ywana-core8 0.0.298 → 0.0.301

package/dist/index.umd.js

@@ -5114,14 +5114,15 @@
         selectionActions = _props$selectionActio === void 0 ? [] : _props$selectionActio,
         _props$canFilter = props.canFilter,
         canFilter = _props$canFilter === void 0 ? false : _props$canFilter,
-        _props$canQuery = props.canQuery,
-        canQuery = _props$canQuery === void 0 ? false : _props$canQuery,
         _props$canAdd = props.canAdd,
         canAdd = _props$canAdd === void 0 ? true : _props$canAdd,
         _props$canDelete = props.canDelete,
         canDelete = _props$canDelete === void 0 ? true : _props$canDelete,
         _props$canEdit = props.canEdit,
         canEdit = _props$canEdit === void 0 ? true : _props$canEdit,
+        _props$canQuery = props.canQuery,
+        canQuery = _props$canQuery === void 0 ? false : _props$canQuery,
+        urlQuery = props.urlQuery,
         groupBy = props.groupBy,
         validator = props.validator,
         scenario = props.scenario,
@@ -5154,7 +5155,7 @@
     }, [form]);
     React.useEffect(function () {
       try {
-        var context = TableContext(url, field, host);
+        var context = TableContext(url, field, host, urlQuery);
         return Promise.resolve(context.load()).then(function () {
           function _temp2() {
             setPageContext(context);
@@ -5195,7 +5196,7 @@
       var onOK = function onOK(form) {
         try {
           form.filters = filters;
-          return Promise.resolve(pageContext.createQuery(form)).then(function () {
+          return Promise.resolve(pageContext.createQuery(form, urlQuery)).then(function () {
             setPageContext(Object.assign({}, pageContext));
           });
         } catch (e) {
@@ -5275,7 +5276,8 @@
     })) : null, renderActions()), canQuery || canFilter ? /*#__PURE__*/React__default["default"].createElement("menu", {
       className: "table-page"
     }, canQuery ? /*#__PURE__*/React__default["default"].createElement(TableQueries, {
-      schema: schema
+      schema: schema,
+      url: urlQuery
     }) : null, canFilter ? /*#__PURE__*/React__default["default"].createElement(TableFilters, {
       schema: schema,
       onSave: saveQuery
@@ -5379,11 +5381,23 @@
 
 
   var TableQueries = function TableQueries(props) {
-    function remove(id) {
-      alert("TODO: remove query");
-    }
+    var remove = function remove(id) {
+      try {
+        return Promise.resolve(pageContext.removeQuery(id, url)).then(function () {
+          setPageContext(Object.assign({}, pageContext));
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+
+    var _useContext3 = React.useContext(PageContext),
+        pageContext = _useContext3[0],
+        setPageContext = _useContext3[1];
 
-    var queries = [{
+    var url = props.url;
+    var _pageContext$queries = pageContext.queries,
+        queries = _pageContext$queries === void 0 ? [{
       name: "Query 1",
       filters: {}
     }, {
@@ -5392,13 +5406,16 @@
     }, {
       name: "Query 3",
       filters: {}
-    }];
+    }] : _pageContext$queries;
+    React.useEffect(function () {
+      pageContext.loadQueries();
+    }, []);
     return /*#__PURE__*/React__default["default"].createElement(React.Fragment, null, /*#__PURE__*/React__default["default"].createElement(Header, {
       className: "table-queries",
       title: /*#__PURE__*/React__default["default"].createElement(Text, null, "Queries")
     }), /*#__PURE__*/React__default["default"].createElement("main", {
       className: "table-queries"
-    }, queries.map(function (query) {
+    }, queries ? queries.map(function (query) {
       return /*#__PURE__*/React__default["default"].createElement("div", {
         className: "table-queries-item"
       }, /*#__PURE__*/React__default["default"].createElement(Icon, {
@@ -5408,10 +5425,10 @@
         clickable: true,
         size: "small",
         action: function action() {
-          return remove();
+          return remove(query.id);
         }
       }));
-    })));
+    }) : /*#__PURE__*/React__default["default"].createElement("div", null, "...empty...")));
   };
   /**
    * Table Filters
@@ -5430,9 +5447,9 @@
       }
     };
 
-    var _useContext3 = React.useContext(PageContext),
-        pageContext = _useContext3[0],
-        setPageContext = _useContext3[1];
+    var _useContext4 = React.useContext(PageContext),
+        pageContext = _useContext4[0],
+        setPageContext = _useContext4[1];
 
     var schema = props.schema,
         onSave = props.onSave;
@@ -5537,9 +5554,9 @@
 
     var site = React.useContext(SiteContext);
 
-    var _useContext4 = React.useContext(PageContext),
-        pageContext = _useContext4[0],
-        setPageContext = _useContext4[1];
+    var _useContext5 = React.useContext(PageContext),
+        pageContext = _useContext5[0],
+        setPageContext = _useContext5[1];
 
     var _pageContext$all = pageContext.all,
         all = _pageContext$all === void 0 ? [] : _pageContext$all;
@@ -5711,7 +5728,7 @@
    * Table Context
    */
 
-  var TableContext = function TableContext(url, field, host) {
+  var TableContext = function TableContext(url, field, host, urlQuery) {
     var API = TableAPI(url, host);
     return {
       all: [],
@@ -5826,7 +5843,7 @@
           var _this11 = this;
 
           var _temp13 = _catch(function () {
-            return Promise.resolve(API.queries()).then(function (_API$queries) {
+            return Promise.resolve(API.queries(urlQuery)).then(function (_API$queries) {
               _this11.queries = _API$queries;
             });
           }, function (error) {
@@ -5920,15 +5937,18 @@
       remove: function remove(id) {
         return http.DELETE(url + "/" + id);
       },
-      queries: function queries() {
-        return http.GET(url + "/queries");
+      queries: function queries(url2) {
+        var url3 = url2 ? url2 : url;
+        return http.GET(url3 + "queries");
       },
-      createQuery: function createQuery(form) {
+      createQuery: function createQuery(form, url2) {
+        var url3 = url2 ? url2 : url;
         var body = JSON.stringify(form);
-        return http.POST(url + "/queries", body);
+        return http.POST(url3 + "queries", body);
       },
-      removeQuery: function removeQuery(id) {
-        return http.DELETE(url + "/queries/" + id);
+      removeQuery: function removeQuery(id, url2) {
+        var url3 = url2 ? url2 : url;
+        return http.DELETE(url3 + "queries/" + id);
       }
     };
   };