react-hook-core 0.1.12 → 0.1.13

package/lib/components.js

@@ -385,12 +385,8 @@ var BaseSearchComponent = (function (_super) {
     if (!lc) {
       lc = state_1.enLocale;
     }
-    var cc = this.getCurrencyCode();
     var fields = this.getFields();
-    var l = this.getList();
-    var f = this.getSearchForm();
-    var dc = (this.ui ? this.ui.decodeFromForm : undefined);
-    var obj3 = search_1.getModel(this.state, name, this, fields, this.excluding, this.keys, l, f, dc, lc, cc);
+    var obj3 = search_1.getModel(this.state, name, this, fields, this.excluding);
     return obj3;
   };
   BaseSearchComponent.prototype.getFields = function () {

package/lib/route.js

@@ -11,7 +11,35 @@ function buildParameters(url) {
   if (i >= 0) {
     urlSearch = url.substring(i + 1);
   }
-  var parsed = qs.parse(urlSearch);
-  return parsed;
+  try {
+    var parsed = convertToObject(qs.parse(urlSearch));
+    return parsed;
+  }
+  catch (error) {
+    console.log(error);
+    throw error;
+  }
 }
 exports.buildParameters = buildParameters;
+function convertToObject(input) {
+  var output = {};
+  for (var key in input) {
+    var value = input[key];
+    var keys = key.split('.');
+    var currentObj = output;
+    for (var i = 0; i < keys.length; i++) {
+      var currentKey = keys[i];
+      if (!currentObj[currentKey]) {
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = value;
+        }
+        else {
+          currentObj[currentKey] = {};
+        }
+      }
+      currentObj = currentObj[currentKey];
+    }
+  }
+  return output;
+}
+exports.convertToObject = convertToObject;

package/lib/search.js

@@ -1,4 +1,11 @@
 "use strict";
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+  for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+  for (var r = Array(s), k = 0, i = 0; i < il; i++)
+    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+      r[k] = a[j];
+  return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var resources = (function () {
   function resources() {
@@ -156,9 +163,36 @@ function optimizeFilter(obj, searchable, fields) {
   else {
     delete obj.sort;
   }
+  if (searchable) {
+    mapObjects(obj, searchable);
+  }
   return obj;
 }
 exports.optimizeFilter = optimizeFilter;
+function mapObjects(objA, objB) {
+  var _a;
+  for (var key in objA) {
+    if (objB.hasOwnProperty(key) && objB[key] !== null && objB[key] !== undefined) {
+      if (Array.isArray(objA[key])) {
+        objA[key] = [];
+        if (Array.isArray(objB[key]) && objB[key].length === 0) {
+        }
+        else {
+          var arrayObjKeyB = objB[key].length > 0 ? (_a = (objB[key])) === null || _a === void 0 ? void 0 : _a.split(',') : [];
+          if (arrayObjKeyB && arrayObjKeyB.length > 1) {
+            objA[key] = __spreadArrays(arrayObjKeyB);
+          }
+          else {
+            objA[key].push(objB[key]);
+          }
+        }
+      }
+      else {
+        objA[key] = objB[key];
+      }
+    }
+  }
+}
 function append(list, results) {
   if (list && results) {
     for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
@@ -527,22 +561,11 @@ function toggleSortStyle(target) {
   return field;
 }
 exports.toggleSortStyle = toggleSortStyle;
-function getModel(state, modelName, searchable, fields, excluding, keys, l, f, dc, lc, currencyCode) {
+function getModel(state, modelName, searchable, fields, excluding) {
   var obj2 = getModelFromState(state, modelName);
-  if (f && dc) {
-    obj2 = dc(f, lc, currencyCode);
-  }
   var obj = obj2 ? obj2 : {};
   var obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
-  if (keys && keys.length === 1) {
-    if (l && l.length > 0) {
-      var refId = l[l.length - 1][keys[0]];
-      if (refId) {
-        obj3.refId = '' + refId;
-      }
-    }
-  }
   return obj3;
 }
 exports.getModel = getModel;

package/lib/state.js

@@ -123,7 +123,7 @@ function buildState(e, state, ctrl, modelName, tloc) {
         var objSet = {};
         try {
           var selectedDate = new Date(ctrl.value);
-          reflect_1.setValue(model, field, selectedDate);
+          reflect_1.setValue(model, field, selectedDate.toISOString());
           objSet[modelName] = model;
           return objSet;
         }

package/lib/useSearch.js

@@ -102,7 +102,7 @@ exports.mergeParam = mergeParam;
 exports.useSearch = function (refForm, initialState, service, p2, p) {
   var baseProps = exports.useCoreSearch(refForm, initialState, service, p2, p);
   react_1.useEffect(function () {
-    var load = baseProps.load, setState = baseProps.setState, component = baseProps.component;
+    var load = baseProps.load, setState = baseProps.setState, component = baseProps.component, searchError = baseProps.searchError;
     if (refForm) {
       var registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       core_1.initForm(refForm.current, registerEvents);
@@ -112,8 +112,13 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
     }
     else {
       var se = (p && p.createFilter ? p.createFilter() : undefined);
-      var s = search_1.mergeFilter(route_1.buildFromUrl(), se, component.pageSizes);
-      load(s, p2.auto);
+      try {
+        var s = search_1.mergeFilter(route_1.buildFromUrl(), se, component.pageSizes);
+        load(s, p2.auto);
+      }
+      catch (error) {
+        searchError(error);
+      }
     }
   }, []);
   return __assign({}, baseProps);
@@ -163,9 +168,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    var lc = (p1.getLocale ? p1.getLocale() : state_1.enLocale);
-    var cc = getCurrencyCode();
-    var obj3 = search_1.getModel(state, n, se, fs, se.excluding, keys, se.list, refForm.current, core_1.getDecodeFromForm(p1), lc, cc);
+    var obj3 = search_1.getModel(state, n, se, fs, se.excluding);
     return obj3;
   };
   var getFilter = p && p.getFilter ? p.getFilter : _getFilter;
@@ -184,7 +187,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     var runSearch = doSearch;
     if (auto) {
       setTimeout(function () {
-        runSearch(com, true);
+        runSearch(obj2, true);
       }, 0);
     }
   };
@@ -304,6 +307,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var searchError = function (err) {
     setComponent({ pageIndex: component.tmpPageIndex });
     core_1.error(err, p1.resource.value, p1.showError);
+    core_1.hideLoading(p1.loading);
   };
   var appendList = (p && p.appendList ? p.appendList : appendListOfState);
   var setList = (p && p.setList ? p.setList : setListOfState);
@@ -379,6 +383,6 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     clearQ: clearQ,
     showResults: showResults,
     getFields: getFields,
-    getModelName: getModelName, format: p ? p.format : undefined
+    getModelName: getModelName, format: p ? p.format : undefined, searchError: searchError
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/components.ts

@@ -420,12 +420,8 @@ export class BaseSearchComponent<T, F extends Filter, P, I extends SearchState<T
     if (!lc) {
       lc = enLocale;
     }
-    const cc = this.getCurrencyCode();
     const fields = this.getFields();
-    const l = this.getList();
-    const f = this.getSearchForm();
-    const dc = (this.ui ? this.ui.decodeFromForm : undefined);
-    const obj3 = getModel<T, F>(this.state, name, this, fields, this.excluding, this.keys, l, f, dc, lc, cc);
+    const obj3 = getModel<T, F>(this.state, name, this, fields, this.excluding);
     return obj3;
   }
   getFields(): string[]|undefined {

package/src/route.ts

@@ -4,11 +4,44 @@ export function buildFromUrl<S>(): S {
   return buildParameters(window.location.search);
 }
 export function buildParameters<T>(url: string): T {
+
   let urlSearch = url;
   const i = urlSearch.indexOf('?');
   if (i >= 0) {
     urlSearch = url.substring(i + 1);
   }
-  const parsed: any = qs.parse(urlSearch);
-  return parsed;
+  try {
+    const parsed: any = convertToObject(qs.parse(urlSearch));
+    return parsed;
+    
+  } catch (error) {
+    console.log(error);
+    throw error;
+  }
+}
+
+export function convertToObject(input: any) {
+  const output = {};
+
+  for (let key in input) {
+    const value = input[key];
+    const keys = key.split('.');
+
+    let currentObj = output as any;
+    for (let i = 0; i < keys.length; i++) {
+      const currentKey = keys[i];
+
+      if (!currentObj[currentKey]) {
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = value;
+        } else {
+          currentObj[currentKey] = {};
+        }
+      }
+
+      currentObj = currentObj[currentKey];
+    }
+  }
+
+  return output;
 }

package/src/search.ts

@@ -188,9 +188,33 @@ export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable,
   } else {
     delete obj.sort;
   }
+  if(searchable) {
+    mapObjects(obj, searchable as S);
+  }
   return obj;
 }
 
+function mapObjects(objA: any, objB: any): void {
+  for (let key in objA) {
+    if (objB.hasOwnProperty(key) && objB[key] !== null && objB[key] !== undefined) {
+      if(Array.isArray(objA[key])) {
+        objA[key] = [];
+        if(Array.isArray(objB[key]) && objB[key].length === 0) {
+        } else {
+          const arrayObjKeyB = objB[key].length > 0 ?  (objB[key])?.split(',') : [];
+          if(arrayObjKeyB && arrayObjKeyB.length > 1) {
+            objA[key] = [...arrayObjKeyB];
+          } else {
+            objA[key].push(objB[key])
+          }
+        }
+      } else {
+        objA[key] = objB[key];
+      }
+    }
+  }
+}
+
 export function append<T>(list?: T[], results?: T[]): T[] {
   if (list && results) {
     for (const obj of results) {
@@ -551,22 +575,11 @@ export function toggleSortStyle(target: HTMLElement): string {
   }
   return field;
 }
-export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[], keys?: string[], l?: T[], f?: HTMLFormElement|null, dc?: (f2: HTMLFormElement, lc2?: Locale, cc?: string) => any, lc?: Locale, currencyCode?: string): S {
+export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
   let obj2 = getModelFromState(state, modelName);
-  if (f && dc) {
-    obj2 = dc(f, lc, currencyCode);
-  }
   const obj: any = obj2 ? obj2 : {};
   const obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
-  if (keys && keys.length === 1) {
-    if (l && l.length > 0) {
-      const refId = (l[l.length - 1] as any)[keys[0]];
-      if (refId) {
-        obj3.refId = '' + refId;
-      }
-    }
-  }
   return obj3;
 }
 function getModelFromState(state: any, modelName: string): any {

package/src/state.ts

@@ -103,25 +103,25 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
         const objSet: any = {};
         try {
           const selectedDate = new Date(ctrl.value);
-          setValue(model, field, selectedDate);
+          setValue(model, field, selectedDate.toISOString());
           objSet[modelName] = model;
           return objSet;
         } catch (error) {
           console.error('Error occurred while formatting date:', error);
         }
         return objSet;
-      } else if (type && (type.toLowerCase() === 'time')) {
-        const objSet: any = {};
-        try {
-          const selectedDate = new Date(ctrl.value);
-          setValue(model, field, selectedDate.getTime());
-          objSet[modelName] = model;
-          return objSet;
-        } catch (error) {
-          console.error('Error occurred while formatting time:', error);
-        }
+    } else if (type && (type.toLowerCase() === 'time')) {
+      const objSet: any = {};
+      try {
+        const selectedDate = new Date(ctrl.value);
+        setValue(model, field, selectedDate.getTime());
+        objSet[modelName] = model;
         return objSet;
-      } else {
+      } catch (error) {
+        console.error('Error occurred while formatting time:', error);
+      }
+      return objSet;
+    } else {
         if (ctrl.tagName === 'SELECT') {
           if (ctrl.value === '' || !ctrl.value) {
             ctrl.removeAttribute('data-value');

package/src/useSearch.ts

@@ -1,5 +1,5 @@
 import {useEffect, useState} from 'react';
-import {error, getDecodeFromForm, getName, getRemoveError, getValidateForm, handleToggle, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
+import {error, getName, getRemoveError, getValidateForm, handleToggle, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone} from './reflect';
 import {buildFromUrl} from './route';
@@ -196,7 +196,7 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
   const baseProps = useCoreSearch(refForm, initialState, service, p2, p);
 
   useEffect(() => {
-    const { load, setState, component } = baseProps;
+    const { load, setState, component, searchError } = baseProps;
     if (refForm) {
       const registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       initForm(refForm.current, registerEvents);
@@ -205,8 +205,12 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
       p.initialize(load, setState, component);
     } else {
       const se: S|undefined = (p && p.createFilter ? p.createFilter() : undefined);
-      const s: any = mergeFilter2(buildFromUrl<S>(), se, component.pageSizes);
-      load(s, p2.auto);
+      try {
+        const s: any = mergeFilter2(buildFromUrl<S>(), se, component.pageSizes);
+        load(s, p2.auto);
+      } catch (error) {
+        searchError(error);
+      }
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -272,9 +276,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    const lc = (p1.getLocale ? p1.getLocale() : enLocale);
-    const cc = getCurrencyCode();
-    const obj3 = getModel<T, S>(state, n, se, fs, se.excluding, keys, se.list, refForm.current, getDecodeFromForm(p1), lc, cc);
+    const obj3 = getModel<T, S>(state, n, se, fs, se.excluding);
     return obj3;
   };
   const getFilter = p && p.getFilter ? p.getFilter : _getFilter;
@@ -295,7 +297,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     const runSearch = doSearch;
     if (auto) {
       setTimeout(() => {
-        runSearch(com, true);
+        runSearch((obj2 as Searchable<T>), true);
       }, 0);
     }
   };
@@ -420,6 +422,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   const searchError = (err: any): void => {
     setComponent({ pageIndex: component.tmpPageIndex });
     error(err, p1.resource.value, p1.showError);
+    hideLoading(p1.loading)
   };
   const appendList = (p && p.appendList ? p.appendList : appendListOfState);
   const setList = (p && p.setList ? p.setList : setListOfState);
@@ -502,6 +505,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     showResults,
     getFields,
     getModelName,
-    format: p ? p.format : undefined
+    format: p ? p.format : undefined,
+    searchError
   };
 };