@7365admin1/layer-common 3.2.2-staging.103 → 3.2.2-staging.105

package/components/BuildingUnitFormAdd.vue

@@ -363,14 +363,18 @@ function setBuildingUnit() {
   buildingUnit.value.companyRegistrationNumber = "";
   buildingUnit.value.leaseStart = "";
   buildingUnit.value.leaseEnd = "";
+  unitLabels.value = ["Unit 1"];
 }
 
 async function submit() {
   disable.value = true;
   const { buildingUnitFiles, companyName, companyRegistrationNumber, leaseStart, leaseEnd, ...rest } = buildingUnit.value;
+  const labels = unitLabels.value.map((label) => label.trim());
+  rest.name = labels[0] || rest.name;
+
   try {
     await add({
-      labels: unitLabels.value,
+      labels,
       unit: rest,
       qty: buildingUnitQty.value,
     });

package/components/HidAccessLogDashboard.vue

@@ -63,7 +63,6 @@
             <tr>
               <th>Name</th>
               <th>Facial Data</th>
-              <th>Unit</th>
               <th>Last Access Method</th>
               <th>Last access time</th>
               <th>Status</th>
@@ -72,14 +71,20 @@
           </thead>
           <tbody>
             <tr v-for="row in paginatedRows" :key="row.key">
-              <td>{{ row.name }}</td>
+              <td>
+                <div class="name-cell">
+                  {{ row.name }}
+                  <v-tooltip v-if="row.name && row.name !== 'N/A'" activator="parent" location="top">
+                    {{ row.name }}
+                  </v-tooltip>
+                </div>
+              </td>
               <td>
                 <v-avatar v-if="row.faceImage" size="34" rounded="lg" class="hid-face-avatar">
                   <v-img :src="row.faceImage" cover />
                 </v-avatar>
                 <span v-else>{{ row.facialData }}</span>
               </td>
-              <td>{{ row.unit }}</td>
               <td>{{ row.method }}</td>
               <td>{{ row.lastAccessTime }}</td>
               <td>
@@ -87,9 +92,12 @@
                   size="small"
                   variant="flat"
                   class="status-chip"
-                  :class="row.status === 'Mapped' ? 'mapped-chip' : 'unmapped-chip'"
+                  :class="getAuthorizationChipClass(row.status)"
                 >
                   {{ row.status }}
+                  <v-tooltip v-if="row.authorizationReason" activator="parent" location="top">
+                    {{ row.authorizationReason }}
+                  </v-tooltip>
                 </v-chip>
               </td>
               <td class="text-right">
@@ -159,6 +167,7 @@
                   <th>Reader Location</th>
                   <th>Access Method</th>
                   <th>Access Date and Time</th>
+                  <th>Status</th>
                 </tr>
               </thead>
               <tbody>
@@ -168,6 +177,19 @@
                   <td>{{ row.readerLocation }}</td>
                   <td>{{ row.method }}</td>
                   <td>{{ row.lastAccessTime }}</td>
+                  <td>
+                    <v-chip
+                      size="small"
+                      variant="flat"
+                      class="status-chip"
+                      :class="getAuthorizationChipClass(row.status)"
+                    >
+                      {{ row.status }}
+                      <v-tooltip v-if="row.authorizationReason" activator="parent" location="top">
+                        {{ row.authorizationReason }}
+                      </v-tooltip>
+                    </v-chip>
+                  </td>
                 </tr>
               </tbody>
             </v-table>
@@ -324,6 +346,7 @@ const props = defineProps({
 });
 
 type AccessTab = "resident" | "visitor" | "administrator";
+type AuthorizationStatus = "Authorized" | "Not Authorized" | "Unknown";
 type AccessRow = {
   key: string;
   identityKey: string;
@@ -337,7 +360,8 @@ type AccessRow = {
   lastAccessTime: string;
   lastAccessDate?: Date;
   readerLocation: string;
-  status: "Mapped" | "Unmapped";
+  status: AuthorizationStatus;
+  authorizationReason?: string;
 };
 
 type PdfAccessRow = {
@@ -365,7 +389,7 @@ const activeTab = ref<AccessTab>("resident");
 const search = ref("");
 const status = ref("Status");
 const page = ref(1);
-const limit = 20;
+const limit = 10;
 const loading = ref(false);
 const loadSequence = ref(0);
 const exportDialog = ref(false);
@@ -383,7 +407,7 @@ const exportForm = reactive({
   status: "Status",
 });
 
-const statusOptions = ["Status", "Mapped", "Unmapped"];
+const statusOptions = ["Status", "Authorized", "Not Authorized", "Unknown"];
 const accessMethodOptions = ["All", "Facial", "QR Code", "ID and Password", "PIN", "Card"];
 
 const readerOptions = computed(() =>
@@ -448,7 +472,7 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
     lastAccessTime: formatDate(getLogAccessDateValue(log)),
     lastAccessDate: parseDate(getLogAccessDateValue(log)),
     readerLocation: getLogReaderLocation(log),
-    status: selectedHistoryRow.value?.status || "Mapped",
+    ...getAuthorizationStatus(log.payload || log, log),
   }));
 
   const liveRows = matchedLiveLogs.map((log, index) => ({
@@ -462,7 +486,7 @@ const selectedHistoryRows = computed<AccessRow[]>(() => {
     lastAccessTime: formatDate(getAccessLogTime(log, {})),
     lastAccessDate: parseDate(getAccessLogTime(log, {})),
     readerLocation: selectedReader.value?.location || "N/A",
-    status: selectedHistoryRow.value?.status || "Mapped",
+    ...getAuthorizationStatus(log, {}),
   }));
 
   return [...historyRows, ...liveRows].sort((a, b) => {
@@ -1198,10 +1222,56 @@ function mapAccessLogToRow(rawLog: Record<string, any>, event: Record<string, an
     lastAccessTime: formatDate(rawAccessTime),
     lastAccessDate: parseDate(rawAccessTime),
     readerLocation: getLogReaderLocation(event),
-    status: identity ? "Mapped" : "Unmapped",
+    ...getAuthorizationStatus(rawLog, event),
+  };
+}
+
+function getAuthorizationStatus(
+  rawLog: Record<string, any>,
+  event: Record<string, any>,
+): Pick<AccessRow, "status" | "authorizationReason"> {
+  const authorization = event.payload?.authorization || rawLog.authorization;
+  if (typeof authorization?.granted === "boolean") {
+    return {
+      status: authorization.granted ? "Authorized" : "Not Authorized",
+      authorizationReason: String(
+        authorization.reason || (authorization.granted ? "Access granted" : "Access denied"),
+      ),
+    };
+  }
+
+  const eventCode = Number(
+    rawLog.event ?? rawLog.event_id ?? rawLog.eventId ?? event.payload?.event,
+  );
+  if (eventCode === 7) {
+    return { status: "Authorized", authorizationReason: "Access granted by HID authorization." };
+  }
+  if (eventCode === 6) {
+    return { status: "Not Authorized", authorizationReason: "Access denied by HID authorization." };
+  }
+
+  const eventLabel = String(
+    getConfigurationLabel("event_types", eventCode) || rawLog.event_name || rawLog.eventName || "",
+  ).toLowerCase();
+  if (/not authorized|unauthori[sz]ed|access denied|denied|rejected/.test(eventLabel)) {
+    return { status: "Not Authorized", authorizationReason: eventLabel };
+  }
+  if (/authorized|access granted|granted|released|opened/.test(eventLabel)) {
+    return { status: "Authorized", authorizationReason: eventLabel };
+  }
+
+  return {
+    status: "Unknown",
+    authorizationReason: "This access log does not include an authorization result.",
   };
 }
 
+function getAuthorizationChipClass(status: AuthorizationStatus) {
+  if (status === "Authorized") return "mapped-chip";
+  if (status === "Not Authorized") return "unmapped-chip";
+  return "unknown-chip";
+}
+
 function findIdentityForAccessLog(rawLog: Record<string, any>, event: Record<string, any>) {
   const eventIdentityId = event.payload?.identity?._id;
   if (eventIdentityId) {
@@ -1643,7 +1713,7 @@ function escapeHtml(value: unknown) {
 .table-card :deep(table) {
   table-layout: fixed;
   width: 100%;
-  min-width: 980px;
+  min-width: 880px;
 }
 
 .table-card :deep(th),
@@ -1653,37 +1723,40 @@ function escapeHtml(value: unknown) {
 
 .table-card :deep(th:nth-child(1)),
 .table-card :deep(td:nth-child(1)) {
-  width: 16%;
+  width: 25%;
 }
 
 .table-card :deep(th:nth-child(2)),
 .table-card :deep(td:nth-child(2)) {
-  width: 14%;
+  width: 13%;
 }
 
 .table-card :deep(th:nth-child(3)),
 .table-card :deep(td:nth-child(3)) {
-  width: 12%;
+  width: 21%;
 }
 
 .table-card :deep(th:nth-child(4)),
 .table-card :deep(td:nth-child(4)) {
-  width: 20%;
+  width: 21%;
 }
 
 .table-card :deep(th:nth-child(5)),
 .table-card :deep(td:nth-child(5)) {
-  width: 18%;
+  width: 14%;
 }
 
 .table-card :deep(th:nth-child(6)),
 .table-card :deep(td:nth-child(6)) {
-  width: 14%;
+  width: 6%;
 }
 
-.table-card :deep(th:nth-child(7)),
-.table-card :deep(td:nth-child(7)) {
-  width: 6%;
+.name-cell {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .history-dialog {
@@ -1776,6 +1849,11 @@ function escapeHtml(value: unknown) {
 }
 
 .unmapped-chip {
+  background: #fde8e8 !important;
+  color: #b42318 !important;
+}
+
+.unknown-chip {
   background: #fff0cc !important;
   color: #9a6700 !important;
 }

package/components/HidUserEnrollment.vue

@@ -1402,31 +1402,26 @@ function getHidErrorMessage(error: any) {
 
 .table-card :deep(th:nth-child(1)),
 .table-card :deep(td:nth-child(1)) {
-  width: 24%;
+  width: 28%;
 }
 
 .table-card :deep(th:nth-child(2)),
 .table-card :deep(td:nth-child(2)) {
-  width: 20%;
+  width: 22%;
 }
 
 .table-card :deep(th:nth-child(3)),
 .table-card :deep(td:nth-child(3)) {
-  width: 12%;
+  width: 25%;
 }
 
 .table-card :deep(th:nth-child(4)),
 .table-card :deep(td:nth-child(4)) {
-  width: 20%;
+  width: 17%;
 }
 
 .table-card :deep(th:nth-child(5)),
 .table-card :deep(td:nth-child(5)) {
-  width: 16%;
-}
-
-.table-card :deep(th:nth-child(6)),
-.table-card :deep(td:nth-child(6)) {
   width: 8%;
 }
 

package/package.json

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