Merge pull request #457 from metasfresh/dev-297

Dev 297
metasfresh · Mar 1, 2017 · 8f5da3a · 8f5da3a
2 parents fdbb71e + 4ef737c
commit 8f5da3a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -52,7 +52,7 @@ class DocumentList extends Component {
     componentWillReceiveProps(props) {
         const {
             windowType, defaultViewId, defaultSort, defaultPage, selected,
-            inBackground
+            inBackground, dispatch
         } = props;
         const {page, sort, viewId, cachedSelection} = this.state;
 
@@ -68,7 +68,7 @@ class DocumentList extends Component {
                 filters: null,
                 viewId: null
             }, () => {
-
+                dispatch(selectTableItems([]))
                 this.fetchLayoutAndData();
             });
         }
@@ -112,9 +112,7 @@ class DocumentList extends Component {
             inBackground != this.props.inBackground
         ) {
             if(!inBackground){
-                this.props.dispatch(
-                    selectTableItems(cachedSelection)
-                )
+                dispatch(selectTableItems(cachedSelection))
             }else{
                 this.setState({
                     cachedSelection: selected

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -63,7 +63,7 @@ class Table extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        const {mainTable, open, rowData} = this.props;
+        const {mainTable, open, rowData, defaultSelected} = this.props;
 
         if(mainTable && open){
             this.table.focus();
@@ -75,6 +75,15 @@ class Table extends Component {
         ){
             this.getIndentData();
         }
+
+        if(
+            JSON.stringify(prevProps.defaultSelected) !==
+            JSON.stringify(defaultSelected)
+        ){
+            this.setState({
+                selected: defaultSelected
+            })
+        }
     }
 
     getChildContext = () => {

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -79,7 +79,7 @@ class MasterWindow extends Component {
     render() {
         const {
             master, modal, breadcrumb, references, actions, attachments,
-            rawModal, selected, indicator, dispatch
+            rawModal, selected, indicator
         } = this.props;
 
         const {newRow, modalTitle} = this.state;