@7365admin1/layer-common 3.0.8 → 3.0.10

package/composables/useHidNavigation.ts

@@ -0,0 +1,106 @@
+import type { ComputedRef, Ref } from "vue";
+
+type HidNavigationParams = {
+  org: string;
+  site: string;
+};
+
+export default function useHidNavigation() {
+  const { getSiteById } = useSiteSettings();
+  const { getHidServiceEnabled } = useOptionalServices();
+
+  function getHidFaceReaderMenu({ org, site }: HidNavigationParams) {
+    return {
+      title: "HID Face Reader",
+      children: [
+        {
+          title: "Face Reader",
+          route: {
+            name: "org-site-access-mgmt-hid-readers",
+            params: { org, site },
+          },
+        },
+        {
+          title: "HID Users",
+          route: {
+            name: "org-site-access-mgmt-hid-users",
+            params: { org, site },
+          },
+        },
+        {
+          title: "Administrator",
+          route: {
+            name: "org-site-access-mgmt-administrator",
+            params: { org, site },
+          },
+        },
+        {
+          title: "Identity Mapping",
+          route: {
+            name: "org-site-access-mgmt-identity-mapping",
+            params: { org, site },
+          },
+        },
+        {
+          title: "Access Logs",
+          route: {
+            name: "org-site-access-mgmt-access-logs",
+            params: { org, site },
+          },
+        },
+      ],
+      icon: "mdi-face-recognition",
+    };
+  }
+
+  function useHidFaceReaderMenu({
+    org,
+    site,
+    fallbackSite,
+    cacheKey = "hid-face-reader-menu-site",
+  }: {
+    org: Ref<string> | ComputedRef<string>;
+    site: Ref<string> | ComputedRef<string>;
+    fallbackSite?: Ref<Record<string, any> | undefined> | ComputedRef<Record<string, any> | undefined>;
+    cacheKey?: string;
+  }) {
+    const siteDetails = ref<Record<string, any> | null>(null);
+
+    watch(
+      site,
+      async (siteId) => {
+        if (!siteId || siteId === "site") {
+          siteDetails.value = null;
+          return;
+        }
+
+        try {
+          siteDetails.value = await getSiteById(siteId);
+        } catch (error) {
+          console.error("Failed to load HID navigation site details:", error);
+          siteDetails.value = null;
+        }
+      },
+      { immediate: true },
+    );
+
+    const enabled = computed(() =>
+      getHidServiceEnabled(site.value, siteDetails.value || fallbackSite?.value),
+    );
+
+    const menuItem = computed(() =>
+      enabled.value ? getHidFaceReaderMenu({ org: org.value, site: site.value }) : null,
+    );
+
+    return {
+      enabled,
+      menuItem,
+      siteDetails,
+    };
+  }
+
+  return {
+    getHidFaceReaderMenu,
+    useHidFaceReaderMenu,
+  };
+}

package/composables/useMember.ts

@@ -53,9 +53,15 @@ export default function useMember() {
     status = "active",
     siteId = "",
   } = {}) {
+    const query: Record<string, any> = { page, limit, type, status };
+
+    if (search) query.search = search;
+    if (user) query.user = user;
+    if (org) query.org = org;
+    if (siteId) query.siteId = siteId;
     return useNuxtApp().$api<Record<string, any>>("/api/members", {
       method: "GET",
-      query: { page, limit, search, user, org, type, status, siteId },
+      query,
     });
   }
   function createUserByVerification(
@@ -114,10 +120,9 @@ export default function useMember() {
     return useNuxtApp().$api<TMember>("/api/members/direct", {
       method: "POST",
       body: payload,
-    })
+    });
   }
 
-
   function updateMemberSite(id: string, siteId: string, siteName: string) {
     return useNuxtApp().$api(`/api/members/site`, {
       method: "PUT",

package/composables/useOptionalServices.ts

@@ -0,0 +1,118 @@
+const optionalServiceFields = [
+  "services",
+  "enabledServices",
+  "serviceTypes",
+  "modules",
+  "enabledModules",
+  "features",
+  "enabledFeatures",
+  "entitlements",
+  "subscriptions",
+  "products",
+];
+
+const hidServiceKeys = [
+  "hid",
+  "hid_amico",
+  "hid_access_control",
+  "hid_access_management",
+  "hid_reader",
+  "hid_readers",
+  "face_reader",
+  "face_readers",
+  "facial_recognition",
+  "biometric_reader",
+  "biometric_readers",
+];
+
+function normalizeServiceKey(value: unknown) {
+  return String(value ?? "")
+    .trim()
+    .toLowerCase()
+    .replace(/[\s-]+/g, "_");
+}
+
+function itemHasService(item: any) {
+  if (!item) return false;
+
+  if (typeof item === "string") {
+    return hidServiceKeys.includes(normalizeServiceKey(item));
+  }
+
+  if (Array.isArray(item)) {
+    return item.some(itemHasService);
+  }
+
+  if (typeof item === "object") {
+    const key = normalizeServiceKey(
+      item.key ??
+        item.code ??
+        item.name ??
+        item.type ??
+        item.service ??
+        item.module ??
+        item.feature,
+    );
+
+    const isEnabled =
+      item.enabled ??
+      item.active ??
+      item.isEnabled ??
+      (item.status ? item.status === "active" : true);
+
+    if (hidServiceKeys.includes(key)) return isEnabled !== false;
+
+    return Object.values(item).some(itemHasService);
+  }
+
+  return false;
+}
+
+export default function useOptionalServices() {
+  const hidServiceOverrides = useState<Record<string, boolean>>(
+    "hid-service-overrides",
+    () => ({}),
+  );
+
+  function hasHidService(source: Record<string, any> | null | undefined) {
+    if (!source) return false;
+
+    if (itemHasService(source.metadata?.services)) return true;
+
+    const presentGateFields = optionalServiceFields.filter((field) =>
+      Object.prototype.hasOwnProperty.call(source, field),
+    );
+
+    if (!presentGateFields.length) return false;
+
+    return presentGateFields.some((field) => itemHasService(source[field]));
+  }
+
+  function getHidServiceEnabled(
+    siteId: string,
+    source: Record<string, any> | null | undefined,
+  ) {
+    if (siteId && Object.prototype.hasOwnProperty.call(hidServiceOverrides.value, siteId)) {
+      return hidServiceOverrides.value[siteId];
+    }
+
+    return hasHidService(source);
+  }
+
+  function setHidServiceOverride(siteId: string, enabled: boolean) {
+    if (!siteId) return;
+
+    hidServiceOverrides.value = {
+      ...hidServiceOverrides.value,
+      [siteId]: enabled,
+    };
+  }
+
+  return {
+    hasHidService,
+    getHidServiceEnabled,
+    setHidServiceOverride,
+    hidServiceKeys,
+    optionalServiceFields,
+  };
+}

package/composables/useSiteSettings.ts

@@ -38,7 +38,7 @@ export default function () {
   }
   async function updateSitebyId(
     siteId: string,
-    payload: { field?: string; value?: number, deliveryCompanyList?: string[] }
+    payload: Record<string, any>
   ) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/sites/id/${siteId}`,

package/composables/useUser.ts

@@ -123,13 +123,12 @@ export default function useUser() {
 
   function getUsers({
     status = "active",
-    type = "",
     search = "",
     page = 1,
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/users", {
       method: "GET",
-      query: { status, search, page, type },
+      query: { status, search, page },
     });
   }
 

package/nuxt.config.ts

@@ -2,7 +2,7 @@
 import vuetify, { transformAssetUrls } from "vite-plugin-vuetify";
 export default defineNuxtConfig({
   ssr: false,
-  devtools: { enabled: true },
+  devtools: { enabled: false },
   build: {
     transpile: ["vuetify"],
   },

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -46,6 +46,7 @@
     "zod": "^3.24.2"
   },
   "resolutions": {
+    "lodash-es": "4.17.21",
     "rollup-plugin-visualizer": "6.0.11"
   }
 }

package/pages/[org]/[site]/access-mgmt/access-logs/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before viewing access logs."
+    >
+      <HidAccessLogDashboard :site="siteId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/pages/[org]/[site]/access-mgmt/administrator/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before managing HID administrators."
+    >
+      <HidUserEnrollment :site="siteId" identity-type="admin" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/pages/[org]/[site]/access-mgmt/hid-readers/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before managing HID readers."
+    >
+      <HidReaderManagement :site="siteId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/pages/[org]/[site]/access-mgmt/hid-users/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before managing HID users."
+    >
+      <HidUserEnrollment :site="siteId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/pages/[org]/[site]/access-mgmt/identity-mapping/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before mapping identities."
+    >
+      <HidIdentityMapping :site="siteId" :org="orgId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/types/local.d.ts

@@ -5,7 +5,8 @@ declare type TToken = {
 };
 
 declare type TNavigationRoute = {
-  name: string;
+  name?: string;
+  path?: string;
   params?: TKeyValuePair;
   query?: TKeyValuePair;
 };