@7365admin1/layer-common 3.0.31-staging.16 → 3.0.31-staging.17

package/components/ServiceProviderMain.vue

@@ -548,7 +548,7 @@
               variant="flat"
               class="text-none sp-invite-submit-btn"
               height="76"
-              :disabled="!validServiceProvider"
+              :disabled="!canSubmitInvite"
               :loading="disableServiceProvider"
               @click="submitServiceProviderInvite()"
             >
@@ -574,6 +574,7 @@ type ListTab = "active" | "pending" | "inactive";
 
 type TableRow = {
   _id: string;
+  userId: string;
   serviceProviderOrgId: string;
   companyName: string;
   email: string;
@@ -733,11 +734,10 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAll: getAllMembers } = useMember();
+const { getAllByUserId } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
-const { getOrgsByMembership } = useMember();
 
 const existingAccount = ref<any>(null);
 const checkingExistingAccount = ref(false);
@@ -757,11 +757,10 @@ const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
-const { getByUserType } = useMember();
-const { getOrgs } = useOrg();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
+  messageServiceProvider.value = "";
 
   if (!email.trim() || emailRule(email) !== true) return;
 
@@ -770,30 +769,50 @@ async function checkExistingAccount(email: string) {
   try {
     const user = await getUserByEmail(email);
 
-    if (!user?._id) return;
+if (!user?._id) return;
 
-    const orgs = await getOrgs({
-      user: user._id,
-    });
+const members = await getAllByUserId(user._id);
 
-    const matchedOrg = orgs.items?.find(
-      (org: any) => org.type === serviceProviderInvite.value.app
-    );
+const appMember = (members.items ?? []).find(
+  (member: any) => member.type === serviceProviderInvite.value.app
+);
+
+if (!appMember) {
+  existingAccount.value = null;
+  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;
+}
+
+existingAccount.value = {
+  _id: appMember.org,
+  text: appMember.orgName,
+  org: appMember.org,
+  orgName: appMember.orgName,
+  siteId: appMember.siteId,
+  siteName: appMember.siteName,
+};
 
-    if (matchedOrg) {
-      existingAccount.value = {
-        _id: matchedOrg.value,
-        text: matchedOrg.text,
-        ...matchedOrg,
-      };
-    }
   } catch (error) {
     existingAccount.value = null;
   } finally {
     checkingExistingAccount.value = false;
   }
 }
-
+const canSubmitInvite = computed(() => {
+  return (
+    validServiceProvider.value &&
+    !messageServiceProvider.value
+  );
+});
 watch(
   () => serviceProviderInvite.value.email,
   async (value) => {
@@ -939,6 +958,7 @@ function formatEmailCell(value: unknown): string {
 function mapProviderRows(raw: Record<string, any>[]): TableRow[] {
   return raw.map((row) => ({
     _id: String(row._id ?? ""),
+    userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.serviceProviderOrgId ?? ""),
     companyName: row.name ?? "-",
     email: formatEmailCell(row.email),
@@ -961,6 +981,7 @@ function inviteTypeLabel(t: string) {
 function mapInviteRows(raw: Record<string, any>[]): TableRow[] {
   return raw.map((row) => ({
     _id: String(row._id ?? ""),
+    userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.metadata?.serviceProviderOrgId ?? ""),
     companyName: row.metadata?.name || "-",
     email: formatEmailCell(row.email),
@@ -1029,16 +1050,12 @@ async function openView(row: TableRow) {
 
   loadingMembers.value = true;
   try {
-    const data = await getAllMembers({
-      page: 1,
-      limit: 1000,
-      org: row.serviceProviderOrgId,
-      status: "active",
-    });
+    const data = await getAllByUserId(row.userId);
+
     serviceProviderMembers.value = (data.items ?? []).map((member: any) => ({
-      _id: String(member._id ?? ""),
-      name: member.name || member.fullName || member.email || "-",
-      role: member.roleName || member.role?.name || "-",
+      _id: member._id,
+      name: member.name || "-",
+      role: member.role || "-",
     }));
   } catch (error: any) {
     showMessage(errorConverter(error), "error");

package/package.json

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