@7365admin1/layer-common 3.2.8-staging.205 → 3.2.8-staging.207

package/components/Layout/NavigationDrawer.vue

@@ -169,13 +169,30 @@ const { menuItem: hidFaceReaderMenu } = useHidFaceReaderMenu({
   cacheKey: "layout-navigation-hid-site",
 });
 
-const { canManageEntryPass } = useSettingsPermission();
+const HID_NAVIGATION_PERMISSIONS = [
+  "access-card-mgmt:see-all-card",
+  "access-card-mgmt:see-all-qr-tagging",
+  "access-card-mgmt:view",
+  "access-card-mgmt:add-access-card",
+  "access-card-mgmt:update-access-card",
+  "access-card-mgmt:delete-access-card",
+  "access-card-mgmt:assign-access-card",
+  "access-card-mgmt:manage-hid",
+];
+
+const { userAppRole } = useLocalSetup();
+const canAccessHid = computed(() => {
+  const permissions = userAppRole.value?.permissions ?? [];
+  return permissions.includes("*") || HID_NAVIGATION_PERMISSIONS.some(
+    (permission) => permissions.includes(permission),
+  );
+});
 
 const navigationItems = computed(() => {
   const items = [...(props.navigationItems as TNavigationItem[])];
 
   if (
-    canManageEntryPass.value &&
+    canAccessHid.value &&
     hidFaceReaderMenu.value &&
     !items.some((item) => item.title === hidFaceReaderMenu.value?.title)
   ) {

package/composables/useHidAmico.ts

@@ -1,4 +1,4 @@
-type HidReaderPayload = {
+export type HidReaderPayload = {
   site?: string;
   name?: string;
   location?: string;
@@ -6,14 +6,26 @@ type HidReaderPayload = {
   username?: string;
   password?: string;
   deviceId?: string;
+  serial?: string;
+  firmwareVersion?: string;
+  readerModel?: "VL35LF" | "VL70LF" | "unknown";
+  capabilities?: Record<string, boolean>;
   portalId?: number;
   portalName?: string;
   monitorPath?: string;
+  monitorStatus?: "unconfigured" | "configured" | "disabled" | "failed";
+  monitorEnabled?: boolean;
+  operatingMode?: "standalone" | "online";
+  cardReadingMode?: "unconfigured" | "pacs" | "csn" | "csn_for_mifare";
+  csnByteOrder?: "msb" | "lsb";
+  pacsFormat?: "raw" | "wiegand";
   enabled?: boolean;
   status?: string;
   lastSyncAt?: string;
   lastSyncStatus?: "idle" | "running" | "completed" | "failed";
   lastSyncMessage?: string;
+  lastCallbackAt?: string;
+  lastCallbackType?: string;
 };
 
 type HidIdentityPayload = {
@@ -24,10 +36,32 @@ type HidIdentityPayload = {
   person?: string;
   user?: string;
   member?: string;
+  serviceProvider?: string;
   visitor?: string;
-  type?: "resident" | "staff" | "contractor" | "visitor" | "unknown";
+  type?: "resident" | "staff" | "contractor" | "visitor" | "admin" | "unknown";
   status?: "active" | "inactive" | "deleted";
-  metadata?: Record<string, any>;
+  metadata?: Record<string, unknown>;
+};
+
+type HidApiRecord = {
+  [key: string]: unknown;
+  data?: HidApiRecord;
+  items?: HidApiRecord[];
+  identities?: HidApiRecord[];
+  users?: HidApiRecord[];
+  message?: string;
+};
+type HidCollectionResponse = HidApiRecord & {
+  items?: HidApiRecord[];
+  total?: number;
+  pages?: number;
+  pageRange?: string;
+  data?: HidApiRecord & {
+    items?: HidApiRecord[];
+    total?: number;
+    pages?: number;
+    pageRange?: string;
+  };
 };
 
 type HidVisitorQrData = {
@@ -74,7 +108,7 @@ export type HidPhysicalCard = {
 };
 
 type HidPhysicalCardInput =
-  | { cardType: "pacs"; facilityCode: number; cardNumber: number }
+  | { cardType: "pacs"; facilityCode: string | number; cardNumber: string | number }
   | { cardType: "csn"; cardValue: string };
 
 export type HidSipAccountData = {
@@ -110,48 +144,68 @@ export function isUnknownSiteFieldError(error: unknown): boolean {
 export default function useHidAmico() {
   const basePath = "/api/access-management/hid";
 
-  function getReaders(query: Record<string, any> = {}) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers`, {
+  function getReaders(query: HidApiRecord = {}) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers`, {
       method: "GET",
       query,
     });
   }
 
   function createReader(payload: HidReaderPayload) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers`, {
       method: "POST",
       body: payload,
     });
   }
 
   function updateReader(readerId: string, payload: HidReaderPayload) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}`, {
       method: "PATCH",
       body: payload,
     });
   }
 
   function deleteReader(readerId: string) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}`, {
       method: "DELETE",
     });
   }
 
   function testReader(readerId: string) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/test`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/test`, {
       method: "POST",
     });
   }
 
-  function syncReader(readerId: string, payload: Record<string, any> = {}) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/sync`, {
+  function syncReader(readerId: string, payload: HidApiRecord = {}) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/sync`, {
       method: "POST",
       body: payload,
     });
   }
 
-  function runObjectOperation(readerId: string, payload: Record<string, any>) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/objects`, {
+  function configureReaderIntegration(readerId: string) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/configure`, {
+      method: "POST",
+    });
+  }
+
+  function setReaderMonitor(readerId: string, enabled: boolean) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/monitor`, {
+      method: "PUT",
+      body: { enabled },
+    });
+  }
+
+  function setReaderOperatingMode(readerId: string, mode: "standalone" | "online") {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/operating-mode`, {
+      method: "PUT",
+      body: { mode },
+    });
+  }
+
+  function runObjectOperation(readerId: string, payload: HidApiRecord) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/objects`, {
       method: "POST",
       body: payload,
     });
@@ -168,35 +222,61 @@ export default function useHidAmico() {
   }
 
   function getReaderConfiguration(readerId: string, payload: Record<string, string[]> = {}) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/configuration`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/configuration`, {
       method: "POST",
       body: payload,
     });
   }
 
-  function setReaderConfiguration(readerId: string, payload: Record<string, any>) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/configuration`, {
+  function setReaderConfiguration(readerId: string, payload: HidApiRecord) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/configuration`, {
       method: "PUT",
       body: payload,
     });
   }
 
-  function getIdentities(readerId: string, query: Record<string, any> = {}) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/identities`, {
+  function getIdentities(readerId: string, query: HidApiRecord = {}) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/identities`, {
+      method: "GET",
+      query,
+    });
+  }
+
+  function getReaderUsers(readerId: string, query: {
+    page?: number;
+    limit?: number;
+    search?: string;
+    status?: "mapped" | "unmapped" | "";
+  } = {}) {
+    return useNuxtApp().$api<HidCollectionResponse>(`${basePath}/readers/${readerId}/users`, {
+      method: "GET",
+      query,
+    });
+  }
+
+  function getReaderAccessLogs(readerId: string, query: {
+    page?: number;
+    limit?: number;
+    search?: string;
+    status?: "authorized" | "not_authorized" | "unknown" | "";
+    method?: "facial" | "qr_code" | "id_password" | "pin" | "card" | "";
+    tab?: "resident" | "visitor" | "administrator";
+  } = {}) {
+    return useNuxtApp().$api<HidCollectionResponse>(`${basePath}/readers/${readerId}/access-logs`, {
       method: "GET",
       query,
     });
   }
 
-  function getLogs(readerId: string, query: Record<string, any> = {}) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/logs`, {
+  function getLogs(readerId: string, query: HidApiRecord = {}) {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/logs`, {
       method: "GET",
       query,
     });
   }
 
   function getUserImage(readerId: string, hidUserId: string | number) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/users/${hidUserId}/image`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/users/${hidUserId}/image`, {
       method: "GET",
     });
   }
@@ -323,40 +403,40 @@ export default function useHidAmico() {
   }
 
   function createIdentity(readerId: string, payload: HidIdentityPayload) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/identities`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/identities`, {
       method: "POST",
       body: payload,
     });
   }
 
   function updateIdentity(identityId: string, payload: HidIdentityPayload) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/identities/${identityId}`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/identities/${identityId}`, {
       method: "PATCH",
       body: payload,
     });
   }
 
   function deleteIdentity(identityId: string) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/identities/${identityId}`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/identities/${identityId}`, {
       method: "DELETE",
     });
   }
 
   function getIntercomStatus(readerId: string) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/intercom/status`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/intercom/status`, {
       method: "GET",
     });
   }
 
   function makeIntercomCall(readerId: string, target: string) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/intercom/call`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/intercom/call`, {
       method: "POST",
       body: { target },
     });
   }
 
   function finalizeIntercomCall(readerId: string) {
-    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/intercom/hangup`, {
+    return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/intercom/hangup`, {
       method: "POST",
     });
   }
@@ -412,6 +492,9 @@ export default function useHidAmico() {
     deleteReader,
     testReader,
     syncReader,
+    configureReaderIntegration,
+    setReaderMonitor,
+    setReaderOperatingMode,
     runObjectOperation,
     issueVisitorQr,
     getReaderConfiguration,
@@ -429,6 +512,8 @@ export default function useHidAmico() {
     setUserPin,
     deleteUserPin,
     getIdentities,
+    getReaderUsers,
+    getReaderAccessLogs,
     createIdentity,
     updateIdentity,
     deleteIdentity,

package/composables/useHidNavigation.ts

@@ -5,6 +5,8 @@ type HidNavigationParams = {
   site: string;
 };
 
+type HidNavigationSite = Record<string, unknown>;
+
 export default function useHidNavigation() {
   const { getSiteById } = useSiteSettings();
   const { getHidServiceEnabled } = useOptionalServices();
@@ -61,10 +63,10 @@ export default function useHidNavigation() {
   }: {
     org: Ref<string> | ComputedRef<string>;
     site: Ref<string> | ComputedRef<string>;
-    fallbackSite?: Ref<Record<string, any> | undefined> | ComputedRef<Record<string, any> | undefined>;
+    fallbackSite?: Ref<HidNavigationSite | undefined> | ComputedRef<HidNavigationSite | undefined>;
     cacheKey?: string;
   }) {
-    const siteDetails = ref<Record<string, any> | null>(null);
+    const siteDetails = ref<HidNavigationSite | null>(null);
 
     watch(
       site,

package/composables/useOptionalServices.ts

@@ -32,7 +32,15 @@ function normalizeServiceKey(value: unknown) {
     .replace(/[\s-]+/g, "_");
 }
 
-function itemHasService(item: any) {
+type OptionalServiceRecord = Record<string, unknown>;
+
+function toOptionalServiceRecord(value: unknown): OptionalServiceRecord {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+    ? value as OptionalServiceRecord
+    : {};
+}
+
+function itemHasService(item: unknown) {
   if (!item) return false;
 
   if (typeof item === "string") {
@@ -44,25 +52,26 @@ function itemHasService(item: any) {
   }
 
   if (typeof item === "object") {
+    const record = toOptionalServiceRecord(item);
     const key = normalizeServiceKey(
-      item.key ??
-        item.code ??
-        item.name ??
-        item.type ??
-        item.service ??
-        item.module ??
-        item.feature,
+      record.key ??
+        record.code ??
+        record.name ??
+        record.type ??
+        record.service ??
+        record.module ??
+        record.feature,
     );
 
     const isEnabled =
-      item.enabled ??
-      item.active ??
-      item.isEnabled ??
-      (item.status ? item.status === "active" : true);
+      record.enabled ??
+      record.active ??
+      record.isEnabled ??
+      (record.status ? record.status === "active" : true);
 
     if (hidServiceKeys.includes(key)) return isEnabled !== false;
 
-    return Object.values(item).some(itemHasService);
+    return Object.values(record).some(itemHasService);
   }
 
   return false;
@@ -74,10 +83,11 @@ export default function useOptionalServices() {
     () => ({}),
   );
 
-  function hasHidService(source: Record<string, any> | null | undefined) {
+  function hasHidService(source: OptionalServiceRecord | null | undefined) {
     if (!source) return false;
 
-    if (itemHasService(source.metadata?.services)) return true;
+    const metadata = toOptionalServiceRecord(source.metadata);
+    if (itemHasService(metadata.services)) return true;
 
     const presentGateFields = optionalServiceFields.filter((field) =>
       Object.prototype.hasOwnProperty.call(source, field),
@@ -90,7 +100,7 @@ export default function useOptionalServices() {
 
   function getHidServiceEnabled(
     siteId: string,
-    source: Record<string, any> | null | undefined,
+    source: OptionalServiceRecord | null | undefined,
   ) {
     if (siteId && Object.prototype.hasOwnProperty.call(hidServiceOverrides.value, siteId)) {
       return hidServiceOverrides.value[siteId];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.8-staging.205",
+  "version": "3.2.8-staging.207",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",