@7365admin1/layer-common 1.11.46 → 1.11.47

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @iservice365/layer-common
 
+## 1.11.47
+
+### Patch Changes
+
+- 3ca3d41: fix search, filter and add get orgs with subscription
+- ecacc9d: update site category, get permissions by invitation
+
 ## 1.11.46
 
 ### Patch Changes

package/components/AccessCardPreviewDialog.vue

@@ -1,4 +1,6 @@
 <template>
+  <Snackbar v-model="snackbar" :text="snackbarMessage" :color="snackbarColor" />
+
   <AccessCardDetailsDialog
     v-model="historyDialog"
     :card="selectedCardInUnit"
@@ -62,6 +64,7 @@
             </v-chip>
           </template>
         </v-autocomplete>
+        <p v-if="assignError" class="text-error text-caption mt-2">{{ assignError }}</p>
       </v-card-text>
 
       <v-toolbar density="compact">
@@ -84,7 +87,8 @@
               color="black"
               class="text-none"
               height="48"
-              :disabled="!assignPerson"
+              :disabled="!assignPerson || assignLoading"
+              :loading="assignLoading"
               @click="confirmAssign"
             >
               Assign
@@ -395,10 +399,11 @@ const emit = defineEmits<{
   "update:selectedCardInUnit": [value: Record<string, any> | null];
   replace: [];
   delete: [];
+  refresh: [];
   "assign-to-person": [{ card: Record<string, any> | null; person: Record<string, any> | null }];
 }>();
 
-const { getResidents } = useAccessManagement();
+const { getResidents, assignUser } = useAccessManagement();
 
 const historyDialog = ref(false);
 const showAssignForm = ref(false);
@@ -406,6 +411,18 @@ const assignPersonType = ref<string>("");
 const assignPerson = ref<Record<string, any> | null>(null);
 const peopleItems = ref<Record<string, any>[]>([]);
 const peopleLoading = ref(false);
+const assignLoading = ref(false);
+const assignError = ref("");
+const encryptedAcmUrl = ref("");
+const snackbar = ref(false);
+const snackbarMessage = ref("");
+const snackbarColor = ref<"success" | "error">("success");
+
+function showToast(message: string, color: "success" | "error") {
+  snackbarMessage.value = message;
+  snackbarColor.value = color;
+  snackbar.value = true;
+}
 
 const isSelectedCardAvailable = computed(() => {
   if (!props.selectedCardInUnit?._id) return false;
@@ -444,13 +461,19 @@ async function openAssignForm() {
   showAssignForm.value = true;
   assignPerson.value = null;
   assignPersonType.value = "";
+  assignError.value = "";
   peopleItems.value = [];
+  encryptedAcmUrl.value = "";
 
   if (!props.unit?._id || !props.orgId || !props.siteId) return;
   peopleLoading.value = true;
   try {
-    const res = await getResidents({ orgId: props.orgId, siteId: props.siteId, unitId: props.unit._id });
-    peopleItems.value = res?.data ?? [];
+    const [residentsRes, acmRes] = await Promise.all([
+      getResidents({ orgId: props.orgId, siteId: props.siteId, unitId: props.unit._id }),
+      $fetch<{ encrypted: string }>("/api/encrypt-acm-url"),
+    ]);
+    peopleItems.value = residentsRes?.data ?? [];
+    encryptedAcmUrl.value = acmRes?.encrypted ?? "";
   } catch {
     peopleItems.value = [];
   } finally {
@@ -462,14 +485,44 @@ function cancelAssign() {
   showAssignForm.value = false;
   assignPerson.value = null;
   assignPersonType.value = "";
+  assignError.value = "";
 }
 
-function confirmAssign() {
-  emit("assign-to-person", {
-    card: props.selectedCardInUnit,
-    person: assignPerson.value,
-  });
-  cancelAssign();
+const selectedCardType = computed(() => {
+  const id = props.selectedCardInUnit?._id;
+  if (!id) return "QRCODE";
+  const isPhysical = [
+    ...(props.unit?.available?.physical ?? []),
+    ...(props.unit?.assigned?.physical ?? []),
+  ].some((c: any) => c._id === id);
+  return isPhysical ? "NFC" : "QRCODE";
+});
+
+async function confirmAssign() {
+  if (!assignPerson.value || !props.unit?._id) return;
+  assignLoading.value = true;
+  assignError.value = "";
+  try {
+    await assignUser({
+      assignees: [assignPerson.value._id],
+      unit: props.unit._id,
+      type: selectedCardType.value,
+      acm_url: encryptedAcmUrl.value,
+    });
+    emit("assign-to-person", {
+      card: props.selectedCardInUnit,
+      person: assignPerson.value,
+    });
+    showToast("Card assigned successfully.", "success");
+    cancelAssign();
+    emit("refresh");
+  } catch (e: any) {
+    const msg = e?.data?.message ?? "Failed to assign. Please try again.";
+    assignError.value = msg;
+    showToast(msg, "error");
+  } finally {
+    assignLoading.value = false;
+  }
 }
 
 function toggleCard(card: Record<string, any>) {

package/components/AccessManagement.vue

@@ -116,6 +116,7 @@
       :org-id="orgId"
       @replace="openReplaceDialog()"
       @delete="openDeleteDialog()"
+      @refresh="handleAssignRefresh"
     />
 
     <!-- Replace Card Dialog -->
@@ -305,6 +306,15 @@ function setCard({ mode = "create", dialog = true, data = {} as TCard } = {}) {
   }
 }
 
+async function handleAssignRefresh() {
+  await getCards();
+  await nextTick();
+  statsRef.value?.refresh();
+  const updated = items.value.find((item: any) => item._id === selectedCard.value?._id);
+  if (updated) selectedCard.value = updated;
+  previewDialog.value = true;
+}
+
 function successCreate() {
   createDialog.value = false;
   getCards();

package/components/ClientMain.vue

@@ -228,7 +228,7 @@ import useSubscription from '../composables/useSubscription'
 type TabStatus = 'active' | 'suspended' | 'pending'
 
 /* ── COMPOSABLES ── */
-const { getAllV2 } = useOrg()
+const { getOrganizationsWithSubscription } = useOrg()
 const { getVerifications, cancelUserInvitation } = useVerification()
 const { getCustomerSites: getCustomerSitesByOrgId } = useCustomerSite()
 const { getByOrgId: getSubscriptionByOrgId } = useSubscription()
@@ -250,7 +250,7 @@ const APP_LIST = [
 const tab             = ref<TabStatus>('active')
 const dialog          = ref(false)
 const openMenuId      = ref<string | null>(null)
-// filterStatus sync với tab, dùng để filter + đổi tab qua select
+// filterStatus
 const filterStatus    = ref<'active' | 'suspended'>('active')
 const filterPlan      = ref('')   // '' = All | any APP_LIST value
 const filterBilling   = ref('')   // '' = All | 'monthly' | 'yearly'
@@ -303,60 +303,72 @@ function parseTotalItems(pageRangeStr: string, fallback: number): number {
   return match ? Number(match[1]) : fallback
 }
 
-/* ── FETCH ── */
-async function mapOrg(org: any, status: string) {
-  let sitesCount = 0, planType = '-', billingCycle = '-',
-      subscriptionStart = '-', subscriptionEnd = '-'
-  try {
-    const siteRes = await getCustomerSitesByOrgId(org._id)
-    sitesCount    = siteRes?.data?.totalItems
-      ?? siteRes?.totalItems
-      ?? siteRes?.data?.items?.length
-      ?? siteRes?.items?.length
-      ?? 0
-
-    const subRes = await getSubscriptionByOrgId(org._id)
-    const sub    = subRes?.data ?? subRes
-    if (sub) {
-      planType          = planTypeLabel(sub)
-      billingCycle      = sub?.billingCycle ?? '-'
-      subscriptionStart = formatDate(sub?.createdAt)
-      subscriptionEnd   = formatDate(sub?.nextBillingDate)
-    }
-  } catch (e) {
-    console.error('mapOrg error:', org._id, e)
-  }
-  return {
-    _id: `${org._id}-${page.value}`,
-    ...org,
-    sites: `${sitesCount} Sites`,
-    planType,
-    billingCycle,
-    subscriptionStart,
-    subscriptionEnd,
-    status: org?.status ?? status,
-  }
-}
 
 async function fetchOrgs(status: 'active' | 'suspended') {
-  const res  = await getAllV2({
-    page:   page.value,
-    search: search.value,
-    limit:  limit.value,
-    status,
-    // truyền filter xuống API nếu backend hỗ trợ
-    ...(filterPlan.value    ? { app: filterPlan.value }             : {}),
-    ...(filterBilling.value ? { billingCycle: filterBilling.value } : {}),
-  })
+  loading.value = true
+
+  try {
+    const res = await getOrganizationsWithSubscription({
+      page: page.value,
+      search: search.value,
+      limit: limit.value,
+      status,
+      type: filterPlan.value,
+      billingCycle: filterBilling.value,
+    })
 
-  const orgs   = res?.data?.items ?? res?.items ?? []
-  const mapped = await Promise.all(orgs.map((org: any) => mapOrg(org, status)))
+    const orgs = res?.data?.items ?? res?.items ?? []
 
-  items.value      = []
-  await nextTick()
-  items.value      = [...mapped]
-  pages.value      = res?.pages ?? 1
-  totalItems.value = parseTotalItems(res?.pageRange, mapped.length)
+    const siteCache: Record<string, number> = {}
+
+    items.value = await Promise.all(
+      orgs.map(async (org: any) => {
+        const sub = org?.subscription ?? {}
+
+        let siteCount = siteCache[org._id]
+
+        if (siteCount === undefined) {
+          const sitesRes = await getCustomerSitesByOrgId(org._id)
+
+          siteCount =
+            sitesRes?.items?.length ??
+            sitesRes?.data?.items?.length ??
+            0
+
+          siteCache[org._id] = siteCount
+        }
+
+        return {
+          _id: org._id,
+
+          name: org.name,
+          email: org.email,
+          nature: org.nature,
+
+          sites: `${siteCount} Sites`,
+
+          planType: planTypeLabel(sub),
+
+          billingCycle: sub?.billingCycle ?? "-",
+
+          subscriptionStart: formatDate(sub?.createdAt),
+
+          subscriptionEnd: formatDate(sub?.nextBillingDate),
+
+          status: org?.status ?? status,
+        }
+      })
+    )
+
+    pages.value = res?.pages ?? 1
+
+    totalItems.value = parseTotalItems(
+      res?.pageRange,
+      items.value.length
+    )
+  } finally {
+    loading.value = false
+  }
 }
 
 async function fetchPending() {
@@ -364,7 +376,8 @@ async function fetchPending() {
     status: 'pending',
     type:   'user-invite',
     page:   page.value,
-    search: search.value,   // search hoạt động đúng ở pending
+    search: search.value,
+    email: search.value,
   })
 
   items.value = await Promise.all(
@@ -391,7 +404,7 @@ async function fetchData() {
   }
 }
 
-/* ── WATCH: filterStatus select đổi → sync tab ── */
+/* ── WATCH: filterStatus ── */
 watch(filterStatus, (val) => {
   tab.value  = val
   page.value = 1
@@ -406,7 +419,7 @@ async function handleUpdatePage(p: number) {
 
 async function onTabChange(value: TabStatus) {
   tab.value  = value
-  // sync filterStatus khi click tab (chỉ 2 giá trị active/suspended)
+  // sync filterStatus ( active/suspended)
   if (value !== 'pending') filterStatus.value = value
   page.value = 1
   await fetchData()
@@ -421,13 +434,12 @@ function handleSearch() {
   if (searchTimeout) clearTimeout(searchTimeout)
   searchTimeout = setTimeout(() => {
     page.value = 1
-    fetchData()   // dùng search.value trực tiếp, không truyền param
+    fetchData()
   }, 300)
 }
 
 function handleFilterChange() {
-  // filterStatus watch sẽ tự trigger fetchData nếu status đổi
-  // nếu chỉ plan/billing thay đổi thì gọi thủ công
+
   page.value = 1
   fetchData()
 }

package/components/DocumentForm.vue

@@ -15,8 +15,8 @@
             v-model="document.attachment"
             :multiple="false"
             :max-length="10"
-            title="Upload PDF Files"
-            accept=".pdf, .doc, .docx, .xls, .xlsx, .txt"
+            title="Upload Files"
+            accept=".pdf,.csv,.doc,.docx"
           />
         </v-col>
 
@@ -28,15 +28,6 @@
           ></v-text-field>
         </v-col>
 
-        <v-col cols="12" class="px-6">
-          <InputLabel class="text-capitalize" title="Document Type" />
-          <v-select
-            v-model="document.type"
-            :items="documentTypes"
-            density="comfortable"
-          />
-        </v-col>
-
         <v-col cols="12">
           <v-row no-gutters>
             <v-col cols="12" class="text-center">
@@ -97,6 +88,10 @@ const prop = defineProps({
     type: String,
     default: "add",
   },
+  parentId: {
+    type: String,
+    default: "",
+  },
   document: {
     type: Object as PropType<TDocument>,
     default: () => ({
@@ -116,8 +111,6 @@ const validForm = ref(false);
 const disable = ref(false);
 const message = ref("");
 
-const documentTypes = ref(["Online Form", "Other"]);
-
 const document = ref<Record<string, any>>({
   name: "",
   attachment: [],
@@ -127,6 +120,10 @@ const document = ref<Record<string, any>>({
 const route = useRoute();
 const siteId = route.params.site as string;
 const orgId = route.params.org as string;
+const routeParentId = computed(() =>
+  typeof route.query.parentId === "string" ? route.query.parentId : ""
+);
+const effectiveParentId = computed(() => prop.parentId || routeParentId.value);
 
 if (prop.mode === "edit") {
   document.value.name = prop.document.name;
@@ -138,7 +135,8 @@ watch(
   () => document.value.attachment,
   async (newVal) => {
     if (newVal && prop.mode !== "edit") {
-      const fileData = await getFileById(newVal);
+      const fileId = Array.isArray(newVal) ? newVal[0] : newVal;
+      const fileData = await getFileById(fileId);
       if (fileData) {
         document.value.name = fileData.data.name;
       }
@@ -146,6 +144,14 @@ watch(
   }
 );
 
+function deriveTypeFromFilename(name = "") {
+  const n = String(name).toLowerCase();
+  if (n.endsWith(".pdf")) return "pdf";
+  if (n.endsWith(".csv")) return "csv";
+  if (n.endsWith(".doc") || n.endsWith(".docx")) return "doc";
+  return "";
+}
+
 function cancel() {
   //   createMore.value = false;
   message.value = "";
@@ -156,23 +162,48 @@ async function submit() {
   disable.value = true;
   try {
     if (prop.mode === "add") {
+      const fileId = Array.isArray(document.value.attachment)
+        ? document.value.attachment[0]
+        : document.value.attachment;
+
+      const fileData = await getFileById(fileId);
+      const fileName = fileData?.data?.name || String(fileId || "");
+      const derivedType = deriveTypeFromFilename(fileName);
+
+      if (!derivedType) {
+        throw new Error("Unsupported file type. Allowed: pdf, csv, doc.");
+      }
+
       const payload = {
         name: document.value.name,
         attachment: document.value.attachment,
-        type: document.value.type || "Other",
+        type: derivedType,
         status: "active",
         org: orgId,
         site: siteId,
+        parentId: effectiveParentId.value,
       };
+
       await add(payload);
     }
 
     if (prop.mode === "edit") {
-      const payload = {
+      const fileId = Array.isArray(document.value.attachment)
+        ? document.value.attachment[0]
+        : document.value.attachment;
+
+      let payload: Record<string, any> = {
         name: document.value.name,
         attachment: document.value.attachment,
-        type: document.value.type,
       };
+
+      if (fileId) {
+        const fileData = await getFileById(fileId);
+        const fileName = fileData?.data?.name || String(fileId || "");
+        const derivedType = deriveTypeFromFilename(fileName);
+        if (derivedType) payload.type = derivedType;
+      }
+
       await updateById(prop.document._id ?? "", payload);
     }
 

package/components/DocumentManagement.vue

@@ -2,7 +2,6 @@
   <v-row no-gutters class="pa-0">
     <v-col cols="12" class="mb-2">
       <v-row no-gutters align="center">
-        <!-- Left Buttons -->
         <v-col cols="12" md="6" class="d-flex align-center">
           <v-btn
             class="text-none me-2"
@@ -21,19 +20,17 @@
             variant="tonal"
             size="large"
             @click="openCreateFolderDialog()"
-            v-if="canCreate && canCreateDocument"
+            v-if="canCreate && canCreateFolder"
           >
             Create Folder
           </v-btn>
         </v-col>
 
-        <!-- Right Search + Filter -->
         <v-col
           cols="12"
           md="6"
           class="d-flex justify-end align-center mt-4 mt-md-0"
         >
-          <!-- Search -->
           <v-text-field
             v-model="search"
             placeholder="Search"
@@ -54,7 +51,7 @@
                 class="filtertype-btn text-none"
                 style="max-width: 220px"
               >
-                {{ selectedFileType || 'Filter by File Type' }}
+                {{ selectedFileType || "Filter by File Type" }}
               </v-btn>
             </template>
 
@@ -76,6 +73,22 @@
         </v-col>
       </v-row>
     </v-col>
+
+    <v-col cols="12" class="mb-2" v-if="isInsideFolder">
+      <div class="folder-path-bar d-flex align-center ga-2 px-3 py-2">
+        <v-btn
+          icon="mdi-arrow-left"
+          size="small"
+          variant="text"
+          @click="goBackFolder"
+        />
+        <v-icon size="18" color="grey-darken-2">mdi-folder</v-icon>
+        <span class="text-body-2 font-weight-medium">{{
+          currentFolderPath
+        }}</span>
+      </div>
+    </v-col>
+
     <v-col cols="12">
       <TableV3
         :headers="headers"
@@ -89,11 +102,49 @@
         @update:page="page = $event"
         @row-click="tableRowClickHandler"
       >
+        <template v-if="isInsideFolder" #breadcrumb>
+          <div class="d-flex align-center flex-wrap ga-1">
+            <v-btn
+              icon="mdi-chevron-left"
+              size="x-small"
+              variant="text"
+              density="comfortable"
+              class="me-1"
+              @click="goBackFolder"
+            />
+
+            <span
+              class="breadcrumb-segment text-body-2 text-grey-darken-1 cursor-pointer"
+              @click="navigateToRoot"
+              >Home</span
+            >
+            <template v-for="(folder, idx) in folderStack" :key="folder.id">
+              <v-icon size="14" color="grey-darken-1">mdi-chevron-right</v-icon>
+              <span
+                :class="[
+                  'breadcrumb-segment text-body-2 font-weight-medium',
+                  idx === folderStack.length - 1
+                    ? 'text-black'
+                    : 'text-grey-darken-1 cursor-pointer',
+                ]"
+                @click="
+                  idx < folderStack.length - 1 && navigateToStackIndex(idx)
+                "
+                >{{ folder.name }}</span
+              >
+            </template>
+          </div>
+        </template>
         <template #item.name="{ item }">
           <div class="d-flex align-center ga-2">
-            <v-icon size="18" color="grey-darken-2">
+            <v-icon
+              size="18"
+              :color="
+                isFolderItem(item._raw) ? 'amber-darken-2' : 'grey-darken-2'
+              "
+            >
               {{
-                item.file_type?.toLowerCase() === "folder"
+                isFolderItem(item._raw)
                   ? "mdi-folder"
                   : "mdi-file-document-outline"
               }}
@@ -115,6 +166,7 @@
             variant="flat"
             class="table-download-btn text-none"
             @click.stop="downloadDocument(item._raw)"
+            :disabled="isFolderItem(item._raw)"
           >
             Download
           </v-btn>
@@ -124,7 +176,11 @@
 
     <!-- Create Dialog -->
     <v-dialog v-model="createDialog" width="450" persistent>
-      <DocumentForm @cancel="createDialog = false" @success="successCreate()" />
+      <DocumentForm
+        :parent-id="activeParentId"
+        @cancel="createDialog = false"
+        @success="successCreate()"
+      />
     </v-dialog>
 
     <!-- Create Folder Dialog -->
@@ -145,7 +201,7 @@
               <v-text-field
                 v-model.trim="folderTitle"
                 density="comfortable"
-                :rules="[v => !!v || 'Folder title is required']"
+                :rules="[(v) => !!v || 'Folder title is required']"
               />
             </v-col>
 
@@ -394,6 +450,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  canCreateFolder: {
+    type: Boolean,
+    default: true,
+  },
   canUpdateDocument: {
     type: Boolean,
     default: true,
@@ -406,9 +466,17 @@ const props = defineProps({
 
 const { headerSearch } = useLocal();
 const documentService = useDocument();
-const { getAll: _getAllDocuments, deleteById, createFolder, create } = documentService;
+const {
+  getAll: _getAllDocuments,
+  deleteById,
+  createFolder,
+  create,
+} = documentService;
 const { getFileUrl } = useFile();
 
+const router = useRouter();
+const route = useRoute();
+
 const page = ref(1);
 const pages = ref(0);
 const pageRange = ref("-- - -- of --");
@@ -419,8 +487,29 @@ const messageColor = ref("");
 
 const items = ref<Array<Record<string, any>>>([]);
 
-const route = useRoute();
 const siteId = route.params.site as string;
+const orgId = route.params.org as string;
+const routeParentId = computed(() =>
+  typeof route.query.parentId === "string" ? route.query.parentId : ""
+);
+const activeParentId = ref(routeParentId.value);
+const folderStack = ref<Array<{ id: string; name: string }>>([]);
+
+const search = computed({
+  get: () => headerSearch.value,
+  set: (value: string) => {
+    headerSearch.value = value;
+  },
+});
+
+const isInsideFolder = computed(() => activeParentId.value !== "");
+const currentFolderPath = computed(() => {
+  if (folderStack.value.length === 0 && activeParentId.value) {
+    return "Current Folder";
+  }
+
+  return folderStack.value.map((folder) => folder.name).join(" / ");
+});
 
 const {
   data: getDocumentReq,
@@ -433,9 +522,10 @@ const {
       page: page.value,
       search: headerSearch.value,
       site: siteId,
+      parentId: activeParentId.value,
     }),
   {
-    watch: [page, headerSearch],
+    watch: [page, headerSearch, activeParentId],
   }
 );
 
@@ -473,8 +563,8 @@ const tableItems = computed(() => {
   return items.value.map((doc: any) => ({
     ...doc,
     _raw: doc,
-    file_type: doc.type || "N/A",
-    file_size: doc.file_size || doc.size || "0mb",
+    file_type: doc.type === "folder" ? "Folder" : doc.type || "N/A",
+    file_size: doc.type === "folder" ? "—" : doc.file_size || doc.size || "0mb",
     date_created: formatDate(doc.created_at || doc.createdAt),
     date_modified: formatDate(doc.updated_at || doc.updatedAt),
     remarks: doc.remarks || "N/A",
@@ -506,10 +596,51 @@ const confirmDialog = ref(false);
 const selectedDocumentId = ref<string | null>(null);
 
 function tableRowClickHandler(data: any) {
-  selectedDocument.value = (data?._raw || data) as TDocument;
+  const rowData = (data?._raw || data) as TDocument;
+
+  if (isFolderItem(rowData)) {
+    openFolder(rowData);
+    return;
+  }
+
+  selectedDocument.value = rowData;
   previewDialog.value = true;
 }
 
+function isFolderItem(document?: Partial<TDocument> & Record<string, any>) {
+  if (!document) {
+    return false;
+  }
+
+  const docType = String(
+    document.type || document.file_type || ""
+  ).toLowerCase();
+  return docType === "folder";
+}
+
+function openFolder(document: Partial<TDocument> & Record<string, any>) {
+  const folderId = String(document._id || "");
+  const folderName = String(document.name || "Folder");
+
+  if (!folderId) {
+    return;
+  }
+
+  activeParentId.value = folderId;
+  folderStack.value.push({ id: folderId, name: folderName });
+  page.value = 1;
+}
+
+function goBackFolder() {
+  if (folderStack.value.length === 0) {
+    return;
+  }
+
+  folderStack.value.pop();
+  activeParentId.value = folderStack.value.at(-1)?.id || "";
+  page.value = 1;
+}
+
 function downloadDocument(document?: TDocument) {
   if (!document?.attachment || !process.client) {
     return;
@@ -563,24 +694,28 @@ async function handleCreateFolder() {
 
   folderLoading.value = true;
   try {
-    if (documentService.createFolder) {
-      const resp = await (documentService as any).createFolder({
-        name: folderTitle.value,
-        remarks: folderRemarks.value,
-        site: siteId,
-      });
-      showMessage(resp?.message || "Folder created successfully!", "success");
+    const payload = {
+      name: folderTitle.value,
+      remarks: folderRemarks.value,
+      org: orgId,
+      site: siteId,
+      parentId: activeParentId.value,
+      type: "folder",
+    };
+
+    let resp: any = null;
+    if ((documentService as any).createFolder) {
+      resp = await (documentService as any).createFolder(payload);
     } else if ((documentService as any).create) {
-      const resp = await (documentService as any).create({
-        name: folderTitle.value,
-        remarks: folderRemarks.value,
-        type: "folder",
-        site: siteId,
-      });
-      showMessage(resp?.message || "Folder created successfully!", "success");
+      resp = await (documentService as any).create(payload);
+    } else if ((documentService as any).add) {
+      resp = await (documentService as any).add(payload);
     } else {
-      // fallback: no API available in this service
-      showMessage("Folder created (local)", "success");
+      showMessage("Unable to create folder. No API available.", "error");
+    }
+
+    if (resp) {
+      showMessage(resp?.message || "Folder created successfully!", "success");
     }
 
     createFolderDialog.value = false;
@@ -588,7 +723,10 @@ async function handleCreateFolder() {
     folderRemarks.value = "";
     await getDocuments();
   } catch (error: any) {
-    showMessage(error?.response?._data?.message || "Failed to create folder", "error");
+    showMessage(
+      error?.response?._data?.message || "Failed to create folder",
+      "error"
+    );
   } finally {
     folderLoading.value = false;
   }
@@ -670,4 +808,10 @@ function selectFileType(type: string) {
 .filtertype-item:last-child {
   border-bottom: none;
 }
+
+.folder-path-bar {
+  border: 1px solid #e0e0e0;
+  border-radius: 8px;
+  background: #fafafa;
+}
 </style>

package/components/RolePermissionFormCreate.vue

@@ -221,8 +221,7 @@ const { requiredRule } = useUtils();
 const { createRole } = useRole();
 const { getSiteById } = useSite();
 
-// Gom selected + enabled vào 1 shallowRef duy nhất
-// để chỉ trigger 1 render cycle khi update cả 2
+// All selected + enabled 1 shallowRef
 const permState = shallowRef({
   selected: [] as string[],
   enabled: [] as string[],
@@ -283,7 +282,7 @@ function toggleSelectAll(value: boolean) {
     }
   }
 
-  // 1 assignment duy nhất = 1 render cycle, không crash
+  // 1 assignment to trigger reactivity only once
   permState.value = { selected: allKeys, enabled: categories }
 }
 

package/components/TableV3.vue

@@ -43,6 +43,10 @@
       </template>
     </v-toolbar>
 
+    <div v-if="$slots.breadcrumb" class="table-v3__breadcrumb">
+      <slot name="breadcrumb" />
+    </div>
+
     <v-data-table
       :headers="headers"
       :items="items"
@@ -176,4 +180,10 @@ watch(
   width: 38px;
   height: 38px;
 }
+
+.table-v3__breadcrumb {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+  background-color: #fff;
+  padding: 6px 12px;
+}
 </style>

package/composables/useAccessManagement.ts

@@ -306,8 +306,16 @@ export default function useAccessManagement() {
     );
   }
 
+  function assignUser(payload: { assignees: string[]; unit: string; type: string; acm_url: string }) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/assign-user`,
+      { method: "POST", body: payload }
+    );
+  }
+
   return {
     getResidents,
+    assignUser,
     getDoorAccessLevels,
     getLiftAccessLevels,
     getAccessGroups,

package/composables/useDocument.ts

@@ -5,6 +5,7 @@ export default function useDocument() {
     limit = 10,
     status = "active",
     site = "",
+    parentId = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(`/api/documents`, {
       method: "GET",
@@ -14,6 +15,7 @@ export default function useDocument() {
         limit,
         status,
         site,
+        parentId,
       },
     });
   }
@@ -26,10 +28,13 @@ export default function useDocument() {
   }
 
   function deleteById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/documents/deleted/document`, {
-      method: "PUT",
-      query: { id },
-    });
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/documents/deleted/document`,
+      {
+        method: "PUT",
+        query: { id },
+      }
+    );
   }
 
   function updateById(id: string, value: any) {
@@ -39,6 +44,12 @@ export default function useDocument() {
     });
   }
 
+  function getById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/documents/${id}`, {
+      method: "GET",
+    });
+  }
+
   function getDocumentsBySiteId(siteId: string, type?: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/documents/site/${siteId}/type/${type}`,
@@ -48,11 +59,22 @@ export default function useDocument() {
     );
   }
 
+  function create(value: any) {
+    return add(value);
+  }
+
+  function createFolder(value: any) {
+    return add({ ...value, type: "folder" });
+  }
+
   return {
     getAll,
+    getById,
     add,
     deleteById,
     updateById,
     getDocumentsBySiteId,
+    create,
+    createFolder,
   };
 }

package/composables/useOrg.ts

@@ -107,31 +107,6 @@ export default function useOrg() {
     });
   }
 
-  /** Super Admin client list, etc.: filter by `organizations.status` (v1 API ignores status). */
-  function getAllV2({
-    page = 1,
-    search = "",
-    limit = 20,
-    nature = "",
-    status = "active",
-  }: {
-    page?: number;
-    search?: string;
-    limit?: number;
-    nature?: string;
-    status?: "active" | "suspended" | "deleted";
-  } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/organizations/v2", {
-      method: "GET",
-      query: {
-        page,
-        search,
-        limit,
-        nature,
-        status,
-      },
-    });
-  }
 
   function add(
     value: Partial<Pick<TOrg, "name" | "email" | "nature" | "contact">>
@@ -179,6 +154,64 @@ export default function useOrg() {
       }
     );
   }
+  function getAllV2({
+    page = 1,
+    search = "",
+    limit = 20,
+    nature = "",
+    status = "active",
+
+  }: {
+    page?: number;
+    search?: string;
+    limit?: number;
+    nature?: string;
+    status?: "active" | "suspended" | "deleted";
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/organizations/v2", {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+        nature,
+        status,
+      },
+    });
+  }
+
+  function getOrganizationsWithSubscription({
+    page = 1,
+    search = "",
+    limit = 20,
+    status = "active",
+    type = "",
+    billingCycle = "",
+  }: {
+    page?: number
+    search?: string
+    limit?: number
+    status?: "active" | "suspended" | "deleted"
+    type?: string
+    billingCycle?: string
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/organizations/v2/orgs/subscriptions",
+      {
+        method: "GET",
+
+        query: {
+          page,
+          search,
+          limit,
+          status,
+          type,
+          billingCycle,
+        },
+      }
+    )
+  }
+
 
   return {
     org,
@@ -196,6 +229,7 @@ export default function useOrg() {
     add,
     addOnboardingOrg,
     updateOrg,
-    getOrgsByEmail
+    getOrgsByEmail,
+    getOrganizationsWithSubscription
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.46",
+  "version": "1.11.47",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/customer.d.ts

@@ -35,4 +35,10 @@ declare type TCustomerSite = {
   }
 };
 
-declare type TSiteCategory = "residential" | "commercial" | "industrial" | "institutional" | "mixed_development" | "infrastructure" | "hospitality"
+type TSiteCategory =
+  | "residential"
+  | "commercial"
+  | "shopping_mall"
+  | "mix_development"
+  | "industrial"
+  | "co_working_co_living";