@7365admin1/layer-common 3.2.2-staging.107 → 3.2.2-staging.108

package/components/EntryPassInformation.vue

@@ -166,8 +166,28 @@
       </template>
 
       <template v-if="passType === 'HID_QR'">
+        <v-card variant="tonal" color="primary" class="mt-3 pa-3" rounded="lg">
+          <div class="d-flex align-center ga-3">
+            <v-icon icon="mdi-door-open" size="28" />
+            <div>
+              <div class="text-caption text-medium-emphasis">Access Reader</div>
+              <div class="text-subtitle-2 font-weight-bold">{{ hidReaderName || "Reader not configured" }}</div>
+              <div class="text-caption mt-1">Access Portal: {{ hidPortalName || "Portal not configured" }}</div>
+            </div>
+          </div>
+        </v-card>
+        <v-alert
+          v-if="!hidPortalName"
+          type="warning"
+          variant="tonal"
+          density="compact"
+          class="mt-3"
+          icon="mdi-alert"
+        >
+          Reconnect this HID reader and select a portal before generating a visitor QR code.
+        </v-alert>
         <v-alert
-          v-if="!hidQrPrinterConfigured"
+          v-else-if="!hidQrPrinterConfigured"
           type="info"
           variant="tonal"
           density="compact"
@@ -283,6 +303,14 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  hidReaderName: {
+    type: String,
+    default: "",
+  },
+  hidPortalName: {
+    type: String,
+    default: "",
+  },
   excludedCardIds: {
     type: Array as PropType<string[]>,
     default: () => [],

package/components/HidAccessLogDashboard.vue

@@ -12,7 +12,7 @@
       </v-btn>
 
       <v-select
-        v-if="readers.length > 1"
+        v-if="readers.length"
         v-model="selectedReaderId"
         :items="readerOptions"
         item-title="title"
@@ -412,7 +412,7 @@ const accessMethodOptions = ["All", "Facial", "QR Code", "ID and Password", "PIN
 
 const readerOptions = computed(() =>
   readers.value.map((reader) => ({
-    title: reader.name || reader.deviceId || reader._id,
+    title: `${reader.name || reader.deviceId || reader._id} — ${reader.portalName || "Portal not configured"}`,
     value: reader._id,
   })),
 );
@@ -582,7 +582,6 @@ async function loadDashboard() {
   loading.value = true;
   resetDashboardData();
   try {
-    const isAdministratorTab = activeTab.value === "administrator";
     const isVisitorTab = activeTab.value === "visitor";
     const [identityResponse, logResponse, hidAccessLogs, configurationResponse, roleResponse, visitorResponse, readerUserResponse] = await Promise.all([
       loadDashboardSource(
@@ -603,9 +602,7 @@ async function loadDashboard() {
       ),
       loadDashboardSource(loadLiveAccessLogs(selectedReaderId.value), [], "live access logs"),
       loadDashboardSource(loadReaderConfiguration(selectedReaderId.value), {}, "reader configuration"),
-      isAdministratorTab
-        ? loadDashboardSource(loadAdministratorRoles(selectedReaderId.value), null, "administrator roles")
-        : Promise.resolve(null),
+      loadDashboardSource(loadAdministratorRoles(selectedReaderId.value), null, "administrator roles"),
       isVisitorTab && props.org
         ? loadDashboardSource(
             getVisitors({
@@ -632,14 +629,9 @@ async function loadDashboard() {
     );
     administratorUserIds.value = getAdministratorRoleUserIds(roleResponse);
     allIdentities.value = mergedIdentities;
-    identities.value = isAdministratorTab
-      ? mergedIdentities.filter((identity: Record<string, any>) => {
-          const hidUserId = toHidNumericId(identity.hidUserId);
-          return Boolean(hidUserId && administratorUserIds.value.has(hidUserId));
-        })
-      : activeTab.value === "visitor"
-        ? mergedIdentities.filter(isVisitorIdentity)
-        : mergedIdentities.filter((identity: Record<string, any>) => !isVisitorIdentity(identity));
+    identities.value = mergedIdentities.filter(
+      (identity: Record<string, any>) => classifyIdentity(identity) === activeTab.value,
+    );
     logs.value = logResponse?.items ?? logResponse?.data?.items ?? logResponse?.data?.logs ?? [];
     liveAccessLogs.value = hidAccessLogs;
     readerConfiguration.value = normalizeReaderConfiguration(configurationResponse);
@@ -781,8 +773,10 @@ function normalizeHidUsers(response: Record<string, any>) {
         registration: user.registration,
         cardNo: user.card_value || user.cardNo || "",
         name: user.name,
+        hidUserTypeId: user.user_type_id,
         metadata: {
           name: user.name,
+          hidUserTypeId: user.user_type_id,
           imageTimestamp: user.image_timestamp ? String(user.image_timestamp) : "",
           hidReaderSource: true,
         },
@@ -835,21 +829,22 @@ function resetDashboardData() {
 
 function isVisibleForActiveTab(row: AccessRow) {
   const identity = findIdentityByKey(row.identityKey);
-  const isVisitor = row.identityType === "visitor" || Boolean(row.visitorId) || isVisitorIdentity(identity);
-  if (activeTab.value === "visitor") {
-    return isVisitor;
-  }
-
-  if (activeTab.value === "administrator") {
-    const hidUserId = toHidNumericId(identity?.hidUserId ?? row.identityKey.split("|")[0]);
-    return Boolean(hidUserId && administratorUserIds.value.has(hidUserId));
-  }
-
-  return !isVisitor;
+  return classifyIdentity(identity, row) === activeTab.value;
 }
 
 function isVisitorIdentity(identity: Record<string, unknown> | undefined) {
-  return Boolean(identity && (identity.type === "visitor" || identity.visitor));
+  return Boolean(identity && (
+    identity.type === "visitor"
+    || identity.visitor
+    || Number(identity.hidUserTypeId ?? (identity.metadata as Record<string, unknown> | undefined)?.hidUserTypeId) === 1
+  ));
+}
+
+function classifyIdentity(identity?: Record<string, any>, row?: AccessRow): AccessTab {
+  const hidUserId = toHidNumericId(identity?.hidUserId ?? row?.identityKey.split("|")[0]);
+  if (hidUserId && administratorUserIds.value.has(hidUserId)) return "administrator";
+  if (row?.identityType === "visitor" || row?.visitorId || isVisitorIdentity(identity)) return "visitor";
+  return "resident";
 }
 
 function loadAdministratorRoles(readerId: string) {
@@ -1200,7 +1195,18 @@ function getRawAccessLogs(event: Record<string, any>) {
     payload.access_logs ||
     payload.accessLogs;
 
-  return Array.isArray(accessLogs) ? accessLogs : [];
+  if (Array.isArray(accessLogs)) return accessLogs;
+
+  const objectChanges = payload.object_changes || result.object_changes || [];
+  return Array.isArray(objectChanges)
+    ? objectChanges
+        .filter((change: Record<string, any>) => (
+          change?.object === "access_logs"
+          && change?.type !== "deleted"
+          && change?.values
+        ))
+        .map((change: Record<string, any>) => change.values)
+    : [];
 }
 
 function mapAccessLogToRow(rawLog: Record<string, any>, event: Record<string, any>, index: string): AccessRow {
@@ -1212,7 +1218,9 @@ function mapAccessLogToRow(rawLog: Record<string, any>, event: Record<string, an
   return {
     key: `${event._id || event.id || "log"}-${rawLog.id || rawLog.time || index}`,
     identityKey,
-    identityType: String(identity?.type || eventIdentity.type || "").toLowerCase() || undefined,
+    identityType: identity
+      ? classifyIdentity(identity)
+      : String(eventIdentity.type || "").toLowerCase() || undefined,
     visitorId: String(identity?.visitor || eventIdentity.visitor || "") || undefined,
     name: identity ? getName(identity) : getRawLogName(rawLog, event),
     facialData: identity ? getFacialData(identity) : "N/A",
@@ -1276,7 +1284,12 @@ function findIdentityForAccessLog(rawLog: Record<string, any>, event: Record<str
   const eventIdentityId = event.payload?.identity?._id;
   if (eventIdentityId) {
     const byId = allIdentities.value.find((identity) => String(identity._id) === String(eventIdentityId));
-    if (byId) return byId;
+    const rawUserId = rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId;
+    if (byId && (
+      rawUserId === undefined
+      || rawUserId === null
+      || String(byId.hidUserId) === String(rawUserId)
+    )) return byId;
   }
 
   const hidUserId = rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId ?? event.payload?.identity?.hidUserId ?? event.payload?.identityLookup?.hidUserId;

package/components/HidIntercomManagement.vue

@@ -24,6 +24,19 @@
         {{ webPhone.callState.value === 'incoming' ? 'Incoming Call' : 'Web Call' }}
       </v-btn>
 
+      <v-select
+        v-if="readers.length"
+        v-model="selectedReaderId"
+        :items="readerOptions"
+        item-title="title"
+        item-value="value"
+        variant="outlined"
+        density="compact"
+        hide-details
+        class="reader-input"
+        @update:model-value="page = 1"
+      />
+
       <div class="toolbar-spacer" />
 
       <v-text-field
@@ -702,6 +715,7 @@ const {
 
 const activeTab = ref<IntercomTab>("intercom");
 const readers = ref<Record<string, any>[]>([]);
+const selectedReaderId = ref("");
 const intercomRows = ref<IntercomRow[]>([]);
 const contacts = ref<ContactRow[]>([]);
 const loading = ref(false);
@@ -821,6 +835,11 @@ const contactForm = reactive({
   serverAddress: "",
 });
 
+const readerOptions = computed(() => readers.value.map((reader) => ({
+  title: `${reader.name || reader.deviceId || reader._id} — ${reader.portalName || "Portal not configured"}`,
+  value: reader._id,
+})));
+
 const visibleRows = computed(() => activeTab.value === "intercom" ? filteredIntercomRows.value : filteredContacts.value);
 const pages = computed(() => Math.max(1, Math.ceil(visibleRows.value.length / limit)));
 const pageRange = computed(() => {
@@ -834,6 +853,7 @@ const pageRange = computed(() => {
 const filteredIntercomRows = computed(() => {
   const query = search.value.trim().toLowerCase();
   return intercomRows.value.filter((row) => {
+    const matchesReader = !selectedReaderId.value || row.reader._id === selectedReaderId.value;
     const matchesSearch = !query || [
       row.name,
       row.location,
@@ -843,18 +863,22 @@ const filteredIntercomRows = computed(() => {
       row.status,
     ].some((value) => String(value || "").toLowerCase().includes(query));
     const matchesStatus = statusFilter.value === "Status" || row.status === statusFilter.value;
-    return matchesSearch && matchesStatus;
+    return matchesReader && matchesSearch && matchesStatus;
   });
 });
 
 const filteredContacts = computed(() => {
   const query = search.value.trim().toLowerCase();
-  return contacts.value.filter((contact) => !query || [
-    contact.name,
-    contact.location,
-    contact.serverAddress,
-    contact.dialCode,
-  ].some((value) => String(value || "").toLowerCase().includes(query)));
+  return contacts.value.filter((contact) => {
+    const matchesReader = !selectedReaderId.value || contact.readerId === selectedReaderId.value;
+    const matchesSearch = !query || [
+      contact.name,
+      contact.location,
+      contact.serverAddress,
+      contact.dialCode,
+    ].some((value) => String(value || "").toLowerCase().includes(query));
+    return matchesReader && matchesSearch;
+  });
 });
 
 const paginatedIntercomRows = computed(() => paginate(filteredIntercomRows.value));
@@ -977,6 +1001,9 @@ async function reload() {
   try {
     const response = await getReaders({ site: props.site, page: 1, limit: 100 });
     readers.value = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
+    if (!readers.value.some((reader) => reader._id === selectedReaderId.value)) {
+      selectedReaderId.value = readers.value[0]?._id || "";
+    }
     await loadIntercomRows();
     await loadContacts();
   } catch (error: any) {
@@ -1328,9 +1355,10 @@ function toggleWebMute() {
 function openContactDialog(contact?: ContactRow) {
   selectedContact.value = contact || null;
   contactForm.id = contact?.id;
-  contactForm.readerId = contact?.readerId || readers.value[0]?._id || "";
+  contactForm.readerId = contact?.readerId || selectedReaderId.value || readers.value[0]?._id || "";
   contactForm.name = contact?.name === "N/A" ? "" : contact?.name || "";
-  contactForm.location = contact?.location === "N/A" ? "" : contact?.location || readers.value[0]?.location || "";
+  const selectedReader = readers.value.find((reader) => reader._id === contactForm.readerId);
+  contactForm.location = contact?.location === "N/A" ? "" : contact?.location || selectedReader?.location || "";
   contactForm.serverAddress = contact?.serverAddress === "N/A" ? "" : contact?.serverAddress || "";
   contactDialog.value = true;
 }
@@ -1695,6 +1723,11 @@ export default {
   max-width: 220px;
 }
 
+.reader-input {
+  width: 300px;
+  max-width: 36vw;
+}
+
 .status-input {
   max-width: 160px;
 }
@@ -2673,6 +2706,7 @@ export default {
   }
 
   .top-placeholder,
+  .reader-input,
   .search-input,
   .status-input {
     width: 100%;

package/components/HidQrCodeConfiguration.vue

@@ -501,7 +501,6 @@ const identificationMethodOptions: Array<{
   { key: "qrCode", label: "QR Code" },
   { key: "idPassword", label: "ID Password" },
   { key: "pin", label: "PIN" },
-  { key: "bluetooth", label: "Bluetooth" },
 ];
 const accessPermissionOptions: Array<{
   category: THidPermissionCategory;
@@ -590,7 +589,7 @@ async function loadConfig() {
       qrCode: configuredMethods?.qrCode ?? Boolean(config.enabled),
       idPassword: configuredMethods?.idPassword ?? true,
       pin: configuredMethods?.pin ?? false,
-      bluetooth: configuredMethods?.bluetooth ?? false,
+      bluetooth: false,
     },
     printer: {
       vendorId: String(config.printer?.vendorId || ""),

package/components/HidReaderForm.vue

@@ -28,17 +28,6 @@
           class="mb-3"
         />
 
-        <div class="field-label">Device ID <span>*</span></div>
-        <v-text-field
-          v-model="draft.deviceId"
-          aria-label="Device ID"
-          placeholder="Enter device id"
-          variant="outlined"
-          density="compact"
-          hide-details="auto"
-          class="mb-3"
-        />
-
         <div class="field-label">Location <span>*</span></div>
         <v-text-field
           v-model="draft.location"
@@ -79,6 +68,49 @@
           :append-inner-icon="showPassword ? 'mdi-eye-off' : 'mdi-eye'"
           @click:append-inner="showPassword = !showPassword"
         />
+
+        <v-btn
+          v-if="mode === 'add'"
+          block
+          variant="tonal"
+          color="primary"
+          prepend-icon="mdi-lan-connect"
+          class="text-none mt-3"
+          :loading="discovering"
+          :disabled="!canDiscover"
+          @click="connectReader"
+        >
+          Connect &amp; discover reader
+        </v-btn>
+        <v-alert v-if="discoveryError" type="error" density="compact" variant="tonal" class="mt-3">
+          {{ discoveryError }}
+        </v-alert>
+
+        <div class="field-label mt-3">Device ID <span>*</span></div>
+        <v-text-field
+          v-model="draft.deviceId"
+          aria-label="Device ID"
+          placeholder="Connect to detect device ID"
+          variant="outlined"
+          density="compact"
+          hide-details="auto"
+          class="mb-3"
+          readonly
+        />
+
+        <div class="field-label">HID Portal <span>*</span></div>
+        <v-select
+          v-model="draft.portalId"
+          :items="portals"
+          item-title="name"
+          item-value="id"
+          aria-label="HID Portal"
+          placeholder="Connect to load portals"
+          variant="outlined"
+          density="compact"
+          hide-details="auto"
+          :readonly="mode === 'edit'"
+        />
       </v-card-text>
 
       <v-card-actions class="form-actions pa-0">
@@ -95,6 +127,7 @@
           variant="flat"
           height="48"
           :loading="loading"
+          :disabled="mode === 'add' && (!draft.deviceId || !draft.portalId)"
           @click="submit"
         >
           Submit
@@ -135,11 +168,18 @@ const dialogModel = computed({
 });
 
 const showPassword = ref(false);
+const discovering = ref(false);
+const discoveryError = ref("");
+const portals = ref<Array<{ id: number; name: string }>>([]);
+const discoveredConnection = ref("");
+const { discoverReader } = useHidAmico();
 const monitorEnabled = ref(true);
 const draft = reactive({
   name: "",
   baseUrl: "",
   deviceId: "",
+  portalId: null as number | null,
+  portalName: "",
   location: "",
   username: "",
   password: "",
@@ -153,6 +193,13 @@ watch(
     draft.name = props.reader?.name ?? "";
     draft.baseUrl = props.reader?.baseUrl ?? "";
     draft.deviceId = props.reader?.deviceId ?? "";
+    draft.portalId = props.reader?.portalId ?? null;
+    draft.portalName = props.reader?.portalName ?? "";
+    portals.value = draft.portalId
+      ? [{ id: draft.portalId, name: draft.portalName || `Portal ${draft.portalId}` }]
+      : [];
+    discoveryError.value = "";
+    discoveredConnection.value = "";
     draft.location = props.reader?.location ?? "";
     draft.username = props.reader?.username ?? "";
     draft.password = props.reader?.password ?? "";
@@ -165,9 +212,53 @@ function close() {
   emit("update:modelValue", false);
 }
 
+const canDiscover = computed(() => Boolean(
+  draft.baseUrl.trim() && draft.username.trim() && draft.password,
+));
+
+watch(
+  () => [draft.baseUrl, draft.username, draft.password],
+  () => {
+    if (props.mode !== "add" || !discoveredConnection.value) return;
+    const current = [draft.baseUrl.trim(), draft.username.trim(), draft.password].join("\n");
+    if (current !== discoveredConnection.value) {
+      draft.deviceId = "";
+      draft.portalId = null;
+      portals.value = [];
+      discoveredConnection.value = "";
+    }
+  },
+);
+
+async function connectReader() {
+  discovering.value = true;
+  discoveryError.value = "";
+  try {
+    const response = await discoverReader({
+      baseUrl: draft.baseUrl.trim(),
+      username: draft.username.trim(),
+      password: draft.password,
+    });
+    const data = response?.data ?? response;
+    draft.deviceId = String(data?.deviceId || "");
+    portals.value = Array.isArray(data?.portals) ? data.portals : [];
+    draft.portalId = portals.value.length === 1 ? portals.value[0].id : null;
+    discoveredConnection.value = [draft.baseUrl.trim(), draft.username.trim(), draft.password].join("\n");
+  } catch (error: any) {
+    draft.deviceId = "";
+    draft.portalId = null;
+    portals.value = [];
+    discoveryError.value = error?.data?.message || error?.message || "Unable to connect to the HID reader.";
+  } finally {
+    discovering.value = false;
+  }
+}
+
 function submit() {
+  const portal = portals.value.find((item) => item.id === Number(draft.portalId));
   const payload: Record<string, any> = {
     ...draft,
+    portalName: portal?.name || draft.portalName,
     monitorPath: monitorEnabled.value ? "api/notifications" : "",
     enabled: monitorEnabled.value,
     status: monitorEnabled.value ? "active" : "inactive",

package/components/HidReaderManagement.vue

@@ -119,6 +119,7 @@
             <span>HID reader name</span><strong>{{ selectedReader?.name || "N/A" }}</strong>
             <span>Device ID</span><strong>{{ selectedReader?.deviceId || "N/A" }}</strong>
             <span>Location</span><strong>{{ selectedReader?.location || "N/A" }}</strong>
+            <span>HID Portal</span><strong>{{ selectedReader?.portalName || selectedReader?.portalId || "N/A" }}</strong>
             <span>Monitor Path</span><strong>{{ selectedReader?.monitorPath || "N/A" }}</strong>
             <span>Status</span><strong>{{ formatReaderStatus(resolveReaderStatus(selectedReader)) }}</strong>
             <span>Username</span><strong>{{ selectedReader?.username || "N/A" }}</strong>

package/components/HidUserEnrollment.vue

@@ -12,7 +12,7 @@
       </v-btn>
 
       <v-select
-        v-if="readers.length > 1"
+        v-if="readers.length"
         v-model="selectedReaderId"
         :items="readerOptions"
         item-title="title"
@@ -48,6 +48,18 @@
       />
     </div>
 
+    <v-alert
+      v-if="selectedReader"
+      :type="selectedReader.portalId && selectedReader.portalName ? 'info' : 'warning'"
+      variant="tonal"
+      density="compact"
+      class="mb-4"
+      icon="mdi-door-open"
+    >
+      Access Reader: {{ selectedReader.name || "HID Reader" }} · Access Portal:
+      {{ selectedReader.portalName || "Not configured" }}
+    </v-alert>
+
     <v-card flat border class="table-card">
       <div class="table-refresh">
         <v-btn
@@ -429,10 +441,13 @@ const statusOptions = ["Status", "Mapped", "Unmapped"];
 
 const readerOptions = computed(() =>
   readers.value.map((reader) => ({
-    title: reader.name || reader.deviceId || reader._id,
+    title: `${reader.name || reader.deviceId || reader._id} — ${reader.portalName || "Portal not configured"}`,
     value: reader._id,
   }))
 );
+const selectedReader = computed(() =>
+  readers.value.find((reader) => reader._id === (selectedReaderId.value || form.reader)) || null,
+);
 
 const pageRange = computed(() => {
   if (serverPageRange.value) return serverPageRange.value;
@@ -689,6 +704,10 @@ async function saveUser() {
     showToast("Access PIN must contain numbers only.", "error");
     return;
   }
+  if (selectedPhotoFile.value && (!selectedReader.value?.portalId || !selectedReader.value?.portalName)) {
+    showToast("Reconnect this HID reader and select a portal before enrolling facial recognition.", "error");
+    return;
+  }
 
   saving.value = true;
   try {

package/components/MemberInformation.vue

@@ -75,6 +75,7 @@
                 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"
+                :hid-reader-name="props.hidReaderName" :hid-portal-name="props.hidPortalName"
                 :excluded-card-ids="props.selectedNfcCards.map((c) => c._id)" />
             </v-col>
 
@@ -192,6 +193,14 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  hidReaderName: {
+    type: String,
+    default: "",
+  },
+  hidPortalName: {
+    type: String,
+    default: "",
+  },
   selectedNfcCards: {
     type: Array as PropType<{ _id: string; cardNo: string }[]>,
     default: () => [],

package/components/VisitorForm.vue

@@ -260,6 +260,8 @@
               :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-reader-name="hidQrReader?.name || ''"
+              :hid-portal-name="hidQrReader?.portalName || ''"
               @update:available-qr-count="(val) => availableQrCount = val" />
           </v-col>
 
@@ -269,6 +271,7 @@
               :settings="entryPassSettings" :settings-loading="entryPassSettingsPending || siteDataPending"
               :unit-id="visitor.unit || null" :hid-qr-code-enabled="hidQrCodePassAllowed"
               :hid-qr-printer-configured="hasHidQrPrinterConfig"
+              :hid-reader-name="hidQrReader?.name || ''" :hid-portal-name="hidQrReader?.portalName || ''"
               :selected-nfc-cards="passType === 'NFC' ? passCards : []" />
           </v-col>
 
@@ -533,6 +536,9 @@
           </v-btn>
 
           <div class="text-h6 font-weight-bold">{{ visitor.name }}</div>
+          <div v-if="hidQrReader?.portalName" class="text-caption text-medium-emphasis mt-1">
+            {{ hidQrReader.name || "HID Reader" }} · {{ hidQrReader.portalName }}
+          </div>
           <div v-if="hidQrPreview.expiresAt" class="text-caption text-medium-emphasis mt-1">
             Valid until {{ formatHidQrExpiry(hidQrPreview.expiresAt) }}
           </div>
@@ -668,7 +674,7 @@ const {
 const { getBySiteId: getEntryPassSettingsBySiteId } =
   useSiteEntryPassSettings();
 const { createVisitorPass, signQr } = useAccessManagement();
-const { issueVisitorQr } = useHidAmico();
+const { getReaders, issueVisitorQr } = useHidAmico();
 const { testConnection } = useWebUsb();
 const {
   findPersonByNRIC,
@@ -877,6 +883,23 @@ const hidQrValidityMinutes = computed(() => {
 });
 
 const hidQrReaderId = computed(() => String(hidQrCodePassConfig.value?.readerId || ""));
+const hidQrReader = ref<Record<string, any> | null>(null);
+
+watch(
+  [hidQrReaderId, () => prop.site],
+  async ([readerId, site]) => {
+    hidQrReader.value = null;
+    if (!readerId || !site) return;
+    try {
+      const response = await getReaders({ site, page: 1, limit: 100 });
+      const readers = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
+      hidQrReader.value = readers.find((reader: Record<string, any>) => String(reader._id) === readerId) || null;
+    } catch {
+      hidQrReader.value = null;
+    }
+  },
+  { immediate: true },
+);
 
 const hidQrCodePassAllowed = computed(() => {
   return (
@@ -2100,6 +2123,12 @@ function validateHidQrReaderConfig() {
     return false;
   }
 
+  if (!hidQrReader.value?.portalId || !hidQrReader.value?.portalName) {
+    errorMessage.value =
+      "The selected HID reader has no portal configured. Reconnect the reader and select a portal before generating a QR code.";
+    return false;
+  }
+
   return true;
 }
 

package/composables/useHidAmico.ts

@@ -6,6 +6,8 @@ type HidReaderPayload = {
   username?: string;
   password?: string;
   deviceId?: string;
+  portalId?: number;
+  portalName?: string;
   monitorPath?: string;
   enabled?: boolean;
   status?: string;
@@ -34,6 +36,9 @@ type HidVisitorQrData = {
   hidUserId: number;
   qrValue: string;
   qrFormat: "0";
+  portalId: number;
+  portalName: string;
+  readerName: string;
   issuedAt: string;
   expiresAt: string;
 };
@@ -189,6 +194,13 @@ export default function useHidAmico() {
     );
   }
 
+  function discoverReader(payload: Pick<HidReaderPayload, "baseUrl" | "username" | "password">) {
+    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/discover`, {
+      method: "POST",
+      body: payload,
+    });
+  }
+
   function getUserPinStatus(readerId: string, hidUserId: string | number) {
     return useNuxtApp().$api<{ data: { pinEnrolled: boolean } }>(
       `${basePath}/readers/${readerId}/users/${hidUserId}/pin`,
@@ -294,6 +306,7 @@ export default function useHidAmico() {
 
   return {
     getReaders,
+    discoverReader,
     createReader,
     updateReader,
     deleteReader,

package/package.json

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