@7365admin1/layer-common 3.1.2 → 3.1.3-staging.39

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

@@ -12,6 +12,24 @@
       <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
@@ -87,6 +105,10 @@ const unitOfMeasurementModel = defineModel("unitOfMeasurement", {
   type: String,
   default: "",
 });
+const attachmentModel = defineModel("attachment", {
+  type: String,
+  default: "",
+});
 const showDialog = defineModel({ type: Boolean, default: false });
 
 const prop = defineProps({
@@ -105,6 +127,9 @@ 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();
 
@@ -124,6 +149,29 @@ 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() {
@@ -147,12 +195,15 @@ 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,7 +28,6 @@
             :items="items"
             fixed-header
             hide-default-footer
-            hide-default-header
             @click:row="handleRowClick"
             style="max-height: 300px"
           >
@@ -281,10 +280,10 @@ const prop = defineProps({
   headers: {
     type: Array as PropType<Array<any>>,
     default: () => [
-      { text: "Host", value: "host" },
-      { text: "Category", value: "category" },
-      { text: "Guard House", value: "guardPost" },
-      { text: "Actions", value: "action", sortable: false },
+      { title: "Host", key: "host" },
+      { title: "Category", key: "category" },
+      // { title: "Guard House", key: "guardPost" },
+      // { title: "Actions", key: "action", sortable: false },
     ],
   },
   readOnly: {
@@ -296,7 +295,7 @@ const prop = defineProps({
 const computedHeaders = computed(() => {
   if (prop.type === "ip") {
     const base = [...prop.headers];
-    base.splice(0, 0, { text: "Name", value: "name" });
+    base.splice(0, 0, { title: "Name", key: "name" });
     return base;
   }
   return prop.headers;

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"],
@@ -1587,27 +1557,30 @@ 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",
   ],
-  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"],
@@ -1630,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];
@@ -1640,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)
     );
   }
 
@@ -2771,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),
     };
   });
 });
@@ -3952,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 (
@@ -4419,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/EquipmentManagementMain.vue

@@ -46,6 +46,19 @@
           </v-row>
         </template>
 
+        <template #item.attachment="{ value }">
+          <v-btn
+            v-if="value"
+            size="small"
+            variant="tonal"
+            class="text-none"
+            @click.stop="viewAttachment(value)"
+          >
+            View Image
+          </v-btn>
+          <span v-else>—</span>
+        </template>
+
         <template #item.status="{ value }">
           <v-chip class="text-capitalize">{{ value || "N/A" }}</v-chip>
         </template>
@@ -61,6 +74,7 @@
     v-model="dialogShowForm"
     v-model:name="equipmentName"
     v-model:unitOfMeasurement="equipmentUnit"
+    v-model:attachment="equipmentAttachment"
     :mode="dialogMode"
     :equipmentData="editingEquipment"
     :site="props.site"
@@ -242,6 +256,29 @@
     </v-card>
   </v-dialog>
 
+  <v-dialog v-model="showAttachmentDialog" max-width="720" persistent>
+    <v-card rounded="lg">
+      <v-card-title class="d-flex align-center pa-4">
+        <span class="text-h6 font-weight-bold">Attachment</span>
+
+        <v-spacer />
+
+        <v-btn
+          icon="mdi-close"
+          variant="text"
+          size="small"
+          @click="(showAttachmentDialog = false), (attachmentUrl = '')"
+        />
+      </v-card-title>
+
+      <v-divider />
+
+      <v-card-text class="pa-6">
+        <v-img :src="attachmentUrl" contain />
+      </v-card-text>
+    </v-card>
+  </v-dialog>
+
   <Snackbar
     v-model="messageSnackbar"
     :text="snackbarMessage"
@@ -253,6 +290,7 @@ import useEquipment from "../composables/useEquipment";
 import useStock from "../composables/useStock";
 import useUtils from "../composables/useUtils";
 import useEquipmentManagement from "../composables/useEquipmentManagement";
+import useFile from "../composables/useFile";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
@@ -280,6 +318,7 @@ const siteName = ref<string>("");
 const submitting = ref(false);
 
 const headers = [
+  { title: "Image", value: "attachment" },
   { title: "Name", value: "name" },
   { title: "Available Stock Qty", value: "qty" },
   { title: "Status", value: "status" },
@@ -293,6 +332,7 @@ const {
   deleteEquipment,
 } = useEquipment();
 const { debounce, requiredRule } = useUtils();
+const { getFileUrl } = useFile();
 
 const searchInput = ref("");
 const startDate = ref("");
@@ -352,11 +392,21 @@ const dialogMode = ref<"add" | "edit">("add");
 const editingEquipment = ref<Record<string, any>>({});
 const equipmentName = ref("");
 const equipmentUnit = ref("");
+const equipmentAttachment = ref("");
 
 const stockActionFormRef = ref<any>(null);
 const stockActionValid = ref(false);
 
 const snackbarMessage = ref("");
+const showAttachmentDialog = ref(false);
+const attachmentUrl = ref("");
+
+function viewAttachment(attachmentId: string) {
+  if (!attachmentId) return;
+
+  attachmentUrl.value = getFileUrl(attachmentId);
+  showAttachmentDialog.value = true;
+}
 
 function showMessage(msg: string, color: string = "error") {
   message.value = msg;
@@ -370,6 +420,7 @@ function onCreateUnit() {
   editingEquipment.value = {};
   equipmentName.value = "";
   equipmentUnit.value = "";
+  equipmentAttachment.value = "";
   dialogShowForm.value = true;
 }
 
@@ -379,6 +430,9 @@ async function _createEquipment() {
     const payload: TEquipmentCreate = {
       name: equipmentName.value,
       unitOfMeasurement: equipmentUnit.value,
+      ...(equipmentAttachment.value
+        ? { attachment: equipmentAttachment.value }
+        : {}),
     };
 
     let response;
@@ -398,6 +452,7 @@ async function _createEquipment() {
     editingEquipment.value = {};
     equipmentName.value = "";
     equipmentUnit.value = "";
+    equipmentAttachment.value = "";
 
     await getEquipmentsRefresh();
   } catch (error: any) {
@@ -455,6 +510,7 @@ const onEditFromMoreAction = async () => {
   editingEquipment.value = response;
   equipmentName.value = response.name || "";
   equipmentUnit.value = response.unitOfMeasurement || "";
+  equipmentAttachment.value = response.attachment || "";
   dialogShowForm.value = true;
 };