ywana-core8 0.0.617 → 0.0.620

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.617",
+  "version": "0.0.620",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/domain/CollectionPage.js

@@ -79,7 +79,7 @@ export const CollectionPage = (props) => {
             </Header>
             <menu className={`collection-page ${className}`}>
                 <Header title={<Text>{name}</Text>} >
-                    { canFilter ? showFilter ? <Icon icon="filter_list" size="small" clickable action={toggleFilters} /> :  <Icon icon="filter_list_off" size="small" clickable action={toggleFilters} /> : false }
+                    {canFilter ? showFilter ? <Icon icon="filter_list" size="small" clickable action={toggleFilters} /> : <Icon icon="filter_list_off" size="small" clickable action={toggleFilters} /> : false}
                 </Header>
                 {canFilter && showFilter ? <CollectionFilters schema={schema} /> : null}
                 {levels ? <CollectionTree schema={schema} icon={icon} levels={levels} onSelect={onSelect} sorter={sorter} searchBy={searchBy} /> : <CollectionList groupBy={groupBy} onSelect={onSelect} searchBy={searchBy} />}
@@ -229,13 +229,18 @@ export const CollectionTree = (props) => {
 
     function group(items, by) {
 
-        const options = schema[by].options
+        const options = schema[by] ? schema[by].options : null
 
         return items.reduce((nodes, field) => {
             let node = nodes.find(n => n.name === field[by])
             if (!node) {
-                let name = options ? options.find(option => option.value === field[by]) : field[by]
-                node = { name, items: [], field: by }
+                let name = field[by]
+                let title = field[by]
+                if (options) {
+                    const opt = options.find(option => option.value === field[by])
+                    if (opt) title = opt.label
+                }
+                node = { name, items: [], field: by, title }
                 nodes.push(node)
             }
             node.items.push(field)
@@ -252,7 +257,7 @@ export const CollectionTree = (props) => {
 
     function renderNodes(nodes) {
         return nodes.map(node => {
-            const title = typeof node.name === 'boolean' ? `${node.field} = ${node.name}` : node.name
+            const title = typeof node.name === 'boolean' ? `${node.field} = ${node.name}` : node.title
             return (
                 <TreeNode key={node.name} icon={null} label={title} open={true}>
                     {node.nodes ? renderNodes(node.nodes) : node.items.map(item => {
@@ -384,7 +389,7 @@ export const CollectionContext = (url, field, host, page, fetching) => {
         changeFilters(filters) {
             this.filters = filters
         },
-        
+
         async load() {
             try {
                 const data = await API.all(null, page);