ywana-core8 0.0.301 → 0.0.304

package/dist/index.cjs

@@ -5010,13 +5010,11 @@ var EntityViewer = function EntityViewer(props) {
 
 var QUERY = {
   id: {
-    section: "Info",
     id: "id",
     type: ywanaCore8.TYPES.STRING,
     editable: false
   },
   name: {
-    section: "Info",
     id: "name",
     type: ywanaCore8.TYPES.STRING,
     required: true,
@@ -5129,6 +5127,7 @@ var TablePage = function TablePage(props) {
       _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,
@@ -5168,7 +5167,7 @@ var TablePage = function TablePage(props) {
         }
 
         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);
@@ -5202,7 +5201,9 @@ var TablePage = function TablePage(props) {
     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) {
@@ -5282,8 +5283,7 @@ 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,
-    url: urlQuery
+    schema: schema
   }) : null, canFilter ? /*#__PURE__*/React__default["default"].createElement(TableFilters, {
     schema: schema,
     onSave: saveQuery
@@ -5389,7 +5389,7 @@ 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 () {
+      return Promise.resolve(pageContext.removeQuery(id)).then(function () {
         setPageContext(Object.assign({}, pageContext));
       });
     } catch (e) {
@@ -5401,7 +5401,6 @@ var TableQueries = function TableQueries(props) {
       pageContext = _useContext3[0],
       setPageContext = _useContext3[1];
 
-  var url = props.url;
   var _pageContext$queries = pageContext.queries,
       queries = _pageContext$queries === void 0 ? [{
     name: "Query 1",
@@ -5413,9 +5412,6 @@ 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")
@@ -5844,12 +5840,12 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
     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) {
@@ -5866,7 +5862,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
         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) {
@@ -5883,7 +5879,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
         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) {
@@ -5943,9 +5939,11 @@ var TableAPI = function TableAPI(url, host) {
     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;