@7365admin1/layer-common 3.1.2-staging.37 → 3.1.2

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

@@ -34,14 +34,3 @@ 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/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.1.2
+
+### Patch Changes
+
+- 56e957d: Update Package Version
+
 ## 3.1.1
 
 ### Patch Changes

package/components/AddEqupmentForm.vue

@@ -12,24 +12,6 @@
       <v-card-text class="pa-4">
         <v-form ref="formRef" v-model="valid">
           <v-row no-gutters class="pa-0">
-            <v-col cols="12" class="pa-0 mb-2">
-              <PhotoUpload
-                v-model="attachmentPhotos"
-                v-model:photo-ids="attachmentIds"
-                title="Photo"
-                @error="photoUploadError = $event"
-              />
-
-              <v-alert
-                v-if="photoUploadError"
-                type="error"
-                density="compact"
-                variant="tonal"
-                class="mt-2"
-              >
-                {{ photoUploadError }}
-              </v-alert>
-            </v-col>
             <v-col cols="12" class="pa-0 mb-2">
               <InputLabel for="name" title="Name" required class="mb-1" />
               <v-text-field
@@ -105,10 +87,6 @@ const unitOfMeasurementModel = defineModel("unitOfMeasurement", {
   type: String,
   default: "",
 });
-const attachmentModel = defineModel("attachment", {
-  type: String,
-  default: "",
-});
 const showDialog = defineModel({ type: Boolean, default: false });
 
 const prop = defineProps({
@@ -127,9 +105,6 @@ const emit = defineEmits(["saved", "close"]);
 const formRef = ref<any>(null);
 const valid = ref(false);
 const submitting = ref(false);
-const attachmentPhotos = ref<string[]>([]);
-const attachmentIds = ref<string[]>([]);
-const photoUploadError = ref("");
 
 const { requiredRule } = useUtils();
 
@@ -149,29 +124,6 @@ const unitOfMeasurementOptions = [
 watchEffect(() => {
   nameModel.value = prop.equipmentData?.name || "";
   unitOfMeasurementModel.value = prop.equipmentData?.unitOfMeasurement || "";
-  attachmentModel.value = prop.equipmentData?.attachment || "";
-});
-
-watch(
-  attachmentIds,
-  (photoIds) => {
-    const [attachmentId] = photoIds;
-    attachmentModel.value = attachmentId || "";
-
-    if (photoIds.length > 1) {
-      attachmentIds.value = attachmentId ? [attachmentId] : [];
-      attachmentPhotos.value = attachmentPhotos.value.slice(0, 1);
-    }
-  },
-  { deep: true }
-);
-
-watch(showDialog, (isOpen) => {
-  if (!isOpen) {
-    attachmentPhotos.value = [];
-    attachmentIds.value = [];
-    photoUploadError.value = "";
-  }
 });
 
 function close() {
@@ -195,15 +147,12 @@ async function submit() {
 
     emit("saved", {
       name: nameModel.value,
+
       unitOfMeasurement: unitOfMeasurementModel.value,
-      attachment: attachmentModel.value,
     });
 
     nameModel.value = "";
     unitOfMeasurementModel.value = "";
-    attachmentModel.value = "";
-    attachmentPhotos.value = [];
-    attachmentIds.value = [];
 
     showDialog.value = false;
     emit("close");

package/components/CameraMain.vue

@@ -28,6 +28,7 @@
             :items="items"
             fixed-header
             hide-default-footer
+            hide-default-header
             @click:row="handleRowClick"
             style="max-height: 300px"
           >
@@ -280,10 +281,10 @@ const prop = defineProps({
   headers: {
     type: Array as PropType<Array<any>>,
     default: () => [
-      { title: "Host", key: "host" },
-      { title: "Category", key: "category" },
-      // { title: "Guard House", key: "guardPost" },
-      // { title: "Actions", key: "action", sortable: false },
+      { text: "Host", value: "host" },
+      { text: "Category", value: "category" },
+      { text: "Guard House", value: "guardPost" },
+      { text: "Actions", value: "action", sortable: false },
     ],
   },
   readOnly: {
@@ -295,7 +296,7 @@ const prop = defineProps({
 const computedHeaders = computed(() => {
   if (prop.type === "ip") {
     const base = [...prop.headers];
-    base.splice(0, 0, { title: "Name", key: "name" });
+    base.splice(0, 0, { text: "Name", value: "name" });
     return base;
   }
   return prop.headers;

package/components/DashboardMain.vue

@@ -984,44 +984,60 @@
               <div
                 v-for="item in formattedActivePatrolItems"
                 :key="item.id || item._id"
-                class="active-patrol-row"
+                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);
+                "
               >
-                <div class="active-patrol-main">
-                  <strong>{{ item.title || item.name }}</strong>
-                  <span>{{ item.subtitle || item.location || "" }}</span>
+                <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>
 
-                <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
+                  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>
 
-                <div class="active-patrol-statuses">
+                <div style="flex: 1; display: flex; justify-content: center">
                   <div
-                    class="active-patrol-status-pill"
-                    :style="getPatrolStatusStyle(item.primaryStatus)"
+                    :style="getPatrolStatusStyle(item.status)"
+                    style="
+                      padding: 6px 16px;
+                      border-radius: 20px;
+                      font-size: 13px;
+                      font-weight: 500;
+                      text-transform: capitalize;
+                    "
                   >
-                    {{ item.primaryStatus }}
+                    {{ item.status }}
                   </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 class="active-patrol-action">
+                <div style="flex: 0 0 auto; text-align: right">
                   <v-btn
                     variant="outlined"
                     class="text-none font-weight-medium"
@@ -1529,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"],
@@ -1548,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"],
@@ -1557,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"],
@@ -1603,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];
@@ -1618,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)
+        )
+      )
     );
   }
 
@@ -2751,23 +2771,18 @@ const activePatrolItems = computed<any[]>(
 
 const formattedActivePatrolItems = computed<any[]>(() => {
   return activePatrolItems.value.map((item) => {
-    const statuses = normalizeListValue(item.status || "Pending");
-    const assignees = normalizeListValue(
-      item.person || item.assignedTo || "Unassigned"
-    );
-
+    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(", ");
+    }
     return {
       ...item,
-      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),
+      status,
+      person,
     };
   });
 });
@@ -3937,20 +3952,6 @@ 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 (
@@ -4418,151 +4419,6 @@ 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%;