pgkiln 0.82.0 → 0.84.0

package/src/i18n/ko.ts

@@ -310,6 +310,15 @@ export const ko: Record<MessageKey, string> = {
   'account.devices_help': "'로그인 유지'를 선택한 브라우저: {count}개.",
   'account.forget_devices': "모든 기기에서 로그아웃",
   'account.devices_forgotten': "모든 기기에서 로그아웃했습니다.",
+  'notify.title': "알림",
+  'notify.none': "알림이 없습니다.",
+  'notify.mark_all_read': "모두 읽음으로 표시",
+  'notify.all': "모든 알림",
+  'notify.marked': "알림을 읽음으로 표시했습니다.",
+  'notify.gone': "이 알림은 더 이상 없습니다.",
+  'notify.bell_one': "알림: 읽지 않음 1개",
+  'notify.bell_n': "알림: 읽지 않음 {n}개",
+  'notify.unread_one': "읽지 않음",
   'push.title': "알림",
   'push.help': "앱이 닫혀 있을 때도 이 기기에서 이 앱의 알림을 받습니다.",
   'push.devices': "알림을 받는 기기: {n}.",

package/src/i18n/nb.ts

@@ -310,6 +310,15 @@ export const nb: Record<MessageKey, string> = {
   'account.devices_help': "Nettlesere der du valgte «Hold meg pålogget»: {count}.",
   'account.forget_devices': "Logg ut på alle enheter",
   'account.devices_forgotten': "Logget ut på alle enheter.",
+  'notify.title': "Varsler",
+  'notify.none': "Ingen varsler.",
+  'notify.mark_all_read': "Merk alle som lest",
+  'notify.all': "Alle varsler",
+  'notify.marked': "Varslene er merket som lest.",
+  'notify.gone': "Dette varselet finnes ikke lenger.",
+  'notify.bell_one': "Varsler: 1 ulest",
+  'notify.bell_n': "Varsler: {n} uleste",
+  'notify.unread_one': "Ulest",
   'push.title': "Varsler",
   'push.help': "Få varsler fra denne appen på denne enheten, også når appen er lukket.",
   'push.devices': "Enheter med varsler: {n}.",

package/src/i18n/pl.ts

@@ -310,6 +310,15 @@ export const pl: Record<MessageKey, string> = {
   'account.devices_help': "Przeglądarki, w których wybrano „Nie wylogowuj mnie”: {count}.",
   'account.forget_devices': "Wyloguj na wszystkich urządzeniach",
   'account.devices_forgotten': "Wylogowano na wszystkich urządzeniach.",
+  'notify.title': "Powiadomienia",
+  'notify.none': "Brak powiadomień.",
+  'notify.mark_all_read': "Oznacz wszystkie jako przeczytane",
+  'notify.all': "Wszystkie powiadomienia",
+  'notify.marked': "Powiadomienia oznaczono jako przeczytane.",
+  'notify.gone': "To powiadomienie już nie istnieje.",
+  'notify.bell_one': "Powiadomienia: 1 nieprzeczytane",
+  'notify.bell_n': "Powiadomienia: nieprzeczytane: {n}",
+  'notify.unread_one': "Nieprzeczytane",
   'push.title': "Powiadomienia",
   'push.help': "Otrzymuj powiadomienia z tej aplikacji na tym urządzeniu, także gdy aplikacja jest zamknięta.",
   'push.devices': "Urządzenia z powiadomieniami: {n}.",

package/src/i18n/pt.ts

@@ -310,6 +310,15 @@ export const pt: Record<MessageKey, string> = {
   'account.devices_help': "Navegadores onde escolheu “Manter a sessão iniciada”: {count}.",
   'account.forget_devices': "Terminar sessão em todos os dispositivos",
   'account.devices_forgotten': "Sessão terminada em todos os dispositivos.",
+  'notify.title': "Notificações",
+  'notify.none': "Sem notificações.",
+  'notify.mark_all_read': "Marcar todas como lidas",
+  'notify.all': "Todas as notificações",
+  'notify.marked': "Notificações marcadas como lidas.",
+  'notify.gone': "Esta notificação já não existe.",
+  'notify.bell_one': "Notificações: 1 por ler",
+  'notify.bell_n': "Notificações: {n} por ler",
+  'notify.unread_one': "Por ler",
   'push.title': "Notificações",
   'push.help': "Receba notificações desta aplicação neste dispositivo, mesmo com a aplicação fechada.",
   'push.devices': "Dispositivos com notificações: {n}.",

package/src/i18n/ru.ts

@@ -310,6 +310,15 @@ export const ru: Record<MessageKey, string> = {
   'account.devices_help': "Браузеров, где выбрано «Не выходить»: {count}.",
   'account.forget_devices': "Выйти на всех устройствах",
   'account.devices_forgotten': "Выход выполнен на всех устройствах.",
+  'notify.title': "Уведомления",
+  'notify.none': "Уведомлений нет.",
+  'notify.mark_all_read': "Отметить все как прочитанные",
+  'notify.all': "Все уведомления",
+  'notify.marked': "Уведомления отмечены как прочитанные.",
+  'notify.gone': "Этого уведомления больше нет.",
+  'notify.bell_one': "Уведомления: 1 непрочитанное",
+  'notify.bell_n': "Уведомления: непрочитанных — {n}",
+  'notify.unread_one': "Непрочитанное",
   'push.title': "Уведомления",
   'push.help': "Получайте уведомления этого приложения на этом устройстве, даже когда приложение закрыто.",
   'push.devices': "Устройства с уведомлениями: {n}.",

package/src/i18n/sv.ts

@@ -310,6 +310,15 @@ export const sv: Record<MessageKey, string> = {
   'account.devices_help': "Webbläsare där du valde ”Håll mig inloggad”: {count}.",
   'account.forget_devices': "Logga ut på alla enheter",
   'account.devices_forgotten': "Utloggad på alla enheter.",
+  'notify.title': "Aviseringar",
+  'notify.none': "Inga aviseringar.",
+  'notify.mark_all_read': "Markera alla som lästa",
+  'notify.all': "Alla aviseringar",
+  'notify.marked': "Aviseringarna har markerats som lästa.",
+  'notify.gone': "Den här aviseringen finns inte längre.",
+  'notify.bell_one': "Aviseringar: 1 oläst",
+  'notify.bell_n': "Aviseringar: {n} olästa",
+  'notify.unread_one': "Oläst",
   'push.title': "Aviseringar",
   'push.help': "Få aviseringar från den här appen på den här enheten, även när appen är stängd.",
   'push.devices': "Enheter med aviseringar: {n}.",

package/src/i18n/tr.ts

@@ -310,6 +310,15 @@ export const tr: Record<MessageKey, string> = {
   'account.devices_help': "“Oturumum açık kalsın” seçtiğiniz tarayıcılar: {count}.",
   'account.forget_devices': "Tüm cihazlarda oturumu kapat",
   'account.devices_forgotten': "Tüm cihazlarda oturum kapatıldı.",
+  'notify.title': "Bildirimler",
+  'notify.none': "Bildirim yok.",
+  'notify.mark_all_read': "Tümünü okundu olarak işaretle",
+  'notify.all': "Tüm bildirimler",
+  'notify.marked': "Bildirimler okundu olarak işaretlendi.",
+  'notify.gone': "Bu bildirim artık yok.",
+  'notify.bell_one': "Bildirimler: 1 okunmamış",
+  'notify.bell_n': "Bildirimler: {n} okunmamış",
+  'notify.unread_one': "Okunmamış",
   'push.title': "Bildirimler",
   'push.help': "Uygulama kapalıyken de bu cihazda bu uygulamanın bildirimlerini alın.",
   'push.devices': "Bildirim alan cihazlar: {n}.",

package/src/i18n/uk.ts

@@ -310,6 +310,15 @@ export const uk: Record<MessageKey, string> = {
   'account.devices_help': "Браузерів, де вибрано «Не виходити»: {count}.",
   'account.forget_devices': "Вийти на всіх пристроях",
   'account.devices_forgotten': "Вихід виконано на всіх пристроях.",
+  'notify.title': "Сповіщення",
+  'notify.none': "Сповіщень немає.",
+  'notify.mark_all_read': "Позначити всі як прочитані",
+  'notify.all': "Усі сповіщення",
+  'notify.marked': "Сповіщення позначено як прочитані.",
+  'notify.gone': "Цього сповіщення більше немає.",
+  'notify.bell_one': "Сповіщення: 1 непрочитане",
+  'notify.bell_n': "Сповіщення: непрочитаних — {n}",
+  'notify.unread_one': "Непрочитане",
   'push.title': "Сповіщення",
   'push.help': "Отримуйте сповіщення цього застосунку на цьому пристрої, навіть коли застосунок закрито.",
   'push.devices': "Пристрої зі сповіщеннями: {n}.",

package/src/i18n/zh.ts

@@ -310,6 +310,15 @@ export const zh: Record<MessageKey, string> = {
   'account.devices_help': "您选择了“保持登录”的浏览器：{count}。",
   'account.forget_devices': "在所有设备上退出登录",
   'account.devices_forgotten': "已在所有设备上退出登录。",
+  'notify.title': "通知",
+  'notify.none': "没有通知。",
+  'notify.mark_all_read': "全部标为已读",
+  'notify.all': "所有通知",
+  'notify.marked': "通知已标为已读。",
+  'notify.gone': "此通知已不存在。",
+  'notify.bell_one': "通知:1 条未读",
+  'notify.bell_n': "通知:{n} 条未读",
+  'notify.unread_one': "未读",
   'push.title': "通知",
   'push.help': "在此设备上接收此应用的通知，即使应用已关闭。",
   'push.devices': "接收通知的设备：{n}。",

package/src/i18n.ts

@@ -337,6 +337,15 @@ const en = {
   'account.devices_help': 'Browsers where you chose "Keep me signed in": {count}.',
   'account.forget_devices': 'Sign out on all devices',
   'account.devices_forgotten': 'Signed out on all devices.',
+  'notify.title': "Notifications",
+  'notify.none': "No notifications.",
+  'notify.mark_all_read': "Mark all read",
+  'notify.all': "All notifications",
+  'notify.marked': "Notifications marked as read.",
+  'notify.gone': "This notification no longer exists.",
+  'notify.bell_one': "Notifications: 1 unread",
+  'notify.bell_n': "Notifications: {n} unread",
+  'notify.unread_one': "Unread",
   'push.title': "Notifications",
   'push.help': "Get notifications from this app on this device, also when the app is closed.",
   'push.devices': "Devices with notifications: {n}.",
@@ -1247,6 +1256,15 @@ const nl: Record<MessageKey, string> = {
   'account.devices_help': 'Browsers waarin je "Ingelogd blijven" koos: {count}.',
   'account.forget_devices': 'Overal afmelden',
   'account.devices_forgotten': 'Op alle apparaten afgemeld.',
+  'notify.title': "Meldingen",
+  'notify.none': "Geen meldingen.",
+  'notify.mark_all_read': "Alles gelezen",
+  'notify.all': "Alle meldingen",
+  'notify.marked': "Meldingen als gelezen gemarkeerd.",
+  'notify.gone': "Deze melding bestaat niet meer.",
+  'notify.bell_one': "Meldingen: 1 ongelezen",
+  'notify.bell_n': "Meldingen: {n} ongelezen",
+  'notify.unread_one': "Ongelezen",
   'push.title': "Meldingen",
   'push.help': "Ontvang meldingen van deze app op dit apparaat, ook als de app gesloten is.",
   'push.devices': "Apparaten met meldingen: {n}.",

package/src/metadata.ts

@@ -112,6 +112,10 @@ export interface App {
   availability_users: string[];
   /** (084) users can send feedback from the navigation bar */
   feedback: boolean;
+  /** (154) the notification bell in the header */
+  notifications: boolean;
+  /** (154) refresh the badges every so many seconds (null: never) */
+  live_badges_s: number | null;
   /** (107) the application's version (Release 1.0), shown in its pages' footer */
   version: string | null;
   /** (085) schema.function(jsonb) returns jsonb that rewrites error messages; seconds of the session timeout warning */
@@ -320,7 +324,9 @@ export interface DynamicAction {
     /** (124) a menu button's entry {"action": NAME} was chosen (trigger: entry or menu button names) */
     | 'menu_entry'
     /** (149) */
-    | 'double_click' | 'key_down' | 'key_press' | 'mouse_enter' | 'mouse_leave' | 'select' | 'resize' | 'scroll' | 'page_unload' | 'before_refresh' | 'facets_change';
+    | 'double_click' | 'key_down' | 'key_press' | 'mouse_enter' | 'mouse_leave' | 'select' | 'resize' | 'scroll' | 'page_unload' | 'before_refresh' | 'facets_change'
+    /** (153) component events: trigger = the grid, calendar, map or tree region */
+    | 'grid_row_init' | 'grid_save' | 'calendar_date_select' | 'calendar_view_change' | 'map_object_click' | 'map_change' | 'tree_selection_change' | 'timer';
   trigger_element: string | null;
   condition_type: 'equals' | 'not_equals' | 'in_list' | 'is_null' | 'is_not_null' | 'greater' | 'greater_equal' | 'less' | 'less_equal' | 'not_in_list' | null;
   condition_value: string | null;
@@ -381,7 +387,9 @@ export interface Process {
   type: 'form_dml' | 'grid_dml' | 'sql' | 'data_load' | 'invoke_api' | 'download' | 'chain' | 'workflow' | 'ai_generate' | 'plugin' | 'send_push' | 'send_email'
     /** (150) */
     | 'close_dialog' | 'clear_session_state' | 'reset_pagination' | 'user_preferences' | 'server_geocoding' | 'print_report'
-    | 'human_task_create' | 'human_task_manage' | 'form_init';
+    | 'human_task_create' | 'human_task_manage' | 'form_init'
+    /** (154) */
+    | 'send_notification';
   region_id: number | null;
   code: string | null;
   config: Record<string, unknown> | null;
@@ -441,7 +449,7 @@ const agg = (table: string, fk: string, parent: string, appId: string) =>
 export async function loadApp(alias: string) {
   return runtime.one<App>(
     `select a.id, a.alias, a.name, a.version, a.home_page, a.authentication, a.access_control, a.sso_providers, a.local_login, a.remember_me_days, a.login_page, a.password_reset, a.session_group, a.mfa, a.mfa_roles, a.mfa_email, a.api_self_tokens, a.ldap_directories, a.header_name, a.header_auto_create, a.logout_url, a.db_auth_roles, a.db_auth_member_of, a.custom_auth_function, a.custom_auth_code, a.custom_auth_post_code, a.nav_list, a.navbar_list, a.pwa, a.pwa_short_name, a.pwa_icon is not null as pwa_has_icon, a.pwa_offline_pages, a.pwa_offline_submit, a.pwa_push, a.db_role, a.debug, a.debug_level, a.theme,
-            a.availability, a.availability_message, a.availability_users, a.feedback, a.error_function, a.session_warning_seconds, a.component_settings,
+            a.availability, a.availability_message, a.availability_users, a.feedback, a.notifications, a.live_badges_s, a.error_function, a.session_warning_seconds, a.component_settings,
             a.language, a.languages, a.language_from, a.date_format, a.timestamp_format, a.time_zone, a.time_zone_auto, a.currency,
             coalesce((select jsonb_agg(jsonb_build_object('name', l.name, 'query', l.query, 'rest_source', l.rest_source)) from meta.lov l where l.app_id = a.id), '[]') as lovs,
             coalesce((select jsonb_agg(jsonb_build_object('page_no', p.page_no, 'name', p.name, 'title', p.title,

package/src/runtime/calendar.ts

@@ -229,7 +229,8 @@ export async function renderCalendar(ctx: PageContext, r: Region): Promise<Raw>
     return html`<a class="cal-add" ${linkAttrs(ctx, create.page, items)} aria-label="${label}" title="${label}">+</a>`;
   };
   const cellAttrs = (day: Date, hour: number | null) =>
-    raw(`${movable ? ` data-drop="${iso(day)}${hour === null ? '' : `T${pad(hour)}:00`}"` : ''}${createOk ? ' data-add' : ''}`);
+    // (161) data-date: what a calendar_date_select dynamic action's condition sees
+    raw(`${movable ? ` data-drop="${iso(day)}${hour === null ? '' : `T${pad(hour)}:00`}"` : ''}${createOk ? ' data-add' : ''} data-date="${iso(day)}${hour === null ? '' : `T${pad(hour)}:00`}"`);
   const on = (day: string) => events.filter((ev) => ev.start <= day && ev.end >= day);
   const go = (v: CalendarView, day: Date | null) =>
     regionUrl(ctx, r, (p) => {
@@ -342,7 +343,7 @@ export async function renderCalendar(ctx: PageContext, r: Region): Promise<Raw>
         (v) => html`<a class="btn${v === view ? ' active' : ''}" href="${go(v, anchor)}"${v === view ? raw(' aria-current="page"') : ''}>${t(`calendar.view_${v}`)}</a>`,
       )}</nav>`
     : '';
-  return html`<div class="calendar cal-view-${view}"${movable ? raw(` data-calendar="${r.id}"`) : ''}>
+  return html`<div class="calendar cal-view-${view}" data-view="${view}"${movable ? raw(` data-calendar="${r.id}"`) : ''}>
     <div class="cal-toolbar">
       <div class="buttons">${nav('‹', prev, prevLabel)}${nav(t('calendar.today'), null)}${nav('›', next, nextLabel)}</div>
       <h3 class="cal-title" aria-live="polite">${title}</h3>

package/src/runtime/context.ts

@@ -38,6 +38,8 @@ export interface PageContext {
   ip: string;
   errors: Errors;
   messages: string[];
+  /** (161) grid regions whose changes this request saved (POST), or the request before it saved (GET): grid_save dynamic actions */
+  savedGrids?: number[];
   /** rendered inside a modal dialog (iframe) */
   dialog: boolean;
   client?: Client;

package/src/runtime/engine.ts

@@ -18,7 +18,7 @@ import { parseDateMask } from './format.ts';
 import { conditionHolds, functionBody } from './logic.ts';
 import { runPluginProcess } from './plugins.ts';
 import { runDeclarative } from './process-types.ts';
-import { BACKGROUND_TYPES, downloadFile, sendEmailProcess, sendPushProcess, workflowProcess, type ChainConfig } from './processes.ts';
+import { BACKGROUND_TYPES, downloadFile, sendEmailProcess, sendNotificationProcess, sendPushProcess, workflowProcess, type ChainConfig } from './processes.ts';
 import { bindValues, dbg, publicError, stripSemicolon, substitute, timed, toState, type Errors, type PageContext } from './context.ts';
 
 const ident = pg.escapeIdentifier;
@@ -621,6 +621,7 @@ async function runOneStep(ctx: PageContext, p: Process, names: Set<string>, dept
       case 'invoke_api': return await invokeApi(ctx, p, names);
       case 'workflow': return await workflowProcess(ctx, p, names);
       case 'send_push': return await sendPushProcess(ctx, p);
+      case 'send_notification': return await sendNotificationProcess(ctx, p);
       case 'send_email': return await sendEmailProcess(ctx, p);
       case 'ai_generate': return (await runAiProcess(ctx, p, names)).message;
       case 'plugin': return await runPluginProcess(ctx, p.config, p.name);

package/src/runtime/feedback.ts

@@ -29,7 +29,7 @@ export function feedbackNode(ctx: PageContext): ListNode | null {
   if (!ctx.app.feedback || ctx.dialog) return null;
   return {
     label: ctx.locale.t('feedback.link'), href: `${ctx.base}/${ctx.page.page_no}/feedback`, modal: false, external: false,
-    icon: 'chat', badge: null, description: null, current: false, inTrail: false, children: [],
+    icon: 'chat', badge: null, key: '__feedback', description: null, current: false, inTrail: false, children: [],
   };
 }
 

package/src/runtime/grid.ts

@@ -831,5 +831,6 @@ export async function gridDml(ctx: PageContext, p: Process): Promise<string | nu
   if (errors.length) throw new Error(errors.join(' '));
   const t = ctx.locale.t;
   const parts = [inserted && t('grid.added', { n: inserted }), updated && t('grid.updated', { n: updated }), deleted && t('grid.deleted', { n: deleted })].filter(Boolean);
+  (ctx.savedGrids ??= []).push(r.id);
   return p.success_message ?? (parts.length ? t('grid.saved_parts', { parts: parts.join(', ') }) : t('grid.no_changes'));
 }

package/src/runtime/lists.ts

@@ -28,6 +28,8 @@ export interface ListNode {
   external: boolean;
   icon: string | null;
   badge: string | null;
+  /** (154) the entry's id (a query's id column, else its label): finds its badge again for a live refresh */
+  key: string;
   description: string | null;
   /** the entry's page is the current page */
   current: boolean;
@@ -50,6 +52,8 @@ interface Entry {
   url: string | null;
   icon: string | null;
   badge: string | null;
+  /** (154) a SELECT whose first value is the badge (static entries; wins over badge) */
+  badge_query?: string | null;
   description: string | null;
   condition?: string | null;
   authz?: string | null;
@@ -105,7 +109,7 @@ async function entriesOf(ctx: PageContext, name: string): Promise<Entry[] | null
   }
   const rows = (
     await runtime.query(
-      `select id, parent_id, label, target_page, target_items, target_url, icon, badge, description, condition, authz
+      `select id, parent_id, label, target_page, target_items, target_url, icon, badge, badge_query, description, condition, authz
          from meta.list_entry where app_id = $1 and list_name = $2 and meta.build_option_on(app_id, build_option)
         order by seq, id`,
       [ctx.app.id, name.toUpperCase()],
@@ -113,10 +117,28 @@ async function entriesOf(ctx: PageContext, name: string): Promise<Entry[] | null
   ).rows;
   return rows.map((r) => ({
     id: r.id, parent_id: r.parent_id, label: ctx.locale.tr(r.label), page: r.target_page, items: r.target_items ?? {}, url: r.target_url,
-    icon: r.icon, badge: r.badge, description: r.description ? ctx.locale.tr(r.description) : null, condition: r.condition, authz: r.authz,
+    icon: r.icon, badge: r.badge, badge_query: r.badge_query, description: r.description ? ctx.locale.tr(r.description) : null, condition: r.condition, authz: r.authz,
   }));
 }
 
+/**
+ * (029, 154) A badge from SQL: the first value of the query's first row, run as the application's
+ * role with the page's binds; an error is a page error and no badge. Empty values give no badge.
+ */
+export async function queryBadge(ctx: PageContext, query: string, what: string): Promise<string | null> {
+  const c = ctx.client;
+  if (!c) return null;
+  try {
+    const sql = stripSemicolon(applyBinds(query, bindValues(ctx)));
+    const res = await savepoint(c, () => c.query({ text: sql, rowMode: 'array' }));
+    const v = res.rows[0]?.[0];
+    return v === null || v === undefined ? null : String(v).trim().slice(0, 100) || null;
+  } catch (e) {
+    ctx.errors.page.push(await publicError(ctx, e, what));
+    return null;
+  }
+}
+
 /** The current page and its parent pages (for "in trail"). */
 function trail(ctx: PageContext) {
   const pages = new Set<number>();
@@ -156,7 +178,10 @@ export async function listTree(ctx: PageContext, name: string): Promise<ListNode
       modal: !!e.page && isModal(ctx, e.page),
       external,
       icon: e.icon,
-      badge: e.badge === null ? null : substitute(e.badge, ctx, (x) => x),
+      badge: e.badge_query?.trim()
+        ? await queryBadge(ctx, e.badge_query, `badge of list entry "${e.label}"`)
+        : e.badge === null ? null : substitute(e.badge, ctx, (x) => x),
+      key: String(e.id ?? e.label),
       description: e.description === null ? null : substitute(e.description, ctx, (x) => x),
       current: isCurrent,
       inTrail: isCurrent || (e.page !== null && current.has(e.page)) || children.some((c) => c.inTrail),
@@ -179,15 +204,22 @@ export async function listTree(ctx: PageContext, name: string): Promise<ListNode
 
 const linkAttrs = (n: ListNode, cls?: string) =>
   html`href="${n.href}"${cls ? html` class="${cls}"` : ''}${n.current ? raw(' aria-current="page"') : ''}${n.modal ? raw(' data-dialog') : ''}${n.external ? raw(' rel="noopener noreferrer"') : ''}`;
-const badge = (n: ListNode) => (n.badge !== null ? html` <span class="badge">${n.badge}</span>` : '');
+/**
+ * An entry's badge. live: the prefix of the badge's data-badge key when the application refreshes
+ * badges (154); an empty badge is then a hidden placeholder the refresh can fill.
+ */
+const badge = (n: ListNode, live?: string) =>
+  n.badge !== null
+    ? html` <span class="badge"${live ? html` data-badge="${live}${n.key}"` : ''}>${n.badge}</span>`
+    : live ? html` <span class="badge" data-badge="${live}${n.key}" hidden></span>` : '';
 
 /** Entries as the navigation menu (the same markup as navigation entries). */
-export function navMarkup(nodes: ListNode[], topNav: boolean): Raw[] {
+export function navMarkup(nodes: ListNode[], topNav: boolean, live?: string): Raw[] {
   return nodes.map((n) => {
-    const label = html`${icon(n.icon ?? 'chevron')}<span>${n.label}</span>${badge(n)}`;
+    const label = html`${icon(n.icon ?? 'chevron')}<span>${n.label}</span>${badge(n, live)}`;
     if (n.children.length)
       return html`<li><details${n.inTrail && !topNav ? raw(' open') : ''}><summary class="${n.inTrail ? 'in-trail' : null}">${label}</summary><ul>${
-        n.href ? html`<li><a ${linkAttrs(n)}>${label}</a></li>` : ''}${navMarkup(n.children, topNav)}</ul></details></li>`;
+        n.href ? html`<li><a ${linkAttrs(n)}>${label}</a></li>` : ''}${navMarkup(n.children, topNav, live)}</ul></details></li>`;
     return html`<li><a ${linkAttrs(n, !n.current && n.inTrail ? 'in-trail' : undefined)}>${label}</a></li>`;
   });
 }
@@ -195,13 +227,13 @@ export function navMarkup(nodes: ListNode[], topNav: boolean): Raw[] {
 const hasIcon = (n: ListNode) => isIcon(n.icon);
 
 /** Entries as the navigation bar in the header: links, with a menu for entries with children (labels of entries with an icon hide on small screens). */
-export function navbarMarkup(nodes: ListNode[], label: string): Raw {
+export function navbarMarkup(nodes: ListNode[], label: string, live?: string): Raw {
   if (!nodes.length) return raw('');
   return html`<nav class="t-navbar" aria-label="${label}"><ul>${nodes.map((n) =>
     n.children.length
-      ? html`<li><details class="menu"><summary${hasIcon(n) ? html` class="nb-icon" aria-label="${n.label}"` : ''}>${icon(n.icon)}<span>${n.label}</span>${badge(n)}</summary><div class="menu-panel align-right"><ul class="t-navbar-menu">${
-          [...(n.href ? [n] : []), ...n.children].map((c) => html`<li><a ${linkAttrs(c)}>${icon(c.icon)}<span>${c.label}</span>${badge(c)}</a></li>`)}</ul></div></details></li>`
-      : html`<li><a ${linkAttrs(n, hasIcon(n) ? 'nb-icon' : undefined)}${hasIcon(n) ? html` aria-label="${n.label}"` : ''}>${icon(n.icon)}<span>${n.label}</span>${badge(n)}</a></li>`)}</ul></nav>`;
+      ? html`<li><details class="menu"><summary${hasIcon(n) ? html` class="nb-icon" aria-label="${n.label}"` : ''}>${icon(n.icon)}<span>${n.label}</span>${badge(n, live)}</summary><div class="menu-panel align-right"><ul class="t-navbar-menu">${
+          [...(n.href ? [n] : []), ...n.children].map((c) => html`<li><a ${linkAttrs(c)}>${icon(c.icon)}<span>${c.label}</span>${badge(c, live)}</a></li>`)}</ul></div></details></li>`
+      : html`<li><a ${linkAttrs(n, hasIcon(n) ? 'nb-icon' : undefined)}${hasIcon(n) ? html` aria-label="${n.label}"` : ''}>${icon(n.icon)}<span>${n.label}</span>${badge(n, live)}</a></li>`)}</ul></nav>`;
 }
 
 function linksMarkup(nodes: ListNode[]): Raw {

package/src/runtime/maps.ts

@@ -13,7 +13,7 @@ import { encodeTile, tileArea, type TileFeature } from '../mvt.ts';
 
 // Map region (APEX: Map region). The SELECT returns, per row, a position
 // (columns lat and lng, latitude and longitude, or location as "lat,lng")
-// and optionally title, body and geojson (a GeoJSON geometry or feature for
+// and optionally id (what a map_object_click dynamic action sees), title, body and geojson (a GeoJSON geometry or feature for
 // lines and areas; a GeoJSON point is a place), and weight (for a heat map).
 // With PostGIS installed, a geometry or geography column (WGS 84) is turned
 // into GeoJSON on the server (ST_AsGeoJSON), so no geojson column is needed.
@@ -59,6 +59,8 @@ interface Point {
   body: string;
   href: string | null;
   weight: number;
+  /** (161) the row's id column: what a map_object_click dynamic action's condition sees */
+  id?: string;
 }
 /** (159, CD-6) a shape layer's look: fixed in the layer's settings, or per row from columns of the same names */
 export interface ShapeStyle {
@@ -164,6 +166,7 @@ async function loadLayer(ctx: PageContext, def: LayerDef, g: PostGis | null, opt
     if ((Number.isNaN(lat) || Number.isNaN(lng)) && loc) [lat, lng] = [Number(loc[1]), Number(loc[2])];
     const title = toState(col(row, 'title')) ?? '';
     const body = toState(col(row, 'body')) ?? '';
+    const id = toState(col(row, 'id')) ?? undefined;
     let href: string | null = null;
     if (linkOk && link) {
       const items: Record<string, string> = {};
@@ -184,14 +187,14 @@ async function loadLayer(ctx: PageContext, def: LayerDef, g: PostGis | null, opt
           ? { ...def.style, ...shapeStyle({ fill_color: col(row, 'fill_color'), stroke_color: col(row, 'stroke_color'), stroke_width: col(row, 'stroke_width'), opacity: col(row, 'opacity') }) }
           : undefined;
         const h = num(col(row, 'height'));
-        shapes.push({ type: 'Feature', geometry, properties: { title, body, href, ...(style ? { style } : {}), ...(def.kind === 'extruded' && Number.isFinite(h) ? { height: h } : {}) } });
+        shapes.push({ type: 'Feature', geometry, properties: { title, body, href, ...(id !== undefined ? { id } : {}), ...(style ? { style } : {}), ...(def.kind === 'extruded' && Number.isFinite(h) ? { height: h } : {}) } });
       }
     }
     // a shape layer draws only shapes
     if (SHAPE_KINDS.has(def.kind)) continue;
     const w = num(col(row, 'weight'));
     const weight = Number.isFinite(w) && w > 0 ? w : Number.isNaN(w) ? 1 : 0;
-    if (Math.abs(lat) <= 90 && Math.abs(lng) <= 180) points.push({ lat, lng, title, body, href, weight });
+    if (Math.abs(lat) <= 90 && Math.abs(lng) <= 180) points.push({ lat, lng, title, body, href, weight, ...(id !== undefined ? { id } : {}) });
   }
   // (159) extruded: each polygon shaded by its height (from light to strong; no 3D view)
   if (def.kind === 'extruded') {
@@ -296,7 +299,7 @@ export function parseTile(z: string, x: string, y: string) {
 export async function layerTile(ctx: PageContext, def: LayerDef, t: { z: number; x: number; y: number }) {
   const { points, shapes, truncated } = await loadLayer(ctx, def, await postgis(), { area: tileArea(t.z, t.x, t.y, 1 / 16), limit: MAX_TILE_ROWS });
   const features: TileFeature[] = [
-    ...points.map((p) => ({ geometry: { type: 'Point', coordinates: [p.lng, p.lat] }, properties: { title: p.title, body: p.body, href: p.href, weight: p.weight } })),
+    ...points.map((p) => ({ geometry: { type: 'Point', coordinates: [p.lng, p.lat] }, properties: { title: p.title, body: p.body, href: p.href, weight: p.weight, ...(p.id !== undefined ? { id: p.id } : {}) } })),
     ...(shapes as { geometry: TileFeature['geometry']; properties: TileFeature['properties'] }[]).map((s) => ({ geometry: s.geometry, properties: s.properties })),
   ];
   return { tile: encodeTile('places', t.z, t.x, t.y, features), truncated };