hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change Utils.unflatten to accept an object as second argument; make name of children property customizable

Browse source
This commit is contained in:
SachaG 2017-05-06 16:12:44 +09:00
parent 6cff2b19fd
commit 3b651a6d2b
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/vulcan-base-components/lib/categories/CategoriesList.jsx
View file

@ -26,7 +26,7 @@ class CategoriesList extends Component {
};
});
const nestedCategories = Utils.unflatten(categoriesClone, '_id', 'parentId');
const nestedCategories = Utils.unflatten(categoriesClone, {idProperty: '_id', parentIdProperty: 'parentId'});
return nestedCategories;
}

2
packages/vulcan-base-components/lib/posts/PostsCommentsThread.jsx
View file

@ -14,7 +14,7 @@ const PostsCommentsThread = (props, context) => {
} else {
const resultsClone = _.map(results, _.clone); // we don't want to modify the objects we got from props
const nestedComments = Utils.unflatten(resultsClone, '_id', 'parentCommentId');
const nestedComments = Utils.unflatten(resultsClone, {idProperty: '_id', parentIdProperty: 'parentCommentId'});
return (
<div className="posts-comments-thread">

12
packages/vulcan-lib/lib/modules/utils.js
View file

@ -308,7 +308,13 @@ Utils.findIndex = (array, predicate) => {
}
// adapted from http://stackoverflow.com/a/22072374/649299
Utils.unflatten = function(array, idProperty, parentIdProperty, parent, level=0, tree){
Utils.unflatten = function(array, options, parent, level=0, tree){
const {
idProperty = '_id',
parentIdProperty = 'parentId',
childrenProperty = 'childrenResults'
} = options;
level++;
@ -334,13 +340,13 @@ Utils.unflatten = function(array, idProperty, parentIdProperty, parent, level=0,
tree = children;
} else {
// else, we add the children to the parent as the "childrenResults" property
parent.childrenResults = children;
parent[childrenProperty] = children;
}
// we call the function on each child
children.forEach(child => {
child.level = level;
Utils.unflatten(array, idProperty, parentIdProperty, child, level);
Utils.unflatten(array, options, child, level);
});
}