Merge pull request #654 from AkshataKatwal16/reassign-cohorts

Issue #0000 feat: Avoid multiple calls for suggestionAPI
tekdi · Jan 29, 2025 · 5d600e9 · 5d600e9
2 parents 09bee26 + d3d273d
commit 5d600e9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/src/components/AddLeanerModal.tsx b/src/components/AddLeanerModal.tsx
@@ -271,7 +271,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
               sendEmail(
                 creatorName,
                 apiBody['username'],
-                password,
+                apiBody['username'],
                 userEmail,
                 apiBody['firstName']
               );

diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -65,6 +65,8 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   };
   const { t } = useTranslation();
   const [suggestions, setSuggestions] = useState<string[]>([]);
+  const [isGetUserName, setIsGetUserName] = useState<boolean>(false);
+
 
   const submittedButtonStatus = useSubmittedButtonStore(
     (state: any) => state.submittedButtonStatus
@@ -274,34 +276,35 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
       return error;
     });
   }
-  const validateUsername = async (userData: { firstName: string; lastName: string; username: string }) => {
+  const validateUsername = async (userData: {
+    firstName: string;
+    lastName: string;
+    username: string;
+  }) => {
     try {
-      const response = await userNameExist(userData);
-      setSuggestions([response?.suggestedUsername]);
+      console.log('suggestions.length', suggestions.length);
+      if (suggestions.length === 0) {
+        const response = await userNameExist(userData);
+        setSuggestions([response?.suggestedUsername]);
+        setIsGetUserName(false);
+      }
     } catch (error) {
       setSuggestions([]);
+      setIsGetUserName(true);
       console.error('Error validating username:', error);
     }
   };
   const handleChange= async(event: any)=> {
     const sanitizedData = sanitizeFormData(event.formData);
-    if(formData?.username && formData?.firstName && formData?.lastName && formData?.username!== event.formData?.username) 
-    {
-      const userData = {
-        firstName: formData?.firstName,
-        lastName: formData?.lastName,
-        username: event.formData?.username,
-      }
-      //         const response = await userNameExist(userData);
-      // setSuggestions([response?.suggestedUsername]);
-      await validateUsername(userData);
-
+    if (event.formData?.username !== formData?.username && formData?.username) {
+      setIsGetUserName(false);
+      setSuggestions([]);
     }
     onChange({ ...event, formData: sanitizedData });
   }
   const handleUsernameBlur = async (username: string) => {
 
-    if (username && formData?.firstName && formData?.lastName) {
+    if (username && formData?.firstName && formData?.lastName &&  !isGetUserName  ) {
       const userData = {
         firstName: formData?.firstName,
         lastName: formData?.lastName,
@@ -311,7 +314,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
     }
   };
   const handleFirstLastNameBlur = async (lastName: string) => {
-    if (lastName && !isEdit) {
+    if (lastName && !isEdit && !isGetUserName) {
       try {
         console.log('Username onblur called' ,formData);
         if(formData?.firstName && formData?.lastName){
@@ -343,6 +346,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
         ...prev,
         username: selectedUsername,
       }));
+      setIsGetUserName(true)
     setSuggestions([]);
   };