@7365admin1/layer-common 3.0.23 → 3.0.25

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 3.0.25
+
+### Patch Changes
+
+- d4a5bb0: Update Layer Common Version
+
+## 3.0.24
+
+### Patch Changes
+
+- 9eb5864: update invite service provider
+
 ## 3.0.23
 
 ### Patch Changes

package/components/AccessCardAddForm.vue

@@ -650,7 +650,7 @@ watch(() => card.value.showAssign, async (newVal) => {
       const response = await _getBlockLevelUnitList(siteId);
       blockLevelUnitData.value = (response as any)?.data || [];
       buildingItems.value = blockLevelUnitData.value.map((b: any) => ({
-        name: b.block,
+        name: `${b.block} (${b.name})`,
         value: b._id,
       }));
     } catch (error) {
@@ -676,7 +676,7 @@ watch(() => card.value.assignBuilding, (newVal) => {
   if (newVal) {
     const selectedBlock = blockLevelUnitData.value.find((b: any) => b._id === newVal);
     levelItems.value = selectedBlock?.levels?.map((l: any) => ({
-      name: l.level,
+      name: l.name,
       value: l._id,
     })) || [];
   } else {

package/components/AccessCardAssignToUnitForm.vue

@@ -309,7 +309,7 @@ onMounted(async () => {
   if (blockLevelResult.status === "fulfilled") {
     blockLevelUnitData.value = (blockLevelResult.value as any)?.data || [];
     buildingItems.value = blockLevelUnitData.value.map((b: any) => ({
-      name: b.block,
+      name: `${b.block} (${b.name})`,
       value: b._id,
     }));
   }
@@ -352,7 +352,7 @@ watch(
       const selectedBlock = blockLevelUnitData.value.find((b: any) => b._id === newVal);
       if (selectedBlock?.levels) {
         levelItems.value = selectedBlock.levels.map((l: any) => ({
-          name: l.level,
+          name: l.name,
           value: l._id,
         }));
       }

package/components/AccessManagement.vue

@@ -152,6 +152,10 @@ const props = defineProps({
   headers: {
     type: Array as PropType<Array<Record<string, any>>>,
     default: () => [
+      {
+        title: "Block Name",
+        value: "block.name",
+      },
       {
         title: "Block",
         value: "block.block",
@@ -180,10 +184,6 @@ const props = defineProps({
         title: "Asgn. (NP)",
         value: "cardCounts.assigned.non_physical",
       },
-      {
-        title: "Total",
-        value: "totalCardCount",
-      },
       // { title: "Action", value: "action-table" },
     ],
   },
@@ -234,6 +234,7 @@ const deleteLoading = ref(false);
 const deleteError = ref("");
 const confirmDialog = ref(false);
 const searchText = ref("");
+const debouncedSearch = ref("");
 const replaceDialog = ref(false);
 
 const route = useRoute();
@@ -277,16 +278,25 @@ const {
   () =>
     getUserTypeAccessCards({
       page: page.value,
-      search: searchText.value,
+      search: debouncedSearch.value,
       organization: orgId.value,
       site: siteId.value,
       userType: "Visitor/Resident",
     }),
   {
-    watch: [page, searchText],
+    watch: [page, debouncedSearch],
   }
 );
 
+let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+watch(searchText, (val) => {
+  page.value = 1;
+  if (debounceTimer) clearTimeout(debounceTimer);
+  debounceTimer = setTimeout(() => {
+    debouncedSearch.value = val;
+  }, 400);
+});
+
 const loading = computed(() => getAllReqStatus.value === "pending");
 
 watchEffect(() => {

package/components/BuildingUnitFormEdit.vue

@@ -427,7 +427,7 @@ watchEffect(() => {
 
 const { data: getUnitPeople, refresh: getUnitPeopleRefresh, pending: getUnitPeoplePending } = useLazyAsyncData(
   "get-unit-people",
-  async () => await getPeopleByUnit(buildingUnit.value._id, { limit: 10, site: prop.site })
+  async () => await getPeopleByUnit(buildingUnit.value._id, { limit: 10, site: prop.site, type: "resident,tenant" })
 );
 
 watch(getUnitPeople, (newData: TPeople[]) => {

package/components/DashboardMain.vue

@@ -1355,7 +1355,16 @@
               :key="item.status"
               class="facility-booking-summary-row"
             >
-              <span class="facility-booking-summary-label">
+              <button
+                v-if="item.status === 'Pending'"
+                class="facility-booking-summary-label facility-booking-summary-label-button"
+                type="button"
+                aria-label="View pending facility bookings"
+                @click="goToFacilityBookingStatus(item.status)"
+              >
+                {{ item.status }}
+              </button>
+              <span v-else class="facility-booking-summary-label">
                 {{ item.status }}
               </span>
               <span class="facility-booking-summary-dots" />
@@ -2294,6 +2303,12 @@ function openFacilityBookingDialog() {
   facilityBookingDialog.value = true;
 }
 
+function goToFacilityBookingStatus(status: string) {
+  if (status !== "Pending" || !props.orgId || !props.site) return;
+  facilityBookingDialog.value = false;
+  router.push(`${dashboardPath("facility/bookings")}?tab=Pending`);
+}
+
 function normalizeFacilityBookingStatus(status: unknown) {
   const value = String(status || "").trim();
   return value === "For Refund" ? "With Refund" : value;
@@ -4233,6 +4248,19 @@ function formatDashboardTime(value?: string) {
   line-height: 1.25;
 }
 
+.facility-booking-summary-label-button {
+  appearance: none;
+  background: transparent;
+  border: 0;
+  cursor: pointer;
+  padding: 0;
+  text-align: left;
+}
+
+.facility-booking-summary-label-button:hover {
+  text-decoration: underline;
+}
+
 .facility-booking-summary-dots {
   border-bottom: 2px dotted #9aa3ad;
   display: block;

package/components/DocumentManagement.vue

@@ -163,13 +163,47 @@
 
         <template #item.action="{ item }">
           <v-btn
+            v-if="!isFolderItem(item._raw)"
             variant="flat"
             class="table-download-btn text-none"
             @click.stop="downloadDocument(item._raw)"
-            :disabled="isFolderItem(item._raw)"
           >
             Download
           </v-btn>
+
+          <v-menu
+            v-else
+            v-model="folderActionMenu[item._raw._id]"
+            location="bottom end"
+            offset="6"
+          >
+            <template #activator="{ props }">
+              <v-btn
+                v-bind="props"
+                icon="mdi-dots-vertical"
+                variant="text"
+                size="small"
+                density="comfortable"
+                class="folder-action-btn"
+                @click.stop
+              />
+            </template>
+
+            <v-list class="folder-action-list pa-0">
+              <v-list-item
+                class="folder-action-item"
+                @click.stop="openEditFolderDialog(item._raw)"
+              >
+                <v-list-item-title class="text-body-2">Edit</v-list-item-title>
+              </v-list-item>
+              <v-list-item
+                class="folder-action-item"
+                @click.stop="openDeleteFolderDialog(item._raw)"
+              >
+                <v-list-item-title class="text-body-2">Delete</v-list-item-title>
+              </v-list-item>
+            </v-list>
+          </v-menu>
         </template>
       </TableV3>
     </v-col>
@@ -251,6 +285,125 @@
       </v-card>
     </v-dialog>
 
+    <!-- Edit Folder Dialog -->
+    <v-dialog v-model="editFolderDialog" width="450" persistent>
+      <v-card width="100%" class="folder-dialog-card">
+        <v-toolbar class="pa-0 folder-dialog-toolbar" density="compact">
+          <v-row no-gutters class="w-100">
+            <v-col cols="12" class="pa-4">
+              <span class="font-weight-medium text-h6">Edit Folder</span>
+            </v-col>
+          </v-row>
+        </v-toolbar>
+
+        <v-card-text style="max-height: 100vh; overflow-y: auto" class="pa-0">
+          <v-form v-model="validEditFolderForm">
+            <v-col cols="12" class="px-6 pt-5">
+              <InputLabel title="Folder Title" />
+              <v-text-field
+                v-model.trim="editFolderTitle"
+                density="comfortable"
+                variant="outlined"
+                :rules="[(v) => !!v || 'Folder title is required']"
+                hide-details="auto"
+              />
+            </v-col>
+
+            <v-col cols="12" class="px-6 pb-5">
+              <InputLabel title="Remarks (Optional)" />
+              <v-textarea
+                v-model.trim="editFolderRemarks"
+                density="comfortable"
+                variant="outlined"
+                rows="3"
+                placeholder="Enter remarks"
+                hide-details
+              />
+            </v-col>
+          </v-form>
+        </v-card-text>
+
+        <v-toolbar class="pa-0" density="compact">
+          <v-row no-gutters class="w-100">
+            <v-col cols="6" class="pa-0">
+              <v-btn
+                block
+                variant="text"
+                class="text-none"
+                size="large"
+                @click="editFolderDialog = false"
+                height="48"
+              >
+                Cancel
+              </v-btn>
+            </v-col>
+            <v-col cols="6" class="pa-0">
+              <v-btn
+                block
+                color="black"
+                variant="flat"
+                class="text-none"
+                size="large"
+                @click="handleApplyFolderEdit"
+                height="48"
+              >
+                Apply
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-toolbar>
+      </v-card>
+    </v-dialog>
+
+    <!-- Delete Folder Dialog -->
+    <v-dialog v-model="deleteFolderDialog" width="450" persistent>
+      <v-card width="100%" class="folder-dialog-card">
+        <v-toolbar density="compact" class="pl-4 folder-dialog-toolbar">
+          <span class="font-weight-medium text-h6">Delete Folder</span>
+        </v-toolbar>
+
+        <v-card-text class="px-6 py-5">
+          <p class="text-subtitle-2 font-weight-medium mb-4">
+            Are you sure you want to permanently delete this folder?
+          </p>
+          <p class="text-body-2 text-grey-darken-1 mb-0">
+            This action cannot be undone and the folder will be removed
+            permanently from the system.
+          </p>
+        </v-card-text>
+
+        <v-toolbar density="compact" class="pa-0">
+          <v-row no-gutters class="w-100">
+            <v-col cols="6" class="pa-0">
+              <v-btn
+                tile
+                block
+                height="48"
+                variant="text"
+                class="text-none"
+                @click="deleteFolderDialog = false"
+              >
+                Cancel
+              </v-btn>
+            </v-col>
+            <v-col cols="6" class="pa-0">
+              <v-btn
+                tile
+                block
+                height="48"
+                color="black"
+                variant="flat"
+                class="text-none"
+                @click="handleDeleteFolderUiConfirm"
+              >
+                Confirm
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-toolbar>
+      </v-card>
+    </v-dialog>
+
     <!-- Edit Dialog -->
     <v-dialog v-model="editDialog" width="450" persistent>
       <DocumentForm
@@ -689,6 +842,15 @@ const folderTitle = ref("");
 const folderRemarks = ref("");
 const folderLoading = ref(false);
 const validFolderForm = ref(false);
+const folderActionMenu = ref<Record<string, boolean>>({});
+const selectedFolder = ref<(Partial<TDocument> & Record<string, any>) | null>(
+  null
+);
+const editFolderDialog = ref(false);
+const deleteFolderDialog = ref(false);
+const editFolderTitle = ref("");
+const editFolderRemarks = ref("");
+const validEditFolderForm = ref(false);
 
 // fileTypes and selectedFileType are declared above to allow
 // the fetch to include the selected filter.
@@ -849,6 +1011,40 @@ function openCreateFolderDialog() {
   createFolderDialog.value = true;
 }
 
+function closeFolderActionMenu(folderId?: string) {
+  if (!folderId) {
+    return;
+  }
+
+  folderActionMenu.value[folderId] = false;
+}
+
+function openEditFolderDialog(
+  folder: Partial<TDocument> & Record<string, any>
+) {
+  selectedFolder.value = folder;
+  editFolderTitle.value = String(folder.name || "");
+  editFolderRemarks.value = String(folder.remarks || "");
+  editFolderDialog.value = true;
+  closeFolderActionMenu(String(folder._id || ""));
+}
+
+function openDeleteFolderDialog(
+  folder: Partial<TDocument> & Record<string, any>
+) {
+  selectedFolder.value = folder;
+  deleteFolderDialog.value = true;
+  closeFolderActionMenu(String(folder._id || ""));
+}
+
+function handleApplyFolderEdit() {
+  editFolderDialog.value = false;
+}
+
+function handleDeleteFolderUiConfirm() {
+  deleteFolderDialog.value = false;
+}
+
 async function handleCreateFolder() {
   if (!folderTitle.value) {
     showMessage("Folder title is required", "error");
@@ -977,4 +1173,35 @@ function selectFileType(type: string) {
   border-radius: 8px;
   background: #fafafa;
 }
+
+.folder-action-btn {
+  color: #38475a;
+}
+
+.folder-action-list {
+  min-width: 180px;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 10px 28px rgba(15, 23, 42, 0.22);
+  overflow: hidden;
+}
+
+.folder-action-item {
+  min-height: 40px;
+  border-bottom: 1px solid #eef0f2;
+  color: #38475a;
+}
+
+.folder-action-item:last-child {
+  border-bottom: none;
+}
+
+.folder-dialog-card {
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.folder-dialog-toolbar {
+  border-bottom: 1px solid #eef0f2;
+}
 </style>

package/components/Nfc/NFCPatrolReportMain.vue

@@ -24,6 +24,7 @@
         <v-window-item value="patrol">
           <PatrolReportTab
             :active="activeTab === 'patrol'"
+            :site="site"
             :filters="filters"
             :options="options"
             @update:filters="updateFilters"

package/components/Nfc/PatrolReport/PatrolReportTab.vue

@@ -43,6 +43,7 @@ import ReportLocationHeader from "./ReportLocationHeader.vue";
 
 const props = defineProps<{
   active: boolean;
+  site: string;
   filters: NFCPatrolReportFilters;
   options: NFCPatrolReportFilterOptions;
 }>();
@@ -59,7 +60,7 @@ const {
   dialogRemarks,
   fetchReport,
   openRemarksDialog,
-} = useNFCPatrolReport(props.filters);
+} = useNFCPatrolReport(props.filters, props.site);
 
 watch(
   () => [props.filters.route, props.filters.timeRange, props.filters.date, props.active],

package/components/Nfc/PatrolReport/ReportFilters.vue

@@ -4,6 +4,8 @@
       <v-select
         :model-value="modelValue.route"
         :items="options.routes"
+        item-title="title"
+        item-value="value"
         label="Select Route"
         variant="outlined"
         density="comfortable"
@@ -18,7 +20,7 @@
       <v-select
         :model-value="modelValue.timeRange"
         :items="options.timeRanges"
-        label="Time Range"
+        label="Start Time"
         variant="outlined"
         density="comfortable"
         rounded="lg"

package/components/RolePermissionMain.vue

@@ -58,7 +58,7 @@
             <span class="text-caption font-weight-bold text-capitalize">
               permissions
             </span>
-            <v-chip>{{ value.length }}</v-chip>
+            <v-chip>{{ getPermissionCount(value) }}</v-chip>
           </template>
 
           <template #item.action-table="{ item }" v-if="canDeleteRole">
@@ -145,6 +145,11 @@
 </template>
 
 <script setup lang="ts">
+import {
+  getPermissionCount,
+  updateRolePermissionsInList,
+} from "../utils/rolePermissionCounts";
+
 const props = defineProps({
   orgId: {
     type: String,
@@ -324,11 +329,29 @@ const Permissions = computed(() => {
 });
 
 function successfulUpdate() {
+  const savedPermissions = [...selectedPermissions.value];
+
   previewDialog.value = false;
-  getRoles();
+  edit.value = false;
+  originalPermissions.value = savedPermissions;
+  items.value = updateRolePermissionsInList(
+    items.value,
+    roleId.value,
+    savedPermissions
+  );
+  void refreshRolesAfterUpdate(savedPermissions);
   useLocalSetup(props.type);
 }
 
+async function refreshRolesAfterUpdate(savedPermissions: string[]) {
+  await getRoles();
+  items.value = updateRolePermissionsInList(
+    items.value,
+    roleId.value,
+    savedPermissions
+  );
+}
+
 const confirmDialog = ref(false);
 const selectedRoleId = ref<string | null>(null);
 const deleteLoading = ref(false);

package/components/ServiceProviderMain.vue

@@ -1210,6 +1210,7 @@ async function submitServiceProviderInvite() {
         serviceProviderInvite.value.siteName ||
         site.value?.name ||
         props.siteName,
+      app: serviceProviderInvite.value.app,
 
       inviteType: existingAccount.value ? "create-org" : "organization-invite",
     });