Merge pull request #1042 from metasfresh/dev-979

Optimized breadcrumb handling #979
metasfresh · Jul 18, 2017 · bb46b39 · bb46b39
2 parents 36a68ee + 668efa2
commit bb46b39
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/src/actions/MenuActions.js b/src/actions/MenuActions.js
@@ -4,6 +4,7 @@ import axios from 'axios';
 // REQUESTS
 
 let breadcrumbsRequested = false;
+let breadcrumbsId = null;
 
 export function pathRequest(nodeId) {
     return axios.get(
@@ -80,36 +81,21 @@ export function getRootBreadcrumb() {
 
 export function getWindowBreadcrumb(id){
     return dispatch => {
-        if (!breadcrumbsRequested) {
+        if (!breadcrumbsRequested && (breadcrumbsId !== id)) {
             breadcrumbsRequested = true;
+
             elementPathRequest('window', id).then(response => {
-                let req = 0;
                 let pathData = flattenOneLine(response.data);
-
-                // promise to get all of the breadcrumb menu options
-                let breadcrumbProcess = new Promise((resolve) => {
-
-                    for(let i = 0; i < pathData.length; i++){
-                        const node = pathData[i];
-                        let nodeId = node.nodeId;
-
-                        breadcrumbRequest(nodeId).then(item => {
-                            node.children = item.data;
-                            req += 1;
-
-                            if(req === pathData.length){
-                                resolve(pathData);
-                            }
-                        })
-                    }
-                });
-
-                return breadcrumbProcess;
+                return pathData;
             }).then((item) => {
                 dispatch(setBreadcrumb(item.reverse()));
+
+                breadcrumbsId = id;
                 breadcrumbsRequested = false;
             }).catch(() => {
                 dispatch(setBreadcrumb([]));
+
+                breadcrumbsId = null;
                 breadcrumbsRequested = false;
             });
         }
@@ -151,7 +137,8 @@ export function flattenOneLine(node) {
     }
     result.push({
         nodeId: node.nodeId,
-        caption: node.caption
+        caption: node.caption,
+        type: node.type
     });
     return result;
 }
diff --git a/src/components/header/Breadcrumb.js b/src/components/header/Breadcrumb.js
@@ -60,7 +60,7 @@ class Breadcrumb extends Component {
             handleMenuOverlay, windowType
         } = this.props;
 
-        const noChildNodes = menu && menu.children && (menu.children.length === 0);
+        const noChildNodes = menu && ((menu.type === 'window') || (menu.children && (menu.children.length === 0)));
 
         if(menu && (menu.elementId || noChildNodes)) {
             (windowType) && this.linkToPage(windowType);

diff --git a/src/components/header/MenuOverlay.js b/src/components/header/MenuOverlay.js
@@ -30,18 +30,19 @@ class MenuOverlay extends Component {
 
     componentDidMount = () => {
 
-
         const {
             nodeId
         } = this.props;
-        if(nodeId == 0){
+
+        if (nodeId == 0){
             getRootBreadcrumb().then(response => {
                 this.setState({
                     data: response
                 })
             })
-        }else {
-            if (this.props.node) {
+        }
+        else {
+            if (this.props.node && this.props.node.children) {
                 this.setState({
                     data: this.props.node
                 })