ywana-core8 0.0.297 → 0.0.300

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,9 +5161,17 @@ 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 () {
-        setPageContext(context);
+        function _temp2() {
+          setPageContext(context);
+        }
+
+        var _temp = function () {
+          if (canQuery) return Promise.resolve(context.loadQueries()).then(function () {});
+        }();
+
+        return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -5193,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) {
@@ -5273,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
@@ -5377,23 +5387,54 @@ var TableSelector = function TableSelector(props) {
 
 
 var TableQueries = function TableQueries(props) {
+  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];
+      pageContext = _useContext3[0],
+      setPageContext = _useContext3[1];
 
+  var url = props.url;
+  var _pageContext$queries = pageContext.queries,
+      queries = _pageContext$queries === void 0 ? [{
+    name: "Query 1",
+    filters: {}
+  }, {
+    name: "Query 2",
+    filters: {}
+  }, {
+    name: "Query 3",
+    filters: {}
+  }] : _pageContext$queries;
   React.useEffect(function () {
     pageContext.loadQueries();
   }, []);
-  var queries = [1, 2, 3];
   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, {
+      icon: "star"
+    }), /*#__PURE__*/React__default["default"].createElement("label", null, query.name), /*#__PURE__*/React__default["default"].createElement(Icon, {
+      icon: "close",
+      clickable: true,
+      size: "small",
+      action: function action() {
+        return remove(query.id);
+      }
+    }));
+  }) : /*#__PURE__*/React__default["default"].createElement("div", null, "...empty...")));
 };
 /**
  * Table Filters
@@ -5501,7 +5542,7 @@ var TableEditor = function TableEditor(props) {
   var remove = function remove(id) {
     try {
       return Promise.resolve(site.confirm("Are you sure ?")).then(function (confirm) {
-        var _temp = function () {
+        var _temp3 = function () {
           if (confirm) {
             return Promise.resolve(pageContext.remove(id)).then(function () {
               pageContext.clear();
@@ -5510,7 +5551,7 @@ var TableEditor = function TableEditor(props) {
           }
         }();
 
-        if (_temp && _temp.then) return _temp.then(function () {});
+        if (_temp3 && _temp3.then) return _temp3.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -5693,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: [],
@@ -5705,7 +5746,7 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this2 = this;
 
-        var _temp3 = _catch(function () {
+        var _temp5 = _catch(function () {
           var filters = filter ? Object.keys(filter).reduce(function (filters, key) {
             var field = filter[key];
             if (field) filters[key] = field;
@@ -5718,7 +5759,7 @@ var TableContext = function TableContext(url, field, host) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
+        return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5753,7 +5794,7 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this5 = this;
 
-        var _temp5 = _catch(function () {
+        var _temp7 = _catch(function () {
           return Promise.resolve(API.create(form)).then(function () {
             return Promise.resolve(_this5.load()).then(function () {});
           });
@@ -5761,7 +5802,7 @@ var TableContext = function TableContext(url, field, host) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(function () {}) : void 0);
+        return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5770,7 +5811,7 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this7 = this;
 
-        var _temp7 = _catch(function () {
+        var _temp9 = _catch(function () {
           return Promise.resolve(API.update(form)).then(function () {
             return Promise.resolve(_this7.load()).then(function () {});
           });
@@ -5778,7 +5819,7 @@ var TableContext = function TableContext(url, field, host) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
+        return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5787,7 +5828,7 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this9 = this;
 
-        var _temp9 = _catch(function () {
+        var _temp11 = _catch(function () {
           return Promise.resolve(API.remove(id)).then(function () {
             return Promise.resolve(_this9.load()).then(function () {});
           });
@@ -5795,7 +5836,7 @@ var TableContext = function TableContext(url, field, host) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
+        return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5807,15 +5848,15 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this11 = this;
 
-        var _temp11 = _catch(function () {
-          return Promise.resolve(API.queries()).then(function (_API$queries) {
+        var _temp13 = _catch(function () {
+          return Promise.resolve(API.queries(urlQuery)).then(function (_API$queries) {
             _this11.queries = _API$queries;
           });
         }, function (error) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
+        return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5824,7 +5865,7 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this13 = this;
 
-        var _temp13 = _catch(function () {
+        var _temp15 = _catch(function () {
           return Promise.resolve(API.createQuery(query)).then(function () {
             _this13.loadQueries();
           });
@@ -5832,7 +5873,7 @@ var TableContext = function TableContext(url, field, host) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
+        return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5841,7 +5882,7 @@ var TableContext = function TableContext(url, field, host) {
       try {
         var _this15 = this;
 
-        var _temp15 = _catch(function () {
+        var _temp17 = _catch(function () {
           return Promise.resolve(API.removeQuery(id)).then(function () {
             return Promise.resolve(_this15.loadQueries()).then(function () {});
           });
@@ -5849,7 +5890,7 @@ var TableContext = function TableContext(url, field, host) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(function () {}) : void 0);
+        return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -5902,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);
     }
   };
 };