ywana-core8 0.0.301 → 0.0.304

package/dist/index.umd.js

@@ -5004,13 +5004,11 @@
 
   var QUERY = {
     id: {
-      section: "Info",
       id: "id",
       type: ywanaCore8.TYPES.STRING,
       editable: false
     },
     name: {
-      section: "Info",
       id: "name",
       type: ywanaCore8.TYPES.STRING,
       required: true,
@@ -5123,6 +5121,7 @@
         _props$canQuery = props.canQuery,
         canQuery = _props$canQuery === void 0 ? false : _props$canQuery,
         urlQuery = props.urlQuery,
+        user = props.user,
         groupBy = props.groupBy,
         validator = props.validator,
         scenario = props.scenario,
@@ -5162,7 +5161,7 @@
           }
 
           var _temp = function () {
-            if (canQuery) return Promise.resolve(context.loadQueries()).then(function () {});
+            if (canQuery) return Promise.resolve(context.loadQueries(user)).then(function () {});
           }();
 
           return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
@@ -5196,7 +5195,9 @@
       var onOK = function onOK(form) {
         try {
           form.filters = filters;
-          return Promise.resolve(pageContext.createQuery(form, urlQuery)).then(function () {
+          form.layout = {};
+          form.user = user;
+          return Promise.resolve(pageContext.createQuery(form)).then(function () {
             setPageContext(Object.assign({}, pageContext));
           });
         } catch (e) {
@@ -5276,8 +5277,7 @@
     })) : null, renderActions()), canQuery || canFilter ? /*#__PURE__*/React__default["default"].createElement("menu", {
       className: "table-page"
     }, canQuery ? /*#__PURE__*/React__default["default"].createElement(TableQueries, {
-      schema: schema,
-      url: urlQuery
+      schema: schema
     }) : null, canFilter ? /*#__PURE__*/React__default["default"].createElement(TableFilters, {
       schema: schema,
       onSave: saveQuery
@@ -5383,7 +5383,7 @@
   var TableQueries = function TableQueries(props) {
     var remove = function remove(id) {
       try {
-        return Promise.resolve(pageContext.removeQuery(id, url)).then(function () {
+        return Promise.resolve(pageContext.removeQuery(id)).then(function () {
           setPageContext(Object.assign({}, pageContext));
         });
       } catch (e) {
@@ -5395,7 +5395,6 @@
         pageContext = _useContext3[0],
         setPageContext = _useContext3[1];
 
-    var url = props.url;
     var _pageContext$queries = pageContext.queries,
         queries = _pageContext$queries === void 0 ? [{
       name: "Query 1",
@@ -5407,9 +5406,6 @@
       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")
@@ -5838,12 +5834,12 @@
       changeFilters: function changeFilters(filters) {
         this.filters = filters;
       },
-      loadQueries: function loadQueries() {
+      loadQueries: function loadQueries(user) {
         try {
           var _this11 = this;
 
           var _temp13 = _catch(function () {
-            return Promise.resolve(API.queries(urlQuery)).then(function (_API$queries) {
+            return Promise.resolve(API.queries(user, urlQuery)).then(function (_API$queries) {
               _this11.queries = _API$queries;
             });
           }, function (error) {
@@ -5860,7 +5856,7 @@
           var _this13 = this;
 
           var _temp15 = _catch(function () {
-            return Promise.resolve(API.createQuery(query)).then(function () {
+            return Promise.resolve(API.createQuery(query, urlQuery)).then(function () {
               _this13.loadQueries();
             });
           }, function (error) {
@@ -5877,7 +5873,7 @@
           var _this15 = this;
 
           var _temp17 = _catch(function () {
-            return Promise.resolve(API.removeQuery(id)).then(function () {
+            return Promise.resolve(API.removeQuery(id, urlQuery)).then(function () {
               return Promise.resolve(_this15.loadQueries()).then(function () {});
             });
           }, function (error) {
@@ -5937,9 +5933,11 @@
       remove: function remove(id) {
         return http.DELETE(url + "/" + id);
       },
-      queries: function queries(url2) {
+      queries: function queries(user, url2) {
         var url3 = url2 ? url2 : url;
-        return http.GET(url3 + "queries");
+        url3 = url3 + "queries";
+        if (user) url3 = url3 + ("?user=" + user);
+        return http.GET(url3);
       },
       createQuery: function createQuery(form, url2) {
         var url3 = url2 ? url2 : url;