@7365admin1/layer-common 3.0.31-staging.23 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.1.0
+
+### Minor Changes
+
+- 8704e51: Update Package Version
+
 ## 3.0.30
 
 ### Patch Changes

package/components/AddEqupmentForm.vue

@@ -12,24 +12,6 @@
       <v-card-text class="pa-4">
         <v-form ref="formRef" v-model="valid">
           <v-row no-gutters class="pa-0">
-            <v-col cols="12" class="pa-0 mb-2">
-              <PhotoUpload
-                v-model="attachmentPhotos"
-                v-model:photo-ids="attachmentIds"
-                title="Photo"
-                @error="photoUploadError = $event"
-              />
-
-              <v-alert
-                v-if="photoUploadError"
-                type="error"
-                density="compact"
-                variant="tonal"
-                class="mt-2"
-              >
-                {{ photoUploadError }}
-              </v-alert>
-            </v-col>
             <v-col cols="12" class="pa-0 mb-2">
               <InputLabel for="name" title="Name" required class="mb-1" />
               <v-text-field
@@ -105,10 +87,6 @@ const unitOfMeasurementModel = defineModel("unitOfMeasurement", {
   type: String,
   default: "",
 });
-const attachmentModel = defineModel("attachment", {
-  type: String,
-  default: "",
-});
 const showDialog = defineModel({ type: Boolean, default: false });
 
 const prop = defineProps({
@@ -127,9 +105,6 @@ const emit = defineEmits(["saved", "close"]);
 const formRef = ref<any>(null);
 const valid = ref(false);
 const submitting = ref(false);
-const attachmentPhotos = ref<string[]>([]);
-const attachmentIds = ref<string[]>([]);
-const photoUploadError = ref("");
 
 const { requiredRule } = useUtils();
 
@@ -149,29 +124,6 @@ const unitOfMeasurementOptions = [
 watchEffect(() => {
   nameModel.value = prop.equipmentData?.name || "";
   unitOfMeasurementModel.value = prop.equipmentData?.unitOfMeasurement || "";
-  attachmentModel.value = prop.equipmentData?.attachment || "";
-});
-
-watch(
-  attachmentIds,
-  (photoIds) => {
-    const [attachmentId] = photoIds;
-    attachmentModel.value = attachmentId || "";
-
-    if (photoIds.length > 1) {
-      attachmentIds.value = attachmentId ? [attachmentId] : [];
-      attachmentPhotos.value = attachmentPhotos.value.slice(0, 1);
-    }
-  },
-  { deep: true }
-);
-
-watch(showDialog, (isOpen) => {
-  if (!isOpen) {
-    attachmentPhotos.value = [];
-    attachmentIds.value = [];
-    photoUploadError.value = "";
-  }
 });
 
 function close() {
@@ -195,15 +147,12 @@ async function submit() {
 
     emit("saved", {
       name: nameModel.value,
+
       unitOfMeasurement: unitOfMeasurementModel.value,
-      attachment: attachmentModel.value,
     });
 
     nameModel.value = "";
     unitOfMeasurementModel.value = "";
-    attachmentModel.value = "";
-    attachmentPhotos.value = [];
-    attachmentIds.value = [];
 
     showDialog.value = false;
     emit("close");

package/components/AddPassKeyToVisitor.vue

@@ -32,6 +32,11 @@
               color="blue"
               variant="tonal"
               size="small"
+              closable
+              @click:close="
+                existingPassToBeReplaced = existingPass;
+                existingPass = null;
+              "
             >
               {{ existingPass.prefixAndName }}
             </v-chip>
@@ -40,9 +45,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"
@@ -80,20 +85,20 @@
             class="d-flex flex-wrap ga-1 mb-2"
           >
             <v-chip
-              v-for="key in existingKeys.filter((k) => k.status != 'Removed')"
+              v-for="key in existingKeys"
               :key="key.keyId"
               prepend-icon="mdi-key"
               color="orange"
               variant="tonal"
               size="small"
               closable
-              @click:close="removeExistingKey(key)"
+              @click:close="removeExistingKey(key.keyId)"
             >
               {{ 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 -->
@@ -111,8 +116,6 @@
             density="compact"
             small-chips
             :loading="fetchKeysPending"
-            clearable
-            @update:model-value="selectKeys"
           >
             <template v-slot:chip="{ props: chipProps, item }">
               <v-chip
@@ -202,7 +205,7 @@ const processing = ref(false);
 const errorMessage = ref("");
 
 // New selections
-const selectedPass = ref<string | null>(null);
+const selectedPass = ref<string>("");
 const selectedKeys = ref<string[]>([]);
 const passInput = ref("");
 const keyInput = ref("");
@@ -210,15 +213,12 @@ const passItems = ref<TPassKey[]>([]);
 const keyItems = ref<TPassKey[]>([]);
 
 // Existing pass/keys (editable)
-const existingPass = ref<{
+const existingPass = ref<{ keyId: string; prefixAndName: string } | null>(null);
+const existingPassToBeReplaced = ref<{
   keyId: string;
   prefixAndName: string;
-  status?: string;
 } | null>(null);
-
-const existingKeys = ref<
-  { keyId: string; prefixAndName: string; status?: string }[]
->([]);
+const existingKeys = ref<{ keyId: string; prefixAndName: string }[]>([]);
 
 const isEditMode = computed(() => prop.mode === "edit");
 const showKeys = computed(() => prop.visitor.type === "contractor");
@@ -237,82 +237,28 @@ const passTypesComputed = computed(() => {
 // Initialise existing values in edit mode
 onMounted(() => {
   if (isEditMode.value) {
-    const vPass = prop.visitor.visitorPass?.filter(
-      (i) => i.status != "Removed"
-    );
+    const vPass = prop.visitor.visitorPass;
     if (Array.isArray(vPass) && vPass.length > 0) {
       const p = vPass[0] as any;
-      existingPass.value = {
-        keyId: p.keyId,
-        prefixAndName: p.prefixAndName,
-        status: p.status,
-      };
+      existingPass.value = { keyId: p.keyId, prefixAndName: p.prefixAndName };
     }
-    const vKeys = prop.visitor.passKeys?.filter((i) => i.status != "Removed");
+    const vKeys = prop.visitor.passKeys;
     if (Array.isArray(vKeys) && vKeys.length > 0) {
       existingKeys.value = (vKeys as any[]).map((k) => ({
         keyId: k.keyId,
         prefixAndName: k.prefixAndName,
-        status: k.status,
       }));
     }
   }
 });
 
-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);
-    }
-  });
+function removeExistingKey(keyId: string) {
+  existingKeys.value = existingKeys.value.filter((k) => k.keyId !== keyId);
 }
 
 // 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,
@@ -348,50 +294,43 @@ 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, existingKeys, passesData, keysData],
+  [existingPassId, existingKeyIds],
   () => {
     const rawPasses = (passesData.value as any)?.items ?? [];
     passItems.value = rawPasses.filter(
       (p: TPassKey) => p._id !== existingPassId.value
     );
-
     const rawKeys = (keysData.value as any)?.items ?? [];
-    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 = rawKeys.filter(
+      (k: TPassKey) => !existingKeyIds.value.includes(k._id!)
     );
-
-    keyItems.value = [...filteredRawKeys, ...manuallyRemovedKeys];
-    console.log("keyItems: ", keyItems.value);
   },
-  { deep: true, immediate: true }
+  { deep: true }
 );
 
 const canSubmit = computed(() => {
-  const hasRemovedKeys = existingKeys.value.some((k) => k.status === "Removed");
-  return (
-    !!selectedPass.value || selectedKeys.value.length > 0 || hasRemovedKeys
-  );
+  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;
 });
 
 async function handleSubmit() {
@@ -404,13 +343,16 @@ 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",
@@ -422,17 +364,13 @@ 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,
-          status: k.status,
-        })),
+        ...existingKeys.value.map((k) => ({ keyId: k.keyId })),
         ...selectedKeys.value.map((keyId) => ({
           keyId,
           status: "Not Returned",
           add: true,
         })),
       ];
-
       payload.passKeys = finalKeys;
     }