ywana-core8 0.0.616 → 0.0.619

package/package.json

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

package/src/domain/CollectionPage.js

@@ -79,10 +79,10 @@ 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 icon={icon} levels={levels} onSelect={onSelect} sorter={sorter} searchBy={searchBy} /> : <CollectionList groupBy={groupBy} onSelect={onSelect} searchBy={searchBy} />}
+                {levels ? <CollectionTree schema={schema} icon={icon} levels={levels} onSelect={onSelect} sorter={sorter} searchBy={searchBy} /> : <CollectionList groupBy={groupBy} onSelect={onSelect} searchBy={searchBy} />}
             </menu>
             <main key={id} className={`collection-page ${className}`}>
                 <CollectionEditor icon={icon} schema={schema} layout={editor} autosave={autosave} delay={delay} canDelete={canDelete} canEdit={canEdit} onReload={reloadSelection} />
@@ -206,7 +206,7 @@ const CollectionList = (props) => {
  */
 export const CollectionTree = (props) => {
 
-    const { icon = "description", levels, onSelect, sorter, searchBy = [] } = props
+    const { icon = "description", levels, onSelect, sorter, searchBy = [], schema } = props
     const [pageContext, setPageContext] = useContext(PageContext)
     const { all = [] } = pageContext
     const [filter, setFilter] = useState()
@@ -228,10 +228,17 @@ export const CollectionTree = (props) => {
     }
 
     function group(items, by) {
+
+        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 = field[by]
+                if (options) {
+                    const opt = options.find(option => option.value === field[by])
+                    if (opt) name = opt.label
+                }
                 node = { name, items: [], field: by }
                 nodes.push(node)
             }
@@ -381,7 +388,7 @@ export const CollectionContext = (url, field, host, page, fetching) => {
         changeFilters(filters) {
             this.filters = filters
         },
-        
+
         async load() {
             try {
                 const data = await API.all(null, page);

package/src/domain/ContentEditor.js

@@ -177,7 +177,7 @@ export const TreededContentEditor = ({ content, filter, onChange }) => {
  * FieldEditor
  */
 export const FieldEditor = ({ field, onChange, content, outlined = false, onReload }) => {
-  const { id, type, item, label, editable, options, hidden = false } = field
+  const { id, type, item, label, options, hidden = false } = field
 
   function change(id, value) {
     if (onChange) onChange(id, value)