@7365admin1/layer-common 4.90.2-staging.491 → 4.90.3

package/composables/useMember.ts

@@ -70,8 +70,6 @@ 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 };
@@ -85,7 +83,6 @@ export default function useMember() {
     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 +158,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 +226,6 @@ export default function useMember() {
     undoCrossSiteRoleFix,
     getSiteAccess,
     saveSiteAccess,
-    updateMemberUnit,
     members,
     member,
     page,

package/composables/useNFCPatrolReportFilters.ts

@@ -31,27 +31,9 @@ export function useNFCPatrolReportFilters(site: string) {
     loading.value = true;
 
     try {
-      // Deleted routes too, labelled, so their past patrols can still be
-      // reported on. An API from before route deletion refuses the parameter
-      // with a 400: ask again without it, and the list is what it was.
-      const response = await getPatrolRoutes({
-        site,
-        page: 1,
-        limit: 100,
-        includeDeleted: true,
-      }).catch((error: any) => {
-        const status = Number(error?.statusCode ?? error?.response?.status ?? 0);
-        if (status !== 400) throw error;
-        return getPatrolRoutes({ site, page: 1, limit: 100 });
-      });
-      const items: Array<Record<string, any>> = response.items ?? [];
-      const isDeleted = (route: Record<string, any>) => route.status === "Deleted";
-      // Routes still in use first, so the report opens on one of them.
-      const routes = [
-        ...items.filter((route) => !isDeleted(route)),
-        ...items.filter(isDeleted),
-      ].map((route) => ({
-        title: isDeleted(route) ? `${route.name} (deleted)` : route.name,
+      const response = await getPatrolRoutes({ site, page: 1, limit: 100 });
+      const routes = (response.items ?? []).map((route: Record<string, any>) => ({
+        title: route.name,
         value: route._id,
         startTimes: route.startTimes ?? [],
       }));

package/composables/useNFCPatrolRoute.ts

@@ -4,24 +4,17 @@ export default function useNFCPatrolRoute() {
     limit = 20,
     site = "",
     search = "",
-    includeDeleted = false,
   } = {}) {
     const query: Record<string, any> = {
       page,
       limit,
       site,
     };
-
+    
     // Only include search parameter if it has a value
     if (search) {
       query.search = search;
     }
-
-    // Deleted routes are left out unless asked for; only the patrol log
-    // report's route picker asks, so their past patrols stay reachable.
-    if (includeDeleted) {
-      query.includeDeleted = true;
-    }
     
     return useNuxtApp().$api<Record<string, any>>(`/api/nfc-patrol-route`, {
       method: "GET",

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,21 +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;
-  /**
-   * The person's user account. Anything acting on the PERSON needs this rather
-   * than `_id`, which identifies the membership: an access card carries it as
-   * `userId`, and HID reader access is bound by it -
-   * `resolvePermissionUserBindings` drops every subject without one.
-   *
-   * Returned from core 3.130. Before that the repository projected it and the
-   * service layer dropped it, so against an older API it is absent on every
-   * row - `providerAccountsKnown` is how the HID enrolment screen tells the two
-   * apart rather than reading an absence as "nobody has an account".
-   */
-  user?: string | null;
 };
 
 export type TSiteProviderCompany = {
@@ -105,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",
@@ -119,7 +102,6 @@ export default function useServiceProvider() {
         siteId,
         ...(status ? { status } : {}),
         ...(include ? { include } : {}),
-        ...(unit ? { unit } : {}),
       },
     });
   }
@@ -287,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 = "",
@@ -322,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,
@@ -361,7 +320,6 @@ export default function useServiceProvider() {
 
   return {
     getSiteMembers,
-    updateSiteMemberUnit,
     exportSiteMembers,
     serviceProviders,
     serviceProvider,
@@ -380,7 +338,6 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
-    updateUnit,
     getByEmail,
   };
 }

package/composables/useSettingsPermission.ts

@@ -122,19 +122,6 @@ export function useSettingsPermission() {
     );
   });
 
-  // Vehicle QR stickers switch: whoever may update vehicles (same grant the
-  // server checks on PUT /api/vehicles/qr/settings/site/:site).
-  const vehiclePermissions: TPermissions = {
-    "vehicle-mgmt": {
-      "update-vehicle": { check: true, description: "Allows the user to update vehicle details." },
-    },
-  };
-  const canManageVehicleQr = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, vehiclePermissions, "vehicle-mgmt", "update-vehicle");
-  });
-
   const canManageSiteSettings = computed(() => {
     return canManageSiteInformation.value || canManageANPRCamera.value || canManageCCTVCamera.value || canManageDeliveryCompanies.value || canManageResidentVisitors.value || canManageWorkOrderSettings.value || canManageBillingAndSOAConfiguration.value || canManageNFCManagement.value || canManageNFCPatrolSettings.value || canManageEntryPass.value || canManageRedDotSettings.value
   })
@@ -151,7 +138,6 @@ export function useSettingsPermission() {
     canManageNFCPatrolSettings,
     canManageEntryPass,
     canManageRedDotSettings,
-    canManageVehicleQr,
     canManageSiteSettings
 
   };

package/composables/useUser.ts

@@ -1,5 +1,3 @@
-import { inviteSitePayload } from "../utils/invite-sites";
-
 export default function useUser() {
   function inviteUser({
     email = "",
@@ -67,10 +65,7 @@ export default function useUser() {
     org = "",
     site = "",
     siteName = "",
-    sites = [] as string[],
   } = {}) {
-    // `sites` = the several chosen sites; the old single `site` still works.
-    const chosen = sites.length ? sites : site ? [site] : [];
     return useNuxtApp().$api<Record<string, any>>("/api/auth/invite/member", {
       method: "POST",
       body: {
@@ -79,7 +74,8 @@ export default function useUser() {
         role,
         name,
         org,
-        ...inviteSitePayload(chosen, siteName),
+        ...(site && { siteId: site }),
+        ...(siteName && { siteName }),
       },
     });
   }

package/composables/useVehicle.ts

@@ -272,41 +272,6 @@ function getSpecificVehicleById(id: string){
 }
 
 
-  // Vehicle QR stickers (core vehicle-qr). Per-site switch, bulk sticker data,
-  // and re-issue (the old sticker stops working).
-  function getVehicleQrSettings(site: string) {
-    return useNuxtApp().$api<{ site: string; enabled: boolean }>(
-      `/api/vehicles/qr/settings/site/${site}`,
-      { method: "GET" },
-    );
-  }
-
-  function setVehicleQrSettings(site: string, enabled: boolean) {
-    return useNuxtApp().$api<{ site: string; enabled: boolean }>(
-      `/api/vehicles/qr/settings/site/${site}`,
-      { method: "PUT", body: { enabled } },
-    );
-  }
-
-  function getVehicleQrStickers(site: string, vehicleIds: string[]) {
-    return useNuxtApp().$api<{
-      site: { _id: string; name: string };
-      items: Array<Record<string, any>>;
-      missing: string[];
-    }>("/api/vehicles/qr/stickers", {
-      method: "POST",
-      body: { site, vehicleIds },
-    });
-  }
-
-  function regenerateVehicleQr(id: string) {
-    return useNuxtApp().$api<{ vehicleId: string; qr: string; token: string }>(
-      `/api/vehicles/qr/regenerate/id/${id}`,
-      { method: "PUT" },
-    );
-  }
-
-
   return {
     getVehicles,
     addVehicle,
@@ -325,10 +290,6 @@ function getSpecificVehicleById(id: string){
     getActiveCameraCounts,
     syncVehicle,
     searchMultipleVehiclesByUnitId,
-    getSpecificVehicleById,
-    getVehicleQrSettings,
-    setVehicleQrSettings,
-    getVehicleQrStickers,
-    regenerateVehicleQr,
+    getSpecificVehicleById
   };
 }

package/composables/useVerification.ts

@@ -11,8 +11,6 @@ export default function useVerification() {
     limit = 20,
     // "seven365": only the invitations Seven365 sent (the console's lists).
     origin = "",
-    // true: one entry per multi-site invitation group, with its `sites`.
-    group = false,
   } = {}): Promise<{
     items: TMiniVerification[];
     pages: number;
@@ -24,7 +22,6 @@ export default function useVerification() {
         status, search, page, type, email, app, siteId, orgId, limit,
         // Sent only when asked for: an older API refuses a key it does not know.
         ...(origin && { origin }),
-        ...(group && { group: "true" }),
       },
     });
   }

package/middleware/01.auth.ts

@@ -4,9 +4,13 @@ export default defineNuxtRouteMiddleware(async (route) => {
   // Get access token from cookies
   const sid = useCookie("sid", cookieConfig).value;
 
-  // No longer saves `?email=` as a browser-wide `service-provider-email` cookie
-  // (30 days): nothing reads it, and a leftover from another account sent the
-  // org app's sign-in to that account's create page.
+  const serviceProviderEmail = (route.query.email as string) ?? "";
+
+
+  if (serviceProviderEmail) {
+    useCookie("service-provider-email", cookieConfig).value =
+      serviceProviderEmail;
+  }
 
   if (!sid) {
     // Redirect to login page if no access token

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.90.2-staging.491",
+  "version": "4.90.3",
   "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/inventory.d.ts

@@ -105,12 +105,6 @@ declare type TInventoryTransaction = {
   location?: { type: "common_area" | "tenant_unit"; area?: string; unit?: string; unitName?: string; tenantName?: string };
   reference?: string;
   supplier?: string;
-  /** Receiving (2026-10): missing on older rows = PO. */
-  receivingType?: "PO" | "DO" | "CASH";
-  doNumber?: string;
-  doDate?: string | null;
-  receiptNumber?: string;
-  poOrderedQty?: number | null;
   unitCost: number;
   totalCost: number;
   photos?: { before: string[]; after: string[]; other: string[] };
@@ -170,24 +164,3 @@ declare type TInventoryHandover = {
   createdAt: string;
   decidedAt?: string;
 };
-
-/** GET /stores/:id/reports/purchase-order: one item of a PO, ordered (null = not recorded) vs received. */
-declare type TInventoryPoLine = {
-  item: string;
-  itemName: string;
-  unit: string;
-  ordered: number | null;
-  received: number;
-  outstanding: number | null;
-  deliveries: {
-    _id: string;
-    date: string;
-    qty: number;
-    receivingType: "PO" | "DO" | "CASH";
-    doNumber: string;
-    doDate: string | null;
-    receiptNumber: string;
-    supplier: string;
-    receivedBy: string;
-  }[];
-};

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

@@ -5,10 +5,7 @@ declare type THidQrCodeFormat = "0" | "1" | "2";
 declare type THidPermissionCategory =
   | "resident"
   | "property_management"
-  /** A provider COMPANY - granting one admits every active member of that org. */
-  | "service_provider"
-  /** ONE PERSON from a provider company, by their membership at this site. */
-  | "service_provider_member";
+  | "service_provider";
 
 declare type THidPermissionAssignment = {
   subjectId: string;
@@ -30,10 +27,7 @@ declare type THidSitePermissions = {
   counts: {
     resident: number;
     propertyManagement: number;
-    /** Provider COMPANIES granted. */
     serviceProvider: number;
-    /** Named provider people granted. Counted apart from the companies. */
-    serviceProviderMember: number;
     intercom: number;
   };
 };