ywana-core8 0.0.681 → 0.0.683

package/dist/index.umd.js

@@ -5636,6 +5636,86 @@
       }));
     };
 
+    /**
+     * Collection API
+     */
+
+    var CollectionAPI$1 = function CollectionAPI(url, host) {
+      var http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
+      /**
+       * objectToQueryParamString
+       * 
+       * @param {*} obj 
+       * @returns 
+       */
+
+      function objectToQueryParamString(obj, likes) {
+        if (isEmpty(obj)) {
+          return "";
+        }
+
+        var notEmptyFields = Object.keys(obj).filter(function (key) {
+          return !isEmpty(obj[key]);
+        });
+        var paramString = notEmptyFields.reduce(function (query, key) {
+          var value = obj[key];
+          var like = likes.includes(key) ? '%' : '';
+
+          if (Array.isArray(value)) {
+            var values = value.map(function (v) {
+              return key + "=" + like + v + like;
+            }).join("&");
+            return "" + query + values + "&";
+          } else if (typeof value === "object") {
+            var params = objectToQueryParamString(value, likes);
+            params.split("&").forEach(function (param) {
+              query = query.concat(key + "." + param + "&");
+            });
+            return query;
+          } else {
+            return "" + query + key + "=" + like + value + like + "&";
+          }
+        }, "");
+        return paramString;
+      }
+
+      return {
+        all: function all(filters, likes, page) {
+          if (likes === void 0) {
+            likes = [];
+          }
+
+          var queryParams = page ? "?page=" + page + "&" : "?";
+          var filterQuery = objectToQueryParamString(filters, likes);
+          queryParams = "" + queryParams + filterQuery;
+          queryParams = queryParams.substring(0, queryParams.length - 1);
+          return http.GET("" + url + queryParams);
+        },
+        find: function find(id) {
+          return http.GET(url + "/" + id);
+        },
+        create: function create(form) {
+          var body = JSON.stringify(form);
+          return http.POST(url, body);
+        },
+        update: function update(form) {
+          var body = JSON.stringify(form);
+          return http.PUT(url + "/" + form.id, body);
+        },
+        updateProperty: function updateProperty(id, propertyName, form) {
+          var body = JSON.stringify(form);
+          return http.PUT(url + "/" + id + "/" + propertyName, body);
+        },
+        patch: function patch(id, form) {
+          var body = JSON.stringify(form);
+          return http.PATCH(url + "/" + id, body);
+        },
+        remove: function remove(id) {
+          return http.DELETE(url + "/" + id);
+        }
+      };
+    };
+
     /**
      * Collection Page
      */
@@ -6282,7 +6362,7 @@
         versioning = false;
       }
 
-      var API = CollectionAPI(url, host);
+      var API = CollectionAPI$1(url, host);
       return {
         all: [],
         filters: {},
@@ -6445,61 +6525,6 @@
         }
       };
     };
-    /**
-     * Collection API
-     */
-
-    var CollectionAPI = function CollectionAPI(url, host) {
-      var http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
-      return {
-        all: function all(filters, page) {
-          var queryParams = page ? "?page=" + page + "&" : "?";
-
-          if (filters) {
-            var filterQuery = Object.keys(filters).reduce(function (query, key) {
-              var value = filters[key];
-
-              if (typeof value === 'boolean') {
-                return query.concat(key + "=" + value + "&");
-              } else if (Array.isArray(value)) {
-                var param = value.length === 0 ? '' : value.reduce(function (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: function find(id) {
-          return http.GET(url + "/" + id);
-        },
-        create: function create(form) {
-          var body = JSON.stringify(form);
-          return http.POST(url, body);
-        },
-        update: function update(form) {
-          var body = JSON.stringify(form);
-          return http.PUT(url + "/" + form.id, body);
-        },
-        patch: function patch(id, form) {
-          var body = JSON.stringify(form);
-          return http.PATCH(url + "/" + id, body);
-        },
-        updateProperty: function updateProperty(id, propertyName, form) {
-          var body = JSON.stringify(form);
-          return http.PUT(url + "/" + id + "/" + propertyName, body);
-        },
-        remove: function remove(id) {
-          return http.DELETE(url + "/" + id);
-        }
-      };
-    };
 
     var QUERY = {
       id: {
@@ -9847,7 +9872,7 @@
       var removeTask = function removeTask(id) {
         try {
           return Promise.resolve(_catch(function () {
-            return Promise.resolve(API.removeTask(id));
+            return Promise.resolve(API.remove(id));
           }, function (error) {
             console.log("removeTask error", error);
           }));
@@ -9859,7 +9884,7 @@
       var createTask = function createTask(task) {
         try {
           return Promise.resolve(_catch(function () {
-            return Promise.resolve(API.createTask(task));
+            return Promise.resolve(API.create(task));
           }, function (error) {
             console.log("createTask error", error);
           }));
@@ -9871,7 +9896,7 @@
       var task = function task(id) {
         try {
           return Promise.resolve(_catch(function () {
-            return Promise.resolve(API.task(id));
+            return Promise.resolve(API.find(id));
           }, function (error) {
             console.log("task error", error);
           }));
@@ -9880,10 +9905,10 @@
         }
       };
 
-      var tasks = function tasks() {
+      var tasks = function tasks(filters, likes) {
         try {
           return Promise.resolve(_catch(function () {
-            return Promise.resolve(API.tasks());
+            return Promise.resolve(API.all(filters, likes));
           }, function (error) {
             console.log("tasks error", error);
           }));
@@ -9893,9 +9918,10 @@
       };
 
       var host = props.host,
-          url = props.url,
+          _props$url = props.url,
+          url = _props$url === void 0 ? "tasks" : _props$url,
           children = props.children;
-      var API = TaskAPI(url, host);
+      var API = CollectionAPI(url, host);
       var value = {
         tasks: tasks,
         task: task,
@@ -9906,37 +9932,10 @@
         value: value
       }, children);
     };
-    /**
-     * API
-     */
-
-    var TaskAPI = function TaskAPI(url, host) {
-      if (url === void 0) {
-        url = "/tasks";
-      }
-
-      var http = HTTPClient(host || window.API || process.env.REACT_APP_API, Session);
-      return {
-        tasks: function tasks() {
-          return http.GET(url);
-        },
-        task: function task(id) {
-          return http.GET(url + "/" + id);
-        },
-        createTask: function createTask(task) {
-          var body = JSON.stringify(task);
-          return http.POST(url, body);
-        },
-        removeTask: function removeTask(id) {
-          return http.DELETE(url + "/" + id);
-        }
-      };
-    };
     /**
      * TaskProgress
      */
 
-
     var TaskProgress = function TaskProgress(props) {
       var refresh = function refresh(id) {
         try {
@@ -10003,6 +10002,8 @@
         }
       };
 
+      var _props$title = props.title,
+          title = _props$title === void 0 ? "Task Monitor" : _props$title;
       var context = React.useContext(TaskContext);
 
       var _useState2 = React.useState([]),
@@ -10077,7 +10078,7 @@
         className: "task-manager"
       }, /*#__PURE__*/React__default["default"].createElement(Header, {
         icon: "list",
-        title: "Task Manager"
+        title: title
       }), /*#__PURE__*/React__default["default"].createElement("main", null, /*#__PURE__*/React__default["default"].createElement(DataTable, table)));
     };