react-hook-core 0.0.1 → 0.1.3

package/src/useEdit.ts

@@ -1,10 +1,12 @@
 import {useEffect, useState} from 'react';
+import {RouteComponentProps} from 'react-router';
 import {clone, makeDiff} from 'reflectx';
-import {Attributes, buildId, createEditStatus, EditPermission, EditStatusConfig, getModelName as getModelName2, initForm, LoadingService, Locale, message, messageByHttpStatus, ModelProps, ResourceService, UIService} from './core';
+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} from './formutil';
+import {focusFirstError, readOnly as setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {useRouter} from './router';
+import {localeOf} from './state';
 import {useUpdate} from './update';
 
 function prepareData(data: any): void {
@@ -39,17 +41,18 @@ export interface BaseEditComponentParam<T, ID> {
   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;
+  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;
   initialState: S;
   service: GenericService<T, ID, number|ResultInfo<T>>;
-  resourceService: ResourceService;
+  resource: ResourceService;
   showMessage: (msg: string) => void;
   showError: (m: string, header?: string, detail?: string, callback?: () => void) => void;
   getLocale?: () => Locale;
-  confirm: (m2: string, header: string, yesCallback?: () => void, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
+  confirm: (m2: string, header?: string, yesCallback?: () => void, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
   ui?: UIService;
   loading?: LoadingService;
 }
@@ -57,165 +60,82 @@ export interface EditComponentParam<T, ID, S> extends BaseEditComponentParam<T,
   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;
   callback?: (m: T, showF: (model: T) => void) => void;
 }
-export interface HookPropsEditParameter<T, ID, S, P extends ModelProps> extends HookPropsBaseEditParameter<T, ID, S, P> {
+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;
   callback?: (m: T, showF: (model: T) => void) => void;
 }
-export interface HookPropsBaseEditParameter<T, ID, S, P extends ModelProps> extends HookBaseEditParameter<T, ID, S> {
-  props?: P;
+export interface HookPropsBaseEditParameter<T, ID, S, P extends RouteComponentProps> extends HookBaseEditParameter<T, ID, S> {
+  props: P;
   prepareCustomData?: (data: any) => void;
 }
-export const useBaseEdit = <T, ID, S>(
+export const useEdit = <T, ID, S>(
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number|ResultInfo<T>>,
   p1: EditParameter,
   p2?: BaseEditComponentParam<T, ID>
   ) => {
-  return useBaseEditWithProps(null, refForm, initialState, service, p1, p2);
+  return useCoreEdit(undefined, refForm, initialState, service, p1, p2);
 };
-export const useBaseEditWithProps = <T, ID, S, P extends ModelProps>(
+export const useEditProps = <T, ID, S, P extends RouteComponentProps>(
   props: P,
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number|ResultInfo<T>>,
-  p1: EditParameter,
-  p2?: BaseEditComponentParam<T, ID>,
-  p3?: EditPermission
-  ) => {
-  const p4: BaseEditComponentParam<T, ID> = (p2 ? p2 : {} as any);
-  const p: HookPropsBaseEditParameter<T, ID, S, P> = {
-    props,
-    refForm,
-    initialState,
-    service,
-    status: p1.status,
-    resourceService: p1.resource,
-    showMessage: p1.showMessage,
-    showError: p1.showError,
-    confirm: p1.confirm,
-    ui: p1.ui,
-    getLocale: p1.getLocale,
-    loading: p1.loading,
-    backOnSuccess: p4.backOnSuccess,
-    metadata: p4.metadata,
-    keys: p4.keys,
-    version: p4.version,
-    setBack: p4.setBack,
-    patchable: p4.patchable,
-    addable: p4.addable,
-    readOnly: p4.readOnly,
-    handleNotFound: p4.handleNotFound,
-    getModelName: p4.getModelName,
-    getModel: p4.getModel,
-    showModel: p4.showModel,
-    createModel: p4.createModel,
-    onSave: p4.onSave,
-    validate: p4.validate,
-    succeed: p4.succeed,
-    fail: p4.fail,
-    postSave: p4.postSave,
-    handleDuplicateKey: p4.handleDuplicateKey,
-    load: p4.load,
-    save: p4.save
-  };
-  const per: EditPermission = (p3 ? p3 : p2);
-  if (per) {
-    p.addable = per.addable;
-    p.readOnly = per.readOnly;
-    p.deletable = per.deletable;
-  }
-  return useBaseEditOneWithProps(p);
-};
-export const useEdit = <T, ID, S, P extends ModelProps>(
-  props: P,
-  refForm: any,
-  initialState: S,
-  service: GenericService<T, ID, number|ResultInfo<T>>,
-  p1: EditComponentParam<T, ID, S>,
   p2: EditParameter,
-  p3?: EditPermission
+  p?: EditComponentParam<T, ID, S>
   ) => {
-  const p4: EditComponentParam<T, ID, S> = (p1 ? p1 : {} as any);
-  const p: HookPropsEditParameter<T, ID, S, P> = {
-    props,
-    refForm,
-    initialize: p4.initialize,
-    callback: p4.callback,
-    initialState,
-    service,
-    status: p2.status,
-    resourceService: p2.resource,
-    showMessage: p2.showMessage,
-    showError: p2.showError,
-    confirm: p2.confirm,
-    ui: p2.ui,
-    getLocale: p2.getLocale,
-    loading: p2.loading,
-    backOnSuccess: p4.backOnSuccess,
-    metadata: p4.metadata,
-    keys: p4.keys,
-    version: p4.version,
-    setBack: p4.setBack,
-    patchable: p4.patchable,
-    addable: p4.addable,
-    readOnly: p4.readOnly,
-    handleNotFound: p4.handleNotFound,
-    getModelName: p4.getModelName,
-    getModel: p4.getModel,
-    showModel: p4.showModel,
-    createModel: p4.createModel,
-    onSave: p4.onSave,
-    validate: p4.validate,
-    succeed: p4.succeed,
-    fail: p4.fail,
-    postSave: p4.postSave,
-    handleDuplicateKey: p4.handleDuplicateKey,
-    load: p4.load,
-    save: p4.save
-  };
-  const per: EditPermission = (p3 ? p3 : p1);
-  if (per) {
-    p.addable = per.addable;
-    p.readOnly = per.readOnly;
-    p.deletable = per.deletable;
-  }
-  return useEditOne(p);
-};
-export const useEditOne = <T, ID, S, P extends ModelProps>(p: HookPropsEditParameter<T, ID, S, P>) => {
-  const baseProps = useBaseEditOneWithProps(p);
+  const baseProps = useCoreEdit<T, ID, S, P>(props, refForm, initialState, service, p2, p);
   useEffect(() => {
-    if (baseProps.refForm) {
-      const registerEvents = (baseProps.ui ? baseProps.ui.registerEvents : null);
+    if (refForm) {
+      const registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       initForm(baseProps.refForm.current, registerEvents);
     }
-    const n = baseProps.getModelName(p.refForm.current);
+    const n = baseProps.getModelName(refForm.current);
     const obj: any = {};
     obj[n] = baseProps.createNewModel();
     baseProps.setState(obj);
-    if (!p.keys && p.service && p.service.metadata) {
-      const metadata = (p.metadata ? p.metadata : p.service.metadata());
+    let keys: string[]|undefined;
+    if (p && !p.keys && service && service.metadata) {
+      const metadata = (p.metadata ? p.metadata : service.metadata());
       const meta = build(metadata);
-      const keys = (p.keys ? p.keys : (meta ? meta.keys : null));
-      const version = (p.version ? p.version : (meta ? meta.version : null));
+      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>(p.props, p.keys);
-    if (p && p.initialize) {
-      p.initialize(id, baseProps.load, baseProps.setState, p.callback);
-    } else {
-      baseProps.load(id, p.callback);
+    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);
+      }
     }
   }, []);
   return {...baseProps};
 };
-export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookPropsBaseEditParameter<T, ID, S, P>) => {
+export const useEditOneProps = <T, ID, S, P extends RouteComponentProps>(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>
+  ) => {
+    /*
   const {
     backOnSuccess = true,
     patchable = true,
     addable = true
-  } = p;
+  } = p; */
+  const addable = (p && p.patchable !== false ? true : undefined);
   const {goBack} = useRouter();
   const back = (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     if (event) {
@@ -224,22 +144,23 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
     goBack();
   };
 
-  const [running, setRunning] = useState(undefined);
-  const baseProps = useUpdate<S>(p.initialState, p.getLocale);
+  const [running, setRunning] = useState<boolean>();
 
-  const getModelName = (f?: HTMLFormElement) => {
-    if (p.name && p.name.length > 0) {
+  const getModelName = (f?: HTMLFormElement|null): string => {
+    if (p && p.name && p.name.length > 0) {
       return p.name;
     }
     return getModelName2(f);
   };
-  const prepareCustomData = (p.prepareCustomData ? p.prepareCustomData : prepareData);
+  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(p.refForm.current);
-    const currentState = state[modelName];
-    if (p.props && p.props.setGlobalState) {
-      const data = p.props.shouldBeCustomized ? prepareCustomData({ [name]: value }) : { [name]: value };
-      p.props.setGlobalState({ [modelName]: { ...currentState, ...data } });
+    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);
     }
@@ -250,47 +171,47 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
     newMode: false,
     setBack: false,
     addable,
-    readOnly,
+    readOnly: p ? p.readOnly : undefined,
     originalModel: undefined
   });
 
   const showModel = (model: T) => {
-    const n = getModelName(p.refForm.current);
+    const n = getModelName(refForm.current);
     const objSet: any = {};
     objSet[n] = model;
     setState(objSet);
-    if (p.readOnly) {
-      const f = p.refForm.current;
-      readOnly(f);
+    if (p && p.readOnly) {
+      const f = refForm.current;
+      setReadOnly(f);
     }
   };
 
-  const resetState = (newMode: boolean, model: T, originalModel: T) => {
-    setFlag({ newMode, originalModel });
+  const resetState = (newMode: boolean, model: T, originalModel?: T) => {
+    setFlag({ newMode, originalModel } as any);
     showModel(model);
   };
 
   const _handleNotFound = (form?: any): void => {
-    const msg = message(p.resourceService.value, 'error_not_found', 'error');
+    const msg = message(p1.resource.value, 'error_not_found', 'error');
     if (form) {
-      readOnly(form);
+      setReadOnly(form);
     }
-    p.showError(msg.message, msg.title);
+    p1.showError(msg.message, msg.title);
   };
-  const handleNotFound = (p.handleNotFound ? p.handleNotFound : _handleNotFound);
+  const handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
 
   const _getModel = () => {
-    const n = getModelName(p.refForm.current);
-    if (p.props) {
-      return p.props[n] || state[n];
+    const n = getModelName(refForm.current);
+    if (props) {
+      return (props as any)[n] || (state as any)[n];
     } else {
-      return state[n];
+      return (state as any)[n];
     }
   };
-  const getModel = (p.getModel ? p.getModel : _getModel);
+  const getModel = (p && p.getModel ? p.getModel : _getModel);
 
   const _createModel = (): T => {
-    const metadata = (p.metadata ? p.metadata : p.service.metadata());
+    const metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
     if (metadata) {
       const obj = createModel2<T>(metadata);
       return obj;
@@ -299,75 +220,76 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
       return obj;
     }
   };
-  const createModel = (p.createModel ? p.createModel : _createModel);
+  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, null);
-    if (p.ui) {
+    resetState(true, obj, undefined);
+    const u = p1.ui;
+    if (u) {
       setTimeout(() => {
-        p.ui.removeFormError(p.refForm.current);
+        u.removeFormError(refForm.current);
       }, 100);
     }
   };
 
   const _onSave = (isBack?: boolean) => {
     if (flag.newMode === true && flag.addable === false) {
-      const m = message(p.resourceService.value, 'error_permission_add', 'error_permission');
-      p.showError(m.message, m.title);
+      const m = message(p1.resource.value, 'error_permission_add', 'error_permission');
+      p1.showError(m.message, m.title);
       return;
-    } else if (flag.newMode === false && p.readOnly) {
-      const msg = message(p.resourceService.value, 'error_permission_edit', 'error_permission');
-      p.showError(msg.message, msg.title);
+    } else if (p && flag.newMode === false && p.readOnly) {
+      const msg = message(p1.resource.value, 'error_permission_edit', 'error_permission');
+      p1.showError(msg.message, msg.title);
       return;
     } else {
       if (running === true) {
         return;
       }
       const obj = getModel();
-      const metadata = (p.metadata ? p.metadata : p.service.metadata());
-      if ((!p.keys || !p.version) && p.service && p.service.metadata) {
+      const metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
+      let keys: string[]|undefined;
+      let version: string|undefined;
+      if (p && metadata && (!p.keys || !p.version)) {
         const meta = build(metadata);
-        const keys = (p.keys ? p.keys : (meta ? meta.keys : null));
-        const version = (p.version ? p.version : (meta ? meta.version : null));
-        p.keys = keys;
-        p.version = version;
+        keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
+        version = (p.version ? p.version : (meta ? meta.version : undefined));
       }
       if (flag.newMode) {
         validate(obj, () => {
-          const msg = message(p.resourceService.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-          p.confirm(msg.message, msg.title, () => {
-            save(obj, null, p.version, isBack);
+          const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
+          p1.confirm(msg.message, msg.title, () => {
+            doSave(obj, undefined, version, isBack);
           }, msg.no, msg.yes);
         });
       } else {
-        const diffObj = makeDiff(initPropertyNullInModel(flag.originalModel, metadata), obj, p.keys, p.version);
+        const diffObj = makeDiff(initPropertyNullInModel(flag.originalModel, metadata), obj, keys, version);
         const objKeys = Object.keys(diffObj);
         if (objKeys.length === 0) {
-          p.showMessage(p.resourceService.value('msg_no_change'));
+          p1.showMessage(p1.resource.value('msg_no_change'));
         } else {
           validate(obj, () => {
-            const msg = message(p.resourceService.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-            p.confirm(msg.message, msg.title, () => {
-              save(obj, diffObj, p.version, isBack);
+            const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
+            p1.confirm(msg.message, msg.title, () => {
+              doSave(obj, diffObj, version, isBack);
             }, msg.no, msg.yes);
           });
         }
       }
     }
   };
-  const onSave = (p.onSave ? p.onSave : _onSave);
+  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(backOnSuccess);
+    onSave();
   };
 
   const _validate = (obj: T, callback: (obj2?: T) => void) => {
-    if (p.ui) {
-      const valid = p.ui.validateForm(p.refForm.current, p.getLocale());
+    if (p1.ui) {
+      const valid = p1.ui.validateForm(refForm.current, localeOf(undefined, p1.getLocale));
       if (valid) {
         callback(obj);
       }
@@ -375,7 +297,7 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
       callback(obj);
     }
   };
-  const validate = (p.validate ? p.validate : _validate);
+  const validate = (p && p.validate ? p.validate : _validate);
 
   const _succeed = (obj: T, msg: string, version?: string, isBack?: boolean, result?: ResultInfo<T>) => {
     if (result) {
@@ -389,44 +311,46 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
     } else {
       handleVersion(obj, version);
     }
-    const isBackO = (isBack == null || isBack === undefined ? backOnSuccess : isBack);
-    p.showMessage(msg);
-    if (isBackO) {
-      back(null);
+    p1.showMessage(msg);
+    if (isBack) {
+      back(undefined);
     }
   };
-  const succeed = (p.succeed ? p.succeed : _succeed);
+  const succeed = (p && p.succeed ? p.succeed : _succeed);
 
   const _fail = (result: ResultInfo<T>) => {
     const errors = result.errors;
-    const f = p.refForm.current;
-    const unmappedErrors = p.ui.showFormError(f, errors);
-    focusFirstError(f);
-    if (!result.message) {
-      if (errors && errors.length === 1) {
-        result.message = errors[0].message;
-      } else {
-        if (p.ui && p.ui.buildErrorMessage) {
-          result.message = p.ui.buildErrorMessage(unmappedErrors);
-        } else {
+    const f = refForm.current;
+    const u = p1.ui;
+    if (errors && u) {
+      const unmappedErrors = u.showFormError(f, errors);
+      focusFirstError(f);
+      if (!result.message) {
+        if (errors && errors.length === 1) {
           result.message = errors[0].message;
+        } else {
+          if (p1.ui && p1.ui.buildErrorMessage) {
+            result.message = p1.ui.buildErrorMessage(unmappedErrors);
+          } else {
+            result.message = errors[0].message;
+          }
         }
       }
+      if (result.message) {
+        const t = p1.resource.value('error');
+        p1.showError(result.message, t);
+      }
     }
-    const t = p.resourceService.value('error');
-    p.showError(result.message, t);
   };
-  const fail = (p.fail ? p.fail : _fail);
+  const fail = (p && p.fail ? p.fail : _fail);
 
   const _postSave = (obj: T, res: number | ResultInfo<T>, version?: string, backOnSave?: boolean) => {
     setRunning(false);
-    if (p.loading) {
-      p.loading.hideLoading();
-    }
+    hideLoading(p1.loading);
     const x: any = res;
-    const successMsg = p.resourceService.value('msg_save_success');
+    const successMsg = p1.resource.value('msg_save_success');
     const newMod = flag.newMode;
-    const st = createEditStatus(p.status);
+    const st = createEditStatus(p ? p.status : undefined);
     if (!isNaN(x)) {
       if (x === st.success) {
         succeed(obj, successMsg, version, backOnSave);
@@ -436,14 +360,14 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
         } else if (!newMod && x === st.not_found) {
           handleNotFound();
         } else {
-          handleStatus(x as number, st, p.resourceService.value, p.showError);
+          handleStatus(x as number, st, p1.resource.value, p1.showError);
         }
       }
     } else {
       const result: ResultInfo<any> = x;
       if (result.status === st.success) {
         succeed(obj, successMsg, version, backOnSave, result);
-        p.showMessage(successMsg);
+        p1.showMessage(successMsg);
       } else if (result.errors && result.errors.length > 0) {
         fail(result);
       } else if (newMod && result.status === st.duplicate_key) {
@@ -451,45 +375,43 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
       } else if (!newMod && x === st.not_found) {
         handleNotFound();
       } else {
-        handleStatus(result.status, st, p.resourceService.value, p.showError);
+        handleStatus(result.status, st, p1.resource.value, p1.showError);
       }
     }
   };
-  const postSave = (p.postSave ? p.postSave : _postSave);
+  const postSave = (p && p.postSave ? p.postSave : _postSave);
 
   const _handleDuplicateKey = (result?: ResultInfo<any>) => {
-    const msg = message(p.resourceService.value, 'error_duplicate_key', 'error');
-    p.showError(msg.message, msg.title);
+    const msg = message(p1.resource.value, 'error_duplicate_key', 'error');
+    p1.showError(msg.message, msg.title);
   };
-  const handleDuplicateKey = (p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
+  const handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
 
-  const _save = async (obj: T, body?: T, version?: string, isBack?: boolean) => {
+  const _doSave = (obj: T, body?: T, version?: string, isBack?: boolean) => {
     setRunning(true);
-    p.loading.showLoading();
-    const isBackO = (isBack == null || isBack === undefined ? backOnSuccess : isBack);
+    showLoading(p1.loading);
+    const isBackO = (isBack == null || isBack === undefined ? true : isBack);
+    const patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
-      if (patchable === true && body && Object.keys(body).length > 0) {
-        const result = await p.service.patch(body);
-        postSave(obj, result, version, isBackO);
+      if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
+        service.patch(body).then(result => postSave(obj, result, version, isBackO));
       } else {
-        const result = await p.service.update(obj);
-        postSave(obj, result, version, isBackO);
+        service.update(obj).then(result => postSave(obj, result, version, isBackO));
       }
     } else {
-      const result = await p.service.insert(obj);
-      postSave(obj, result, version, isBackO);
+      service.insert(obj).then(result => postSave(obj, result, version, isBackO));
     }
   };
-  const save = (p.save ? p.save : _save);
+  const doSave = (p && p.doSave ? p.doSave : _doSave);
 
-  const _load = async (_id: ID, callback?: (m: T, showM: (m2: T) => void) => void) => {
+  const _load = (_id: ID, callback?: (m: T, showM: (m2: T) => void) => void) => {
     const id: any = _id;
-    debugger;
     if (id != null && id !== '') {
-      try {
-        const obj = await p.service.load(id);
+      setRunning(true);
+      showLoading(p1.loading);
+      service.load(id).then(obj => {
         if (!obj) {
-          handleNotFound(p.refForm.current);
+          handleNotFound(refForm.current);
         } else {
           setFlag({ newMode: false, originalModel: clone(obj) });
           if (callback) {
@@ -498,31 +420,30 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
             showModel(obj);
           }
         }
-      } catch (err) {
+        setRunning(false);
+        hideLoading(p1.loading);
+      }).catch(err => {
         const data = (err &&  err.response) ? err.response : err;
-        const r = p.resourceService;
+        const r = p1.resource;
         const title = r.value('error');
         let msg = r.value('error_internal');
         if (data && data.status === 404) {
-          handleNotFound(p.refForm.current);
+          handleNotFound(refForm.current);
         } else {
           if (data.status && !isNaN(data.status)) {
             msg = messageByHttpStatus(data.status, r.value);
           }
           if (data && (data.status === 401 || data.status === 403)) {
-            readOnly(p.refForm.current);
+            setReadOnly(refForm.current);
           }
-          p.showError(msg, title);
+          p1.showError(msg, title);
         }
-      } finally {
         setRunning(false);
-        if (p.loading) {
-          p.loading.hideLoading();
-        }
-      }
+        hideLoading(p1.loading);
+      });
     } else {
       const obj = createModel();
-      setFlag({ newMode: true, originalModel: null });
+      setFlag({ newMode: true, originalModel: undefined });
       if (callback) {
         callback(obj, showModel);
       } else {
@@ -530,14 +451,14 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
       }
     }
   };
-  const load = (p.load ? p.load : _load);
+  const load = (p && p.load ? p.load : _load);
 
   return {
     ...baseProps,
     back,
-    refForm: p.refForm,
-    ui: p.ui,
-    resource: p.resourceService.resource(),
+    refForm,
+    ui: p1.ui,
+    resource: p1.resource.resource(),
     flag,
     running,
     setRunning,
@@ -548,17 +469,17 @@ export const useBaseEditOneWithProps = <T, ID, S, P extends ModelProps>(p: HookP
     handleNotFound,
     getModel,
     createNewModel: createModel,
-    newOnClick,
-    saveOnClick,
+    newOnClick: create,
+    save,
     onSave,
     confirm,
     validate,
-    showMessage: p.showMessage,
+    showMessage: p1.showMessage,
     succeed,
     fail,
     postSave,
     handleDuplicateKey,
     load,
-    save
+    doSave
   };
 };