ywana-core8 0.0.828 → 0.0.829

package/dist/index.cjs

@@ -5073,11 +5073,12 @@ var TaskContextProvider = function TaskContextProvider(props) {
     }
   };
 
-  var tasks = function tasks(filters, likes) {
+  var tasks = function tasks(filters2, likes) {
     try {
       return Promise.resolve(_catch$5(function () {
-        console.log("tasks", filters);
-        return Promise.resolve(API.all(filters, likes));
+        var filters3 = Object.assign({}, filters, filters2);
+        console.log("tasks", filters, filters3);
+        return Promise.resolve(API.all(filters3, likes));
       }, function (error) {
         console.log("tasks error", error);
       }));
@@ -5098,6 +5099,14 @@ var TaskContextProvider = function TaskContextProvider(props) {
 
   var _listeners = Object.assign({}, listeners);
 
+  var _useState = React.useState({}),
+      filters = _useState[0],
+      setFilters = _useState[1];
+
+  React.useEffect(function () {
+    console.log("TaskContext", filters);
+  }, [filters]);
+
   function addListener(taskID, listener) {
     _listeners[taskID] = listener;
   }
@@ -5109,7 +5118,8 @@ var TaskContextProvider = function TaskContextProvider(props) {
   React.useEffect(function () {
     var interval = setInterval(function () {
       try {
-        return Promise.resolve(API.all()).then(function (tasks) {
+        console.log("TASKS REFRESH", filters);
+        return Promise.resolve(API.all(filters)).then(function (tasks) {
           // find task for each listener
           Object.keys(_listeners).forEach(function (taskID) {
             var task = tasks.find(function (task) {
@@ -5137,7 +5147,8 @@ var TaskContextProvider = function TaskContextProvider(props) {
     updateTask: updateTask,
     removeTask: removeTask,
     addListener: addListener,
-    removeListener: removeListener
+    removeListener: removeListener,
+    setFilters: setFilters
   };
   return /*#__PURE__*/React__default["default"].createElement(TaskContext.Provider, {
     value: value
@@ -5170,9 +5181,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) {
@@ -5205,9 +5216,7 @@ var TaskMonitor = function TaskMonitor(props) {
 
   var refresh = function refresh() {
     try {
-      if (from) filters["from"] = from;
-      console.log("refresh", filters);
-      return Promise.resolve(context.tasks(filters)).then(function (tasks) {
+      return Promise.resolve(context.tasks()).then(function (tasks) {
         setTasks(tasks);
       });
     } catch (e) {
@@ -5217,21 +5226,20 @@ var TaskMonitor = function TaskMonitor(props) {
 
   var _props$title = props.title,
       title = _props$title === void 0 ? "Task Monitor" : _props$title,
-      _props$filters = props.filters,
-      filters = _props$filters === void 0 ? {} : _props$filters,
       editors = props.editors;
   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];
 
-  var _useState3 = React.useState(props.from),
-      from = _useState3[0],
-      setFrom = _useState3[1];
+  var _useState4 = React.useState(),
+      from = _useState4[0],
+      setFrom = _useState4[1];
 
   React.useEffect(function () {
+    if (props.from) setFrom(props.from);
     refresh();
     var interval = setInterval(function () {
       refresh();
@@ -5240,6 +5248,12 @@ var TaskMonitor = function TaskMonitor(props) {
       clearInterval(interval);
     };
   }, []);
+  React.useEffect(function () {
+    console.log("from", from);
+    if (from) context.setFilters({
+      from: from
+    });
+  }, [from]);
 
   function changeFrom(id, value) {
     setFrom(value);