ywana-core8 0.0.614 → 0.0.617

package/package.json

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

package/src/domain/CollectionPage.js

@@ -82,7 +82,7 @@ export const CollectionPage = (props) => {
                     { 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,13 @@ export const CollectionTree = (props) => {
     }
 
     function group(items, by) {
+
+        const options = schema[by].options
+
         return items.reduce((nodes, field) => {
             let node = nodes.find(n => n.name === field[by])
             if (!node) {
-                let name = field[by]
+                let name = options ? options.find(option => option.value === field[by]) : field[by]
                 node = { name, items: [], field: by }
                 nodes.push(node)
             }

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)

package/src/html/index.js

@@ -20,4 +20,4 @@ export { Tree, TreeNode, TreeItem } from './tree'
 export { Switch } from './switch'
 export { Tooltip } from './tooltip'
 export { Thumbnail } from './thumbnail'
-export { ColorField } from './colorfield'
+export { ColorField } from './color'