@7365admin1/layer-common 3.1.2-staging.36 → 3.1.2-staging.38

package/components/CameraMain.vue

@@ -28,7 +28,6 @@
             :items="items"
             fixed-header
             hide-default-footer
-            hide-default-header
             @click:row="handleRowClick"
             style="max-height: 300px"
           >
@@ -281,10 +280,10 @@ const prop = defineProps({
   headers: {
     type: Array as PropType<Array<any>>,
     default: () => [
-      { text: "Host", value: "host" },
-      { text: "Category", value: "category" },
-      { text: "Guard House", value: "guardPost" },
-      { text: "Actions", value: "action", sortable: false },
+      { title: "Host", key: "host" },
+      { title: "Category", key: "category" },
+      // { title: "Guard House", key: "guardPost" },
+      // { title: "Actions", key: "action", sortable: false },
     ],
   },
   readOnly: {
@@ -296,7 +295,7 @@ const prop = defineProps({
 const computedHeaders = computed(() => {
   if (prop.type === "ip") {
     const base = [...prop.headers];
-    base.splice(0, 0, { text: "Name", value: "name" });
+    base.splice(0, 0, { title: "Name", key: "name" });
     return base;
   }
   return prop.headers;

package/components/ServiceProviderMain.vue

@@ -734,7 +734,7 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAllByUserId } = useMember();
+const { getAll: getAllMembers, getAllByUserId } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
@@ -757,6 +757,9 @@ const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
+const { getByUserType } = useMember();
+const { getOrgs } = useOrg();
+const { getByEmail } = useServiceProvider();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
@@ -767,40 +770,54 @@ async function checkExistingAccount(email: string) {
   checkingExistingAccount.value = true;
 
   try {
+    // Check if user exists
     const user = await getUserByEmail(email);
 
 if (!user?._id) return;
 
-const members = await getAllByUserId(user._id);
+    // Check if this service provider already exists in current org/site
+    const serviceProviders = await getByEmail({
+  email,
+  orgId: props.orgId,
+  siteId: props.siteId,
+});
 
-const appMember = (members.items ?? []).find(
-  (member: any) => member.type === serviceProviderInvite.value.app
-);
+console.log("serviceProviders", serviceProviders);
 
-if (!appMember) {
-  existingAccount.value = null;
-  return;
-}
+    if (serviceProviders?.length) {
+      messageServiceProvider.value =
+        "This service provider already exists.";
+      return;
+    }
 
-if (
-  appMember.org === props.orgId &&
-  (appMember.siteId || "") === (props.siteId || "")
-) {
-  existingAccount.value = null;
-  messageServiceProvider.value =
-    "This user is already a member of this service provider.";
-  return;
-}
+    // Check existing memberships
+    const members = await getAllByUserId(user._id);
 
-existingAccount.value = {
-  _id: appMember.org,
-  text: appMember.orgName,
-  org: appMember.org,
-  orgName: appMember.orgName,
-  siteId: appMember.siteId,
-  siteName: appMember.siteName,
-};
+    const appMember = (members.items ?? []).find(
+      (member: any) => member.type === serviceProviderInvite.value.app
+    );
+
+    if (!appMember) return;
 
+    // Already belongs to the same org/site
+    if (
+      appMember.org === props.orgId &&
+      (appMember.siteId || "") === (props.siteId || "")
+    ) {
+      messageServiceProvider.value =
+        "This user is already a member of this service provider.";
+      return;
+    }
+
+    // Existing account in another org/site
+    existingAccount.value = {
+      _id: appMember.org,
+      text: appMember.orgName,
+      org: appMember.org,
+      orgName: appMember.orgName,
+      siteId: appMember.siteId,
+      siteName: appMember.siteName,
+    };
   } catch (error) {
     existingAccount.value = null;
   } finally {

package/composables/useServiceProvider.ts

@@ -236,6 +236,26 @@ export default function useServiceProvider() {
     );
   }
 
+   async function getByEmail({
+    email = "",
+    orgId = "",
+    siteId = "",
+    serviceProviderOrgId = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/service-providers/email",
+      {
+        method: "GET",
+        query: {
+          email,
+          ...(orgId ? { orgId } : {}),
+          ...(siteId ? { siteId } : {}),
+          ...(serviceProviderOrgId ? { serviceProviderOrgId } : {}),
+        },
+      }
+    );
+  }
+
   return {
     serviceProviders,
     serviceProvider,
@@ -254,5 +274,6 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
+    getByEmail,
   };
 }

package/package.json

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