Merge pull request #136 from AkshataKatwal16/admin

Issue feat: add chanages for create user upon click on send credential button
tekdi · Aug 14, 2024 · 3ea3891 · 3ea3891
2 parents a6b5c02 + fddbbc5
commit 3ea3891
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/components/CommonUserModal.tsx b/src/components/CommonUserModal.tsx
@@ -65,6 +65,9 @@ const CommonUserModal: React.FC<UserModalProps> = ({
   const setSubmittedButtonStatus = useSubmittedButtonStore(
     (state: any) => state.setSubmittedButtonStatus
   );
+  const noError = useSubmittedButtonStore(
+    (state: any) => state.noError);
+
   const  userEnteredEmail = useSubmittedButtonStore(
     (state: any) => state.userEnteredEmail
   );
@@ -457,11 +460,16 @@ const CommonUserModal: React.FC<UserModalProps> = ({
             onClick={() => { 
 
               setSubmittedButtonStatus(true);
-              if(userType!==FormContextType.STUDENT && !isEditModal && submittedButtonStatus)
-              {
-                setOpenModal(true)
-
-              }
+              // if (userType !== FormContextType.STUDENT && !isEditModal && noError) {
+              //   setOpenModal(true);
+              // }
+              // console.log(submittedButtonStatus)
+              setTimeout(() => {
+                console.log(noError)
+                if (userType !== FormContextType.STUDENT && !isEditModal && noError) {
+                  setOpenModal(true);
+                }
+              }, 100); 
               console.log("Submit button was clicked");
             }}
           >

diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -54,6 +54,9 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   const setUserEnteredEmail = useSubmittedButtonStore(
     (state: any) => state.setUserEnteredEmail
   );
+  const setNoError= useSubmittedButtonStore(
+    (state: any) => state.setNoError
+  );
 
   const widgets: any = {
     MultiSelectDropdown: MultiSelectDropdown,
@@ -62,6 +65,10 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   };
 
   const handleError = (errors: any) => {
+    if (errors.length === 0) {
+    console.log("No errors");
+    // You can perform any additional action here when there are no errors
+  }
     console.log("handle error1");
     if (errors.length > 0) {
       const property = errors[0].property?.replace(/^root\./, "");
@@ -115,6 +122,8 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
 
   const transformErrors = (errors: any) => {
     console.log("errors", errors);
+    errors.length===0? setNoError(true):  setNoError(false)
+
     console.log("schema", schema);
 
     return errors?.map((error: any) => {
@@ -231,7 +240,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
     });
   };
   useEffect(() => {
-    setSubmittedButtonStatus(false);
+   // setSubmittedButtonStatus(false);
   }, []);
   return (
     <div>

diff --git a/src/utils/useSharedState.ts b/src/utils/useSharedState.ts
@@ -8,7 +8,11 @@ const useSubmittedButtonStore = create((set) => ({
   setAdminInformation: (data: any) => set({ adminInformation: data }),
 //  setSubmittedButtonStatus: (status: boolean) => set({ submittedButtonStatus: status }),
   userEnteredEmail:"",
+  noError:false,
+  setNoError:(data: boolean) => set({ noError: data }),
   setUserEnteredEmail: (status: string) => set({ userEnteredEmail: status }),
+  shouldFetch:true,
+   setShouldFetch:(data: boolean) => set({ shouldFetch: data }),
 
 }));