@7365admin1/layer-common 4.0.3-staging.232 → 4.0.3-staging.233

package/components/HidAccessLogDashboard.vue

@@ -138,10 +138,6 @@
         </StatusChip>
       </template>
 
-      <template #[`item.mappingStatus`]="{ item }">
-        <StatusChip :status="item.mappingStatus" />
-      </template>
-
       <template #[`item.action-table`]="{ item }">
         <AppButton
           variant="row"
@@ -307,7 +303,7 @@ const props = defineProps({
   },
 });
 
-type AccessTab = "all" | "unmapped" | "mapped" | "visitor" | "administrator";
+type AccessTab = "all" | "visitor" | "administrator";
 type IdentityCategory = "resident" | "visitor" | "administrator";
 type AuthorizationStatus = "Authorized" | "Not Authorized" | "Unknown";
 type AccessRow = {
@@ -374,7 +370,6 @@ type JsPdf = {
 
 const {
   getReaders,
-  getIdentities,
   getLogs,
   getUserImage,
   getReaderUsers,
@@ -519,7 +514,6 @@ const filteredRows = computed(() => {
       row.method,
       row.lastAccessTime,
       row.status,
-      row.mappingStatus,
     ].some((value) => String(value ?? "").toLowerCase().includes(query));
 
     const matchesStatus = !status.value || row.status === status.value;
@@ -531,12 +525,10 @@ const filteredRows = computed(() => {
 
 /**
  * The source of truth is the Amico access log, so All is the initial view.
- * The other tabs are audit filters; unmapped events never fall into Resident.
+ * The other tabs are Amico audit filters.
  */
 const tabOptions: Array<{ label: string; value: AccessTab }> = [
   { label: "All", value: "all" },
-  { label: "Unmapped", value: "unmapped" },
-  { label: "Mapped", value: "mapped" },
   { label: "Visitor", value: "visitor" },
   { label: "Administrator", value: "administrator" },
 ];
@@ -553,7 +545,6 @@ const logHeaders = [
   { title: "Access Method", value: "method", sortable: false },
   { title: "Access Date and Time", value: "lastAccessTime", sortable: false },
   { title: "Status", value: "status", sortable: false },
-  { title: "iService Mapping", value: "mappingStatus", sortable: false },
   { title: "", value: "action-table", sortable: false },
 ];
 
@@ -626,15 +617,7 @@ async function loadDashboard() {
   resetDashboardData();
   try {
     const isVisitorTab = activeTab.value === "visitor";
-    const [identityResponse, logResponse, hidAccessLogResponse, visitorResponse, readerUserResponse] = await Promise.all([
-      loadDashboardSource(
-        getIdentities(selectedReaderId.value, {
-          page: page.value,
-          limit: 100,
-        }),
-        null,
-        "identities",
-      ),
+    const [logResponse, hidAccessLogResponse, visitorResponse, readerUserResponse] = await Promise.all([
       loadDashboardSource(
         getLogs(selectedReaderId.value, {
           page: page.value,
@@ -693,16 +676,8 @@ async function loadDashboard() {
 
     if (sequence !== loadSequence.value) return;
 
-    const loadedIdentities = identityResponse?.items ?? identityResponse?.data?.items ?? identityResponse?.data?.identities ?? [];
     const liveItems = hidAccessLogResponse?.items ?? hidAccessLogResponse?.data?.items ?? [];
     const readerUsers = readerUserResponse?.items ?? readerUserResponse?.data?.items ?? [];
-    const embeddedIdentities = liveItems
-      .map((item: Record<string, unknown>) => item.identity)
-      .filter(isUnknownRecord);
-    const mergedIdentities = mergeReaderUsersWithIdentities(
-      readerUsers,
-      [...loadedIdentities, ...embeddedIdentities],
-    );
     const loadedVisitors = visitorResponse?.items ?? visitorResponse?.data?.items ?? visitorResponse?.data?.visitors ?? [];
     visitorRecords.value = Object.fromEntries(
       loadedVisitors.map((visitor: HidAccessRecord) => [String(visitor._id), visitor]),
@@ -713,8 +688,10 @@ async function loadDashboard() {
         .map((item: Record<string, unknown>) => toHidNumericId(item.hidUserId ?? item.user_id))
         .filter((userId: number | undefined): userId is number => Boolean(userId)),
     );
-    allIdentities.value = mergedIdentities;
-    identities.value = mergedIdentities.filter(isMappedIdentity);
+    // The reader is the source of HID identities. Do not merge old iService
+    // identity metadata here: it can contain a stale photo from another user.
+    allIdentities.value = readerUsers;
+    identities.value = readerUsers;
     logs.value = liveItems.length
       ? []
       : logResponse?.items ?? logResponse?.data?.items ?? logResponse?.data?.logs ?? [];
@@ -728,7 +705,7 @@ async function loadDashboard() {
       hidUserId: String(hidUserId),
     }));
     await loadUserImages(
-      [...mergedIdentities, ...accessLogImageCandidates],
+      [...readerUsers, ...accessLogImageCandidates],
       accessLogUserIds,
     );
   } finally {
@@ -756,7 +733,6 @@ async function loadUserImages(items: HidAccessRecord[], forceUserIds = new Set<n
     if (
       !hidUserId ||
       key in userImages.value ||
-      identity?.metadata?.photo ||
       (!forceUserIds.has(hidUserId) && !hasHidImageHint(identity))
     ) return;
 
@@ -784,11 +760,9 @@ function hasHidImageHint(identity: HidAccessRecord) {
   return Boolean(
     identity?.metadata?.imageTimestamp ||
       identity?.metadata?.facialData ||
-      identity?.metadata?.photo ||
       identity?.imageTimestamp ||
       identity?.image_timestamp ||
-      identity?.facialData ||
-      identity?.photo,
+      identity?.facialData,
   );
 }
 
@@ -802,38 +776,6 @@ async function onTabChange(tab: AccessTab) {
   loadDashboard();
 }
 
-function mergeReaderUsersWithIdentities(readerUsers: HidAccessRecord[], identities: HidAccessRecord[]) {
-  const identityById = new Map<string, HidAccessRecord>();
-  identities.forEach((identity) => {
-    const id = toHidNumericId(identity.hidUserId);
-    if (id) identityById.set(String(id), identity);
-  });
-
-  const mergedReaderUsers = readerUsers.map((readerUser) => {
-    const identity = identityById.get(String(toHidNumericId(readerUser.hidUserId)));
-    if (!identity) return readerUser;
-
-    return {
-      ...readerUser,
-      ...identity,
-      hidUserId: identity.hidUserId || readerUser.hidUserId,
-      rawHidUserId: readerUser.rawHidUserId,
-      name: identity.metadata?.name || identity.name || readerUser.name,
-      registration: identity.registration || readerUser.registration,
-      cardNo: identity.cardNo || readerUser.cardNo,
-      metadata: {
-        ...readerUser.metadata,
-        ...identity.metadata,
-        imageTimestamp: identity.metadata?.imageTimestamp || readerUser.metadata?.imageTimestamp,
-      },
-    };
-  });
-
-  const readerUserIds = new Set(readerUsers.map((user) => String(toHidNumericId(user.hidUserId))));
-  const identitiesOnly = identities.filter((identity) => !readerUserIds.has(String(toHidNumericId(identity.hidUserId))));
-  return [...mergedReaderUsers, ...identitiesOnly];
-}
-
 function resetDashboardData() {
   selectedHistoryRow.value = undefined;
   identities.value = [];
@@ -841,6 +783,7 @@ function resetDashboardData() {
   visitorRecords.value = {};
   logs.value = [];
   liveAccessLogs.value = [];
+  userImages.value = {};
   administratorUserIds.value = new Set();
   serverPages.value = 1;
   serverPageRange.value = "";
@@ -849,8 +792,6 @@ function resetDashboardData() {
 function isVisibleForActiveTab(row: AccessRow) {
   const identity = findIdentityByKey(row.identityKey);
   if (activeTab.value === "all") return true;
-  if (activeTab.value === "unmapped") return !isMappedIdentity(identity);
-  if (activeTab.value === "mapped") return isMappedIdentity(identity);
   return classifyIdentity(identity, row) === activeTab.value;
 }
 
@@ -912,12 +853,7 @@ function getName(identity: HidAccessRecord) {
 }
 
 function getFacialData(identity: HidAccessRecord) {
-  return identity.metadata?.facialData || identity.metadata?.imageTimestamp || (identity.metadata?.photo ? identity.hidUserId : "N/A");
-}
-
-function getUserImageSrc(identity: HidAccessRecord) {
-  const hidUserId = toHidNumericId(identity?.hidUserId);
-  return identity?.metadata?.photo || (hidUserId ? userImages.value[String(hidUserId)] : "") || "";
+  return identity.metadata?.facialData || identity.metadata?.imageTimestamp || "N/A";
 }
 
 function getUnit(identity: HidAccessRecord) {
@@ -953,7 +889,7 @@ function getAccessMethod(identity: HidAccessRecord, log?: HidAccessRecord) {
   if (payload.confidence || payload.user_id || payload.userId || payload.hidUserId) return "Facial";
   if (payload.password_value || payload.password || isValidIdentifierId(payload.identifier_id)) return "ID and Password";
   if (identity.metadata?.pinPassword) return "ID and Password";
-  return identity.metadata?.photo || identity.metadata?.facialData ? "Facial" : "N/A";
+  return identity.metadata?.facialData || identity.metadata?.imageTimestamp ? "Facial" : "N/A";
 }
 
 function formatDate(value?: string | number) {
@@ -1177,6 +1113,9 @@ function mapAccessLogToRow(rawLog: HidAccessRecord, event: HidAccessRecord, inde
   const mapped = isMappedIdentity(identity);
   const eventIdentity = event.payload?.identity || event.payload?.identityLookup || {};
   const rawAccessTime = getAccessLogTime(rawLog, event);
+  const logHidUserId = toHidNumericId(
+    rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId ?? identity?.hidUserId,
+  );
   const identityKey = identity ? getIdentityKey(identity) : getLogIdentityKey({ ...event, payload: { ...event.payload, rawAccessLog: rawLog } });
 
   return {
@@ -1189,7 +1128,7 @@ function mapAccessLogToRow(rawLog: HidAccessRecord, event: HidAccessRecord, inde
     name: getRawLogName(rawLog, event, identity),
     hidUserId: formatHidUid(rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId ?? identity?.hidUserId),
     facialData: identity ? getFacialData(identity) : "N/A",
-    faceImage: identity ? getUserImageSrc(identity) : "",
+    faceImage: logHidUserId ? userImages.value[String(logHidUserId)] || "" : "",
     unit: identity ? getUnit(identity) : "N/A",
     method: getAccessMethod(identity || {}, { ...event, payload: { ...event.payload, rawAccessLog: rawLog } }),
     lastAccessTime: formatDate(rawAccessTime),

package/components/HidQrCodeConfiguration.vue

@@ -21,19 +21,26 @@
     <div class="config-body">
       <div class="section-label config-body__title">HID Configuration</div>
 
-      <div class="online-mode-row">
-        <div>
-          <h3>Activate Online Mode</h3>
-          <p>Enables real-time server communication, synchronizing live credential verification and access data across the network.</p>
+      <div class="form-section">
+        <div class="section-label">Visitor QR Reader</div>
+        <p class="section-description">
+          Select the HID reader and portal used when creating a Visitor QR pass.
+        </p>
+        <div class="reader-grid">
+          <AppSelect
+            v-model="form.readerId"
+            :items="visitorQrReaderOptions"
+            placeholder="Select a HID reader"
+            :disabled="Boolean(savingSection) || visitorQrReaderOptions.length === 0"
+          />
+          <AppButton
+            icon="mdi-content-save-outline"
+            :disabled="Boolean(savingSection) || !form.readerId"
+            @click="saveSection('reader')"
+          >
+            Save Reader
+          </AppButton>
         </div>
-        <v-switch
-          v-model="form.onlineMode"
-          class="app-switch"
-          hide-details
-          :loading="savingSection === 'online-mode'"
-          :disabled="Boolean(savingSection) || !form.readerId"
-          @update:model-value="saveOnlineMode"
-        />
       </div>
 
       <v-divider />
@@ -48,7 +55,6 @@
             v-for="method in identificationMethodOptions"
             :key="method.key"
             class="method-control"
-            :class="{ 'method-control--disabled': !form.onlineMode }"
           >
             <span>{{ method.label }}</span>
             <v-switch
@@ -57,7 +63,7 @@
               hide-details
               density="compact"
               :loading="savingSection === `method-${method.key}`"
-              :disabled="Boolean(savingSection) || !form.onlineMode"
+              :disabled="Boolean(savingSection) || !form.readerId"
               @update:model-value="saveIdentificationMethod(method.key)"
             />
           </div>
@@ -368,7 +374,6 @@ const {
   getReaders,
   getReaderConfiguration,
   setReaderConfiguration,
-  setReaderOperatingMode,
   getSitePermissions,
   getPermissionCandidates,
   updateSitePermissions,
@@ -436,6 +441,10 @@ const savingPermissions = ref(false);
 const hasPrinterConfig = computed(() =>
   Boolean(form.printer.vendorId && form.printer.productId),
 );
+const visitorQrReaderOptions = computed(() => readers.value.map((reader) => ({
+  title: String(reader.name || reader.deviceId || reader._id) + " - " + (reader.portalName || "Portal not configured"),
+  value: reader._id,
+})));
 const identificationMethodOptions: Array<{
   key: HidIdentificationMethod;
   label: string;
@@ -537,7 +546,9 @@ async function loadConfig() {
   const configuredMethods = config.identificationMethods;
   Object.assign(form, {
     enabled: Boolean(config.enabled),
-    onlineMode: Boolean(config.onlineMode),
+    // Visitor QR is reader-local. Do not restore a legacy Online Mode value
+    // from the site record and accidentally make a scan depend on Monitor.
+    onlineMode: false,
     readerId: String(config.readerId || readers.value[0]?._id || ""),
     qrFormat: "0",
     identificationMethods: {
@@ -705,7 +716,6 @@ async function loadReaderConfiguration() {
 
   try {
     const response = await getReaderConfiguration(form.readerId, {
-      general: ["online"],
       identifier: [
         "card_identification_enabled",
         "pin_identification_enabled",
@@ -713,12 +723,8 @@ async function loadReaderConfiguration() {
       ],
     });
     const configuration = getConfigurationData(response);
-    const general = isUnknownRecord(configuration.general) ? configuration.general : {};
     const identifier = isUnknownRecord(configuration.identifier) ? configuration.identifier : {};
 
-    if (general.online !== undefined) {
-      form.onlineMode = isEnabledConfiguration(general.online);
-    }
     if (identifier.pin_identification_enabled !== undefined) {
       const pinEnabled = isEnabledConfiguration(identifier.pin_identification_enabled);
       form.identificationMethods.pin = pinEnabled;
@@ -739,7 +745,7 @@ function buildPayload() {
     ...(siteData.value?.metadata || {}),
     hidQrCodePass: {
       enabled: form.identificationMethods.qrCode,
-      onlineMode: form.onlineMode,
+      onlineMode: false,
       readerId: form.readerId,
       // Visitor QR passes always use Amico alphanumeric qrcodes.
       qrFormat: "0",
@@ -775,22 +781,6 @@ async function saveSection(section: string) {
   }
 }
 
-async function saveOnlineMode() {
-  if (!props.site || !form.readerId) return;
-
-  savingSection.value = "online-mode";
-  try {
-    await setReaderOperatingMode(form.readerId, form.onlineMode ? "online" : "standalone");
-    await updateSitebyId(props.site, buildPayload());
-    showMessage("Online mode updated.", "success");
-  } catch (error: unknown) {
-    await loadConfig();
-    showMessage(errorConverter(error), "error");
-  } finally {
-    savingSection.value = "";
-  }
-}
-
 async function saveIdentificationMethod(method: HidIdentificationMethod) {
   if (!props.site) return;
 
@@ -991,6 +981,13 @@ function showMessage(text: string, color: string) {
   align-items: end;
 }
 
+.reader-grid {
+  display: grid;
+  grid-template-columns: minmax(260px, 1fr) minmax(150px, 220px);
+  gap: 14px;
+  align-items: end;
+}
+
 .template-grid {
   display: grid;
   grid-template-columns: minmax(220px, 1fr) minmax(220px, 1fr);
@@ -1337,6 +1334,7 @@ function showMessage(text: string, color: string) {
   }
 
   .printer-grid,
+  .reader-grid,
   .template-grid,
   .validity-grid,
   .permission-location,
@@ -1352,6 +1350,7 @@ function showMessage(text: string, color: string) {
 @media (max-width: 700px) {
   .online-mode-row,
   .printer-grid,
+  .reader-grid,
   .template-grid,
   .validity-grid,
   .methods-grid,