ywana-core8 0.0.231 → 0.0.235

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.231",
+  "version": "0.0.235",
   "description": "ywana-core8",
   "author": "Ernesto Roldan Garcia",
   "license": "MIT",

package/src/domain/ContentEditor.js

@@ -248,16 +248,22 @@ export const StringEditor = ({ field, value = '', onChange, content, outlined })
     return opts
   }
 
+  function renderFormat(format, options) {
+    switch (format) {
+      case FORMATS.HTML: return <Editor id={id} value={value} onChange={change} content={content} />
+      case FORMATS.DATE: return <TextField outlined={outlined} id={id} type="date" label={label} value={value} onChange={change} readOnly={!editable} />
+      default:
+        return options ? (
+          <DropDown outlined={outlined} id={id} label={label} value={value} onChange={change} options={buildOptions()} readOnly={!editable} canFilter={predictive} />
+        ) : (
+          <TextField outlined={outlined} id={id} label={label} value={value} onChange={change} readOnly={!editable} />
+        )
+    }
+  }
+
   return (
     <div className='field-editor string-editor'>
-
-      { format === FORMATS.HTML ? <Editor id={id} value={value} onChange={change} content={content}/> : null }
-
-      {
-        format === FORMATS.DATE ? <TextField outlined={outlined} id={id} type="date" label={label} value={value} onChange={change} readOnly={!editable} /> :
-          options ? <DropDown outlined={outlined} id={id} label={label} value={value} onChange={change} options={buildOptions()} readOnly={!editable} canFilter={predictive} /> :
-            <TextField outlined={outlined} id={id} label={label} value={value} onChange={change} readOnly={!editable} />
-      }
+      {renderFormat(format, options)}
     </div>
   )
 }
@@ -272,12 +278,12 @@ const NumberEditor = ({ field, value, onChange, outlined = false }) => {
     if (onChange) onChange(id, value)
   }
 
-  const val = value || value ==="" ? value : field.default
+  const val = value || value === "" ? value : field.default
   const min = field.min
   const max = field.max
   const disabled = !editable
 
-  console.log('NumberEditor: ', label, val, value )
+  console.log('NumberEditor: ', label, val, value)
 
   return (
     <div className='field-editor number-editor'>

package/src/domain/TablePage.js

@@ -4,7 +4,7 @@ import { Button, DataTable, DropDown, Header, Icon, MenuIcon, MenuItem, Text } f
 import { HTTPClient, Session } from '../http'
 import { PageContext, SiteContext } from '../site'
 import { ContentEditor } from './ContentEditor'
-import { Content } from './ContentType'
+import { CHECK, Content } from './ContentType'
 import { ContentViewer } from './ContentViewer'
 import { CreateContentDialog } from './CreateContentDialog'
 import "./TablePage.css"
@@ -310,15 +310,27 @@ const TableEditor = (props) => {
         })
     }
 
+    function renderGroupLabel(groupName) {
+        const grouper = schema[groupBy]
+        if (grouper.options) {
+            const options = CHECK['isFunction'](grouper.options) ? grouper.options() : grouper.options
+            const option = options.find(option => option.value === groupName)
+            console.log(grouperName, options, option )
+            return option.label ? option.label : groupName+"LABEL NOT FOUND "
+        } else {
+            return groupName
+        }
+    }
+
     function renderGroups() {
 
         const items = filter ? filter(all) : all
 
-        const groups = items.reduce((groups, filter) => {
-            const groupName = filter[groupBy]
+        const groups = items.reduce((groups, item) => {
+            const groupName = item[groupBy]
             const group = groups[groupName]
             if (!group) groups[groupName] = []
-            groups[groupName].push(filter)
+            groups[groupName].push(item)
             return groups
         }, {})
 
@@ -361,6 +373,7 @@ const TableEditor = (props) => {
             return (
                 <Fragment key={groupName}>
                     <Header title={groupName} >
+                        {renderGroupLabel(groupName)}
                         <span className="size">{groupSize}</span>
                     </Header>
                     <DataTable {...table} onRowSelection={select} editable={editable} onCheckAll={check} />