ywana-core8 0.0.293 → 0.0.294

package/package.json

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

package/src/domain/TablePage.js

@@ -7,6 +7,7 @@ import { ContentEditor } from './ContentEditor'
 import { CHECK, Content } from './ContentType'
 import { ContentViewer } from './ContentViewer'
 import { CreateContentDialog } from './CreateContentDialog'
+import { QUERY } from './squema'
 import "./TablePage.css"
 
 /**
@@ -58,6 +59,15 @@ export const TablePage = (props) => {
         site.openDialog(<CreateContentDialog label={`Crear ${name}`} type={schema} onOK={onOK} validator={validator} filter={formFilter} />);
     }
 
+    function saveQuery(filters) {
+        const onOK = async (form) => {
+            form.filters = filters
+            await pageContext.createQuery(form)
+            setPageContext(Object.assign({}, pageContext))
+        }
+        site.openDialog(<CreateContentDialog label="Nueva query" type={QUERY} onOK={onOK} />)
+    }
+
     function change(next) {
         setForm(next)
     }
@@ -125,7 +135,7 @@ export const TablePage = (props) => {
             {canQuery || canFilter ? (
                 <menu className="table-page">
                     {canQuery ? <TableQueries schema={schema} /> : null}
-                    {canFilter ? <TableFilters schema={schema} /> : null}
+                    {canFilter ? <TableFilters schema={schema} onSave={saveQuery}/> : null}
                 </menu>
             ) : null }
             <main key={id} className="table-page">
@@ -197,11 +207,24 @@ const TableSelector = (props) => {
  * Table Queries
  */
 const TableQueries = (props) => {
+
+    const [pageContext, setPageContext] = useContext(PageContext)
+
+    useEffect(() => {
+        await pageContext.loadQueries()
+    }, [])
+
+
+    const queries = [1,2,3 ]
     return (
         <Fragment>
             <Header className="table-queries" title={<Text>Queries</Text>} />
             <main className="table-queries">
-                ...
+                {queries.map(query => (
+                    <div className="table-queries-item">
+                           
+                    </div>
+                ))}
             </main>
         </Fragment>
     )
@@ -213,7 +236,7 @@ const TableQueries = (props) => {
 const TableFilters = (props) => {
 
     const [pageContext, setPageContext] = useContext(PageContext)
-    const { schema } = props
+    const { schema, onSave } = props
     const [form, setForm] = useState({})
 
     const filterSchema = useMemo(() => {
@@ -238,6 +261,10 @@ const TableFilters = (props) => {
         change({})
     }
 
+    function save() {
+        if (onSave) onSave(form)
+    }
+
     const content = new Content(filterSchema, form)
     return (
         <Fragment>
@@ -247,6 +274,9 @@ const TableFilters = (props) => {
             <main className="table-filters">
                 <ContentEditor content={content} onChange={change} />
             </main>
+            <footer>
+                { canQuery ? <Button icon="playlist_add" label="CREAR BUSQUEDA" action={save} outlined/>}
+            </footer>
         </Fragment>
     )
 }
@@ -414,16 +444,15 @@ const TableContext = (url, field, host) => {
         checked: new Set([]),
         selected: null,
         filters: {},
+        queries: [],
 
         async load(filter) {
             try {
-
                 const filters = filter ? Object.keys(filter).reduce((filters, key) => {
                     const field = filter[key];
                     if (field) filters[key] = field;
                     return filters;
                 }, {}) : []
-
                 const data = await API.all(filters);
                 this.all = field ? data[field] : data;
             } catch (error) {
@@ -481,7 +510,35 @@ const TableContext = (url, field, host) => {
 
         changeFilters(filters) {
             this.filters = filters
+        },
+
+        async loadQueries() {
+            try {
+                this.queries = await API.queries()
+            } catch (error) {
+                console.log(error)
+            }
+        },
+
+        async createQuery(query) {
+            try {
+                await API.createQuery(query)
+                this.loadQueries()
+            } catch (error) {
+                console.log(error)
+            }
+        },
+
+        async removeQuery(id) {
+            try {
+                await API.removeQuery(id)
+                await this.loadQueries()
+            } catch (error) {
+                console.log(error)
+            }
+            return
         }
+
     }
 }
 
@@ -531,6 +588,19 @@ const TableAPI = (url, host) => {
 
         remove(id) {
             return http.DELETE(`${url}/${id}`)
-        }
+        },
+
+        queries() {
+            return http.GET(`${url}/queries`)
+        },
+
+        createQuery(form) {
+            const body = JSON.stringify(form)
+            return http.POST(`${url}/queries`, body)
+        },
+
+        removeQuery(id) {
+            return http.DELETE(`${url}/queries/${id}`)
+        }, 
     }
 }

package/src/domain/squema.js

@@ -0,0 +1,6 @@
+import { TYPES } from "ywana-core8";
+
+export const QUERY = {
+    id      : { section: "Info", id: "id"         , type: TYPES.STRING                , editable: false                     },
+    name    : { section: "Info", id: "name"       , type: TYPES.STRING                , required: true  , label: "Name"     },
+}

package/src/site/site.test.js

@@ -4,6 +4,7 @@ import { Site } from './site'
 import { Page } from './page'
 import './site.css'
 import './page.css'
+import { TablePage } from '../domain/TablePage'
 
 const SiteTest = (prop) => {
     return (
@@ -28,7 +29,8 @@ const Page1 = (props) => {
     return (
         <Fragment>
             <header>Page 1</header>
-            <main></main>
+            <main>
+            </main>
             <footer>f1</footer>
         </Fragment>
     )