@7365admin1/layer-common 4.35.1-staging.384 → 4.36.0

package/composables/useWebUsb.ts

@@ -345,19 +345,16 @@ export default function useWebUsb() {
       70,
     );
 
-    // The pass used to print five copies of the same QR - four 140px ones at
-    // the corners around a 250px centre - so a strip could be cut apart. It now
-    // prints a single large QR filling that same band (y 90 to 440, above the
-    // company name at y 470), which scans far more reliably on a thermal print.
-    // Generated at the size it is drawn at: the old corner copies were
-    // downscaled from the 250px canvas, which softened their modules.
-    const qrSize = 350;
-    const qrCanvas = await QRCode.toCanvas(qrUrlImage, {
-      width: qrSize,
-      margin: 1,
-    });
+    const qrSmall = 140;
+    const qrCenter = 250;
+    const margin = 20;
+    const qrCanvas = await QRCode.toCanvas(qrUrlImage, { width: qrCenter });
 
-    ctx.drawImage(qrCanvas, (canvas.width - qrSize) / 2, 90, qrSize, qrSize);
+    ctx.drawImage(qrCanvas, margin, 90, qrSmall, qrSmall);
+    ctx.drawImage(qrCanvas, canvas.width - qrSmall - margin, 90, qrSmall, qrSmall);
+    ctx.drawImage(qrCanvas, (canvas.width - qrCenter) / 2, 110, qrCenter, qrCenter);
+    ctx.drawImage(qrCanvas, margin, 300, qrSmall, qrSmall);
+    ctx.drawImage(qrCanvas, canvas.width - qrSmall - margin, 300, qrSmall, qrSmall);
 
     ctx.font = "25px Arial";
     ctx.fillText(companyName || "", canvas.width / 2, 470);
@@ -404,8 +401,8 @@ export default function useWebUsb() {
   /**
    * The self-service onboarding QR: one large QR code, a "SCAN QR CODE"-style
    * subtext, and a dark site-name banner along the bottom - a single-purpose
-   * gate sign, not the visitor-pass receipt `createReceiptLayout` produces
-   * (that one pairs its QR with company, date, access and instruction lines).
+   * gate sign, not the multi-copy visitor-pass receipt `createReceiptLayout`
+   * produces (that one prints several QRs to be cut apart and handed out).
    */
   async function createOnboardingQrLayout(
     qrUrlImage: string,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.35.1-staging.384",
+  "version": "4.36.0",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",
@@ -36,7 +36,7 @@
     "build": "nuxt build .playground",
     "generate": "nuxt generate .playground",
     "preview": "nuxt preview .playground",
-    "test": "esbuild composables/useANPRSettings.ts --format=esm --outfile=test/.build/useANPRSettings.mjs --log-level=error && esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && esbuild composables/usePlateToastWindow.ts --format=esm --outfile=test/.build/usePlateToastWindow.mjs --log-level=error && esbuild utils/client-invite-modules.ts --bundle --platform=node --format=esm --outfile=test/.build/client-invite-modules.mjs --log-level=error && esbuild utils/robot-display.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-display.mjs --log-level=error && esbuild utils/building-map.ts --bundle --platform=node --format=esm --outfile=test/.build/building-map.mjs --log-level=error && esbuild utils/robot-building.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-building.mjs --log-level=error && esbuild utils/robot-fleet-core.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-fleet-core.mjs --log-level=error && node --experimental-strip-types --test \"test/*.test.mjs\" && yarn test:units",
+    "test": "esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && esbuild composables/usePlateToastWindow.ts --format=esm --outfile=test/.build/usePlateToastWindow.mjs --log-level=error && esbuild utils/client-invite-modules.ts --bundle --platform=node --format=esm --outfile=test/.build/client-invite-modules.mjs --log-level=error && esbuild utils/robot-display.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-display.mjs --log-level=error && esbuild utils/building-map.ts --bundle --platform=node --format=esm --outfile=test/.build/building-map.mjs --log-level=error && esbuild utils/robot-building.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-building.mjs --log-level=error && node --experimental-strip-types --test \"test/*.test.mjs\" && yarn test:units",
     "test:units": "node --experimental-strip-types --test \"utils/*.test.ts\"",
     "release": "yarn run build && changeset publish"
   },

package/pages/[org]/[site]/access-mgmt/administrator/index.vue

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before managing HID users."
     >
-      <HidUserEnrollment :site="siteId" :org="orgId" />
+      <HidUserEnrollment :site="siteId" />
     </HidEnabledGate>
   </v-container>
 </template>

package/pages/[org]/[site]/access-mgmt/hid-cards/index.vue

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before managing physical HID cards."
     >
-      <HidUserEnrollment :site="siteId" :org="orgId" card-management />
+      <HidUserEnrollment :site="siteId" card-management />
     </HidEnabledGate>
   </v-container>
 </template>

package/pages/[org]/[site]/access-mgmt/hid-readers/index.vue

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before managing HID readers."
     >
-      <HidReaderManagement :site="siteId" :org="orgId" />
+      <HidReaderManagement :site="siteId" />
     </HidEnabledGate>
   </v-container>
 </template>

package/plugins/API.ts

@@ -11,17 +11,6 @@ export default defineNuxtPlugin((nuxtApp) => {
     onRequest({ options }) {
       const sid = useCookie("sid", cookieConfig).value ?? "";
       options.headers.set("Authorization", sid);
-      // Which of the user's memberships this screen is working in (DV-0396):
-      // this app's member type and the organisation in the address. With
-      // several memberships pinned to one site, the server then checks the
-      // same role the screen was drawn from (core `requireSiteReach`). Only
-      // chooses among the user's own memberships; it grants nothing.
-      const app = useRuntimeConfig().public.APP;
-      if (app) options.headers.set("X-App", String(app));
-      const org = (nuxtApp as any).$router?.currentRoute?.value?.params?.org;
-      if (typeof org === "string" && /^[0-9a-f]{24}$/i.test(org)) {
-        options.headers.set("X-Org", org);
-      }
     },
     // "You do not have permission to ..." - the role changed since the page
     // read it. Re-read it in the background (plugins/secure-member.client.ts)

package/types/document.d.ts

@@ -3,18 +3,4 @@ declare type TDocument = {
   name: string;
   attachment: string;
   type: string;
-  /**
-   * Set at upload or renewal, absent when the document never expires.
-   *
-   * An ISO instant on the way out of the API and a `YYYY-MM-DD` string on the
-   * way back in, which is what `InputDatePicker` binds to - hence the loose
-   * type rather than `string`.
-   */
-  expiryDate?: string | Date | null;
-  remarks?: string;
-  size?: number;
-  parentId?: string | null;
-  createdAt?: string | Date;
-  updatedAt?: string | Date;
-  status?: string;
 };

package/types/facility.d.ts

@@ -73,10 +73,6 @@ declare type TFacility = {
   hourInterval?: number;
   isBookingFeeEnabled: boolean;
   isGuestEnabled: boolean;
-  /** Residents may complete this facility's checklist themselves. */
-  isResidentChecklistEnabled?: boolean;
-  /** Security may complete it. Mutually exclusive with the above. */
-  isSecurityChecklistEnabled?: boolean;
   bookingAmount: number | null;
   peakBookingFeeAmount?: number | null;
   bookingFeeGuestAmount?: number | null;

package/types/people.d.ts

@@ -22,38 +22,11 @@ declare type TPeople = {
   email?: string;
   files?: { name: string, id: string }[];
   isOwner?: boolean;
-  /**
-   * Owner / occupant / person-in-charge, as the BUSINESS people form asks it.
-   * Absent on everyone else - `isOwner` is still the flag that decides unit
-   * ownership, and the server derives it from this when it is sent. See
-   * `OccupancyRoles` in core's `person.model.ts`.
-   */
-  occupancyRole?: TOccupancyRole;
-  // Link to this person's `users` row. Empty for the person types that carry
-  // no login, and empty for a resident whose account was never written.
-  user?: string;
-};
-
-declare type TOccupancyRole = "owner" | "occupant" | "person-in-charge";
-
-/** One standing and everything the product says about it. See `utils/occupancy-role.ts`. */
-declare type TOccupancyRoleOption = {
-  value: TOccupancyRole;
-  /** The label a stored role is printed with. */
-  title: string;
-  /** The row menu's wording. */
-  action: string;
-  /** The confirmation's heading and its sentence. */
-  prompt: string;
-  description: string;
 };
 
 declare type TPlateNumber = { plateNumber: string, recNo?: string, _id?: string, status: TVehicleStatus, type: TVehicleType, anprCameras?: TVehicleAnprCamera[] };
 
 
-// `""` is the FORM's "nothing picked yet" - it is stripped from the payload
-// before it is sent, because absence is what the server reads as "never
-// asked". See `PeopleFormMgmt.vue`.
-declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> & { status?: string; user?: string; occupancyRole?: TOccupancyRole | "" }
+declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> & { status?: string }
 
 declare type TPeopleType = "guest" | "resident" | "tenant"

package/utils/module-routes.ts

@@ -12,7 +12,7 @@
  * (checked against every app's own `useLocalPermission` nav gate, 2026-09-11).
  * Shared or ambiguous pages stay out: calendar, keys (gated on `site-settings`),
  * access-mgmt (`site-settings:manage-entry-pass` also opens it), equipment and
- * inventory, service-providers and support tickets.
+ * inventory, the property CCTV wall, service-providers and support tickets.
  *
  * NEVER MAPPED: the dashboard, settings, members, invitations and roles. A client
  * must always be able to run its own people and roles; the server never denies
@@ -40,13 +40,6 @@ export const MODULE_ROUTES: Readonly<Record<string, string>> = Object.freeze({
   // Includes its CCTV page: security's drawer shows it to whoever can see
   // Virtual Patrol, so it follows the same module.
   "org-site-virtual-patrol": "virtual-patrol",
-  // Property Management's camera wall (owner approval 2026-09-25, item 3). Its
-  // menu, page and the server's wall endpoint all read the four legacy
-  // `virtual-patrol:` strings (`useCameraViewPermission`, core
-  // `CAMERA_VIEW_PERMISSIONS`), and the PM role editor now calls that row
-  // "CCTV". So it follows the same module as Security's own CCTV page above.
-  // Fails open like every entry: a client with no module list keeps it.
-  "org-site-cctv": "virtual-patrol",
   "org-site-robot-management": "robot-mgmt",
   "org-site-attendance": "attendance-mgmt",
   "org-site-my-attendance": "my-attendance",

package/utils/nav-sections.ts

@@ -125,13 +125,7 @@ export const SECTION_ORDER: string[] = [
  * objects; only the order changes.
  */
 export function withSections<T extends { title?: string }>(
-  items: T[],
-  /**
-   * An application's own name for a heading, e.g. Property Management prints
-   * SECURITY OPERATIONS as ESTATE SECURITY (owner approval 2026-09-25, item 6).
-   * Changes the printed label only; grouping and order are unchanged.
-   */
-  labels: Readonly<Record<string, string>> = {}
+  items: T[]
 ): Array<TSectionedNavItem<T>> {
   // An unmapped title inherits the section of the item above it.
   let current = "";
@@ -150,7 +144,7 @@ export function withSections<T extends { title?: string }>(
 
   let printed = "";
   return grouped.map(({ item, section }) => {
-    const label = section === printed ? "" : labels[section] ?? section;
+    const label = section === printed ? "" : section;
     printed = section;
     return { item, section: label };
   });

package/utils/notification-target.ts

@@ -24,68 +24,25 @@
  * Eleven web apps render this bell and only `iservice365-web-app-org` has an
  * order queue. Rather than make eleven apps configure a map, the name is
  * written down once here and the bell asks its own router whether the route
- * exists before pushing.
- *
- * EVERY KIND SINCE 2026-09-24 (owner: "the notification never routes me")
- * Each row names what it is about (`params.kind`, else its `module`), and the
- * tables below say which web apps have that page. The bell opens this app's
- * own page when it has one and otherwise jumps to the app that does, by its
- * `APP_*` URL, with the organisation and site in the path.
+ * exists before pushing — so in the ten apps without the page the click stays
+ * exactly what it was: mark as read, go nowhere.
  */
 
 /** Only the fields a destination is decided from. */
 export type TTargetRow = {
   module?: string;
-  screen?: string;
-  title?: string;
-  appSlug?: string;
-  siteId?: string | null;
-  /**
-   * `kind` is the click-through target every sender sets since 2026-09-24
-   * (core `withNotificationKind`); `site` stands in for `siteId` on rows kept
-   * unscoped on purpose. Older rows have neither and are read from `module`.
-   */
-  params?: { id?: string; org?: string; kind?: string; site?: string } | null;
+  params?: { id?: string } | null;
 };
 
 /** What the surrounding app knows that the stored row does not. */
 export type TTargetContext = {
   /** The organization in the current URL. Org routes are all nested under it. */
   organization?: string;
-  /** The site in the current URL, used when the row names none. */
-  site?: string;
 };
 
-/** The web apps a click can land in, keyed like their `APP_*` runtime URLs. */
-export type TAppKey =
-  | "org"
-  | "security"
-  | "property-management"
-  | "hygiene"
-  | "mechanical-electrical"
-  | "pest-control"
-  | "landscaping"
-  | "pool-maintenance";
-
-/** One place the record can be opened: a path inside one web app. */
-export type TCandidate = { app: TAppKey; path: string };
-
 export type TNotificationTarget = {
-  /** A route name in the current app, tried first (the two original targets). */
-  name?: string;
-  params?: Record<string, string>;
-  query?: Record<string, string>;
-  /**
-   * Set when the page lives in another web app. The bell opens
-   * `<that app's URL><path>` when its own router has no route by `name`.
-   */
-  app?: TAppKey;
-  path?: string;
-  /**
-   * Every page that shows the record, best first. The bell opens the first one
-   * its own router has; otherwise it jumps to the first whose app URL is set.
-   */
-  candidates?: TCandidate[];
+  name: string;
+  params: Record<string, string>;
 };
 
 /** Nuxt's generated names for `pages/org/[organization]/marketplace/orders/`. */
@@ -95,175 +52,13 @@ export const ORDER_DETAIL_ROUTE = "org-organization-marketplace-orders-id";
 /** The stored `module` tag on a row sent to a vendor's staff. */
 export const VENDOR_ORDER_MODULE = "marketplace-vendor-order";
 
-/**
- * "<Company> has invited you to <site>" — core `serviceProviderInvited` stores
- * `module: "other"` (the apps route on it; it never changes) with this
- * `screen`, the invitation id in `params.id`, and, since 2026-09-24, the
- * invited company's own organisation in `params.org`.
- *
- * It opens the organisation app's Invitations page, where "Invitations from
- * other organisations" lists it with Accept / Decline. Only the organisation
- * app has that page; every other app sends the click there by URL.
- */
-export const SP_INVITATION_SCREEN = "/service-provider-invitation";
-export const INVITATIONS_ROUTE = "org-organization-client-invitations";
-
-/**
- * What a row is about. `params.kind` when the sender set it; for older rows the
- * `module`, except where the module is shared: `platform` (a new client, an
- * accepted invitation, a robot) and `other` (both halves of a service-provider
- * invitation) are told apart by the fixed titles their senders use.
- */
-export function notificationKind(item: TTargetRow | null | undefined): string {
-  const kind = String(item?.params?.kind ?? "").trim();
-  if (kind) return kind;
-  const module = String(item?.module ?? "");
-  const title = String(item?.title ?? "");
-  if (String(item?.screen ?? "") === SP_INVITATION_SCREEN) return "serviceProviderInvite";
-  if (module === "platform") {
-    if (/^robot /i.test(title)) return "robot";
-    if (/^new client/i.test(title)) return "client";
-    if (/^invitation accepted/i.test(title)) return "clientInvitation";
-    return "";
-  }
-  if (module === "other") {
-    return /(accepted|declined) your invitation$/i.test(title) ? "serviceProviderInviteAnswer" : "";
-  }
-  return module;
-}
-
-/**
- * The web app a mobile-tagged row's work lives in. A work order sent to the
- * iClean365 app is managed in the Hygiene web app, and so on; anything from the
- * resident or iMA365 apps is the property manager's.
- */
-const APP_FOR_SLUG: Record<string, TAppKey> = {
-  "iservice365-hygiene-mobile-app": "hygiene",
-  "iservice365-m-and-e-mobile-app": "mechanical-electrical",
-  "iservice365-pest-control-mobile-app": "pest-control",
-  "iservice365-pool-maintenance-mobile-app": "pool-maintenance",
-  "iservice365-landscaping-mobile-app": "landscaping",
-  "iservice365-landscape-mobile-app": "landscaping",
-};
-
-const SERVICE_APPS: TAppKey[] = [
-  "property-management",
-  "security",
-  "hygiene",
-  "mechanical-electrical",
-  "pest-control",
-  "landscaping",
-  "pool-maintenance",
-];
-
-/**
- * Site pages, `/<org>/<site>/<page>` in the service web apps, and which apps
- * have them. "any" = every service app has the page; the row's own app leads.
- */
-type TSitePage = { apps: TAppKey[] | "any"; page: (id: string) => string };
-const withId = (list: string) => (id: string) => (id ? `${list}/${id}` : list);
-const SITE_PAGES: Record<string, TSitePage[]> = {
-  workOrder: [{ apps: "any", page: withId("work-orders") }],
-  feedback: [{ apps: "any", page: withId("feedbacks") }],
-  bulletinBoard: [{ apps: "any", page: () => "bulletin-board" }],
-  inventory: [{ apps: "any", page: () => "inventory" }],
-  event: [{ apps: ["property-management"], page: () => "event-mgmt" }],
-  facilityBooking: [{ apps: ["property-management"], page: () => "facility-booking" }],
-  onlineForm: [{ apps: ["property-management"], page: () => "online-forms" }],
-  documentExpiry: [{ apps: ["property-management"], page: () => "document-mgmt" }],
-  emergencyContact: [{ apps: ["property-management"], page: () => "emergency-contacts" }],
-  incidentReport: [{ apps: ["security", "property-management"], page: withId("incident-reports") }],
-  visitors: [
-    { apps: ["security"], page: () => "visitor-management" },
-    { apps: ["property-management"], page: () => "visitor-mgmt" },
-  ],
-  virtualPatrol: [{ apps: ["security"], page: () => "virtual-patrol/logs" }],
-  cameraFault: [
-    { apps: ["security"], page: () => "virtual-patrol/cctv" },
-    { apps: ["property-management"], page: () => "cctv" },
-  ],
-  serviceProviderInviteAnswer: [
-    { apps: SERVICE_APPS.filter((a) => a !== "hygiene"), page: () => "service-providers" },
-  ],
-};
-SITE_PAGES.myVisitors = SITE_PAGES.visitors;
-
-/** Every kind the web can open, for tests and for anyone asking "is this clickable?". */
-export const WEB_TARGET_KINDS = [
-  ...Object.keys(SITE_PAGES),
-  "serviceProviderInvite",
-  VENDOR_ORDER_MODULE,
-  "robot",
-  "client",
-  "clientInvitation",
-];
-
-function sitePageTarget(
-  kind: string,
-  item: TTargetRow,
-  organization: string,
-  site: string,
-): TNotificationTarget | null {
-  const pages = SITE_PAGES[kind];
-  if (!pages || !organization || !site) return null;
-  const id = encodeURIComponent(String(item.params?.id ?? "").trim());
-  const home = APP_FOR_SLUG[String(item.appSlug ?? "")] ?? "property-management";
-  const base = `/${encodeURIComponent(organization)}/${encodeURIComponent(site)}/`;
-  const candidates: TCandidate[] = [];
-  for (const { apps, page } of pages) {
-    const list = apps === "any" ? [home, ...SERVICE_APPS.filter((a) => a !== home)] : apps;
-    for (const app of list) candidates.push({ app, path: base + page(id) });
-  }
-  return { candidates };
-}
-
-/** Seven365 staff pages, in the organisation app. */
-function staffTarget(kind: string, item: TTargetRow): TNotificationTarget | null {
-  const id = String(item.params?.id ?? "").trim();
-  if (kind === "robot") return { candidates: [{ app: "org", path: "/super-admin/robots" }] };
-  if (kind === "clientInvitation") {
-    return { candidates: [{ app: "org", path: "/super-admin/client-list" }] };
-  }
-  if (kind === "client") {
-    return id
-      ? { candidates: [{ app: "org", path: "/super-admin/client-details" }], query: { org: id } }
-      : { candidates: [{ app: "org", path: "/super-admin/client-list" }] };
-  }
-  return null;
-}
-
 export function notificationTarget(
   item: TTargetRow | null | undefined,
   context: TTargetContext = {},
 ): TNotificationTarget | null {
   const organization = String(context.organization ?? "").trim();
-  const kind = notificationKind(item);
-
-  if (kind === "serviceProviderInvite") {
-    // The invited company's organisation when the row names it (the invitation
-    // belongs there), otherwise the one on screen. The list on that page is
-    // keyed on the signed-in account, so either shows the invitation.
-    const org = String(item?.params?.org ?? "").trim() || organization;
-    if (!org) return null;
-    const id = String(item?.params?.id ?? "").trim();
-    const query: Record<string, string> = id ? { invite: id } : {};
-    return {
-      name: INVITATIONS_ROUTE,
-      params: { organization: org },
-      query,
-      app: "org",
-      path: `/org/${encodeURIComponent(org)}/client-invitations`,
-    };
-  }
-
-  if (!item) return null;
-  const staff = staffTarget(kind, item);
-  if (staff) return staff;
 
-  if (kind !== VENDOR_ORDER_MODULE) {
-    const site = String(item.siteId ?? item.params?.site ?? context.site ?? "").trim();
-    return sitePageTarget(kind, item, organization, site);
-  }
+  if (String(item?.module ?? "") !== VENDOR_ORDER_MODULE) return null;
 
   // Every order route is nested under the organization. Without one there is no
   // URL to build, and guessing an organization for somebody who belongs to
@@ -271,74 +66,10 @@ export function notificationTarget(
   if (!organization) return null;
 
   const id = String(item?.params?.id ?? "").trim();
-  const orders = `/org/${encodeURIComponent(organization)}/marketplace/orders`;
 
   // No id — an older row, or one whose params were dropped — still has an
   // honest destination: the queue the order is sitting in.
-  if (!id) {
-    return {
-      name: ORDER_QUEUE_ROUTE,
-      params: { organization },
-      candidates: [{ app: "org", path: orders }],
-    };
-  }
+  if (!id) return { name: ORDER_QUEUE_ROUTE, params: { organization } };
 
-  return {
-    name: ORDER_DETAIL_ROUTE,
-    params: { organization, id },
-    candidates: [{ app: "org", path: `${orders}/${encodeURIComponent(id)}` }],
-  };
-}
-
-/**
- * The full URL for a target whose page lives in another web app, or "" when
- * there is none to build (no path, or that app's URL is not configured).
- */
-export function externalTargetUrl(
-  target: TNotificationTarget | null | undefined,
-  appUrls: Partial<Record<TAppKey, string>> = {},
-): string {
-  const options: TCandidate[] = [
-    ...(target?.app && target.path ? [{ app: target.app, path: target.path }] : []),
-    ...(target?.candidates ?? []),
-  ];
-  const qs = new URLSearchParams(target?.query ?? {}).toString();
-  for (const { app, path } of options) {
-    const base = String(appUrls[app] ?? "").trim().replace(/\/+$/, "");
-    if (base) return `${base}${path}${qs ? `?${qs}` : ""}`;
-  }
-  return "";
-}
-
-/** What the bell does with a click: move inside this app, open another app, or nothing. */
-export type TNavigation =
-  | {
-      type: "route";
-      to: { name?: string; params?: Record<string, string>; path?: string; query?: Record<string, string> };
-    }
-  | { type: "href"; href: string }
-  | null;
-
-/**
- * This app's own page first — by route name, then by path (the site is in the
- * path, so opening it switches the site) — else the first app that has the
- * page and whose URL is configured. The page itself still checks the person may
- * see it: a link grants nothing.
- */
-export function chooseNavigation(
-  target: TNotificationTarget | null | undefined,
-  app: {
-    hasRoute: (name: string) => boolean;
-    hasPage: (path: string) => boolean;
-    appUrls?: Partial<Record<TAppKey, string>>;
-  },
-): TNavigation {
-  if (!target) return null;
-  if (target.name && app.hasRoute(target.name)) {
-    return { type: "route", to: { name: target.name, params: target.params, query: target.query } };
-  }
-  const local = target.candidates?.find((c) => app.hasPage(c.path));
-  if (local) return { type: "route", to: { path: local.path, query: target.query } };
-  const href = externalTargetUrl(target, app.appUrls);
-  return href ? { type: "href", href } : null;
+  return { name: ORDER_DETAIL_ROUTE, params: { organization, id } };
 }

package/utils/permission-labels.ts

@@ -55,31 +55,14 @@ export const RESOURCE_LABELS: Record<string, string> = {
   roles: "Roles and permissions",
 };
 
-/**
- * Names that differ BY APPLICATION, keyed by the role `type` the editor is
- * opened with. Only where one key means a different screen in one app.
- *
- * Owner approval 2026-09-25, item 2: in the Property Management editor the
- * `virtual-patrol` row is the CCTV camera wall (the four legacy strings
- * `useCameraViewPermission` and core `CAMERA_VIEW_PERMISSIONS` read), not the
- * Security app's Virtual Patrol. Label only: the key and every stored string
- * stay `virtual-patrol:*`, so every role that holds them keeps working.
- */
-export const RESOURCE_LABELS_BY_TYPE: Record<string, Record<string, string>> = {
-  property_management_agency: { "virtual-patrol": "CCTV" },
-  real_estate_developer: { "virtual-patrol": "CCTV" },
-};
-
 /**
  * `work_orders` -> `Work orders`.
  *
  * Sentence case, not Title Case: a list of 47 Title Cased phrases is harder to
  * scan, not easier.
  */
-export function formatResourceLabel(key: string, type?: string): string {
+export function formatResourceLabel(key: string): string {
   if (!key) return "";
-  const byType = type ? RESOURCE_LABELS_BY_TYPE[type]?.[key] : undefined;
-  if (byType) return byType;
   if (RESOURCE_LABELS[key]) return RESOURCE_LABELS[key];
 
   const words = key
@@ -132,12 +115,11 @@ export function formatActionLabel(action: string): string {
  */
 export function sortResourcesByLabel<T>(
   tree: Record<string, T> | null | undefined,
-  type?: string,
 ): Record<string, T> {
   if (!tree || typeof tree !== "object") return {};
   const sorted: Record<string, T> = {};
   for (const key of Object.keys(tree).sort((a, b) =>
-    formatResourceLabel(a, type).localeCompare(formatResourceLabel(b, type), undefined, {
+    formatResourceLabel(a).localeCompare(formatResourceLabel(b), undefined, {
       sensitivity: "base",
       numeric: true,
     }),