@7365admin1/layer-common 1.11.27 → 1.11.29

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.29
+
+### Patch Changes
+
+- 1fa1e46: Update layer-common
+
+## 1.11.28
+
+### Patch Changes
+
+- 21ced98: Update Site Settings
+
 ## 1.11.27
 
 ### Patch Changes

package/components/AccessCardAddForm.vue

@@ -435,8 +435,6 @@ const prop = defineProps({
 });
 
 const { add: _addCard, updateById: _updateCardById } = useCard();
-const { getAll: _getBuildings } = useBuilding();
-const { getAllUnits: _getUnits } = useBuildingUnit();
 const {
   getDoorAccessLevels: _getDoorAccessLevels,
   getLiftAccessLevels: _getLiftAccessLevels,
@@ -444,6 +442,7 @@ const {
   addPhysicalCard: _addPhysicalCard,
   addNonPhysicalCard: _addNonPhysicalCard,
   bulkPhysicalAccessCard: _bulkPhysicalAccessCard,
+  getBlockLevelUnitList: _getBlockLevelUnitList,
 } = useAccessManagement();
 const { getBySiteId: _getEntryPassSettings } = useSiteEntryPassSettings();
 const { getFileUrl } = useFile();
@@ -570,7 +569,7 @@ const liftAccessLevelItems = ref<{ name: string; no: string }[]>([]);
 const buildingItems = ref<{ name: string; value: string }[]>([]);
 const levelItems = ref<{ name: string; value: string }[]>([]);
 const unitItems = ref<{ name: string; value: string }[]>([]);
-const buildingsData = ref<Record<string, any>[]>([]);
+const blockLevelUnitData = ref<any[]>([]);
 const encryptedAcmUrl = ref("");
 
 const route = useRoute();
@@ -644,28 +643,24 @@ function updateEndDate(startDate: string | null) {
   }
 }
 
-// Watch for Assign toggle to fetch buildings
+// Watch for Assign toggle to fetch block/level/unit data
 watch(() => card.value.showAssign, async (newVal) => {
   if (newVal) {
     try {
-      const response = await _getBuildings({
-        page: 1,
-        status: "active",
-        site: siteId,
-      });
-      buildingsData.value = response.items || [];
-      buildingItems.value = buildingsData.value.map((building: any) => ({
-        name: building.block,
-        value: building._id,
+      const response = await _getBlockLevelUnitList(siteId);
+      blockLevelUnitData.value = (response as any)?.data || [];
+      buildingItems.value = blockLevelUnitData.value.map((b: any) => ({
+        name: b.block,
+        value: b._id,
       }));
     } catch (error) {
-      console.error("Failed to fetch buildings:", error);
+      console.error("Failed to fetch block/level/unit list:", error);
     }
   } else {
-    // Reset selections when toggled off
     card.value.assignBuilding = "";
     card.value.assignLevel = "";
     card.value.assignUnit = "";
+    blockLevelUnitData.value = [];
     buildingItems.value = [];
     levelItems.value = [];
     unitItems.value = [];
@@ -673,51 +668,35 @@ watch(() => card.value.showAssign, async (newVal) => {
 });
 
 // Watch for building selection to populate levels
-watch(() => card.value.assignBuilding, async (newVal) => {
+watch(() => card.value.assignBuilding, (newVal) => {
+  card.value.assignLevel = "";
+  card.value.assignUnit = "";
+  unitItems.value = [];
+
   if (newVal) {
-    const selectedBuilding = buildingsData.value.find((b: any) => b._id === newVal);
-    if (selectedBuilding && selectedBuilding.levels) {
-      levelItems.value = selectedBuilding.levels.map((level: string) => ({
-        name: level,
-        value: level,
-      }));
-    }
-    // Reset level and unit when building changes
-    card.value.assignLevel = "";
-    card.value.assignUnit = "";
-    unitItems.value = [];
+    const selectedBlock = blockLevelUnitData.value.find((b: any) => b._id === newVal);
+    levelItems.value = selectedBlock?.levels?.map((l: any) => ({
+      name: l.level,
+      value: l._id,
+    })) || [];
   } else {
     levelItems.value = [];
-    card.value.assignLevel = "";
-    card.value.assignUnit = "";
-    unitItems.value = [];
   }
 });
 
-// Watch for level selection to fetch units
-watch(() => card.value.assignLevel, async (newVal) => {
+// Watch for level selection to populate units
+watch(() => card.value.assignLevel, (newVal) => {
+  card.value.assignUnit = "";
+
   if (newVal && card.value.assignBuilding) {
-    try {
-      const response = await _getUnits({
-        page: 1,
-        status: "active",
-        site: siteId,
-        building: card.value.assignBuilding,
-      });
-      const units = response.items || [];
-      // Filter units by selected level
-      const filteredUnits = units.filter((unit: any) => unit.level === newVal);
-      unitItems.value = filteredUnits.map((unit: any) => ({
-        name: unit.name,
-        value: unit._id,
-      }));
-    } catch (error) {
-      console.error("Failed to fetch units:", error);
-    }
-    card.value.assignUnit = "";
+    const selectedBlock = blockLevelUnitData.value.find((b: any) => b._id === card.value.assignBuilding);
+    const selectedLevel = selectedBlock?.levels?.find((l: any) => l._id === newVal);
+    unitItems.value = selectedLevel?.units?.map((u: any) => ({
+      name: u.name,
+      value: u._id,
+    })) || [];
   } else {
     unitItems.value = [];
-    card.value.assignUnit = "";
   }
 });
 

package/components/AccessCardAssignToUnitForm.vue

@@ -68,7 +68,6 @@
               persistent-placeholder
               :rules="[requiredArrayRule]"
               :disabled="!form.level"
-              :loading="unitLoading"
               multiple
               chips
               closable-chips
@@ -209,9 +208,8 @@ const {
   getLiftAccessLevels: _getLiftAccessLevels,
   assignAccessCard: _assignAccessCard,
   getAvailableAccessCards: _getAvailableAccessCards,
+  getBlockLevelUnitList: _getBlockLevelUnitList,
 } = useAccessManagement();
-const { getAll: _getBuildings } = useBuilding();
-const { getAllUnits: _getUnits } = useBuildingUnit();
 const { requiredRule } = useUtils();
 
 const route = useRoute();
@@ -221,7 +219,6 @@ const validForm = ref(false);
 const loading = ref(false);
 const levelsLoading = ref(false);
 const buildingLoading = ref(false);
-const unitLoading = ref(false);
 const availableLoading = ref(false);
 const availableCount = ref<number | null>(null);
 
@@ -245,7 +242,7 @@ const NO_SELECTION = { name: "No Selection", no: null };
 const accessLevelItems = ref<{ name: string; no: string | null }[]>([]);
 const liftAccessLevelItems = ref<{ name: string; no: string | null }[]>([]);
 const buildingItems = ref<{ name: string; value: string }[]>([]);
-const buildingsData = ref<Record<string, any>[]>([]);
+const blockLevelUnitData = ref<any[]>([]);
 const levelItems = ref<{ name: string; value: string }[]>([]);
 const unitItems = ref<{ name: string; value: string }[]>([]);
 
@@ -303,15 +300,15 @@ onMounted(async () => {
   buildingLoading.value = true;
   levelsLoading.value = true;
 
-  const [buildingsResult, acmResult] = await Promise.allSettled([
-    _getBuildings({ page: 1, status: "active", site: siteId.value }),
+  const [blockLevelResult, acmResult] = await Promise.allSettled([
+    _getBlockLevelUnitList(siteId.value),
     $fetch<{ encrypted: string }>("/api/encrypt-acm-url"),
   ]);
 
-  // Buildings
-  if (buildingsResult.status === "fulfilled") {
-    buildingsData.value = buildingsResult.value.items || [];
-    buildingItems.value = buildingsData.value.map((b: any) => ({
+  // Blocks / Levels / Units
+  if (blockLevelResult.status === "fulfilled") {
+    blockLevelUnitData.value = (blockLevelResult.value as any)?.data || [];
+    buildingItems.value = blockLevelUnitData.value.map((b: any) => ({
       name: b.block,
       value: b._id,
     }));
@@ -345,20 +342,18 @@ onMounted(async () => {
 
 watch(
   () => form.value.building,
-  async (newVal) => {
+  (newVal) => {
     form.value.level = null;
     form.value.units = [];
     levelItems.value = [];
     unitItems.value = [];
 
     if (newVal) {
-      const selectedBuilding = buildingsData.value.find(
-        (b: any) => b._id === newVal
-      );
-      if (selectedBuilding?.levels) {
-        levelItems.value = selectedBuilding.levels.map((level: string) => ({
-          name: level,
-          value: level,
+      const selectedBlock = blockLevelUnitData.value.find((b: any) => b._id === newVal);
+      if (selectedBlock?.levels) {
+        levelItems.value = selectedBlock.levels.map((l: any) => ({
+          name: l.level,
+          value: l._id,
         }));
       }
     }
@@ -367,29 +362,18 @@ watch(
 
 watch(
   () => form.value.level,
-  async (newVal) => {
+  (newVal) => {
     form.value.units = [];
     unitItems.value = [];
 
     if (newVal && form.value.building) {
-      unitLoading.value = true;
-      try {
-        const response = await _getUnits({
-          page: 1,
-          status: "active",
-          site: siteId.value,
-          building: form.value.building,
-        });
-        const units = response.items || [];
-        const filtered = units.filter((u: any) => u.level === newVal);
-        unitItems.value = filtered.map((u: any) => ({
+      const selectedBlock = blockLevelUnitData.value.find((b: any) => b._id === form.value.building);
+      const selectedLevel = selectedBlock?.levels?.find((l: any) => l._id === newVal);
+      if (selectedLevel?.units) {
+        unitItems.value = selectedLevel.units.map((u: any) => ({
           name: u.name,
           value: u._id,
         }));
-      } catch {
-        console.error("Failed to fetch units");
-      } finally {
-        unitLoading.value = false;
       }
     }
   }

package/components/AccessManagement.vue

@@ -152,7 +152,7 @@ const props = defineProps({
     default: () => [
       {
         title: "Block",
-        value: "block.name",
+        value: "block.block",
       },
       {
         title: "Level",

package/components/InvitationForm.vue

@@ -131,6 +131,13 @@
 </template>
 
 <script setup lang="ts">
+import useCustomerSite from '../composables/useCustomerSite';
+import useLocal from '../composables/useLocal';
+import { useLocalSetup } from '../composables/useLocalSetup';
+import useRole from '../composables/useRole';
+import useUser from '../composables/useUser';
+import useUtils from '../composables/useUtils';
+
 const APP = useRuntimeConfig().public.APP;
 const props = defineProps({
   title: {
@@ -190,6 +197,7 @@ const invite = ref<Record<string, any>>({
   org: "",
   site: "",
   siteName: "",
+  isMemberInvite: false,
 });
 
 invite.value.app = props.app;
@@ -298,9 +306,14 @@ const roles = ref<Array<Record<string, any>>>([]);
 const { getRoles } = useRole();
 
 const { data: RolesData, refresh: refreshRoles } = await useLazyAsyncData(
-  "get-roles-by-type",
-  () => getRoles({ org: props.org, type: app.value, limit: 50 }),
-  { watch: [app] }
+  "get-roles-by-type-" + props.org + "-" + props.app,
+  () =>
+  getRoles({
+    org: props.org,
+    type: props.app,
+    limit: 50,
+  }),
+  { watch: [() => props.app] }
 );
 
 watchEffect(() => {
@@ -309,10 +322,10 @@ watchEffect(() => {
   }
 });
 
-function handleUpdateApp(value: string) {
+async function handleUpdateApp(value: string)  {
   invite.value.role = "";
   invite.value.site = "";
-  refreshRoles();
+  await refreshRoles()
 }
 
 const createMore = ref(false);

package/components/RolePermissionFormCreate.vue

@@ -91,6 +91,9 @@
 </template>
 
 <script setup lang="ts">
+import useRole from '../composables/useRole';
+import useUtils from '../composables/useUtils';
+
 const props = defineProps({
   title: {
     type: String,

package/components/RolePermissionFormPreviewUpdate.vue

@@ -111,6 +111,9 @@
 </template>
 
 <script setup lang="ts">
+import useRole from '../composables/useRole';
+import useUtils from '../composables/useUtils';
+
 const definedModel = defineModel<Array<string>>({
   default: () => [],
 });

package/components/ServiceProviderMain.vue

@@ -327,6 +327,8 @@
 </template>
 
 <script lang="ts" setup>
+import useServiceProvider from '../composables/useServiceProvider';
+
 const props = defineProps({
   orgId: {
     type: String,
@@ -418,7 +420,7 @@ const serviceProvider = ref({
 const {
   getAll: getAllServiceProvider,
   add: addServiceProvider,
-  invite: inviteServiceProvider,
+  createServiceProviderInvite
 } = useServiceProvider();
 
 const { getSiteById } = useSite();
@@ -536,12 +538,15 @@ async function submitServiceProviderInvite() {
   disableServiceProvider.value = true;
   messageServiceProvider.value = "";
   try {
-    await inviteServiceProvider({
-      email: serviceProvider.value.email,
-      orgId: props.orgId,
-      siteId: props.siteId,
-      siteName: site.value?.name ?? "",
-    });
+    const payload = {
+  email: serviceProvider.value.email?.trim(),
+  orgId: props.orgId,
+  siteId: props.siteId,
+  siteName: site.value?.name || props.siteName,
+};
+
+
+await createServiceProviderInvite(payload);
     if (createMoreServiceProvider.value) {
       serviceProvider.value.email = "";
     } else {