@7365admin1/layer-common 3.2.1-staging.71 → 3.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.2.1
+
+### Patch Changes
+
+- 413272f: 08122026 new release
+
 ## 3.2.0
 
 ### Minor Changes

package/components/EntryPassInformation.vue

@@ -168,13 +168,13 @@
       <template v-if="passType === 'HID_QR'">
         <v-alert
           v-if="!hidQrPrinterConfigured"
-          type="info"
+          type="warning"
           variant="tonal"
           density="compact"
           class="mt-3"
-          icon="mdi-qrcode"
+          icon="mdi-printer-alert"
         >
-          HID QR Code will be generated and shown on screen. You can download it after continuing.
+          No printer is configured on HID settings. QR Pass may not print.
         </v-alert>
         <v-alert
           v-else
@@ -184,7 +184,7 @@
           class="mt-3"
           icon="mdi-qrcode-scan"
         >
-          HID QR Code will be generated and shown on screen. Printing is also available.
+          HID QR Code will be generated and printed when you continue.
         </v-alert>
       </template>
     </template>

package/components/HidAccessLogDashboard.vue

@@ -327,8 +327,6 @@ type AccessTab = "resident" | "visitor" | "administrator";
 type AccessRow = {
   key: string;
   identityKey: string;
-  identityType?: string;
-  visitorId?: string;
   name: string;
   facialData: string;
   faceImage?: string;
@@ -353,7 +351,6 @@ const { getVisitors } = useVisitor();
 
 const readers = ref<Record<string, any>[]>([]);
 const identities = ref<Record<string, any>[]>([]);
-const allIdentities = ref<Record<string, any>[]>([]);
 const visitorRecords = ref<Record<string, any>>({});
 const logs = ref<Record<string, any>[]>([]);
 const liveAccessLogs = ref<Record<string, any>[]>([]);
@@ -421,17 +418,8 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
   if (!selectedHistoryRow.value) return [];
 
   const selectedKey = selectedHistoryRow.value.identityKey;
-  const selectedIdentity = findIdentityByKey(selectedKey);
-  const matchedLogs = logs.value.filter((log) =>
-    selectedIdentity
-      ? accessLogMatchesIdentity(log, selectedIdentity)
-      : getLogIdentityKey(log) === selectedKey,
-  );
-  const matchedLiveLogs = liveAccessLogs.value.filter((log) =>
-    selectedIdentity
-      ? accessLogMatchesIdentity(log, selectedIdentity)
-      : getAccessLogIdentityKey(log) === selectedKey,
-  );
+  const matchedLogs = logs.value.filter((log) => getLogIdentityKey(log) === selectedKey);
+  const matchedLiveLogs = liveAccessLogs.value.filter((log) => getAccessLogIdentityKey(log) === selectedKey);
 
   if (!matchedLogs.length && !matchedLiveLogs.length) {
     return rows.value.filter((row) => row.identityKey === selectedKey);
@@ -561,41 +549,28 @@ async function loadDashboard() {
     const isAdministratorTab = activeTab.value === "administrator";
     const isVisitorTab = activeTab.value === "visitor";
     const [identityResponse, logResponse, hidAccessLogs, configurationResponse, roleResponse, visitorResponse, readerUserResponse] = await Promise.all([
-      loadDashboardSource(
-        getIdentities(selectedReaderId.value, {
-          page: 1,
-          limit: 500,
-        }),
-        null,
-        "identities",
-      ),
-      loadDashboardSource(
-        getLogs(selectedReaderId.value, {
-          page: 1,
-          limit: 500,
-        }),
-        null,
-        "persisted access logs",
-      ),
-      loadDashboardSource(loadLiveAccessLogs(selectedReaderId.value), [], "live access logs"),
-      loadDashboardSource(loadReaderConfiguration(selectedReaderId.value), {}, "reader configuration"),
-      isAdministratorTab
-        ? loadDashboardSource(loadAdministratorRoles(selectedReaderId.value), null, "administrator roles")
-        : Promise.resolve(null),
+      getIdentities(selectedReaderId.value, {
+        page: 1,
+        limit: 500,
+        ...(!isAdministratorTab ? { type: getIdentityType(activeTab.value) } : {}),
+      }),
+      getLogs(selectedReaderId.value, {
+        page: 1,
+        limit: 500,
+      }),
+      loadLiveAccessLogs(selectedReaderId.value),
+      loadReaderConfiguration(selectedReaderId.value),
+      isAdministratorTab ? loadAdministratorRoles(selectedReaderId.value) : Promise.resolve(null),
       isVisitorTab && props.org
-        ? loadDashboardSource(
-            getVisitors({
-              org: props.org,
-              site: props.site,
-              page: 1,
-              limit: 500,
-              order: "desc",
-            }),
-            null,
-            "visitor records",
-          )
+        ? getVisitors({
+            org: props.org,
+            site: props.site,
+            page: 1,
+            limit: 500,
+            order: "desc",
+          })
         : Promise.resolve(null),
-      loadDashboardSource(loadReaderUsers(selectedReaderId.value), [], "reader users"),
+      loadReaderUsers(selectedReaderId.value),
     ]);
 
     if (sequence !== loadSequence.value) return;
@@ -603,19 +578,18 @@ async function loadDashboard() {
     const loadedIdentities = identityResponse?.items ?? identityResponse?.data?.items ?? identityResponse?.data?.identities ?? [];
     const mergedIdentities = mergeReaderUsersWithIdentities(readerUserResponse, loadedIdentities);
     const loadedVisitors = visitorResponse?.items ?? visitorResponse?.data?.items ?? visitorResponse?.data?.visitors ?? [];
-    visitorRecords.value = Object.fromEntries(
-      loadedVisitors.map((visitor: Record<string, any>) => [String(visitor._id), visitor]),
-    );
+    visitorRecords.value = isVisitorTab
+      ? Object.fromEntries(loadedVisitors.map((visitor: Record<string, any>) => [String(visitor._id), visitor]))
+      : {};
     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));
+      : isVisitorTab
+        ? mergedIdentities.filter((identity: Record<string, any>) => Boolean(getVisitorRecord(identity)))
+      : mergedIdentities;
     logs.value = logResponse?.items ?? logResponse?.data?.items ?? logResponse?.data?.logs ?? [];
     liveAccessLogs.value = hidAccessLogs;
     readerConfiguration.value = normalizeReaderConfiguration(configurationResponse);
@@ -627,15 +601,6 @@ async function loadDashboard() {
   }
 }
 
-async function loadDashboardSource<T>(request: Promise<T>, fallback: T, label: string): Promise<T> {
-  try {
-    return await request;
-  } catch (error) {
-    console.warn(`Unable to load HID ${label}`, error);
-    return fallback;
-  }
-}
-
 async function loadUserImages(items: Record<string, any>[]) {
   if (!selectedReaderId.value) return;
 
@@ -801,7 +766,6 @@ function mergeReaderUsersWithIdentities(readerUsers: Record<string, any>[], iden
 function resetDashboardData() {
   selectedHistoryRow.value = undefined;
   identities.value = [];
-  allIdentities.value = [];
   visitorRecords.value = {};
   logs.value = [];
   liveAccessLogs.value = [];
@@ -809,11 +773,15 @@ function resetDashboardData() {
   administratorUserIds.value = new Set();
 }
 
+function getIdentityType(tab: AccessTab) {
+  if (tab === "administrator") return "admin";
+  return tab;
+}
+
 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;
+    return Boolean(identity && getVisitorRecord(identity));
   }
 
   if (activeTab.value === "administrator") {
@@ -821,11 +789,7 @@ function isVisibleForActiveTab(row: AccessRow) {
     return Boolean(hidUserId && administratorUserIds.value.has(hidUserId));
   }
 
-  return !isVisitor;
-}
-
-function isVisitorIdentity(identity: Record<string, unknown> | undefined) {
-  return Boolean(identity && (identity.type === "visitor" || identity.visitor));
+  return !identity || !getVisitorRecord(identity);
 }
 
 function loadAdministratorRoles(readerId: string) {
@@ -871,13 +835,13 @@ function getIdentityKey(identity: Record<string, any>) {
   return [
     identity.hidUserId,
     identity.registration,
-    identity.cardNo || identity.metadata?.qrCodeValue,
+    identity.cardNo,
   ].filter(Boolean).join("|");
 }
 
 function findIdentityByKey(identityKey: string) {
   if (!identityKey) return undefined;
-  return allIdentities.value.find((identity) => getIdentityKey(identity) === identityKey);
+  return identities.value.find((identity) => getIdentityKey(identity) === identityKey);
 }
 
 function getLogIdentityKey(log: Record<string, any>) {
@@ -887,7 +851,7 @@ function getLogIdentityKey(log: Record<string, any>) {
   return [
     identity.hidUserId || lookup.hidUserId || rawLog.user_id || rawLog.userId || rawLog.hidUserId,
     identity.registration || lookup.registration,
-    identity.cardNo || lookup.cardNo || rawLog.card_value || rawLog.cardNo || rawLog.qrcode_value,
+    identity.cardNo || lookup.cardNo || rawLog.card_value || rawLog.cardNo,
   ].filter(Boolean).join("|");
 }
 
@@ -1181,15 +1145,12 @@ function getRawAccessLogs(event: Record<string, any>) {
 
 function mapAccessLogToRow(rawLog: Record<string, any>, event: Record<string, any>, index: string): AccessRow {
   const identity = findIdentityForAccessLog(rawLog, event);
-  const eventIdentity = event.payload?.identity || event.payload?.identityLookup || {};
   const rawAccessTime = getAccessLogTime(rawLog, event);
   const identityKey = identity ? getIdentityKey(identity) : getLogIdentityKey({ ...event, payload: { ...event.payload, rawAccessLog: rawLog } });
 
   return {
     key: `${event._id || event.id || "log"}-${rawLog.id || rawLog.time || index}`,
     identityKey,
-    identityType: String(identity?.type || eventIdentity.type || "").toLowerCase() || undefined,
-    visitorId: String(identity?.visitor || eventIdentity.visitor || "") || undefined,
     name: identity ? getName(identity) : getRawLogName(rawLog, event),
     facialData: identity ? getFacialData(identity) : "N/A",
     faceImage: identity ? getUserImageSrc(identity) : "",
@@ -1205,33 +1166,32 @@ function mapAccessLogToRow(rawLog: Record<string, any>, event: Record<string, an
 function findIdentityForAccessLog(rawLog: Record<string, any>, event: Record<string, any>) {
   const eventIdentityId = event.payload?.identity?._id;
   if (eventIdentityId) {
-    const byId = allIdentities.value.find((identity) => String(identity._id) === String(eventIdentityId));
+    const byId = identities.value.find((identity) => String(identity._id) === String(eventIdentityId));
     if (byId) return byId;
   }
 
   const hidUserId = rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId ?? event.payload?.identity?.hidUserId ?? event.payload?.identityLookup?.hidUserId;
   const registration = rawLog.registration ?? event.payload?.identity?.registration ?? event.payload?.identityLookup?.registration;
   const cardNo = rawLog.card_value || rawLog.cardNo || event.payload?.identity?.cardNo || event.payload?.identityLookup?.cardNo;
-  const qrCodeValue = rawLog.qrcode_value || rawLog.qrCode || rawLog.qrcode;
 
-  return allIdentities.value.find((identity) => {
+  return identities.value.find((identity) => {
     return (
       (hidUserId !== undefined && hidUserId !== null && String(identity.hidUserId) === String(hidUserId)) ||
       (registration && identity.registration === registration) ||
-      (cardNo && String(identity.cardNo) === String(cardNo)) ||
-      (qrCodeValue && String(identity.metadata?.qrCodeValue || "") === String(qrCodeValue))
+      (cardNo && String(identity.cardNo) === String(cardNo))
     );
   });
 }
 
 function getLatestAccessLogForIdentity(identity: Record<string, any>) {
+  const identityKey = getIdentityKey(identity);
   const accessLogs = [
     ...liveAccessLogs.value,
     ...logs.value.flatMap((event) => getRawAccessLogs(event)),
   ];
 
   return accessLogs
-    .filter((log) => accessLogMatchesIdentity(log, identity))
+    .filter((log) => getAccessLogIdentityKey(log) === identityKey)
     .sort((a, b) => {
       const aTime = parseDate(getAccessLogTime(a, {}))?.getTime() || 0;
       const bTime = parseDate(getAccessLogTime(b, {}))?.getTime() || 0;
@@ -1239,46 +1199,11 @@ function getLatestAccessLogForIdentity(identity: Record<string, any>) {
     })[0];
 }
 
-function toUnknownRecord(value: unknown): Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-    ? value as Record<string, unknown>
-    : {};
-}
-
-function accessLogMatchesIdentity(log: unknown, identity: unknown) {
-  const logRecord = toUnknownRecord(log);
-  const identityRecord = toUnknownRecord(identity);
-  const payload = toUnknownRecord(logRecord.payload);
-  const rawLog = Object.keys(toUnknownRecord(payload.rawAccessLog)).length
-    ? toUnknownRecord(payload.rawAccessLog)
-    : logRecord;
-  const eventIdentity = Object.keys(toUnknownRecord(payload.identity)).length
-    ? toUnknownRecord(payload.identity)
-    : toUnknownRecord(payload.identityLookup);
-  const metadata = toUnknownRecord(identityRecord.metadata);
-  const hidUserId = rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId ?? eventIdentity.hidUserId;
-  const registration = rawLog.registration || eventIdentity.registration;
-  const credential =
-    rawLog.card_value ||
-    rawLog.cardNo ||
-    rawLog.qrcode_value ||
-    rawLog.qrCode ||
-    rawLog.qrcode ||
-    eventIdentity.cardNo;
-  const identityCredential = identityRecord.cardNo || metadata.qrCodeValue;
-
-  return Boolean(
-    (hidUserId !== undefined && hidUserId !== null && String(identityRecord.hidUserId) === String(hidUserId)) ||
-    (registration && identityRecord.registration === registration) ||
-    (credential && identityCredential && String(identityCredential) === String(credential)),
-  );
-}
-
 function getAccessLogIdentityKey(rawLog: Record<string, any>) {
   return [
     rawLog.user_id ?? rawLog.userId ?? rawLog.hidUserId,
     rawLog.registration,
-    rawLog.card_value || rawLog.cardNo || rawLog.qrcode_value,
+    rawLog.card_value || rawLog.cardNo,
   ].filter(Boolean).join("|");
 }