@7365admin1/layer-common 4.35.1-staging.385 → 4.37.0

package/components/VisitorManagement.vue

@@ -742,35 +742,11 @@
                 class="visitor-preview__row"
               >
                 <div class="visitor-preview__label">{{ label }}</div>
-                <div>
-                  <!-- Was a hover tooltip on the value: the full NRIC only
-                       reachable by hovering, which says nothing is there to
-                       reach and cannot be reached at all on a touch screen.
-                       The eye alone, at the 14px the Incident Report screens
-                       draw it, is a 14px target - the floor is 24px. So the
-                       NUMBER is the control and the eye is its affordance:
-                       the whole masked value is pressable, which makes the
-                       target the width of the digits rather than of a glyph,
-                       and being a real `button` it also takes a tab stop,
-                       which a `v-icon` with a click handler never did. -->
-                  <button
-                    type="button"
-                    class="visitor-preview__reveal"
-                    :aria-label="showVisitorNric ? 'Hide NRIC' : 'Show NRIC'"
-                    :aria-pressed="showVisitorNric"
-                    @click="showVisitorNric = !showVisitorNric"
-                  >
-                    <span class="visitor-preview__value">
-                      {{
-                        showVisitorNric
-                          ? selectedVisitorObject[key]
-                          : maskNRIC(selectedVisitorObject[key])
-                      }}
-                    </span>
-                    <v-icon size="16" class="visitor-preview__eye">
-                      {{ showVisitorNric ? "mdi-eye-off-outline" : "mdi-eye-outline" }}
-                    </v-icon>
-                  </button>
+                <div
+                  v-tooltip:top="selectedVisitorObject[key]"
+                  class="visitor-preview__value"
+                >
+                  {{ maskNRIC(selectedVisitorObject[key]) }}
                 </div>
               </div>
 
@@ -820,84 +796,6 @@
                 </div>
               </div>
 
-              <!--
-                THE CONTRACTOR'S PARTY.
-
-                The list row has always said `( +2 members)` beside the name
-                and then had nowhere to send you for the names themselves. The
-                block spans both columns rather than sitting in the 116px
-                value track: a member is a record, not a value, and several of
-                them in a 250px column is unreadable.
-
-                Read off `selectedVisitorDataObject` (the raw row) and not
-                `selectedVisitorObject`, which filters itself down to
-                `typeFieldMap` plus five fixed keys - `members` is on neither
-                list, and widening that computed would change what four other
-                dialogs on this screen see.
-              -->
-              <div
-                v-else-if="key === 'members' && selectedVisitorMembers.length"
-                class="visitor-preview__row visitor-preview__row--block"
-              >
-                <div class="visitor-preview__label">
-                  {{ label }} ({{ selectedVisitorMembers.length }})
-                </div>
-                <div class="visitor-preview__members">
-                  <div
-                    v-for="(member, index) in selectedVisitorMembers"
-                    :key="member?.nric || member?.name || index"
-                    class="visitor-preview__member"
-                  >
-                    <div class="visitor-preview__value">
-                      {{ member?.name || "N/A" }}
-                    </div>
-                    <template v-for="field in memberDetailFields" :key="field.key">
-                      <div
-                        v-if="member?.[field.key]"
-                        class="visitor-preview__member-line"
-                      >
-                        <span class="visitor-preview__member-key">
-                          {{ field.label }}
-                        </span>
-                        <!-- A member's NRIC is the same class of data as the
-                             visitor's, so it gets the same control. Each
-                             member reveals separately - one toggle for the
-                             whole card would show three people's NRICs to
-                             read one. -->
-                        <button
-                          v-if="field.key === 'nric'"
-                          type="button"
-                          class="visitor-preview__reveal"
-                          :aria-label="
-                            isMemberNricShown(index)
-                              ? `Hide NRIC for ${member?.name || 'this member'}`
-                              : `Show NRIC for ${member?.name || 'this member'}`
-                          "
-                          :aria-pressed="isMemberNricShown(index)"
-                          @click="toggleMemberNric(index)"
-                        >
-                          <span>
-                            {{
-                              isMemberNricShown(index)
-                                ? member.nric
-                                : maskNRIC(member.nric)
-                            }}
-                          </span>
-                          <v-icon size="16" class="visitor-preview__eye">
-                            {{
-                              isMemberNricShown(index)
-                                ? "mdi-eye-off-outline"
-                                : "mdi-eye-outline"
-                            }}
-                          </v-icon>
-                        </button>
-                        <span v-else>{{ member[field.key] }}</span>
-                      </div>
-                    </template>
-                  </div>
-                </div>
-              </div>
-
               <!-- The vehicle number, with Block on its right: the Registered
                    tab only, for someone who may add vehicles. It opens the
                    Vehicle Mgmt Block Listed form with the category taken from
@@ -1604,17 +1502,8 @@ const { org: orgId, site: siteId } = route.params as {
   site: string;
 };
 
-// The page reads its own site's switches rather than relying on the layout's
-// toast to have fetched them - that copy could belong to the previous site.
-const {
-  enableUnregistered,
-  loaded: anprSettingsLoaded,
-  ensureANPRSettings,
-} = useANPRSettings(siteId);
+const { enableUnregistered } = useANPRSettings(siteId);
 const enableUnregisteredTab = computed(() => enableUnregistered.value);
-ensureANPRSettings(true).catch(() => {
-  // No settings = no Unregistered tab, same as before.
-});
 
 const {
   getVisitors,
@@ -2199,71 +2088,6 @@ const isSelectedVisitorPendingApproval = computed(
   () => selectedVisitorStatus.value === "pending"
 );
 
-/**
- * The members a contractor brought with them. Not gated on the Guests tab: the
- * list row's own `( +N members)` count is not either, and a contractor with a
- * party has one wherever the screen shows it.
- *
- * Blank entries are dropped rather than drawn as an empty card - the payload
- * carries `""` for every detail nobody filled in, so a member with no name and
- * no details would otherwise render as a bare inset box.
- */
-const selectedVisitorMembers = computed<Record<string, any>[]>(() => {
-  const members = selectedVisitorDataObject.value?.members;
-  if (!Array.isArray(members)) return [];
-
-  return members.filter(
-    (member: Record<string, any>) =>
-      member?.name || member?.nric || member?.contact || member?.plateNumber
-  );
-});
-
-/**
- * WHICH NRICs ARE UNCOVERED RIGHT NOW.
- *
- * Per member and not per card, so revealing one person's number does not
- * uncover the rest of the party's. Both are cleared when the dialog closes -
- * a preview must not open on the next visitor with the last one's NRIC
- * already showing, and it is the same `selectedVisitorId` that would carry it
- * across if the same row were reopened.
- */
-const showVisitorNric = ref(false);
-const shownMemberNrics = ref<number[]>([]);
-
-function isMemberNricShown(index: number) {
-  return shownMemberNrics.value.includes(index);
-}
-
-function toggleMemberNric(index: number) {
-  shownMemberNrics.value = isMemberNricShown(index)
-    ? shownMemberNrics.value.filter((x) => x !== index)
-    : [...shownMemberNrics.value, index];
-}
-
-watch(
-  () => dialog.viewVisitor,
-  (open) => {
-    if (open) return;
-    showVisitorNric.value = false;
-    shownMemberNrics.value = [];
-  }
-);
-
-/**
- * What a member row prints under the name, in order. `plateNumber` is in here
- * because the API returns it on `members[]` even though neither
- * `TMemberInfo` (this package) nor `TContractorMembers` (API-core's visitor
- * model, name and nric only) declares it - the two types have drifted from the
- * document and from each other. Reading the key defensively costs nothing and
- * shows the vehicle a member actually arrived in; the types are somebody's to
- * reconcile separately.
- */
-const memberDetailFields = [
-  { key: "nric", label: "NRIC" },
-  { key: "contact", label: "Contact" },
-  { key: "plateNumber", label: "Vehicle" },
-] as const;
-
 const formatType = (item: any) =>
   (item.deliveryType ? item.deliveryType + "-" : "") + item.type;
 
@@ -2277,7 +2101,6 @@ const formattedFields = {
   level: "Level",
   unit: "Unit",
   purpose: "Purpose",
-  members: "Members",
   checkIn: "Check In",
   snapshotEntryImage: "Entry Image",
   checkOut: "Check Out",
@@ -3110,11 +2933,7 @@ watch([searchInput, dateFrom, dateTo, filterTypes, activeTab], () => {
 const syncVisitorFiltersFromRoute = () => {
   const requestedTab = (route.query.tab as string) || "registered";
   const nextTab =
-    // Until the switches are read, keep a requested Unregistered tab (the plate
-    // toast links here) instead of bouncing it to Registered.
-    (anprSettingsLoaded.value &&
-      !enableUnregisteredTab.value &&
-      requestedTab === "unregistered") ||
+    (!enableUnregisteredTab.value && requestedTab === "unregistered") ||
     (!showResidentTransactionsTab.value && requestedTab === "resident-transactions")
       ? "registered"
       : requestedTab;
@@ -3173,9 +2992,9 @@ const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();
 
 watch(
-  [enableUnregisteredTab, anprSettingsLoaded],
-  ([enabled]) => {
-    if (!enabled && anprSettingsLoaded.value && activeTab.value === "unregistered") {
+  enableUnregisteredTab,
+  (enabled) => {
+    if (!enabled && activeTab.value === "unregistered") {
       activeTab.value = "registered";
     }
   },
@@ -3273,100 +3092,6 @@ watchEffect(async () => {
   word-break: break-word;
 }
 
-/* A row whose value is a set of records rather than a value - it drops the
-   two-column grid and runs the full width of the card body. */
-.visitor-preview__row--block {
-  display: block;
-}
-
-.visitor-preview__members {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  margin-top: 8px;
-}
-
-/*
- * An added member reads as an inset on the card it sits in - `--hover` on
- * `--border` at the inner radius. Those are `Card/MemberInfoSummary`'s three
- * decisions, unchanged, so a member looks the same in the preview as it does
- * in the form that created it. Only the TYPE differs: that card still prints
- * `<strong>Label:</strong> value`, which is the pattern this dialog just moved
- * off, so the lines below are set on the scale rather than inherited.
- */
-.visitor-preview__member {
-  padding: 9px 12px;
-  border: 1px solid var(--border);
-  border-radius: var(--r-inner);
-  background: var(--hover);
-}
-
-.visitor-preview__member-line {
-  display: flex;
-  gap: 8px;
-  margin-top: 3px;
-  font-size: var(--fs-breadcrumb);
-  color: var(--text2);
-  word-break: break-word;
-}
-
-.visitor-preview__member-key {
-  flex: 0 0 52px;
-  color: var(--muted);
-}
-
-/*
- * THE NRIC REVEAL.
- *
- * The pressable thing is the masked number, not the glyph beside it: an eye on
- * its own is a 14-16px target where 24px is the floor, and on a 12.5px member
- * line an `AppButton variant="icon"` - the layer's 32px icon square - would
- * make the NRIC line half again the height of the Contact line under it.
- * Pressing the digits gives a target the width of the value at no cost to the
- * rhythm, and reads the right way round: the number is what changes.
- *
- * It inherits its type rather than setting any, so the visitor's NRIC stays on
- * `--fs-cell` and a member's on the `--fs-breadcrumb` of the line it sits in.
- * The negative margin pays back the padding, so a revealed value starts on the
- * same left edge as every other value in the card.
- */
-.visitor-preview__reveal {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  margin: -3px -7px;
-  padding: 3px 7px;
-  border: none;
-  border-radius: var(--r-inner-sm);
-  background: transparent;
-  font: inherit;
-  color: inherit;
-  text-align: left;
-  cursor: pointer;
-  transition: background var(--motion) ease;
-}
-
-.visitor-preview__reveal:hover {
-  background: var(--hover);
-}
-
-.visitor-preview__reveal:focus-visible {
-  outline: 2px solid var(--accent);
-  outline-offset: 1px;
-}
-
-/* The design's interactive ink - not Vuetify's fixed blue, which is one colour
-   on both themes. `affectedEntities` gives its NRIC eye the same value. */
-.visitor-preview__eye {
-  color: var(--accent-text);
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .visitor-preview__reveal {
-    transition: none;
-  }
-}
-
 /* The width the type filter carried as `max-width="200"` on the v-select. */
 .visitor-type-filter {
   max-width: 200px;

package/components/VisitorSocketPopUp.vue

@@ -137,9 +137,8 @@ const config = useRuntimeConfig();
 const publicConfig = config.public as Record<string, string | undefined>;
 const route  = useRoute();
 const { tab } = useVisitor();
-// A getter, not the string: this component outlives site switches.
 const { enableUnregistered, ensureANPRSettings } = useANPRSettings(
-  () => props.siteId
+  props.siteId
 );
 const enableUnregisteredSnackbar = computed(() => enableUnregistered.value);
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =

package/composables/useANPRSettings.ts

@@ -1,50 +1,19 @@
-import { computed, toValue, type MaybeRefOrGetter } from "vue";
-
-/*
- * A site's ANPR switches (e.g. "Enable Unregistered Vehicles"), shared by every
- * caller on the page: the Visitor Mgmt tabs, the plate toast in the layout, and
- * Site Settings.
- *
- * `siteId` may be a ref or a getter. The layout's toast lives across site
- * switches, so a plain string captured once kept answering for the FIRST site
- * it saw - and the Visitor Mgmt page never fetched at all, so its
- * "Unregistered" tab showed only when that stale copy happened to be for the
- * right site (i.e. after a hard refresh on the page itself).
- *
- * One map keyed by site id: a key that is present means "fetched", even when
- * the site has no settings yet (stored as `{}`).
- */
-export default function (siteId?: MaybeRefOrGetter<string | undefined>) {
-  const site = computed(() => toValue(siteId) || "");
-
-  const bySite = useState<Record<string, Record<string, any>>>(
-    "anpr-settings-by-site",
-    () => ({})
+export default function (siteId?: string) {
+  const stateKey = computed(() =>
+    siteId ? `anpr-settings-${siteId}` : "anpr-settings"
   );
 
-  const anprSettings = computed<Record<string, any> | null>({
-    get: () => bySite.value[site.value] ?? null,
-    set: (value) => {
-      bySite.value = { ...bySite.value, [site.value]: value ?? {} };
-    },
-  });
-
-  /** True once this site's settings have been read (or saved) at least once. */
-  const loaded = computed(() => site.value in bySite.value);
+  const anprSettings = useState<Record<string, any> | null>(
+    stateKey.value,
+    () => null
+  );
 
   const enableUnregistered = computed(
     () => anprSettings.value?.ANPRSwitches?.enableUnregistered === true
   );
 
-  function store(forSite: unknown, response: Record<string, any> | null) {
-    const key = String(forSite ?? "");
-    if (!key) return;
-    bySite.value = { ...bySite.value, [key]: response ?? {} };
-  }
-
   async function fetchANPRSettings(data?: any) {
-    const payload =
-      data ?? (site.value ? { site: site.value, userType: "site" } : undefined);
+    const payload = data ?? (siteId ? { site: siteId, userType: "site" } : undefined);
 
     if (!payload) {
       return anprSettings.value;
@@ -58,21 +27,23 @@ export default function (siteId?: MaybeRefOrGetter<string | undefined>) {
       }
     );
 
-    store(payload.site, response);
+    if (response) {
+      anprSettings.value = response;
+    }
 
     return response;
   }
 
   async function ensureANPRSettings(force = false) {
-    if (!site.value) {
+    if (!siteId) {
       return anprSettings.value;
     }
 
-    if (!force && loaded.value) {
+    if (!force && anprSettings.value) {
       return anprSettings.value;
     }
 
-    return await fetchANPRSettings({ site: site.value, userType: "site" });
+    return await fetchANPRSettings({ site: siteId, userType: "site" });
   }
 
   async function getANPRSettingBySite(data: any) {
@@ -89,7 +60,7 @@ export default function (siteId?: MaybeRefOrGetter<string | undefined>) {
     );
 
     if (response) {
-      store(data?.site, response);
+      anprSettings.value = response;
     }
 
     return response;
@@ -97,7 +68,6 @@ export default function (siteId?: MaybeRefOrGetter<string | undefined>) {
 
   return {
     anprSettings,
-    loaded,
     enableUnregistered,
     ensureANPRSettings,
     getANPRSettingBySite,

package/composables/useAccessManagement.ts

@@ -228,11 +228,7 @@ export default function useAccessManagement() {
     unitId: string;
     page?: number;
     limit?: number;
-    /** Card-number search. Sent only when non-empty; API-core does not read
-     *  it yet, so until it does the list comes back unfiltered. */
-    search?: string;
   }) {
-    const search = params.search?.trim();
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/available-card-contractor/${params.type}`,
       {
@@ -242,7 +238,6 @@ export default function useAccessManagement() {
           unitId: params.unitId,
           page: params.page ?? 1,
           limit: params.limit ?? 100,
-          ...(search ? { search } : {}),
         },
       }
     );

package/composables/useCleaningPermission.ts

@@ -13,7 +13,6 @@ export default function useCleaningPermission() {
     bulletinBoardPermissions,
  
     inventoryPermissions,
-    robotPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
@@ -292,7 +291,6 @@ export default function useCleaningPermission() {
           "Allows the user to view detailed information for item checkouts.",
       },
     },
-    "robot-mgmt": robotPermissions,
   };
 
   return {

package/composables/useCommonPermission.ts

@@ -331,39 +331,7 @@ export function useCommonPermissions() {
     },
   };
 
-  /*
-   * ROBOTS - owner approval 2026-09-25, item 1: the Property Management and
-   * Cleaning role editors offer Robots, so a narrower role can be given robot
-   * access. Same five strings, spelling and wording as `useSecurityPermission`
-   * and exactly what core `robot-permission.util.ts ROBOT_PERMISSIONS` enforces.
-   * Catalogue-only: offering an entry grants nobody anything until it is ticked.
-   */
-  const robotPermissions = {
-    "add-robot": {
-      check: true,
-      description: "Allows the user to add a new robot to the system.",
-    },
-    "see-all-robots": {
-      check: true,
-      description: "Allows the user to view the list of all robots.",
-    },
-    "see-robot-details": {
-      check: true,
-      description: "Allows the user to view the details of a specific robot.",
-    },
-    "update-robot": {
-      check: true,
-      description: "Allows the user to update robot details.",
-    },
-    "delete-robot": {
-      check: true,
-      description:
-        "Allows the user to remove a robot from the system permanently.",
-    },
-  };
-
   return {
-    robotPermissions,
     inventoryPermissions,
     invitationPermissions,
     memberPermissions,

package/composables/useDocument.ts

@@ -6,7 +6,6 @@ export default function useDocument() {
     type = "all",
     site = "",
     parentId = "",
-    expiry = "all",
   }: {
     page?: number;
     search?: string;
@@ -14,11 +13,6 @@ export default function useDocument() {
     type?: string;
     site?: string;
     parentId?: string;
-    /**
-     * Which tab is asking: "active" for Documents, "expired" for
-     * Document (Expired). Defaults to "all" so existing callers are unaffected.
-     */
-    expiry?: string;
   } = {}) {
     const query: Record<string, any> = {
       page,
@@ -27,7 +21,6 @@ export default function useDocument() {
       type,
       site,
       parentId,
-      expiry,
     };
 
     return useNuxtApp().$api<Record<string, any>>(`/api/documents`, {

package/composables/useFacility.ts

@@ -76,8 +76,6 @@ export default function usetFacility() {
     hourInterval?: number;
     isBookingFeeEnabled: boolean;
     isGuestEnabled: boolean;
-    isResidentChecklistEnabled: boolean;
-    isSecurityChecklistEnabled: boolean;
     bookingAmount: number | null;
     peakBookingFeeAmount?: number | null;
     bookingFeeGuestAmount?: number | null;
@@ -175,8 +173,6 @@ export default function usetFacility() {
         hourInterval = 1,
         isBookingFeeEnabled = false,
         isGuestEnabled = false,
-        isResidentChecklistEnabled = false,
-        isSecurityChecklistEnabled = false,
         bookingAmount = 0,
         peakBookingFeeAmount = 0,
         bookingFeeGuestAmount = 0,
@@ -240,13 +236,6 @@ export default function usetFacility() {
       this.hourInterval = hourInterval;
       this.isBookingFeeEnabled = isBookingFeeEnabled;
       this.isGuestEnabled = isGuestEnabled;
-      // Exactly one owner, always. `isResidentChecklistEnabled` is the flag
-      // the apps gate on, so it decides, and security is its complement —
-      // stored rather than computed so each app can read its own flag without
-      // knowing the rule. A facility predating both fields lands on security,
-      // which is how every one of them already behaved.
-      this.isResidentChecklistEnabled = isResidentChecklistEnabled === true;
-      this.isSecurityChecklistEnabled = !this.isResidentChecklistEnabled;
       this.bookingAmount = bookingAmount;
       this.peakBookingFeeAmount = peakBookingFeeAmount;
       this.bookingFeeGuestAmount = bookingFeeGuestAmount;