@7365admin1/layer-common 3.1.4-staging.53 → 3.1.4-staging.54

package/components/DashboardMain.vue

@@ -1483,6 +1483,7 @@ const props = defineProps({
   },
   title: { type: String, default: "" },
   extraWidgetKeys: { type: Array as () => string[], default: () => [] },
+  hiddenWidgetKeys: { type: Array as () => string[], default: () => [] },
   showHeaderActions: { type: Boolean, default: true },
   appKey: {
     type: String as () =>
@@ -1530,51 +1531,26 @@ const { downloadPDF } = usePDFDownload();
 const route = useRoute();
 
 const propertyWidgetPermissions: Record<string, string[]> = {
-  workOrders: [
-    "work_orders:see-all-work-orders",
-    "work-order:see-all-work-orders",
-  ],
+  workOrders: ["work_orders:see-all-work-orders"],
   incidents: ["incident-reports:see-incident-reports"],
-  visitors: ["visitorManagement:see-all-visitor"],
+  visitors: ["visitor-mgmt:see-all-visitor"],
   facilityBookings: ["facility-booking-mgmt:see-all-facility-booking"],
-  activity: [
-    "work_orders:see-all-work-orders",
-    "work-order:see-all-work-orders",
-  ],
+  activity: ["work_orders:see-all-work-orders"],
   upcomingEvents: ["event-mgmt:see-all-event"],
   todayReminders: ["event-mgmt:see-all-event"],
   todayAttentions: [
     "incident-reports:see-incident-reports",
     "facility-booking-mgmt:see-all-facility-booking",
   ],
-  workOrderStatus: [
-    "work_orders:see-all-work-orders",
-    "work-order:see-all-work-orders",
-  ],
+  workOrderStatus: ["work_orders:see-all-work-orders"],
   feedbacks: ["feedbacks:see-all-feedback"],
   activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs"],
 };
 
 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",
-  ],
+  openWorkOrder: ["work_orders:see-all-work-orders"],
+  workOrders: ["work_orders:see-all-work-orders"],
+  activity: ["work_orders:see-all-work-orders"],
   recentActivity: [
     "work_orders:see-all-work-orders",
     "work_order:see-all-work-orders",
@@ -1594,7 +1570,7 @@ const moduleWidgetPermissions: Record<string, string[]> = {
     "incident-reports:see-incident-reports",
     "incident-reports:see-all-incident-reports",
   ],
-  visitors: ["visitor:see-all-visitor"],
+  visitors: ["visitor-mgmt:see-all-visitor"],
   facilityBookings: ["facility-booking:see-all-facility-booking"],
   patrolCompliance: [
     "virtual-patrol:see-all-virtual-patrol-logs",
@@ -1610,6 +1586,7 @@ function hasSchedulePermission(permissions: string[], action: string) {
 }
 
 function canViewWidget(key: string) {
+  if (props.hiddenWidgetKeys.includes(key)) return false;
   const permissions = userAppRole.value?.permissions;
   const modulePermissions = isPropertyMode.value
     ? propertyWidgetPermissions[key]

package/composables/useEquipmentManagementPermission.ts

@@ -80,7 +80,7 @@ export function useEquipmentManagementPermission() {
       userAppRole.value,
       permissions,
       "supply-mgmt",
-      "request-item"
+      "checkout-item"
     );
   });
 

package/composables/useEquipmentPermission.ts

@@ -76,7 +76,7 @@ export function useEquipmentPermission() {
       userAppRole.value,
       permissions,
       "supply-mgmt",
-      "request-item"
+      "checkout-item"
     );
   });
 

package/package.json

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