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

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,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/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.75.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

@@ -82,14 +82,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.`;

package/components/BuildingUnitManagement.vue

@@ -1,298 +0,0 @@
-<template>
-  <v-card width="100%">
-    <v-expansion-panels v-model="panels" variant="accordion" multiple>
-      <v-expansion-panel v-for="section in sections" :key="section.key" :value="section.key">
-        <v-expansion-panel-title class="bg-primary">
-          <span>{{ section.title }} ({{ section.items.length }})</span>
-          <v-spacer />
-          <!-- @click.stop: the button sits in the panel header, so a click must
-               not also open or close the panel. -->
-          <v-btn v-if="canUpdate" size="small" variant="tonal" class="text-none mr-4" prepend-icon="mdi-plus"
-            @click.stop="openAdd(section.key)">
-            Add
-          </v-btn>
-        </v-expansion-panel-title>
-
-        <v-expansion-panel-text>
-          <v-progress-linear v-if="section.loading" indeterminate color="primary" />
-          <v-list v-if="section.items.length" density="compact" class="bg-transparent">
-            <v-list-item v-for="item in section.items" :key="item._id" :title="item.name"
-              :subtitle="section.subtitle(item)">
-              <template v-if="canUpdate" #append>
-                <v-btn icon="mdi-close" size="small" variant="text" :loading="removing === item._id"
-                  :aria-label="`Remove ${item.name} from this unit`" @click="confirmRemove(section.key, item)" />
-              </template>
-            </v-list-item>
-          </v-list>
-          <p v-else-if="!section.loading" class="font-weight-semibold text-caption ml-2 mt-5">
-            **No {{ section.empty }} to display**
-          </p>
-        </v-expansion-panel-text>
-      </v-expansion-panel>
-    </v-expansion-panels>
-
-    <p v-if="message" class="text-center text-subtitle-2 font-weight-medium text-error mt-4">
-      {{ message }}
-    </p>
-
-    <v-dialog v-model="removeDialog" width="450" persistent>
-      <v-card width="100%">
-        <v-toolbar density="compact" class="pl-4">
-          <span class="font-weight-medium text-h5">
-            Remove {{ pendingRemove?.section === "members" ? "Management" : "Service Provider" }}
-          </span>
-        </v-toolbar>
-
-        <v-card-text>
-          <p class="text-subtitle-2 text-center">
-            Are you sure you want to remove <strong>{{ pendingRemove?.name }}</strong> from this unit?
-          </p>
-        </v-card-text>
-
-        <v-toolbar density="compact">
-          <v-row no-gutters>
-            <v-col cols="6">
-              <v-btn tile block size="48" variant="text" class="text-none" :disabled="!!removing"
-                @click="removeDialog = false">
-                Cancel
-              </v-btn>
-            </v-col>
-            <v-col cols="6">
-              <v-btn tile block size="48" color="primary-button" variant="flat" class="text-none"
-                :loading="!!removing" @click="remove">
-                Remove
-              </v-btn>
-            </v-col>
-          </v-row>
-        </v-toolbar>
-      </v-card>
-    </v-dialog>
-
-    <v-dialog v-model="addDialog" width="520" persistent>
-      <v-card>
-        <v-toolbar density="compact" class="pl-4">
-          <span class="font-weight-medium text-h6">Add {{ adding === "members" ? "Management" : "Service Providers" }}</span>
-        </v-toolbar>
-        <v-card-text>
-          <p class="text-caption mb-3">
-            Only active {{ adding === "members" ? "members" : "service provider people" }} that are not assigned to a
-            unit yet are listed.
-          </p>
-          <v-autocomplete v-model="selected" v-model:search="candidateSearch" :items="candidates"
-            :loading="candidatesLoading" item-title="name" item-value="_id" multiple chips closable-chips
-            no-filter density="comfortable" placeholder="Search by name"
-            :no-data-text="candidatesLoading ? 'Loading...' : 'No one available'">
-            <template #item="{ props: itemProps, item }">
-              <v-list-item v-bind="itemProps" :subtitle="subtitleOf(item.raw)" />
-            </template>
-          </v-autocomplete>
-        </v-card-text>
-        <v-card-actions>
-          <v-spacer />
-          <v-btn class="text-none" :disabled="saving" @click="addDialog = false">Cancel</v-btn>
-          <v-btn class="text-none" color="primary" variant="flat" :loading="saving" :disabled="!selected.length"
-            @click="add">
-            Add
-          </v-btn>
-        </v-card-actions>
-      </v-card>
-    </v-dialog>
-  </v-card>
-</template>
-
-<script setup lang="ts">
-/**
- * A building unit's Management tab: the management members and the service
- * provider people (Members > Service Providers, not the provider companies)
- * attached to this unit. Each can be on one unit at a time, and only while
- * active - the server detaches them the moment they are suspended or deleted,
- * so they simply drop off this list.
- */
-type TSection = "members" | "providers";
-type TRow = {
-  _id: string;
-  name: string;
-  email?: string;
-  roleName?: string;
-  type?: string;
-  company?: string;
-  role?: string;
-  status?: string;
-};
-
-const props = defineProps({
-  unitId: {
-    type: String,
-    required: true,
-  },
-  /** The unit's site. The route's `site` is used when this is empty. */
-  siteId: {
-    type: String,
-    default: "",
-  },
-  /** The membership type whose members manage the site. */
-  managementType: {
-    type: String,
-    default: "property_management_agency",
-  },
-  canUpdate: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const route = useRoute();
-const org = computed(() => (route.params.org as string) ?? "");
-const site = computed(() => props.siteId || ((route.params.site as string) ?? ""));
-
-const { getAll: getMembers, updateMemberUnit } = useMember();
-const { getSiteMembers: getProviderPeople, updateSiteMemberUnit: updateProviderUnit } = useServiceProvider();
-const { debounce } = useUtils();
-
-const panels = ref<TSection[]>(["members", "providers"]);
-const message = ref("");
-const removing = ref("");
-
-function membersQuery(unit: string, search = "") {
-  return getMembers({ org: org.value, siteId: site.value, type: props.managementType, status: "active", unit, search, limit: 50 });
-}
-
-/**
- * The site's provider people on `unit`, active only. The endpoint returns the
- * whole list (no paging or search), so `search` is matched here.
- */
-async function providersQuery(unit: string, search = "") {
-  const res = await getProviderPeople(site.value, unit);
-  const q = search.toLowerCase();
-  const items = (res?.items ?? []).filter(
-    (p) => p.status === "active" && (!q || [p.name, p.email, p.company].some((v) => v?.toLowerCase().includes(q))),
-  );
-  return { items };
-}
-
-const { data: memberRes, pending: membersLoading, refresh: refreshMembers } = useLazyAsyncData(
-  `unit-management-members-${props.unitId}`,
-  () => membersQuery(props.unitId),
-);
-const { data: providerRes, pending: providersLoading, refresh: refreshProviders } = useLazyAsyncData(
-  `unit-management-providers-${props.unitId}`,
-  () => providersQuery(props.unitId),
-);
-
-function subtitleOf(row: TRow) {
-  return [row.company, row.roleName || row.role || row.type?.replace(/_/g, " "), row.email]
-    .filter(Boolean)
-    .join(" · ");
-}
-
-const sections = computed(() => [
-  {
-    key: "members" as TSection,
-    title: "Management",
-    empty: "management",
-    items: (memberRes.value?.items ?? []) as TRow[],
-    loading: membersLoading.value,
-    subtitle: subtitleOf,
-  },
-  {
-    key: "providers" as TSection,
-    title: "Service Providers",
-    empty: "service providers",
-    items: (providerRes.value?.items ?? []) as TRow[],
-    loading: providersLoading.value,
-    subtitle: subtitleOf,
-  },
-]);
-
-function refresh(section: TSection) {
-  return section === "members" ? refreshMembers() : refreshProviders();
-}
-
-function assign(section: TSection, id: string, unit: string) {
-  return section === "members" ? updateMemberUnit(id, unit) : updateProviderUnit(id, unit);
-}
-
-function errorOf(error: any, fallback: string) {
-  return error?.response?._data?.message || error?.data?.message || fallback;
-}
-
-// --- Remove: confirmed first ---
-const removeDialog = ref(false);
-const pendingRemove = ref<{ section: TSection; id: string; name: string } | null>(null);
-
-function confirmRemove(section: TSection, row: TRow) {
-  message.value = "";
-  pendingRemove.value = { section, id: row._id, name: row.name };
-  removeDialog.value = true;
-}
-
-async function remove() {
-  if (!pendingRemove.value) return;
-  const { section, id } = pendingRemove.value;
-  removing.value = id;
-  try {
-    await assign(section, id, "");
-    await refresh(section);
-  } catch (error: any) {
-    message.value = errorOf(error, "Failed to remove from unit.");
-  } finally {
-    removing.value = "";
-    removeDialog.value = false;
-    pendingRemove.value = null;
-  }
-}
-
-// --- Add dialog: active rows on no unit yet ---
-const addDialog = ref(false);
-const adding = ref<TSection>("members");
-const selected = ref<string[]>([]);
-const candidates = ref<TRow[]>([]);
-const candidateSearch = ref("");
-const candidatesLoading = ref(false);
-const saving = ref(false);
-
-async function loadCandidates() {
-  candidatesLoading.value = true;
-  try {
-    const search = candidateSearch.value?.trim() ?? "";
-    const res = adding.value === "members" ? await membersQuery("none", search) : await providersQuery("none", search);
-    // Keep what is already picked, so a new search does not drop the chips.
-    const picked = candidates.value.filter((c) => selected.value.includes(c._id));
-    const found = ((res?.items ?? []) as TRow[]).filter((c) => !selected.value.includes(c._id));
-    candidates.value = [...picked, ...found];
-  } catch (error: any) {
-    message.value = errorOf(error, "Failed to load the list.");
-  } finally {
-    candidatesLoading.value = false;
-  }
-}
-
-const debouncedLoad = debounce(loadCandidates, 400);
-watch(candidateSearch, () => {
-  if (addDialog.value) debouncedLoad();
-});
-
-function openAdd(section: TSection) {
-  message.value = "";
-  adding.value = section;
-  selected.value = [];
-  candidates.value = [];
-  candidateSearch.value = "";
-  addDialog.value = true;
-  loadCandidates();
-}
-
-async function add() {
-  saving.value = true;
-  message.value = "";
-  const section = adding.value;
-  const results = await Promise.allSettled(selected.value.map((id) => assign(section, id, props.unitId)));
-  const failed = results.filter((r): r is PromiseRejectedResult => r.status === "rejected");
-  if (failed.length) {
-    message.value = errorOf(failed[0].reason, `${failed.length} could not be added.`);
-  }
-  await refresh(section);
-  saving.value = false;
-  addDialog.value = false;
-}
-</script>