Fixes on Lore's review and fixed ordering bugs

geosolutions-it · Jan 23, 2017 · 074a5c8 · 074a5c8
1 parent b4f5bd2
commit 074a5c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/web/client/components/TOC/DefaultLayerOrGroup.jsx b/web/client/components/TOC/DefaultLayerOrGroup.jsx
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, GeoSolutions Sas.
+ * Copyright 2017, GeoSolutions Sas.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the

diff --git a/web/client/reducers/layers.js b/web/client/reducers/layers.js
@@ -44,17 +44,17 @@ const deepRemove = (nodes, findValue) => {
     }
     return nodes;
 };
-const getNode = (nodes, name) => {
+const getNode = (nodes, id) => {
     if (nodes && isArray(nodes)) {
         return nodes.reduce((previous, node) => {
             if (previous) {
                 return previous;
             }
-            if (node && (node.name === name || node.id === name)) {
+            if (node && (node.name === id || node.id === id)) {
                 return node;
             }
             if (node && node.nodes && node.nodes.length > 0) {
-                return getNode(node.nodes, name);
+                return getNode(node.nodes, id);
             }
             return previous;
         }, null);

diff --git a/web/client/utils/LayersUtils.js b/web/client/utils/LayersUtils.js
@@ -19,15 +19,15 @@ const getLayersId = (groupId, allLayers) => {
     return allLayers.filter((layer) => (layer.group || 'Default') === groupId).map((layer) => layer.id).reverse();
 };
 const initialReorderLayers = (groups, allLayers) => {
-    return groups.slice(0).reduce((previous, group) => {
+    return groups.slice(0).reverse().reduce((previous, group) => {
         return previous.concat(
-            group.nodes.reduce((layers, node) => {
+            group.nodes.slice(0).reverse().reduce((layers, node) => {
                 if (isObject(node)) {
-                    return layers.concat(initialReorderLayers([node], allLayers).reverse());
+                    return layers.concat(initialReorderLayers([node], allLayers));
                 }
                 return layers.concat(getLayer(node, allLayers));
             }, [])
-            ).reverse();
+            );
     }, []);
 };
 const reorderLayers = (groups, allLayers) => {