ywana-core8 0.0.219 → 0.0.220

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.219",
+  "version": "0.0.220",
   "description": "ywana-core8",
   "author": "Ernesto Roldan Garcia",
   "license": "MIT",

package/src/domain/CollectionPage.js

@@ -315,7 +315,25 @@ export const CollectionContext = (url, field) => {
 const CollectionAPI = (url) => {
 
     return {
-        all() {
+        all(filters) {
+            let queryParams = "?"
+            if (filters) {
+                const filterQuery = Object.keys(filters).reduce((query, key) => {
+                    const value = filters[key]
+                    if (typeof (value) === 'boolean') {
+                        return query.concat(`${key}=${value}&`)
+                    } else if (Array.isArray(value)) {
+                        const param = value.length === 0 ? '' : value.reduce((param, item) => {
+                            param = param.concat(`${key}=${item}&`)
+                            return param
+                        }, "")
+                        return query.concat(param)
+                    } else {
+                        return query.concat(`${key}=%${filters[key]}%&`)
+                    }
+                }, "")
+                queryParams = queryParams.concat(filterQuery)
+            }
             return http.GET(url)
         },
 

package/src/html/table.js

@@ -76,7 +76,7 @@ export const DataTable = (props) => {
                     <tr>
                         {columns.map(({ id, label, type, item, sortable }) => {
                             const sort = sortDir[id] ? sortDir[id] : null
-                            const [rowspan, colspan] = type === TYPES.ENTITY ? [1, Object.keys(item).length] : [2, 1]
+                            const [rowspan, colspan] = type === TYPES.ENTITY ? [1, Object.values(item).filter(v=>v.column===true).length] : [2, 1]
                             return (
                                 <th rowSpan={rowspan} colSpan={colspan}>
                                     {id === "checked" ? <CheckBox onChange={checkAll} /> : <Text key={`th_${id}`}>{label}</Text>}