ywana-core8 0.0.298 → 0.0.301

package/dist/index.cjs

@@ -5120,14 +5120,15 @@ var TablePage = function TablePage(props) {
       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,
@@ -5160,7 +5161,7 @@ var TablePage = function TablePage(props) {
   }, [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);
@@ -5201,7 +5202,7 @@ var TablePage = function TablePage(props) {
     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) {
@@ -5281,7 +5282,8 @@ var TablePage = function TablePage(props) {
   })) : 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
@@ -5385,11 +5387,23 @@ var TableSelector = function TableSelector(props) {
 
 
 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: {}
   }, {
@@ -5398,13 +5412,16 @@ var TableQueries = function TableQueries(props) {
   }, {
     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, {
@@ -5414,10 +5431,10 @@ var TableQueries = function TableQueries(props) {
       clickable: true,
       size: "small",
       action: function action() {
-        return remove();
+        return remove(query.id);
       }
     }));
-  })));
+  }) : /*#__PURE__*/React__default["default"].createElement("div", null, "...empty...")));
 };
 /**
  * Table Filters
@@ -5436,9 +5453,9 @@ var TableFilters = function TableFilters(props) {
     }
   };
 
-  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;
@@ -5543,9 +5560,9 @@ var TableEditor = function TableEditor(props) {
 
   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;
@@ -5717,7 +5734,7 @@ var TableEditor = function TableEditor(props) {
  * Table Context
  */
 
-var TableContext = function TableContext(url, field, host) {
+var TableContext = function TableContext(url, field, host, urlQuery) {
   var API = TableAPI(url, host);
   return {
     all: [],
@@ -5832,7 +5849,7 @@ var TableContext = function TableContext(url, field, host) {
         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) {
@@ -5926,15 +5943,18 @@ var TableAPI = function TableAPI(url, host) {
     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);
     }
   };
 };