@7365admin1/layer-common 3.1.3 → 3.1.4-staging.46

package/.github/workflows/publish-staging.yml

@@ -34,3 +34,14 @@ jobs:
 
       - name: Publish to npm with staging tag
         run: npm publish --tag staging --registry https://registry.npmjs.org
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+        run: |
+          MESSAGE="@everyone :rotating_light: **Publish Staging** failed in \`${{ github.repository }}\` (\`${{ github.workflow }}\`)
+          ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          curl -s -X POST -H "Content-Type: application/json" \
+            -d "$(jq -n --arg content "$MESSAGE" '{content: $content}')" \
+            "$DISCORD_WEBHOOK_URL"

package/components/AttachmentsViewer.vue

@@ -48,7 +48,7 @@
                                 <v-list-item class="cursor-pointer" @click="openMediaViewer(item._id, item.mimeType)">
                                     <template #prepend>
                                         <v-avatar size="36" rounded="sm" class="mr-3">
-                                            <v-img :src="getFileUrl(item._id)" cover>
+                                            <v-img :src="imageCover(item._id)" cover>
                                                 <template #error>
                                                     <v-icon color="green" size="20">mdi-image</v-icon>
                                                 </template>
@@ -97,7 +97,7 @@
         </v-row>
 
         <!-- Media Carousel (images + videos) -->
-        <ImageCarousel v-model="showCarousel" :active-file-id="activeFileId" :files="carouselFiles" />
+        <ImageCarousel v-model="showCarousel" :active-file-id="activeFileId" :files="carouselFiles" :anpr="anpr" :site="site" />
 
         <!-- Document Viewer -->
         <DocumentViewer v-model="showDocumentViewer" :file-id="activeFileId" :file-name="activeFileName"
@@ -123,10 +123,18 @@ const props = defineProps({
     showFileTypeTitle: {
         type: Boolean,
         default: false,
+    },
+    anpr: {
+        type: Boolean,
+        default: false
+    },
+    site: {
+        type: String,
+        default: ""
     }
 });
 
-const { getFileUrl, urlToFile, getFileById } = useFile();
+const { getFileUrl, urlToFile, getFileById, getFileUrlAnpr } = useFile();
 
 const rawFileArray = ref<{ file: File, _id: string, preview: boolean, mimeType: string }[]>([]);
 const loading = ref(true);
@@ -159,6 +167,12 @@ function openDocumentViewer(id: string, name: string, mimeType: string) {
     showDocumentViewer.value = true;
 }
 
+const imageCover = (id: string) => {
+    if(props.anpr && props.site){
+        return getFileUrlAnpr(`${props.site}/${id}`)
+    } else return getFileUrl(id)
+}
+
 function getFileIcon(mimeType: string): string {
     if (mimeType.startsWith('image/')) return 'mdi-image';
     if (mimeType.startsWith('video/')) return 'mdi-video';
@@ -206,7 +220,11 @@ watchEffect(async () => {
 
             try {
                 // Try to get the actual file with proper MIME type detection from blob
-                const fileUrl = getFileUrl(item.id);
+                // const fileUrl = getFileUrl(item.id);
+                let fileUrl = ""
+                if(props.anpr && props.site){
+                    fileUrl = getFileUrlAnpr(`${props.site}/${item.id}`)
+                } else fileUrl = getFileUrl(item.id);
                 file = await urlToFile(fileUrl, item.name);
                 mimeType = file.type || 'application/octet-stream';
 

package/components/DashboardMain.vue

@@ -984,60 +984,44 @@
               <div
                 v-for="item in formattedActivePatrolItems"
                 :key="item.id || item._id"
-                class="d-flex align-center justify-space-between"
-                style="
-                  padding: 16px 20px;
-                  border: 1px solid #e2e8f0;
-                  border-radius: 12px;
-                  margin-bottom: 12px;
-                  background-color: #ffffff;
-                  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02);
-                "
+                class="active-patrol-row"
               >
-                <div style="flex: 1; min-width: 140px">
-                  <strong
-                    style="
-                      display: block;
-                      font-size: 15px;
-                      font-weight: 700;
-                      color: #0b2f47;
-                      margin-bottom: 4px;
-                    "
-                    >{{ item.title || item.name }}</strong
-                  >
-                  <span style="font-size: 13px; color: #94a3b8">{{
-                    item.subtitle || item.location || ""
-                  }}</span>
+                <div class="active-patrol-main">
+                  <strong>{{ item.title || item.name }}</strong>
+                  <span>{{ item.subtitle || item.location || "" }}</span>
                 </div>
 
-                <div
-                  style="flex: 1; display: flex; align-items: center; gap: 12px"
-                >
-                  <AvatarMain
-                    :name="item.person || item.assignedTo"
-                    :size="36"
-                  />
-                  <span style="font-size: 14px; color: #64748b">{{
-                    item.person || item.assignedTo
-                  }}</span>
+                <div class="active-patrol-assignees">
+                  <div class="active-patrol-assignee">
+                    <AvatarMain :name="item.primaryAssignee" :size="24" />
+                    <span>{{ item.primaryAssignee }}</span>
+                  </div>
+                  <span
+                    v-if="item.extraAssigneeCount > 0"
+                    class="active-patrol-more-pill active-patrol-tooltip"
+                    :data-tooltip="item.extraAssignees.join(', ')"
+                  >
+                    +{{ item.extraAssigneeCount }}
+                  </span>
                 </div>
 
-                <div style="flex: 1; display: flex; justify-content: center">
+                <div class="active-patrol-statuses">
                   <div
-                    :style="getPatrolStatusStyle(item.status)"
-                    style="
-                      padding: 6px 16px;
-                      border-radius: 20px;
-                      font-size: 13px;
-                      font-weight: 500;
-                      text-transform: capitalize;
-                    "
+                    class="active-patrol-status-pill"
+                    :style="getPatrolStatusStyle(item.primaryStatus)"
                   >
-                    {{ item.status }}
+                    {{ item.primaryStatus }}
                   </div>
+                  <span
+                    v-if="item.extraStatusCount > 0"
+                    class="active-patrol-more-pill active-patrol-tooltip"
+                    :data-tooltip="item.extraStatuses.join(', ')"
+                  >
+                    +{{ item.extraStatusCount }}
+                  </span>
                 </div>
 
-                <div style="flex: 0 0 auto; text-align: right">
+                <div class="active-patrol-action">
                   <v-btn
                     variant="outlined"
                     class="text-none font-weight-medium"
@@ -1545,30 +1529,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 +1548,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"],
@@ -1603,14 +1573,14 @@ const moduleWidgetPermissions: Record<string, string[]> = {
     "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"],
@@ -1633,9 +1603,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];
@@ -1643,20 +1618,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)
     );
   }
 
@@ -2774,18 +2751,23 @@ const activePatrolItems = computed<any[]>(
 
 const formattedActivePatrolItems = computed<any[]>(() => {
   return activePatrolItems.value.map((item) => {
-    let status = item.status;
-    if (Array.isArray(status)) {
-      status = status.join(", ");
-    }
-    let person = item.person || item.assignedTo || "Unassigned";
-    if (Array.isArray(person)) {
-      person = person.join(", ");
-    }
+    const statuses = normalizeListValue(item.status || "Pending");
+    const assignees = normalizeListValue(
+      item.person || item.assignedTo || "Unassigned"
+    );
+
     return {
       ...item,
-      status,
-      person,
+      status: statuses.join(", "),
+      statuses,
+      primaryStatus: statuses[0] || "Pending",
+      extraStatuses: statuses.slice(1),
+      extraStatusCount: Math.max(0, statuses.length - 1),
+      person: assignees.join(", "),
+      assignees,
+      primaryAssignee: assignees[0] || "Unassigned",
+      extraAssignees: assignees.slice(1),
+      extraAssigneeCount: Math.max(0, assignees.length - 1),
     };
   });
 });
@@ -3955,6 +3937,20 @@ function normalizeStatus(value: any) {
   return text.replace(/[_-]+/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
 
+function normalizeListValue(value: any) {
+  if (Array.isArray(value)) {
+    return value
+      .flatMap((entry) => normalizeListValue(entry))
+      .map((entry) => String(entry).trim())
+      .filter(Boolean);
+  }
+
+  return String(value || "")
+    .split(",")
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+}
+
 function getStatusTone(status: any) {
   const s = String(status || "").toLowerCase();
   if (
@@ -4422,6 +4418,151 @@ function formatDashboardTime(value?: string) {
   border: 2px solid #f9c97c;
 }
 
+.active-patrol-row {
+  align-items: center;
+  background-color: #ffffff;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02);
+  display: grid;
+  gap: 10px;
+  grid-template-columns: 150px minmax(0, 1fr) max-content max-content;
+  margin-bottom: 12px;
+  min-height: 64px;
+  overflow: visible;
+  padding: 12px 14px;
+}
+
+.active-patrol-main {
+  min-width: 0;
+}
+
+.active-patrol-main strong {
+  color: #0b2f47;
+  display: block;
+  font-size: 13px;
+  font-weight: 700;
+  line-height: 1.25;
+  margin-bottom: 3px;
+  overflow-wrap: anywhere;
+}
+
+.active-patrol-main span {
+  color: #94a3b8;
+  display: block;
+  font-size: 11px;
+  line-height: 1.25;
+  overflow-wrap: anywhere;
+}
+
+.active-patrol-assignees {
+  align-items: center;
+  display: flex;
+  gap: 6px;
+  min-width: 0;
+}
+
+.active-patrol-assignee {
+  align-items: center;
+  background: #f8fafc;
+  border: 1px solid #e7edf3;
+  border-radius: 999px;
+  display: inline-flex;
+  flex: 1 1 auto;
+  gap: 6px;
+  max-width: 100%;
+  min-width: 0;
+  padding: 2px 8px 2px 3px;
+}
+
+.active-patrol-assignee span {
+  color: #475569;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1.2;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.active-patrol-statuses {
+  align-items: center;
+  display: flex;
+  gap: 6px;
+  justify-content: flex-start;
+  min-width: 0;
+}
+
+.active-patrol-status-pill {
+  border-radius: 20px;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1.2;
+  padding: 5px 10px;
+  text-transform: capitalize;
+  white-space: nowrap;
+}
+
+.active-patrol-more-pill {
+  align-items: center;
+  background: #eef3f8;
+  border: 1px solid #dbe4ed;
+  border-radius: 999px;
+  color: #607386;
+  display: inline-flex;
+  flex: 0 0 auto;
+  font-size: 11px;
+  font-weight: 800;
+  height: 24px;
+  justify-content: center;
+  line-height: 1;
+  min-width: 30px;
+  padding: 0 8px;
+  position: relative;
+  white-space: nowrap;
+}
+
+.active-patrol-action {
+  justify-self: end;
+  text-align: right;
+}
+
+.active-patrol-tooltip::after {
+  background: #0f2638;
+  border-radius: 6px;
+  bottom: calc(100% + 8px);
+  box-shadow: 0 8px 24px rgba(15, 38, 56, 0.18);
+  color: #ffffff;
+  content: attr(data-tooltip);
+  font-size: 11px;
+  font-weight: 600;
+  left: 50%;
+  line-height: 1.35;
+  max-width: 260px;
+  opacity: 0;
+  padding: 7px 9px;
+  pointer-events: none;
+  position: absolute;
+  text-align: left;
+  transform: translate(-50%, 4px);
+  transition: opacity 0.14s ease, transform 0.14s ease;
+  white-space: normal;
+  width: max-content;
+  z-index: 5;
+}
+
+.active-patrol-tooltip:hover::after {
+  opacity: 1;
+  transform: translate(-50%, 0);
+}
+
+@media (max-width: 960px) {
+  .active-patrol-row {
+    grid-template-columns: 120px minmax(0, 1fr) max-content max-content;
+  }
+}
+
 .figma-icon-badge {
   align-items: center;
   border-radius: 50%;

package/components/ImageCarousel.vue

@@ -7,7 +7,7 @@
           <template v-if="fileTypes?.[x] === 'image'">
             <v-carousel-item height="100%" width="100%" rounded="lg">
               <v-row no-gutters class="w-100 h-100" align="center">
-                <v-img :lazy-src="getFileUrl(x)" :src="getFileUrl(x)" width="70%" height="70%"
+                <v-img :lazy-src="getFinalUrl(x)" :src="getFinalUrl(x)" width="70%" height="70%"
                   :alt="'Image Viewer Card -' + index"></v-img>
               </v-row>
               <template v-slot:placeholder>
@@ -21,7 +21,7 @@
             <v-carousel-item>
               <v-row no-gutters class="h-100 w-100" align="center" justify="center">
                 <video width="80%" height="80%" controls>
-                  <source :src="getFileUrl(x)" />
+                  <source :src="getFinalUrl(x)" />
                 </video>
               </v-row>
               <template v-slot:placeholder>
@@ -78,11 +78,19 @@ const props = defineProps({
   files: {
     type: Array as PropType<string[]>,
     default: []
+  },
+  site: {
+    type: String,
+    default: ""
+  },
+  anpr: {
+    type: Boolean,
+    default: false
   }
 });
 
 
-const { getFileUrl, urlToFile } = useFile()
+const { getFileUrl, urlToFile, getFileUrlAnpr } = useFile()
 const overlay = defineModel({ required: true, default: false });
 const activeIndex = ref(0);
 const fileTypes = ref<Record<string, "image" | "video" | "other">>({});
@@ -107,10 +115,13 @@ async function resolveFileTypes() {
 
   for (const x of props.files) {
     try {
-      const url = getFileUrl(x);
+      let url = ""
+      if (props.anpr && props.site) {
+        url = getFileUrlAnpr(`${props.site}/${x}`)
+      } else url = getFileUrl(x);
       const file = await urlToFile(url, x);
       const type = file?.type;
-     
+
 
       if (type?.startsWith("video")) fileTypes.value[x] = "video";
       else if (type?.startsWith("image")) fileTypes.value[x] = "image";
@@ -129,6 +140,13 @@ watch(
 );
 
 
+const getFinalUrl = (id: string) => {
+  if (props.anpr && props.site) {
+    return getFileUrlAnpr(`${props.site}/${id}`)
+  } else return getFileUrl(id)
+}
+
+
 </script>
 
 <style scoped>

package/components/ManageChecklistMain.vue

@@ -304,31 +304,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/MemberMain.vue

@@ -149,21 +149,23 @@
       </template>
 
       <template #footer>
-        <v-btn
-          variant="text"
-          @click="confirmDialog = false"
-          :disabled="updateLoading"
-        >
-          Close
-        </v-btn>
-        <v-btn
-          color="primary"
-          variant="flat"
-          @click="handleUpdateMemberStatus"
-          :loading="updateLoading"
-        >
-          {{ updateActionText }} Member </v-btn
-        >r
+        <div class="d-flex justify-center ga-3 w-100">
+          <v-btn
+            variant="text"
+            @click="confirmDialog = false"
+            :disabled="updateLoading"
+          >
+            Close
+          </v-btn>
+          <v-btn
+            color="primary"
+            variant="flat"
+            @click="handleUpdateMemberStatus"
+            :loading="updateLoading"
+          >
+            {{ updateActionText }} Member
+          </v-btn>
+        </div>
       </template>
     </ConfirmDialog>
 

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(

package/components/RolePermissionFormPreviewUpdate.vue

@@ -19,7 +19,7 @@
               :error-messages="errorMessages"
               :readonly="!edit"
               :hint="
-                edit ? 'Select permissions' : 'Permissions are not editable'
+                edit && 'Select permissions'
               "
               persistent-hint
             />

package/components/ServiceProviderMain.vue

@@ -734,7 +734,7 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAllByUserId } = useMember();
+const { getAll: getAllMembers, getAllByUserId } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
@@ -757,6 +757,9 @@ const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
+const { getByUserType } = useMember();
+const { getOrgs } = useOrg();
+const { getByEmail } = useServiceProvider();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
@@ -767,40 +770,54 @@ async function checkExistingAccount(email: string) {
   checkingExistingAccount.value = true;
 
   try {
+    // Check if user exists
     const user = await getUserByEmail(email);
 
 if (!user?._id) return;
 
-const members = await getAllByUserId(user._id);
+    // Check if this service provider already exists in current org/site
+    const serviceProviders = await getByEmail({
+  email,
+  orgId: props.orgId,
+  siteId: props.siteId,
+});
 
-const appMember = (members.items ?? []).find(
-  (member: any) => member.type === serviceProviderInvite.value.app
-);
+console.log("serviceProviders", serviceProviders);
 
-if (!appMember) {
-  existingAccount.value = null;
-  return;
-}
+    if (serviceProviders?.length) {
+      messageServiceProvider.value =
+        "This service provider already exists.";
+      return;
+    }
 
-if (
-  appMember.org === props.orgId &&
-  (appMember.siteId || "") === (props.siteId || "")
-) {
-  existingAccount.value = null;
-  messageServiceProvider.value =
-    "This user is already a member of this service provider.";
-  return;
-}
+    // Check existing memberships
+    const members = await getAllByUserId(user._id);
 
-existingAccount.value = {
-  _id: appMember.org,
-  text: appMember.orgName,
-  org: appMember.org,
-  orgName: appMember.orgName,
-  siteId: appMember.siteId,
-  siteName: appMember.siteName,
-};
+    const appMember = (members.items ?? []).find(
+      (member: any) => member.type === serviceProviderInvite.value.app
+    );
+
+    if (!appMember) return;
 
+    // Already belongs to the same org/site
+    if (
+      appMember.org === props.orgId &&
+      (appMember.siteId || "") === (props.siteId || "")
+    ) {
+      messageServiceProvider.value =
+        "This user is already a member of this service provider.";
+      return;
+    }
+
+    // Existing account in another org/site
+    existingAccount.value = {
+      _id: appMember.org,
+      text: appMember.orgName,
+      org: appMember.org,
+      orgName: appMember.orgName,
+      siteId: appMember.siteId,
+      siteName: appMember.siteName,
+    };
   } catch (error) {
     existingAccount.value = null;
   } finally {

package/components/VisitorForm.vue

@@ -36,10 +36,17 @@
                   </template>
 
                   <v-list v-if="nricSearchResults.length" class="pa-1 phone-search-results">
-                    <v-list-item v-for="(item, index) in nricSearchResults" :key="item._id || index"
-                      @click="selectNricSearchResult(item)" class="cursor-pointer nric-search-item">
-                      <VisitorSearchResultSummary :item="item" />
-                    </v-list-item>
+                    <div class="search-results-scroll">
+                      <v-list-item v-for="(item, index) in nricSearchResults" :key="item._id || index"
+                        @click="selectNricSearchResult(item)" class="cursor-pointer nric-search-item">
+                        <VisitorSearchResultSummary :item="item" />
+                      </v-list-item>
+                    </div>
+                    <div class="search-results-close pa-1">
+                      <v-btn block variant="flat" color="red" @click.stop="closeAutofillSearchResults('nric')">
+                        Close
+                      </v-btn>
+                    </div>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -58,10 +65,17 @@
                   </template>
 
                   <v-list v-if="phoneSearchResults.length" class="pa-1 phone-search-results">
-                    <v-list-item v-for="(item, index) in phoneSearchResults" :key="item._id || index"
-                      @click="selectPhoneNumberSearchResult(item)" class="cursor-pointer nric-search-item">
-                      <VisitorSearchResultSummary :item="item" />
-                    </v-list-item>
+                    <div class="search-results-scroll">
+                      <v-list-item v-for="(item, index) in phoneSearchResults" :key="item._id || index"
+                        @click="selectPhoneNumberSearchResult(item)" class="cursor-pointer nric-search-item">
+                        <VisitorSearchResultSummary :item="item" />
+                      </v-list-item>
+                    </div>
+                    <div class="search-results-close pa-1">
+                      <v-btn block variant="flat" color="red" @click.stop="closeAutofillSearchResults('contact')">
+                        Close
+                      </v-btn>
+                    </div>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -77,15 +91,23 @@
                 <v-menu v-model="vehicleSearchMenu" location="bottom" offset-y :close-on-content-click="false">
                   <template #activator="{ props }">
                     <InputVehicleNumber v-bind="props" v-model="visitor.plateNumber" density="comfortable"
-                      @update:model-value="handleUpdateVehicleNumber" @focus="isPlateNumberFieldFocused = true"
+                      @update:model-value="handleUpdateVehicleNumber" @focus="handleFocusPlateNumber"
                       @blur="isPlateNumberFieldFocused = false" />
                   </template>
 
                   <v-list v-if="vehicleSearchResults.length" class="pa-1 phone-search-results">
-                    <v-list-item v-for="(item, index) in vehicleSearchResults" :key="item._id || index"
-                      @click="selectPlateNumberSearchResult(item)" class="cursor-pointer nric-search-item">
-                      <VisitorSearchResultSummary :item="item" />
-                    </v-list-item>
+                    <div class="search-results-scroll">
+                      <v-list-item v-for="(item, index) in vehicleSearchResults" :key="item._id || index"
+                        @click="selectPlateNumberSearchResult(item)" class="cursor-pointer nric-search-item">
+                        <VisitorSearchResultSummary :item="item" />
+                      </v-list-item>
+                    </div>
+                    <div class="search-results-close pa-1">
+                      <v-btn block variant="flat" color="red"
+                        @click.stop="closeAutofillSearchResults('vehicleNumber')">
+                        Close
+                      </v-btn>
+                    </div>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -308,10 +330,10 @@
 
           <div class="nric-selected-person d-flex align-center justify-space-between ga-3 mb-5">
             <span>{{ selectedNricSearchResult.name || "Unknown" }}</span>
-            <span class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
+            <span v-if="!visitor.nric || currentAutofillSource === 'nric'" class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
           </div>
 
-          <template v-if="!visitor.contact && selectedNricContactOptions.length >= 1">
+          <template v-if="(!visitor.contact || currentAutofillSource === 'contact') && selectedNricContactOptions.length >= 1">
             <h3 class="nric-options-section-title font-weight-bold mb-2">Contact</h3>
             <v-radio-group v-model="selectedNricContact" hide-details color="success" class="nric-option-group">
               <v-radio v-for="contact in selectedNricContactOptions" :key="contact" :label="contact" :value="contact"
@@ -319,7 +341,7 @@
             </v-radio-group>
           </template>
 
-          <template v-if="!visitor.plateNumber && selectedNricPlateOptions.length >= 1">
+          <template v-if="(!visitor.plateNumber || currentAutofillSource === 'vehicleNumber') && selectedNricPlateOptions.length >= 1">
             <h3 class="nric-options-section-title font-weight-bold mb-2 mt-5">Vehicle</h3>
             <v-radio-group v-model="selectedNricPlate" hide-details color="success" class="nric-option-group">
               <v-radio v-for="plate in selectedNricPlateOptions" :key="plate" :label="plate" :value="plate"
@@ -1044,8 +1066,8 @@ function selectAutofillSearchResult(item: Partial<TPeople>, source: Exclude<Auto
   const selectedPlate =
     findMatchingPlateOption(plateOptions, visitor.plateNumber) || plateOptions[0] || "";
 
-  const needsContactChoice = !visitor.contact?.trim() && contactOptions.length > 1;
-  const needsPlateChoice = !visitor.plateNumber?.trim() && plateOptions.length > 1;
+  const needsContactChoice = (!visitor.contact?.trim() || source === 'contact') && contactOptions.length > 1;
+  const needsPlateChoice = (!visitor.plateNumber?.trim() || source === 'vehicleNumber') && plateOptions.length > 1;
 
   if (needsContactChoice || needsPlateChoice) {
     nricSearchMenu.value = false;
@@ -1066,6 +1088,23 @@ function selectAutofillSearchResult(item: Partial<TPeople>, source: Exclude<Auto
   });
 }
 
+function closeAutofillSearchResults(source: Exclude<AutofillSource, null>) {
+  if (source === "nric") {
+    nricSearchMenu.value = false;
+    nricSearchResults.value = [];
+  }
+
+  if (source === "contact") {
+    phoneSearchMenu.value = false;
+    phoneSearchResults.value = [];
+  }
+
+  if (source === "vehicleNumber") {
+    vehicleSearchMenu.value = false;
+    vehicleSearchResults.value = [];
+  }
+}
+
 function closeNricAutofillOptions() {
   dialog.nricAutofillOptions = false;
   selectedNricSearchResult.value = null;
@@ -1503,6 +1542,15 @@ function handleUpdateVehicleNumber() {
   debounceFetchPlateNumber();
 }
 
+const handleFocusPlateNumber = () => {
+  isPlateNumberFieldFocused.value = true;
+  if (prop.mode === 'register') {
+
+    handleUpdateVehicleNumber();
+  }
+};
+
+
 function backToSelection() {
   emit("back");
   message.value = "";
@@ -2108,10 +2156,22 @@ onMounted(() => {
 }
 
 .phone-search-results {
+  display: flex;
+  flex-direction: column;
   max-height: 400px;
+  overflow: hidden;
+}
+
+.search-results-scroll {
+  flex: 1 1 auto;
+  min-height: 0;
   overflow-y: auto;
 }
 
+.search-results-close {
+  flex: 0 0 auto;
+}
+
 .nric-options-card {
   border-radius: 16px !important;
 }

package/components/VisitorManagement.vue

@@ -675,6 +675,24 @@
                   />
                 </div>
               </span>
+              <span
+                v-else-if="
+                  key === 'snapshotEntryImage' || key === 'snapshotExitImage'
+                "
+                class="d-flex flex-column"
+              >
+                <strong class="w-full">{{ label }}:</strong>
+                <div class="d-flex flex-wrap ga-2">
+                  <AttachmentsViewer
+                    :files="
+                      mappedSnapshots([selectedVisitorObject.snapshotEntryImage])
+                    "
+                    anpr
+                    :site="siteId"
+                    title="Snapshot"
+                  />
+                </div>
+              </span>
 
               <span
                 v-else-if="selectedVisitorObject[key]"
@@ -825,10 +843,8 @@
                 item-title="label"
                 item-value="value"
                 v-model="pass.status"
-                :disabled="
-                  selectedVisitorObject.checkOut || pass.status == 'Removed'
-                "
-              ></v-select>
+                :disabled="pass.status == 'Removed'"
+              />
               <v-textarea
                 v-if="pass.status === 'Lost' || pass.status === 'Damaged'"
                 no-resize
@@ -836,8 +852,7 @@
                 class="w-100"
                 density="compact"
                 v-model="pass.remarks"
-                :disabled="selectedVisitorObject.checkOut"
-              ></v-textarea>
+              />
             </v-row>
           </div>
           <div v-if="keyReturnStatuses.length > 0" class="mb-2">
@@ -864,10 +879,8 @@
                 item-title="label"
                 item-value="value"
                 v-model="key.status"
-                :disabled="
-                  selectedVisitorObject.checkOut || key.status == 'Removed'
-                "
-              ></v-select>
+                :disabled="key.status == 'Removed'"
+              />
               <v-textarea
                 v-if="key.status === 'Lost' || key.status === 'Damaged'"
                 no-resize
@@ -875,8 +888,7 @@
                 class="w-100"
                 density="compact"
                 v-model="key.remarks"
-                :disabled="selectedVisitorObject.checkOut"
-              ></v-textarea>
+              />
             </v-row>
           </div>
 
@@ -886,11 +898,11 @@
               color="blue"
               density="comfortable"
               class="text-capitalize"
-              :disabled="selectedVisitorObject.checkOut"
               :loading="loading.updatingPassKeys"
               @click.stop="handleUpdatePassKeys"
-              >Update Pass/Keys</v-btn
             >
+              Update Pass/Keys
+            </v-btn>
           </v-row>
         </v-card-text>
         <v-toolbar class="pa-0" density="compact">
@@ -900,8 +912,9 @@
                 variant="text"
                 block
                 @click="dialog.returnPassesKeys = false"
-                >Close</v-btn
               >
+                Close
+              </v-btn>
             </v-col>
             <v-col cols="6">
               <v-btn
@@ -915,8 +928,9 @@
                   !canConfirmCheckout || selectedVisitorObject.checkOut
                 "
                 @click="proceedCheckout"
-                >Confirm Checkout</v-btn
               >
+                Confirm Checkout
+              </v-btn>
             </v-col>
           </v-row>
         </v-toolbar>
@@ -1442,6 +1456,15 @@ function mappedAttachments(attachments: string[]) {
   });
 }
 
+function mappedSnapshots(attachments: string[]) {
+  return attachments.map((x, index) => {
+    return {
+      id: x,
+      name: `Snapshot - ${x}`,
+    };
+  });
+}
+
 function normalizeDateOnly(value: string) {
   if (!value) return "";
   if (/^\d{4}-\d{2}-\d{2}$/.test(value)) return value;

package/composables/useCleaningSchedulePermission.ts

@@ -1,58 +1,23 @@
 export function useCleaningSchedulePermission() {
-  const { hasPermission } = usePermission();
-  const { permissions } = useCleaningPermission();
-
   const { userAppRole } = useLocalSetup();
 
-  const canViewSchedules = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-all-schedules");
-  });
-
-  const canViewScheduleDetails = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-schedule-details");
-  });
-
-  const canDownloadSchedule = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "download-schedule");
-  });
-
-  const canManageScheduleTasks = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "manage-schedule-tasks");
-  });
-
-  const canGenerateChecklist = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "generate-checklist");
-  });
-
-  const canViewHistory = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "view-history");
-  });
-
-  const canAddRemarks = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "add-remarks");
-  });
+  const can = (action: string) =>
+    computed(() => {
+      const permissions = userAppRole.value?.permissions;
+      if (!permissions) return false;
+      if (permissions.includes("*")) return true;
+      return permissions.some((permission) =>
+        permission.endsWith(`-schedule-mgmt:${action}`),
+      );
+    });
 
   return {
-    canViewSchedules,
-    canViewScheduleDetails,
-    canDownloadSchedule,
-    canManageScheduleTasks,
-    canGenerateChecklist,
-    canViewHistory,
-    canAddRemarks,
+    canViewSchedules: can("see-all-schedules"),
+    canViewScheduleDetails: can("see-schedule-details"),
+    canDownloadSchedule: can("download-schedule"),
+    canManageScheduleTasks: can("manage-schedule-tasks"),
+    canGenerateChecklist: can("generate-checklist"),
+    canViewHistory: can("view-history"),
+    canAddRemarks: can("add-remarks"),
   };
 }

package/composables/useServiceProvider.ts

@@ -236,6 +236,26 @@ export default function useServiceProvider() {
     );
   }
 
+   async function getByEmail({
+    email = "",
+    orgId = "",
+    siteId = "",
+    serviceProviderOrgId = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/service-providers/email",
+      {
+        method: "GET",
+        query: {
+          email,
+          ...(orgId ? { orgId } : {}),
+          ...(siteId ? { siteId } : {}),
+          ...(serviceProviderOrgId ? { serviceProviderOrgId } : {}),
+        },
+      }
+    );
+  }
+
   return {
     serviceProviders,
     serviceProvider,
@@ -254,5 +274,6 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
+    getByEmail,
   };
 }

package/package.json

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