@7365admin1/layer-common 4.82.1-staging.476 → 4.83.0

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

@@ -1,9 +1,7 @@
 import { isPermissionRefusal } from "../utils/permission-refusal";
-import { accessSuspendedMessage, SIGNIN_NOTICE_COOKIE } from "../utils/access-suspended";
 
 export default defineNuxtPlugin((nuxtApp) => {
   const { cookieConfig } = useRuntimeConfig().public;
-  let signingOut = false;
 
   const api = $fetch.create({
     baseURL: "/",
@@ -34,20 +32,6 @@ export default defineNuxtPlugin((nuxtApp) => {
     // 401 + "You do not have permission ..." (vehicle writes and every other
     // `requireSiteReach` gate). See utils/permission-refusal.ts.
     onResponseError({ response }) {
-      // Every membership suspended (2026-10-01): the server already ended the
-      // session. Sign out here and let the sign-in page say why, once.
-      const suspended = accessSuspendedMessage((response as any)?._data);
-      if (suspended && import.meta.client && !signingOut) {
-        signingOut = true;
-        void nuxtApp.runWithContext(() => {
-          useCookie(SIGNIN_NOTICE_COOKIE, { ...cookieConfig, maxAge: 300 }).value = suspended;
-          for (const name of ["sid", "user", "organization"]) useCookie(name, cookieConfig).value = null;
-          const { APP_MAIN, APP_NAME } = useRuntimeConfig().public as Record<string, string>;
-          if (String(APP_NAME ?? "").toLowerCase() === "main" || !APP_MAIN) return navigateTo("/sign-in");
-          window.location.href = `${APP_MAIN}/sign-in`;
-        });
-        return;
-      }
       if (!isPermissionRefusal(response?.status, (response as any)?._data)) return;
       if (!import.meta.client) return;
       const refresh = (nuxtApp as any).$refreshAppRole;

package/types/attendance.d.ts

@@ -11,11 +11,9 @@ declare type TAttendance = {
 declare type TAttendanceCheckIn = {
   checkIn: {
     timestamp: string;
-    location?: TAttendanceLocation;
+    location: TAttendanceLocation;
     img?: string;
-    privatePhoto?: string;
   };
-  proxy?: TAttendanceProxy;
 };
 
 declare type TAttendanceCheckOut = {
@@ -37,14 +35,4 @@ declare type TAttendanceSettings = {
   location?: TAttendanceLocation;
   isGeofencingEnabled?: boolean;
   mile?: number;
-  /** Site device mode: one shared phone may check staff in/out (default OFF). */
-  siteDeviceMode?: boolean;
-};
-
-/** Who a Site device mode check-in is for. Never the full NRIC. */
-declare type TAttendanceProxy = {
-  name: string;
-  nricLast4: string;
-  nricPrefix?: string;
-  post?: string;
 };

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/member.d.ts

@@ -10,10 +10,6 @@ declare type TMember = {
   customerOrgId?: string;
   customerSiteId?: string;
   status?: string;
-  email?: string;
-  /** The building unit this member manages (a unit's Management tab). */
-  unit?: string | null;
-  unitName?: string;
   createdAt?: string;
   updatedAt?: string;
   deletedAt?: string;

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/types/service-provider.d.ts

@@ -7,11 +7,6 @@ declare type TServiceProvider = {
   serviceProviderOrgId: string;
   type: string;
   nature: string;
-  status?: string;
-  email?: string;
-  /** The building unit this provider serves (a unit's Management tab). */
-  unit?: string | null;
-  unitName?: string;
 };
 
 declare type TServiceProviderName = {

package/utils/notification-target.ts

@@ -45,7 +45,7 @@ export type TTargetRow = {
    * (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; storeId?: string } | null;
+  params?: { id?: string; org?: string; kind?: string; site?: string } | null;
 };
 
 /** What the surrounding app knows that the stored row does not. */
@@ -127,26 +127,9 @@ export function notificationKind(item: TTargetRow | null | undefined): string {
     return "";
   }
   if (module === "other") {
-    if (/(accepted|declined) your invitation$/i.test(title)) return "serviceProviderInviteAnswer";
-    // Inventory alerts sent before core had an inventory module were stored as "other".
-    return /request waiting|request (was )?(approved|rejected)|low (on )?stock|stock handed to you|hand-over (confirmed|declined)/i.test(title)
-      ? "inventory"
-      : "";
+    return /(accepted|declined) your invitation$/i.test(title) ? "serviceProviderInviteAnswer" : "";
   }
-  // Older rows spelled the work order module with a hyphen.
-  return module === "work-order" ? "workOrder" : module;
-}
-
-/**
- * Which inventory tab an alert is about. Alerts carry the store id but no tab,
- * so the tab follows the alert's fixed title (API-core inventory-notify.service)
- * - the same rule the mobile apps use. Values are the web tabs' own names.
- */
-export function inventoryTabForAlert(title: string): "requests" | "stock" | "mine" | "" {
-  if (/stock handed to you|hand-over (confirmed|declined)/i.test(title)) return "mine";
-  if (/request waiting|request (was )?(approved|rejected)/i.test(title)) return "requests";
-  if (/low (on )?stock/i.test(title)) return "stock";
-  return "";
+  return module;
 }
 
 /**
@@ -199,8 +182,6 @@ const SITE_PAGES: Record<string, TSitePage[]> = {
     { apps: ["security"], page: () => "virtual-patrol/cctv" },
     { apps: ["property-management"], page: () => "cctv" },
   ],
-  // A robot at the site raised an alarm (core safety alert, category robotAlert).
-  robotAlert: [{ apps: ["security", "property-management", "hygiene"], page: () => "robot-management/alerts" }],
   // hygiene has its Service Providers page too since 2026-09-28
   serviceProviderInviteAnswer: [{ apps: SERVICE_APPS, page: () => "service-providers" }],
 };
@@ -233,12 +214,7 @@ function sitePageTarget(
     const list = apps === "any" ? [home, ...SERVICE_APPS.filter((a) => a !== home)] : apps;
     for (const app of list) candidates.push({ app, path: base + page(id) });
   }
-  if (kind !== "inventory") return { candidates };
-  // Open the alert's own store on the tab it is about (InventoryMain reads ?storeId=&tab=).
-  const storeId = String(item.params?.storeId ?? item.params?.id ?? "").trim();
-  const tab = inventoryTabForAlert(String(item.title ?? ""));
-  const query: Record<string, string> = { ...(storeId ? { storeId } : {}), ...(tab ? { tab } : {}) };
-  return Object.keys(query).length ? { candidates, query } : { candidates };
+  return { candidates };
 }
 
 /** Seven365 staff pages, in the organisation app. */
@@ -318,21 +294,6 @@ export function notificationTarget(
   };
 }
 
-/** Kinds that only the iService365 phone apps can open (residents' own screens). */
-const PHONE_ONLY_KINDS = new Set(["prelovedMarketplace", "marketplace-order"]);
-
-/**
- * What the bell says when a click has nowhere to go, so a click is never a
- * silent nothing. A link grants nothing either way: the page opened still
- * checks the person may see it.
- */
-export function noTargetMessage(item: TTargetRow | null | undefined): string {
-  if (PHONE_ONLY_KINDS.has(notificationKind(item))) {
-    return "This notification opens in the iService365 app on your phone.";
-  }
-  return "There is no page to open for this notification here. It has been marked as read.";
-}
-
 /**
  * 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).

package/utils/role.ts

@@ -9,19 +9,6 @@
 export const showSiteField = (siteState: boolean, type: string): boolean =>
   siteState && type !== "admin";
 
-/**
- * A role's name with its site, "Admin · St. Regis Residences" (owner
- * 2026-10-01: role names are unique per SITE, so two sites may both have an
- * "Admin" - two independent roles - and every list that can show both must
- * say which is which). Organisation-level roles (no site) show the name alone.
- * `siteName` comes from the role list (`GET /api/roles`, core 2026-10-01).
- */
-export function roleLabel(role: { name?: unknown; siteName?: unknown; site?: unknown } | null | undefined): string {
-  const name = typeof role?.name === "string" ? role.name : "";
-  const site = typeof role?.siteName === "string" ? role.siteName.trim() : "";
-  return role?.site && site ? `${name} · ${site}` : name;
-}
-
 /**
  * The Assign Role picker's list, with the member's CURRENT role always in it.
  *
@@ -63,13 +50,13 @@ export function memberRoleChip(
   const limited = limitedSites(item);
   if (orgLevel && limited.length) {
     return {
-      text: limited.map((l) => `${l.roleName || "No role"} · ${l.siteName || "a site"}`).join(", "),
+      text: limited.map((l) => `${l.roleName || "No role"} (${l.siteName || "a site"})`).join(", "),
       tone: "info",
     };
   }
   if (orgLevel && item?.roleState === "other-site") {
     const site = typeof item?.roleSiteName === "string" && item.roleSiteName ? item.roleSiteName : "";
-    return { text: site ? `${name || "Role"} · ${site}` : name || "Role", tone: "info" };
+    return { text: site ? `${name || "Role"} (${site})` : name || "Role", tone: "info" };
   }
   switch (item?.roleState) {
     case "missing":