@7365admin1/layer-common 3.0.13 → 3.0.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 3.0.15
+
+### Patch Changes
+
+- ddf32e8: Update Layer-common version
+
+## 3.0.14
+
+### Patch Changes
+
+- 47d94a5: update service provider flow
+
 ## 3.0.13
 
 ### Patch Changes

package/components/BuildingManagement/buildings.vue

@@ -15,6 +15,8 @@
             <v-btn fab icon density="comfortable" @click="getBuildings()">
               <v-icon>mdi-refresh</v-icon>
             </v-btn>
+            <v-text-field v-model="searchInput" autocomplete="off" placeholder="Search" density="compact" hide-details dense clearable
+              class="mx-2" style="width: 200px;" />
           </template>
 
           <template #append>
@@ -219,9 +221,11 @@ const props = defineProps({
 const site = (useRoute().params.site as string) ?? "";
 const status = (useRoute().params.status as string) ?? "active";
 
-const { headerSearch } = useLocal();
+const { debounce } = useUtils();
 const { getAll: _getBuildings, deleteById } = useBuilding();
 
+const searchInput = ref("");
+const headerSearch = ref("");
 const page = ref(1);
 const pages = ref(0);
 const pageRange = ref("-- - -- of --");
@@ -252,6 +256,15 @@ const {
 
 const loading = computed(() => getBuildingReqStatus.value === "pending");
 
+const debounceSearch = debounce(() => {
+  headerSearch.value = searchInput.value?.trim() || "";
+  page.value = 1;
+}, 500);
+
+watch(searchInput, () => {
+  debounceSearch();
+});
+
 watchEffect(() => {
   if (getBuildingReq.value) {
     items.value = getBuildingReq.value.items;

package/components/BuildingManagement/units.vue

@@ -15,6 +15,8 @@
             <v-btn fab icon density="comfortable" @click="getBuildingUnit()">
               <v-icon>mdi-refresh</v-icon>
             </v-btn>
+            <v-text-field v-model="searchInput" placeholder="Search" density="compact" hide-details dense clearable
+              class="mx-2" style="width: 200px;" />
           </template>
 
           <template #append>
@@ -156,12 +158,12 @@ const status = (useRoute().params.status as string) ?? "active";
 
 const { smAndUp } = useDisplay();
 
-const { toOrdinal } = useUtils();
+const { debounce, formatDateDDMMYYYYLocal, toOrdinal } = useUtils();
 
-const { headerSearch } = useLocal();
 const { getAll, deleteById } = useBuildingUnit();
-const { formatDateDDMMYYYYLocal } = useUtils();
 
+const searchInput = ref("");
+const headerSearch = ref("");
 const page = ref(1);
 const pages = ref(0);
 const pageRange = ref("-- - -- of --");
@@ -192,6 +194,15 @@ const {
 
 const loading = computed(() => getBuildingReqStatus.value === "pending");
 
+const debounceSearch = debounce(() => {
+  headerSearch.value = searchInput.value?.trim() || "";
+  page.value = 1;
+}, 500);
+
+watch(searchInput, () => {
+  debounceSearch();
+});
+
 watchEffect(() => {
   if (getBuildingReq.value) {
     items.value = getBuildingReq.value.items;

package/components/DashboardMain.vue

@@ -653,7 +653,15 @@
                 <button
                   class="figma-row-action"
                   type="button"
-                  @click="navigateTo(dashboardPath('incident-reports'))"
+                  @click="
+                    navigateTo(
+                      item.type === 'facility-booking'
+                        ? `${dashboardPath('facility/bookings')}?booking=${
+                            item.id
+                          }`
+                        : dashboardPath(`incident-reports/${item.id}`)
+                    )
+                  "
                 >
                   {{ item.actionLabel || "Review" }}
                 </button>
@@ -1146,6 +1154,8 @@ type DashboardListItem = {
   tone?: string;
   color?: string;
   actionLabel?: string;
+  type?: string;
+  raw?: Record<string, any>;
 };
 
 type TaskItem = {
@@ -1236,21 +1246,36 @@ function canViewWidget(key: string) {
 
   const widgetToModulePermissionMap: Record<string, string[]> = {
     workOrders: ["work-orders:see-all-work-orders"],
-    incidents: ["incident-reports:see-incident-reports", "incident-reports:see-all-incident-reports"],
+    incidents: [
+      "incident-reports:see-incident-reports",
+      "incident-reports:see-all-incident-reports",
+    ],
     visitors: ["visitor:see-all-visitor"],
     facilityBookings: ["facility-booking:see-all-facility-booking"],
-    patrolCompliance: ["virtual-patrol:see-all-virtual-patrol-logs", "virtual-patrol:see-all-virtual-patrol-route"],
+    patrolCompliance: [
+      "virtual-patrol:see-all-virtual-patrol-logs",
+      "virtual-patrol:see-all-virtual-patrol-route",
+    ],
     staffStatus: ["attendance:see-all-attendance"],
     attendance: ["attendance:see-all-attendance"],
     feedbacks: ["feedbacks:see-all-feedbacks"],
-    upcomingEvents: ["bulletin-boards:see-all-bulletin-boards", "bulletin-board:see-all-bulletin-board"],
+    upcomingEvents: [
+      "bulletin-boards:see-all-bulletin-boards",
+      "bulletin-board:see-all-bulletin-board",
+    ],
     workOrderStatus: ["work-orders:see-all-work-orders"],
-    activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs", "virtual-patrol:see-all-virtual-patrol-route"],
-    taskSchedule: ["cleaning-schedule-mgmt:see-all-schedules"]
+    activePatrol: [
+      "virtual-patrol:see-all-virtual-patrol-logs",
+      "virtual-patrol:see-all-virtual-patrol-route",
+    ],
+    taskSchedule: ["cleaning-schedule-mgmt:see-all-schedules"],
   };
 
   const modulePerms = widgetToModulePermissionMap[key];
-  if (modulePerms && modulePerms.some(p => userAppRole.value.permissions?.includes(p))) {
+  if (
+    modulePerms &&
+    modulePerms.some((p) => userAppRole.value.permissions?.includes(p))
+  ) {
     return true;
   }
 
@@ -2034,23 +2059,26 @@ function computeFacilityMetric(): DashboardMetric {
     ).toLowerCase();
     return val === selected.toLowerCase();
   });
+  const ongoing = items.filter((i: any) => {
+    const s = String(i.status || "").toLowerCase();
+    return (
+      s.includes("ongoing") ||
+      s.includes("approved") ||
+      s.includes("in-progress")
+    );
+  }).length;
+  const waitingApproval = items.filter((i: any) => {
+    const s = String(i.status || "").toLowerCase();
+    return (
+      s.includes("pending") || s.includes("review") || s.includes("approval")
+    );
+  }).length;
+
   return {
     ...metric,
-    count: items.length,
-    ongoing: items.filter((i: any) => {
-      const s = String(i.status || "").toLowerCase();
-      return (
-        s.includes("ongoing") ||
-        s.includes("approved") ||
-        s.includes("in-progress")
-      );
-    }).length,
-    waitingApproval: items.filter((i: any) => {
-      const s = String(i.status || "").toLowerCase();
-      return (
-        s.includes("pending") || s.includes("review") || s.includes("approval")
-      );
-    }).length,
+    count: ongoing + waitingApproval,
+    ongoing,
+    waitingApproval,
   };
 }
 
@@ -2413,7 +2441,9 @@ function getMetricMeta(metric: DashboardMetric) {
     parts.push(`${formatNumber(toNumber(metric.ongoing))} ongoing`);
   if (typeof metric.waitingApproval !== "undefined")
     parts.push(
-      `${formatNumber(toNumber(metric.waitingApproval))} waiting approval`
+      `${formatNumber(toNumber(metric.waitingApproval))} ${
+        isPropertyMode.value ? "for approval" : "waiting approval"
+      }`
     );
   if (typeof metric.lowStock !== "undefined")
     parts.push(`${formatNumber(toNumber(metric.lowStock))} low stock`);
@@ -2446,6 +2476,10 @@ function getFilteredVisitorMetric(): DashboardMetric {
     };
   }
 
+  if (!items || !items.length) {
+    return metric;
+  }
+
   const filtered = items.filter(
     (item: any) => getVisitorFilterValue(item) === selected
   );
@@ -2487,6 +2521,8 @@ function normalizeListItems(keys: string[]): DashboardListItem[] {
     icon: item.icon || getListIcon(context),
     tone: item.tone,
     actionLabel: item.actionLabel,
+    type: item.type,
+    raw: item,
   }));
 }
 
@@ -2865,16 +2901,26 @@ function dashboardPath(path: string) {
   return `/${props.orgId}/${props.site}/${path}`;
 }
 
+function getSchedulePath() {
+  const service = props.serviceType;
+  if (service === "cleaning_services") return "cleaning-schedule";
+  if (service === "landscaping_services") return "landscape-schedule";
+  if (service === "pest_control_services") return "pest-schedule";
+  if (service === "pool_maintenance_services") return "pool-schedule";
+  if (service === "mechanical_electrical_services") return "technician-schedule";
+  return "schedule-task";
+}
+
 function goToDashboardRoute(routeKey: string) {
   if (!props.orgId || !props.site) return;
   const pathMap: Record<string, string> = {
     attendance: "attendance",
     feedbacks: "feedbacks",
-    scheduleTask: "schedule-task",
+    scheduleTask: getSchedulePath(),
     virtualPatrol: "virtual-patrol/logs",
     manpower: "manpower-monitoring/attendance",
     incidentReports: "incident-reports",
-    "virtual-patrol": "virtual-patrol",
+    "virtual-patrol": "virtual-patrol/logs",
     "work-orders": "work-orders",
     "event-mgmt": "event-mgmt",
     calendar: "calendar",
@@ -2896,10 +2942,15 @@ function goToListItem(item: TaskItem | FeedbackItem, routeKey: string) {
   }
   const pathMap: Record<string, string> = {
     feedbacks: "feedbacks",
-    scheduleTask: "schedule-task",
+    scheduleTask: getSchedulePath(),
   };
   const path = pathMap[routeKey] || routeKey;
-  router.push(`/${props.orgId}/${props.site}/${path}/${id}`);
+  const scheduleId = item.raw?.schedule?._id || item.raw?.schedule;
+  if (routeKey === "scheduleTask" && scheduleId) {
+    router.push(`/${props.orgId}/${props.site}/${path}/${scheduleId}/${id}`);
+  } else {
+    router.push(`/${props.orgId}/${props.site}/${path}/${id}`);
+  }
 }
 
 // ─── Widget Management ────────────────────────────────────────────────────────

package/components/ServiceProviderMain.vue

@@ -319,7 +319,7 @@
                     v-model="serviceProvider.type"
                     item-title="title"
                     item-value="value"
-                    :items="natureOfBusiness"
+                    :items="natureOfBusinessV3"
                     density="comfortable"
                     :rules="[requiredRule]"
                   ></v-select>
@@ -402,7 +402,7 @@
               variant="flat"
               color="black"
               class="text-none"
-              size="large"
+              size="small"
               :disabled="!validServiceProvider"
               :loading="disableServiceProvider"
               @click="submitServiceProviderAdd"
@@ -415,39 +415,68 @@
     </v-card>
   </v-dialog>
 
-  <v-dialog v-model="createInviteDialog" width="680" persistent>
-    <v-card width="100%" rounded="lg" class="sp-invite-card">
-      <v-toolbar flat color="grey-lighten-4" height="76">
-        <v-row no-gutters class="fill-height px-6" align="center">
-          <span class="font-weight-bold text-h5">
-            Invite Service Provider
-          </span>
-        </v-row>
-      </v-toolbar>
-      <v-card-text class="sp-invite-body">
-        <v-form
-          v-model="validServiceProvider"
-          :disabled="disableServiceProvider"
-        >
-          <v-row no-gutters>
-            <v-col cols="12">
-              <v-row no-gutters>
-                <InputLabel class="text-capitalize" title="Email" required />
-                <v-col cols="12">
-                  <v-text-field
-                    v-model="serviceProviderInvite.email"
-                    variant="outlined"
-                    density="comfortable"
-                    :rules="[requiredRule, emailRule]"
-                  ></v-text-field>
-                </v-col>
-              </v-row>
-            </v-col>
+ <v-dialog v-model="createInviteDialog" width="580" persistent>
+  <v-card width="100%" rounded="lg" class="sp-invite-card">
+    <v-toolbar flat color="grey-lighten-4" height="76">
+      <v-row no-gutters class="fill-height px-6" align="center">
+        <span class="font-weight-bold text-h5">
+          Invite Service Provider
+        </span>
+      </v-row>
+    </v-toolbar>
 
-            <v-col cols="12">
-              <v-divider class="mb-6" />
-            </v-col>
+    <v-card-text class="sp-invite-body">
+      <v-form
+        v-model="validServiceProvider"
+        :disabled="disableServiceProvider"
+      >
+        <v-row no-gutters>
+          <!-- Email -->
+          <v-col cols="12">
+            <v-row no-gutters>
+              <InputLabel class="text-capitalize" title="Email" required />
+              <v-col cols="12">
+                <v-text-field
+                  v-model="serviceProviderInvite.email"
+                  variant="outlined"
+                  density="comfortable"
+                  :rules="[requiredRule, emailRule]"
+                ></v-text-field>
+              </v-col>
+            </v-row>
+          </v-col>
 
+          <!-- Existing account block -->
+          <v-col cols="12" v-if="existingAccount">
+            <v-divider class="mb-6" />
+
+            <div class="sp-existing-title">Existing Account Verified</div>
+
+            <div class="sp-existing-copy">
+              {{ serviceProviderInvite.email }} is already onboarded.
+              Sending this invite will add this site to the list of
+              locations this company manages.
+            </div>
+
+            <v-row no-gutters>
+              <InputLabel title="Organization" />
+              <v-col cols="12">
+                <v-text-field
+                  :model-value="existingAccount.text"
+                  readonly
+                  variant="outlined"
+                  density="comfortable"
+                />
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-divider class="mb-6" />
+          </v-col>
+
+          <!-- App & Site: only shown when no existing account is verified -->
+          <template v-if="!existingAccount">
             <v-col cols="12">
               <v-row no-gutters>
                 <InputLabel class="text-capitalize" title="App" required />
@@ -460,7 +489,6 @@
                     variant="outlined"
                     density="comfortable"
                     :rules="[requiredRule]"
-                    @update:model-value="loadInviteRoles"
                   ></v-select>
                 </v-col>
               </v-row>
@@ -483,79 +511,64 @@
                 </v-col>
               </v-row>
             </v-col>
+          </template>
 
-            <v-col cols="12">
-              <v-row no-gutters>
-                <InputLabel class="text-capitalize" title="Role" required />
-                <v-col cols="12">
-                  <v-select
-                    v-model="serviceProviderInvite.role"
-                    :items="serviceProviderInviteRoles"
-                    item-title="name"
-                    item-value="_id"
-                    variant="outlined"
-                    density="comfortable"
-                    :loading="loadingInviteRoles"
-                    :rules="[requiredRule]"
-                  ></v-select>
-                </v-col>
-              </v-row>
-            </v-col>
-
-            <v-col cols="12" class="my-2">
-              <v-row no-gutters>
-                <v-col cols="12" class="text-center">
-                  <span
-                    class="text-none text-subtitle-2 font-weight-medium text-error"
-                  >
-                    {{ messageServiceProvider }}
-                  </span>
-                </v-col>
-              </v-row>
-            </v-col>
-          </v-row>
-        </v-form>
-      </v-card-text>
-
-      <v-toolbar flat height="76" class="sp-invite-footer">
-        <v-row no-gutters class="fill-height">
-          <v-col cols="6" class="fill-height">
-            <v-btn
-              block
-              variant="flat"
-              class="text-none sp-invite-footer-btn"
-              height="76"
-              @click="setServiceProvider({ mode: 'invite', dialog: false })"
-            >
-              Cancel
-            </v-btn>
-          </v-col>
-
-          <v-col cols="6" class="fill-height">
-            <v-btn
-              block
-              variant="flat"
-              class="text-none sp-invite-submit-btn"
-              height="76"
-              :disabled="!validServiceProvider"
-              :loading="disableServiceProvider"
-              @click="submitServiceProviderInvite()"
-            >
-              Submit
-            </v-btn>
+          <!-- Error message -->
+          <v-col cols="12" class="my-2">
+            <v-row no-gutters>
+              <v-col cols="12" class="text-center">
+                <span
+                  class="text-none text-subtitle-2 font-weight-medium text-error"
+                >
+                  {{ messageServiceProvider }}
+                </span>
+              </v-col>
+            </v-row>
           </v-col>
         </v-row>
-      </v-toolbar>
-    </v-card>
-  </v-dialog>
+      </v-form>
+    </v-card-text>
+
+    <v-toolbar flat height="76" class="sp-invite-footer">
+      <v-row no-gutters class="fill-height">
+        <v-col cols="6" class="fill-height">
+          <v-btn
+            block
+            variant="flat"
+            class="text-none sp-invite-footer-btn"
+            height="76"
+            @click="setServiceProvider({ mode: 'invite', dialog: false })"
+          >
+            Back
+          </v-btn>
+        </v-col>
+
+        <v-col cols="6" class="fill-height">
+          <v-btn
+            block
+            variant="flat"
+            class="text-none sp-invite-submit-btn"
+            height="76"
+            :disabled="!validServiceProvider"
+            :loading="disableServiceProvider"
+            @click="submitServiceProviderInvite()"
+          >
+            Submit
+          </v-btn>
+        </v-col>
+      </v-row>
+    </v-toolbar>
+  </v-card>
+</v-dialog>
 
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
 </template>
 
 <script lang="ts" setup>
 import useServiceProvider from "../composables/useServiceProvider";
+import useUser from "../composables/useUser";
 import useVerification from "../composables/useVerification";
-import useRole from "../composables/useRole";
+// import useRole from "../composables/useRole";
 import { errorConverter } from "../utils/data";
 
 type ListTab = "active" | "pending" | "inactive";
@@ -674,8 +687,9 @@ const headers = [
   },
 ];
 
-const { natureOfBusiness } = useLocal();
+const { natureOfBusinessV3 } = useLocal();
 const { requiredRule, emailRule, debounce } = useUtils();
+const {getUserByEmail} = useUser()
 
 const listTab = ref<ListTab>("active");
 const page = ref(1);
@@ -705,13 +719,12 @@ const serviceProvider = ref({
   orgName: "",
   category: "",
 });
-const defaultInviteApp = "property_management_agency";
+const defaultInviteApp = "security_agency";
 const serviceProviderInvite = ref({
   email: "",
   app: defaultInviteApp,
   siteId: props.siteId,
   siteName: props.siteName,
-  role: "",
 });
 
 const {
@@ -722,8 +735,14 @@ const {
 } = useServiceProvider();
 const { getAll: getAllMembers } = useMember();
 
-const { getVerifications, cancelUserInvitation } = useVerification();
-const { getRoles } = useRole();
+const { getVerifications, cancelUserInvitation, getVerificationByEmail } = useVerification();
+const {
+  getOrgsByMembership,
+} = useMember();
+
+const existingAccount = ref<any>(null);
+const checkingExistingAccount = ref(false);
+// const { getRoles } = useRole();
 
 const { getSiteById } = useSite();
 
@@ -736,11 +755,53 @@ const searchText = ref("");
 
 const createDialog = ref(false);
 const createInviteDialog = ref(false);
-const loadingInviteRoles = ref(false);
-const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
+// const loadingInviteRoles = ref(false);
+// const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
+
+const { getByUserType } = useMember();
+
+async function checkExistingAccount(email: string) {
+  // existingAccount.value = null;
+
+  if (!email.trim() || emailRule(email) !== true) return;
+
+  checkingExistingAccount.value = true;
+
+  try {
+    const user = await getUserByEmail(email);
+
+    if (!user?._id) return;
+
+const member = await getByUserType(user._id, "organization");
+    console.log("member raw:", member);
+    console.log("onboardingCompleted:", member?.onboardingCompleted);
+
+    if (member?.onboardingCompleted) {
+      existingAccount.value = {
+        _id: member.org,
+        text: member.orgName,
+        ...member,
+      };
+    }
+  } catch (error) {
+    console.error(error);
+    existingAccount.value = null;
+  } finally {
+    checkingExistingAccount.value = false;
+  }
+}
+
+
+watch(
+  () => serviceProviderInvite.value.email,
+  async (value) => {
+    console.log("typing:", value);
+    await checkExistingAccount(value);
+  }
+);
 
 const serviceProviderInviteApps = computed(() =>
-  natureOfBusiness.map((item) => ({
+  natureOfBusinessV3.map((item) => ({
     ...item,
     title:
       item.value === "cleaning_services"
@@ -801,7 +862,7 @@ function rowActionLabel(row: TableRow) {
 
 function typeDisplay(type: string, nature?: string) {
   if (nature && String(nature).trim()) return String(nature);
-  const list = natureOfBusiness.value as Array<{ title?: string; value?: string }>;
+  const list = natureOfBusinessV3.value as Array<{ title?: string; value?: string }>;
   const hit = list?.find((x) => x.value === type);
   return hit?.title ?? type ?? "-";
 }
@@ -822,25 +883,25 @@ function statusChipColor(statusLabel: string) {
   return "primary";
 }
 
-async function loadInviteRoles() {
-  loadingInviteRoles.value = true;
-  serviceProviderInvite.value.role = "";
-  try {
-    const response = await getRoles({
-      org: props.orgId,
-      type: serviceProviderInvite.value.app,
-      limit: 50,
-    });
-    serviceProviderInviteRoles.value = response?.items ?? [];
-    serviceProviderInvite.value.role =
-      serviceProviderInviteRoles.value[0]?._id ?? "";
-  } catch (error: any) {
-    serviceProviderInviteRoles.value = [];
-    showMessage(errorConverter(error), "error");
-  } finally {
-    loadingInviteRoles.value = false;
-  }
-}
+// async function loadInviteRoles() {
+//   loadingInviteRoles.value = true;
+//   serviceProviderInvite.value.role = "";
+//   try {
+//     const response = await getRoles({
+//       org: props.orgId,
+//       type: serviceProviderInvite.value.app,
+//       limit: 50,
+//     });
+//     serviceProviderInviteRoles.value = response?.items ?? [];
+//     serviceProviderInvite.value.role =
+//       serviceProviderInviteRoles.value[0]?._id ?? "";
+//   } catch (error: any) {
+//     serviceProviderInviteRoles.value = [];
+//     showMessage(errorConverter(error), "error");
+//   } finally {
+//     loadingInviteRoles.value = false;
+//   }
+// }
 
 function setInviteSiteName(siteId: string) {
   const selectedSite = serviceProviderInviteSites.value.find(
@@ -1067,37 +1128,38 @@ function setServiceProvider({
     createDialog.value = dialog;
   }
 
-  if (dialog) {
-    serviceProvider.value = {
-      name: "",
-      type: "",
+ if (dialog) {
+  serviceProvider.value = {
+    name: "",
+    type: "",
+    email: "",
+    description: "",
+    orgId: props.orgId,
+    siteId: props.siteId,
+    siteName: site.value?.name ?? "",
+    orgName: "Org Name",
+    category: mode === "add" ? "internal" : "external",
+  };
+
+  if (mode === "invite") {
+    existingAccount.value = null;
+
+    serviceProviderInvite.value = {
       email: "",
-      description: "",
-      orgId: props.orgId,
+      app: defaultInviteApp,
       siteId: props.siteId,
-      siteName: site.value?.name ?? "",
-      orgName: "Org Name",
-      category: mode === "add" ? "internal" : "external",
+      siteName: site.value?.name || props.siteName,
     };
-
-    if (mode === "invite") {
-      serviceProviderInvite.value = {
-        email: "",
-        app: defaultInviteApp,
-        siteId: props.siteId,
-        siteName: site.value?.name || props.siteName,
-        role: "",
-      };
-      createMoreServiceProvider.value = false;
-      void loadInviteRoles();
-    }
-    return;
   }
 
-  serviceProvider.value.description = data.description ?? "";
-  serviceProvider.value.email = data.email ?? "";
-  serviceProvider.value.name = data.name ?? "";
-  serviceProvider.value.type = data.type ?? "";
+  createMoreServiceProvider.value = false;
+  return;
+}
+
+serviceProvider.value.description = data.description ?? "";
+serviceProvider.value.email = data.email ?? "";
+serviceProvider.value.name = data.name ?? "";
+serviceProvider.value.type = data.type ?? "";
 }
 
 async function submitServiceProviderAdd() {
@@ -1130,7 +1192,6 @@ async function submitServiceProviderInvite() {
       email: serviceProviderInvite.value.email.trim(),
       name: "",
       app: serviceProviderInvite.value.app,
-      role: serviceProviderInvite.value.role,
       orgId: props.orgId,
       siteId: serviceProviderInvite.value.siteId,
       siteName:
@@ -1318,4 +1379,17 @@ async function submitServiceProviderInvite() {
   font-size: 1.5rem;
   font-weight: 700;
 }
+.sp-existing-title {
+  font-size: 1.125rem;
+  font-weight: 700;
+  color: #101828;
+  margin-bottom: 16px;
+}
+
+.sp-existing-copy {
+  font-size: 1rem;
+  color: #344054;
+  line-height: 1.5;
+  margin-bottom: 24px;
+}
 </style>

package/components/SiteSettings.vue

@@ -206,7 +206,7 @@ const { canManageSiteInformation,
 const { getSiteById, updateSitebyId, updateSiteInformation } =
   useSiteSettings();
 const { requiredRule } = useUtils();
-const { getFileUrl } = useFile();
+const { getFileUrl, getFileById } = useFile();
 
 const blocks = ref(0);
 const guardPosts = ref(0);
@@ -229,6 +229,23 @@ const siteDocuments = ref<string[]>([]);
 const siteDocumentsNames = ref<Record<string, string>>({});
 const savingSiteInfo = ref<boolean>(false);
 
+watch(
+  siteDocuments,
+  async (ids) => {
+    for (const id of ids) {
+      if (!siteDocumentsNames.value[id]) {
+        try {
+          const file = (await getFileById(id)) as any;
+          siteDocumentsNames.value[id] = file?.data?.name ?? file?.name ?? "";
+        } catch {
+          siteDocumentsNames.value[id] = "";
+        }
+      }
+    }
+  },
+  { deep: true }
+);
+
 const coverPhotoUrl = computed(() =>
   coverPhoto.value.length > 0 ? getFileUrl(coverPhoto.value[0]) : ""
 );

package/composables/useLocal.ts

@@ -65,6 +65,17 @@ export default function useLocal() {
     { title: "Pest Control Services", value: "pest_control_services" },
     { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
   ];
+  const natureOfBusinessV3 = [
+    { title: "Security", value: "security_agency" },
+    { title: "Cleaning", value: "cleaning_services" },
+    {
+      title: "Mechanical & Electrical ",
+      value: "mechanical_electrical_services",
+    },
+    { title: "Landscaping", value: "landscaping_services" },
+    { title: "Pest Control", value: "pest_control_services" },
+    { title: "Pool Maintenance", value: "pool_maintenance_services" },
+  ];
 
 
   const landingPage = useCookie("landing-page", cookieConfig);
@@ -143,6 +154,7 @@ export default function useLocal() {
     headerSearch,
     natureOfBusiness,
     natureOfBusinessV2,
+    natureOfBusinessV3,
     landingPage,
     subjects,
   };

package/package.json

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