@7365admin1/layer-common 4.0.1 → 4.0.2

package/components/HidAccessLogDashboard.vue

@@ -89,8 +89,16 @@
 
       <!-- Staging's hover-the-full-name tooltip, kept. -->
       <template #[`item.name`]="{ item }">
-        <span class="app-cell--strong">
-          {{ item.name }}
+        <span class="hid-log-name app-cell--strong">
+          <v-avatar
+            v-if="item.faceImage"
+            size="34"
+            rounded="lg"
+            class="hid-face-avatar"
+          >
+            <v-img :src="item.faceImage" cover />
+          </v-avatar>
+          <span>{{ item.name }}</span>
           <v-tooltip
             v-if="item.name && item.name !== 'N/A'"
             activator="parent"
@@ -101,13 +109,8 @@
         </span>
       </template>
 
-      <!-- The face thumbnail, unchanged. It prints whatever the row already
-           carried; this screen does not read or export a template. -->
-      <template #[`item.facialData`]="{ item }">
-        <v-avatar v-if="item.faceImage" size="34" rounded="lg" class="hid-face-avatar">
-          <v-img :src="item.faceImage" cover />
-        </v-avatar>
-        <span v-else class="app-cell--muted">{{ item.facialData }}</span>
+      <template #[`item.hidUserId`]="{ item }">
+        <span class="app-cell--num">{{ item.hidUserId }}</span>
       </template>
 
       <template #[`item.method`]="{ item }">
@@ -135,6 +138,10 @@
         </StatusChip>
       </template>
 
+      <template #[`item.mappingStatus`]="{ item }">
+        <StatusChip :status="item.mappingStatus" />
+      </template>
+
       <template #[`item.action-table`]="{ item }">
         <AppButton
           variant="row"
@@ -300,7 +307,8 @@ const props = defineProps({
   },
 });
 
-type AccessTab = "resident" | "visitor" | "administrator";
+type AccessTab = "all" | "unmapped" | "mapped" | "visitor" | "administrator";
+type IdentityCategory = "resident" | "visitor" | "administrator";
 type AuthorizationStatus = "Authorized" | "Not Authorized" | "Unknown";
 type AccessRow = {
   key: string;
@@ -308,6 +316,7 @@ type AccessRow = {
   identityType?: string;
   visitorId?: string;
   name: string;
+  hidUserId: string;
   facialData: string;
   faceImage?: string;
   unit: string;
@@ -316,6 +325,7 @@ type AccessRow = {
   lastAccessDate?: Date;
   readerLocation: string;
   status: AuthorizationStatus;
+  mappingStatus: "Mapped" | "Unmapped";
   authorizationReason?: string;
 };
 
@@ -381,7 +391,7 @@ const liveAccessLogs = ref<HidAccessRecord[]>([]);
 const administratorUserIds = ref<Set<number>>(new Set());
 const userImages = ref<Record<string, string>>({});
 const selectedReaderId = ref("");
-const activeTab = ref<AccessTab>("resident");
+const activeTab = ref<AccessTab>("all");
 const search = ref("");
 const status = ref("");
 const accessMethod = ref("");
@@ -463,6 +473,7 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
     key: `${selectedHistoryRow.value?.key || "history"}-${log._id || log.id || index}`,
     identityKey: selectedKey,
     name: selectedHistoryRow.value?.name || "N/A",
+    hidUserId: selectedHistoryRow.value?.hidUserId || "N/A",
     facialData: selectedHistoryRow.value?.facialData || "N/A",
     faceImage: selectedHistoryRow.value?.faceImage,
     unit: selectedHistoryRow.value?.unit || "N/A",
@@ -470,6 +481,7 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
     lastAccessTime: formatDate(getLogAccessDateValue(log)),
     lastAccessDate: parseDate(getLogAccessDateValue(log)),
     readerLocation: getLogReaderLocation(log),
+    mappingStatus: selectedHistoryRow.value?.mappingStatus || "Unmapped",
     ...getAuthorizationStatus(log.payload || log, log),
   }));
 
@@ -477,6 +489,7 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
     key: `${selectedHistoryRow.value?.key || "history"}-live-${log.id || log.time || index}`,
     identityKey: selectedKey,
     name: selectedHistoryRow.value?.name || "N/A",
+    hidUserId: selectedHistoryRow.value?.hidUserId || "N/A",
     facialData: selectedHistoryRow.value?.facialData || "N/A",
     faceImage: selectedHistoryRow.value?.faceImage,
     unit: selectedHistoryRow.value?.unit || "N/A",
@@ -484,6 +497,7 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
     lastAccessTime: formatDate(getAccessLogTime(log, {})),
     lastAccessDate: parseDate(getAccessLogTime(log, {})),
     readerLocation: selectedReader.value?.location || "N/A",
+    mappingStatus: selectedHistoryRow.value?.mappingStatus || "Unmapped",
     ...getAuthorizationStatus(log, {}),
   }));
 
@@ -499,11 +513,13 @@ const filteredRows = computed(() => {
   return rows.value.filter((row) => {
     const matchesSearch = !query || [
       row.name,
+      row.hidUserId,
       row.facialData,
       row.unit,
       row.method,
       row.lastAccessTime,
       row.status,
+      row.mappingStatus,
     ].some((value) => String(value ?? "").toLowerCase().includes(query));
 
     const matchesStatus = !status.value || row.status === status.value;
@@ -514,11 +530,13 @@ const filteredRows = computed(() => {
 });
 
 /**
- * The three tabs, as data rather than three `v-tab` elements, so the shared
- * `app-tab` strip can render them. Same values, same order, same handler.
+ * 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.
  */
 const tabOptions: Array<{ label: string; value: AccessTab }> = [
-  { label: "Resident", value: "resident" },
+  { label: "All", value: "all" },
+  { label: "Unmapped", value: "unmapped" },
+  { label: "Mapped", value: "mapped" },
   { label: "Visitor", value: "visitor" },
   { label: "Administrator", value: "administrator" },
 ];
@@ -530,13 +548,12 @@ const tabOptions: Array<{ label: string; value: AccessTab }> = [
  * percentages had no design number behind them.
  */
 const logHeaders = [
-  { title: "Name", value: "name", sortable: false },
-  { title: "Facial Data", value: "facialData", sortable: false },
-  // Staging (b0667a7) dropped Unit from this table - the unit still shows in
-  // the per-identity history dialog, so the column is not carried back.
-  { title: "Last Access Method", value: "method", sortable: false },
-  { title: "Last access time", value: "lastAccessTime", sortable: false },
+  { title: "Amico Name", value: "name", sortable: false },
+  { title: "UID", value: "hidUserId", sortable: false },
+  { 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 },
 ];
 
@@ -664,7 +681,11 @@ async function loadDashboard() {
           )
         : Promise.resolve(null),
       loadDashboardSource(
-        getReaderUsers(selectedReaderId.value, { page: page.value, limit: 100 }),
+        getReaderUsers(selectedReaderId.value, {
+          page: 1,
+          limit: 100,
+          includeVisitors: true,
+        }),
         { items: [] },
         "reader users",
       ),
@@ -693,9 +714,7 @@ async function loadDashboard() {
         .filter((userId: number | undefined): userId is number => Boolean(userId)),
     );
     allIdentities.value = mergedIdentities;
-    identities.value = mergedIdentities.filter(
-      (identity: Record<string, unknown>) => classifyIdentity(identity) === activeTab.value,
-    );
+    identities.value = mergedIdentities.filter(isMappedIdentity);
     logs.value = liveItems.length
       ? []
       : logResponse?.items ?? logResponse?.data?.items ?? logResponse?.data?.logs ?? [];
@@ -704,7 +723,14 @@ async function loadDashboard() {
     serverPageRange.value = String(
       hidAccessLogResponse?.pageRange ?? hidAccessLogResponse?.data?.pageRange ?? "",
     );
-    await loadUserImages(identities.value);
+    const accessLogUserIds = getAccessLogUserIds(liveItems);
+    const accessLogImageCandidates = [...accessLogUserIds].map((hidUserId) => ({
+      hidUserId: String(hidUserId),
+    }));
+    await loadUserImages(
+      [...mergedIdentities, ...accessLogImageCandidates],
+      accessLogUserIds,
+    );
   } finally {
     if (sequence === loadSequence.value) {
       loading.value = false;
@@ -721,13 +747,18 @@ async function loadDashboardSource<T>(request: Promise<T>, fallback: T, label: s
   }
 }
 
-async function loadUserImages(items: HidAccessRecord[]) {
+async function loadUserImages(items: HidAccessRecord[], forceUserIds = new Set<number>()) {
   if (!selectedReaderId.value) return;
 
   await Promise.all(items.map(async (identity) => {
     const hidUserId = toHidNumericId(identity.hidUserId);
     const key = String(hidUserId || "");
-    if (!hidUserId || userImages.value[key] || identity?.metadata?.photo || !hasHidImageHint(identity)) return;
+    if (
+      !hidUserId ||
+      key in userImages.value ||
+      identity?.metadata?.photo ||
+      (!forceUserIds.has(hidUserId) && !hasHidImageHint(identity))
+    ) return;
 
     try {
       const response = await getUserImage(selectedReaderId.value, hidUserId);
@@ -741,6 +772,14 @@ async function loadUserImages(items: HidAccessRecord[]) {
   }));
 }
 
+function getAccessLogUserIds(items: HidAccessRecord[]) {
+  return new Set(
+    items
+      .map((item) => toHidNumericId(item.user_id ?? item.userId ?? item.hidUserId))
+      .filter((userId): userId is number => userId !== undefined),
+  );
+}
+
 function hasHidImageHint(identity: HidAccessRecord) {
   return Boolean(
     identity?.metadata?.imageTimestamp ||
@@ -809,9 +848,16 @@ 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;
 }
 
+function isMappedIdentity(identity: HidAccessRecord | undefined) {
+  return Boolean(identity?.person || identity?.member || identity?.serviceProvider || identity?.visitor);
+}
+
 function isVisitorIdentity(identity: Record<string, unknown> | undefined) {
   return Boolean(identity && (
     identity.type === "visitor"
@@ -820,7 +866,7 @@ function isVisitorIdentity(identity: Record<string, unknown> | undefined) {
   ));
 }
 
-function classifyIdentity(identity?: Record<string, unknown>, row?: AccessRow): AccessTab {
+function classifyIdentity(identity?: Record<string, unknown>, row?: AccessRow): IdentityCategory {
   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";
@@ -1128,6 +1174,7 @@ function getRawAccessLogs(event: HidAccessRecord): HidAccessRecord[] {
 
 function mapAccessLogToRow(rawLog: HidAccessRecord, event: HidAccessRecord, index: string): AccessRow {
   const identity = findIdentityForAccessLog(rawLog, event);
+  const mapped = isMappedIdentity(identity);
   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 } });
@@ -1139,7 +1186,8 @@ function mapAccessLogToRow(rawLog: HidAccessRecord, event: HidAccessRecord, inde
       ? classifyIdentity(identity)
       : String(eventIdentity.type || "").toLowerCase() || undefined,
     visitorId: String(identity?.visitor || eventIdentity.visitor || "") || undefined,
-    name: identity ? getName(identity) : getRawLogName(rawLog, event),
+    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) : "",
     unit: identity ? getUnit(identity) : "N/A",
@@ -1147,6 +1195,7 @@ function mapAccessLogToRow(rawLog: HidAccessRecord, event: HidAccessRecord, inde
     lastAccessTime: formatDate(rawAccessTime),
     lastAccessDate: parseDate(rawAccessTime),
     readerLocation: getLogReaderLocation(event),
+    mappingStatus: mapped ? "Mapped" : "Unmapped",
     ...getAuthorizationStatus(rawLog, event),
   };
 }
@@ -1190,9 +1239,7 @@ function getAuthorizationStatus(
 }
 
 function findIdentityForAccessLog(rawLog: HidAccessRecord, event: HidAccessRecord) {
-  if (rawLog.identity && typeof rawLog.identity === "object") {
-    return rawLog.identity;
-  }
+  if (isUnknownRecord(rawLog.identity)) return rawLog.identity;
   const eventIdentityId = event.payload?.identity?._id;
   if (eventIdentityId) {
     const byId = allIdentities.value.find((identity) => String(identity._id) === String(eventIdentityId));
@@ -1283,8 +1330,35 @@ function getAccessLogTime(rawLog: HidAccessRecord, event: HidAccessRecord) {
   return rawLog.time || rawLog.createdAt || rawLog.accessedAt || event.createdAt;
 }
 
-function getRawLogName(rawLog: HidAccessRecord, event: HidAccessRecord) {
-  return rawLog.name || event.payload?.identity?.name || event.payload?.name || "Unmapped";
+function getRawLogName(
+  rawLog: HidAccessRecord,
+  event: HidAccessRecord,
+  identity?: HidAccessRecord,
+) {
+  return getText(rawLog.user_name)
+    || getText(rawLog.userName)
+    || getText(rawLog.name)
+    || getText(event.payload?.rawAccessLog?.user_name)
+    || getText(event.payload?.rawAccessLog?.userName)
+    || getText(event.payload?.rawAccessLog?.name)
+    || getText(identity?.metadata?.name)
+    || getText(identity?.name)
+    || "Unknown";
+}
+
+function formatHidUid(value: unknown) {
+  const text = getText(value);
+  if (!text) return "N/A";
+  const numeric = Number(text);
+  return Number.isSafeInteger(numeric) && numeric > 0
+    ? `UID${String(numeric).padStart(6, "0")}`
+    : text;
+}
+
+function getText(value: unknown) {
+  if (typeof value === "string") return value.trim();
+  if (typeof value === "number") return String(value);
+  return "";
 }
 
 function exportRows() {
@@ -1765,6 +1839,12 @@ function escapeHtml(value: unknown) {
   background: var(--hover);
 }
 
+.hid-log-name {
+  align-items: center;
+  display: inline-flex;
+  gap: 8px;
+}
+
 @media (max-width: 960px) {
   .history-toolbar {
     align-items: stretch;

package/components/HidReaderManagement.vue

@@ -172,7 +172,7 @@
               <strong>{{ syncPreviewStats.updatedInformation }}</strong>
             </div>
             <div>
-              <span>Facial Data</span>
+              <span>Existing Facial Data</span>
               <strong>{{ syncPreviewStats.facialData }}</strong>
             </div>
           </div>
@@ -229,7 +229,7 @@
               <strong>{{ resultStats.updatedInformation }}</strong>
             </div>
             <div>
-              <span>New Photos</span>
+              <span>Synced Facial Data</span>
               <strong>{{ resultStats.facialData }}</strong>
             </div>
           </div>
@@ -331,6 +331,7 @@ const {
   updateReader,
   deleteReader,
   testReader,
+  syncReaderFacialData,
   configureReaderIntegration,
   setReaderMonitor,
   setReaderOperatingMode,
@@ -596,13 +597,17 @@ async function runConfirmedAction() {
       const unmappedCount = Number(payload.unmappedCount || 0);
 
       if (!payload.objects.length) {
+        const facialSync = await syncReaderFacialData(selectedReader.value._id);
+        const facialStats = toFacialSyncStats(facialSync);
         if (unmappedCount) {
-          const message = syncMessage.value
-            || `Found ${unmappedCount} HID user(s) that must be linked from the HID Users screen.`;
+          const message = [
+            syncMessage.value || `Found ${unmappedCount} HID user(s) that must be linked from the HID User Mapping screen.`,
+            facialStats.message,
+          ].filter(Boolean).join(" ");
           await applyReaderSyncState(selectedReader.value._id, "completed", message);
           showResult(true, "Sync Review Required", message, {
             readerName: selectedReader.value.name || "HID Reader",
-            stats: syncPreviewStats.value,
+            stats: { ...syncPreviewStats.value, facialData: facialStats.syncedCount },
           });
           confirmDialog.value = false;
           resetActionFlow();
@@ -619,14 +624,18 @@ async function runConfirmedAction() {
         return;
       }
       const result = await syncHidUsers(selectedReader.value._id, payload.users);
+      const facialSync = await syncReaderFacialData(selectedReader.value._id);
+      const facialStats = toFacialSyncStats(facialSync);
       const mappingMessage = unmappedCount
-        ? `${unmappedCount} HID user(s) still need to be linked from the HID Users screen.`
+        ? `${unmappedCount} HID user(s) still need to be linked from the HID User Mapping screen.`
         : "";
-      const message = syncMessage.value || [result.message, mappingMessage].filter(Boolean).join(" ");
+      const message = [syncMessage.value, result.message, facialStats.message, mappingMessage]
+        .filter(Boolean)
+        .join(" ");
       await applyReaderSyncState(selectedReader.value._id, "completed", message);
       showResult(true, "Sync Successful", message, {
         readerName: selectedReader.value.name || "HID Reader",
-        stats: syncPreviewStats.value,
+        stats: { ...syncPreviewStats.value, facialData: facialStats.syncedCount },
       });
     }
     if (pendingAction.value === "delete") {
@@ -714,7 +723,7 @@ async function buildSyncPayload(readerId: string) {
         facialData: countFacialData(hidUsers),
       },
       defaultMessage: hidUsers.length
-        ? `Found ${hidUsers.length} HID user(s) that must be linked from the HID Users screen.`
+        ? `Found ${hidUsers.length} HID user(s) that must be linked from the HID User Mapping screen.`
         : "",
     };
   }
@@ -760,7 +769,7 @@ async function buildSyncPayload(readerId: string) {
     defaultMessage: [
       totalUsersToSync ? `Ready to sync ${totalUsersToSync} linked HID user(s).` : "",
       hidUsersToImport.length
-        ? `${hidUsersToImport.length} HID user(s) must be linked from the HID Users screen.`
+        ? `${hidUsersToImport.length} HID user(s) must be linked from the HID User Mapping screen.`
         : "",
     ].filter(Boolean).join(" "),
   };
@@ -832,7 +841,11 @@ function normalizeHidUsers(response: HidRecord) {
     [];
 
   return Array.isArray(users)
-    ? users.map((user) => ({
+    ? users
+      // Visitor QR passes are linked by their visitor transaction and must not
+      // be offered for manual HID user mapping or counted as unmapped users.
+      .filter((user) => Number(user?.user_type_id) !== 1)
+      .map((user) => ({
         hidUserId: user.id,
         registration: user.registration,
         cardNo: user.card_value || user.cardNo,
@@ -970,6 +983,16 @@ function countFacialData(users: HidRecord[]) {
   return users.filter((user) => user.face || user.photo || user.image || user.imageUrl || user.faceImage).length;
 }
 
+function toFacialSyncStats(response: unknown) {
+  const root = asHidRecord(response);
+  const data = asHidRecord(root.data ?? root);
+  const syncedCount = Number(data.syncedCount);
+  return {
+    syncedCount: Number.isSafeInteger(syncedCount) && syncedCount >= 0 ? syncedCount : 0,
+    message: String(data.message || "").trim(),
+  };
+}
+
 function getFriendlyHidError(error: unknown) {
   const message = getHidErrorMessage(error);
   const lowerMessage = message.toLowerCase();