@7365admin1/layer-common 1.11.41 → 1.11.42

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.42
+
+### Patch Changes
+
+- e11278e: updates and fixes
+
 ## 1.11.41
 
 ### Patch Changes

package/components/AttachmentsViewer.vue

@@ -6,7 +6,8 @@
 
                 <!-- Loading Skeleton -->
                 <template v-if="loading && files?.length > 0">
-                    <v-card v-for="(file, index) in files" :key="index" height="50px" flat border="sm black" class="mb-2">
+                    <v-card v-for="(file, index) in files" :key="index" height="50px" flat border="sm black"
+                        class="mb-2">
                         <v-skeleton-loader type="list-item" class="mb-2" />
                     </v-card>
                 </template>
@@ -56,7 +57,7 @@
                                     </template>
                                     <v-list-item-title class="text-body-2">{{ item.file.name }}</v-list-item-title>
                                     <v-list-item-subtitle class="text-caption">{{ item.mimeType
-                                    }}</v-list-item-subtitle>
+                                        }}</v-list-item-subtitle>
                                     <template #append>
                                         <v-icon size="16" color="grey-lighten-1">mdi-eye-outline</v-icon>
                                     </template>
@@ -81,7 +82,7 @@
                                     </template>
                                     <v-list-item-title class="text-body-2">{{ item.file.name }}</v-list-item-title>
                                     <v-list-item-subtitle class="text-caption">{{ item.mimeType
-                                    }}</v-list-item-subtitle>
+                                        }}</v-list-item-subtitle>
                                     <template #append>
                                         <v-icon size="16" color="grey-lighten-1">mdi-open-in-new</v-icon>
                                     </template>
@@ -200,26 +201,54 @@ watchEffect(async () => {
     for (const item of (props.files || [])) {
         // Handle building files format: { id, name }
         if (item.id && item.name && !item.file) {
+            let file: File = new File([], item.name);
             let mimeType = 'application/octet-stream';
+
             try {
-                const fileMeta = await getFileById(item.id) as any;
-                const apiMimeType = fileMeta?.data?.mimeType || fileMeta?.mimeType;
-                // Use API mime type only if it's not generic
-                if (apiMimeType && apiMimeType !== 'application/octet-stream') {
-                    mimeType = apiMimeType;
-                } else {
-                    // Fallback to filename-based detection
+                // Try to get the actual file with proper MIME type detection from blob
+                const fileUrl = getFileUrl(item.id);
+                file = await urlToFile(fileUrl, item.name);
+                mimeType = file.type || 'application/octet-stream';
+
+                // If blob detection returned generic type, try API metadata or filename
+                if (mimeType === 'application/octet-stream') {
+                    try {
+                        const fileMeta = await getFileById(item.id) as any;
+                        const apiMimeType = fileMeta?.data?.mimeType || fileMeta?.mimeType;
+                        if (apiMimeType && apiMimeType !== 'application/octet-stream') {
+                            mimeType = apiMimeType;
+                        } else {
+                            const ext = item.name?.split('.').pop()?.toLowerCase();
+                            mimeType = inferMimeType(ext);
+                        }
+                    } catch {
+                        // Fallback to filename-based detection
+                        const ext = item.name?.split('.').pop()?.toLowerCase();
+                        mimeType = inferMimeType(ext);
+                    }
+                }
+            } catch {
+                // Fallback: try API metadata
+                try {
+                    const fileMeta = await getFileById(item.id) as any;
+                    const apiMimeType = fileMeta?.data?.mimeType || fileMeta?.mimeType;
+                    if (apiMimeType && apiMimeType !== 'application/octet-stream') {
+                        mimeType = apiMimeType;
+                    } else {
+                        // Fallback to filename-based detection
+                        const ext = item.name?.split('.').pop()?.toLowerCase();
+                        mimeType = inferMimeType(ext);
+                    }
+                } catch {
+                    // Final fallback: infer from filename
                     const ext = item.name?.split('.').pop()?.toLowerCase();
                     mimeType = inferMimeType(ext);
                 }
-            } catch {
-                // Fallback: infer MIME type from file name
-                const ext = item.name?.split('.').pop()?.toLowerCase();
-                mimeType = inferMimeType(ext);
             }
+
             processedFiles.push({
                 _id: item.id,
-                file: new File([], item.name, { type: mimeType }),
+                file,
                 preview: item.preview ?? false,
                 mimeType
             });

package/components/BulletinBoardForm.vue

@@ -52,12 +52,12 @@
 
                     <v-col cols="12">
                         <InputLabel class="text-capitalize" title="Start Date" required />
-                        <InputDateTimePicker v-model:utc="bulletinForm.startDate" :rules="[validStartDateRule]" />
+                        <InputDateTimePicker v-model:utc="bulletinForm.startDate" :rules="[validStartDateRule]"/>
                     </v-col>
 
                     <v-col cols="12" v-if="!bulletinForm.noExpiration">
                         <InputLabel class="text-capitalize" title="End Date" required />
-                        <InputDateTimePicker v-model:utc="bulletinForm.endDate" :rules="[validExpiryDateRule]" />
+                        <InputDateTimePicker v-model:utc="bulletinForm.endDate" :rules="[validExpiryDateRule]" :min="today" />
                     </v-col>
 
                     <v-col cols="12">
@@ -103,6 +103,15 @@
 </template>
 
 <script setup lang="ts">
+const today = computed(() => {
+    const d = new Date()
+    const yyyy = d.getFullYear()
+    const mm = String(d.getMonth() + 1).padStart(2, '0')
+    const dd = String(d.getDate()).padStart(2, '0')
+    console.log('${yyyy}-${mm}-${dd}',`${yyyy}-${mm}-${dd}`)
+    return `${yyyy}-${mm}-${dd}`
+})
+
 const prop = defineProps({
     siteId: {
         type: String,

package/components/BulletinBoardManagement.vue

@@ -214,6 +214,7 @@ function eventStatusFormat(status: any) {
 
 const tabOptions = [
     { name: "Active", status: "active" },
+    { name: "Upcoming", status: "upcoming" },
     { name: "Expired", status: "expired" },
 ];
 
@@ -332,7 +333,7 @@ watch([searchInput], ([search]) => {
 
 onMounted(() => {
     const statusQuery = (useRoute()?.query?.status)
-    status.value = (statusQuery === "active" || statusQuery === "expired") ? statusQuery : "active"
+    status.value = (statusQuery === "active" || statusQuery === "upcoming" || statusQuery === "expired") ? statusQuery : "active"
 })
 
 </script>

package/components/ClientMain.vue

@@ -34,8 +34,7 @@
 
         <!-- ACTIONS -->
         <template #actions>
-          <v-btn v-if="tab !== 'suspended'" class="text-none" rounded="pill" variant="tonal" size="large"
-            @click="openInviteDialog">
+          <v-btn class="text-none" rounded="pill" variant="tonal" size="large" @click="openInviteDialog">
             Invite Client
           </v-btn>
         </template>
@@ -71,7 +70,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref } from 'vue'
+import { computed, nextTick, onMounted, ref } from 'vue'
 import useOrg from '../composables/useOrg'
 import useVerification from '../composables/useVerification'
 import useRole from '../composables/useRole'
@@ -82,7 +81,7 @@ import useSubscription from '../composables/useSubscription'
 const tab = ref<'active' | 'suspended' | 'pending'>('active')
 const dialog = ref(false)
 
-const { getAll } = useOrg()
+const { getAllV2 } = useOrg()
 const { getVerifications, cancelUserInvitation } = useVerification()
 const { getCustomerSites: getCustomerSitesByOrgId } = useCustomerSite()
 const { getByOrgId: getSubscriptionByOrgId } = useSubscription()
@@ -112,6 +111,7 @@ const APP_LIST = [
 /* ================= HEADERS ================= */
 const orgHeaders = [
   { title: 'Organization Name', key: 'name' },
+  { title: 'Email', key: 'email' },
   { title: 'Sites', key: 'sites' },
   { title: 'Plan Type', key: 'planType' },
   { title: 'Billing Cycle', key: 'billingCycle' },
@@ -143,9 +143,22 @@ const pageRange = computed(() => {
 })
 
 /* ================= HELPERS ================= */
-function formatDate(date?: string) {
-  if (!date) return '-'
-  return new Date(date).toLocaleDateString('en-US')
+function formatDate(date?: string | Date) {
+  if (date == null || date === '') return '-'
+  const d = typeof date === 'object' && date instanceof Date ? date : new Date(date as string)
+  if (Number.isNaN(d.getTime())) return '-'
+  return d.toLocaleDateString('en-US')
+}
+
+/** Subscription document không luôn có `paidType`; fallback theo type/description. */
+function planTypeLabel(sub: Record<string, any>) {
+  if (!sub) return '-'
+  if (sub.paidType) return String(sub.paidType)
+  if (sub.type === 'organization') return 'Organization'
+  if (sub.type === 'affiliate') return 'Affiliate'
+  const desc = String(sub.description || '').trim()
+  if (desc) return desc.length > 48 ? `${desc.slice(0, 45)}…` : desc
+  return '-'
 }
 
 async function resolveRoleName(id: string) {
@@ -159,10 +172,11 @@ async function resolveRoleName(id: string) {
 const limit = ref(10)
 /* ================= FETCH ================= */
 async function fetchActive() {
-  const res = await getAll({
+  const res = await getAllV2({
     page: page.value,
     search: search.value,
     limit: limit.value,
+    status: 'active',
   })
 
   const orgs = res?.data?.items || res?.items || []
@@ -189,7 +203,7 @@ async function fetchActive() {
         const subscription = subRes?.data || subRes
 
         if (subscription) {
-          planType = subscription?.paidType || '-'
+          planType = planTypeLabel(subscription)
           billingCycle = subscription?.billingCycle || '-'
           subscriptionStart = formatDate(subscription?.createdAt)
           subscriptionEnd = formatDate(subscription?.nextBillingDate)
@@ -207,6 +221,7 @@ async function fetchActive() {
         subscriptionStart,
         subscriptionEnd,
         status: org?.status || 'active',
+        actions: '—',
       }
     })
   )
@@ -225,10 +240,11 @@ async function fetchActive() {
 }
 
 async function fetchSuspended() {
-  const res = await getAll({
+  const res = await getAllV2({
     page: page.value,
     search: search.value,
-    // status: 'suspended',
+    limit: limit.value,
+    status: 'suspended',
   })
   const orgs = res?.data?.items || res?.items || []
 
@@ -252,7 +268,7 @@ async function fetchSuspended() {
         const subRes = await getSubscriptionByOrgId(org._id)
         const subscription = subRes?.data || subRes
         if (subscription) {
-          planType = subscription?.paidType || '-'
+          planType = planTypeLabel(subscription)
           billingCycle = subscription?.billingCycle || '-'
           subscriptionStart = formatDate(subscription?.createdAt)
           subscriptionEnd = formatDate(subscription?.nextBillingDate)
@@ -262,7 +278,7 @@ async function fetchSuspended() {
       }
 
       return {
-        _id: org._id,
+        _id: `${org._id}-${page.value}`,
         ...org,
         sites: `${sitesCount} Sites`,
         planType,
@@ -270,17 +286,17 @@ async function fetchSuspended() {
         subscriptionStart,
         subscriptionEnd,
         status: org?.status || 'suspended',
+        actions: '—',
       }
     })
   )
 
+  items.value = []
+  await nextTick()
   items.value = [...mapped]
-
-pages.value = res?.pages || 1
-
-const match = res?.pageRange?.match(/of\s+(\d+)/i)
-
-totalItems.value = match ? Number(match[1]) : mapped.length
+  pages.value = res?.pages || 1
+  const match = res?.pageRange?.match(/of\s+(\d+)/i)
+  totalItems.value = match ? Number(match[1]) : mapped.length
 }
 
 async function fetchPending() {
@@ -322,9 +338,7 @@ async function fetchData() {
       await fetchActive()
     }
     else if (tab.value === 'suspended') {
-      items.value = []
-      pages.value = 1
-      totalItems.value = 0
+      await fetchSuspended()
     }
     else {
       await fetchPending()

package/components/Input/DateTimePicker.vue

@@ -7,7 +7,7 @@
             </template>
         </v-text-field>
         <div class="w-100 d-flex align-end ga-3 hidden-input">
-            <input ref="dateInput" :type="inputType" v-model="dateTime" />
+            <input ref="dateInput" :type="inputType" v-model="dateTime" :min="minValue" />
         </div>
     </div>
 </template>
@@ -27,6 +27,10 @@ const prop = defineProps({
     dateOnly: {
         type: Boolean,
         default: false
+    },
+    min: {
+        type: String,
+        default: undefined
     }
 })
 
@@ -36,6 +40,15 @@ const dateTimeUTC = defineModel<string | null>('utc', { default: null }) // UTC
 
 const dateTimeFormattedReadOnly = ref<string | null>(null)
 const inputType = computed(() => (prop.dateOnly ? 'date' : 'datetime-local'))
+
+
+const minValue = computed(() => {
+    if (!prop.min) return undefined
+    if (/^\d{4}-\d{2}-\d{2}$/.test(prop.min)) {
+        return prop.dateOnly ? prop.min : `${prop.min}T00:00`
+    }
+    return prop.min
+})
 const inputPlaceholder = computed(() => (
     prop.placeholder || (prop.dateOnly ? 'MM/DD/YYYY' : 'DD/MM/YYYY, HH:MM AM/PM')
 ))

package/components/InvitationClientForm.vue

@@ -21,6 +21,9 @@
               :rules="[requiredRule, emailRule]"
               :loading="loading.verifyingEmail"
             />
+            <div v-if="existingUserMessage" class="text-subtitle-2 text-error mt-n3 mb-2">
+              {{ existingUserMessage }}
+            </div>
           </v-col>
 
           <!-- APP MULTI SELECT -->
@@ -37,7 +40,35 @@
               density="comfortable"
               :rules="[requiredRule]"
               @update:model-value="handleUpdateApp"
-            />
+            >
+              <template #item="{ props: itemProps, item }">
+                <v-list-item
+                  v-bind="itemProps"
+                  :disabled="item.raw.disabled"
+                >
+                  <template #prepend>
+                    <v-checkbox-btn
+                      :model-value="invite.app.includes(item.raw.value)"
+                      :disabled="item.raw.disabled"
+                      color="black"
+                      density="comfortable"
+                    />
+                  </template>
+
+                  <template #title>
+                    <span :class="item.raw.disabled ? 'text-disabled' : ''">
+                      {{ item.raw.title }}
+                    </span>
+                  </template>
+
+                  <template #subtitle>
+                    <span v-if="item.raw.disabled" class="text-error text-caption">
+                      Already a member
+                    </span>
+                  </template>
+                </v-list-item>
+              </template>
+            </v-autocomplete>
           </v-col>
 
           <!-- ROLE -->
@@ -65,21 +96,11 @@
             />
           </v-col>
 
-          <!-- CREATE MORE -->
-          <v-col cols="12" class="mt-2">
-            <v-checkbox v-model="createMore" density="comfortable" hide-details>
-              <template #label>
-                <span class="text-subtitle-2 font-weight-bold">
-                  Create more
-                </span>
-              </template>
-            </v-checkbox>
-          </v-col>
 
           <!-- ERROR -->
           <v-col cols="12" class="my-2 text-center">
             <span class="text-subtitle-2 text-error">
-              {{ message }}
+              {{ submitError }}
             </span>
           </v-col>
 
@@ -116,14 +137,14 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, reactive, watchEffect } from 'vue'
+import { computed, ref, reactive, watchEffect, watch } from 'vue'
 import useCustomerSite from '../composables/useCustomerSite'
 import useLocal from '../composables/useLocal'
 import useRole from '../composables/useRole'
 import useUser from '../composables/useUser'
 import useUtils from '../composables/useUtils'
 import useOrg from '../composables/useOrg'
-import { watch } from 'vue'
+import useMember from '../composables/useMember'
 
 const APP = useRuntimeConfig().public.APP
 
@@ -156,7 +177,6 @@ const invite = ref({
   isMemberInvite: false,
 })
 
-/* default app */
 if (props.mode === "create") {
   invite.value.app = props.app ? [props.app] : []
 }
@@ -168,11 +188,14 @@ const APP_LIST = [
   { title: "Cleaning Services", value: "cleaning_services" },
   { title: "Mechanical & Electrical Services", value: "mechanical_electrical_services" },
   { title: "Pest Control Services", value: "pest_control_services" },
+  { title: "Landscaping Services", value: "landscaping_services" },
   { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
 ]
+
 const { getByName } = useOrg()
 const org = ref<any>(null)
-  watch(
+
+watch(
   () => props.org,
   async (name) => {
     if (!name) return
@@ -181,7 +204,14 @@ const org = ref<any>(null)
   { immediate: true }
 )
 
-const apps = computed(() => APP_LIST)
+const apps = computed(() => {
+  return APP_LIST.map(app => {
+    const disabled = userAccess.value.some(
+      (a: any) => a.type === app.value
+    )
+    return { ...app, disabled }
+  })
+})
 
 /* ================= SITE ================= */
 const { natureOfBusiness } = useLocal()
@@ -221,18 +251,14 @@ const { getRoles } = useRole()
 
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
-  () =>
-  getRoles({
-    org: org.value?._id,
-    type: props.app,
-    limit: 50,
-  }),
+  () => getRoles({ org: org.value?._id, type: props.app, limit: 50 }),
   { watch: [() => props.app] }
 )
 
 watchEffect(() => {
   if (roleData.value) roles.value = roleData.value.items
 })
+
 watch(
   () => org.value?._id,
   async (id) => {
@@ -240,6 +266,7 @@ watch(
     await refreshRoles()
   }
 )
+
 /* ================= EVENTS ================= */
 async function handleUpdateApp(value: string[]) {
   invite.value.role = ""
@@ -252,59 +279,86 @@ function handleUpdateSite(id: string) {
   invite.value.siteName = obj?.title || ""
 }
 
-/* ================= SUBMIT ================= */
-const { inviteUserClient } = useUser()
+/* ================= EMAIL CHECK ================= */
+const { inviteUserClient, getUserByEmail } = useUser()
+const { getAllByUserId } = useMember()
 const { requiredRule, emailRule } = useUtils()
 
-const message = ref("")
-const createMore = ref(false)
+const existingUserMessage = ref("")
+const submitError = ref("")
 const disable = ref(false)
+const existingUser = ref<any>(null)
+const userAccess = ref<any[]>([])
 
-async function submit() {
-  loading.submittingForm = true
+let timeout: any = null
+
+watch(
+  () => invite.value.email,
+  (email) => {
+    clearTimeout(timeout)
+    existingUserMessage.value = ""
+    existingUser.value = null
+    userAccess.value = []
+
+    if (!email || email.length < 3) return
+
+    timeout = setTimeout(async () => {
+      await checkEmail(email)
+    }, 400)
+  }
+)
+
+async function checkEmail(email: string) {
+  loading.verifyingEmail = true
+  existingUserMessage.value = ""
 
   try {
-    const apps = invite.value.app || []
-
-    await Promise.all(
-      apps.map(app =>
-        inviteUserClient({
-          email: invite.value.email,
-          app,
-          role: invite.value.role,
-          // org: invite.value.org,
-          org: org.value?._id,
-          site: invite.value.site,
-          siteName: invite.value.siteName,
-          // isMemberInvite: invite.value.isMemberInvite,
-        })
-      )
-    )
+    const user = await getUserByEmail(email)
+
+    if (user?._id) {
+      existingUser.value = user
+      existingUserMessage.value = `User already exists: ${email}`
+
+     const memberRes = await getAllByUserId(user._id)
 
-    if (createMore.value) {
-      form.value?.reset()
-      invite.value = {
-        email: "",
-        app: [],
-        role: "",
-        org: org.value?._id || "",
-        site: "",
-        siteName: "",
-        isMemberInvite: false,
-      }
-      emit("success", false)
+userAccess.value = memberRes?.items || []
     } else {
-      emit("success", true)
+      existingUser.value = null
+      userAccess.value = []
     }
+  } catch (e) {
+    existingUser.value = null
+    userAccess.value = []
+  } finally {
+    loading.verifyingEmail = false
+  }
+}
+
+/* ================= SUBMIT ================= */
+async function submit() {
+  loading.submittingForm = true
+  submitError.value = ""
+
+  try {
+    await inviteUserClient({
+      email: invite.value.email,
+      app: invite.value.app,
+      role: invite.value.role,
+      org: org.value?._id,
+      site: invite.value.site,
+      siteName: invite.value.siteName,
+    })
+
+    emit("success", true)
 
   } catch (e: any) {
-    message.value = e?.response?._data?.message || "Error"
+    submitError.value = e?.response?._data?.message || "Error"
   } finally {
     loading.submittingForm = false
   }
 }
-
 function cancel() {
   emit("cancel")
 }
 </script>
+

package/components/InvitationForm.vue

@@ -190,6 +190,10 @@ const props = defineProps({
   hideApp: {
     type: Boolean,
     default: false
+  },
+  inviteMember: {
+  type: Boolean,
+  default: false
   }
 });
 
@@ -377,20 +381,27 @@ function handleUpdateSite(siteId: string) {
   invite.value.siteName = obj?.title || "";
 }
 
-const { inviteUser } = useUser();
+const { inviteUser, inviteMemberClient } = useUser();
 
 async function submit() {
   loading.submittingForm = true;
+
   try {
-    await inviteUser(invite.value);
+    if (props.inviteMember) {
+      await inviteMemberClient(invite.value);
+    } else {
+      await inviteUser(invite.value);
+    }
 
     if (createMore.value) {
       form.value?.reset();
       resetInvite();
       emit("success", false);
-    } else emit("success", true);
+    } else {
+      emit("success", true);
+    }
   } catch (error: any) {
-    message.value = error.response._data.message;
+    message.value = error.response?._data?.message || error.message;
   } finally {
     loading.submittingForm = false;
   }