Merge pull request #464 from metasfresh/dev-297

Dev 297
metasfresh · Mar 2, 2017 · 258389c · 258389c
2 parents a8cf083 + 1b77937
commit 258389c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -155,7 +155,7 @@ class DocumentList extends Component {
         const {data} = this.state;
         // When the rows are changing we should ensure
         // that selection still exist
-        return (data && data.size && selected[0] &&
+        return (data && data.size && data.result && selected[0] &&
             getItemsByProperty(
                 data.result, 'id', selected[0]
             ).length
@@ -348,7 +348,7 @@ class DocumentList extends Component {
                         <QuickActions
                             windowType={windowType}
                             viewId={viewId}
-                            selected={selectionValid && selected}
+                            selected={selectionValid ? selected : undefined}
                             refresh={refresh}
                             shouldNotUpdate={inBackground}
                             fetchOnInit={fetchQuickActionsOnInit}
@@ -400,7 +400,7 @@ class DocumentList extends Component {
                                     <SelectionAttributes
                                         refresh={refresh}
                                         setClickOutsideLock={this.setClickOutsideLock}
-                                        selected={selectionValid && selected}
+                                        selected={selectionValid ? selected : undefined}
                                         shouldNotUpdate={
                                             inBackground
                                         }

diff --git a/src/components/app/QuickActions.js b/src/components/app/QuickActions.js
@@ -73,7 +73,9 @@ class QuickActions extends Component {
 
     fetchActions = () => {
         const {dispatch, windowType, viewId, selected} = this.props;
-        dispatch(quickActionsRequest(windowType, viewId, selected)).then(response => {
+        dispatch(
+            quickActionsRequest(windowType, viewId, selected)
+        ).then(response => {
             this.setState({
                 actions: response.data.actions
             })