ywana-core8 0.0.796 → 0.0.798

package/package.json

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

package/src/domain2/CollectionContext.js

@@ -14,7 +14,10 @@ export const CollectionContextProvider = (props) => {
     const [all, setAll] = useState([])
     const [filters, setFilters] = useState(filtersValue)
     const [likes, setLikes] = useState([])
+    
     const [customFilters, setCustomFilters] = useState({})
+    const [filtered, setFiltered] = useState([])
+
     const [queries, setQueries] = useState([])
     const [selected, setSelected] = useState(null)
 
@@ -28,21 +31,28 @@ export const CollectionContextProvider = (props) => {
         return () => {
             mounted = false;
         }
-    }, [filters, customFilters])
+    }, [filters])
+
+    useEffect(() => {
+        runCustomFilters()
+    }, [customFilters])
 
     async function load() {
 
+        /*
         const runCustomFilters = (all) => {
             const cfs = Object.values(customFilters)
             const data = cfs.length ? cfs.reduce((acc, filter) => filter(acc), all) : all;
             return data
         }
+        */
 
         try {
             const response = await API.all(filters, likes, page);
             const next = field ? response[field] : response;
-            const data = runCustomFilters(next)
-            return data
+            //const data = runCustomFilters(next)
+            //return data
+            return next;
         } catch (error) {
             console.log(error)
         }
@@ -57,7 +67,7 @@ export const CollectionContextProvider = (props) => {
             console.log(error)
         }
     }
-    
+
     async function select(id) {
         if (fetching) {
             const result = await fetch(id)
@@ -85,6 +95,12 @@ export const CollectionContextProvider = (props) => {
         setCustomFilters(next)
         return
     }
+
+    function runCustomFilters() {
+        const cfs = Object.values(customFilters)
+        const data = cfs.length ? cfs.reduce((acc, filter) => filter(acc), all) : all;
+        setFiltered(data)
+    }
     
     async function fetch(id) {
         try {
@@ -99,7 +115,7 @@ export const CollectionContextProvider = (props) => {
         try {
             if (versioning) form.version = 1
             await API.create(form);
-            await this.load();
+            await this.reload();
         } catch (error) {
             console.log(error)
         }
@@ -110,7 +126,7 @@ export const CollectionContextProvider = (props) => {
         try {
             if (versioning) form.version = form.version ? form.version + 1 : 1
             await API.update(form)
-            await this.load()
+            await this.reload()
         } catch (error) {
             console.log(error)
         }
@@ -121,7 +137,7 @@ export const CollectionContextProvider = (props) => {
         try {
             if (versioning) form.version = form.version ? form.version + 1 : 1
             await API.patch(id, form)
-            await this.load()
+            await this.reload()
         } catch (error) {
             console.log(error)
         }
@@ -131,7 +147,7 @@ export const CollectionContextProvider = (props) => {
     async function updateProperty(id, propertyName, form) {
         try {
             await API.updateProperty(id, propertyName, form)
-            await this.load()
+            await this.reload()
         } catch (error) {
             console.log(error)
         }
@@ -141,7 +157,7 @@ export const CollectionContextProvider = (props) => {
     async function remove(id) {
         try {
             await API.remove(id)
-            await this.load()
+            await this.reload()
         } catch (error) {
             console.log(error)
         }
@@ -162,6 +178,8 @@ export const CollectionContextProvider = (props) => {
         setLikes,
 
         customFilters,
+        filtered,
+        runCustomFilters,
         addCustomFilter,
         removeCustomFilter,
 

package/src/domain2/CollectionContext.test.js

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import { CheckBox } from '../html'
 import { CollectionContext, CollectionContextProvider } from './CollectionContext'
 import { CollectionEditor } from './CollectionEditor'
@@ -42,17 +42,30 @@ const CollectionContextTest = (props) => {
 }
 
 const CustomFilter1 = (props) => {
-    const collectionContext = useContext(CollectionContext)
-    const { filters, setFilters } = collectionContext
+
+    const context = useContext(CollectionContext)
+    const [active, setActive] = useState(false)
+
+    useEffect(() => {
+        if (active) {
+            context.addCustomFilter("ACTIVE", filter)
+        } else {
+            context.removeCustomFilter("ACTIVE")
+        }
+    }, [active])
 
     function change(id, value) {
-        setFilters({ ...filters, [id]: value })
+        setActive(value)
+    }
+
+    function filter(all) {
+        console.log("CUSTOMFILTER1 DO NOTHING")
+        return all
     }
 
     return (
         <div>
-            <CheckBox id="custom1" label="Custom Filter 1" value={filters.custom1} onChange={change} />
+            <CheckBox id="custom1" label="Custom Filter 1" value={active} onChange={change} />
         </div>
     )
-}
-
+}

package/src/domain2/CollectionList.js

@@ -10,7 +10,7 @@ export const CollectionList = (props) => {
 
     const { itemRenderer, groupBy, groupRenderer, searchBy = [], sortBy, sortDir } = props
     const context = useContext(CollectionContext)
-    const { all = [], selected, filters, customFilters } = context
+    const { all = [], filtered=[], selected, filters, customFilters } = context
     const [search, setSearch] = useState('')
 
     function changeSearch(id, value) {
@@ -21,7 +21,7 @@ export const CollectionList = (props) => {
         context.select(id)
     }
 
-    const searched = searchBy.length > 0 && search.length > 0 ? all.filter(item => {
+    const searched = searchBy.length > 0 && search.length > 0 ? filtered.filter(item => {
         const text = searchBy.map(field => item[field]).join(' ').toLowerCase()
         return text.includes(search.toLowerCase())
     }) : all