ywana-core8 0.0.301 → 0.0.304

package/package.json

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

package/src/domain/TablePage.js

@@ -23,7 +23,7 @@ export const TablePage = (props) => {
         editable,
         actions = [], dev = false, tableActions, selectionActions = [],
         canFilter = false, canAdd = true, canDelete = true, canEdit = true,
-        canQuery = false, urlQuery,
+        canQuery = false, urlQuery, user,
         groupBy, validator, scenario,
         formFilter, tableFilter, editorFilter = false
     } = props
@@ -49,7 +49,7 @@ export const TablePage = (props) => {
     useEffect(async () => {
         const context = TableContext(url, field, host, urlQuery)
         await context.load()
-        if (canQuery) await context.loadQueries()
+        if (canQuery) await context.loadQueries(user)
         setPageContext(context)
     }, [])
 
@@ -64,7 +64,9 @@ export const TablePage = (props) => {
     function saveQuery(filters) {
         const onOK = async (form) => {
             form.filters = filters
-            await pageContext.createQuery(form, urlQuery)
+            form.layout = {}
+            form.user = user
+            await pageContext.createQuery(form)
             setPageContext(Object.assign({}, pageContext))
         }
         site.openDialog(<CreateContentDialog label="Nueva query" type={QUERY} onOK={onOK} />)
@@ -136,7 +138,7 @@ export const TablePage = (props) => {
             </Header>
             {canQuery || canFilter ? (
                 <menu className="table-page">
-                    {canQuery ? <TableQueries schema={schema} url={urlQuery}/> : null}
+                    {canQuery ? <TableQueries schema={schema} /> : null}
                     {canFilter ? <TableFilters schema={schema} onSave={saveQuery}/> : null}
                 </menu>
             ) : null }
@@ -211,20 +213,14 @@ const TableSelector = (props) => {
 const TableQueries = (props) => {
 
     const [pageContext, setPageContext] = useContext(PageContext)
-    const { url } = props
     const { queries= [
         { name: "Query 1", filters: {}},
         { name: "Query 2", filters: {}},
         { name: "Query 3", filters: {}},
     ] } = pageContext
 
-    useEffect(() => {
-        pageContext.loadQueries()
-    }, [])
-
-    
     async function remove(id) {
-        await pageContext.removeQuery(id, url)
+        await pageContext.removeQuery(id)
         setPageContext(Object.assign({}, pageContext))
     }
     
@@ -526,9 +522,9 @@ const TableContext = (url, field, host, urlQuery) => {
             this.filters = filters
         },
 
-        async loadQueries() {
+        async loadQueries(user) {
             try {
-                this.queries = await API.queries(urlQuery)
+                this.queries = await API.queries(user,urlQuery)
             } catch (error) {
                 console.log(error)
             }
@@ -536,7 +532,7 @@ const TableContext = (url, field, host, urlQuery) => {
 
         async createQuery(query) {
             try {
-                await API.createQuery(query)
+                await API.createQuery(query, urlQuery)
                 this.loadQueries()
             } catch (error) {
                 console.log(error)
@@ -545,7 +541,7 @@ const TableContext = (url, field, host, urlQuery) => {
 
         async removeQuery(id) {
             try {
-                await API.removeQuery(id)
+                await API.removeQuery(id, urlQuery)
                 await this.loadQueries()
             } catch (error) {
                 console.log(error)
@@ -604,9 +600,11 @@ const TableAPI = (url, host) => {
             return http.DELETE(`${url}/${id}`)
         },
 
-        queries(url2) {
-            const url3 = url2 ? url2 : url
-            return http.GET(`${url3}queries`)
+        queries(user,url2) {
+            let url3 = url2 ? url2 : url
+            url3 = url3+"queries"
+            if (user) url3 = url3 + `?user=${user}`
+            return http.GET(url3)
         },
 
         createQuery(form, url2) {

package/src/domain/squema.js

@@ -1,6 +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"     },
+    id      : { id: "id"  , type: TYPES.STRING, editable: false                 },
+    name    : { id: "name", type: TYPES.STRING, required: true  , label: "Name" },
 }