@7365admin1/layer-common 3.0.25 → 3.0.27

package/components/HidReaderForm.vue

@@ -17,18 +17,16 @@
           class="mb-3"
         />
 
-        <template v-if="mode === 'add'">
-          <div class="field-label">Base URL / IP address <span>*</span></div>
-          <v-text-field
-            v-model="draft.baseUrl"
-            aria-label="Base URL / IP address"
-            placeholder="http://192.168.x.x."
-            variant="outlined"
-            density="compact"
-            hide-details="auto"
-            class="mb-3"
-          />
-        </template>
+        <div class="field-label">Base URL / IP address <span>*</span></div>
+        <v-text-field
+          v-model="draft.baseUrl"
+          aria-label="Base URL / IP address"
+          placeholder="https://your domain URL"
+          variant="outlined"
+          density="compact"
+          hide-details="auto"
+          class="mb-3"
+        />
 
         <div class="field-label">Device ID <span>*</span></div>
         <v-text-field
@@ -175,10 +173,6 @@ function submit() {
     status: monitorEnabled.value ? "active" : "inactive",
   };
 
-  if (props.mode === "edit") {
-    delete payload.baseUrl;
-  }
-
   emit("submit", payload);
 }
 </script>

package/components/HidReaderManagement.vue

@@ -859,12 +859,32 @@ function getFriendlyHidError(error: any) {
     return "Unable to verify the HID reader session. Please check the reader username and password, then try again.";
   }
 
+  if (
+    message.includes("status 401") ||
+    message.includes("401 Authorization Required") ||
+    lowerMessage.includes("authorization required")
+  ) {
+    return "Unable to authorize the HID gateway connection. Please check the relay credentials on the server, then try again.";
+  }
+
+  if (message.includes("status 403") || lowerMessage.includes("forbidden")) {
+    return "The HID gateway rejected this request. Please check the relay access permissions and try again.";
+  }
+
+  if (message.includes("status 404") || lowerMessage.includes("not found")) {
+    return "The HID gateway endpoint could not be found. Please check the reader Base URL and try again.";
+  }
+
+  if (lowerMessage.includes("<html") || lowerMessage.includes("<!doctype")) {
+    return "The HID gateway returned an unexpected response. Please check the relay configuration and try again.";
+  }
+
   if (message.includes("reader is not active")) {
     return "This HID reader is not active. Please enable the reader before syncing.";
   }
 
   if (message.includes("HID Amico request failed:")) {
-    return message;
+    return "The HID device rejected the request. Please check the reader connection and try again.";
   }
 
   return message || "The HID device rejected the request. Please check the reader connection and try again.";

package/components/MemberInformation.vue

@@ -77,6 +77,22 @@
               </v-autocomplete>
             </v-col>
 
+            <v-col v-if="props.unitId" cols="12">
+              <EntryPassInformation
+                v-model="memberPassType"
+                v-model:quantity="memberPassQuantity"
+                v-model:cards="memberPassCards"
+                :settings="props.settings"
+                :loading="props.settingsLoading"
+                :site-id="props.site"
+                :unit-id="props.unitId"
+                :visitor-type="props.type"
+                :hid-qr-code-enabled="props.hidQrCodeEnabled"
+                :hid-qr-printer-configured="props.hidQrPrinterConfigured"
+                :excluded-card-ids="props.selectedNfcCards.map((c) => c._id)"
+              />
+            </v-col>
+
             <v-col cols="12">
               <InputLabel
                 class="text-capitalize"
@@ -164,6 +180,30 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  settings: {
+    type: Object as PropType<Record<string, any> | null>,
+    default: null,
+  },
+  settingsLoading: {
+    type: Boolean,
+    default: false,
+  },
+  unitId: {
+    type: String as PropType<string | null>,
+    default: null,
+  },
+  hidQrCodeEnabled: {
+    type: Boolean,
+    default: false,
+  },
+  hidQrPrinterConfigured: {
+    type: Boolean,
+    default: false,
+  },
+  selectedNfcCards: {
+    type: Array as PropType<{ _id: string; cardNo: string }[]>,
+    default: () => [],
+  },
 });
 
 const { requiredRule } = useUtils();
@@ -201,6 +241,9 @@ const dialog = reactive({
 });
 
 const selectedPass = ref<string>("");
+const memberPassType = ref<string | null>(null);
+const memberPassQuantity = ref<number | null>(1);
+const memberPassCards = ref<{ _id: string; cardNo: string }[]>([]);
 
 const members = defineModel<TMemberInfo[]>({ required: true, default: [] });
 const committedMembers = ref<TMemberInfo[]>([]);
@@ -303,12 +346,27 @@ watch(scannedPassValue, (newVal) => {
   showMessage("Scanned pass not available", "error");
 });
 
+function resetAccessCard() {
+  memberPassType.value = null;
+  memberPassQuantity.value = 1;
+  memberPassCards.value = [];
+}
+
 function handleClearForm() {
   formRef.value?.reset();
+  resetAccessCard();
 }
 
 async function handleAddMember() {
-  committedMembers.value.push({ ...memberForm });
+  committedMembers.value.push({
+    ...memberForm,
+    ...(memberPassType.value ? {
+      passType: memberPassType.value,
+      passQuantity: memberPassQuantity.value,
+      passCards: memberPassCards.value,
+    } : {}),
+  } as any);
+  resetAccessCard();
   handleClearForm();
 }
 

package/components/RolePermissionMain.vue

@@ -145,11 +145,6 @@
 </template>
 
 <script setup lang="ts">
-import {
-  getPermissionCount,
-  updateRolePermissionsInList,
-} from "../utils/rolePermissionCounts";
-
 const props = defineProps({
   orgId: {
     type: String,
@@ -270,10 +265,22 @@ const selectedPermissions = ref<Array<string>>([]);
 const originalPermissions = ref<Array<string>>([]);
 const edit = ref(false);
 
-const { convertPermissionsToArray } = useUtils();
-
 const roleId = ref("");
 
+function getPermissionCount(permissions: unknown): number {
+  return Array.isArray(permissions) ? permissions.length : 0;
+}
+
+function updateRolePermissionsInList(
+  roles: Array<Record<string, any>>,
+  roleId: string,
+  permissions: string[]
+) {
+  return roles.map((role) =>
+    role._id === roleId ? { ...role, permissions } : role
+  );
+}
+
 const { getRoleById: _getRoleById, deleteRole } = useRole();
 
 const { data: role, refresh: getRoleById } = useLazyAsyncData(
@@ -340,7 +347,6 @@ function successfulUpdate() {
     savedPermissions
   );
   void refreshRolesAfterUpdate(savedPermissions);
-  useLocalSetup(props.type);
 }
 
 async function refreshRolesAfterUpdate(savedPermissions: string[]) {

package/components/SiteSettings.vue

@@ -371,7 +371,9 @@ function show(message: string, color: string) {
 }
 
 // ANPR Settings
-const { getANPRSettingBySite, createUpdateANPRSettings } = useANPRSettings();
+const { getANPRSettingBySite, createUpdateANPRSettings } = useANPRSettings(
+  props.siteId
+);
 const isSaving = ref(false);
 
 // Reactive object to hold the state of the 3 switches

package/components/VisitorForm.vue

@@ -204,12 +204,17 @@
               v-model:cards="passCards" :settings="entryPassSettings"
               :loading="entryPassSettingsPending || siteDataPending" :site-id="prop.site"
               :unit-id="visitor.unit || null" :visitor-type="prop.type" :hid-qr-code-enabled="hidQrCodePassAllowed"
-              :hid-qr-printer-configured="hasHidQrPrinterConfig" />
+              :hid-qr-printer-configured="hasHidQrPrinterConfig"
+              @update:available-qr-count="(val) => availableQrCount = val" />
           </v-col>
 
           <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" />
+              :site="prop.site" :selected-visitor-pass="visitor.visitorPass" :clearable="true"
+              :settings="entryPassSettings" :settings-loading="entryPassSettingsPending || siteDataPending"
+              :unit-id="visitor.unit || null"
+              :hid-qr-code-enabled="hidQrCodePassAllowed" :hid-qr-printer-configured="hasHidQrPrinterConfig"
+              :selected-nfc-cards="passType === 'NFC' ? passCards : []" />
           </v-col>
 
           <v-col v-if="prop.mode === 'add'" cols="12" class="mt-2">
@@ -394,6 +399,7 @@ const visitor = reactive<Partial<TVisitorPayload>>({
 const passType = ref<string | null>(null);
 const passQuantity = ref<number | null>(1);
 const passCards = ref<{ _id: string; cardNo: string }[]>([]);
+const availableQrCount = ref<number | null>(null);
 const hidQrPrintPayload = ref<string | null>(null);
 const hidQrPrinted = ref(false);
 
@@ -628,10 +634,10 @@ function selectNricSearchResult(item: Partial<TPeople>) {
   if (!visitor.company) {
     visitor.company = companyNames.value?.[0] || visitor.company;
   }
-  visitor.block = (item.block as any) ?? (visitor.block as any) ?? "";
-  visitor.level = (item.level as any) ?? (visitor.level as any) ?? "";
-  visitor.unit = item.unit ?? visitor.unit ?? "";
-  visitor.unitName = item.unitName ?? visitor.unitName;
+  // visitor.block = (item.block as any) ?? (visitor.block as any) ?? "";
+  // visitor.level = (item.level as any) ?? (visitor.level as any) ?? "";
+  // visitor.unit = item.unit ?? visitor.unit ?? "";
+  // visitor.unitName = item.unitName ?? visitor.unitName;
 
   setTimeout(() => {
     currentAutofillSource.value = null;
@@ -990,6 +996,20 @@ async function handleNextPage() {
     return;
   }
   const step = contractorStep.value;
+  if (step === 2 && passType.value === "QR") {
+    if (availableQrCount.value === null) {
+      errorMessage.value = "Please wait while QR passes are being generated...";
+      return;
+    }
+    if (availableQrCount.value === 0) {
+      errorMessage.value = "No QR passes available. Add a non-physical card to this unit in Access Management first.";
+      return;
+    }
+  }
+  if (step === 2 && passType.value === "NFC" && passCards.value.length === 0) {
+    errorMessage.value = "Please select at least one NFC card before proceeding.";
+    return;
+  }
   if (step < 3) contractorStep.value++;
   else await submit();
 }
@@ -1098,7 +1118,15 @@ async function submit() {
             type: passType.value === "QR" ? "QRCODE" : passType.value,
             nfcCards: passCards.value,
             acm_url: acmUrl,
-            visitorId,
+            user: {
+              visitorId,
+              name: visitor.name,
+              nric: visitor.nric,
+              contact: visitor.contact,
+              company: visitor.company,
+              type: visitor.type,
+              plateNumber: visitor.plateNumber,
+            },
           });
 
           if (passType.value === "QR") {