Added infinite nesting to TOC #1388
Conversation
| let getGroupVisibility = (nodes) => { | ||
| let visibility = true; | ||
| let visibility = false; |
There was a problem hiding this comment.
I don't think this refactor is correct. The group visibility is true only if every node is visible
| @@ -9,21 +9,41 @@ | |||
| const assign = require('object-assign'); | |||
| const {isObject, isArray} = require('lodash'); | |||
|
|
|||
| const getGroup = (groupId, groups) => { | |||
| return groups.filter((subGroup) => isObject(subGroup) && subGroup.id === groupId).pop(); | |||
There was a problem hiding this comment.
use lodash head to get first element of array, not pop
There was a problem hiding this comment.
The id is autogenerated and is the same then before, are name and title that change.
| @@ -204,7 +149,29 @@ function layers(state = [], action) { | |||
| }); | |||
| let originalNode = head(flatLayers.filter((layer) => { return (layer[selector] === action.node || layer[selector].indexOf(action.node + '.') === 0); })); | |||
| if (!sameGroup && originalNode ) { | |||
| let newGroups = moveNode(state.groups, action.node, (action.options.group || 'Default')); | |||
| // Remove layers from old group | |||
There was a problem hiding this comment.
Why did you remove moveNode?
| @@ -0,0 +1,25 @@ | |||
| /** | |||
| * Copyright 2016, GeoSolutions Sas. | |||
| @@ -31,7 +31,7 @@ const GroupTitle = React.createClass({ | |||
| let expanded = (this.props.node.expanded !== undefined) ? this.props.node.expanded : true; | |||
| let groupTitle = this.props.node && this.props.node.title || 'Default'; | |||
| return ( | |||
| <div className="toc-group-title" onClick={() => this.props.onClick(this.props.node.name, expanded)} style={this.props.style}> | |||
| <div className="toc-group-title" onClick={() => this.props.onClick(this.props.node.id, expanded)} style={this.props.style}> | |||
There was a problem hiding this comment.
Yes, group id is mandatory, but is autogenerated in LayersUtils.getLayersByGroup
| const getNode = (nodes, name) => { | ||
| if (nodes && isArray(nodes)) { | ||
| return nodes.reduce((previous, node) => { | ||
| if (previous) { | ||
| return previous; | ||
| } | ||
| if (node && node.name === name) { | ||
| if (node && (node.name === name || node.id === name)) { |
There was a problem hiding this comment.
rename name parameter as id
| group = head(LayersUtils.getLayersByGroup([getNode(newLayers, node)])); | ||
| // check for parent group if exist | ||
| const parentGroup = groupId.split('.').reduce((tree, gName, idx) => { | ||
| const gId = groupId.split(".", idx + 1).join('.'); |
There was a problem hiding this comment.
parentId is more meaningful
There was a problem hiding this comment.
parentGroup is the object parentGroup.id is the parentId
|
Should we use |
No description provided.