Handle async control flow when closing raw modal

Issue #1361
metasfresh · Jan 13, 2018 · 637b012 · 637b012
1 parent d4e6e37
commit 637b012
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/components/app/RawModal.js b/src/components/app/RawModal.js
@@ -68,31 +68,33 @@ class RawModal extends Component {
     });
   };
 
-  handleClose = () => {
+  handleClose = async () => {
     const { closeCallback, viewId, windowType } = this.props;
     const { isNew } = this.state;
 
     if (closeCallback) {
-      closeCallback(isNew);
+      await closeCallback(isNew);
     }
 
-    deleteView(windowType, viewId);
+    await deleteView(windowType, viewId);
 
-    this.removeModal();
+    await this.removeModal();
   };
 
-  removeModal = () => {
+  removeModal = async () => {
     const { dispatch, modalVisible, windowType, viewId } = this.props;
 
-    dispatch(closeRawModal());
-    dispatch(closeModal());
-    dispatch(
+    for (const action of [
+      closeRawModal(),
+      closeModal(),
       closeListIncludedView({
         windowType,
         viewId,
         forceClose: true
       })
-    );
+    ]) {
+      await dispatch(action);
+    }
 
     if (!modalVisible) {
       document.body.style.overflow = "auto";

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -227,8 +227,8 @@ class MasterWindow extends Component {
   closeModalCallback = (
     { isNew, windowType, documentId, tabId, rowId } = {}
   ) => {
-    if (isNew) {
-      discardNewRow({ windowType, documentId, tabId, rowId });
+    if (!isNew) {
+      return discardNewRow({ windowType, documentId, tabId, rowId });
     }
   };