@7365admin1/layer-common 4.73.1-staging.456 → 4.74.0

package/composables/useHidAmico.ts

@@ -28,22 +28,6 @@ export type HidReaderPayload = {
   lastCallbackType?: string;
 };
 
-export type HidProfileQr = {
-  readerId: string;
-  userId: string;
-  memberId: string;
-  hidUserId: string;
-  registration: string;
-  readerName: string;
-  portalName: string;
-  qrEnabled: boolean;
-  issued: boolean;
-  qrValue: string;
-  issuedAt: string;
-  /** null when the permission lookup itself failed, so "unknown" stays distinct from "no". */
-  assigned: boolean | null;
-};
-
 type HidIdentityPayload = {
   site?: string;
   hidUserId?: string | number;
@@ -155,28 +139,6 @@ export type HidSipAccountData = {
   provisionedAt: string;
 };
 
-/** One row of the site's SIP account list - who owns the extension, never its password. */
-export type HidSipAccountListItem = {
-  _id: string;
-  userId: string;
-  name: string;
-  email: string;
-  /**
-   * What the owner is called after their name on the contact list: their
-   * "Blk 1/Level 1/Unit 1" when they live here, and their membership type -
-   * "Security Agency" - when they do not. "" only when the site knows neither.
-   *
-   * Optional because an API still on the `@7365admin1/core` release that
-   * predates it answers without the field; the contact picker falls back to the
-   * bare name rather than showing a dangling separator.
-   */
-  unitLabel?: string;
-  extension: string;
-  username: string;
-  status: string;
-  provisionedAt: string;
-};
-
 /**
  * True only for the specific validation error an API that predates core #1878
  * returns when the discover body carries `site`. Deliberately narrow: after
@@ -204,36 +166,6 @@ export default function useHidAmico() {
     });
   }
 
-  /**
-   * The signed-in member's own QR code on one reader.
-   *
-   * No user id in the path: the server takes the caller from the session, so
-   * these cannot be pointed at somebody else. `assigned` in the response says
-   * whether the HID permissions screen actually admits this member to the
-   * reader - issuing a code does not grant access, and the screen has to be
-   * able to say so.
-   */
-  function getProfileQr(readerId: string) {
-    return useNuxtApp().$api<{ data: HidProfileQr }>(
-      `${basePath}/readers/${readerId}/profile-qr`,
-      { method: "GET" },
-    );
-  }
-
-  function issueProfileQr(readerId: string) {
-    return useNuxtApp().$api<{ data: HidProfileQr }>(
-      `${basePath}/readers/${readerId}/profile-qr`,
-      { method: "POST" },
-    );
-  }
-
-  function deleteProfileQr(readerId: string) {
-    return useNuxtApp().$api<{ data: HidProfileQr }>(
-      `${basePath}/readers/${readerId}/profile-qr`,
-      { method: "DELETE" },
-    );
-  }
-
   function createReader(payload: HidReaderPayload) {
     return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers`, {
       method: "POST",
@@ -325,36 +257,6 @@ export default function useHidAmico() {
     });
   }
 
-  /**
-   * Which credentials a reader accepts at the door.
-   *
-   * Separate from `setReaderConfiguration` on purpose. That one is the generic
-   * configuration endpoint, gated by an allowlist of writable objects; this is
-   * a dedicated route that validates the four methods against the reader's own
-   * `capabilities` and confirms the write by reading the device back, so a
-   * refusal here names the credential the hardware would not take.
-   */
-  function setReaderIdentificationMethods(readerId: string, payload: HidApiRecord) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/identification-methods`,
-      { method: "PUT", body: payload },
-    );
-  }
-
-  /**
-   * Put a reader back to the settings iService holds for it.
-   *
-   * A POST rather than a GET because it WRITES: reading the reader's
-   * configuration is only the first half, and anything that drifted is
-   * re-applied before this returns.
-   */
-  function reconcileReaderIdentificationMethods(readerId: string) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/identification-methods/reconcile`,
-      { method: "POST" },
-    );
-  }
-
   function getIdentities(readerId: string, query: HidApiRecord = {}) {
     return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/identities`, {
       method: "GET",
@@ -512,27 +414,6 @@ export default function useHidAmico() {
     );
   }
 
-  function getUserPasswordStatus(readerId: string, hidUserId: string | number) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/users/${hidUserId}/password`,
-      { method: "GET" },
-    );
-  }
-
-  function setUserPassword(readerId: string, hidUserId: string | number, password: string) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/users/${hidUserId}/password`,
-      { method: "PUT", body: { password } },
-    );
-  }
-
-  function deleteUserPassword(readerId: string, hidUserId: string | number) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/users/${hidUserId}/password`,
-      { method: "DELETE" },
-    );
-  }
-
   function deleteUserPin(readerId: string, hidUserId: string | number) {
     return useNuxtApp().$api<{ data: { pinEnrolled: boolean } }>(
       `${basePath}/readers/${readerId}/users/${hidUserId}/pin`,
@@ -593,42 +474,6 @@ export default function useHidAmico() {
     );
   }
 
-  /**
-   * The site's SIP accounts for the intercom contact picker. Site-scoped only:
-   * the organisation never decided who may read this — the site guard does —
-   * and sending one narrowed the list on a customer site whose accounts were
-   * provisioned by a managing agent.
-   */
-  function getSipAccounts(siteId: string) {
-    return useNuxtApp().$api<{ data: HidSipAccountListItem[] }>(
-      `${basePath}/sites/${siteId}/intercom/sip-accounts`,
-      { method: "GET" },
-    );
-  }
-
-  /**
-   * Wake the resident's phone for a call the web phone has just placed.
-   *
-   * The SIP INVITE is the call and travels over the WebSocket, not through the
-   * API; this only rings the resident's mobile so somebody is there to answer
-   * it. It is therefore fired after the INVITE and never awaited in a way that
-   * could fail the call — see `startWebCall` in `HidIntercomManagement.vue`.
-   *
-   * `notified: false` with a reason is a normal response, not an error: staff
-   * extensions and external SIP addresses have no resident behind them.
-   */
-  function notifyIntercomCall(
-    siteId: string,
-    payload: { orgId: string; destination: string; callId: string; readerId?: string },
-  ) {
-    return useNuxtApp().$api<{
-      data: { notified: boolean; delivered?: number; reason?: string };
-    }>(
-      `${basePath}/sites/${siteId}/intercom/notify-call`,
-      { method: "POST", body: payload },
-    );
-  }
-
   function getPermissionCandidates(
     siteId: string,
     query: {
@@ -660,9 +505,6 @@ export default function useHidAmico() {
 
   return {
     getReaders,
-    getProfileQr,
-    issueProfileQr,
-    deleteProfileQr,
     discoverReader,
     createReader,
     updateReader,
@@ -677,8 +519,6 @@ export default function useHidAmico() {
     issueVisitorQr,
     getReaderConfiguration,
     setReaderConfiguration,
-    setReaderIdentificationMethods,
-    reconcileReaderIdentificationMethods,
     getLogs,
     setUserImage,
     deleteUserImage,
@@ -690,9 +530,6 @@ export default function useHidAmico() {
     getUserPinStatus,
     setUserPin,
     deleteUserPin,
-    getUserPasswordStatus,
-    setUserPassword,
-    deleteUserPassword,
     getIdentities,
     getReaderUsers,
     getReaderAccessLogs,
@@ -703,8 +540,6 @@ export default function useHidAmico() {
     makeIntercomCall,
     finalizeIntercomCall,
     ensureSipAccount,
-    getSipAccounts,
-    notifyIntercomCall,
     getSitePermissions,
     getPermissionCandidates,
     updateSitePermissions,

package/composables/useHidNavigation.ts

@@ -46,33 +46,9 @@ export default function useHidNavigation() {
           },
         },
         {
-          // "HID Reader Users" now points at `access-mgmt/administrator`, not at
-          // `access-mgmt/hid-users`.
-          //
-          // Both routes mount a roster of the reader's users, but only this one
-          // can act on them. `administrator` renders HidUserEnrollment WITHOUT
-          // `card-management`, and that prop is what gates the Enroll action:
-          //   <template v-if="!props.cardManagement" #actions>
-          // `hid-users` renders HidReaderUserRoster, which is read-only apart
-          // from PIN management. So the menu entry with this name used to lead
-          // to the screen that cannot enrol, while the screen that can was
-          // reachable only by typing the URL.
-          //
-          // `hid-users` is left in place and simply unlisted - the same state
-          // `administrator` was in - so any existing link to it still resolves.
           title: "HID Reader Users",
           route: {
-            name: "org-site-access-mgmt-administrator",
-            params: { org, site },
-          },
-        },
-        {
-          // The signed-in member's own pass, not somebody else's. Every other
-          // entry in this group acts on a resident or a visitor; this one has
-          // no subject but the caller.
-          title: "HID QR Code",
-          route: {
-            name: "org-site-access-mgmt-hid-qr-code",
+            name: "org-site-access-mgmt-hid-users",
             params: { org, site },
           },
         },

package/composables/useMember.ts

@@ -70,22 +70,15 @@ export default function useMember() {
     status = "active",
     siteId = "",
     roleState = "",
-    /** A building unit id, or "none": members on no unit yet. */
-    unit = "",
-    people = false,
   } = {}) {
     const query: Record<string, any> = { page, limit, type, status };
 
-    // Organization app Members: every person, site-limited ones as one row
-    // with `limitedTo` (core 2026-09-29). Only sent when asked for.
-    if (people) query.people = 1;
     if (search) query.search = search;
     // "other-site": only members holding a role pinned to another site.
     if (roleState) query.roleState = roleState;
     if (user) query.user = user;
     if (org) query.org = org;
     if (siteId) query.siteId = siteId;
-    if (unit) query.unit = unit;
     return useNuxtApp().$api<Record<string, any>>("/api/members", {
       method: "GET",
       query,
@@ -161,14 +154,6 @@ export default function useMember() {
     });
   }
 
-  /** Attach a member to a building unit, or detach them (`unit` ""). */
-  function updateMemberUnit(id: string, unit: string) {
-    return useNuxtApp().$api<Record<string, any>>("/api/members/unit", {
-      method: "PUT",
-      body: { id, unit },
-    });
-  }
-
   function getByUserTypeOrg(user: string, type: string, org: string) {
     return useNuxtApp().$api<TMember>(
       `/api/members/user/${user}/app/${type}/org`,
@@ -237,7 +222,6 @@ export default function useMember() {
     undoCrossSiteRoleFix,
     getSiteAccess,
     saveSiteAccess,
-    updateMemberUnit,
     members,
     member,
     page,

package/composables/usePeople.ts

@@ -115,24 +115,6 @@ export default function () {
     });
   }
 
-  /**
-   * The blocks, levels and units at a site that actually have an occupant.
-   * The other half of the unit picker: this narrows the cascade, then
-   * `getPeopleByUnit` answers "which person in this unit?".
-   */
-  async function getOccupiedStructure(
-    site: string,
-    { type = "", status = "active", block = "", level = "" } = {}
-  ) {
-    return await useNuxtApp().$api<Record<string, any>>(
-      `/api/people/site/${site}/occupied-structure`,
-      {
-        method: "GET",
-        query: { type, status, block, level },
-      }
-    );
-  }
-
   async function getPeopleByUnit(
     _id: string,
     { status = "active", type = "" } = {}
@@ -166,7 +148,6 @@ export default function () {
     findPersonByPlateNumberMultipleResult,
     findPersonByContact,
     getPeopleByUnit,
-    getOccupiedStructure,
     searchCompanyList,
     findUsersByPlateNumber,
     reviewResidentPerson,

package/composables/useServiceProvider.ts

@@ -15,9 +15,6 @@ export type TSiteProviderMember = {
   lastLoginAt?: string | null;
   /** a subcontractor: the provider that brought its company onto the site */
   invitedVia?: string;
-  /** The building unit this person is attached to (a unit's Management tab). */
-  unit?: string | null;
-  unitName?: string;
 };
 
 export type TSiteProviderCompany = {
@@ -93,8 +90,6 @@ export default function useServiceProvider() {
     status = "",
     /** "engagements": also providers engaged through an accepted invitation. */
     include = "",
-    /** A building unit id, or "none": providers on no unit yet. */
-    unit = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/service-providers", {
       method: "GET",
@@ -107,7 +102,6 @@ export default function useServiceProvider() {
         siteId,
         ...(status ? { status } : {}),
         ...(include ? { include } : {}),
-        ...(unit ? { unit } : {}),
       },
     });
   }
@@ -275,17 +269,6 @@ export default function useServiceProvider() {
     );
   }
 
-  /** Attach a provider to a building unit, or detach it (`unit` ""). */
-  async function updateUnit(id: string, unit: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/service-providers/${id}/unit`,
-      {
-        method: "PATCH",
-        body: { unit },
-      }
-    );
-  }
-
    async function getByEmail({
     email = "",
     orgId = "",
@@ -310,29 +293,17 @@ export default function useServiceProvider() {
    * Members > Service Providers: the provider people with access to this
    * site, and one entry per provider company with its head count. The
    * site's own organisation only - the server refuses anyone else.
-   * `unit`: a building unit id, or "none" (people on no unit yet).
    */
-  function getSiteMembers(siteId: string, unit = ""): Promise<{
+  function getSiteMembers(siteId: string): Promise<{
     items: TSiteProviderMember[];
     companies: TSiteProviderCompany[];
   }> {
     return useNuxtApp().$api("/api/service-providers/site-members", {
       method: "GET",
-      query: { siteId, ...(unit ? { unit } : {}) },
+      query: { siteId },
     });
   }
 
-  /** Attach one of those people to a building unit, or detach them (`unit` ""). */
-  function updateSiteMemberUnit(id: string, unit: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/service-providers/site-members/${id}/unit`,
-      {
-        method: "PATCH",
-        body: { unit },
-      }
-    );
-  }
-
   /** The same list as an Excel file, under the same filters. */
   function exportSiteMembers(
     siteId: string,
@@ -349,7 +320,6 @@ export default function useServiceProvider() {
 
   return {
     getSiteMembers,
-    updateSiteMemberUnit,
     exportSiteMembers,
     serviceProviders,
     serviceProvider,
@@ -368,7 +338,6 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
-    updateUnit,
     getByEmail,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.73.1-staging.456",
+  "version": "4.74.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.",

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/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/role.ts

@@ -36,28 +36,12 @@ export function withCurrentRole<T extends { _id?: unknown; name?: unknown }>(
  * a member showed "Security" and Assign Role could not fix it). Rows from an
  * older server carry no `roleState` and render exactly as before.
  */
-export function memberRoleChip(
-  item: {
-    roleName?: unknown;
-    roleState?: unknown;
-    roleSiteName?: unknown;
-    limitedTo?: unknown;
-  },
-  /** The Organization app's Members list: there is no "this site" there. */
-  orgLevel = false,
-): { text: string; tone: "info" | "warn" } | null {
+export function memberRoleChip(item: {
+  roleName?: unknown;
+  roleState?: unknown;
+  roleSiteName?: unknown;
+}): { text: string; tone: "info" | "warn" } | null {
   const name = typeof item?.roleName === "string" ? item.roleName : "";
-  const limited = limitedSites(item);
-  if (orgLevel && limited.length) {
-    return {
-      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" };
-  }
   switch (item?.roleState) {
     case "missing":
       return { text: "No role assigned - assign one", tone: "warn" };
@@ -82,14 +66,9 @@ export function memberRoleChip(
  * re-assign a role for the right site, nobody's access is cut). `null` at 0 so
  * the banner disappears once every member here has this site's role.
  */
-export function otherSiteBannerText(count: unknown, orgLevel = false): string | null {
+export function otherSiteBannerText(count: unknown): string | null {
   const n = typeof count === "number" && Number.isFinite(count) ? Math.floor(count) : 0;
   if (n <= 0) return null;
-  if (orgLevel) {
-    return n === 1
-      ? "1 member holds a role created for one particular site. Fix roles from other sites gives them the right role."
-      : `${n} members hold a role created for one particular site. Fix roles from other sites gives each one the right role.`;
-  }
   return n === 1
     ? "1 member here has a role from another site. Assign them a role for this site."
     : `${n} members here have a role from another site. Assign each one a role for this site.`;
@@ -116,19 +95,3 @@ export function safeReturnTo(value: unknown): string {
   const path = Array.isArray(value) ? value[0] : value;
   return typeof path === "string" && /^\/(?!\/)[^\s\\]*$/.test(path) ? path : "";
 }
-
-type TLimitedSite = { siteId?: string; siteName?: string; roleName?: string };
-
-/** The sites a site-limited person may open (server `limitedTo`; org Members). */
-export function limitedSites(item: { limitedTo?: unknown } | null | undefined): TLimitedSite[] {
-  return Array.isArray(item?.limitedTo) ? (item!.limitedTo as TLimitedSite[]) : [];
-}
-
-/**
- * The Organization app's Members "Sites" cell (owner report 2026-09-29, Aigle
- * / Kanesan): a person limited to sites stays on the list and says where.
- */
-export function siteAccessLabel(item: { limitedTo?: unknown } | null | undefined): string {
-  const names = limitedSites(item).map((l) => l.siteName || "a site");
-  return names.length ? `Limited to: ${names.join(", ")}` : "All sites";
-}