ywana-core8 0.0.300 → 0.0.303

package/package.json

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

package/src/domain/TablePage.js

@@ -64,7 +64,7 @@ export const TablePage = (props) => {
     function saveQuery(filters) {
         const onOK = async (form) => {
             form.filters = filters
-            await pageContext.createQuery(form, urlQuery)
+            await pageContext.createQuery(form)
             setPageContext(Object.assign({}, pageContext))
         }
         site.openDialog(<CreateContentDialog label="Nueva query" type={QUERY} onOK={onOK} />)
@@ -136,7 +136,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 +211,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))
     }
     
@@ -536,7 +530,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 +539,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)
@@ -606,18 +600,18 @@ const TableAPI = (url, host) => {
 
         queries(url2) {
             const url3 = url2 ? url2 : url
-            return http.GET(`${url3}/queries`)
+            return http.GET(`${url3}queries`)
         },
 
         createQuery(form, url2) {
             const url3 = url2 ? url2 : url
             const body = JSON.stringify(form)
-            return http.POST(`${url3}/queries`, body)
+            return http.POST(`${url3}queries`, body)
         },
 
         removeQuery(id, url2) {
             const url3 = url2 ? url2 : url
-            return http.DELETE(`${url3}/queries/${id}`)
+            return http.DELETE(`${url3}queries/${id}`)
         }, 
     }
 }