@7365admin1/layer-common 1.11.53 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 2.0.0
+
+### Major Changes
+
+- f4ee57d: Refactor Building Management Module
+
+## 1.11.54
+
+### Patch Changes
+
+- 4eeaa88: add member site and org query params
+
 ## 1.11.53
 
 ### Patch Changes

package/components/BuildingForm.vue

@@ -3,7 +3,7 @@
     <v-toolbar>
       <v-row no-gutters class="fill-height px-6" align="center">
         <span class="font-weight-bold text-h5 text-capitalize">
-          {{ prop.mode }} Block
+          {{ prop.mode }} Block {{ (prop.mode === "edit" && building.block) ? `- ${building.block}` : "" }}
         </span>
       </v-row>
     </v-toolbar>
@@ -12,21 +12,21 @@
         <v-row no-gutters class="px-6 pt-4">
           <v-col cols="12" class="mt-2">
             <v-row no-gutters>
-              <InputLabel class="text-capitalize font-weight-bold" title="Name" required />
+              <InputLabel class="text-capitalize font-weight-bold" title="Block Name" required />
               <v-col cols="12">
                 <v-text-field v-model="building.name" density="comfortable" :rules="[requiredRule]"></v-text-field>
               </v-col>
             </v-row>
           </v-col>
 
-          <v-col cols="12">
+          <v-col v-if="prop.mode === 'add'" cols="12">
             <v-row>
               <v-col cols="6" class="mt-2">
                 <v-row no-gutters>
-                  <InputLabel class="text-capitalize font-weight-bold" title="Block" required />
+                  <InputLabel class="text-capitalize font-weight-bold" title="Block No." required />
                   <v-col cols="12">
                     <v-select v-model.number="building.block" :items="blocks" item-title="label" item-value="value"
-                      density="comfortable" :disabled="prop.mode === 'edit'" :rules="[
+                      density="comfortable" :rules="[
                         requiredRule,
                         () =>
                           (building.block && building.block > 0) ||
@@ -43,7 +43,7 @@
 
               <v-col cols="6" class="mt-2">
                 <v-row no-gutters>
-                  <InputLabel class="text-capitalize font-weight-bold" title="Levels" required />
+                  <InputLabel class="text-capitalize font-weight-bold" title="No. of Levels" required />
                   <v-col cols="12">
                     <v-text-field v-model.number="buildingLevels" density="comfortable" :rules="[requiredRule]"
                       type="number" @update:model-value="setBuildingLevels()"></v-text-field>
@@ -53,24 +53,33 @@
             </v-row>
           </v-col>
 
-          <v-col v-if="buildingLevels" cols="12">
+          <!-- <v-col v-if="buildingLevels &&" cols="12">
             <v-row justify="center">
               <v-col cols="6">
                 <v-btn block color="primary" variant="text" class="text-none font-weight-bold" text="Set level labels"
                   @click="show = !show"></v-btn>
               </v-col>
             </v-row>
-          </v-col>
+          </v-col> -->
+        </v-row>
+
+        <v-row no-gutters v-if="building.levels.length > 0 || newLevelsArray.length > 0" class="mt-2">
+          <InputLabel class="text-capitalize font-weight-bold px-6 mb-2" title="Levels" />
         </v-row>
 
         <v-expand-transition>
-          <v-row v-show="show" no-gutters class="px-6">
+          <v-row v-if="prop.mode === 'edit'" no-gutters class="px-6">
             <template v-for="(level, levelIndex) in building.levels" :key="levelIndex">
               <v-col cols="12">
                 <v-row no-gutters>
-                  <InputLabel class="text-capitalize font-weight-bold" :title="`Level ${levelIndex + 1}`" />
-                  <v-col cols="12">
-                    <v-text-field v-model.trim="building.levels[levelIndex]" density="comfortable"></v-text-field>
+                  <v-col :cols="prop.mode === 'edit' ? 10 : 12">
+                    <v-text-field v-model.trim="building.levels[levelIndex].name" density="comfortable"></v-text-field>
+                  </v-col>
+                  <v-col v-if="prop.mode === 'edit'" cols="2" class="d-flex align-center pb-5 justify-end">
+                    <v-btn icon variant="text" color="error" :disabled="disable"
+                      @click="openDeleteLevelPrompt(levelIndex)">
+                      <v-icon icon="mdi-trash-can-outline"></v-icon>
+                    </v-btn>
                   </v-col>
                 </v-row>
               </v-col>
@@ -78,9 +87,43 @@
           </v-row>
         </v-expand-transition>
 
+
+
+        <v-row no-gutters class="px-6 w-100">
+          <v-row no-gutters v-for="(newLevelsItem, index) in newLevelsArray" :key="index" :cols="12" class="w-100">
+            <v-text-field v-model.trim="newLevelsArray[index]" density="comfortable"></v-text-field>
+            <v-col cols="2" class="d-flex align-center pb-5 justify-end">
+              <v-btn icon variant="text" color="error" @click="newLevelsArray.splice(index, 1)">
+                <v-icon icon="mdi-trash-can-outline"></v-icon>
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-row>
+
+        <v-row v-if="prop.mode === 'edit'" no-gutters class="px-6 w-100">
+          <v-col cols="10">
+            <v-text-field v-model.trim="activeNewLevelInput" density="comfortable" class="w-100"
+              placeholder="Add new level" @click="addNewLevelErrorMessage = ''"></v-text-field>
+          </v-col>
+          <v-col cols="2" class="d-flex align-center pb-5 justify-end">
+            <v-btn icon variant="text" @click="addNewLevel()">
+              <v-icon icon="mdi-plus"></v-icon>
+            </v-btn>
+          </v-col>
+        </v-row>
+        <v-row v-if="prop.mode === 'edit'" no-gutters class="px-6 mb-2">
+          <span class="text-caption text-error">
+            {{ addNewLevelErrorMessage }}
+          </span>
+        </v-row>
+
+
+
+
         <v-col cols="12" class="px-6">
-          <InputLabel class="text-capitalize" title="Building Floor plan" />
-          <InputFileV2 v-model="building.buildingFiles" :multiple="true" accept="*"  :max-length="10" title="Upload Files" />
+          <InputLabel class="text-capitalize font-weight-bold" title="Building Floor plan" />
+          <InputFileV2 v-model="building.buildingFiles" :multiple="true" accept="*" :max-length="10"
+            title="Upload Files" />
         </v-col>
 
         <v-col cols="12" class="mt-2">
@@ -121,10 +164,40 @@
         </v-col>
       </v-row>
     </v-toolbar>
+
+    <ConfirmDialog v-model="confirmDeleteLevelDialog" :loading="loading.deletingLevel" width="450" persistent>
+      <template #title>
+        Delete Level
+      </template>
+
+      <template #description>
+        Are you sure you want to delete {{ levelPendingDeleteName || "this level" }}?
+      </template>
+
+      <template #footer>
+        <v-row no-gutters class="w-100">
+          <v-col cols="6">
+            <v-btn tile block size="48" variant="text" class="text-none" :disabled="loading.deletingLevel"
+              @click="closeDeleteLevelPrompt">
+              Cancel
+            </v-btn>
+          </v-col>
+
+          <v-col cols="6">
+            <v-btn tile block size="48" variant="flat" color="error" class="text-none" :loading="loading.deletingLevel"
+              :disabled="loading.deletingLevel" @click="confirmDeleteLevel">
+              Delete
+            </v-btn>
+          </v-col>
+        </v-row>
+      </template>
+    </ConfirmDialog>
   </v-card>
 </template>
 
 <script setup lang="ts">
+import InputLabel from './InputLabel.vue';
+
 const prop = defineProps({
   site: {
     type: String,
@@ -152,6 +225,7 @@ const prop = defineProps({
 
 const { getSiteById } = useSite();
 const { getFileById } = useFile();
+const { deleteById, batchUpdateLevels } = useBuildingLevel();
 
 const site = ref<TSite | null>(null);
 
@@ -184,21 +258,64 @@ const blocks = computed(() => {
   return formattedArray;
 });
 
-const emit = defineEmits(["cancel", "success", "success:create-more"]);
+const emit = defineEmits(["cancel", "success", "success:create-more", "refresh"]);
 
 const validForm = ref(false);
 
 const buildingLevels = ref(0);
+const newLevelsArray = ref<string[]>([])
+const activeNewLevelInput = ref<string>("")
+const addNewLevelErrorMessage = ref("");
+
+const loading = reactive({
+  deletingLevel: false,
+});
 
 const show = ref(false);
+const confirmDeleteLevelDialog = ref(false);
+const levelPendingDeleteIndex = ref<number | null>(null);
+const levelActionLoading = ref(false);
+
+const levelPendingDeleteName = computed(() => {
+  if (levelPendingDeleteIndex.value === null) return "";
+  return building.value.levels[levelPendingDeleteIndex.value]?.name ?? "";
+});
 
 function setBuildingLevels() {
-  building.value.levels.length = 0;
+  newLevelsArray.value = [];
   for (let index = 0; index < buildingLevels.value; index++) {
-    building.value.levels.push(`Lvl${index + 1}`);
+    newLevelsArray.value.push(`Lvl${index + 1}`);
   }
 }
 
+// function addNewLevels() {
+//   const levelsToAdd = newLevelsInput.value
+//     .split(/\r?\n|,/)
+//     .map((item) => item.trim())
+//     .filter(Boolean);
+
+//   if (!levelsToAdd.length) return;
+//   buildingLevels.value = building.value.levels.length;
+//   newLevelsInput.value = "";
+// }
+
+function openDeleteLevelPrompt(levelIndex: number) {
+  levelPendingDeleteIndex.value = levelIndex;
+  confirmDeleteLevelDialog.value = true;
+}
+
+function closeDeleteLevelPrompt() {
+  confirmDeleteLevelDialog.value = false;
+  levelPendingDeleteIndex.value = null;
+}
+
+async function deleteLevelPlaceholder(levelName: string, levelIndex: number) {
+  // Placeholder integration for future delete-level API call.
+  return { success: true, levelName, levelIndex };
+}
+
+
+
 const building = ref<TBuilding>({
   site: "",
   name: "",
@@ -207,13 +324,17 @@ const building = ref<TBuilding>({
   buildingFiles: []
 });
 
+const initialBuildingLevels = ref([])
+
 // Normalize buildingFiles: extract IDs for InputFileV2, keep names in a separate map
 const buildingFilesNames = ref<Record<string, string>>({});
 
 building.value.site = prop.site;
 if (prop.mode === "edit") {
   building.value = JSON.parse(JSON.stringify(prop.building));
+  building.value.levels = building.value.levels.map((level: any) => ({ _id: level._id, name: level.name }));  //temporary
   buildingLevels.value = building.value.levels.length;
+  initialBuildingLevels.value = JSON.parse(JSON.stringify(building.value.levels));
 
   const rawFiles = building.value.buildingFiles as any[];
   if (rawFiles?.length && typeof rawFiles[0] === 'object') {
@@ -256,16 +377,34 @@ async function submit() {
   try {
     if (prop.mode === "add") {
       const buildingPayload = { ...building.value };
-      buildingPayload.buildingFiles = (building.value.buildingFiles as string[] || []).map((id) => ({ id, name: buildingFilesNames.value[id] ?? "" }));
-      await createBuilding(buildingPayload);
+
+      let payload: TBuildingPayload = {
+        site: buildingPayload.site,
+        name: buildingPayload.name,
+        block: buildingPayload.block,
+        levels: [...newLevelsArray.value],
+        buildingFiles: (building.value.buildingFiles as string[] || []).map((id) => ({ id, name: buildingFilesNames.value[id] ?? "" }))
+      };
+
+      await createBuilding(payload);
     }
 
     if (prop.mode === "edit") {
+
+      console.log('Updating building with levels:', building.value.levels);
+
+      if(JSON.stringify(initialBuildingLevels.value) !== JSON.stringify(building.value.levels)) {
+          await batchUpdateLevels(building.value.levels as { _id: string; name: string }[]);
+      }
+
+      const newLevels = [...newLevelsArray.value, ...(activeNewLevelInput.value.trim() ? [activeNewLevelInput.value.trim()] : [])];
+      
       await updateById(building.value._id ?? "", {
         name: building.value.name,
         block: building.value.block,
-        levels: building.value.levels,
-        buildingFiles: (building.value.buildingFiles as string[] || []).map((id) => ({ id, name: buildingFilesNames.value[id] ?? "" }))
+        // levels: building.value.levels,
+        buildingFiles: (building.value.buildingFiles as string[] || []).map((id) => ({ id, name: buildingFilesNames.value[id] ?? "" })),
+        ...(newLevels.length > 0 ? { levels: newLevels } : {})
       });
     }
 
@@ -288,6 +427,49 @@ async function submit() {
   }
 }
 
+
+const addNewLevel = () => {
+  if (!activeNewLevelInput.value.trim()) {
+    addNewLevelErrorMessage.value = "Please fill in the current new level before adding another.";
+    return;
+  }
+  newLevelsArray.value.push(activeNewLevelInput.value);
+  activeNewLevelInput.value = "";
+}
+
+const confirmDeleteLevel = async () => {
+  const levelIndex = levelPendingDeleteIndex.value;
+  if (levelIndex === null) {
+    console.error("No level selected for deletion.");
+    return;
+  }
+  const levelId = building.value.levels[levelIndex]._id;
+  if (!levelId) {
+    console.error("Level ID is missing. Cannot delete level.");
+    return;
+  }
+
+  try {
+    loading.deletingLevel = true;
+    await deleteById(levelId);
+    const index = building.value.levels.findIndex(level => level._id === levelId);
+    closeDeleteLevelPrompt();
+    if (index !== -1) {
+      building.value.levels.splice(index, 1);
+      buildingLevels.value = building.value.levels.length;
+    }
+    emit('refresh')
+  } catch (error: any) {
+    console.error("Failed to delete level:", error);
+    const message = error.response?._data?.message || "Failed to delete level";
+    message.value = message;
+  } finally {
+    loading.deletingLevel = false;
+  }
+
+
+}
+
 watch(buildingLevels, (newVal) => {
   setTimeout(() => {
     show.value = newVal > 0 && !!newVal;

package/components/BuildingManagement/buildings.vue

@@ -43,12 +43,12 @@
     <v-dialog v-model="createDialog" width="450" persistent>
       <BuildingForm :site="site" :blocks="items" @cancel="createDialog = false" @success="successCreate()"
         @success:create-more="getBuildings()" />
-    </v-dialog>
+    </v-dialog> 
 
     <!-- Edit Dialog -->
     <v-dialog v-model="editDialog" width="450" persistent>
       <BuildingForm :site="site" :blocks="items" mode="edit" @cancel="editDialog = false" @success="successUpdate()"
-        :building="selectedBuilding" />
+        :building="selectedBuilding" @refresh="getBuildings()" />
     </v-dialog>
 
     <!-- Preview Dialog -->

package/components/BuildingManagement/units.vue

@@ -103,7 +103,7 @@ const props = defineProps({
       },
        {
         title: "Level",
-        value: "level",
+        value: "level.name",
       },
       {
         title: "Block",

package/components/BuildingUnitFormAdd.vue

@@ -31,12 +31,12 @@
                       item-value="_id" v-model:search="searchBuilding" :hide-no-data="false" density="comfortable"
                       :rules="[requiredRule]" variant="outlined">
                       <template v-slot:item="{ props: itemProps, item }">
-                        <v-list-item v-bind="itemProps" :title="`Block ${item?.raw?.block} (${item?.raw?.name})`">
+                        <v-list-item v-bind="itemProps" :title="item?.raw?.name">
 
                         </v-list-item>
                       </template>
                       <template v-slot:selection="{ item }">
-                        {{ buildingUnit.building && `Block ${item?.raw?.block} (${item?.raw?.name})`  }}
+                        {{ buildingUnit.building && `${item?.raw?.name}`  }}
                       </template>
                     </v-autocomplete>
                   </v-col>
@@ -47,7 +47,7 @@
                 <v-row no-gutters>
                   <InputLabel class="text-capitalize" title="Level" required />
                   <v-col cols="12">
-                    <v-select v-model="buildingUnit.level" :items="buildingLevels" density="comfortable"
+                    <v-select v-model="buildingUnit.level" :items="buildingLevels" item-title="name" item-value="_id" density="comfortable"
                       :rules="[requiredRule]"></v-select>
                   </v-col>
                 </v-row>
@@ -275,7 +275,7 @@ watchEffect(() => {
 
 const buildingUnitQty = ref(1);
 
-const buildingUnit = ref<TBuildingUnit>({
+const buildingUnit = ref<TBuildingUnitPayload>({
   site: "",
   name: "Unit",
   building: "",

package/components/BuildingUnitFormEdit.vue

@@ -29,10 +29,11 @@
 
             <v-col cols="12" md="6" lg="4" class="mt-2">
               <v-row no-gutters>
-                <InputLabel class="text-capitalize font-weight-bold" title="Level" required />
+                <InputLabel class="text-capitalize font-weight-bold" title="Level"/>
                 <v-col cols="12">
-                  <v-select v-model="buildingUnit.level" :items="buildingLevels" density="comfortable"
-                    :rules="[requiredRule]"></v-select>
+                  <!-- <v-select v-model="buildingUnit.level" :items="buildingLevels" readonly item-title="name" class="no-pointer" item-value="_id" density="comfortable"
+                    :rules="[requiredRule]"></v-select> -->
+                    <v-text-field :model-value="buildingUnit.level.name" density="comfortable" readonly class="no-pointer" />
                 </v-col>
               </v-row>
             </v-col>
@@ -43,7 +44,7 @@
                   <v-row no-gutters>
                     <InputLabel class="text-capitalize font-weight-bold" title="Block Name" />
                     <v-col cols="12">
-                      <v-text-field :model-value="`Block ${buildingUnit.block} (${buildingUnit.buildingName})`"
+                      <v-text-field :model-value="buildingUnit.buildingName"
                         density="comfortable" readonly class="no-pointer"></v-text-field>
                     </v-col>
                   </v-row>
@@ -328,7 +329,10 @@ const buildingUnit = ref({
   ownerName: "",
   building: "",
   buildingName: "",
-  level: 0,
+  level: {
+    _id: "",
+    name: "",
+  },
   // category: "",
   block: null,
   status: "active",
@@ -457,13 +461,13 @@ const selectedBuilding = computed(() => {
   return buildings.value.find((b) => b.value === buildingUnit.value.building);
 });
 
-const buildingLevels = computed(() => {
-  const levels = selectedBuilding.value?.levels ?? [];
-  return levels.map((level: string) => ({
-    title: level,
-    value: level,
-  }))
-});
+// const buildingLevels = computed(() => {
+//   const levels = selectedBuilding.value?.levels ?? [];
+//   return levels.map((level: { name: string; _id: string }) => ({
+//     name: level.name,
+//     value: level._id,
+//   }))
+// });
 
 const disable = ref(false);
 
@@ -500,7 +504,7 @@ async function submit() {
 
     await updateById(buildingUnit.value._id ?? "", {
       name: buildingUnit.value.name,
-      level: buildingUnit.value.level,
+      level: buildingUnit.value.level._id,
       // category: buildingUnit.value.category,
       buildingUnitFiles: (buildingUnit.value.buildingUnitFiles as string[] || []).map((id) => ({ id, name: buildingUnitFilesNames.value[id] ?? "" })),
       companyName: buildingUnit.value.companyName,

package/components/InvitationMain.vue

@@ -195,20 +195,27 @@ const props = defineProps({
 const { authenticate } = useLocalAuth();
 authenticate();
 
-const headers = [
-  {
-    title: "Date",
-    value: "createdAt",
-  },
-  {
-    title: "E-mail",
-    value: "email",
-  },
-  {
-    title: "Action",
-    value: "action-table",
-  },
-];
+const headers = computed(() => {
+  const baseHeaders = [
+    {
+      title: "Date",
+      value: "createdAt",
+    },
+    {
+      title: "E-mail",
+      value: "email",
+    },
+  ];
+
+  if (props.status === "pending" && props.cancelInvitation) {
+    baseHeaders.push({
+      title: "Action",
+      value: "action-table",
+    });
+  }
+
+  return baseHeaders;
+});
 
 const { getVerifications: _getVerifications, cancelUserInvitation } =
   useVerification();
@@ -239,16 +246,21 @@ const {
   items: TMiniVerification[];
   pages: number;
   pageRange: string;
-}>("get-verifications" + props.status, () =>
-  _getVerifications({
-    page: page.value,
-    status: props.status,
-    search: headerSearch.value,
-    type: "user-invite,member-invite",
-    app: props.app,
-    orgId: props.org,
-    siteId: props.siteId,
-  })
+}>(
+  `get-verifications-${props.app}-${props.org}-${props.siteId}-${props.status}`,
+  () =>
+    _getVerifications({
+      page: page.value,
+      status: props.status,
+      search: headerSearch.value,
+      type: "user-invite,member-invite",
+      app: props.app,
+      orgId: props.org,
+      siteId: props.siteId,
+    }),
+  {
+    watch: [() => props.status]
+  }
 );
 
 const loading = computed(() => getVerificationsStatus.value === "pending");
@@ -261,7 +273,8 @@ watchEffect(() => {
   }
 });
 
-watch([headerSearch], () => {
+watch([headerSearch, () => props.status], () => {
+  page.value = 1;
   getVerifications();
 });
 

package/components/MemberMain.vue

@@ -159,8 +159,8 @@
           @click="handleUpdateMemberStatus"
           :loading="updateLoading"
         >
-          {{ updateActionText }} Member
-        </v-btn>
+          {{ updateActionText }} Member </v-btn
+        >r
       </template>
     </ConfirmDialog>
 
@@ -375,7 +375,7 @@ const {
   refresh: getAll,
   status: getAllReqStatus,
 } = useAsyncData(
-  () => `get-all-members-${props.status}-${props.orgId}`,
+  `get-all-members-${props.type}-${props.orgId}-${props.siteId}-${props.status}`,
   () =>
     _getAll({
       status: props.status,
@@ -383,14 +383,23 @@ const {
       search: headerSearch.value,
       page: page.value,
       type: props.type,
+      siteId: props.siteId,
     }),
   {
-    watch: [() => props.status, headerSearch],
+    watch: [() => props.status, () => props.orgId, () => props.siteId, headerSearch],
   }
 );
 
 const loading = computed(() => getAllReqStatus.value === "pending");
 
+watch(headerSearch, () => {
+  page.value = 1;
+});
+
+watch([() => props.orgId, () => props.siteId], () => {
+  page.value = 1;
+});
+
 watchEffect(() => {
   if (getAllReq.value) {
     items.value = getAllReq.value.items;
@@ -425,7 +434,7 @@ function setMember({
 
 const roles = ref<Array<Record<string, any>>>([]);
 const { getRoles } = useRole();
-const { data: getAllRoleReq } = useLazyAsyncData("get-roles", () =>
+const { data: getAllRoleReq } = useLazyAsyncData(`get-roles-${props.type}-${props.orgId}`, () =>
   getRoles({ org: props.orgId, type: props.type, limit: 20 })
 );
 

package/components/OnlineFormConfigurationForm.vue

@@ -267,7 +267,7 @@ const { create: _add, updateById: _update, getAll: _getAll } = useOnlineFormConf
 
 const { data: existingFormsData } = useLazyAsyncData(
   `online-form-configurations-filter-${siteId}-${Date.now()}`,
-  () => _getAll({ site: siteId, org: orgId, limit: 100 })
+  () => _getAll({ site: siteId, org: orgId, status: "active", limit: 100 })
 );
 
 const availableTemplateNames = computed(() => {