@7365admin1/layer-common 1.11.46 → 1.11.48

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @iservice365/layer-common
 
+## 1.11.48
+
+### Patch Changes
+
+- 75d1ea7: add new nature business v2
+
+## 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/CameraForm.vue

@@ -30,7 +30,7 @@
             />
           </v-col>
 
-          <v-col v-if="isANPR" cols="12">
+          <!-- <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="Category" required />
             <v-select
               v-model="camera.category"
@@ -38,7 +38,7 @@
               density="comfortable"
               :rules="[requiredRule]"
             />
-          </v-col>
+          </v-col> -->
 
           <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="Type" required />
@@ -50,14 +50,14 @@
             />
           </v-col>
 
-          <v-col v-if="isANPR" cols="12">
+          <!-- <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="Guard House" />
             <v-select
               v-model="camera.guardPost"
               :items="guardPostOptions"
               density="comfortable"
             />
-          </v-col>
+          </v-col> -->
 
           <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="User" required />
@@ -231,6 +231,8 @@ const anprDirectionOptions = computed(() => [
   { title: "Entry", value: "entry" },
   { title: "Exit", value: "exit" },
   { title: "Both Entry and Exit", value: "both" },
+  { title: "Visitors", value: "visitors" },
+  { title: "Residents", value: "residents" },
 ]);
 
 function back() {

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,50 @@ 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,
+        size: fileData?.data?.size ?? fileData?.data?.file_size ?? 0,
         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;
+        payload.size = fileData?.data?.size ?? fileData?.data?.file_size ?? 0;
+      }
+
       await updateById(prop.document._id ?? "", payload);
     }