react-hook-core 0.1.2 → 0.1.5

package/src/useEdit.ts

@@ -1,17 +1,13 @@
 import {useEffect, useState} from 'react';
-import {RouteComponentProps} from 'react-router';
-import {clone, makeDiff} from 'reflectx';
+import {useNavigate, useParams} from 'react-router';
 import {Attributes, buildId, createEditStatus, EditStatusConfig, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ResourceService, showLoading, UIService} from './core';
 import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel, ResultInfo} from './edit';
 import {focusFirstError, readOnly as setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
-import {useRouter} from './router';
+import {clone, makeDiff} from './reflect';
 import {localeOf} from './state';
 import {useUpdate} from './update';
 
-function prepareData(data: any): void {
-}
-
 export interface BaseEditComponentParam<T, ID> {
   status?: EditStatusConfig;
   backOnSuccess?: boolean;
@@ -40,9 +36,9 @@ export interface BaseEditComponentParam<T, ID> {
   fail?: (result: ResultInfo<T>) => void;
   postSave?: (obj: T, res: number|ResultInfo<T>, version?: string, backOnSave?: boolean) => void;
   handleDuplicateKey?: (result?: ResultInfo<T>) => void;
-  load?: (i: ID, callback?: (m: T, showM: (m2: T) => void) => void) => void;
-  save?: (obj: T, diff?: T, version?: string, isBack?: boolean) => void;
-  prepareCustomData?: (data: any) => void; // need to review
+  load?: (i: ID|null, callback?: (m: T, showM: (m2: T) => void) => void) => void;
+  doSave?: (obj: T, diff?: T, version?: string, isBack?: boolean) => void;
+  // prepareCustomData?: (data: any) => void; // need to review
 }
 export interface HookBaseEditParameter<T, ID, S> extends BaseEditComponentParam<T, ID> {
   refForm: any;
@@ -57,27 +53,57 @@ export interface HookBaseEditParameter<T, ID, S> extends BaseEditComponentParam<
   loading?: LoadingService;
 }
 export interface EditComponentParam<T, ID, S> extends BaseEditComponentParam<T, ID> {
-  initialize?: (id: ID, ld: (i: ID, cb?: (m: T, showF: (model: T) => void) => void) => void, setState2: DispatchWithCallback<Partial<S>>, callback?: (m: T, showF: (model: T) => void) => void) => void;
+  initialize?: (id: ID|null, ld: (i: ID|null, cb?: (m: T, showF: (model: T) => void) => void) => void, setState2: DispatchWithCallback<Partial<S>>, callback?: (m: T, showF: (model: T) => void) => void) => void;
   callback?: (m: T, showF: (model: T) => void) => void;
 }
-export interface HookPropsEditParameter<T, ID, S, P extends RouteComponentProps> extends HookPropsBaseEditParameter<T, ID, S, P> {
-  initialize?: (id: ID, ld: (i: ID, cb?: (m: T, showF: (model: T) => void) => void) => void, setState2: DispatchWithCallback<Partial<S>>, callback?: (m: T, showF: (model: T) => void) => void) => void;
+export interface HookPropsEditParameter<T, ID, S, P> extends HookPropsBaseEditParameter<T, ID, S, P> {
+  initialize?: (id: ID|null, ld: (i: ID|null, cb?: (m: T, showF: (model: T) => void) => void) => void, setState2: DispatchWithCallback<Partial<S>>, callback?: (m: T, showF: (model: T) => void) => void) => void;
   callback?: (m: T, showF: (model: T) => void) => void;
 }
-export interface HookPropsBaseEditParameter<T, ID, S, P extends RouteComponentProps> extends HookBaseEditParameter<T, ID, S> {
+export interface HookPropsBaseEditParameter<T, ID, S, P> extends HookBaseEditParameter<T, ID, S> {
   props: P;
-  prepareCustomData?: (data: any) => void;
+  // prepareCustomData?: (data: any) => void;
 }
 export const useEdit = <T, ID, S>(
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number|ResultInfo<T>>,
-  p1: EditParameter,
-  p2?: BaseEditComponentParam<T, ID>
+  p2: EditParameter,
+  p?: EditComponentParam<T, ID, S>
   ) => {
-  return useCoreEdit(undefined, refForm, initialState, service, p1, p2);
+  const params = useParams();
+  const baseProps = useCoreEdit(refForm, initialState, service, p2, p);
+  useEffect(() => {
+    if (refForm) {
+      const registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
+      initForm(baseProps.refForm.current, registerEvents);
+    }
+    const n = baseProps.getModelName(refForm.current);
+    const obj: any = {};
+    obj[n] = baseProps.createNewModel();
+    baseProps.setState(obj);
+    let keys: string[]|undefined;
+    if (p && !p.keys && service && service.metadata) {
+      const metadata = (p.metadata ? p.metadata : service.metadata());
+      if (metadata) {
+        const meta = build(metadata);
+        keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
+        const version = (p.version ? p.version : (meta ? meta.version : undefined));
+        p.keys = keys;
+        p.version = version;
+      }
+    }
+    const id = buildId<ID>(params, keys);
+    if (p && p.initialize) {
+      p.initialize(id, baseProps.load, baseProps.setState, p.callback);
+    } else {
+      baseProps.load(id, p ? p.callback : undefined);
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return {...baseProps};
 };
-export const useEditProps = <T, ID, S, P extends RouteComponentProps>(
+export const useEditProps = <T, ID, S, P>(
   props: P,
   refForm: any,
   initialState: S,
@@ -85,7 +111,8 @@ export const useEditProps = <T, ID, S, P extends RouteComponentProps>(
   p2: EditParameter,
   p?: EditComponentParam<T, ID, S>
   ) => {
-  const baseProps = useCoreEdit<T, ID, S, P>(props, refForm, initialState, service, p2, p);
+  const params = useParams();
+  const baseProps = useCoreEdit<T, ID, S, P>(refForm, initialState, service, p2, p, props);
   useEffect(() => {
     if (refForm) {
       const registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
@@ -98,36 +125,37 @@ export const useEditProps = <T, ID, S, P extends RouteComponentProps>(
     let keys: string[]|undefined;
     if (p && !p.keys && service && service.metadata) {
       const metadata = (p.metadata ? p.metadata : service.metadata());
-      const meta = build(metadata);
-      keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
-      const version = (p.version ? p.version : (meta ? meta.version : undefined));
-      p.keys = keys;
-      p.version = version;
-    }
-    const id = buildId<ID>(props, keys);
-    if (id) {
-      if (p && p.initialize) {
-        p.initialize(id, baseProps.load, baseProps.setState, p.callback);
-      } else {
-        baseProps.load(id, p ? p.callback : undefined);
+      if (metadata) {
+        const meta = build(metadata);
+        keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
+        const version = (p.version ? p.version : (meta ? meta.version : undefined));
+        p.keys = keys;
+        p.version = version;
       }
     }
+    const id = buildId<ID>(params, keys);
+    if (p && p.initialize) {
+      p.initialize(id, baseProps.load, baseProps.setState, p.callback);
+    } else {
+      baseProps.load(id, p ? p.callback : undefined);
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return {...baseProps};
 };
-export const useEditOneProps = <T, ID, S, P extends RouteComponentProps>(p: HookPropsEditParameter<T, ID, S, P>) => {
+export const useEditOneProps = <T, ID, S, P>(p: HookPropsEditParameter<T, ID, S, P>) => {
   return useEditProps(p.props, p.refForm, p.initialState, p.service, p, p);
 };
 export const useEditOne = <T, ID, S>(p: HookBaseEditParameter<T, ID, S>) => {
   return useEdit(p.refForm, p.initialState, p.service, p, p);
 };
 export const useCoreEdit = <T, ID, S, P>(
-  props: P|undefined,
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number|ResultInfo<T>>,
   p1: EditParameter,
-  p?: BaseEditComponentParam<T, ID>
+  p?: BaseEditComponentParam<T, ID>,
+  props?: P
   ) => {
     /*
   const {
@@ -135,13 +163,13 @@ export const useCoreEdit = <T, ID, S, P>(
     patchable = true,
     addable = true
   } = p; */
+  const navigate = useNavigate();
   const addable = (p && p.patchable !== false ? true : undefined);
-  const {goBack} = useRouter();
   const back = (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     if (event) {
       event.preventDefault();
     }
-    goBack();
+    navigate(-1);
   };
 
   const [running, setRunning] = useState<boolean>();
@@ -154,18 +182,6 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const baseProps = useUpdate<S>(initialState, getModelName, p1.getLocale);
 
-  const prepareCustomData = (p && p.prepareCustomData ? p.prepareCustomData : prepareData);
-  const updateDateState = (name: string, value: any) => {
-    const modelName = getModelName(refForm.current);
-    const currentState = (state as any)[modelName];
-    if (props && (props as any).setGlobalState) {
-      const data = (props as any).shouldBeCustomized ? prepareCustomData({ [name]: value }) : { [name]: value };
-      (props as any).setGlobalState({ [modelName]: { ...currentState, ...data } });
-    } else {
-      setState({[modelName]: {...currentState, [name]: value}} as T);
-    }
-  };
-
   const { state, setState } = baseProps;
   const [flag, setFlag] = useMergeState({
     newMode: false,
@@ -222,7 +238,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const createModel = (p && p.createModel ? p.createModel : _createModel);
 
-  const newOnClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+  const create = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     event.preventDefault();
     const obj = createModel();
     resetState(true, obj, undefined);
@@ -260,7 +276,7 @@ export const useCoreEdit = <T, ID, S, P>(
         validate(obj, () => {
           const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
           p1.confirm(msg.message, msg.title, () => {
-            save(obj, undefined, version, isBack);
+            doSave(obj, undefined, version, isBack);
           }, msg.no, msg.yes);
         });
       } else {
@@ -272,7 +288,7 @@ export const useCoreEdit = <T, ID, S, P>(
           validate(obj, () => {
             const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
             p1.confirm(msg.message, msg.title, () => {
-              save(obj, diffObj, version, isBack);
+              doSave(obj, diffObj, version, isBack);
             }, msg.no, msg.yes);
           });
         }
@@ -281,7 +297,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const onSave = (p && p.onSave ? p.onSave : _onSave);
 
-  const saveOnClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+  const save = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     event.preventDefault();
     event.persist();
     onSave();
@@ -387,7 +403,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
 
-  const _save = (obj: T, body?: T, version?: string, isBack?: boolean) => {
+  const _doSave = (obj: T, body?: T, version?: string, isBack?: boolean) => {
     setRunning(true);
     showLoading(p1.loading);
     const isBackO = (isBack == null || isBack === undefined ? true : isBack);
@@ -402,9 +418,9 @@ export const useCoreEdit = <T, ID, S, P>(
       service.insert(obj).then(result => postSave(obj, result, version, isBackO));
     }
   };
-  const save = (p && p.save ? p.save : _save);
+  const doSave = (p && p.doSave ? p.doSave : _doSave);
 
-  const _load = (_id: ID, callback?: (m: T, showM: (m2: T) => void) => void) => {
+  const _load = (_id: ID|null, callback?: (m: T, showM: (m2: T) => void) => void) => {
     const id: any = _id;
     if (id != null && id !== '') {
       setRunning(true);
@@ -462,16 +478,16 @@ export const useCoreEdit = <T, ID, S, P>(
     flag,
     running,
     setRunning,
-    updateDateState,
     showModel,
     getModelName,
     resetState,
     handleNotFound,
     getModel,
     createNewModel: createModel,
-    newOnClick,
-    saveOnClick,
+    newOnClick: create,
+    save,
     onSave,
+    // eslint-disable-next-line no-restricted-globals
     confirm,
     validate,
     showMessage: p1.showMessage,
@@ -480,6 +496,6 @@ export const useCoreEdit = <T, ID, S, P>(
     postSave,
     handleDuplicateKey,
     load,
-    save
+    doSave
   };
 };

package/src/useSearch.ts

@@ -1,21 +1,25 @@
 import {useEffect, useState} from 'react';
-import {RouteComponentProps} from 'react-router';
-import {useHistory, useRouteMatch} from 'react-router-dom';
-import {clone} from 'reflectx';
-import {addParametersIntoUrl, append, buildMessage, Filter, formatResults, getFieldsFromForm, getModel, handleAppend, handleSort, initFilter, mergeFilter as mergeFilter2, Pagination, removeSortStatus, showPaging, Sortable, validate} from 'search-core';
-import {error, getDecodeFromForm, getName, getRemoveError, getValidateForm, hideLoading, initForm, Locale, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
+import {error, getDecodeFromForm, 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';
+import {addParametersIntoUrl, append, buildMessage, formatResults, getFieldsFromForm, getModel, handleAppend, handleSort, initFilter, mergeFilter as mergeFilter2, Pagination, removeSortStatus, showPaging, Sortable, validate} from './search';
 import {enLocale} from './state';
-import {useUpdate, useUpdateWithProps} from './update';
+import {useUpdate} from './update';
 
 export interface Searchable<T> extends Pagination, Sortable {
   nextPageToken?: string;
   excluding?: string[]|number[];
   list?: T[];
 }
-function prepareData(data: any): void {
+interface Filter {
+  page?: number;
+  limit?: number;
+  firstLimit?: number;
+  fields?: string[];
+  sort?: string;
 }
+
 export const callSearch = <T, S extends Filter>(se: S, search3: (s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>, showResults3: (s: S, sr: SearchResult<T>, lc: Locale) => void, searchError3: (err: any) => void, lc: Locale, nextPageToken?: string) => {
   const s = clone(se);
   let page = se.page;
@@ -24,7 +28,7 @@ export const callSearch = <T, S extends Filter>(se: S, search3: (s: S, limit?: n
   }
   let offset: number;
   if (!se.limit || se.limit <= 0) {
-    se.limit = 20;
+    se.limit = 24;
   }
   if (se.firstLimit && se.firstLimit > 0) {
     offset = se.limit * (page - 2) + se.firstLimit;
@@ -53,13 +57,19 @@ export interface InitSearchComponentParam<T, M extends Filter, S> extends Search
   createFilter?: () => M;
   initialize?: (ld: (s: M, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<S>>, com?: SearchComponentState<T, M>) => void;
 }
-export interface HookPropsSearchParameter<T, S extends Filter, ST, P extends RouteComponentProps> extends HookPropsBaseSearchParameter<T, S, ST, P> {
+export interface HookPropsSearchParameter<T, S extends Filter, ST, P> extends HookPropsBaseSearchParameter<T, S, ST, P> {
   createFilter?: () => S;
   initialize?: (ld: (s: S, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<ST>>, com?: SearchComponentState<T, S>) => void;
 }
 export interface SearchComponentParam<T, M extends Filter> {
+  addable?: boolean;
+  editable?: boolean;
+  approvable?: boolean;
+  deletable?: boolean;
+
   keys?: string[];
   sequenceNo?: string;
+  hideFilter?: boolean;
   name?: string;
   fields?: string[];
   appendMode?: boolean;
@@ -77,7 +87,7 @@ export interface SearchComponentParam<T, M extends Filter> {
   getFilter?: () => M;
   getFields?: () => string[]|undefined;
   validateSearch?: (se: M, callback: () => void) => void;
-  prepareCustomData?: (data: any) => void;
+  // prepareCustomData?: (data: any) => void;
   format?(obj: T, locale?: Locale): T;
   showResults?(s: M, sr: SearchResult<T>, lc: Locale): void;
   appendList?(results: T[], list: T[]|undefined, s: DispatchWithCallback<Partial<SearchComponentState<T, M>>>): void;
@@ -95,7 +105,7 @@ export interface SearchComponentParam<T, M extends Filter> {
 export interface HookBaseSearchParameter<T, S extends Filter, ST extends SearchComponentState<T, S>> extends SearchComponentParam<T, S> {
   refForm: any;
   initialState: ST;
-  search: ((s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>;
+  service: ((s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>;
   resource: ResourceService;
   showMessage: (msg: string) => void;
   showError: (m: string, header?: string, detail?: string, callback?: () => void) => void;
@@ -104,7 +114,7 @@ export interface HookBaseSearchParameter<T, S extends Filter, ST extends SearchC
 }
 export interface HookPropsBaseSearchParameter<T, S extends Filter, ST, P> extends HookBaseSearchParameter<T, S, ST> {
   props?: P;
-  prepareCustomData?: (data: any) => void;
+  // prepareCustomData?: (data: any) => void;
 }
 export interface SearchComponentState<T, S> extends Pagination, Sortable {
   view?: string;
@@ -121,7 +131,7 @@ export interface SearchComponentState<T, S> extends Pagination, Sortable {
 
   pageMaxSize?: number;
   pageSizes?: number[];
-  excluding?: any;
+  excluding?: string[]|number[];
   hideFilter?: boolean;
 
   ignoreUrlParam?: boolean;
@@ -131,7 +141,6 @@ export interface SearchComponentState<T, S> extends Pagination, Sortable {
   approvable?: boolean;
   deletable?: boolean;
 }
-export const pageSizes = [10, 20, 40, 60, 100, 200, 400, 800];
 
 function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>): SearchComponentParam<T, S> {
   if (p) {
@@ -139,7 +148,7 @@ function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>): Search
       p.sequenceNo = 'sequenceNo';
     }
     if (!p.pageSize) {
-      p.pageSize = 20;
+      p.pageSize = 24;
     }
     if (!p.pageSizes) {
       p.pageSizes = pageSizes;
@@ -147,25 +156,44 @@ function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>): Search
     if (!p.pageMaxSize || p.pageMaxSize <= 0) {
       p.pageMaxSize = 7;
     }
+    if (p.hideFilter === undefined) {
+      p.hideFilter = true;
+    }
+    if (p.addable === undefined) {
+      p.addable = true;
+    }
+    if (p.editable === undefined) {
+      p.editable = true;
+    }
+    if (p.approvable === undefined) {
+      p.approvable = true;
+    }
+    if (p.deletable === undefined) {
+      p.deletable = true;
+    }
     return p;
   } else {
     return {
       sequenceNo: 'sequenceNo',
-      pageSize: 20,
+      pageSize: 24,
       pageSizes,
-      pageMaxSize: 7
+      pageMaxSize: 7,
+      hideFilter: true,
+      addable: true,
+      editable: true,
+      approvable: true,
+      deletable: true
     };
   }
 }
 export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T, S>>(
   refForm: any,
   initialState: ST,
-  search: ((s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>,
+  service: ((s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>,
   p2: SearchParameter,
   p?: InitSearchComponentParam<T, S, ST>,
 ) => {
-  debugger;
-  const baseProps = useCoreSearch(undefined, refForm, initialState, search, p2, p);
+  const baseProps = useCoreSearch(refForm, initialState, service, p2, p);
 
   useEffect(() => {
     const { load, setState, component } = baseProps;
@@ -180,22 +208,23 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
       const s: any = mergeFilter2(buildFromUrl<S>(), se, component.pageSizes);
       load(s, p2.auto);
     }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return { ...baseProps };
 };
-export const useSearchOneProps = <T, S extends Filter, ST extends SearchComponentState<T, S>, P extends RouteComponentProps>(p: HookPropsSearchParameter<T, S, ST, P>) => {
-  return useSearch(p.refForm, p.initialState, p.search, p, p);
+export const useSearchOneProps = <T, S extends Filter, ST extends SearchComponentState<T, S>, P>(p: HookPropsSearchParameter<T, S, ST, P>) => {
+  return useSearch(p.refForm, p.initialState, p.service, p, p);
 };
 export const useSearchOne = <T, S extends Filter, ST extends SearchComponentState<T, S>>(p: HookBaseSearchParameter<T, S, ST>) => {
-  return useCoreSearch(undefined, p.refForm, p.initialState, p.search, p, p);
+  return useCoreSearch(p.refForm, p.initialState, p.service, p, p);
 };
 export const useCoreSearch = <T, S extends Filter, ST, P>(
-  props: P|undefined,
   refForm: any,
   initialState: ST,
-  search: ((s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>,
+  service: ((s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>,
   p1: SearchParameter,
-  p2?: SearchComponentParam<T, S>
+  p2?: SearchComponentParam<T, S>,
+  props?: P
 ) => {
   const p = mergeParam(p2);
   const [running, setRunning] = useState<boolean>();
@@ -206,38 +235,21 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
   const getModelName = (p && p.getModelName ? p.getModelName : _getModelName);
 
   // const setState2: <K extends keyof S, P>(st: ((prevState: Readonly<S>, props: Readonly<P>) => (Pick<S, K> | S | null)) | (Pick<S, K> | S | null), cb?: () => void) => void;
-  const baseProps = (props ? useUpdateWithProps<ST, P>(props, initialState, getModelName, p1.getLocale, getRemoveError(p1), p ? p.prepareCustomData : undefined) : useUpdate<ST>(initialState, getModelName, p1.getLocale, getRemoveError(p1)));
+  const baseProps = useUpdate<ST>(initialState, getModelName, p1.getLocale, getRemoveError(p1));
   const { state, setState } = baseProps;
-  const [history, match] = [useHistory(), useRouteMatch()];
 
   const _getCurrencyCode = (): string => {
     return refForm && refForm.current ? refForm.current.getAttribute('currency-code') : null;
   };
   const getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode;
 
-  const prepareCustomData = (p && p.prepareCustomData ? p.prepareCustomData : prepareData);
-  const updateDateState = (name: string, value: any) => {
-    const modelName = getModelName();
-    const currentState = (state as any)[modelName];
-    if (props && (props as any).setGlobalState) {
-      const data = (props as any).shouldBeCustomized ? prepareCustomData({ [name]: value }) : { [name]: value };
-      (props as any).setGlobalState({ [modelName]: { ...currentState, ...data } });
-    } else {
-      setState({ [modelName]: { ...currentState, [name]: value } } as T);
-    }
-    setState({ [modelName]: { ...currentState, [name]: value } } as T);
-  };
-
   // const p = createSearchComponentState<T, S>(p1);
   const [component, setComponent] = useMergeState<SearchComponentState<T, S>>(p);
 
-  const toggleFilter = (event: any): void => {
-    setComponent({ hideFilter: !component.hideFilter });
-  };
-
-  const add = (event: any) => {
-    event.preventDefault();
-    history.push(match.url + '/add');
+  const toggleFilter = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
+    const x = !component.hideFilter;
+    handleToggle(event.target as HTMLInputElement, !x);
+    setComponent({ hideFilter: x });
   };
 
   const _getFields = (): string[]|undefined => {
@@ -253,8 +265,8 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
       se = component;
     }
     let keys = p && p.keys ? p.keys : undefined;
-    if (!keys && typeof search !== 'function' && search.keys) {
-      keys = search.keys();
+    if (!keys && typeof service !== 'function' && service.keys) {
+      keys = service.keys();
     }
     const n = getModelName();
     let fs = p && p.fields;
@@ -303,10 +315,10 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
         addParametersIntoUrl(s, isFirstLoad);
       }
       const lc = p1.getLocale ? p1.getLocale() : enLocale;
-      if (typeof search === 'function') {
-        callSearch<T, S>(s, search, showResults, searchError, lc, se.nextPageToken);
+      if (typeof service === 'function') {
+        callSearch<T, S>(s, service, showResults, searchError, lc, se.nextPageToken);
       } else {
-        callSearch<T, S>(s, search.search, showResults, searchError, lc, se.nextPageToken);
+        callSearch<T, S>(s, service.search, showResults, searchError, lc, se.nextPageToken);
       }
     });
   };
@@ -343,7 +355,7 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
     }
   };
 
-  const searchOnClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
+  const search = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
     if (event) {
       event.preventDefault();
     }
@@ -411,11 +423,11 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
   const _showResults = (s: S, sr: SearchResult<T>, lc: Locale) => {
     const results = sr.list;
     if (results && results.length > 0) {
-      formatResults(results, component.pageIndex, component.pageSize, component.initPageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
+      formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }
     const am = component.appendMode;
     const pi = (s.page && s.page >= 1 ? s.page : 1);
-    setComponent({ itemTotal: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
+    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
     if (am) {
       let limit = s.limit;
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
@@ -456,11 +468,11 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
     doSearch(component);
   };
 
-  const pageChanged = (data: any) => {
-    const { currentPage, itemsPerPage } = data;
-    setComponent({ pageIndex: currentPage, pageSize: itemsPerPage, append: false });
-    component.pageIndex = currentPage;
-    component.pageSize = itemsPerPage;
+  const pageChanged = (data: PageChange) => {
+    const { page, size } = data;
+    setComponent({ pageIndex: page, pageSize: size, append: false });
+    component.pageIndex = page;
+    component.pageSize = size;
     component.append = false;
     doSearch(component);
   };
@@ -470,14 +482,12 @@ export const useCoreSearch = <T, S extends Filter, ST, P>(
     running,
     setRunning,
     getCurrencyCode,
-    updateDateState,
     resource: p1.resource.resource(),
     setComponent,
     component,
     showMessage: p1.showMessage,
     load,
-    add,
-    searchOnClick,
+    search,
     sort,
     changeView,
     showMore,