ywana-core8 0.0.574 → 0.0.577

package/dist/index.cjs

@@ -2900,12 +2900,10 @@ var Planner = function Planner(_ref) {
 
   var thisMondayElement = React.useRef(null);
   React.useEffect(function () {
-    console.log(thisMondayElement.current);
-
     if (thisMondayElement.current) {
       showThisWeek();
     }
-  });
+  }, [thisMondayElement]);
   React.useEffect(function () {
     var element = document.getElementById(focusEvent);
     if (element) element.scrollIntoView({
@@ -2945,7 +2943,8 @@ var Planner = function Planner(_ref) {
   }
 
   function showThisWeek() {
-    var element = document.querySelector(".thisMonday");
+    var element = thisMondayElement.current; //const element = document.querySelector(".thisMonday")
+
     if (element) element.scrollIntoView({
       behavior: 'smooth',
       block: 'start',
@@ -3043,8 +3042,12 @@ var Planner = function Planner(_ref) {
     var isWekend = [0, 6].includes(date.moment.day());
     var weekend = isWekend ? "weekend" : "";
     var thisWeek = moment__default["default"]().startOf('week').isSame(date.moment, "week") ? "thisWeek" : "";
+    var today = moment__default["default"]();
+    var weekStart = today.clone().startOf('week');
+    var isThisMonday = date.moment.isSame(weekStart);
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "column-header"
+      className: "column-header",
+      ref: isThisMonday ? thisMondayElement : null
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "date-header " + weekend + " " + thisWeek
     }, /*#__PURE__*/React__default["default"].createElement(Text, {
@@ -3059,8 +3062,7 @@ var Planner = function Planner(_ref) {
       events: events,
       period: period,
       onSelectCell: selectCell,
-      onChange: onChange,
-      thisMondayRef: thisMondayElement
+      onChange: onChange
     });
   }))));
 };
@@ -3074,8 +3076,7 @@ var PlannerRow = function PlannerRow(props) {
       events = _props$events === void 0 ? [] : _props$events,
       period = props.period,
       onSelectCell = props.onSelectCell,
-      onChange = props.onChange,
-      thisMondayRef = props.thisMondayRef;
+      onChange = props.onChange;
   var rowEvents = events.filter(function (event) {
     return event.lane === lane.id;
   });
@@ -3100,8 +3101,7 @@ var PlannerRow = function PlannerRow(props) {
       date: date,
       events: cellEvents,
       onSelect: onSelectCell,
-      onDrop: change,
-      thisMondayRef: thisMondayRef
+      onDrop: change
     });
   }));
 };
@@ -3115,8 +3115,7 @@ var PlannerCell = function PlannerCell(_ref2) {
       events = _ref2.events,
       date = _ref2.date,
       onSelect = _ref2.onSelect,
-      onDrop = _ref2.onDrop,
-      thisMondayRef = _ref2.thisMondayRef;
+      onDrop = _ref2.onDrop;
 
   var _useState4 = React.useState(false),
       dragOver = _useState4[0],
@@ -3154,12 +3153,10 @@ var PlannerCell = function PlannerCell(_ref2) {
   var weekend = isWekend ? "weekend" : "";
   var today = moment__default["default"]();
   var weekStart = today.clone().startOf('week');
-  var isThisMonday = date.moment.isSame(weekStart);
   var thisMonday = date.moment.isSame(weekStart) ? "thisMonday" : "";
   var dragOverStyle = dragOver ? "drag-over" : "";
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "cell " + thisMonday + " " + weekend + " " + dragOverStyle,
-    ref: isThisMonday ? thisMondayRef : null,
     onDragOver: onDragOver,
     onDragLeave: onDragLeave,
     onDrop: drop,
@@ -7379,11 +7376,11 @@ var TablePage2 = function TablePage2(props) {
       children = props.children;
 
   var _useContext = React.useContext(PageContext),
+      pageContext = _useContext[0],
       setPageContext = _useContext[1];
 
   var context = TableContext$1(url, field, host, urlQuery, params);
-  var _pageContext = pageContext,
-      selected = _pageContext.selected;
+  var selected = pageContext.selected;
   var timer = React.useRef(null);
 
   var _useState = React.useState(selected),
@@ -7704,16 +7701,6 @@ var TableQueries$1 = function TableQueries(props) {
 
 
 var TableFilters$1 = function TableFilters(props) {
-  var reload = function reload() {
-    try {
-      return Promise.resolve(pageContext.load(form)).then(function () {
-        setPageContext(Object.assign({}, pageContext));
-      });
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-
   var change = function change(next) {
     try {
       setForm(next);
@@ -7757,10 +7744,13 @@ var TableFilters$1 = function TableFilters(props) {
     return filterSchema;
   }, [schema]);
   React.useEffect(function () {
-    if (filters) setForm(filters);
+    if (filters && !equal__default["default"](filters, form)) setForm(filters);
   }, [filters]);
   React.useEffect(function () {
-    reload();
+    if (pageContext.changeFilters && !equal__default["default"](filters, form)) {
+      pageContext.changeFilters(form);
+      setPageContext(Object.assign({}, pageContext));
+    }
   }, [form]);
 
   function clear() {
@@ -7829,7 +7819,7 @@ var TableEditor$1 = function TableEditor(props) {
   var remove = function remove(id) {
     try {
       return Promise.resolve(site.confirm("Are you sure ?")).then(function (confirm) {
-        var _temp5 = function () {
+        var _temp7 = function () {
           if (confirm) {
             return Promise.resolve(pageContext.remove(id)).then(function () {
               pageContext.clear();
@@ -7838,7 +7828,7 @@ var TableEditor$1 = function TableEditor(props) {
           }
         }();
 
-        if (_temp5 && _temp5.then) return _temp5.then(function () {});
+        if (_temp7 && _temp7.then) return _temp7.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -7852,7 +7842,8 @@ var TableEditor$1 = function TableEditor(props) {
       setPageContext = _useContext5[1];
 
   var _pageContext$all = pageContext.all,
-      all = _pageContext$all === void 0 ? [] : _pageContext$all;
+      all = _pageContext$all === void 0 ? [] : _pageContext$all,
+      filters = pageContext.filters;
   var icon = props.icon,
       title = props.title,
       schema = props.schema,
@@ -7860,7 +7851,8 @@ var TableEditor$1 = function TableEditor(props) {
       canDelete = props.canDelete,
       filter = props.filter,
       actions = props.actions,
-      className = props.className;
+      className = props.className,
+      tabbedBy = props.tabbedBy;
 
   var _useState4 = React.useState(props.groupBy),
       groupBy = _useState4[0],
@@ -7872,6 +7864,21 @@ var TableEditor$1 = function TableEditor(props) {
   React.useEffect(function () {
     try {
       var _temp4 = function () {
+        if (filters) {
+          return Promise.resolve(pageContext.load(filters)).then(function () {
+            setPageContext(Object.assign({}, pageContext));
+          });
+        }
+      }();
+
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [filters]);
+  React.useEffect(function () {
+    try {
+      var _temp6 = function () {
         if (tab) {
           var _filter2;
 
@@ -7883,7 +7890,7 @@ var TableEditor$1 = function TableEditor(props) {
         }
       }();
 
-      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -8078,7 +8085,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this2 = this;
 
-        var _temp7 = _catch$1(function () {
+        var _temp9 = _catch$1(function () {
           var filters = filter ? Object.keys(filter).reduce(function (filters, key) {
             var field = filter[key];
 
@@ -8102,7 +8109,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8137,7 +8144,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this5 = this;
 
-        var _temp9 = _catch$1(function () {
+        var _temp11 = _catch$1(function () {
           return Promise.resolve(API.create(form)).then(function () {
             return Promise.resolve(_this5.load()).then(function () {});
           });
@@ -8145,7 +8152,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8154,7 +8161,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this7 = this;
 
-        var _temp11 = _catch$1(function () {
+        var _temp13 = _catch$1(function () {
           return Promise.resolve(API.update(form)).then(function () {
             return Promise.resolve(_this7.load()).then(function () {});
           });
@@ -8162,7 +8169,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8171,7 +8178,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this9 = this;
 
-        var _temp13 = _catch$1(function () {
+        var _temp15 = _catch$1(function () {
           return Promise.resolve(API.remove(id)).then(function () {
             return Promise.resolve(_this9.load()).then(function () {});
           });
@@ -8179,7 +8186,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8191,7 +8198,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this11 = this;
 
-        var _temp15 = _catch$1(function () {
+        var _temp17 = _catch$1(function () {
           return Promise.resolve(API.queries(user, urlQuery)).then(function (_API$queries) {
             _this11.queries = _API$queries;
           });
@@ -8199,7 +8206,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8208,7 +8215,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this13 = this;
 
-        var _temp17 = _catch$1(function () {
+        var _temp19 = _catch$1(function () {
           return Promise.resolve(API.createQuery(query, urlQuery)).then(function () {
             return Promise.resolve(_this13.loadQueries(user)).then(function () {});
           });
@@ -8216,7 +8223,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
+        return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -8225,7 +8232,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       try {
         var _this15 = this;
 
-        var _temp19 = _catch$1(function () {
+        var _temp21 = _catch$1(function () {
           return Promise.resolve(API.removeQuery(id, urlQuery)).then(function () {
             return Promise.resolve(_this15.loadQueries(user)).then(function () {});
           });
@@ -8233,7 +8240,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
+        return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -8268,7 +8275,7 @@ var TableAPI$1 = function TableAPI(url, host, params) {
             }, "");
             return query.concat(param);
           } else {
-            return query.concat(key + "=%" + filters[key] + "%&");
+            return query.concat(key + "=" + filters[key] + "&");
           }
         }, "");
         queryParams = queryParams.concat(filterQuery);
@@ -8816,15 +8823,6 @@ var TableQueries = function TableQueries(props) {
 
 
 var TableFilters = function TableFilters(props) {
-  var reload = function reload() {
-    try {
-      return Promise.resolve(pageContext.load(form, likes)).then(function () {
-        setPageContext(Object.assign({}, pageContext));
-      });
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
 
   var change = function change(next) {
     try {
@@ -8868,7 +8866,7 @@ var TableFilters = function TableFilters(props) {
     delete filterSchema.flows;
     return filterSchema;
   }, [schema]);
-  var likes = React.useMemo(function () {
+  React.useMemo(function () {
     var fields = Object.values(schema);
     return fields.reduce(function (likes, field) {
       if (field.like === true) likes.push(field.id);
@@ -8876,10 +8874,13 @@ var TableFilters = function TableFilters(props) {
     }, []);
   }, [schema]);
   React.useEffect(function () {
-    if (filters) setForm(filters);
+    if (filters && !equal__default["default"](filters, form)) setForm(filters);
   }, [filters]);
   React.useEffect(function () {
-    reload();
+    if (pageContext.changeFilters && !equal__default["default"](filters, form)) {
+      pageContext.changeFilters(form);
+      setPageContext(Object.assign({}, pageContext));
+    }
   }, [form]);
 
   function clear() {
@@ -8948,7 +8949,7 @@ var TableEditor = function TableEditor(props) {
   var remove = function remove(id) {
     try {
       return Promise.resolve(site.confirm("Are you sure ?")).then(function (confirm) {
-        var _temp3 = function () {
+        var _temp5 = function () {
           if (confirm) {
             return Promise.resolve(pageContext.remove(id)).then(function () {
               pageContext.clear();
@@ -8957,7 +8958,7 @@ var TableEditor = function TableEditor(props) {
           }
         }();
 
-        if (_temp3 && _temp3.then) return _temp3.then(function () {});
+        if (_temp5 && _temp5.then) return _temp5.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -8971,7 +8972,8 @@ var TableEditor = function TableEditor(props) {
       setPageContext = _useContext5[1];
 
   var _pageContext$all = pageContext.all,
-      all = _pageContext$all === void 0 ? [] : _pageContext$all;
+      all = _pageContext$all === void 0 ? [] : _pageContext$all,
+      filters = pageContext.filters;
   var icon = props.icon,
       title = props.title,
       schema = props.schema,
@@ -8986,6 +8988,22 @@ var TableEditor = function TableEditor(props) {
       groupBy = _useState5[0],
       setGroupBy = _useState5[1];
 
+  React.useEffect(function () {
+    try {
+      var _temp4 = function () {
+        if (filters) {
+          return Promise.resolve(pageContext.load(filters)).then(function () {
+            setPageContext(Object.assign({}, pageContext));
+          });
+        }
+      }();
+
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [filters]);
+
   function changeGroup(id, value) {
     setGroupBy(value);
   }
@@ -9168,7 +9186,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this2 = this;
 
-        var _temp5 = _catch(function () {
+        var _temp7 = _catch(function () {
           var filters = filter ? Object.keys(filter).reduce(function (filters, key) {
             var field = filter[key];
 
@@ -9197,7 +9215,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9235,7 +9253,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this5 = this;
 
-        var _temp7 = _catch(function () {
+        var _temp9 = _catch(function () {
           return Promise.resolve(API.create(form)).then(function () {
             return Promise.resolve(_this5.load({}, [])).then(function () {});
           });
@@ -9243,7 +9261,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9252,7 +9270,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this7 = this;
 
-        var _temp9 = _catch(function () {
+        var _temp11 = _catch(function () {
           return Promise.resolve(API.update(form)).then(function () {
             return Promise.resolve(_this7.load()).then(function () {});
           });
@@ -9260,7 +9278,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9269,7 +9287,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this9 = this;
 
-        var _temp11 = _catch(function () {
+        var _temp13 = _catch(function () {
           return Promise.resolve(API.remove(id)).then(function () {
             return Promise.resolve(_this9.load()).then(function () {});
           });
@@ -9277,7 +9295,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9289,7 +9307,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this11 = this;
 
-        var _temp13 = _catch(function () {
+        var _temp15 = _catch(function () {
           return Promise.resolve(API.queries(user, urlQuery)).then(function (_API$queries) {
             _this11.queries = _API$queries;
           });
@@ -9297,7 +9315,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9306,7 +9324,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this13 = this;
 
-        var _temp15 = _catch(function () {
+        var _temp17 = _catch(function () {
           return Promise.resolve(API.createQuery(query, urlQuery)).then(function () {
             return Promise.resolve(_this13.loadQueries(user)).then(function () {});
           });
@@ -9314,7 +9332,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9323,7 +9341,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       try {
         var _this15 = this;
 
-        var _temp17 = _catch(function () {
+        var _temp19 = _catch(function () {
           return Promise.resolve(API.removeQuery(id, urlQuery)).then(function () {
             return Promise.resolve(_this15.loadQueries(user)).then(function () {});
           });
@@ -9331,7 +9349,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           console.log(error);
         });
 
-        return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
+        return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }