@7365admin1/layer-common 1.11.37 → 1.11.38

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.38
+
+### Patch Changes
+
+- 79f3f90: Update Layer-common
+
 ## 1.11.37
 
 ### Patch Changes

package/components/ClientMain.vue

@@ -1,20 +1,9 @@
 <template>
   <v-row no-gutters>
     <v-col cols="12">
-    <TableMain
-  :headers="currentHeaders"
-  :items="items"
-  :loading="loading"
-  :page="page"
-  :pages="pages"
-  :pageRange="pageRange"
-  :items-per-page="-1"
-  :extension-height="120"
-  :offset="300"
-  show-header
-  @refresh="handleRefresh"
-  @update:page="handleUpdatePage"
->
+      <TableMain :headers="currentHeaders" :items="items" :loading="loading" :page="page" :pages="pages"
+        :pageRange="pageRange" :items-per-page="-1" :extension-height="120" :offset="300" show-header
+        @refresh="handleRefresh" @update:page="handleUpdatePage">
         <!-- EXTENSION -->
         <template #extension>
           <v-row no-gutters class="w-100 d-flex flex-column ga-2 pt-2">
@@ -25,30 +14,16 @@
             </v-tabs>
 
             <div class="px-3 py-2 w-100">
-              <v-text-field
-                v-model="search"
-                density="compact"
-                placeholder="Search"
-                clearable
-                max-width="300"
-                append-inner-icon="mdi-magnify"
-                hide-details
-                @update:model-value="handleSearch"
-              />
+              <v-text-field v-model="search" density="compact" placeholder="Search" clearable max-width="300"
+                append-inner-icon="mdi-magnify" hide-details @update:model-value="handleSearch" />
             </div>
           </v-row>
         </template>
 
         <!-- ACTIONS -->
         <template #actions>
-          <v-btn
-            v-if="tab !== 'suspended'"
-            class="text-none"
-            rounded="pill"
-            variant="tonal"
-            size="large"
-            @click="openInviteDialog"
-          >
+          <v-btn v-if="tab !== 'suspended'" class="text-none" rounded="pill" variant="tonal" size="large"
+            @click="openInviteDialog">
             Invite Client
           </v-btn>
         </template>
@@ -60,26 +35,16 @@
 
         <!-- STATUS CELL -->
         <template #item.status="{ value }">
-          <v-chip
-            size="small"
-            :color="value === 'suspended' ? 'error' : 'success'"
-            variant="flat"
-          >
+          <v-chip size="small" :color="value === 'suspended' ? 'error' : 'success'" variant="flat">
             {{ value }}
           </v-chip>
         </template>
 
         <!-- ACTION CELL (pending only) -->
         <template #item.action="{ item }">
-          <v-btn
-            v-if="tab === 'pending'"
-            size="small"
-            color="error"
-            variant="tonal"
-            :loading="cancelLoadingId === item._id"
-            :disabled="cancelLoadingId === item._id"
-            @click="cancelInvite(item)"
-          >
+          <v-btn v-if="tab === 'pending'" size="small" color="error" variant="tonal"
+            :loading="cancelLoadingId === item._id" :disabled="cancelLoadingId === item._id"
+            @click="cancelInvite(item)">
             Cancel Invite
           </v-btn>
         </template>
@@ -88,11 +53,7 @@
 
     <!-- DIALOG -->
     <v-dialog v-model="dialog" max-width="500">
-      <InvitationClientForm
-        title="Invite Client"
-        @success="handleSuccess"
-        @cancel="dialog = false"
-      />
+      <InvitationClientForm title="Invite Client" @success="handleSuccess" @cancel="dialog = false" />
     </v-dialog>
   </v-row>
 </template>
@@ -125,6 +86,17 @@ const search = ref('')
 const totalItems = ref(0)
 const cancelLoadingId = ref<string | null>(null)
 
+
+const APP_LIST = [
+  { title: "Organization", value: "organization" },
+  { title: "Security Agency", value: "security_agency" },
+  { title: "Cleaning Services", value: "cleaning_services" },
+  { title: "Property Management Agency", value: "property_management_agency" },
+  { 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" },
+]
 /* ================= HEADERS ================= */
 const orgHeaders = [
   { title: 'Organization Name', key: 'name' },
@@ -286,13 +258,16 @@ async function fetchPending() {
     type: 'user-invite',
     page: page.value,
     search: search.value,
-    app: 'organization',
+    // app: 'organization',
   })
 
   items.value = await Promise.all(
     (res?.items || []).map(async (i: any) => ({
       ...i,
-      app: i.metadata?.app ?? '-',
+      app:
+        APP_LIST.find(a => a.value === i.metadata?.app)?.title ||
+        i.metadata?.app ||
+        '-',
       role: await resolveRoleName(i.metadata?.role),
     }))
   )

package/components/InvitationClientForm.vue

@@ -119,17 +119,18 @@
 import { computed, ref, reactive, watchEffect } from 'vue'
 import useCustomerSite from '../composables/useCustomerSite'
 import useLocal from '../composables/useLocal'
-import { useLocalSetup } from '../composables/useLocalSetup'
 import useRole from '../composables/useRole'
 import useUser from '../composables/useUser'
 import useUtils from '../composables/useUtils'
+import useOrg from '../composables/useOrg'
+import { watch } from 'vue'
 
 const APP = useRuntimeConfig().public.APP
 
 /* ================= PROPS ================= */
 const props = defineProps({
   title: { type: String, default: "Invite Form" },
-  app: { type: String, default: "organization" },
+  app: { type: String, default: "" },
   org: { type: String, default: "" },
   mode: { type: String, default: "create" },
 })
@@ -162,17 +163,23 @@ if (props.mode === "create") {
 
 /* ================= APP LIST ================= */
 const APP_LIST = [
-  { title: "Organization", value: "organization" },
+  { title: "Property Management Agency", value: "property_management_agency" },
   { title: "Security Agency", value: "security_agency" },
   { title: "Cleaning Services", value: "cleaning_services" },
-  { title: "Property Management Agency", value: "property_management_agency" },
   { 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 { orgNature } = useLocalSetup()
+const { getByName } = useOrg()
+const org = ref<any>(null)
+  watch(
+  () => props.org,
+  async (name) => {
+    if (!name) return
+    org.value = await getByName(name)
+  },
+  { immediate: true }
+)
 
 const apps = computed(() => APP_LIST)
 
@@ -188,7 +195,7 @@ const { getAll: getAllCustomerSite } = useCustomerSite()
 
 const { data: siteData, refresh: refreshSiteData } = await useLazyAsyncData(
   "sites",
-  () => getAllCustomerSite({ org: props.org, limit: 50 })
+  () => getAllCustomerSite({ org: org.value?._id, limit: 50 })
 )
 
 watchEffect(() => {
@@ -200,9 +207,13 @@ watchEffect(() => {
   }
 })
 
-watchEffect(() => {
-  if (hasSite.value) refreshSiteData()
-})
+watch(
+  () => org.value?._id,
+  async (id) => {
+    if (!id) return
+    await refreshSiteData()
+  }
+)
 
 /* ================= ROLE ================= */
 const roles = ref<any[]>([])
@@ -211,18 +222,24 @@ const { getRoles } = useRole()
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
   () =>
-    getRoles({
-      org: props.org,
-      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) => {
+    if (!id) return
+    await refreshRoles()
+  }
+)
 /* ================= EVENTS ================= */
 async function handleUpdateApp(value: string[]) {
   invite.value.role = ""
@@ -255,7 +272,8 @@ async function submit() {
           email: invite.value.email,
           app,
           role: invite.value.role,
-          org: invite.value.org,
+          // org: invite.value.org,
+          org: org.value?._id,
           site: invite.value.site,
           siteName: invite.value.siteName,
           // isMemberInvite: invite.value.isMemberInvite,
@@ -269,7 +287,7 @@ async function submit() {
         email: "",
         app: [],
         role: "",
-        org: props.org,
+        org: org.value?._id || "",
         site: "",
         siteName: "",
         isMemberInvite: false,

package/components/ScheduleTaskForm.vue

@@ -20,7 +20,7 @@
         </v-row>
       </v-toolbar>
 
-      <v-card-text class="pa-8 flex-grow-1" style="overflow-y: auto">
+      <v-card-text class="pa-4 flex-grow-1" style="overflow-y: auto">
         <v-form ref="formRef" v-model="valid">
           <v-row dense>
             <v-col cols="12">
@@ -52,7 +52,10 @@
                 <div class="text-caption text-medium-emphasis mb-2">
                   {{ selectedDates.length }} date(s) selected
                 </div>
-                <div v-if="selectedDates.length > 0" class="d-flex flex-wrap gap-1">
+                <div
+                  v-if="selectedDates.length > 0"
+                  class="d-flex flex-wrap ga-2"
+                >
                   <v-chip
                     v-for="date in selectedDates"
                     :key="date"
@@ -121,6 +124,108 @@
               </v-select>
             </v-col>
 
+            <v-col v-if="selectedAreas.length > 0" cols="12">
+              <InputLabel title="Units Under Selected Areas" />
+              <v-card variant="outlined" rounded class="mb-4">
+                <v-list density="compact" nav>
+                  <template
+                    v-for="(area, idx) in selectedAreas"
+                    :key="area.value || area._id"
+                  >
+                    <v-divider v-if="idx > 0" />
+
+                    <v-list-item
+                      rounded="0"
+                      class="px-3"
+                      @click="toggleArea(area.value || area._id)"
+                    >
+                      <template #prepend>
+                        <v-icon size="18" color="medium-emphasis">
+                          {{
+                            openAreas.includes(area.value || area._id)
+                              ? "mdi-chevron-down"
+                              : "mdi-chevron-right"
+                          }}
+                        </v-icon>
+                      </template>
+
+                      <v-list-item-title class="text-body-2 font-weight-medium">
+                        {{ area.name }}
+                      </v-list-item-title>
+
+                      <template #append>
+                        <v-progress-circular
+                          v-if="
+                            loadingUnits &&
+                            !(area.value || area._id in fetchedAreaUnits)
+                          "
+                          size="14"
+                          width="2"
+                          indeterminate
+                          color="primary"
+                        />
+                        <v-chip
+                          v-else
+                          size="x-small"
+                          variant="tonal"
+                          color="primary"
+                        >
+                          {{
+                            (fetchedAreaUnits[area.value || area._id] || [])
+                              .length
+                          }}
+                        </v-chip>
+                      </template>
+                    </v-list-item>
+
+                    <v-expand-transition>
+                      <div v-show="openAreas.includes(area.value || area._id)">
+                        <v-card-text class="pt-1 pb-3 px-3">
+                          <div
+                            v-if="
+                              loadingUnits &&
+                              !(area.value || area._id in fetchedAreaUnits)
+                            "
+                            class="d-flex flex-wrap ga-2"
+                          >
+                            <v-skeleton-loader
+                              v-for="n in 4"
+                              :key="n"
+                              type="chip"
+                              width="80"
+                            />
+                          </div>
+
+                          <div
+                            v-else-if="
+                              (fetchedAreaUnits[area.value || area._id] || [])
+                                .length > 0
+                            "
+                            class="d-flex flex-wrap ga-1"
+                          >
+                            <v-chip
+                              v-for="unit in fetchedAreaUnits[
+                                area.value || area._id
+                              ]"
+                              :key="unit.unit"
+                              size="small"
+                              variant="tonal"
+                            >
+                              {{ unit.name }}
+                            </v-chip>
+                          </div>
+
+                          <span v-else class="text-caption text-disabled">
+                            No units configured
+                          </span>
+                        </v-card-text>
+                      </div>
+                    </v-expand-transition>
+                  </template>
+                </v-list>
+              </v-card>
+            </v-col>
+
             <v-col cols="12">
               <InputLabel for="description" title="Task Description" />
               <v-textarea
@@ -138,18 +243,16 @@
         </v-form>
       </v-card-text>
 
-      <v-divider />
-
-      <v-card-actions class="pa-0">
-        <v-row no-gutters class="fill-width">
+      <v-toolbar class="pa-0" density="compact">
+        <v-row no-gutters>
           <v-col cols="6" class="pa-0">
             <v-btn
               block
               variant="text"
-              class="text-none rounded-0"
-              size="x-large"
+              class="text-none"
+              size="large"
               @click="close"
-              height="56"
+              height="48"
               :disabled="submitting"
             >
               Cancel
@@ -161,7 +264,7 @@
               variant="flat"
               color="primary"
               class="text-none font-weight-bold rounded-0"
-              height="56"
+              height="48"
               @click="submitTask"
               :loading="submitting"
             >
@@ -169,7 +272,7 @@
             </v-btn>
           </v-col>
         </v-row>
-      </v-card-actions>
+      </v-toolbar>
     </v-card>
   </v-dialog>
 
@@ -202,7 +305,7 @@ const props = defineProps({
 const show = defineModel("show", { type: Boolean, default: false });
 const emit = defineEmits(["saved", "close", "refresh"]);
 
-const { getAreas } = useAreas();
+const { getAreas, getAreaById } = useAreas();
 const { createScheduleTask, updateScheduleTask, getScheduleTaskById } =
   useScheduleTask();
 
@@ -215,19 +318,52 @@ const subject = ref("");
 const description = ref("");
 const scheduleTime = ref("08:00");
 const pickerDates = ref<Date[]>([]);
-// Derived from pickerDates — single source of truth, always in sync
 const selectedDates = computed(() =>
   pickerDates.value.map((d) => toLocalISO(d)).sort()
 );
 
 const selectedAreas = ref<any[]>([]);
+const loadingUnits = ref(false);
+const fetchedAreaUnits = ref<Record<string, { name: string; unit: string }[]>>(
+  {}
+);
+const openAreas = ref<string[]>([]);
+
+const selectedAreaIds = computed(() =>
+  selectedAreas.value.map((a: any) => a.value || a._id)
+);
+
+watch(selectedAreaIds, async (ids, prevIds) => {
+  openAreas.value = ids.slice();
+
+  const toFetch = ids.filter(
+    (id) => !prevIds?.includes(id) && !(id in fetchedAreaUnits.value)
+  );
+
+  if (!toFetch.length) return;
+
+  loadingUnits.value = true;
+  try {
+    await Promise.all(
+      toFetch.map(async (id) => {
+        try {
+          const result = await getAreaById(id);
+          fetchedAreaUnits.value[id] = result?.units || [];
+        } catch {
+          fetchedAreaUnits.value[id] = [];
+        }
+      })
+    );
+  } finally {
+    loadingUnits.value = false;
+  }
+});
 
 const message = ref("");
 const messageSnackbar = ref(false);
 const messageColor = ref("success");
 const areasList = ref<any[]>([]);
 
-// Helper function to generate all dates between start and end
 const generateDateRange = (start: Date, end: Date): Date[] => {
   const dates: Date[] = [];
   const current = new Date(start);
@@ -240,7 +376,6 @@ const generateDateRange = (start: Date, end: Date): Date[] => {
   return dates;
 };
 
-// Helper: convert a Date to a local YYYY-MM-DD string (avoids UTC-shift issues)
 const toLocalISO = (d: Date): string => {
   const y = d.getFullYear();
   const m = String(d.getMonth() + 1).padStart(2, "0");
@@ -248,7 +383,6 @@ const toLocalISO = (d: Date): string => {
   return `${y}-${m}-${day}`;
 };
 
-// Remove a single date from the selection via chip close
 const removeDate = (dateISO: string) => {
   pickerDates.value = pickerDates.value.filter(
     (d) => toLocalISO(d) !== dateISO
@@ -261,12 +395,23 @@ const showMessage = (text: string, color: string = "success") => {
   messageSnackbar.value = true;
 };
 
+const toggleArea = (id: string) => {
+  const idx = openAreas.value.indexOf(id);
+  if (idx === -1) {
+    openAreas.value.push(id);
+  } else {
+    openAreas.value.splice(idx, 1);
+  }
+};
+
 const resetForm = () => {
   subject.value = "";
   description.value = "";
   scheduleTime.value = "08:00";
   pickerDates.value = [];
   selectedAreas.value = [];
+  fetchedAreaUnits.value = {};
+  openAreas.value = [];
 };
 
 const setFormFromTask = (task: any) => {
@@ -310,7 +455,8 @@ const setFormFromTask = (task: any) => {
 
 const { data: getAreasReq, pending: loadingAreas } = await useLazyAsyncData(
   `get-areas-${props.site}`,
-  () => getAreas({ site: props.site, limit: 1000, serviceType: props.serviceType }),
+  () =>
+    getAreas({ site: props.site, limit: 1000, serviceType: props.serviceType }),
   {
     watch: [show, () => props.site],
     immediate: false,
@@ -377,7 +523,11 @@ const submitTask = async () => {
         (props.taskData as any)?._id || (props.taskData as any)?.id;
       response = await updateScheduleTask(taskId, payload);
     } else {
-      response = await createScheduleTask({ ...payload, site: props.site, serviceType: props.serviceType });
+      response = await createScheduleTask({
+        ...payload,
+        site: props.site,
+        serviceType: props.serviceType,
+      });
     }
 
     showMessage(

package/components/ScheduleTaskMain.vue

@@ -205,12 +205,14 @@
           <v-toolbar>
             <v-row no-gutters class="fill-height px-6" align="center">
               <span class="font-weight-bold text-h6 text-capitalize">
-                Delete {{ selectedTask?.title || 'Schedule Task' }}
+                Delete {{ selectedTask?.title || "Schedule Task" }}
               </span>
             </v-row>
           </v-toolbar>
           <v-card-text>
-            <span class="text-subtitle-2">Are you sure you want to delete this schedule task?</span>
+            <span class="text-subtitle-2"
+              >Are you sure you want to delete this schedule task?</span
+            >
           </v-card-text>
 
           <v-toolbar class="pa-0" density="compact">
@@ -257,6 +259,7 @@
 
 <script lang="ts" setup>
 import useScheduleTask from "../composables/useScheduleTask";
+import useUtils from "../composables/useUtils";
 
 const props = defineProps({
   orgId: { type: String, required: true },
@@ -271,13 +274,16 @@ const props = defineProps({
 });
 
 const { formatDate, debounce } = useUtils();
-const { getScheduleTasks, getScheduleTaskById, deleteScheduleTask } = useScheduleTask();
+const { getScheduleTasks, getScheduleTaskById, deleteScheduleTask } =
+  useScheduleTask();
 
 const canViewScheduleTasks = computed(() => props.canViewScheduleTasks);
 const canCreateScheduleTask = computed(() => props.canCreateScheduleTask);
 const canUpdateScheduleTask = computed(() => props.canUpdateScheduleTask);
 const canDeleteScheduleTask = computed(() => props.canDeleteScheduleTask);
-const canViewScheduleTaskDetails = computed(() => props.canViewScheduleTaskDetails);
+const canViewScheduleTaskDetails = computed(
+  () => props.canViewScheduleTaskDetails
+);
 
 const page = ref(1);
 const pages = ref(0);

package/components/VehicleForm.vue

@@ -776,6 +776,7 @@ onMounted(() => {
       vehicle.end = prop.vehicleData.end || '';
       vehicle.start = prop.vehicleData.start || '';
       vehicle.plateNumber = prop.vehicleData.plates?.find((p) => p._id === prop.plateNumberId)?.plateNumber || '';
+      vehicle.peopleId = prop.vehicleData.peopleId || '';
     }
   }, 300);
 })

package/components/VisitorManagement.vue

@@ -1331,10 +1331,10 @@ const {
       params.status = activeTab.value;
     }
 
-    if (activeTab.value !== "registered") {
-      delete params.type;
-      delete params.checkedOut;
-    }
+    // if (activeTab.value !== "registered") {
+    //   delete params.type;
+    //   delete params.checkedOut;
+    // }
 
     return await getVisitors(params);
   },

package/composables/useMember.ts

@@ -93,6 +93,21 @@ export default function useMember() {
       }
     );
   }
+
+function createMemberDirect(payload: {
+  userId: string;
+  orgId: string;
+  roleId: string;
+  app: string;
+  siteId?: string;
+  siteName?:string;
+}) {
+  return useNuxtApp().$api<TMember>('/api/members/direct', {
+    method: 'POST',
+    body: payload,
+  })
+}
+
   return {
     members,
     member,
@@ -107,5 +122,6 @@ export default function useMember() {
     getByUserIdType,
     updateMemberStatus,
     updateMemberRole,
+    createMemberDirect
   };
 }

package/composables/useWorkOrder.ts

@@ -137,15 +137,21 @@ export default function useWorkOrder() {
   }
 
   function deleteWorkOrder(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/work-orders/deleted/work-order/${id}`,
-      {
-        method: "PUT",
-        // query: { id },
-      }
-    );
+    return useNuxtApp().$api<Record<string, any>>(`/api/work-orders/${id}`, {
+      method: "DELETE",
+    });
   }
 
+  // function deleteWorkOrder(id: string) {
+  //   return useNuxtApp().$api<Record<string, any>>(
+  //     `/api/work-orders/deleted/work-order/${id}`,
+  //     {
+  //       method: "PUT",
+  //       // query: { id },
+  //     }
+  //   );
+  // }
+
   function getWorkOrderSettings(_workOrderSettings: Record<string, any>) {
     return useNuxtApp().$api<Record<string, any>>(
       "/api/work-order-settings/get-by-site",

package/package.json

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

package/types/org.d.ts

@@ -5,6 +5,7 @@ declare type TOrg = {
   contact: string;
   busInst: string;
   type: string;
+  defaultSite?: string;
   createdAt?: string;
   updatedAt?: string;
   status?: string;