Merge pull request #770 from metasfresh/dev-769

#769 Reverting changes from #704
metasfresh · May 22, 2017 · 57198b9 · 57198b9
2 parents 7d92cda + 21aa3be
commit 57198b9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -410,14 +410,14 @@ export function patch(
         )).then(response => {
             responsed = true;
             dispatch(mapDataToState(
-                response.data, isModal, rowId, id, windowType
+                response.data, isModal, rowId, id, windowType, isAdvanced
             ));
         }).catch(() => {
             dispatch(getData(
                 entity, windowType, id, tabId, rowId, null, null, isAdvanced
             )).then(response => {
                 dispatch(mapDataToState(
-                    response.data, isModal, rowId, id, windowType
+                    response.data, isModal, rowId, id, windowType, isAdvanced
                 ));
             });
         });
@@ -462,7 +462,7 @@ function updateRow(row, scope){
     }
 }
 
-function mapDataToState(data, isModal, rowId, id, windowType) {
+function mapDataToState(data, isModal, rowId, id, windowType, isAdvanced) {
     return (dispatch) => {
         let staleTabIds = [];
 
@@ -474,7 +474,7 @@ function mapDataToState(data, isModal, rowId, id, windowType) {
                     if(
                         tabInfo.stale &&
                         staleTabIds.indexOf(tabInfo.tabid) === -1
-                      ){
+                    ){
                         staleTabIds.push(tabInfo.tabid);
                     }
                 })
@@ -490,10 +490,15 @@ function mapDataToState(data, isModal, rowId, id, windowType) {
                 ))
             }else{
                 if (item.rowId && !isModal) {
+                    // Update directly to a row by the widget in cell
                     dispatch(updateRow(parsedItem, 'master'));
                 } else {
+                    // Update by a modal
                     item.rowId && dispatch(updateRow(parsedItem, 'master'));
 
+                    // Advanced edit
+                    isAdvanced && dispatch(updateData(parsedItem, 'master'));
+
                     dispatch(updateData(
                         parsedItem, getScope(isModal && index === 0)
                     ));
@@ -504,10 +509,9 @@ function mapDataToState(data, isModal, rowId, id, windowType) {
         //Handling staleTabIds
         !isModal && staleTabIds.map(staleTabId => {
             dispatch(getTab(staleTabId, windowType, id)).then(tab => {
-                dispatch(addRowData({[staleTabId]: tab}, getScope(isModal)));
-            })
+                dispatch(addRowData({[staleTabId]: tab}, 'master'));
+            });
         })
-
     }
 }
 

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -6,7 +6,9 @@ import {push} from 'react-router-redux';
 import {
     findRowByPropName,
     attachFileAction,
-    clearMasterData
+    clearMasterData,
+    getTab,
+    addRowData
 } from '../actions/WindowActions';
 
 import {
@@ -42,7 +44,7 @@ class MasterWindow extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        const {master} = this.props;
+        const {master, modal, params, dispatch} = this.props;
         const isDocumentNotSaved = !master.saveStatus.saved;
         const isDocumentSaved = master.saveStatus.saved;
 
@@ -52,6 +54,16 @@ class MasterWindow extends Component {
         if (!prevProps.master.saveStatus.saved && isDocumentSaved) {
             window.removeEventListener('beforeunload', this.confirm)
         }
+
+        // When closing modal, we need to update the stale tabs
+        if(!modal.visible && modal.visible !== prevProps.modal.visible){
+            Object.keys(master.includedTabsInfo).map(tabId => {
+                dispatch(getTab(tabId, params.windowType, master.docId))
+                    .then(tab => {
+                        dispatch(addRowData({[tabId]: tab}, 'master'));
+                    });
+            })
+        }
     }
 
     componentWillUnmount() {