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

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

@@ -1545,16 +1545,30 @@ 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: [
-    "work_orders:see-all-work-orders",
+    "workOrder: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: [
-    "work_orders:see-all-work-orders",
+    "workOrder:see-all-work-orders",
     "work-order:see-all-work-orders",
   ],
   upcomingEvents: ["event-mgmt:see-all-event"],
@@ -1564,7 +1578,7 @@ const propertyWidgetPermissions: Record<string, string[]> = {
     "facility-booking-mgmt:see-all-facility-booking",
   ],
   workOrderStatus: [
-    "work_orders:see-all-work-orders",
+    "workOrder:see-all-work-orders",
     "work-order:see-all-work-orders",
   ],
   feedbacks: ["feedbacks:see-all-feedback"],
@@ -1573,30 +1587,27 @@ 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",
   ],
-  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",
+  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",
   ],
   staffStatus: ["attendance-mgmt:see-all-attendance"],
   attendance: ["attendance-mgmt:see-all-attendance"],
@@ -1619,14 +1630,9 @@ 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];
@@ -1634,22 +1640,20 @@ 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 (modulePermissions) {
-    return modulePermissions.some((permission) =>
-      permissions.includes(permission)
+  if (dashboardPermission || modulePermissions) {
+    return (
+      (dashboardPermission && permissions.includes(dashboardPermission)) ||
+      Boolean(
+        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,11 +270,10 @@ const {
       page: page.value,
       status: props.status,
       search: headerSearch.value,
-      // type: "user-invite,member-invite",
-      type: "member-invite",
+      type: "user-invite,member-invite",
       app: props.app,
       orgId: props.org,
-      // siteId: props.siteId,
+      siteId: props.siteId,
     }),
   {
     watch: [() => props.status]

package/components/ManageChecklistMain.vue

@@ -305,38 +305,31 @@
 
       <v-divider />
 
-      <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-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-card>
   </v-dialog>
 

package/components/PhotoUpload.vue

@@ -59,21 +59,6 @@
     </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">
@@ -211,8 +196,6 @@ 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);
@@ -222,8 +205,10 @@ const uploading = ref(false);
 const { addFile } = useFile();
 
 function viewPhoto(photoData: string) {
-  selectedPhoto.value = photoData;
-  showPhotoPreview.value = true;
+  const link = document.createElement("a");
+  link.href = photoData;
+  link.target = "_blank";
+  link.click();
 }
 
 watch(

package/components/VisitorForm.vue

@@ -66,7 +66,7 @@
                     <v-list-item v-for="(item, index) in nricSearchResults" :key="item._id || index"
                       @click="selectNricSearchResult(item)" class="cursor-pointer">
                       <v-list-item-title>{{ item.name || 'Unknown' }}</v-list-item-title>
-                      <v-list-item-subtitle>NRIC: {{ item.nric }} | Contact No: {{ item.contact }} </v-list-item-subtitle>
+                      <v-list-item-subtitle>{{ item.contact }}</v-list-item-subtitle>
                     </v-list-item>
                   </v-list>
                 </v-menu>
@@ -155,13 +155,9 @@
           <v-col v-if="shouldShowField('plateNumber')" cols="12">
             <v-row>
               <v-col cols="12">
-                <InputLabel class="text-capitalize" title="Vehicle Number" :required="isVehicleRequired" />
+                <InputLabel class="text-capitalize" title="Vehicle Number" required />
                 <!-- <v-text-field v-model.trim.uppercase="visitor.plateNumber" density="comfortable" /> -->
-                <InputVehicleNumber
-                  v-model="visitor.plateNumber"
-                  :rules="[isVehicleRequired ? requiredRule : () => true]"
-                  density="comfortable"
-                />
+                <InputVehicleNumber v-model="visitor.plateNumber" density="comfortable" />
               </v-col>
             </v-row>
           </v-col>
@@ -639,10 +635,6 @@ const requireNRIC = computed(() => {
   return prop.type !== "walk-in" && prop.type !== "guest";
 });
 
-const isVehicleRequired = computed(() => {
-  return ["guest", "drop-off", "pick-up"].includes(prop.type);
-});
-
 const hidQrCodePassConfig = computed(() => {
   return (siteData.value as any)?.metadata?.hidQrCodePass || {};
 });

package/composables/useCleaningSchedulePermission.ts

@@ -1,23 +1,58 @@
 export function useCleaningSchedulePermission() {
+  const { hasPermission } = usePermission();
+  const { permissions } = useCleaningPermission();
+
   const { userAppRole } = useLocalSetup();
 
-  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}`),
-      );
-    });
+  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");
+  });
 
   return {
-    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"),
+    canViewSchedules,
+    canViewScheduleDetails,
+    canDownloadSchedule,
+    canManageScheduleTasks,
+    canGenerateChecklist,
+    canViewHistory,
+    canAddRemarks,
   };
 }

package/package.json

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

package/types/customer.d.ts

@@ -41,5 +41,4 @@ type TSiteCategory =
   | "shopping_mall"
   | "mix_development"
   | "industrial"
-  | "co_working"
-  | "co_living";
+  | "co_working_co_living";