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

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/DashboardMain.vue

@@ -1545,30 +1545,16 @@ const { userAppRole } = useLocalSetup();
 const { downloadPDF } = usePDFDownload();
 const route = useRoute();
 
-const dashboardWidgetPermissions: Record<string, string> = {
-  activity: "dashboard:view-activity",
-  recentActivity: "dashboard:view-activity",
-  taskSchedule: "dashboard:view-task-schedule",
-  staffStatus: "dashboard:view-attendance-widget",
-  attendance: "dashboard:view-attendance-widget",
-  feedbacks: "dashboard:view-feedbacks-widget",
-  workOrderStatus: "dashboard:view-work-order-status",
-  activePatrol: "dashboard:view-active-patrol",
-  upcomingEvents: "dashboard:view-upcoming-events",
-  todayReminders: "dashboard:view-today-reminders",
-  todayAttentions: "dashboard:view-today-attentions",
-};
-
 const propertyWidgetPermissions: Record<string, string[]> = {
   workOrders: [
-    "workOrder:see-all-work-orders",
+    "work_orders:see-all-work-orders",
     "work-order:see-all-work-orders",
   ],
   incidents: ["incident-reports:see-incident-reports"],
   visitors: ["visitorManagement:see-all-visitor"],
   facilityBookings: ["facility-booking-mgmt:see-all-facility-booking"],
   activity: [
-    "workOrder:see-all-work-orders",
+    "work_orders:see-all-work-orders",
     "work-order:see-all-work-orders",
   ],
   upcomingEvents: ["event-mgmt:see-all-event"],
@@ -1578,7 +1564,7 @@ const propertyWidgetPermissions: Record<string, string[]> = {
     "facility-booking-mgmt:see-all-facility-booking",
   ],
   workOrderStatus: [
-    "workOrder:see-all-work-orders",
+    "work_orders:see-all-work-orders",
     "work-order:see-all-work-orders",
   ],
   feedbacks: ["feedbacks:see-all-feedback"],
@@ -1587,27 +1573,30 @@ const propertyWidgetPermissions: Record<string, string[]> = {
 
 const moduleWidgetPermissions: Record<string, string[]> = {
   openWorkOrder: [
+    "work_orders:see-all-work-orders",
     "work_order:see-all-work-orders",
     "work-order:see-all-work-orders",
     "work-orders:see-all-work-orders",
   ],
   workOrders: [
+    "work_orders:see-all-work-orders",
     "work_order:see-all-work-orders",
     "work-order:see-all-work-orders",
     "work-orders:see-all-work-orders",
   ],
   activity: [
+    "work_orders:see-all-work-orders",
     "work_order:see-all-work-orders",
     "work-order:see-all-work-orders",
     "work-orders:see-all-work-orders",
+    "work_orders:see-all-work-orders",
   ],
-  taskSchedule: [
-    "cleaning-schedule-mgmt:see-all-schedules",
-    "schedule-task-mgmt:see-all-schedule-tasks",
-  ],
-  taskCompleted: [
-    "cleaning-schedule-mgmt:see-all-schedules",
-    "schedule-task-mgmt:see-all-schedule-tasks",
+  recentActivity: [
+    "work_orders:see-all-work-orders",
+    "work_order:see-all-work-orders",
+    "work-order:see-all-work-orders",
+    "work-orders:see-all-work-orders",
+    "work_orders:see-all-work-orders",
   ],
   staffStatus: ["attendance-mgmt:see-all-attendance"],
   attendance: ["attendance-mgmt:see-all-attendance"],
@@ -1630,9 +1619,14 @@ const moduleWidgetPermissions: Record<string, string[]> = {
   activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs"],
 };
 
+function hasSchedulePermission(permissions: string[], action: string) {
+  return permissions.some((permission) =>
+    permission.endsWith(`-schedule-mgmt:${action}`)
+  );
+}
+
 function canViewWidget(key: string) {
   const permissions = userAppRole.value?.permissions;
-  const dashboardPermission = dashboardWidgetPermissions[key];
   const modulePermissions = isPropertyMode.value
     ? propertyWidgetPermissions[key]
     : moduleWidgetPermissions[key];
@@ -1640,20 +1634,22 @@ function canViewWidget(key: string) {
   if (!permissions) return true;
   if (permissions.includes("*")) return true;
 
+  if (
+    !isPropertyMode.value &&
+    ["taskSchedule", "taskCompleted"].includes(key)
+  ) {
+    return hasSchedulePermission(permissions, "see-all-schedules");
+  }
+
   if (isPropertyMode.value && modulePermissions) {
     return modulePermissions.some((permission) =>
       permissions.includes(permission)
     );
   }
 
-  if (dashboardPermission || modulePermissions) {
-    return (
-      (dashboardPermission && permissions.includes(dashboardPermission)) ||
-      Boolean(
-        modulePermissions?.some((permission) =>
-          permissions.includes(permission)
-        )
-      )
+  if (modulePermissions) {
+    return modulePermissions.some((permission) =>
+      permissions.includes(permission)
     );
   }
 

package/components/InvitationMain.vue

@@ -221,7 +221,7 @@ const headers = computed(() => {
       title: "Status",
       value: "status",
     },
-    
+
   ];
 
   if (props.status === "pending" && props.cancelInvitation) {
@@ -270,10 +270,11 @@ const {
       page: page.value,
       status: props.status,
       search: headerSearch.value,
-      type: "user-invite,member-invite",
+      // type: "user-invite,member-invite",
+      type: "member-invite",
       app: props.app,
       orgId: props.org,
-      siteId: props.siteId,
+      // siteId: props.siteId,
     }),
   {
     watch: [() => props.status]

package/components/ManageChecklistMain.vue

@@ -305,31 +305,38 @@
 
       <v-divider />
 
-      <v-card-actions class="pa-0">
-        <v-btn
-          color="grey"
-          variant="flat"
-          rounded="0"
-          class="flex-grow-1 text-none"
-          height="48"
-          :disabled="rejectModal.submitting"
-          @click="closeRejectDialog"
-        >
-          Cancel
-        </v-btn>
-        <v-btn
-          color="error"
-          variant="flat"
-          rounded="0"
-          class="flex-grow-1 text-none"
-          height="48"
-          :loading="rejectModal.submitting"
-          :disabled="!isRejectModalValid || rejectModal.submitting"
-          @click="submitRejectDialog"
-        >
-          Confirm
-        </v-btn>
-      </v-card-actions>
+      <v-toolbar class="pa-0" density="compact">
+        <v-row no-gutters>
+          <v-col cols="6" class="pa-0">
+            <v-btn
+              block
+              variant="text"
+              class="text-none"
+              size="large"
+              height="48"
+              :disabled="rejectModal.submitting"
+              @click="closeRejectDialog"
+            >
+              Cancel
+            </v-btn>
+          </v-col>
+
+          <v-col cols="6" class="pa-0">
+            <v-btn
+              block
+              variant="flat"
+              color="black"
+              class="text-none font-weight-bold rounded-0"
+              height="48"
+              :loading="rejectModal.submitting"
+              :disabled="!isRejectModalValid || rejectModal.submitting"
+              @click="submitRejectDialog"
+            >
+              Confirm
+            </v-btn>
+          </v-col>
+        </v-row>
+      </v-toolbar>
     </v-card>
   </v-dialog>
 

package/components/PhotoUpload.vue

@@ -59,6 +59,21 @@
     </v-col>
   </v-row>
 
+  <v-dialog v-model="showPhotoPreview" max-width="900">
+    <v-card>
+      <v-card-actions class="pa-2 justify-end">
+        <v-btn
+          icon="mdi-close"
+          variant="text"
+          @click="showPhotoPreview = false"
+        />
+      </v-card-actions>
+      <v-card-text class="pa-2 pt-0">
+        <v-img :src="selectedPhoto" contain max-height="80vh" />
+      </v-card-text>
+    </v-card>
+  </v-dialog>
+
   <v-dialog v-model="photoOptionsDialog" max-width="420">
     <v-card>
       <v-card-title class="d-flex align-center pa-4">
@@ -196,6 +211,8 @@ const photos = ref<string[]>([...props.modelValue]);
 const photosIds = ref<string[]>([...props.photoIds]);
 const photoOptionsDialog = ref(false);
 const showCameraDialog = ref(false);
+const showPhotoPreview = ref(false);
+const selectedPhoto = ref("");
 const videoRef = ref<HTMLVideoElement | null>(null);
 const canvasRef = ref<HTMLCanvasElement | null>(null);
 const fileInputRef = ref<HTMLInputElement | null>(null);
@@ -205,10 +222,8 @@ const uploading = ref(false);
 const { addFile } = useFile();
 
 function viewPhoto(photoData: string) {
-  const link = document.createElement("a");
-  link.href = photoData;
-  link.target = "_blank";
-  link.click();
+  selectedPhoto.value = photoData;
+  showPhotoPreview.value = true;
 }
 
 watch(