@7365admin1/layer-common 3.0.24 → 3.0.26

package/components/VisitorSocketPopUp.vue

@@ -32,7 +32,7 @@
     </section> -->
 
     <v-snackbar
-      v-if="!isUnregisteredVisitorRoute"
+      v-if="!isUnregisteredVisitorRoute && enableUnregisteredSnackbar && canViewVisitor"
       v-model="snackBarMessage.modal"
       :color="snackBarMessage.color"
       :timeout="snackBarMessage.timeout"
@@ -94,12 +94,20 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  canViewVisitor: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const config = useRuntimeConfig();
 const publicConfig = config.public as Record<string, string | undefined>;
 const route = useRoute();
 const { tab } = useVisitor();
+const { enableUnregistered, ensureANPRSettings } = useANPRSettings(
+  props.siteId
+);
+const enableUnregisteredSnackbar = computed(() => enableUnregistered.value);
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();
 
@@ -124,6 +132,16 @@ const permanentMessageDialog = reactive({
   text: "",
 });
 
+watch(
+  () => props.siteId,
+  async (siteId) => {
+    if (siteId && !route.path.includes("/settings")) {
+      await ensureANPRSettings();
+    }
+  },
+  { immediate: true }
+);
+
 const path = computed(() => route.path);
 const isVisitorManagementPath = (path: string) =>
   path.includes("/visitor-management");
@@ -166,6 +184,10 @@ const showTransientMessage = (
   color: string,
   isUnregistered = false
 ) => {
+  if (!enableUnregisteredSnackbar.value) {
+    return;
+  }
+
   snackBarMessage.text = text;
   snackBarMessage.color = color;
   snackBarMessage.modal = true;
@@ -283,6 +305,12 @@ watch(
   { immediate: true }
 );
 
+watch(enableUnregisteredSnackbar, (enabled) => {
+  if (!enabled) {
+    snackBarMessage.modal = false;
+  }
+});
+
 onUnmounted(() => {
   disconnectSocket();
 });

package/composables/useANPRSettings.ts

@@ -1,26 +1,75 @@
-export default function () {
-  async function getANPRSettingBySite(data: any) {
-    return await useNuxtApp().$api<Record<string, any>>(
+export default function (siteId?: string) {
+  const stateKey = computed(() =>
+    siteId ? `anpr-settings-${siteId}` : "anpr-settings"
+  );
+
+  const anprSettings = useState<Record<string, any> | null>(
+    stateKey.value,
+    () => null
+  );
+
+  const enableUnregistered = computed(
+    () => anprSettings.value?.ANPRSwitches?.enableUnregistered === true
+  );
+
+  async function fetchANPRSettings(data?: any) {
+    const payload = data ?? (siteId ? { site: siteId, userType: "site" } : undefined);
+
+    if (!payload) {
+      return anprSettings.value;
+    }
+
+    const response = await useNuxtApp().$api<Record<string, any>>(
       `/api/anpr-settings/get/v1`,
       {
         method: "POST",
-        body: data,
+        body: payload,
       }
     );
+
+    if (response) {
+      anprSettings.value = response;
+    }
+
+    return response;
   }
-  async function createUpdateANPRSettings(
-    data: any
-  ) {
-    return await useNuxtApp().$api<Record<string, any>>(
+
+  async function ensureANPRSettings(force = false) {
+    if (!siteId) {
+      return anprSettings.value;
+    }
+
+    if (!force && anprSettings.value) {
+      return anprSettings.value;
+    }
+
+    return await fetchANPRSettings({ site: siteId, userType: "site" });
+  }
+
+  async function getANPRSettingBySite(data: any) {
+    return await fetchANPRSettings(data);
+  }
+
+  async function createUpdateANPRSettings(data: any) {
+    const response = await useNuxtApp().$api<Record<string, any>>(
       `/api/anpr-settings/v1`,
       {
         method: "POST",
         body: data,
       }
     );
+
+    if (response) {
+      anprSettings.value = response;
+    }
+
+    return response;
   }
 
   return {
+    anprSettings,
+    enableUnregistered,
+    ensureANPRSettings,
     getANPRSettingBySite,
     createUpdateANPRSettings,
   };

package/composables/useAccessManagement.ts

@@ -268,7 +268,15 @@ export default function useAccessManagement() {
     type: string;
     nfcCards: { _id: string; cardNo: string }[];
     acm_url: string;
-    visitorId: string;
+    user: {
+      visitorId: string;
+      name?: string;
+      nric?: string;
+      contact?: string;
+      company?: string;
+      type?: string;
+      plateNumber?: string;
+    };
   }) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/visitor`,

package/composables/useCleaningPermission.ts

@@ -6,7 +6,7 @@ export default function useCleaningPermission() {
     workOrderPermissions,
     invitationPermissions,
     bulletinBoardPermissions,
-    dashboardPermissions,
+ 
   } = useCommonPermissions();
   const permissions: TPermissions = {
     members: memberPermissions,
@@ -15,7 +15,7 @@ export default function useCleaningPermission() {
     roles: rolePermissions,
     invitations: invitationPermissions,
     "bulletin-board": bulletinBoardPermissions,
-    dashboard: dashboardPermissions,
+ 
     inventory: {
       "view-inventory": {
         check: true,

package/composables/useCommonPermission.ts

@@ -279,44 +279,7 @@ export function useCommonPermissions() {
 
     }
 
-    const dashboardPermissions: Record<string, TPermission> = {
-      "view-activity": {
-        check: true,
-        description: "Allows the user to view the activity chart widget.",
-      },
-      "view-task-schedule": {
-        check: true,
-        description: "Allows the user to view the task schedule widget.",
-      },
-      "view-attendance-widget": {
-        check: true,
-        description: "Allows the user to view the attendance/staff status widget.",
-      },
-      "view-feedbacks-widget": {
-        check: true,
-        description: "Allows the user to view the feedbacks widget.",
-      },
-      "view-upcoming-events": {
-        check: true,
-        description: "Allows the user to view the upcoming events widget.",
-      },
-      "view-today-reminders": {
-        check: true,
-        description: "Allows the user to view the today's reminders widget.",
-      },
-      "view-today-attentions": {
-        check: true,
-        description: "Allows the user to view the today's attentions widget.",
-      },
-      "view-work-order-status": {
-        check: true,
-        description: "Allows the user to view the work order status widget.",
-      },
-      "view-active-patrol": {
-        check: true,
-        description: "Allows the user to view the active patrol widget.",
-      },
-    }
+
   
   return {
     invitationPermissions,
@@ -329,6 +292,6 @@ export function useCommonPermissions() {
     buildingUnitManagementPermissions,
     bulletinBoardPermissions,
     siteSettingsPermissions,
-    dashboardPermissions
+
   };
 }

package/composables/useDocument.ts

@@ -76,6 +76,25 @@ export default function useDocument() {
     return add({ ...value, type: "folder" });
   }
 
+  function updateFolderById(id: string, value: any) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/documents/folder/${id}`,
+      {
+        method: "PUT",
+        body: value,
+      }
+    );
+  }
+
+  function deleteFolderById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/documents/folder/${id}`,
+      {
+        method: "DELETE",
+      }
+    );
+  }
+
   return {
     getAll,
     getById,
@@ -85,5 +104,7 @@ export default function useDocument() {
     getDocumentsBySiteId,
     create,
     createFolder,
+    updateFolderById,
+    deleteFolderById,
   };
 }

package/composables/useLocalAuth.ts

@@ -41,7 +41,9 @@ export default function useLocalAuth() {
       );
 
     watchEffect(() => {
-      currentUser.value = getCurrentUserReq.value as TUser | null;
+      if (getCurrentUserReq.value) {
+        currentUser.value = getCurrentUserReq.value as TUser;
+      }
     });
 
     watchEffect(() => {

package/composables/useNFCPatrolLog.ts

@@ -0,0 +1,35 @@
+interface NFCPatrolLogQuery {
+  page?: number;
+  limit?: number;
+  site: string;
+  date: string;
+  routeId: string;
+  routeStartTime: string;
+}
+
+export default function useNFCPatrolLog() {
+  function getAll<T = Record<string, any>>({
+    page = 1,
+    limit = 10,
+    site,
+    date,
+    routeId,
+    routeStartTime,
+  }: NFCPatrolLogQuery) {
+    return useNuxtApp().$api<T>("/api/nfc-patrol-log", {
+      method: "GET",
+      query: {
+        page,
+        limit,
+        site,
+        date,
+        "route._id": routeId,
+        "route.startTime": routeStartTime,
+      },
+    });
+  }
+
+  return {
+    getAll,
+  };
+}

package/composables/useNFCPatrolReport.ts

@@ -3,25 +3,58 @@ import type {
   NFCPatrolReport,
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
-import { useNFCPatrolReportService } from "../services/nfcPatrolReport";
 
-export function useNFCPatrolReport(filters: NFCPatrolReportFilters) {
-  const reportService = useNFCPatrolReportService();
+interface NFCPatrolLogResponse {
+  data?: NFCPatrolLogResponse | NFCPatrolReport;
+  item?: NFCPatrolReport;
+  items?: NFCPatrolReport[];
+  nfcPatrolLog?: NFCPatrolReport;
+}
+
+export function useNFCPatrolReport(
+  filters: NFCPatrolReportFilters,
+  site: string,
+) {
+  const { getAll: getPatrolLogs } = useNFCPatrolLog();
   const report = ref<NFCPatrolReport | null>(null);
   const loading = ref(false);
   const selectedActivityRemarks = ref("");
   const dialogRemarks = ref(false);
 
   async function fetchReport() {
+    if (!site || !filters.date || !filters.route || !filters.timeRange) {
+      report.value = null;
+      return;
+    }
+
     loading.value = true;
 
     try {
-      report.value = await reportService.getPatrolReport(filters);
+      const response = await getPatrolLogs<NFCPatrolLogResponse>({
+        page: 1,
+        limit: 10,
+        site,
+        date: filters.date,
+        routeId: filters.route,
+        routeStartTime: filters.timeRange.split(" - ")[0],
+      });
+
+      report.value = extractReport(response);
     } finally {
       loading.value = false;
     }
   }
 
+  function extractReport(response: NFCPatrolLogResponse): NFCPatrolReport | null {
+    const payload = response.data ?? response;
+
+    if ("location" in payload && "activities" in payload) {
+      return payload;
+    }
+
+    return payload.nfcPatrolLog ?? payload.item ?? payload.items?.[0] ?? null;
+  }
+
   function openRemarksDialog(activity: NFCPatrolActivity) {
     selectedActivityRemarks.value = activity.remarks || "No remarks provided";
     dialogRemarks.value = true;

package/composables/useNFCPatrolReportFilters.ts

@@ -2,14 +2,13 @@ import type {
   NFCPatrolReportFilterOptions,
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
-import { useNFCPatrolReportService } from "../services/nfcPatrolReport";
 
 export function useNFCPatrolReportFilters(site: string) {
-  const reportService = useNFCPatrolReportService();
+  const { getAll: getPatrolRoutes } = useNFCPatrolRoute();
 
   const filters = reactive<NFCPatrolReportFilters>({
-    route: "WH01 Patrol Route",
-    timeRange: "15:00 - 17:00",
+    route: "",
+    timeRange: "",
     date: "2025-11-27",
   });
 
@@ -24,12 +23,36 @@ export function useNFCPatrolReportFilters(site: string) {
     loading.value = true;
 
     try {
-      options.value = await reportService.getFilterOptions(site);
+      const response = await getPatrolRoutes({ site, page: 1, limit: 100 });
+      const routes = (response.items ?? []).map((route: Record<string, any>) => ({
+        title: route.name,
+        value: route._id,
+        startTimes: route.startTimes ?? [],
+      }));
+
+      options.value.routes = routes;
+
+      if (!routes.some((route) => route.value === filters.route)) {
+        filters.route = routes[0]?.value ?? "";
+      }
+
+      updateStartTimes();
     } finally {
       loading.value = false;
     }
   }
 
+  function updateStartTimes() {
+    const route = options.value.routes.find(({ value }) => value === filters.route);
+    options.value.timeRanges = route?.startTimes ?? [];
+
+    if (!options.value.timeRanges.includes(filters.timeRange)) {
+      filters.timeRange = options.value.timeRanges[0] ?? "";
+    }
+  }
+
+  watch(() => filters.route, updateStartTimes);
+
   return {
     filters,
     options,

package/package.json

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

package/pages/[org]/[site]/access-mgmt/administrator/index.vue

@@ -13,6 +13,8 @@
 <script setup lang="ts">
 definePageMeta({
   layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
 });
 
 const route = useRoute();

package/pages/[org]/[site]/access-mgmt/hid-readers/index.vue

@@ -13,6 +13,8 @@
 <script setup lang="ts">
 definePageMeta({
   layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
 });
 
 const route = useRoute();

package/pages/[org]/[site]/access-mgmt/hid-users/index.vue

@@ -13,6 +13,8 @@
 <script setup lang="ts">
 definePageMeta({
   layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
 });
 
 const route = useRoute();

package/pages/[org]/[site]/access-mgmt/identity-mapping/index.vue

@@ -13,6 +13,8 @@
 <script setup lang="ts">
 definePageMeta({
   layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
 });
 
 const route = useRoute();

package/services/nfcPatrolReport.ts

@@ -7,7 +7,11 @@ import type {
 } from "../types/nfc-patrol-report";
 
 const filterOptions: NFCPatrolReportFilterOptions = {
-  routes: ["WH01 Patrol Route", "WH02 Patrol Route", "WH03 Patrol Route"],
+  routes: [
+    { title: "WH01 Patrol Route", value: "WH01 Patrol Route", startTimes: [] },
+    { title: "WH02 Patrol Route", value: "WH02 Patrol Route", startTimes: [] },
+    { title: "WH03 Patrol Route", value: "WH03 Patrol Route", startTimes: [] },
+  ],
   timeRanges: ["15:00 - 17:00", "08:00 - 10:00", "13:00 - 15:00", "18:00 - 20:00"],
 };
 

package/types/nfc-patrol-report.ts

@@ -13,8 +13,14 @@ export interface NFCPatrolReportExportRequest {
   filters: NFCPatrolReportFilters;
 }
 
+export interface NFCPatrolReportRouteOption {
+  title: string;
+  value: string;
+  startTimes: string[];
+}
+
 export interface NFCPatrolReportFilterOptions {
-  routes: string[];
+  routes: NFCPatrolReportRouteOption[];
   timeRanges: string[];
 }
 

package/types/visitor.d.ts

@@ -71,6 +71,7 @@ declare type TVisitorPayload = Pick<
   | "createdBy"
 > & {
   members?: TMemberInfo[];
+  updatedBy?: string;
 };
 
 declare type TDefaultOptionObj = {