@7365admin1/layer-common 3.0.14 → 3.0.15

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.0.15
+
+### Patch Changes
+
+- ddf32e8: Update Layer-common version
+
 ## 3.0.14
 
 ### Patch Changes

package/components/DashboardMain.vue

@@ -653,7 +653,15 @@
                 <button
                   class="figma-row-action"
                   type="button"
-                  @click="navigateTo(dashboardPath('incident-reports'))"
+                  @click="
+                    navigateTo(
+                      item.type === 'facility-booking'
+                        ? `${dashboardPath('facility/bookings')}?booking=${
+                            item.id
+                          }`
+                        : dashboardPath(`incident-reports/${item.id}`)
+                    )
+                  "
                 >
                   {{ item.actionLabel || "Review" }}
                 </button>
@@ -1146,6 +1154,8 @@ type DashboardListItem = {
   tone?: string;
   color?: string;
   actionLabel?: string;
+  type?: string;
+  raw?: Record<string, any>;
 };
 
 type TaskItem = {
@@ -1236,21 +1246,36 @@ function canViewWidget(key: string) {
 
   const widgetToModulePermissionMap: Record<string, string[]> = {
     workOrders: ["work-orders:see-all-work-orders"],
-    incidents: ["incident-reports:see-incident-reports", "incident-reports:see-all-incident-reports"],
+    incidents: [
+      "incident-reports:see-incident-reports",
+      "incident-reports:see-all-incident-reports",
+    ],
     visitors: ["visitor:see-all-visitor"],
     facilityBookings: ["facility-booking:see-all-facility-booking"],
-    patrolCompliance: ["virtual-patrol:see-all-virtual-patrol-logs", "virtual-patrol:see-all-virtual-patrol-route"],
+    patrolCompliance: [
+      "virtual-patrol:see-all-virtual-patrol-logs",
+      "virtual-patrol:see-all-virtual-patrol-route",
+    ],
     staffStatus: ["attendance:see-all-attendance"],
     attendance: ["attendance:see-all-attendance"],
     feedbacks: ["feedbacks:see-all-feedbacks"],
-    upcomingEvents: ["bulletin-boards:see-all-bulletin-boards", "bulletin-board:see-all-bulletin-board"],
+    upcomingEvents: [
+      "bulletin-boards:see-all-bulletin-boards",
+      "bulletin-board:see-all-bulletin-board",
+    ],
     workOrderStatus: ["work-orders:see-all-work-orders"],
-    activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs", "virtual-patrol:see-all-virtual-patrol-route"],
-    taskSchedule: ["cleaning-schedule-mgmt:see-all-schedules"]
+    activePatrol: [
+      "virtual-patrol:see-all-virtual-patrol-logs",
+      "virtual-patrol:see-all-virtual-patrol-route",
+    ],
+    taskSchedule: ["cleaning-schedule-mgmt:see-all-schedules"],
   };
 
   const modulePerms = widgetToModulePermissionMap[key];
-  if (modulePerms && modulePerms.some(p => userAppRole.value.permissions?.includes(p))) {
+  if (
+    modulePerms &&
+    modulePerms.some((p) => userAppRole.value.permissions?.includes(p))
+  ) {
     return true;
   }
 
@@ -2034,23 +2059,26 @@ function computeFacilityMetric(): DashboardMetric {
     ).toLowerCase();
     return val === selected.toLowerCase();
   });
+  const ongoing = items.filter((i: any) => {
+    const s = String(i.status || "").toLowerCase();
+    return (
+      s.includes("ongoing") ||
+      s.includes("approved") ||
+      s.includes("in-progress")
+    );
+  }).length;
+  const waitingApproval = items.filter((i: any) => {
+    const s = String(i.status || "").toLowerCase();
+    return (
+      s.includes("pending") || s.includes("review") || s.includes("approval")
+    );
+  }).length;
+
   return {
     ...metric,
-    count: items.length,
-    ongoing: items.filter((i: any) => {
-      const s = String(i.status || "").toLowerCase();
-      return (
-        s.includes("ongoing") ||
-        s.includes("approved") ||
-        s.includes("in-progress")
-      );
-    }).length,
-    waitingApproval: items.filter((i: any) => {
-      const s = String(i.status || "").toLowerCase();
-      return (
-        s.includes("pending") || s.includes("review") || s.includes("approval")
-      );
-    }).length,
+    count: ongoing + waitingApproval,
+    ongoing,
+    waitingApproval,
   };
 }
 
@@ -2413,7 +2441,9 @@ function getMetricMeta(metric: DashboardMetric) {
     parts.push(`${formatNumber(toNumber(metric.ongoing))} ongoing`);
   if (typeof metric.waitingApproval !== "undefined")
     parts.push(
-      `${formatNumber(toNumber(metric.waitingApproval))} waiting approval`
+      `${formatNumber(toNumber(metric.waitingApproval))} ${
+        isPropertyMode.value ? "for approval" : "waiting approval"
+      }`
     );
   if (typeof metric.lowStock !== "undefined")
     parts.push(`${formatNumber(toNumber(metric.lowStock))} low stock`);
@@ -2446,6 +2476,10 @@ function getFilteredVisitorMetric(): DashboardMetric {
     };
   }
 
+  if (!items || !items.length) {
+    return metric;
+  }
+
   const filtered = items.filter(
     (item: any) => getVisitorFilterValue(item) === selected
   );
@@ -2487,6 +2521,8 @@ function normalizeListItems(keys: string[]): DashboardListItem[] {
     icon: item.icon || getListIcon(context),
     tone: item.tone,
     actionLabel: item.actionLabel,
+    type: item.type,
+    raw: item,
   }));
 }
 
@@ -2865,16 +2901,26 @@ function dashboardPath(path: string) {
   return `/${props.orgId}/${props.site}/${path}`;
 }
 
+function getSchedulePath() {
+  const service = props.serviceType;
+  if (service === "cleaning_services") return "cleaning-schedule";
+  if (service === "landscaping_services") return "landscape-schedule";
+  if (service === "pest_control_services") return "pest-schedule";
+  if (service === "pool_maintenance_services") return "pool-schedule";
+  if (service === "mechanical_electrical_services") return "technician-schedule";
+  return "schedule-task";
+}
+
 function goToDashboardRoute(routeKey: string) {
   if (!props.orgId || !props.site) return;
   const pathMap: Record<string, string> = {
     attendance: "attendance",
     feedbacks: "feedbacks",
-    scheduleTask: "schedule-task",
+    scheduleTask: getSchedulePath(),
     virtualPatrol: "virtual-patrol/logs",
     manpower: "manpower-monitoring/attendance",
     incidentReports: "incident-reports",
-    "virtual-patrol": "virtual-patrol",
+    "virtual-patrol": "virtual-patrol/logs",
     "work-orders": "work-orders",
     "event-mgmt": "event-mgmt",
     calendar: "calendar",
@@ -2896,10 +2942,15 @@ function goToListItem(item: TaskItem | FeedbackItem, routeKey: string) {
   }
   const pathMap: Record<string, string> = {
     feedbacks: "feedbacks",
-    scheduleTask: "schedule-task",
+    scheduleTask: getSchedulePath(),
   };
   const path = pathMap[routeKey] || routeKey;
-  router.push(`/${props.orgId}/${props.site}/${path}/${id}`);
+  const scheduleId = item.raw?.schedule?._id || item.raw?.schedule;
+  if (routeKey === "scheduleTask" && scheduleId) {
+    router.push(`/${props.orgId}/${props.site}/${path}/${scheduleId}/${id}`);
+  } else {
+    router.push(`/${props.orgId}/${props.site}/${path}/${id}`);
+  }
 }
 
 // ─── Widget Management ────────────────────────────────────────────────────────

package/package.json

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