@7365admin1/layer-common 3.0.18 → 3.0.20

package/components/VisitorForm.vue

@@ -291,7 +291,7 @@
               autocomplete="off"
               :disabled="!visitor.block"
               :key="
-                levelListDataPending ? 'level-list-pending' : 'level-list-ready'
+                levelsDataPending ? 'level-list-pending' : 'level-list-ready'
               "
               :loading="levelsDataPending"
               @update:model-value="handleChangeLevel"
@@ -308,9 +308,7 @@
               item-title="title"
               item-value="value"
               :disabled="!visitor.level"
-              :key="
-                unitListDataPending ? 'unit-list-pending' : 'unit-list-ready'
-              "
+              :key="unitsDataPending ? 'unit-list-pending' : 'unit-list-ready'"
               :loading="unitsDataPending"
               :rules="[requiredRule]"
               @update:model-value="handleUpdateUnit"
@@ -344,7 +342,7 @@
           </v-col>
 
           <v-col
-            v-if="(withStep2 || withStep3) && contractorStep === 2"
+            v-show="(withStep2 || withStep3) && contractorStep === 2"
             cols="12"
           >
             <PassInformation
@@ -355,6 +353,7 @@
               :contractor-type="visitor.contractorType"
               :hide-keys="!showShowKeysField"
               :passKeys="visitor.passKeys"
+              :clearable="true"
             />
             <EntryPassInformation
               v-if="showEntryPassInformation"
@@ -371,13 +370,14 @@
             />
           </v-col>
 
-          <v-col v-if="withStep3 && contractorStep === 3" cols="12">
+          <v-col v-show="withStep3 && contractorStep === 3" cols="12">
             <MemberInformation
               v-model="visitor.members"
               :type="prop.type"
               :contractor-type="visitor.contractorType"
               :site="prop.site"
               :selected-visitor-pass="visitor.visitorPass"
+              :clearable="true"
             />
           </v-col>
 
@@ -710,7 +710,9 @@ const hidQrPrinterConfig = computed(() => {
 });
 
 const hasHidQrPrinterConfig = computed(() => {
-  return Boolean(hidQrPrinterConfig.value?.vendorId && hidQrPrinterConfig.value?.productId);
+  return Boolean(
+    hidQrPrinterConfig.value?.vendorId && hidQrPrinterConfig.value?.productId
+  );
 });
 
 const hidQrTemplate = computed(() => {
@@ -723,11 +725,17 @@ const hidQrValidityMinutes = computed(() => {
 });
 
 const hidQrCodePassAllowed = computed(() => {
-  return hidQrCodePassEnabled.value && ["guest", "contractor", "walk-in"].includes(prop.type);
+  return (
+    hidQrCodePassEnabled.value &&
+    ["guest", "contractor", "walk-in"].includes(prop.type)
+  );
 });
 
 const showEntryPassInformation = computed(() => {
-  return Boolean(entryPassSettings.value?.data?.settings?.nfcPass || hidQrCodePassAllowed.value);
+  return Boolean(
+    entryPassSettings.value?.data?.settings?.nfcPass ||
+      hidQrCodePassAllowed.value
+  );
 });
 
 const companyNames = ref<string[]>([]);
@@ -1297,11 +1305,17 @@ async function submit() {
 
     if (res) {
       if (passType.value === "HID_QR") {
-        const printed = await printHidQrCodePass(getVisitorIdFromResponse(res), false);
+        const printed = await printHidQrCodePass(
+          getVisitorIdFromResponse(res),
+          false
+        );
         if (!printed) return;
       }
 
-      if (prop.type === "contractor" && (passType.value === "QR" || passType.value === "NFC")) {
+      if (
+        prop.type === "contractor" &&
+        (passType.value === "QR" || passType.value === "NFC")
+      ) {
         const visitorId = res as unknown as string;
         const rawUrl = entryPassSettings.value?.data?.settings?.url;
         const { encrypted: acmUrl } = await $fetch<{ encrypted: string }>(
@@ -1453,14 +1467,16 @@ function getHidQrPrinterUsbIds() {
 
 function validateHidQrPrinterConfig() {
   if (!hasHidQrPrinterConfig.value) {
-    errorMessage.value = "No printer is configured on HID settings. Please configure the HID QR Code printer before continuing.";
+    errorMessage.value =
+      "No printer is configured on HID settings. Please configure the HID QR Code printer before continuing.";
     return false;
   }
 
   const { vendorId, productId } = getHidQrPrinterUsbIds();
 
   if (!Number.isFinite(vendorId) || !Number.isFinite(productId)) {
-    errorMessage.value = "Invalid HID QR Code printer configuration. Please check Vendor and Product ID in Settings.";
+    errorMessage.value =
+      "Invalid HID QR Code printer configuration. Please check Vendor and Product ID in Settings.";
     return false;
   }
 
@@ -1471,7 +1487,9 @@ function buildHidQrCodePayload(visitorId = "") {
   if (hidQrPrintPayload.value) return hidQrPrintPayload.value;
 
   const issuedAt = new Date();
-  const expiresAt = new Date(issuedAt.getTime() + hidQrValidityMinutes.value * 60 * 1000);
+  const expiresAt = new Date(
+    issuedAt.getTime() + hidQrValidityMinutes.value * 60 * 1000
+  );
   const nonce =
     typeof crypto !== "undefined" && "randomUUID" in crypto
       ? crypto.randomUUID()
@@ -1502,9 +1520,14 @@ function buildHidQrCodePayload(visitorId = "") {
 }
 
 function buildVisitorAddress() {
-  const blockLabel = blocksArray.value.find((b: any) => b.value === visitor.block)?.title || "";
-  const levelLabel = levelsArray.value.find((l: any) => l.value === visitor.level)?.title || "";
-  const unitLabel = unitsArray.value.find((u: any) => u.value === visitor.unit)?.title || visitor.unitName || "";
+  const blockLabel =
+    blocksArray.value.find((b: any) => b.value === visitor.block)?.title || "";
+  const levelLabel =
+    levelsArray.value.find((l: any) => l.value === visitor.level)?.title || "";
+  const unitLabel =
+    unitsArray.value.find((u: any) => u.value === visitor.unit)?.title ||
+    visitor.unitName ||
+    "";
   return [blockLabel, levelLabel, unitLabel].filter(Boolean).join("/");
 }
 
@@ -1527,7 +1550,7 @@ async function printHidQrCodePass(visitorId = "", manageProcessing = true) {
       visitor.company || visitor.name || "",
       buildVisitorAddress(),
       hidQrTemplate.value?.header || "HID QR Code",
-      hidQrTemplate.value?.subtext || "Scan QR code for access",
+      hidQrTemplate.value?.subtext || "Scan QR code for access"
     );
 
     if (!printResult?.success || printResult?.printTest?.success === false) {

package/composables/useBuilding.ts

@@ -236,6 +236,19 @@ export default function useBuilding() {
     });
   }
 
+  function uploadSpreadsheetBuilding(params: { site: string; file: File }) {
+    const formData = new FormData();
+    formData.append("file", params.file);
+
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/files/blocks/upload-spreadsheet",
+      {
+        method: "POST",
+        query: { site: params.site },
+        body: formData,
+      }
+    );
+  }
 
   function getBlocksSelection({siteId} : { siteId: string; }) {
     return useNuxtApp().$api(`/api/buildings/list/site/${siteId}`, {
@@ -272,6 +285,7 @@ export default function useBuilding() {
     updateBuildingField,
     deleteById,
     updateById,
+    uploadSpreadsheetBuilding,
     getBlocksSelection,
     getLevelsSelection,
     getUnitSelection

package/composables/useServiceProvider.ts

@@ -174,12 +174,13 @@ export default function useServiceProvider() {
     orgId = "",
     siteId = "",
     siteName = "",
+    inviteType=""
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       "/api/service-providers/invite",
       {
         method: "POST",
-        body: { email, orgId, siteId, siteName },
+        body: { email, orgId, siteId, siteName, inviteType },
       }
     );
   }

package/composables/useVisitor.ts

@@ -110,25 +110,29 @@ export default function () {
     checkedOut,
     tab,
   }: GetVisitorsParams = {}) {
+    const query = Object.fromEntries(
+      Object.entries({
+        page,
+        limit,
+        search,
+        org,
+        site,
+        dateTo,
+        dateFrom,
+        type,
+        status,
+        checkedOut,
+        plateNumber,
+        order,
+        tab,
+      }).filter(([, value]) => value !== undefined && value !== null && value !== "")
+    );
+
     return await useNuxtApp().$api<Record<string, any>>(
       "/api/visitor-transactions",
       {
         method: "GET",
-        query: {
-          page,
-          limit,
-          search,
-          org,
-          site,
-          dateTo,
-          dateFrom,
-          type,
-          status,
-          checkedOut,
-          plateNumber,
-          order,
-          tab,
-        },
+        query,
       }
     );
   }

package/package.json

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

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

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before viewing access logs."
     >
-      <HidAccessLogDashboard :site="siteId" />
+      <HidAccessLogDashboard :org="orgId" :site="siteId" />
     </HidEnabledGate>
   </v-container>
 </template>
@@ -13,6 +13,8 @@
 <script setup lang="ts">
 definePageMeta({
   layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
 });
 
 const route = useRoute();

package/types/visitor.d.ts

@@ -81,7 +81,7 @@ declare type TDefaultOptionObj = {
 declare type TMemberInfo = {
   name: string;
   nric: string;
-  visitorPass?: { keyId: string }[];
+  visitorPass?: TPassKeyPayload[];
   passKeys?: TPassKeyPayload[];
   contact: string;
 };