@7365admin1/layer-common 3.0.7 → 3.0.9

package/composables/useSettingsPermission.ts

@@ -0,0 +1,138 @@
+import { useCommonPermissions } from "./useCommonPermission";
+
+export function useSettingsPermission() {
+  const { hasPermission } = usePermission();
+  const { siteSettingsPermissions: permissions } = useCommonPermissions();
+  const { userAppRole } = useLocalSetup();
+
+  const canManageSiteInformation = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-site-information",
+    );
+  });
+  const canManageANPRCamera = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-anpr-camera",
+    );
+  });
+  const canManageCCTVCamera = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-cctv-camera",
+    );
+  });
+  const canManageDeliveryCompanies = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-delivery-companies",
+    );
+  });
+  const canManageResidentVisitors = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-resident-visitors",
+    );
+  });
+  const canManageWorkOrderSettings = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-work-order-settings",
+    );
+  });
+  const canManageBillingAndSOAConfiguration = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-billing-and-soa-configuration",
+    );
+  });
+  const canManageNFCManagement = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-nfc-management",
+    );
+  });
+  const canManageNFCPatrolSettings = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-nfc-patrol-settings",
+    );
+  });
+  const canManageEntryPass = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-entry-pass",
+    );
+  });
+  const canManageRedDotSettings = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-red-dot-settings",
+    );
+  });
+
+  const canManageSiteSettings = computed(() => {
+    return canManageSiteInformation.value || canManageANPRCamera.value || canManageCCTVCamera.value || canManageDeliveryCompanies.value || canManageResidentVisitors.value || canManageWorkOrderSettings.value || canManageBillingAndSOAConfiguration.value || canManageNFCManagement.value || canManageNFCPatrolSettings.value || canManageEntryPass.value || canManageRedDotSettings.value
+  })
+
+  return {
+    canManageSiteInformation,
+    canManageANPRCamera,
+    canManageCCTVCamera,
+    canManageDeliveryCompanies,
+    canManageResidentVisitors,
+    canManageWorkOrderSettings,
+    canManageBillingAndSOAConfiguration,
+    canManageNFCManagement,
+    canManageNFCPatrolSettings,
+    canManageEntryPass,
+    canManageRedDotSettings,
+    canManageSiteSettings
+
+  };
+}

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.7",
+  "version": "3.0.9",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@iconify/vue": "^5.0.0",
     "@mdi/font": "^7.4.47",
     "@types/qrcode": "^1.5.6",
-    "ckeditor5": "^47.2.0",
+    "ckeditor5": "47.4.0",
     "html2pdf.js": "^0.10.2",
     "html5-qrcode": "^2.3.8",
     "moment-timezone": "^0.6.0",
@@ -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;
 };

package/types/visitor.d.ts

@@ -31,6 +31,7 @@ declare type TVisitor = {
   passKeys?: TPassKeyPayload[];
   checkInRemarks?: string;
   checkOutRemarks?: string;
+  createdBy?: string;
 };
 
 declare type TVisitorType =
@@ -66,6 +67,7 @@ declare type TVisitorPayload = Pick<
   | "passKeys"
   | "checkInRemarks"
   | "checkOutRemarks"
+  | "createdBy"
 > & {
   members?: TMemberInfo[];
 };
@@ -80,8 +82,8 @@ declare type TMemberInfo = {
   nric: string;
   visitorPass?: { keyId: string }[];
   passKeys?: TPassKeyPayload[];
-  contact: string
-}
+  contact: string;
+};
 
 declare type TPassKeyPayload = {
   keyId: string;