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

package/components/InvitationMain.vue

@@ -61,37 +61,19 @@
           <template #item.createdAt="{ item }">
             {{ item.createdAt ? formatDate(item.createdAt) : "" }}
           </template>
-          <template #item.siteLabel="{ item }">
-            <a
-              v-if="siteCountOf(item) > 1"
-              href="#"
-              class="text-primary"
-              :title="item.sites?.map((s) => s.siteName).join(', ')"
-              @click.prevent="detailItem = item"
-            >
-              {{ siteLabel(item) }}
-            </a>
-            <span v-else>{{ siteLabel(item) }}</span>
-          </template>
           <template #item.action-table="{ item }">
             <v-menu
-              :close-on-content-click="true"
+              :close-on-content-click="false"
               offset-y
-              width="170"
-              v-if="item.status === 'pending' && (props.cancelInvitation || props.inviteMember)"
+              width="150"
+              v-if="props.cancelInvitation"
             >
               <template v-slot:activator="{ props }">
                 <v-icon v-bind="props">mdi-dots-vertical</v-icon>
               </template>
               <v-list>
-                <v-list-item v-if="props.inviteMember" @click="onResend(item)">
-                  Resend
-                </v-list-item>
-                <v-list-item
-                  v-if="props.cancelInvitation"
-                  @click="openConfirmDialog(groupIds(item))"
-                >
-                  {{ siteCountOf(item) > 1 ? "Cancel all" : "Cancel Invite" }}
+                <v-list-item @click="openConfirmDialog(item._id ?? '')" v-if="item.status === 'pending'">
+                  Cancel Invite
                 </v-list-item>
               </v-list>
             </v-menu>
@@ -103,34 +85,6 @@
       </AppCard>
     </v-col>
 
-    <v-dialog :model-value="!!detailItem" max-width="520" @update:model-value="detailItem = null">
-      <v-card v-if="detailItem" class="pa-4">
-        <div class="text-h6 mb-1">{{ siteLabel(detailItem) }}</div>
-        <div class="text-caption mb-3">
-          {{ detailItem.email }} - one invitation e-mail; accepting it adds every site below.
-        </div>
-        <v-list density="compact" style="max-height: 50vh; overflow-y: auto">
-          <v-list-item v-for="s in detailItem.sites" :key="s._id" :title="s.siteName || 'Site'">
-            <template #append>
-              <span class="text-caption me-3">{{ formatStatus(s.status || "") }}</span>
-              <v-btn
-                v-if="s.status === 'pending' && props.cancelInvitation"
-                size="small"
-                variant="text"
-                color="error"
-                @click="openConfirmDialog([s._id])"
-              >
-                Cancel
-              </v-btn>
-            </template>
-          </v-list-item>
-        </v-list>
-        <div class="d-flex justify-end mt-3">
-          <v-btn variant="text" @click="detailItem = null">Close</v-btn>
-        </div>
-      </v-card>
-    </v-dialog>
-
     <ConfirmDialog
       v-model="confirmDialog"
       :loading="cancelLoading"
@@ -141,12 +95,8 @@
       </template>
       <template #description>
         <p class="text-subtitle-2">
-          {{
-            selectedInviteIds.length > 1
-              ? `Are you sure you want to cancel all ${selectedInviteIds.length} site invitations?`
-              : "Are you sure you want to cancel this invitation?"
-          }}
-          This action cannot be undone.
+          Are you sure you want to cancel this invitation? This action cannot be
+          undone.
         </p>
       </template>
       <template #footer>
@@ -190,13 +140,6 @@
 <script setup lang="ts">
 // Relative import: this layer's `utils/` is not auto-imported into consumers.
 import { invitationsEmptyText } from "../utils/invitations-empty-text";
-import {
-  groupIds,
-  resendArgs,
-  siteCountOf,
-  siteLabel,
-} from "../utils/invite-group";
-import useUser from "../composables/useUser";
 
 /** The same two tabs, same labels, same routes. */
 const invitationTabs = [
@@ -262,8 +205,7 @@ const headers = computed(() => {
     },
     {
       title: "Site Invited To",
-      value: "siteLabel",
-      sortable: false,
+      value: "metadata.siteName",
     },
     {
       title: "Status",
@@ -272,7 +214,7 @@ const headers = computed(() => {
 
   ];
 
-  if (props.status === "pending" && (props.cancelInvitation || props.inviteMember)) {
+  if (props.status === "pending" && props.cancelInvitation) {
     baseHeaders.push({
       title: "Action",
       value: "action-table",
@@ -284,7 +226,6 @@ const headers = computed(() => {
 
 const { getVerifications: _getVerifications, cancelUserInvitation } =
   useVerification();
-const { inviteMemberClient } = useUser();
 
 const page = ref(1);
 const pages = ref(0);
@@ -314,31 +255,20 @@ const {
   pageRange: string;
 }>(
   `get-verifications-${props.app}-${props.org}-${props.siteId}-${props.status}`,
-  async () => {
-    const query = {
+  () =>
+    _getVerifications({
       page: page.value,
       status: props.status,
       search: headerSearch.value,
       // type: "user-invite,member-invite",
       type: "member-invite",
-      // The org console (organization app, no site) lists every invitation of
-      // the organisation, including the site invitations sent from there
-      // (owner request 2026-10-02); the server's list scoping is unchanged.
-      app: props.app === "organization" && !props.siteId ? "" : props.app,
+      app: props.app,
       orgId: props.org,
       // A site app lists only THIS site's invitations; the server checks the
       // caller reaches it (owner report 2026-09-28: LakeGarden's invitations
       // showed on every Wing Tai site). The org console passes no site.
       siteId: props.siteId,
-    };
-    // One row per multi-site invitation. An API without `group` refuses the
-    // key: fall back to the plain list (one row per site, as before).
-    try {
-      return await _getVerifications({ ...query, group: true });
-    } catch {
-      return await _getVerifications(query);
-    }
-  },
+    }),
   {
     watch: [() => props.status]
   }
@@ -376,63 +306,31 @@ watch([headerSearch, () => props.status], () => {
 });
 
 const confirmDialog = ref(false);
-const selectedInviteIds = ref<string[]>([]);
+const selectedInviteId = ref<string | null>(null);
 const cancelLoading = ref(false);
-const detailItem = ref<any>(null);
-const resending = ref(false);
 
-function openConfirmDialog(ids: string[]) {
-  selectedInviteIds.value = ids;
+function openConfirmDialog(id: string) {
+  selectedInviteId.value = id;
   confirmDialog.value = true;
 }
 
 async function onConfirmCancel() {
-  if (!selectedInviteIds.value.length) return;
+  if (!selectedInviteId.value) return;
 
   cancelLoading.value = true;
   try {
-    let res: Record<string, any> = {};
-    for (const id of selectedInviteIds.value) {
-      res = await cancelUserInvitation(id);
-    }
-
-    showMessage(
-      selectedInviteIds.value.length > 1
-        ? "All site invitations cancelled"
-        : res.message || "Invitation cancelled successfully",
-      "success",
-    );
-    detailItem.value = null;
+    const res = await cancelUserInvitation(selectedInviteId.value);
+
+    showMessage(res.message || "Invitation cancelled successfully", "success");
     await getVerifications();
     confirmDialog.value = false;
-    selectedInviteIds.value = [];
+    selectedInviteId.value = null;
   } catch (error: any) {
-    showMessage(error?.data?.message || error?.message || "Failed to cancel invitation", "error");
-    await getVerifications();
+    showMessage(error?.message || "Failed to cancel invitation", "error");
   }
   cancelLoading.value = false;
 }
 
-// ONE request = ONE e-mail for the whole group (the server re-uses the
-// pending rows and names every site).
-async function onResend(item: any) {
-  const args = resendArgs(item);
-  if (!args) {
-    showMessage("This invitation cannot be re-sent from here.", "error");
-    return;
-  }
-  if (resending.value) return;
-  resending.value = true;
-  try {
-    await inviteMemberClient(args);
-    showMessage("Invitation re-sent (one e-mail).", "success");
-    await getVerifications();
-  } catch (error: any) {
-    showMessage(error?.data?.message || error?.message || "Failed to resend invitation", "error");
-  }
-  resending.value = false;
-}
-
 function handleSuccess(closeForm: boolean) {
   getVerifications();
   if (closeForm) {

package/components/SiteSettings.vue

@@ -199,22 +199,6 @@
         </v-expansion-panel-text>
       </v-expansion-panel>
 
-      <v-expansion-panel v-if="canManageVehicleQr">
-        <v-expansion-panel-title>
-          <v-icon class="mr-2">mdi-qrcode</v-icon>
-          Vehicle QR stickers
-        </v-expansion-panel-title>
-        <v-expansion-panel-text>
-          <v-switch v-model="vehicleQrEnabled" :loading="vehicleQrSaving" :disabled="vehicleQrSaving"
-            label="Vehicle QR stickers" color="primary" hide-details data-test="vehicle-qr-switch"
-            @update:model-value="saveVehicleQr" />
-          <p class="text-caption text-medium-emphasis mt-2 mb-0">
-            When on, staff can print a QR sticker for each vehicle from Vehicle Mgmt, and guards can scan it to see
-            which unit the vehicle belongs to.
-          </p>
-        </v-expansion-panel-text>
-      </v-expansion-panel>
-
       <slot
         name="panels"
         :can-manage="canManageSiteSettings"
@@ -231,7 +215,6 @@ import useFile from "../composables/useFile";
 import useSiteSettings from "../composables/useSiteSettings";
 import useUtils from "../composables/useUtils";
 import useANPRSettings from "../composables/useANPRSettings";
-import useVehicle from "../composables/useVehicle";
 
 const props = defineProps({
   siteId: { type: String, required: true },
@@ -250,7 +233,6 @@ const { canManageSiteInformation,
   canManageCCTVCamera,
   canManageDeliveryCompanies,
   canManageResidentVisitors,
-  canManageVehicleQr,
 } = useSettingsPermission();
 
 const { getSiteById, updateSitebyId, updateSiteInformation } =
@@ -423,36 +405,6 @@ function handleUpdateCompanies(value: string[]) {
 
 const route = useRoute();
 
-// Vehicle QR stickers switch (off until someone turns it on).
-const { getVehicleQrSettings, setVehicleQrSettings } = useVehicle();
-const vehicleQrEnabled = ref(false);
-const vehicleQrSaving = ref(false);
-
-await useLazyAsyncData(`vehicle-qr-${props.siteId}`, async () => {
-  if (!canManageVehicleQr.value) return null;
-  try {
-    vehicleQrEnabled.value = !!(await getVehicleQrSettings(props.siteId))?.enabled;
-  } catch {
-    vehicleQrEnabled.value = false;
-  }
-  return null;
-});
-
-async function saveVehicleQr(value: boolean | null) {
-  const enabled = !!value;
-  vehicleQrSaving.value = true;
-  try {
-    const res = await setVehicleQrSettings(props.siteId, enabled);
-    vehicleQrEnabled.value = !!res?.enabled;
-    show(enabled ? "Vehicle QR stickers turned on" : "Vehicle QR stickers turned off", "success");
-  } catch (e: any) {
-    vehicleQrEnabled.value = !enabled;
-    show(e?.data?.message || "Could not change the Vehicle QR stickers setting", "error");
-  } finally {
-    vehicleQrSaving.value = false;
-  }
-}
-
 function show(message: string, color: string) {
   toast.show = true;
   toast.message = message;

package/components/TableMain.vue

@@ -59,32 +59,17 @@
             >
               {{ createLabel }}
             </v-btn>
-            <!--
-              The design's search field. This was a `v-text-field` with only a
-              `max-width`, so inside the actions row it shrank to its minimum
-              and showed "Se" and a magnifier, at a different height and
-              border from the button beside it. Same `search` model; clearing
-              now sets "" instead of Vuetify's null.
-            -->
-            <AppField
+            <v-text-field
               v-if="canSearch"
               v-model="searchInput"
-              search
+              density="compact"
               placeholder="Search"
-              aria-label="Search"
+              clearable
+              max-width="300"
+              append-inner-icon="mdi-magnify"
+              hide-details
               class="table-card__search"
-            >
-              <template v-if="searchInput" #trailing>
-                <button
-                  type="button"
-                  class="app-field__trailing"
-                  aria-label="Clear search"
-                  @click="searchInput = ''"
-                >
-                  <v-icon icon="mdi-close" size="16" />
-                </button>
-              </template>
-            </AppField>
+            />
             <!-- Ghost/secondary, as the design specifies for Scan QR Code. -->
             <v-btn
               v-if="canScanVisitorQRCode"

package/components/VehicleManagement.vue

@@ -8,9 +8,6 @@
     <v-col cols="12">
       <PageHeader title="Vehicle Mgmt">
         <template #actions>
-          <AppButton v-if="qrStickersOn" icon="mdi-qrcode" variant="ghost" @click="openStickerDialog()">
-            Print QR stickers
-          </AppButton>
           <AppButton v-if="canCreateVehicle" icon="mdi-plus" @click="handleAddVehicleClick">
             Add Vehicle
           </AppButton>
@@ -85,19 +82,17 @@
         be drawn.
       -->
       <template #item.action="{ item }">
-        <v-menu v-if="rowHasVehicleActions(item, vehiclePermissions) || qrStickersOn" location="bottom end">
+        <v-menu v-if="rowHasVehicleActions(item, vehiclePermissions)" location="bottom end">
           <template #activator="{ props: menuProps }">
             <AppButton v-bind="menuProps" variant="row" icon="mdi-dots-vertical" aria-label="Vehicle actions"
               @click.stop />
           </template>
           <v-list density="compact">
             <template v-for="plate in rowPlates(item)" :key="plate._id ?? plate.plateNumber">
-              <template v-if="vehiclePlateActions(plate, vehiclePermissions).length || qrStickersOn">
+              <template v-if="vehiclePlateActions(plate, vehiclePermissions).length">
                 <v-list-subheader v-if="rowPlates(item).length > 1">
                   {{ plate.plateNumber }}
                 </v-list-subheader>
-                <v-list-item v-if="qrStickersOn" title="Re-issue sticker" prepend-icon="mdi-qrcode-edit"
-                  @click="askReissue(plate as TPlateNumber)" />
                 <v-list-item v-for="action in vehiclePlateActions(plate, vehiclePermissions)" :key="action.key"
                   :title="action.title" :prepend-icon="action.icon" :base-color="action.color"
                   @click="runVehicleAction(action.key, plate as TPlateNumber)" />
@@ -217,13 +212,11 @@
                           v-tooltip:top="'History'" @click="openHistory(plateNumberItem as TPlateNumber)" />
                       </template>
                       <template #item.action="{ item: plateNumberItem }">
-                        <v-menu v-if="vehiclePlateActions(plateNumberItem, vehiclePermissions).length || qrStickersOn">
+                        <v-menu v-if="vehiclePlateActions(plateNumberItem, vehiclePermissions).length">
                           <template #activator="{ props: menuProps }">
                             <v-btn icon="mdi-dots-vertical" v-bind="menuProps" flat size="x-small" />
                           </template>
                           <v-list density="compact">
-                            <v-list-item v-if="qrStickersOn" title="Re-issue sticker" prepend-icon="mdi-qrcode-edit"
-                              @click="askReissue(plateNumberItem as TPlateNumber)" />
                             <v-list-item
                               v-for="action in vehiclePlateActions(plateNumberItem, vehiclePermissions)"
                               :key="action.key" :title="action.title" :prepend-icon="action.icon"
@@ -348,26 +341,6 @@
         </v-card-text>
       </v-card>
     </v-dialog>
-    <VehicleQrStickerDialog v-if="qrStickersOn" v-model="dialog.qrStickers" :site="props.site" :rows="items"
-      :view="activeTab" :search="searchInput" :vehicle-ids="qrVehicleIds" />
-
-    <v-dialog v-model="dialog.qrReissue" width="460">
-      <v-card>
-        <v-card-title>Re-issue sticker?</v-card-title>
-        <v-card-text>
-          A new QR sticker will be made for {{ qrReissuePlate?.plateNumber }}. The old sticker will stop working, so
-          the new one must be pasted on the car.
-          <v-alert v-if="qrReissueError" type="error" variant="tonal" density="compact" class="mt-3">{{ qrReissueError }}</v-alert>
-        </v-card-text>
-        <v-card-actions>
-          <v-spacer />
-          <v-btn variant="text" class="text-none" @click="dialog.qrReissue = false">Cancel</v-btn>
-          <v-btn color="primary" variant="flat" class="text-none" :loading="qrReissuing" @click="confirmReissue">
-            Re-issue
-          </v-btn>
-        </v-card-actions>
-      </v-card>
-    </v-dialog>
     <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-row>
 </template>
@@ -487,53 +460,7 @@ const activeTab = ref<TVehicleTab>("residents");
 
 
 const { formatCamelCaseToWords, formatDate, debounce, maskNRIC } = useUtils();
-const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, blockVehicle, unblockVehicle, getSpecificVehicleById, getActiveCameraCounts, getVehicleQrSettings, regenerateVehicleQr } = useVehicle();
-
-// Vehicle QR stickers: the site's switch (Settings) decides whether the print
-// and re-issue actions exist; only people who may update vehicles get them.
-const qrEnabled = ref(false);
-const qrStickersOn = computed(() => qrEnabled.value && props.canUpdateVehicle);
-const qrVehicleIds = ref<string[]>([]);
-const qrReissuePlate = ref<TPlateNumber | null>(null);
-const qrReissuing = ref(false);
-const qrReissueError = ref("");
-
-async function loadQrSetting() {
-  try {
-    qrEnabled.value = !!(await getVehicleQrSettings(props.site))?.enabled;
-  } catch {
-    qrEnabled.value = false;
-  }
-}
-onMounted(loadQrSetting);
-
-function openStickerDialog(ids: string[] = []) {
-  qrVehicleIds.value = ids;
-  dialog.qrStickers = true;
-}
-
-function askReissue(plate: TPlateNumber) {
-  qrReissuePlate.value = plate || null;
-  qrReissueError.value = "";
-  dialog.qrReissue = true;
-}
-
-async function confirmReissue() {
-  const id = qrReissuePlate.value?._id;
-  if (!id) return;
-  qrReissuing.value = true;
-  qrReissueError.value = "";
-  try {
-    await regenerateVehicleQr(String(id));
-    dialog.qrReissue = false;
-    dialog.showMoreActions = false;
-    openStickerDialog([String(id)]);
-  } catch (e: any) {
-    qrReissueError.value = errorConverter(e);
-  } finally {
-    qrReissuing.value = false;
-  }
-}
+const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, blockVehicle, unblockVehicle, getSpecificVehicleById, getActiveCameraCounts } = useVehicle();
 
 /**
  * Active ANPR cameras per list at the site. A live plate on fewer cameras
@@ -616,9 +543,7 @@ const dialog = reactive({
   blockVehicle: false,
   unblockVehicle: false,
   history: false,
-  bulkVehicle: false,
-  qrStickers: false,
-  qrReissue: false,
+  bulkVehicle: false
 });
 
 

package/components/VisitorForm.vue

@@ -943,20 +943,8 @@ const hidQrReaderId = computed(() => (
   hidQrConfiguredReaderId.value || String(hidQrReader.value?._id || "")
 ));
 
-/*
- * Visitor QR passes are hidden at the manager's request (2026-09-23).
- *
- * A flag rather than a deletion: issuing, the preview dialog, printing and the
- * regenerate handler below are all intact and untouched, so bringing the
- * feature back is this one line. Every surface that offers a Visitor QR reads
- * `hidQrCodePassAllowed`, which is why the switch belongs here and not in each
- * of them.
- */
-const HID_VISITOR_QR_ENABLED = false;
-
 const hidQrCodePassAllowed = computed(() => {
   return (
-    HID_VISITOR_QR_ENABLED &&
     hidQrCodePassEnabled.value &&
     ["guest", "contractor", "walk-in"].includes(prop.type)
   );