ywana-core8 0.0.513 → 0.0.516

package/package.json

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

package/src/domain/CollectionPage.js

@@ -22,7 +22,7 @@ export const CollectionPage = (props) => {
         actions = [], onSelect,
         canFilter = false, canAdd = false, canDelete = false, canEdit = false,
         autosave = false, delay = 1000, 
-        groupBy, levels, 
+        groupBy, levels, sorter,
         editor, 
         children 
     } = props
@@ -68,7 +68,7 @@ export const CollectionPage = (props) => {
                 <Header title={<Text>Lista de {name}</Text>} >
                 </Header>
                 {canFilter ? <CollectionFilters schema={schema}/> : null }
-                {levels ? <CollectionTree levels={levels} onSelect={onSelect}/> : <CollectionList groupBy={groupBy} onSelect={onSelect}/>}
+                {levels ? <CollectionTree levels={levels} onSelect={onSelect} sorter={sorter}/> : <CollectionList groupBy={groupBy} onSelect={onSelect}/>}
             </menu>
             <main key={id} className="collection-page">
                 <CollectionEditor icon={icon} schema={schema} layout={editor} autosave={autosave} delay={delay} />
@@ -166,7 +166,7 @@ const CollectionList = (props) => {
  */
 export const CollectionTree = (props) => {
 
-    const { levels, onSelect } = props
+    const { levels, onSelect, sorter } = props
     const [pageContext, setPageContext] = useContext(PageContext)
     const { all = [] } = pageContext
 
@@ -213,7 +213,13 @@ export const CollectionTree = (props) => {
         })
     }
 
-    const nodes = generateNodes(levels, all)
+    const items = sorter ? all.sort((a,b) => {
+        const labelA = `${a.studio}${a.name}`
+        const labelB = `${b.studio}${b.name}`
+        return labelA.localeCompare(labelB)
+    }) : all
+
+    const nodes = generateNodes(levels, items)
     return (
         <main>
             <Tree>

package/src/html/table.js

@@ -191,14 +191,16 @@ const DataTableCell = ({ row, column, cell, editable }) => {
  * @returns 
  */
 const EntityCellViewer = ({ id, item, value }) => {
-    const fields = Object.values(item).filter(field => field.column === true)
 
+    const fields = Object.values(item).filter(field => field.column === true)
+    const locale = window.navigator.userLanguage || window.navigator.language;
+    
     return fields.map(field => {
 
         let text = value[field.id]
 
         if (field.format) {
-            switch (format) {
+            switch (field.format) {
                 case FORMATS.COLOR:
                     text = <input type="color" value={text} disabled />
                 case FORMATS.URL: