Merge pull request #1177 from layer5io/leecalcote/user-invite-check

Add useGetUserByEmailQuery to GetStartedModal and InviteUserModal components

Author: leecalcote

src/custom/DashboardWidgets/GettingStartedWidget/GetStartedModal.tsx

@@ -75,6 +75,7 @@ interface GetStartedModalProps {
   useLazyGetTeamsQuery: any;
   embedDesignPath: string;
   isFromMeshery: boolean;
+  useGetUserByEmailQuery: any;
 }
 
 const Loading: React.FC<LoadingProps> = ({ showModal, handleClose, style }) => {
@@ -164,7 +165,8 @@ const GetStartedModal: React.FC<GetStartedModalProps> = ({
   isAssignUserRolesAllowed,
   useLazyGetTeamsQuery,
   embedDesignPath,
-  isFromMeshery
+  isFromMeshery,
+  useGetUserByEmailQuery
 }) => {
   const [openModal, setOpenModal] = useState<boolean>(false);
   const [clicked, setClicked] = useState<number | undefined>(undefined);
@@ -309,6 +311,7 @@ const GetStartedModal: React.FC<GetStartedModalProps> = ({
           useNotificationHandlers={useNotificationHandlers}
           isAssignUserRolesAllowed={isAssignUserRolesAllowed}
           useLazyGetTeamsQuery={useLazyGetTeamsQuery}
+          useGetUserByEmailQuery={useGetUserByEmailQuery}
         />
       )}
     </>

src/custom/DashboardWidgets/GettingStartedWidget/InviteUserModal.tsx

@@ -68,6 +68,7 @@ interface UserInviteModalProps {
   };
   isAssignUserRolesAllowed: boolean;
   useLazyGetTeamsQuery: any;
+  useGetUserByEmailQuery: any;
 }
 
 export default function UserInviteModal({
@@ -81,7 +82,8 @@ export default function UserInviteModal({
   useHandleUserInviteMutation,
   useNotificationHandlers,
   isAssignUserRolesAllowed,
-  useLazyGetTeamsQuery
+  useLazyGetTeamsQuery,
+  useGetUserByEmailQuery
 }: UserInviteModalProps) {
   const [inviteeFirstName, setInviteeFirstName] = useState<string>('');
   const [inviteeLastName, setInviteeLastName] = useState<string>('');
@@ -101,6 +103,13 @@ export default function UserInviteModal({
   const orgs = data?.organizations;
   const defaultOrgSelection = { id: 'none', name: 'None' };
   const [organization, setOrganization] = useState<Organization>(defaultOrgSelection);
+  
+  // Query to check if user exists by email
+  const { data: existingUserData } = useGetUserByEmailQuery(
+    { email: inviteeEmail },
+    { skip: !inviteeEmail || !EMAIL_REGEXP.test(inviteeEmail) }
+  );
+
   const { data: providerRolesData } = useGetUserOrgRolesQuery({
     orgId: currentOrgId,
     all: true,
@@ -180,6 +189,16 @@ export default function UserInviteModal({
       setErrorMessages((state) => ({ ...state, inviteeEmail: 'Email is invalid' }));
       isSuccess = false;
     }
+
+    // Check if user with this email already exists using GetUserByEmail
+    if (isSuccess && existingUserData) {
+      setErrorMessages((state) => ({
+        ...state,
+        inviteeEmail: 'A user with this email already exists'
+      }));
+      isSuccess = false;
+    }
+
     if (isSuccess) handleInvite();
   };