ywana-core8 0.0.834 → 0.0.836

package/dist/index.cjs

@@ -4918,86 +4918,6 @@ var Wizard = function Wizard(props) {
   }, prevButton, /*#__PURE__*/React__default["default"].createElement("div", null), nextButton)));
 };
 
-/**
- * Collection API
- */
-
-var CollectionAPI$1 = function CollectionAPI(url, host) {
-  var http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
-  /**
-   * objectToQueryParamString
-   * 
-   * @param {*} obj 
-   * @returns 
-   */
-
-  function objectToQueryParamString(obj, likes) {
-    if (isEmpty(obj)) {
-      return "";
-    }
-
-    var notEmptyFields = Object.keys(obj).filter(function (key) {
-      return !isEmpty(obj[key]);
-    });
-    var paramString = notEmptyFields.reduce(function (query, key) {
-      var value = obj[key];
-      var like = likes.includes(key) ? '%' : '';
-
-      if (Array.isArray(value)) {
-        var values = value.map(function (v) {
-          return key + "=" + like + v + like;
-        }).join("&");
-        return "" + query + values + "&";
-      } else if (typeof value === "object") {
-        var params = objectToQueryParamString(value, likes);
-        params.split("&").forEach(function (param) {
-          query = query.concat(key + "." + param + "&");
-        });
-        return query;
-      } else {
-        return "" + query + key + "=" + like + value + like + "&";
-      }
-    }, "");
-    return paramString;
-  }
-
-  return {
-    all: function all(filters, likes, page) {
-      if (likes === void 0) {
-        likes = [];
-      }
-
-      var queryParams = page ? "?page=" + page + "&" : "?";
-      var filterQuery = objectToQueryParamString(filters, likes);
-      queryParams = "" + queryParams + filterQuery;
-      queryParams = queryParams.substring(0, queryParams.length - 1);
-      return http.GET("" + url + queryParams);
-    },
-    find: function find(id) {
-      return http.GET(url + "/" + id);
-    },
-    create: function create(form) {
-      var body = JSON.stringify(form);
-      return http.POST(url, body);
-    },
-    update: function update(form) {
-      var body = JSON.stringify(form);
-      return http.PUT(url + "/" + form.id, body);
-    },
-    updateProperty: function updateProperty(id, propertyName, form) {
-      var body = JSON.stringify(form);
-      return http.PUT(url + "/" + id + "/" + propertyName, body);
-    },
-    patch: function patch(id, form) {
-      var body = JSON.stringify(form);
-      return http.PATCH(url + "/" + id, body);
-    },
-    remove: function remove(id) {
-      return http.DELETE(url + "/" + id);
-    }
-  };
-};
-
 /**
  * Task Context
  */
@@ -5203,35 +5123,24 @@ var TaskContextProvider = function TaskContextProvider(props) {
       _props$url = props.url,
       url = _props$url === void 0 ? "/tasks" : _props$url,
       _props$frequency = props.frequency,
-      frequency = _props$frequency === void 0 ? 5000 : _props$frequency,
-      children = props.children,
-      _props$listeners = props.listeners,
-      listeners = _props$listeners === void 0 ? {} : _props$listeners;
+      frequency = _props$frequency === void 0 ? 1000 : _props$frequency,
+      children = props.children;
   var API = CollectionAPI$1(url, host);
 
-  var _listeners = Object.assign({}, listeners);
-
-  function addListener(taskID, listener) {
-    _listeners[taskID] = listener;
-  }
-
-  function removeListener(taskID) {
-    delete _listeners[taskID];
-  }
+  var _useState = React.useState({}),
+      listeners = _useState[0],
+      setListeners = _useState[1];
 
   React.useEffect(function () {
-    var interval = setInterval(function () {
+    var _interval = setInterval(function () {
       try {
-        var taskIDs = Object.keys(_listeners);
-        if (taskIDs.length === 0) return Promise.resolve();
+        var taskIDs = Object.keys(listeners);
 
         var _temp2 = _forTo(taskIDs, function (i) {
           var taskID = taskIDs[i];
+          var listener = listeners[taskID];
           return Promise.resolve(task(taskID)).then(function (tsk) {
-            if (tsk) {
-              var listener = _listeners[taskID];
-              if (listener) listener(tsk, value);
-            }
+            if (listener) listener(tsk);
           });
         });
 
@@ -5240,17 +5149,34 @@ var TaskContextProvider = function TaskContextProvider(props) {
         return Promise.reject(e);
       }
     }, frequency);
+
     return function () {
-      return clearInterval(interval);
+      return clearInterval(_interval);
     };
-  }, []);
+  }, [listeners]);
+
+  function addListener(taskID, listener) {
+    var _extends2;
+
+    var next = _extends({}, listeners, (_extends2 = {}, _extends2[taskID] = listener, _extends2));
+
+    setListeners(next);
+  }
+
+  function removeListener(taskID) {
+    var next = _extends({}, listeners);
+
+    delete next[taskID];
+    setListeners(next);
+  }
+
   var value = {
     tasks: tasks,
     task: task,
     createTask: createTask,
     updateTask: updateTask,
     removeTask: removeTask,
-    listeners: _listeners,
+    listeners: listeners,
     addListener: addListener,
     removeListener: removeListener
   };
@@ -5285,9 +5211,9 @@ var TaskProgress = function TaskProgress(props) {
       autoreload = _props$autoreload === void 0 ? true : _props$autoreload,
       onComplete = props.onComplete;
 
-  var _useState = React.useState(0),
-      progress = _useState[0],
-      setProgress = _useState[1];
+  var _useState2 = React.useState(0),
+      progress = _useState2[0],
+      setProgress = _useState2[1];
 
   React.useEffect(function () {
     if (autoreload) {
@@ -5337,10 +5263,10 @@ var TaskMonitor = function TaskMonitor(props) {
       frequency = _props$frequency2 === void 0 ? 5000 : _props$frequency2;
   var context = React.useContext(TaskContext);
 
-  var _useState2 = React.useState([]),
-      _useState2$ = _useState2[0],
-      tasks = _useState2$ === void 0 ? [] : _useState2$,
-      setTasks = _useState2[1];
+  var _useState3 = React.useState([]),
+      _useState3$ = _useState3[0],
+      tasks = _useState3$ === void 0 ? [] : _useState3$,
+      setTasks = _useState3[1];
 
   React.useEffect(function () {
     refresh();
@@ -5418,9 +5344,7 @@ var TaskMonitor = function TaskMonitor(props) {
   }, /*#__PURE__*/React__default["default"].createElement(Header, {
     icon: "list",
     title: title
-  }, context.listeners ? /*#__PURE__*/React__default["default"].createElement(Chip, {
-    label: Object.keys(context.listeners).length
-  }) : null), /*#__PURE__*/React__default["default"].createElement("main", null, /*#__PURE__*/React__default["default"].createElement(DataTable, table)));
+  }), /*#__PURE__*/React__default["default"].createElement("main", null, /*#__PURE__*/React__default["default"].createElement(DataTable, table)));
 };
 /**
  * Task Info
@@ -6952,6 +6876,86 @@ var EditContentDialog = function EditContentDialog(_ref) {
   }));
 };
 
+/**
+ * Collection API
+ */
+
+var CollectionAPI$1 = function CollectionAPI(url, host) {
+  var http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
+  /**
+   * objectToQueryParamString
+   * 
+   * @param {*} obj 
+   * @returns 
+   */
+
+  function objectToQueryParamString(obj, likes) {
+    if (isEmpty(obj)) {
+      return "";
+    }
+
+    var notEmptyFields = Object.keys(obj).filter(function (key) {
+      return !isEmpty(obj[key]);
+    });
+    var paramString = notEmptyFields.reduce(function (query, key) {
+      var value = obj[key];
+      var like = likes.includes(key) ? '%' : '';
+
+      if (Array.isArray(value)) {
+        var values = value.map(function (v) {
+          return key + "=" + like + v + like;
+        }).join("&");
+        return "" + query + values + "&";
+      } else if (typeof value === "object") {
+        var params = objectToQueryParamString(value, likes);
+        params.split("&").forEach(function (param) {
+          query = query.concat(key + "." + param + "&");
+        });
+        return query;
+      } else {
+        return "" + query + key + "=" + like + value + like + "&";
+      }
+    }, "");
+    return paramString;
+  }
+
+  return {
+    all: function all(filters, likes, page) {
+      if (likes === void 0) {
+        likes = [];
+      }
+
+      var queryParams = page ? "?page=" + page + "&" : "?";
+      var filterQuery = objectToQueryParamString(filters, likes);
+      queryParams = "" + queryParams + filterQuery;
+      queryParams = queryParams.substring(0, queryParams.length - 1);
+      return http.GET("" + url + queryParams);
+    },
+    find: function find(id) {
+      return http.GET(url + "/" + id);
+    },
+    create: function create(form) {
+      var body = JSON.stringify(form);
+      return http.POST(url, body);
+    },
+    update: function update(form) {
+      var body = JSON.stringify(form);
+      return http.PUT(url + "/" + form.id, body);
+    },
+    updateProperty: function updateProperty(id, propertyName, form) {
+      var body = JSON.stringify(form);
+      return http.PUT(url + "/" + id + "/" + propertyName, body);
+    },
+    patch: function patch(id, form) {
+      var body = JSON.stringify(form);
+      return http.PATCH(url + "/" + id, body);
+    },
+    remove: function remove(id) {
+      return http.DELETE(url + "/" + id);
+    }
+  };
+};
+
 /**
  * Collection Page
  */
@@ -11838,6 +11842,7 @@ exports.Chip = Chip;
 exports.Chips = Chips;
 exports.CircularProgress = CircularProgress;
 exports.CollectionAPI = CollectionAPI$1;
+exports.CollectionAPI2 = CollectionAPI;
 exports.CollectionContext = CollectionContext$1;
 exports.CollectionContext2 = CollectionContext;
 exports.CollectionEditor = CollectionEditor$2;