Merge pull request #513 from metasfresh/dev-349

Dev 349
metasfresh · Mar 8, 2017 · 130d833 · 130d833
2 parents 0ec9794 + f4877e6
commit 130d833
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 19 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -183,10 +183,11 @@ export function indicatorState(state) {
 
 //SELECT ON TABLE
 
-export function selectTableItems(ids) {
+export function selectTableItems(ids, windowType) {
     return {
         type: types.SELECT_TABLE_ITEMS,
-        ids: ids
+        ids,
+        windowType
     }
 }
 

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -70,7 +70,7 @@ class DocumentList extends Component {
                 filters: null,
                 viewId: null
             }, () => {
-                dispatch(selectTableItems([]))
+                dispatch(selectTableItems([], null))
                 this.fetchLayoutAndData();
             });
         }
@@ -113,7 +113,7 @@ class DocumentList extends Component {
             inBackground != this.props.inBackground
         ) {
             if(!inBackground){
-                dispatch(selectTableItems(cachedSelection))
+                dispatch(selectTableItems(cachedSelection, windowType))
             }else{
                 this.setState({
                     cachedSelection: selected

diff --git a/src/components/header/Header.js b/src/components/header/Header.js
@@ -1,7 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import {connect} from 'react-redux';
 import {push} from 'react-router-redux';
-import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 
 import logo from '../../assets/images/metasfresh_logo_green_thumb.png';
 
@@ -228,7 +227,7 @@ class Header extends Component {
             docSummaryData, siteName, docNoData, docNo, docStatus, docStatusData,
             windowType, dataId, breadcrumb, showSidelist, references, actions,
             viewId, inbox, homemenu, selected, entity, query, attachments,
-            showIndicator, isDocumentNotSaved
+            showIndicator, isDocumentNotSaved, selectedWindowType
         } = this.props;
 
         const {
@@ -390,6 +389,7 @@ class Header extends Component {
                     handleClone={this.handleClone}
                     redirect={this.redirect}
                     selected={selected}
+                    selectedWindowType={selectedWindowType}
                     entity={entity}
                     disableOnClickOutside={!isSubheaderShow}
                     query={query}
@@ -448,16 +448,19 @@ function mapStateToProps(state) {
     }
 
     const {
-        selected
+        selected,
+        selectedWindowType
     } = windowHandler || {
-        selected: []
+        selected: [],
+        selectedWindowType: null
     }
 
     return {
         selected,
         viewId,
         inbox,
-        homemenu
+        homemenu,
+        selectedWindowType
     }
 }
 

diff --git a/src/components/header/SubHeader.js b/src/components/header/SubHeader.js
@@ -41,7 +41,8 @@ class Subheader extends Component {
 
     componentDidMount() {
         const {
-            dispatch, windowType, dataId, selected, entity, query
+            dispatch, windowType, dataId, selected, selectedWindowType, entity,
+            query
         } = this.props;
 
         dispatch(setActions([]));
@@ -50,7 +51,13 @@ class Subheader extends Component {
 
         if(windowType){
             if(selected.length === 1 || dataId){
-                const id = dataId ? dataId : selected[0];
+                const id = dataId ? dataId : (selectedWindowType == windowType ? selected[0]: null);
+
+                if(!id){
+                    dispatch(setAttachments([]));
+                    dispatch(setReferences([]));
+                    return;
+                }
 
                 /*
                  * These actions always are called in window context
@@ -75,7 +82,7 @@ class Subheader extends Component {
 
             dispatch(
                 actionsRequest(
-                    entity, windowType, dataId ? dataId : query && query.viewId, selected)
+                    entity, windowType, dataId ? dataId : query && query.viewId, (selectedWindowType === windowType ? selected[0]: []))
             ).then((response) => {
                 dispatch(setActions(response.data.actions));
             });

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -53,13 +53,13 @@ class Table extends Component {
     }
 
     componentWillUpdate(nextProps, nextState) {
-        const {dispatch} = this.props;
+        const {dispatch, type} = this.props;
 
         if(
             JSON.stringify(nextState.selected) !==
             JSON.stringify(this.state.selected)
         ){
-            dispatch(selectTableItems(nextState.selected));
+            dispatch(selectTableItems(nextState.selected, type));
         }
     }
 
@@ -142,13 +142,13 @@ class Table extends Component {
     }
 
     selectProduct = (id, idFocused, idFocusedDown) => {
-        const {dispatch} = this.props;
+        const {dispatch, type} = this.props;
 
         this.setState(prevState => ({
             selected: prevState.selected.concat([id])
         }), () => {
             const {selected} = this.state;
-            dispatch(selectTableItems(selected))
+            dispatch(selectTableItems(selected, type))
             this.triggerFocus(idFocused, idFocusedDown);
         })
     }

diff --git a/src/containers/DocList.js b/src/containers/DocList.js
@@ -34,7 +34,7 @@ class DocList extends Component {
         dispatch(getWindowBreadcrumb(windowType));
 
         if(latestNewDocument){
-            dispatch(selectTableItems([latestNewDocument]));
+            dispatch(selectTableItems([latestNewDocument], windowType));
             dispatch(setLatestNewDocument(null));
         }
     }

diff --git a/src/reducers/windowHandler.js b/src/reducers/windowHandler.js
@@ -33,7 +33,8 @@ const initialState = {
     indicator: 'saved',
     latestNewDocument: null,
     viewId: null,
-    selected: []
+    selected: [],
+    selectedWindowType: null
 }
 
 export default function windowHandler(state = initialState, action) {
@@ -218,7 +219,8 @@ export default function windowHandler(state = initialState, action) {
 
         case types.SELECT_TABLE_ITEMS:
             return Object.assign({}, state, {
-                selected: action.ids
+                selected: action.ids,
+                selectedWindowType: action.windowType
             })
 
         // LATEST NEW DOCUMENT CACHE