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());
       });
   }
 

src/actions/page-template-actions.js

@@ -174,7 +174,6 @@ export const savePageTemplate = (entity) => async (dispatch) => {
             html: T.translate("page_template_list.page_crud.page_saved")
           })
         );
-        getPageTemplates()(dispatch);
       })
       .catch((err) => {
         console.error(err);
@@ -199,7 +198,6 @@ export const savePageTemplate = (entity) => async (dispatch) => {
           html: T.translate("page_template_list.page_crud.page_created")
         })
       );
-      getPageTemplates()(dispatch);
     })
     .catch((err) => {
       console.error(err);

src/actions/sponsor-actions.js

@@ -1126,7 +1126,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}`,
@@ -1138,14 +1138,14 @@ 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(
+    return postRequest(
       createAction(UPDATE_SUMMIT_SPONSORSHIP),
       createAction(SUMMIT_SPONSORSHIP_ADDED),
       `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/sponsorships-types`,
@@ -1155,7 +1155,7 @@ export const saveSummitSponsorship = (entity) => async (dispatch, getState) => {
     )(params)(dispatch).then(() => {
       dispatch(showMessage(success_message));
     });
-  }
+
 };
 
 export const uploadSponsorshipBadgeImage =

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

@@ -177,7 +177,7 @@ const FormTemplateItemListPage = ({
     );
   };
 
-  const handleFormTemplateSave = (item) => {
+  const handleFormTemplateSave = (item) =>
     saveFormTemplateItem(formTemplateId, item).then(() =>
       getFormTemplateItems(
         formTemplateId,
@@ -189,8 +189,6 @@ const FormTemplateItemListPage = ({
         showArchived
       )
     );
-    setShowInventoryItemModal(false);
-  };
 
   const columns = [
     {

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

@@ -212,17 +212,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(
+        "",
+        DEFAULT_CURRENT_PAGE,
+        perPage,
+        order,
+        orderDir,
+        showArchived
+      )
     );
-  };
 
   return (
     <div className="container">

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

@@ -74,9 +74,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

src/pages/sponsors-global/form-templates/sponsor-inventory-popup.js

@@ -45,6 +45,8 @@ const SponsorItemDialog = ({
   onMetaFieldTypeValueDeleted,
   entity: initialEntity
 }) => {
+  const [isSaving, setIsSaving] = useState(false);
+
   const formik = useFormik({
     initialValues: {
       ...initialEntity,
@@ -65,7 +67,13 @@ const SponsorItemDialog = ({
       quantity_limit_per_show: positiveNumberValidation(),
       meta_fields: formMetafieldsValidation()
     }),
-    onSubmit: (values) => onSave(values)
+    onSubmit: (values) => {
+      if (isSaving) return;
+      setIsSaving(true);
+      onSave(values)
+        .then(() => onClose())
+        .finally(() => setIsSaving(false));
+    }
   });
 
   const mediaType = {
@@ -79,6 +87,7 @@ const SponsorItemDialog = ({
   useScrollToError(formik);
 
   const handleClose = () => {
+    if (isSaving) return;
     formik.resetForm();
     onClose();
   };
@@ -92,12 +101,18 @@ const SponsorItemDialog = ({
       disableEnforceFocus
       disableAutoFocus
       disableRestoreFocus
+      disableEscapeKeyDown={isSaving}
     >
       <DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
         {initialEntity.id
           ? T.translate("edit_inventory_item.edit_item")
           : T.translate("edit_inventory_item.new_item")}
-        <IconButton size="small" onClick={handleClose} sx={{ mr: 1 }}>
+        <IconButton
+          size="small"
+          onClick={handleClose}
+          sx={{ mr: 1 }}
+          disabled={isSaving}
+        >
           <CloseIcon fontSize="small" />
         </IconButton>
       </DialogTitle>
@@ -227,7 +242,12 @@ const SponsorItemDialog = ({
           </DialogContent>
           <Divider />
           <DialogActions>
-            <Button type="submit" fullWidth variant="contained">
+            <Button
+              type="submit"
+              fullWidth
+              variant="contained"
+              disabled={isSaving}
+            >
               {T.translate("edit_inventory_item.save_changes")}
             </Button>
           </DialogActions>

src/pages/sponsors-global/inventory/inventory-list-page.js

@@ -246,20 +246,17 @@ const InventoryListPage = ({
     setOpen(true);
   };
 
-  const handleInventorySave = (item) => {
-    saveInventoryItem(item)
-      .then(() =>
-        getInventoryItems(
-          term,
-          currentPage,
-          perPage,
-          order,
-          orderDir,
-          showArchived
-        )
+  const handleInventorySave = (item) =>
+    saveInventoryItem(item).then(() =>
+      getInventoryItems(
+        term,
+        currentPage,
+        perPage,
+        order,
+        orderDir,
+        showArchived
       )
-      .finally(() => setOpen(false));
-  };
+    );
 
   const handleArchiveItem = (item) =>
     item.is_archived

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

@@ -114,9 +114,17 @@ const PageTemplateListPage = ({
     setOpenCloneDialog(true);
   };
 
-  const handleSavePageTemplate = (entity) => {
-    savePageTemplate(entity).then(() => setOpenPageDialog(false));
-  };
+  const handleSavePageTemplate = (entity) =>
+    savePageTemplate(entity).then(() =>
+      getPageTemplates(
+        term,
+        DEFAULT_CURRENT_PAGE,
+        perPage,
+        order,
+        orderDir,
+        showArchived
+      )
+    );
 
   const handleArchive = (item) =>
     item.is_archived

src/pages/sponsors-global/page-templates/page-template-popup/index.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import T from "i18n-react/dist/i18n-react";
 import PropTypes from "prop-types";
 import {
@@ -43,6 +43,7 @@ const PageTemplatePopup = ({
   sponsorshipIds,
   title
 }) => {
+  const [isSaving, setIsSaving] = useState(false);
   const popupTitle =
     title ??
     (pageTemplate?.id
@@ -129,14 +130,17 @@ const PageTemplatePopup = ({
       }),
       modules: yup.array().of(moduleSchema)
     }),
-    enableReinitialize: true,
     onSubmit: (values) => {
+      if (isSaving) return;
+      setIsSaving(true);
       const modulesWithOrder = values.modules.map((m, idx) => ({
         ...m,
         custom_order: idx
       }));
 
-      onSave({ ...values, modules: modulesWithOrder });
+      onSave({ ...values, modules: modulesWithOrder })
+        .then(() => onClose())
+        .finally(() => setIsSaving(false));
     }
   });
 
@@ -179,11 +183,27 @@ const PageTemplatePopup = ({
     });
   };
 
+  const handleClose = () => {
+    if (isSaving) return;
+    onClose();
+  };
+
   return (
-    <Dialog open onClose={onClose} maxWidth="md" fullWidth>
+    <Dialog
+      open
+      onClose={handleClose}
+      maxWidth="md"
+      fullWidth
+      disableEscapeKeyDown={isSaving}
+    >
       <DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
         <Typography fontSize="1.5rem">{popupTitle}</Typography>
-        <IconButton size="small" onClick={onClose} sx={{ mr: 1 }}>
+        <IconButton
+          size="small"
+          onClick={handleClose}
+          sx={{ mr: 1 }}
+          disabled={isSaving}
+        >
           <CloseIcon fontSize="small" />
         </IconButton>
       </DialogTitle>
@@ -306,7 +326,12 @@ const PageTemplatePopup = ({
           </DialogContent>
           <Divider />
           <DialogActions>
-            <Button type="submit" fullWidth variant="contained">
+            <Button
+              type="submit"
+              fullWidth
+              variant="contained"
+              disabled={isSaving}
+            >
               {T.translate("page_template_list.page_crud.save")}
             </Button>
           </DialogActions>