fix: adjust popup pattern, add isSaving on popups, return promises

src/actions/inventory-item-actions.js

@@ -233,23 +233,20 @@ export const saveInventoryItem = (entity) => async (dispatch) => {
           promises.push(saveItemMetaFieldTypes(normalizedEntity)(dispatch));
         }
 
-        Promise.all(promises)
-          .then(() => {
-            dispatch(
-              showSuccessMessage(
-                T.translate("edit_inventory_item.inventory_item_saved")
-              )
-            );
-          })
-          .catch((err) => {
-            console.error(err);
-          })
-          .finally(() => {
-            dispatch(stopLoading());
-          });
+        return Promise.all(promises).then(() => {
+          dispatch(
+            showSuccessMessage(
+              T.translate("edit_inventory_item.inventory_item_saved")
+            )
+          );
+        });
       })
       .catch((err) => {
         console.error(err);
+        throw err;
+      })
+      .finally(() => {
+        dispatch(stopLoading());
       });
   }
 
@@ -279,23 +276,20 @@ export const saveInventoryItem = (entity) => async (dispatch) => {
         promises.push(saveItemMetaFieldTypes(inventoryItem)(dispatch));
       }
 
-      Promise.all(promises)
-        .then(() => {
-          dispatch(
-            showMessage(success_message, () => {
-              history.push("/app/inventory");
-            })
-          );
-        })
-        .catch((err) => {
-          console.error(err);
-        })
-        .finally(() => {
-          dispatch(stopLoading());
-        });
+      return Promise.all(promises).then(() => {
+        dispatch(
+          showMessage(success_message, () => {
+            history.push("/app/inventory");
+          })
+        );
+      });
     })
     .catch((err) => {
       console.error(err);
+      throw err;
+    })
+    .finally(() => {
+      dispatch(stopLoading());
     });
 };
 

src/actions/page-template-actions.js

@@ -177,6 +177,7 @@ export const savePageTemplate = (entity) => async (dispatch) => {
         );
       })
       .catch((err) => {
+        console.error(err);
         throw err;
       })
       .finally(() => {
@@ -201,6 +202,7 @@ export const savePageTemplate = (entity) => async (dispatch) => {
       );
     })
     .catch((err) => {
+      console.error(err);
       throw err;
     })
     .finally(() => {

src/actions/sponsor-actions.js

@@ -1128,7 +1128,7 @@ export const saveSummitSponsorship = (entity) => async (dispatch, getState) => {
   const normalizedEntity = normalizeSponsorship(entity);
 
   if (entity.id) {
-    putRequest(
+    return putRequest(
       createAction(UPDATE_SUMMIT_SPONSORSHIP),
       createAction(SUMMIT_SPONSORSHIP_UPDATED),
       `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/sponsorships-types/${entity.id}`,
@@ -1140,24 +1140,24 @@ export const saveSummitSponsorship = (entity) => async (dispatch, getState) => {
         showSuccessMessage(T.translate("edit_sponsorship.sponsorship_saved"))
       );
     });
-  } else {
-    const success_message = {
-      title: T.translate("general.done"),
-      html: T.translate("edit_sponsorship.sponsorship_created"),
-      type: "success"
-    };
-
-    postRequest(
-      createAction(UPDATE_SUMMIT_SPONSORSHIP),
-      createAction(SUMMIT_SPONSORSHIP_ADDED),
-      `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/sponsorships-types`,
-      normalizedEntity,
-      authErrorHandler,
-      entity
-    )(params)(dispatch).then(() => {
-      dispatch(showMessage(success_message));
-    });
   }
+
+  const success_message = {
+    title: T.translate("general.done"),
+    html: T.translate("edit_sponsorship.sponsorship_created"),
+    type: "success"
+  };
+
+  return postRequest(
+    createAction(UPDATE_SUMMIT_SPONSORSHIP),
+    createAction(SUMMIT_SPONSORSHIP_ADDED),
+    `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/sponsorships-types`,
+    normalizedEntity,
+    authErrorHandler,
+    entity
+  )(params)(dispatch).then(() => {
+    dispatch(showMessage(success_message));
+  });
 };
 
 export const uploadSponsorshipBadgeImage =

src/actions/sponsor-forms-actions.js

@@ -1355,7 +1355,9 @@ export const updateSponsorFormItem =
           );
         });
       })
-      .catch(console.log) // need to catch promise reject
+      .catch((err) => {
+        throw err;
+      })
       .finally(() => {
         dispatch(stopLoading());
       });
@@ -1490,7 +1492,9 @@ export const addInventoryItems =
           })
         );
       })
-      .catch(console.log) // need to catch promise reject
+      .catch((err) => {
+        throw err;
+      })
       .finally(() => {
         dispatch(stopLoading());
       });

src/pages/sponsors-global/form-templates/form-template-from-duplicate-popup.js

@@ -22,7 +22,6 @@ import SearchInput from "openstack-uicore-foundation/lib/components/mui/search-i
 import MenuButton from "../../../components/mui/menu-button";
 
 const FormTemplateFromDuplicateDialog = ({
-  open,
   options,
   onClose,
   onDuplicate,
@@ -94,7 +93,7 @@ const FormTemplateFromDuplicateDialog = ({
   ];
 
   return (
-    <Dialog open={open} onClose={handleClose} maxWidth="md" fullWidth>
+    <Dialog open onClose={handleClose} maxWidth="md" fullWidth>
       <DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
         <Typography fontSize="1.5rem">
           {T.translate("form_template_from_duplicate_dialog.duplicate_form")}
@@ -176,7 +175,6 @@ const FormTemplateFromDuplicateDialog = ({
 };
 
 FormTemplateFromDuplicateDialog.propTypes = {
-  open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   onDuplicate: PropTypes.func.isRequired,
   onSearch: PropTypes.func.isRequired,

src/pages/sponsors-global/form-templates/form-template-item-list-page.js

@@ -174,7 +174,7 @@ const FormTemplateItemListPage = ({
     );
   };
 
-  const handleFormTemplateSave = (item) => {
+  const handleFormTemplateSave = (item) =>
     saveFormTemplateItem(formTemplateId, item).then(() =>
       getFormTemplateItems(
         formTemplateId,
@@ -184,10 +184,8 @@ const FormTemplateItemListPage = ({
         order,
         orderDir,
         showArchived
-      )
+      ).catch(() => {})
     );
-    setShowInventoryItemModal(false);
-  };
 
   const columns = [
     {

src/pages/sponsors-global/form-templates/form-template-list-page.js

@@ -139,6 +139,11 @@ const FormTemplateListPage = ({
     setFormTemplateFromDuplicatePopupOpen(false);
   };
 
+  const handleCloseFormTemplateDialog = () => {
+    resetFormTemplateForm();
+    setFormTemplatePopupOpen(false);
+  };
+
   const handleDuplicatePopupClose = () => {
     getFormTemplates(
       "",
@@ -212,17 +217,17 @@ const FormTemplateListPage = ({
     sortDir: orderDir
   };
 
-  const handleOnSave = async (values) => {
-    await saveFormTemplate(values);
-    getFormTemplates(
-      "",
-      DEFAULT_CURRENT_PAGE,
-      perPage,
-      order,
-      orderDir,
-      showArchived
+  const handleOnSave = (values) =>
+    saveFormTemplate(values).then(() =>
+      getFormTemplates(
+        "",
+        values.id ? currentPage : DEFAULT_CURRENT_PAGE,
+        perPage,
+        order,
+        orderDir,
+        showArchived
+      ).catch(() => {})
     );
-  };
 
   return (
     <div className="container">
@@ -330,31 +335,33 @@ const FormTemplateListPage = ({
           />
         </div>
       )}
-      <FormTemplateDialog
-        entity={currentFormTemplate}
-        errors={currentFormTemplateErrors}
-        open={formTemplatePopupOpen}
-        onSave={handleOnSave}
-        toDuplicate={formTemplateDuplicate}
-        onClose={() => setFormTemplatePopupOpen(false)}
-        onMetaFieldTypeDeleted={deleteFormTemplateMetaFieldType}
-        onMetaFieldTypeValueDeleted={deleteFormTemplateMetaFieldTypeValue}
-        onMaterialDeleted={deleteFormTemplateMaterial}
-      />
-      <FormTemplateFromDuplicateDialog
-        open={formTemplateFromDuplicatePopupOpen}
-        options={tableOptions}
-        onClose={handleDuplicatePopupClose}
-        onDuplicate={handleDuplicateForm}
-        onSearch={handleSearch}
-        onSort={handleSort}
-        perPage={perPage}
-        currentPage={currentPage}
-        totalRows={totalFormTemplates}
-        onPageChange={handlePageChange}
-        onPerPageChange={handlePerPageChange}
-        formTemplates={formTemplates}
-      />
+      {formTemplatePopupOpen && (
+        <FormTemplateDialog
+          entity={currentFormTemplate}
+          errors={currentFormTemplateErrors}
+          onSave={handleOnSave}
+          toDuplicate={formTemplateDuplicate}
+          onClose={handleCloseFormTemplateDialog}
+          onMetaFieldTypeDeleted={deleteFormTemplateMetaFieldType}
+          onMetaFieldTypeValueDeleted={deleteFormTemplateMetaFieldTypeValue}
+          onMaterialDeleted={deleteFormTemplateMaterial}
+        />
+      )}
+      {formTemplateFromDuplicatePopupOpen && (
+        <FormTemplateFromDuplicateDialog
+          options={tableOptions}
+          onClose={handleDuplicatePopupClose}
+          onDuplicate={handleDuplicateForm}
+          onSearch={handleSearch}
+          onSort={handleSort}
+          perPage={perPage}
+          currentPage={currentPage}
+          totalRows={totalFormTemplates}
+          onPageChange={handlePageChange}
+          onPerPageChange={handlePerPageChange}
+          formTemplates={formTemplates}
+        />
+      )}
     </div>
   );
 };

src/pages/sponsors-global/form-templates/form-template-popup.js

@@ -27,7 +27,6 @@ import {
 } from "../../../utils/yup";
 
 const FormTemplateDialog = ({
-  open,
   onClose,
   onSave,
   toDuplicate = false,
@@ -74,9 +73,9 @@ const FormTemplateDialog = ({
       if (isSaving) return;
 
       setIsSaving(true);
-      Promise.resolve(onSave(finalValues))
+      onSave(finalValues)
         .then(() => {
-          closePopup();
+          onClose();
         })
         .catch(() => {
           // keep dialog open on save error to preserve user input
@@ -96,7 +95,7 @@ const FormTemplateDialog = ({
 
   return (
     <Dialog
-      open={open}
+      open
       onClose={handleClose}
       maxWidth="md"
       fullWidth
@@ -197,7 +196,6 @@ const FormTemplateDialog = ({
 };
 
 FormTemplateDialog.propTypes = {
-  open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
   entity: PropTypes.object