Merge pull request #1059 from metasfresh/dev-1027

line looks selected, but it's not #1027
metasfresh · Jul 19, 2017 · 864e4b0 · 864e4b0
2 parents c4edeed + 041388d
commit 864e4b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -481,7 +481,7 @@ class DocumentList extends Component {
     render() {
         const {
             layout, data, viewId, clickOutsideLock, refresh, page, filters,
-            cachedSelection, isShowIncluded, hasShowIncluded
+            cachedSelection, isShowIncluded, hasShowIncluded, refreshSelection
         } = this.state;
 
         const {
@@ -581,7 +581,7 @@ class DocumentList extends Component {
                                 disableOnClickOutside={clickOutsideLock}
                                 defaultSelected={cachedSelection ?
                                     cachedSelection : selected}
-                                refreshSelection={this.state.refreshSelection}
+                                refreshSelection={refreshSelection}
                                 queryLimitHit={data.queryLimitHit}
                                 doesSelectionExist={this.doesSelectionExist}
                                 showIncludedViewOnSelect={this.showIncludedViewOnSelect}

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -70,7 +70,7 @@ class Table extends Component {
         const {
             mainTable, open, rowData, defaultSelected, disconnectFromState,
             dispatch, type, refreshSelection, supportIncludedViewOnSelect,
-            showIncludedViewOnSelect
+            showIncludedViewOnSelect, viewId
         } = this.props;
 
         const {
@@ -112,6 +112,15 @@ class Table extends Component {
                 selected: defaultSelected
             })
         }
+
+        if(
+            JSON.stringify(prevProps.viewId) !==
+            JSON.stringify(viewId)
+        ){
+            this.setState({
+                selected: []
+            })
+        }
     }
 
     showSelectedIncludedView = (selected) => {