ywana-core8 0.0.574 → 0.0.577

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.574",
+  "version": "0.0.577",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/domain/TabbedTablePage.js

@@ -333,11 +333,14 @@ const TableFilters = (props) => {
     }, [schema])
 
     useEffect(() => {
-        if (filters) setForm(filters)
+        if (filters && !equal(filters, form)) setForm(filters)
     }, [filters])
 
     useEffect(() => {
-        reload()
+        if (pageContext.changeFilters && !equal(filters,form)) {
+            pageContext.changeFilters(form)
+            setPageContext(Object.assign({}, pageContext))
+        }
     }, [form])
 
     async function change(next) {
@@ -384,6 +387,13 @@ export const TableEditor = (props) => {
     const { icon, title, schema, editable, canDelete, filter, actions, tabs, className } = props
     const [groupBy, setGroupBy] = useState(props.groupBy)
 
+    useEffect(async () => {
+        if (filters) {
+           await  pageContext.load(filters)
+            setPageContext(Object.assign({}, pageContext))
+        }
+    }, [filters])
+
     function changeGroup(id, value) {
         setGroupBy(value)
     }

package/src/domain/TablePage2.js

@@ -31,7 +31,7 @@ export const TablePage2 = (props) => {
         children
     } = props
 
-    const [cd, setPageContext] = useContext(PageContext)
+    const [pageContext, setPageContext] = useContext(PageContext)
     const context = TableContext(url, field, host, urlQuery, params)
     const { selected } = pageContext
     const timer = useRef(null)
@@ -283,22 +283,20 @@ const TableFilters = (props) => {
     }, [schema])
 
     useEffect(() => {
-        if (filters) setForm(filters)
+        if (filters && !equal(filters, form)) setForm(filters)
     }, [filters])
 
     useEffect(() => {
-        reload()
+        if (pageContext.changeFilters && !equal(filters,form)) {
+            pageContext.changeFilters(form)
+            setPageContext(Object.assign({}, pageContext))
+        }
     }, [form])
 
     async function change(next) {
         setForm(next)
     }
 
-    async function reload() {
-        await pageContext.load(form)
-        setPageContext(Object.assign({}, pageContext))
-    }
-
     function clear() {
         change({})
     }
@@ -331,10 +329,17 @@ export const TableEditor = (props) => {
     const site = useContext(SiteContext)
     const [pageContext, setPageContext] = useContext(PageContext)
     const { all = [], filters } = pageContext
-    const { icon, title, schema, editable, canDelete, filter, actions, className } = props
+    const { icon, title, schema, editable, canDelete, filter, actions, className, tabbedBy } = props
     const [groupBy, setGroupBy] = useState(props.groupBy)
     const [tab, setTab] = useState(0)
 
+    useEffect(async () => {
+        if (filters) {
+           await  pageContext.load(filters)
+            setPageContext(Object.assign({}, pageContext))
+        }
+    }, [filters])
+
     useEffect(async () => {
         if (tab) {
             const filter = { [tab.field]: tab.value }
@@ -632,7 +637,7 @@ const 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)

package/src/widgets/planner/Planner.js

@@ -23,9 +23,8 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
     const thisMondayElement = useRef(null)
     
     useEffect(() => {
-        console.log(thisMondayElement.current)
         if (thisMondayElement.current) { showThisWeek() }
-    })
+    }, [thisMondayElement])
 
     useEffect(() => {
         const element = document.getElementById(focusEvent)
@@ -67,7 +66,8 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
     }
 
     function showThisWeek() {
-        const element = document.querySelector(".thisMonday")
+        const element = thisMondayElement.current
+        //const element = document.querySelector(".thisMonday")
         if (element) element.scrollIntoView({
             behavior: 'smooth',
             block: 'start',
@@ -131,8 +131,13 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
                             const isWekend = [0, 6].includes(date.moment.day());
                             const weekend = isWekend ? "weekend" : "";
                             const thisWeek = moment().startOf('week').isSame(date.moment, "week") ? "thisWeek" : "";
+
+                            const today = moment()
+                            var weekStart = today.clone().startOf('week')
+                            const isThisMonday = (date.moment.isSame(weekStart))
+
                             return (
-                                <div className="column-header">
+                                <div className="column-header" ref={isThisMonday ? thisMondayElement : null}>
                                     <div className={`date-header ${weekend} ${thisWeek}`}>
                                         <Text use="headline6">{date.moment.format("DD")}</Text>
                                         &nbsp;
@@ -143,7 +148,7 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
                         })}
                     </div>
 
-                    {lanes.map((lane) => <PlannerRow key={lane.id} lane={lane} events={events} period={period} onSelectCell={selectCell} onChange={onChange} thisMondayRef={thisMondayElement} />)}
+                    {lanes.map((lane) => <PlannerRow key={lane.id} lane={lane} events={events} period={period} onSelectCell={selectCell} onChange={onChange} />)}
 
                 </div>
             </main>
@@ -156,7 +161,7 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
  */
 const PlannerRow = (props) => {
 
-    const { lane, events = [], period, onSelectCell, onChange, thisMondayRef } = props
+    const { lane, events = [], period, onSelectCell, onChange } = props
     const rowEvents = events.filter(event => event.lane === lane.id)
 
 
@@ -175,7 +180,7 @@ const PlannerRow = (props) => {
                     return eventDate.getTime() === slotDate.getTime();
                 })
                 return (
-                    <PlannerCell key={`${lane.id}-${slotDate.toString()}`} lane={lane} date={date} events={cellEvents} onSelect={onSelectCell} onDrop={change} thisMondayRef={thisMondayRef} />
+                    <PlannerCell key={`${lane.id}-${slotDate.toString()}`} lane={lane} date={date} events={cellEvents} onSelect={onSelectCell} onDrop={change} />
                 );
             })}
         </div>
@@ -185,7 +190,7 @@ const PlannerRow = (props) => {
 /**
  * Planner Cell
  */
-const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, onSelect, onDrop, editable = false, thisMondayRef }) => {
+const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, onSelect, onDrop, editable = false }) => {
 
     const [dragOver, setDragOver] = useState(false);
 
@@ -223,11 +228,10 @@ const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, on
 
     const today = moment()
     var weekStart = today.clone().startOf('week')
-    const isThisMonday = (date.moment.isSame(weekStart))
     const thisMonday = (date.moment.isSame(weekStart)) ? "thisMonday" : ""
     const dragOverStyle = dragOver ? "drag-over" : ""
     return (
-        <div className={`cell ${thisMonday} ${weekend} ${dragOverStyle}`} ref={isThisMonday ? thisMondayRef : null} onDragOver={onDragOver} onDragLeave={onDragLeave} onDrop={drop} onClick={select}>
+        <div className={`cell ${thisMonday} ${weekend} ${dragOverStyle}`} onDragOver={onDragOver} onDragLeave={onDragLeave} onDrop={drop} onClick={select}>
             {events.map(event => {
                 const { Renderer = EventCard } = event
                 return <Renderer key={event.id} event={event} />