ywana-core8 0.0.299 → 0.0.302

package/package.json

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

package/src/domain/TablePage.js

@@ -47,7 +47,7 @@ export const TablePage = (props) => {
     }, [form])
 
     useEffect(async () => {
-        const context = TableContext(url, field, host)
+        const context = TableContext(url, field, host, urlQuery)
         await context.load()
         if (canQuery) await context.loadQueries()
         setPageContext(context)
@@ -211,19 +211,15 @@ 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)
+        await pageContext.removeQuery(id, url)
         setPageContext(Object.assign({}, pageContext))
     }
     
@@ -447,7 +443,7 @@ export const TableEditor = (props) => {
 /**
  * Table Context
  */
-const TableContext = (url, field, host) => {
+const TableContext = (url, field, host, urlQuery) => {
 
     const API = TableAPI(url, host)
 
@@ -527,7 +523,7 @@ const TableContext = (url, field, host) => {
 
         async loadQueries() {
             try {
-                this.queries = await API.queries()
+                this.queries = await API.queries(urlQuery)
             } catch (error) {
                 console.log(error)
             }
@@ -603,17 +599,20 @@ const TableAPI = (url, host) => {
             return http.DELETE(`${url}/${id}`)
         },
 
-        queries() {
-            return http.GET(`${url}/queries`)
+        queries(url2) {
+            const url3 = url2 ? url2 : url
+            return http.GET(`${url3}queries`)
         },
 
-        createQuery(form) {
+        createQuery(form, url2) {
+            const url3 = url2 ? url2 : url
             const body = JSON.stringify(form)
-            return http.POST(`${url}/queries`, body)
+            return http.POST(`${url3}queries`, body)
         },
 
-        removeQuery(id) {
-            return http.DELETE(`${url}/queries/${id}`)
+        removeQuery(id, url2) {
+            const url3 = url2 ? url2 : url
+            return http.DELETE(`${url3}queries/${id}`)
         }, 
     }
 }