@7365admin1/layer-common 3.0.30-staging.9 → 3.0.31-staging.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.0.30
+
+### Patch Changes
+
+- afdccc4: Build for Leftover changes from Benar's PR
+
 ## 3.0.29
 
 ### Patch Changes

package/components/AddPassKeyToVisitor.vue

@@ -32,11 +32,6 @@
               color="blue"
               variant="tonal"
               size="small"
-              closable
-              @click:close="
-                existingPassToBeReplaced = existingPass;
-                existingPass = null;
-              "
             >
               {{ existingPass.prefixAndName }}
             </v-chip>
@@ -45,9 +40,9 @@
 
           <!-- New pass selector -->
           <v-autocomplete
-            v-if="!existingPass"
             v-model="selectedPass"
             v-model:search="passInput"
+            :label="existingPass?.keyId ? 'Change pass' : undefined"
             :hide-no-data="false"
             :items="passItems"
             item-title="prefixAndName"
@@ -85,20 +80,20 @@
             class="d-flex flex-wrap ga-1 mb-2"
           >
             <v-chip
-              v-for="key in existingKeys"
+              v-for="key in existingKeys.filter((k) => k.status != 'Removed')"
               :key="key.keyId"
               prepend-icon="mdi-key"
               color="orange"
               variant="tonal"
               size="small"
               closable
-              @click:close="removeExistingKey(key.keyId)"
+              @click:close="removeExistingKey(key)"
             >
               {{ key.prefixAndName }}
             </v-chip>
-            <span class="text-caption text-medium-emphasis align-self-center"
-              >(current)</span
-            >
+            <span class="text-caption text-medium-emphasis align-self-center">
+              (current)
+            </span>
           </div>
 
           <!-- New keys selector -->
@@ -116,6 +111,8 @@
             density="compact"
             small-chips
             :loading="fetchKeysPending"
+            clearable
+            @update:model-value="selectKeys"
           >
             <template v-slot:chip="{ props: chipProps, item }">
               <v-chip
@@ -205,7 +202,7 @@ const processing = ref(false);
 const errorMessage = ref("");
 
 // New selections
-const selectedPass = ref<string>("");
+const selectedPass = ref<string | null>(null);
 const selectedKeys = ref<string[]>([]);
 const passInput = ref("");
 const keyInput = ref("");
@@ -213,12 +210,15 @@ const passItems = ref<TPassKey[]>([]);
 const keyItems = ref<TPassKey[]>([]);
 
 // Existing pass/keys (editable)
-const existingPass = ref<{ keyId: string; prefixAndName: string } | null>(null);
-const existingPassToBeReplaced = ref<{
+const existingPass = ref<{
   keyId: string;
   prefixAndName: string;
+  status?: string;
 } | null>(null);
-const existingKeys = ref<{ keyId: string; prefixAndName: string }[]>([]);
+
+const existingKeys = ref<
+  { keyId: string; prefixAndName: string; status?: string }[]
+>([]);
 
 const isEditMode = computed(() => prop.mode === "edit");
 const showKeys = computed(() => prop.visitor.type === "contractor");
@@ -237,28 +237,82 @@ const passTypesComputed = computed(() => {
 // Initialise existing values in edit mode
 onMounted(() => {
   if (isEditMode.value) {
-    const vPass = prop.visitor.visitorPass;
+    const vPass = prop.visitor.visitorPass?.filter(
+      (i) => i.status != "Removed"
+    );
     if (Array.isArray(vPass) && vPass.length > 0) {
       const p = vPass[0] as any;
-      existingPass.value = { keyId: p.keyId, prefixAndName: p.prefixAndName };
+      existingPass.value = {
+        keyId: p.keyId,
+        prefixAndName: p.prefixAndName,
+        status: p.status,
+      };
     }
-    const vKeys = prop.visitor.passKeys;
+    const vKeys = prop.visitor.passKeys?.filter((i) => i.status != "Removed");
     if (Array.isArray(vKeys) && vKeys.length > 0) {
       existingKeys.value = (vKeys as any[]).map((k) => ({
         keyId: k.keyId,
         prefixAndName: k.prefixAndName,
+        status: k.status,
       }));
     }
   }
 });
 
-function removeExistingKey(keyId: string) {
-  existingKeys.value = existingKeys.value.filter((k) => k.keyId !== keyId);
+const previouslyRemovedKeys = ref<any>([]);
+
+function removeExistingKey(key: Record<string, any>) {
+  const originalKey = existingKeys.value.find((k) => k.keyId === key.keyId);
+
+  if (
+    originalKey &&
+    !previouslyRemovedKeys.value.some((k: any) => k.keyId === key.keyId)
+  ) {
+    previouslyRemovedKeys.value.push({ ...originalKey });
+  }
+
+  existingKeys.value = existingKeys.value.map((i) => {
+    if (i.keyId === key.keyId) {
+      return {
+        ...i,
+        status: "Removed",
+      };
+    }
+    return i;
+  });
+}
+
+function selectKeys() {
+  const currentSelections = [...selectedKeys.value];
+
+  currentSelections.forEach((selectedId) => {
+    const removedMatch = previouslyRemovedKeys.value.find(
+      (k: any) => k.keyId === selectedId
+    );
+
+    if (removedMatch) {
+      existingKeys.value = existingKeys.value.map((i) => {
+        if (i.keyId === selectedId) {
+          return {
+            ...i,
+            status: removedMatch.status,
+          };
+        }
+        return i;
+      });
+
+      previouslyRemovedKeys.value = previouslyRemovedKeys.value.filter(
+        (k: any) => k.keyId !== selectedId
+      );
+
+      selectedKeys.value = selectedKeys.value.filter((id) => id !== selectedId);
+    }
+  });
 }
 
 // Exclude already-held pass/keys from selectable lists
 const existingPassId = computed(() => existingPass.value?.keyId);
-const existingKeyIds = computed(() => existingKeys.value.map((k) => k.keyId));
+// const existingKeyIds = computed(() => existingKeys.value.map((k) => k.keyId));
 
 const {
   data: passesData,
@@ -294,43 +348,50 @@ const {
     })
 );
 
-watch(passesData, (data: any) => {
-  const all: TPassKey[] = Array.isArray(data?.items) ? data.items : [];
-  passItems.value = all.filter((p) => p._id !== existingPassId.value);
-});
+// watch(passesData, (data: any) => {
+//   const all: TPassKey[] = Array.isArray(data?.items) ? data.items : [];
+//   passItems.value = all.filter((p) => p._id !== existingPassId.value);
+// });
 
-watch(keysData, (data: any) => {
-  const all: TPassKey[] = Array.isArray(data?.items) ? data.items : [];
-  keyItems.value = all.filter((k) => !existingKeyIds.value.includes(k._id!));
-});
+// watch(keysData, (data: any) => {
+//   const all: TPassKey[] = Array.isArray(data?.items) ? data.items : [];
+//   keyItems.value = all.filter((k) => !existingKeyIds.value.includes(k._id!));
+// });
 
 // Re-filter when existing items change
 watch(
-  [existingPassId, existingKeyIds],
+  [existingPassId, existingKeys, passesData, keysData],
   () => {
     const rawPasses = (passesData.value as any)?.items ?? [];
     passItems.value = rawPasses.filter(
       (p: TPassKey) => p._id !== existingPassId.value
     );
+
     const rawKeys = (keysData.value as any)?.items ?? [];
-    keyItems.value = rawKeys.filter(
-      (k: TPassKey) => !existingKeyIds.value.includes(k._id!)
+    const manuallyRemovedKeys = existingKeys.value
+      .filter((k) => k.status === "Removed")
+      .map((k) => ({
+        _id: k.keyId,
+        prefixAndName: k.prefixAndName,
+      }));
+
+    const allExistingKeyIds = existingKeys.value.map((k) => k.keyId);
+
+    const filteredRawKeys = rawKeys.filter(
+      (k: TPassKey) => !allExistingKeyIds.includes(k._id!)
     );
+
+    keyItems.value = [...filteredRawKeys, ...manuallyRemovedKeys];
+    console.log("keyItems: ", keyItems.value);
   },
-  { deep: true }
+  { deep: true, immediate: true }
 );
 
 const canSubmit = computed(() => {
-  if (isEditMode.value) {
-    // allow save if anything changed: existing items modified OR new items selected
-    return (
-      existingPass.value !== null ||
-      selectedPass.value ||
-      existingKeys.value.length > 0 ||
-      selectedKeys.value.length > 0
-    );
-  }
-  return !!selectedPass.value || selectedKeys.value.length > 0;
+  const hasRemovedKeys = existingKeys.value.some((k) => k.status === "Removed");
+  return (
+    !!selectedPass.value || selectedKeys.value.length > 0 || hasRemovedKeys
+  );
 });
 
 async function handleSubmit() {
@@ -343,16 +404,13 @@ async function handleSubmit() {
 
     // Build final pass list: kept existing + newly selected
     const finalPasses: { keyId: string; status?: string; add?: boolean }[] = [];
-    if (existingPass.value) {
-      finalPasses.push({ keyId: existingPass.value.keyId, status: "Removed" });
-    }
-    if (existingPassToBeReplaced.value) {
-      finalPasses.push({
-        keyId: existingPassToBeReplaced.value.keyId,
-        status: "Removed",
-      });
-    }
     if (selectedPass.value) {
+      if (existingPass.value) {
+        finalPasses.push({
+          keyId: existingPass.value.keyId,
+          status: "Removed",
+        });
+      }
       finalPasses.push({
         keyId: selectedPass.value,
         status: "Not Returned",
@@ -364,13 +422,17 @@ async function handleSubmit() {
     // Build final keys list: kept existing + newly selected
     if (showKeys.value) {
       const finalKeys: { keyId: string; status?: string; add?: boolean }[] = [
-        ...existingKeys.value.map((k) => ({ keyId: k.keyId })),
+        ...existingKeys.value.map((k) => ({
+          keyId: k.keyId,
+          status: k.status,
+        })),
         ...selectedKeys.value.map((keyId) => ({
           keyId,
           status: "Not Returned",
           add: true,
         })),
       ];
+
       payload.passKeys = finalKeys;
     }
 

package/components/VisitorManagement.vue

@@ -315,7 +315,9 @@
                 style="cursor: pointer"
               >
                 <v-chip
-                  v-for="pass in item.visitorPass"
+                  v-for="pass in item.visitorPass.filter(
+                    (i) => i.status != 'Removed'
+                  )"
                   :key="(pass as any)._id ?? (pass as any).keyId"
                   prepend-icon="mdi-card-bulleted-outline"
                   size="x-small"
@@ -325,7 +327,9 @@
                   {{ (pass as any)?.prefixAndName }}
                 </v-chip>
                 <v-chip
-                  v-for="key in item.passKeys"
+                  v-for="key in item.passKeys.filter(
+                    (i) => i.status != 'Removed'
+                  )"
                   :key="(key as any)._id ?? (key as any).keyId"
                   prepend-icon="mdi-key"
                   size="x-small"
@@ -404,9 +408,16 @@
           </v-menu>
 
           <!-- QRCODE identifier -->
-          <div v-if="item.accessCards?.type === 'QRCODE' && item.accessCards?.cardNo" class="d-flex align-center ga-1 mt-1">
+          <div
+            v-if="
+              item.accessCards?.type === 'QRCODE' && item.accessCards?.cardNo
+            "
+            class="d-flex align-center ga-1 mt-1"
+          >
             <v-icon size="15" icon="mdi-qrcode" color="teal" />
-            <v-chip size="x-small" variant="tonal" color="teal">QR · ({{ item.cards?.flat().length ?? 1 }})</v-chip>
+            <v-chip size="x-small" variant="tonal" color="teal"
+              >QR · ({{ item.cards?.flat().length ?? 1 }})</v-chip
+            >
           </div>
         </v-row>
       </template>
@@ -814,7 +825,9 @@
                 item-title="label"
                 item-value="value"
                 v-model="pass.status"
-                :disabled="selectedVisitorObject.checkOut"
+                :disabled="
+                  selectedVisitorObject.checkOut || pass.status == 'Removed'
+                "
               ></v-select>
               <v-textarea
                 v-if="pass.status === 'Lost' || pass.status === 'Damaged'"
@@ -851,7 +864,9 @@
                 item-title="label"
                 item-value="value"
                 v-model="key.status"
-                :disabled="selectedVisitorObject.checkOut"
+                :disabled="
+                  selectedVisitorObject.checkOut || key.status == 'Removed'
+                "
               ></v-select>
               <v-textarea
                 v-if="key.status === 'Lost' || key.status === 'Damaged'"
@@ -911,37 +926,87 @@
     <v-dialog v-model="dialog.returnNfcCard" max-width="450" persistent>
       <v-card>
         <v-toolbar density="compact" color="">
-          <v-row no-gutters class="d-flex fill-height justify-space-between align-center px-4">
+          <v-row
+            no-gutters
+            class="d-flex fill-height justify-space-between align-center px-4"
+          >
             <span class="font-weight-bold">Return NFC Card</span>
-            <v-btn icon="mdi-close" variant="text" @click="dialog.returnNfcCard = false" />
+            <v-btn
+              icon="mdi-close"
+              variant="text"
+              @click="dialog.returnNfcCard = false"
+            />
           </v-row>
         </v-toolbar>
         <v-card-text class="px-4 pb-2">
-          <p class="text-body-2 mb-3">Please indicate the status of the NFC card before checking out.</p>
+          <p class="text-body-2 mb-3">
+            Please indicate the status of the NFC card before checking out.
+          </p>
           <div>
             <InputLabel class="text-capitalize" title="Full Name" />
-            <v-text-field v-model="selectedVisitorObject.name" density="comfortable" readonly />
+            <v-text-field
+              v-model="selectedVisitorObject.name"
+              density="comfortable"
+              readonly
+            />
           </div>
           <div>
             <InputLabel class="text-capitalize" title="Location" />
-            <v-text-field v-model="selectedVisitorObject.location" density="comfortable" readonly />
+            <v-text-field
+              v-model="selectedVisitorObject.location"
+              density="comfortable"
+              readonly
+            />
           </div>
-          <div v-for="(card, idx) in nfcCardReturnStatuses" :key="card.cardId" class="mb-4">
+          <div
+            v-for="(card, idx) in nfcCardReturnStatuses"
+            :key="card.cardId"
+            class="mb-4"
+          >
             <div class="d-flex align-center ga-2 mb-2">
               <v-icon size="18" icon="mdi-credit-card-outline" color="purple" />
-              <v-chip size="small" variant="tonal" color="purple">{{ card.cardNo }}</v-chip>
+              <v-chip size="small" variant="tonal" color="purple">{{
+                card.cardNo
+              }}</v-chip>
             </div>
-            <v-select v-model="nfcCardReturnStatuses[idx].status" :items="nfcPassStatusOptions" item-title="label" item-value="value" density="comfortable" hide-details />
-            <v-textarea v-if="card.status === 'Lost' || card.status === 'Damage'" v-model="nfcCardReturnStatuses[idx].remarks" label="Remarks (required)" no-resize rows="3" class="mt-2" density="compact" />
+            <v-select
+              v-model="nfcCardReturnStatuses[idx].status"
+              :items="nfcPassStatusOptions"
+              item-title="label"
+              item-value="value"
+              density="comfortable"
+              hide-details
+            />
+            <v-textarea
+              v-if="card.status === 'Lost' || card.status === 'Damage'"
+              v-model="nfcCardReturnStatuses[idx].remarks"
+              label="Remarks (required)"
+              no-resize
+              rows="3"
+              class="mt-2"
+              density="compact"
+            />
           </div>
         </v-card-text>
         <v-toolbar class="pa-0" density="compact">
           <v-row no-gutters>
             <v-col cols="6">
-              <v-btn variant="text" block @click="dialog.returnNfcCard = false">Close</v-btn>
+              <v-btn variant="text" block @click="dialog.returnNfcCard = false"
+                >Close</v-btn
+              >
             </v-col>
             <v-col cols="6">
-              <v-btn color="red" variant="flat" height="48" rounded="0" block :loading="loading.checkingOut" :disabled="!canConfirmNfcCheckout" @click="handleNfcCheckout">Confirm Checkout</v-btn>
+              <v-btn
+                color="red"
+                variant="flat"
+                height="48"
+                rounded="0"
+                block
+                :loading="loading.checkingOut"
+                :disabled="!canConfirmNfcCheckout"
+                @click="handleNfcCheckout"
+                >Confirm Checkout</v-btn
+              >
             </v-col>
           </v-row>
         </v-toolbar>
@@ -971,7 +1036,7 @@
         @close="dialog.editPassKey = false"
         @done="
           () => {
-            dialog.editPassKey = false;
+            // dialog.editPassKey = false;
             getVisitorRefresh();
           }
         "
@@ -1826,7 +1891,8 @@ const nfcCardReturnStatuses = ref<
 const canConfirmCheckout = computed(() => {
   const allEntries = [...passReturnStatuses.value, ...keyReturnStatuses.value];
   return allEntries.every((entry) => {
-    if (!entry.status || ["In Use","Not Returned"].includes(entry.status)) return false;
+    if (!entry.status || ["In Use", "Not Returned"].includes(entry.status))
+      return false;
     if (
       (entry.status === "Lost" || entry.status === "Damaged") &&
       !entry.remarks.trim()
@@ -1840,7 +1906,8 @@ const canConfirmNfcCheckout = computed(() => {
   if (nfcCardReturnStatuses.value.length === 0) return false;
   return nfcCardReturnStatuses.value.every(({ status, remarks }) => {
     if (!status || status === "In Use") return false;
-    if ((status === "Lost" || status === "Damage") && !remarks.trim()) return false;
+    if ((status === "Lost" || status === "Damage") && !remarks.trim())
+      return false;
     return true;
   });
 });
@@ -1883,17 +1950,28 @@ function handleCheckout(userId: string) {
     return;
   }
 
-  const hasNfc = visitor?.accessCards?.type === "NFC" && !!visitor?.accessCards?.cardNo;
+  const hasNfc =
+    visitor?.accessCards?.type === "NFC" && !!visitor?.accessCards?.cardNo;
   if (hasNfc) {
     const allCards: any[] = visitor.cards?.flat() ?? [];
     nfcCardReturnStatuses.value = allCards.map((card: any) => ({
       cardId: card._id,
-      cardNo: card._id === visitor.accessCards._id ? visitor.accessCards.cardNo : card._id,
+      cardNo:
+        card._id === visitor.accessCards._id
+          ? visitor.accessCards.cardNo
+          : card._id,
       status: "In Use",
       remarks: "",
     }));
     if (nfcCardReturnStatuses.value.length === 0) {
-      nfcCardReturnStatuses.value = [{ cardId: visitor.accessCards._id, cardNo: visitor.accessCards.cardNo, status: "In Use", remarks: "" }];
+      nfcCardReturnStatuses.value = [
+        {
+          cardId: visitor.accessCards._id,
+          cardNo: visitor.accessCards.cardNo,
+          status: "In Use",
+          remarks: "",
+        },
+      ];
     }
     dialog.returnNfcCard = true;
     return;
@@ -1961,7 +2039,9 @@ async function handleNfcCheckout() {
       })),
     });
     if (res) {
-      await updateVisitor(userId as string, { checkOut: new Date().toISOString() });
+      await updateVisitor(userId as string, {
+        checkOut: new Date().toISOString(),
+      });
       showMessage("Visitor successfully checked-out!", "info");
       await getVisitorRefresh();
       dialog.returnNfcCard = false;
@@ -1969,7 +2049,10 @@ async function handleNfcCheckout() {
     }
   } catch (error: any) {
     const errorMessage = error?.response?._data?.message;
-    showMessage(errorMessage || "Something went wrong. Please try again later.", "error");
+    showMessage(
+      errorMessage || "Something went wrong. Please try again later.",
+      "error"
+    );
   } finally {
     loading.checkingOut = false;
   }
@@ -2241,11 +2324,7 @@ const syncVisitorFiltersFromRoute = () => {
 
 onMounted(syncVisitorFiltersFromRoute);
 
-watch(
-  () => route.query,
-  syncVisitorFiltersFromRoute,
-  { deep: true }
-);
+watch(() => route.query, syncVisitorFiltersFromRoute, { deep: true });
 
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.0.30-staging.9",
+  "version": "3.0.31-staging.10",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {