ywana-core8 0.0.19 → 0.0.23

package/package.json

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

package/src/domain/TablePage.js

@@ -1,9 +1,10 @@
 import equal from 'deep-equal'
 import React, { Fragment, useContext, useEffect, useMemo, useRef, useState } from 'react'
-import { EditContentDialog } from '.'
-import { Content, ContentEditor, HTTPClient, PageContext, Session, SiteContext } from '..'
-import { SCENARIO1 } from '../../dev/scenario1'
-import { BuildGroupOptions } from '../../pages/kinds/options'
+import { EditContentDialog } from './EditContentDialog'
+import { Content } from './ContentType'
+import { ContentEditor } from './ContentEditor'
+import { HTTPClient, Session } from '../http'
+import { SiteContext, PageContext } from '../site'
 import { Button, DataTable, DropDown, Header, Icon, MenuIcon, MenuItem, Text } from '../html'
 import "./TablePage.css"
 
@@ -15,7 +16,7 @@ const http = HTTPClient(window.API || process.env.REACT_APP_API, Session);
 export const TablePage = (props) => {
 
     const site = useContext(SiteContext)
-    const { id = "table", icon, title, name = "table 1", schema, url, field, delay = 1000, actions, editable, canAdd = true, dev = true, autosave = true, groupBy, validator, scenario } = props
+    const { id = "table", icon, title, name = "table 1", schema, url, field, delay = 1000, actions, editable, canAdd = true, dev = false, autosave = true, groupBy, validator, scenario } = props
     const [pageContext, setPageContext] = useContext(PageContext)
     const { selected } = pageContext
     const timer = useRef(null)
@@ -66,7 +67,7 @@ export const TablePage = (props) => {
     async function playScenario() {
         const promises1 = pageContext.all.map(async item => await pageContext.remove(item.id))
         Promise.all(promises1).then(async () => {
-            const promises2 = SCENARIO1.map(async (item) => await pageContext.create(item))
+            const promises2 = scenario.map(async (item) => await pageContext.create(item))
             Promise.all(promises2).then(async () => {
                 await pageContext.load()
                 setPageContext(Object.assign({}, pageContext))
@@ -266,10 +267,16 @@ const TableEditor = (props) => {
 
     table.columns.push({ id: "actions" })
 
+    function buildGroupOptions(schema) {
+        return Object.values(schema)
+            .filter(field => field.grouper === true)
+            .map(field => ({ label: field.label, value: field.id }))
+    }
+
     return (
         <Fragment>
             <Header icon={icon} title={<Text>{title}</Text>}>
-                <DropDown id="groupBy" label="Agrupar Por" value={groupBy} options={BuildGroupOptions(schema)} onChange={changeGroup} />
+                <DropDown id="groupBy" label="Agrupar Por" value={groupBy} options={buildGroupOptions(schema)} onChange={changeGroup} />
             </Header>
             <main className="table-editor">
                 {renderGroups()}
@@ -296,7 +303,7 @@ const TableContext = (url, field) => {
 
                 const filters = filter ? Object.keys(filter).reduce((filters, key) => {
                     const field = filter[key];
-                    if (field) filters[key] = field;
+                    if (field) filters[key] === field;
                     return filters;
                 }, {}) : []
 
@@ -365,6 +372,11 @@ const TableAPI = (url) => {
                 const filterQuery = Object.keys(filters).reduce((query, key) => {
                     if (typeof (filters[key]) === 'boolean') {
                         return query.concat(`${key}=${filters[key]}&`)
+                    } else if (Array.isArray(filters[key])) {
+                        const param =  filters[key].length === 0 ? '' : filters[key].reduce((param,field) => {
+                            param.concat(`${key}=${field}&`)
+                        }, '')
+                        return query.concat(param)
                     } else {
                         return query.concat(`${key}=%${filters[key]}%&`)
                     }

package/src/html/checkbox.js

@@ -16,7 +16,6 @@ export const CheckBox = (props) => {
 
     const labelTxt = <Text>{label}</Text>
     
-    console.log(label, value)
     return value === true  ? (
         <div className="checkbox" key={`${id}1`}>
             <input id={id} type="checkbox" placeholder={placeholder} checked value={value} onChange={change} />

package/src/html/tab.js

@@ -24,7 +24,7 @@ export const Tabs = (props) => {
   return (
     <div class="tabs">
       {tabs}
-      <div class="tab-filler" />
+      <div className="tab-filler" />
     </div>
   )
 }

package/src/html/table.js

@@ -102,7 +102,7 @@ const DataTableRow = (props) => {
     return (
         <Fragment>
             <tr onClick={ev => onSelect(row, ev)}>
-                {columns.map(column => <DataTableCell row={row} column={column} cell={row[column.id]} editable={editable}/>)}
+                {columns.map(column => <DataTableCell key={row.id} row={row} column={column} cell={row[column.id]} editable={editable}/>)}
                 {row.info ? <Icon icon={infoIcon} clickable action={() => toggleInfo(!isInfoOpen)} /> : null}
             </tr>
             {row.info && isInfoOpen ? (

package/src/html/tokenfield.js

@@ -6,7 +6,7 @@ import './tokenfield.css'
 /**
  * Token Field
  */
-export const TokenField = ({ id, label, init, onChange }) => {
+export const TokenField = ({ id, label, init = [], onChange }) => {
   const mounted = useRef(false)
   const [value, setValue] = useState()
   const [tokens, setTokens] = useState(init)