ywana-core8 0.0.518 → 0.0.521

package/package.json

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

package/src/css/html.css

@@ -42,4 +42,16 @@ td.actions {
  */
  body > iframe[style*="2147483647"]:not([id="webpack-dev-server-client-overlay"]) {
   display: none;
+}
+
+.empty-message {
+  width: 100%;
+  height: 100%;
+  min-height: 10rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: var(--text-color-lighter)
 }

package/src/domain/TabbedTablePage.js

@@ -36,16 +36,16 @@ export const TabbedTablePage = (props) => {
     const timer = useRef(null)
     const [form, setForm] = useState(selected)
     const [tabs, setTabs] = useState([])
-    
+
     useEffect(async () => {
         const field = Object.values(schema).find(field => field.tab && field.tab === true)
-        const tabs = field.options.map(option => Object.assign({}, option, { field: field.id}))
+        const tabs = field.options.map(option => Object.assign({}, option, { field: field.id }))
         setTabs(tabs)
         context.changeTab(tabs[0])
         setPageContext(context)
     }, [])
-    
-    useEffect( async () => {
+
+    useEffect(async () => {
         if (tab) {
             const filter = { [tab.field]: tab.value }
             await pageContext.load(filter, [])
@@ -151,7 +151,7 @@ export const TabbedTablePage = (props) => {
     }
 
     function renderTabs() {
-        const selected = tab ? tab.value : null 
+        const selected = tab ? tab.value : null
         return (
             <Tabs selected={selected} onChange={changeTab} fillRight={true} fillLeft={false}>
                 {tabs.map(tab => <Tab id={tab.value} label={tab.label} />)}
@@ -179,7 +179,7 @@ export const TabbedTablePage = (props) => {
                 </menu>
             ) : null}
             <main key={id} className="table-page">
-                <TableEditor icon={icon} title={name} tabs={renderTabs()} schema={schema} delay={delay} editable={editable} groupBy={groupBy} filter={tableFilter} actions={tableActions} canDelete={canDelete} className={tableClassName}/>
+                <TableEditor icon={icon} title={name} tabs={renderTabs()} schema={schema} delay={delay} editable={editable} groupBy={groupBy} filter={tableFilter} actions={tableActions} canDelete={canDelete} className={tableClassName} />
                 {children ? <article>{children}</article> : null}
             </main>
             {renderAside()}
@@ -326,10 +326,10 @@ const TableFilters = (props) => {
 
     const likes = useMemo(() => {
         const fields = Object.values(schema)
-            return fields.reduce((likes, field) => {
-                if (field.like === true) likes.push(field.id)
-                return likes
-            }, [])
+        return fields.reduce((likes, field) => {
+            if (field.like === true) likes.push(field.id)
+            return likes
+        }, [])
     }, [schema])
 
     useEffect(() => {
@@ -446,6 +446,14 @@ export const TableEditor = (props) => {
 
     function renderGroups() {
         const items = filter ? filter(all) : all
+
+        if (items.length === 0) return (
+            <div className='empty-message'>
+                <Icon icon="search_off" />
+                <Text>No Result Found</Text>
+            </div>
+        )
+
         const groups = items.reduce((groups, item) => {
             const groupName = item[groupBy]
             const group = groups[groupName]
@@ -453,6 +461,7 @@ export const TableEditor = (props) => {
             groups[groupName].push(item)
             return groups
         }, {})
+
         return Object.keys(groups).map(groupName => {
             const table = {
                 columns: Object.values(schema)
@@ -492,7 +501,7 @@ export const TableEditor = (props) => {
                     <Header title={title} >
                         <span className="size">{groupSize}</span>
                     </Header>
-                    <DataTable {...table} onRowSelection={select} editable={editable} onCheckAll={check} className={className}/>
+                    <DataTable {...table} onRowSelection={select} editable={editable} onCheckAll={check} className={className} />
                 </Fragment>
             )
         })
@@ -550,7 +559,7 @@ const TableContext = (url, field, host, urlQuery) => {
 
                     return filters;
                 }, {}) : []
-                
+
                 if (this.tab) {
                     filters[this.tab.field] = this.tab.value
                 }
@@ -670,7 +679,7 @@ const TableAPI = (url, host) => {
                         }, "")
                         return query.concat(param)
                     } else {
-                        return like.includes(key) ? query.concat(`${key}=%${filters[key]}%&`) :  query.concat(`${key}=${filters[key]}&`)
+                        return like.includes(key) ? query.concat(`${key}=%${filters[key]}%&`) : query.concat(`${key}=${filters[key]}&`)
                     }
                 }, "")
                 queryParams = queryParams.concat(filterQuery)

package/src/html/table.js

@@ -110,10 +110,19 @@ export const DataTable = (props) => {
                     </tr>
                 </thead>
                 <tbody>
-                    {
+                    {rows.length > 0 ?
                         multiSort(rows, sortDir).map(row => (
                             <DataTableRow key={row.id} row={row} columns={columns} onSelect={select} onDrop={moveRow} editable={editable} expanded={expanded} />
-                        ))
+                        )) : (
+                            <tr>
+                                <td colSpan={columns.length+1}>
+                                    <div className='empty-message'>
+                                        <Icon icon="search_off" />
+                                        <Text>No Result Found</Text>
+                                    </div>
+                                </td>
+                            </tr>
+                        )
                     }
                 </tbody>
             </table>
@@ -194,7 +203,7 @@ const EntityCellViewer = ({ id, item, value }) => {
 
     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]

package/src/html/table.test.js

@@ -35,7 +35,7 @@ export const TableTest = (prop) => {
         setRows(next)
     }
 
-    const table = {
+    const table1 = {
         className: "xxx",
         editable: true,
         columns : [
@@ -49,9 +49,23 @@ export const TableTest = (prop) => {
         rows
     } 
 
+    const table2 = {
+        className: "xxx",
+        editable: true,
+        columns : [
+            { id: "checked", onChange: check },
+            { id: "name", label: "Name", type: "String", onChange: editCell },
+            { id: "name", label: "Name", type: "String", sortable: true },
+            { id: "thumb", label: "Thumb", type: "String", format: FORMATS.IMG },
+            { id: "color", label: "Color", type: "String", format: FORMATS.COLOR },
+            { id: "date", label: "Date", type: "String", format: FORMATS.DATE },
+        ],
+        rows: []
+    } 
+
     return (
         <div style={{ maxHeight: "20rem", overflow: "hidden", border: "solid 1px red", margin: "2rem" }}>
-           <DataTable {...table} onRowSelection={select} onCheckAll={checkAll}/>
+           <DataTable {...table2} onRowSelection={select} onCheckAll={checkAll}/>
         </div>
     )
 }