fix: moved setShowDialog false after validating

culturecreates · Oct 16, 2024 · 9cc28ae · 9cc28ae
1 parent d2f8822
commit 9cc28ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx b/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx
@@ -251,22 +251,7 @@ function CreateNewOrganization() {
 
   const onSaveHandler = (event, toggle = false) => {
     event?.preventDefault();
-    setShowDialog(false);
     let validateFieldList = [];
-    // if (
-    //   form.getFieldValue('socialMediaLinks')?.filter((link) => {
-    //     if (link) return true;
-    //   })?.length > 0
-    // ) {
-    //   validateFieldList = validateFieldList?.concat(
-    //     form
-    //       .getFieldValue('socialMediaLinks')
-    //       ?.filter((link) => {
-    //         if (link) return true;
-    //       })
-    //       ?.map((link, index) => ['socialMediaLinks', index]),
-    //   );
-    // }
     let mandatoryFields = standardMandatoryFieldNames;
     validateFieldList = validateFieldList?.concat(
       formFields
@@ -290,6 +275,7 @@ function CreateNewOrganization() {
       form
         .validateFields(validateFieldList)
         .then(async () => {
+          setShowDialog(false);
           var values = form.getFieldsValue(true);
           let organizationPayload = {};
           Object.keys(values)?.map((object) => {

diff --git a/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx b/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx
@@ -219,7 +219,6 @@ function CreateNewPerson() {
 
   const onSaveHandler = (event) => {
     event?.preventDefault();
-    setShowDialog(false);
     let validateFieldList = [];
     let mandatoryFields = formFieldProperties?.mandatoryFields?.standardFields?.map((field) => field?.fieldName);
     validateFieldList = validateFieldList?.concat(
@@ -243,6 +242,7 @@ function CreateNewPerson() {
     form
       .validateFields(validateFieldList)
       .then(async () => {
+        setShowDialog(false);
         var values = form.getFieldsValue(true);
         let personPayload = {};
         Object.keys(values)?.map((object) => {

diff --git a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx
@@ -414,11 +414,11 @@ function CreateNewPlace() {
 
   const onSaveHandler = (event) => {
     event?.preventDefault();
-    setShowDialog(false);
     var promise = new Promise(function (resolve, reject) {
       form
         .validateFields(publishValidateFields ?? [])
         .then(async () => {
+          setShowDialog(false);
           var values = form.getFieldsValue(true);
 
           let placeObj,