ywana-core8 0.0.471 → 0.0.474

package/package.json

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

package/src/domain/ContentType.js

@@ -25,6 +25,7 @@ export const FORMATS = {
     TOKENS: 'TOKENS'
 }
 
+
 /**
  * CHECK
  */

package/src/domain/TabbedTablePage.js

@@ -45,10 +45,9 @@ export const TabbedTablePage = (props) => {
     }, [])
     
     useEffect( async () => {
-        console.log("TAB", tab)
         if (tab) {
             const filter = { [tab.field]: tab.value }
-            await pageContext.load(filter, false)
+            await pageContext.load(filter, [])
             setPageContext(Object.assign({}, pageContext))
         }
     }, [tab])
@@ -102,7 +101,6 @@ export const TabbedTablePage = (props) => {
     }
 
     async function save() {
-        console.log('saving.....')
         await pageContext.update(form)
         setPageContext(Object.assign({}, pageContext))
     }
@@ -153,7 +151,6 @@ export const TabbedTablePage = (props) => {
 
     function renderTabs() {
         const selected = tab ? tab.value : null 
-        console.log(selected)
         return (
             <Tabs selected={selected} onChange={changeTab}>
                 {tabs.map(tab => <Tab id={tab.value} label={tab.label} />)}
@@ -173,9 +170,6 @@ export const TabbedTablePage = (props) => {
                     </MenuIcon>
                 ) : null}
                 {renderActions()}
-
-                    {renderTabs()}
-
             </Header>
             {canQuery || canFilter ? (
                 <menu className="table-page">
@@ -184,7 +178,7 @@ export const TabbedTablePage = (props) => {
                 </menu>
             ) : null}
             <main key={id} className="table-page">
-                <TableEditor icon={icon} title={name} schema={schema} delay={delay} editable={editable} groupBy={groupBy} filter={tableFilter} actions={tableActions} canDelete={canDelete} />
+                <TableEditor icon={icon} title={name} tabs={renderTabs()} schema={schema} delay={delay} editable={editable} groupBy={groupBy} filter={tableFilter} actions={tableActions} canDelete={canDelete} />
                 {children ? <article>{children}</article> : null}
             </main>
             {renderAside()}
@@ -329,6 +323,14 @@ const TableFilters = (props) => {
         return filterSchema
     }, [schema])
 
+    const likes = useMemo(() => {
+        const fields = Object.values(schema)
+            return fields.reduce((likes, field) => {
+                if (field.like === true) likes.push(field.id)
+                return likes
+            }, [])
+    }, [schema])
+
     useEffect(() => {
         if (filters) setForm(filters)
     }, [filters])
@@ -342,7 +344,7 @@ const TableFilters = (props) => {
     }
 
     async function reload() {
-        await pageContext.load(form)
+        await pageContext.load(form, likes)
         setPageContext(Object.assign({}, pageContext))
     }
 
@@ -378,7 +380,7 @@ export const TableEditor = (props) => {
     const site = useContext(SiteContext)
     const [pageContext, setPageContext] = useContext(PageContext)
     const { all = [], filters } = pageContext
-    const { icon, title, schema, editable, canDelete, filter, actions } = props
+    const { icon, title, schema, editable, canDelete, filter, actions, tabs } = props
     const [groupBy, setGroupBy] = useState(props.groupBy)
 
     function changeGroup(id, value) {
@@ -505,6 +507,7 @@ export const TableEditor = (props) => {
         <Fragment>
             <Header icon={icon} title={<Text>{title}</Text>}>
                 <DropDown id="groupBy" label="Agrupar Por" value={groupBy} options={buildGroupOptions(schema)} onChange={changeGroup} />
+                {tabs}
             </Header>
             <main className="table-editor">
                 {renderGroups()}
@@ -529,7 +532,7 @@ const TableContext = (url, field, host, urlQuery) => {
         queries: [],
         tab: null,
 
-        async load(filter, like) {
+        async load(filter, like = []) {
             try {
                 const filters = filter ? Object.keys(filter).reduce((filters, key) => {
                     const field = filter[key];
@@ -583,7 +586,7 @@ const TableContext = (url, field, host, urlQuery) => {
         async create(form) {
             try {
                 await API.create(form);
-                await this.load({}, false);
+                await this.load({}, []);
             } catch (error) {
                 console.log(error)
             }
@@ -652,7 +655,7 @@ const TableAPI = (url, host) => {
     const http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
 
     return {
-        all(filters, like = true) {
+        all(filters, like = []) {
             let queryParams = "?"
             if (filters) {
                 const filterQuery = Object.keys(filters).reduce((query, key) => {
@@ -666,7 +669,7 @@ const TableAPI = (url, host) => {
                         }, "")
                         return query.concat(param)
                     } else {
-                        return like ? 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/site/site.test.js

@@ -115,19 +115,19 @@ const Page2 = (props) => {
 const Page3 = (props) => {
 
     const schema = {
-        name  : { id: "name"  , type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: false, column: true , filter: true , label: "Name"   },
-        state : { id: "state" , type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: true , column: true , filter: false, label: "State" , options: [
+        name  : { id: "name"  , type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: false, column: true , filter: true , like: true, label: "Name"   },
+        state : { id: "state" , type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: true , column: true , filter: false            , label: "State" , options: [
             { label: "Pendiente", value: "NOT_CLASSIFIED" },
             { label: "Clasificada", value: "CLASSIFIED"}, 
         ]},
-        field1: { id: "field1", type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: false, column: true , filter: true , label: "field1" },
-        field2: { id: "field2", type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: false, column: true , filter: true , label: "field2" },
-        field4: { id: "field4", type: TYPES.STRING, format: FORMATS.COLOR, required: true, tab: false, column: true , filter: true , label: "Color"  },
+        field1: { id: "field1", type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: false, column: true , filter: true             , label: "field1" },
+        field2: { id: "field2", type: TYPES.STRING, format: FORMATS.NONE , required: true, tab: false, column: true , filter: true             , label: "field2" },
+        field4: { id: "field4", type: TYPES.STRING, format: FORMATS.COLOR, required: true, tab: false, column: true , filter: true             , label: "Color"  },
     }
 
     return (
         <Fragment>
-            <TabbedTablePage title="Referencias" schema={schema} host="http://localhost:3000" url="/references"/>
+            <TabbedTablePage title="Referencias" schema={schema} host="http://localhost:3000" url="/references" canFilter={true} />
         </Fragment>
     )
 }