add site announcements

src/web/pages/helpers/navigationFocus.test.ts

@@ -5,6 +5,7 @@ import {
   buildSiteFocusPath,
   clearFocusParams,
   readFocusAccountIntent,
+  readFocusAnnouncementId,
   readFocusSiteId,
 } from './navigationFocus.js';
 
@@ -20,6 +21,8 @@ describe('navigationFocus helpers', () => {
   it('parses focus params from query string', () => {
     expect(readFocusSiteId('?focusSiteId=15')).toBe(15);
     expect(readFocusSiteId('?focusSiteId=abc')).toBeNull();
+    expect(readFocusAnnouncementId('?focusAnnouncementId=21')).toBe(21);
+    expect(readFocusAnnouncementId('?focusAnnouncementId=abc')).toBeNull();
 
     expect(readFocusAccountIntent('?focusAccountId=22&openRebind=1')).toEqual({
       accountId: 22,
@@ -37,6 +40,7 @@ describe('navigationFocus helpers', () => {
 
   it('clears focus params but keeps other params', () => {
     expect(clearFocusParams('?focusSiteId=12&q=abc')).toBe('?q=abc');
+    expect(clearFocusParams('?focusAnnouncementId=44&type=site_notice')).toBe('?type=site_notice');
     expect(clearFocusParams('?focusAccountId=2&openRebind=1&type=token')).toBe('?type=token');
     expect(clearFocusParams('?focusAccountId=2')).toBe('');
   });
@@ -60,6 +64,12 @@ describe('navigationFocus helpers', () => {
       type: 'status',
     })).toBe('/sites?focusSiteId=9');
 
+    expect(buildEventNavigationPath({
+      relatedType: 'site_announcement',
+      relatedId: 12,
+      type: 'site_notice',
+    })).toBe('/site-announcements?focusAnnouncementId=12');
+
     expect(buildEventNavigationPath({
       relatedType: 'route',
       relatedId: null,
@@ -68,6 +78,7 @@ describe('navigationFocus helpers', () => {
 
     expect(buildEventNavigationPath({ type: 'proxy' })).toBe('/logs');
     expect(buildEventNavigationPath({ type: 'checkin' })).toBe('/checkin');
+    expect(buildEventNavigationPath({ type: 'site_notice' })).toBe('/site-announcements');
     expect(buildEventNavigationPath({})).toBe('/events');
   });
 });

src/web/pages/helpers/navigationFocus.ts

@@ -1,4 +1,5 @@
 const FOCUS_SITE_ID_KEY = 'focusSiteId';
+const FOCUS_ANNOUNCEMENT_ID_KEY = 'focusAnnouncementId';
 const FOCUS_ACCOUNT_ID_KEY = 'focusAccountId';
 const FOCUS_TOKEN_ID_KEY = 'focusTokenId';
 const OPEN_REBIND_KEY = 'openRebind';
@@ -21,6 +22,12 @@ export function buildSiteFocusPath(siteId: number): string {
   return `/sites?${FOCUS_SITE_ID_KEY}=${normalizedId}`;
 }
 
+export function buildAnnouncementFocusPath(announcementId: number): string {
+  const normalizedId = normalizePositiveId(announcementId);
+  if (!normalizedId) return '/site-announcements';
+  return `/site-announcements?${FOCUS_ANNOUNCEMENT_ID_KEY}=${normalizedId}`;
+}
+
 export function buildAccountFocusPath(
   accountId: number,
   options?: { openRebind?: boolean; segment?: 'session' | 'apikey' | 'tokens' },
@@ -48,6 +55,11 @@ export function readFocusSiteId(search: string): number | null {
   return normalizePositiveId(params.get(FOCUS_SITE_ID_KEY));
 }
 
+export function readFocusAnnouncementId(search: string): number | null {
+  const params = new URLSearchParams(search);
+  return normalizePositiveId(params.get(FOCUS_ANNOUNCEMENT_ID_KEY));
+}
+
 export function readFocusAccountIntent(search: string): { accountId: number | null; openRebind: boolean } {
   const params = new URLSearchParams(search);
   return {
@@ -64,6 +76,7 @@ export function readFocusTokenId(search: string): number | null {
 export function clearFocusParams(search: string): string {
   const params = new URLSearchParams(search);
   params.delete(FOCUS_SITE_ID_KEY);
+  params.delete(FOCUS_ANNOUNCEMENT_ID_KEY);
   params.delete(FOCUS_ACCOUNT_ID_KEY);
   params.delete(FOCUS_TOKEN_ID_KEY);
   params.delete(OPEN_REBIND_KEY);
@@ -86,6 +99,9 @@ export function buildEventNavigationPath(event: {
   if (relatedType === 'site' && relatedId) {
     return buildSiteFocusPath(relatedId);
   }
+  if (relatedType === 'site_announcement' && relatedId) {
+    return buildAnnouncementFocusPath(relatedId);
+  }
   if (relatedType === 'route') {
     return '/routes';
   }
@@ -95,6 +111,9 @@ export function buildEventNavigationPath(event: {
   if (eventType === 'checkin') {
     return '/checkin';
   }
+  if (eventType === 'site_notice') {
+    return '/site-announcements';
+  }
 
   return '/events';
 }