ywana-core8 0.0.681 → 0.0.683

package/package.json

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

package/src/domain/CollectionAPI.js

@@ -46,7 +46,7 @@ import { isEmpty} from '../commons'
 
     return {
 
-        all(filters, likes, page) {
+        all(filters, likes = [], page) {
             let queryParams = page ? `?page=${page}&` : "?"
             const filterQuery = objectToQueryParamString(filters, likes)
             queryParams = `${queryParams}${filterQuery}`

package/src/domain/CollectionPage.js

@@ -1,12 +1,12 @@
 import equal from 'deep-equal'
 import React, { Fragment, useContext, useEffect, useRef, useState, useMemo } from 'react'
-import { HTTPClient, Session } from '../http'
 import { PageContext } from '../site'
+import { SiteContext } from '../site/siteContext'
 import { Button, Header, Icon, List, Menu, MenuIcon, MenuItem, Text, Tree, TreeItem, TreeNode, TextField, Chip, Tooltip } from '../html'
-import { Content, TYPES } from './ContentType'
 import { ContentEditor, TabbedContentEditor, TreededContentEditor } from './ContentEditor'
 import { CreateContentDialog } from './CreateContentDialog'
-import { SiteContext } from '../site/siteContext'
+import { CollectionAPI } from './CollectionAPI'
+import { Content, TYPES } from './ContentType'
 import "./CollectionPage.css"
 
 /**
@@ -523,63 +523,3 @@ export const CollectionContext = (url, field, host, page, fetching, versioning =
     }
 }
 
-/**
- * Collection API
- */
-const CollectionAPI = (url, host) => {
-
-    const http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
-
-    return {
-        all(filters, page) {
-            let queryParams = page ? `?page=${page}&` : "?"
-            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 + queryParams)
-        },
-
-        find(id) {
-            return http.GET(`${url}/${id}`)
-        },
-
-        create(form) {
-            const body = JSON.stringify(form)
-            return http.POST(url, body)
-        },
-
-        update(form) {
-            const body = JSON.stringify(form)
-            return http.PUT(`${url}/${form.id}`, body)
-        },
-
-        patch(id, form) {
-            const body = JSON.stringify(form)
-            return http.PATCH(`${url}/${id}`, body)
-        },
-
-        updateProperty(id, propertyName, form) {
-            const body = JSON.stringify(form)
-            return http.PUT(`${url}/${id}/${propertyName}`, body)
-        },
-
-        remove(id) {
-            return http.DELETE(`${url}/${id}`)
-        }
-
-    }
-}

package/src/incubator/task.js

@@ -1,6 +1,5 @@
 import React, { useEffect, useContext, useState } from 'react'
 import { LinearProgress, Header, DataTable, Icon } from '../html'
-import { HTTPClient, Session } from '../http'
 import "./task.css"
 
 /**
@@ -13,12 +12,12 @@ export const TaskContext = React.createContext({})
  */
 export const TaskContextProvider = (props) => {
 
-    const { host, url, children } = props
-    const API = TaskAPI(url, host)
+    const { host, url = "tasks", children } = props
+    const API = CollectionAPI(url, host)
 
-    async function tasks() {
+    async function tasks(filters, likes) {
         try {
-            const response = await API.tasks();
+            const response = await API.all(filters, likes);
             return response;
         } catch (error) {
             console.log("tasks error", error);
@@ -27,7 +26,7 @@ export const TaskContextProvider = (props) => {
 
     async function task(id) {
         try {
-            const response = await API.task(id);
+            const response = await API.find(id);
             return response;
         } catch (error) {
             console.log("task error", error);
@@ -36,7 +35,7 @@ export const TaskContextProvider = (props) => {
 
     async function createTask(task) {
         try {
-            const response = await API.createTask(task);
+            const response = await API.create(task);
             return response;
         } catch (error) {
             console.log("createTask error", error);
@@ -45,7 +44,7 @@ export const TaskContextProvider = (props) => {
 
     async function removeTask(id) {
         try {
-            const response = await API.removeTask(id);
+            const response = await API.remove(id);
             return response;
         } catch (error) {
             console.log("removeTask error", error);
@@ -66,35 +65,6 @@ export const TaskContextProvider = (props) => {
     )
 }
 
-/**
- * API
- */
-const TaskAPI = (url = "/tasks", host) => {
-
-    const http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
-
-    return {
-
-        tasks() {
-            return http.GET(url)
-        },
-
-        task(id) {
-            return http.GET(`${url}/${id}`)
-        },
-
-        createTask(task) {
-            const body = JSON.stringify(task)
-            return http.POST(url, body)
-        },
-
-        removeTask(id) {
-            return http.DELETE(`${url}/${id}`)
-        }
-    }
-
-}
-
 /**
  * TaskProgress
  */
@@ -127,6 +97,8 @@ export const TaskProgress = (props) => {
  */
 export const TaskMonitor = (props) => {
 
+    const { title = "Task Monitor" } = props
+
     const context = useContext(TaskContext)
     const [tasks = [], setTasks] = useState([])
 
@@ -180,7 +152,7 @@ export const TaskMonitor = (props) => {
 
     return (
         <div className="task-manager">
-            <Header icon="list" title="Task Manager" />
+            <Header icon="list" title={title} />
             <main>
                 <DataTable {...table} />
             </main>