react-hook-core 0.2.7 → 0.2.9

package/lib/core.js

@@ -136,7 +136,7 @@ function error(err, gv, ae) {
   var title = gv('error');
   var msg = gv('error_internal');
   if (!err) {
-    ae(msg, title);
+    ae(msg, undefined, title);
     return;
   }
   var data = err && err.response ? err.response : err;
@@ -145,10 +145,10 @@ function error(err, gv, ae) {
     if (status_1 && !isNaN(status_1)) {
       msg = messageByHttpStatus(status_1, gv);
     }
-    ae(msg, title);
+    ae(msg, undefined, title);
   }
   else {
-    ae(msg, title);
+    ae(msg, undefined, title);
   }
 }
 exports.error = error;
@@ -235,13 +235,6 @@ function getValidateForm(u, vf) {
   return (u && u.ui ? u.ui.validateForm : undefined);
 }
 exports.getValidateForm = getValidateForm;
-function getDecodeFromForm(u, d) {
-  if (d) {
-    return d;
-  }
-  return (u && u.ui ? u.ui.decodeFromForm : undefined);
-}
-exports.getDecodeFromForm = getDecodeFromForm;
 function handleToggle(target, on) {
   if (target) {
     if (on) {

package/lib/useEdit.js

@@ -134,7 +134,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (form) {
       formutil_1.setReadOnly(form);
     }
-    p1.showError(msg.message, msg.title, undefined, function () { return window.history.back; });
+    p1.showError(msg.message, function () { return window.history.back; }, msg.title);
   };
   var handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
   var _getModel = function () {
@@ -163,9 +163,9 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       }
       else {
         var msg = core_1.message(p1.resource.value, 'msg_confirm_back', 'confirm', 'yes', 'no');
-        p1.confirm(msg.message, msg.title, function () {
+        p1.confirm(msg.message, function () {
           navigate(-1);
-        }, msg.no, msg.yes);
+        }, msg.title, msg.no, msg.yes);
       }
     }
   };
@@ -196,11 +196,11 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (p && p.readOnly) {
       if (flag.newMode === true) {
         var m = core_1.message(p1.resource.value, 'error_permission_add', 'error_permission');
-        p1.showError(m.message, m.title);
+        p1.showError(m.message, undefined, m.title);
       }
       else {
         var msg = core_1.message(p1.resource.value, 'error_permission_edit', 'error_permission');
-        p1.showError(msg.message, msg.title);
+        p1.showError(msg.message, undefined, msg.title);
       }
     }
     else {
@@ -219,9 +219,9 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       if (flag.newMode) {
         validate(obj_1, function () {
           var msg = core_1.message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-          p1.confirm(msg.message, msg.title, function () {
+          p1.confirm(msg.message, function () {
             doSave(obj_1, undefined, version_1, isBack);
-          }, msg.no, msg.yes);
+          }, msg.title, msg.no, msg.yes);
         });
       }
       else {
@@ -233,9 +233,9 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         else {
           validate(obj_1, function () {
             var msg = core_1.message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-            p1.confirm(msg.message, msg.title, function () {
+            p1.confirm(msg.message, function () {
               doSave(obj_1, diffObj_1, version_1, isBack);
-            }, msg.no, msg.yes);
+            }, msg.title, msg.no, msg.yes);
           });
         }
       }
@@ -288,20 +288,20 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         var t = p1.resource.value('error');
         if (p1.ui && p1.ui.buildErrorMessage) {
           var msg = p1.ui.buildErrorMessage(unmappedErrors);
-          p1.showError(msg, t);
+          p1.showError(msg, undefined, t);
         }
         else {
-          p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
+          p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, undefined, t);
         }
       }
     }
     else {
       var t = p1.resource.value('error');
       if (result.length > 0) {
-        p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, undefined, t);
       }
       else {
-        p1.showError(t, t);
+        p1.showError(t, undefined, t);
       }
     }
   };
@@ -310,14 +310,15 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (err) {
       setRunning(false);
       core_1.hideLoading(p1.loading);
+      var errHeader = p1.resource.value('error');
       var errMsg = p1.resource.value('error_internal');
       var data = (err && err.response) ? err.response : err;
       if (data.status === 400) {
         var errMsg_1 = p1.resource.value('error_400');
-        p1.showError(errMsg_1, "Error");
+        p1.showError(errMsg_1, undefined, errHeader);
       }
       else {
-        p1.showError(errMsg, "Error");
+        p1.showError(errMsg, undefined, errHeader);
       }
     }
   };
@@ -345,7 +346,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         else {
           var title = p1.resource.value('error');
           var err = p1.resource.value('error_version');
-          p1.showError(err, title);
+          p1.showError(err, undefined, title);
         }
       }
     }
@@ -369,7 +370,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var postSave = (p && p.postSave ? p.postSave : _postSave);
   var _handleDuplicateKey = function (result) {
     var msg = core_1.message(p1.resource.value, 'error_duplicate_key', 'error');
-    p1.showError(msg.message, msg.title);
+    p1.showError(msg.message, undefined, msg.title);
   };
   var handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
   var _doSave = function (obj, body, version, isBack) {
@@ -436,7 +437,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
             if (data && (data.status === 401 || data.status === 403)) {
               formutil_1.setReadOnly(refForm.current);
             }
-            p1.showError(msg, title);
+            p1.showError(msg, undefined, title);
           }
         }
         setRunning(false);

package/lib/useSearch.js

@@ -1,6 +1,6 @@
 "use strict";
 var __assign = (this && this.__assign) || function () {
-  __assign = Object.assign || function (t) {
+  __assign = Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
       s = arguments[i];
       for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
@@ -361,8 +361,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     component.append = false;
     doSearch(component);
   };
-  return __assign(__assign({}, baseProps), {
-    running: running,
+  return __assign(__assign({}, baseProps), { running: running,
     setRunning: setRunning,
     getCurrencyCode: getCurrencyCode, resource: p1.resource.resource(), setComponent: setComponent,
     component: component, showMessage: p1.showMessage, load: load,
@@ -377,6 +376,5 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     clearQ: clearQ,
     showResults: showResults,
     getFields: getFields,
-    getModelName: getModelName, format: p ? p.format : undefined, searchError: searchError
-  });
+    getModelName: getModelName, format: p ? p.format : undefined, searchError: searchError });
 };

package/package.json

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

package/src/core.ts

@@ -29,7 +29,7 @@ export interface SearchPermission {
 export interface SearchParameter {
   resource: ResourceService;
   showMessage: (msg: string, option?: string) => void;
-  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void;
+  showError: (m: string, callback?: () => void, h?: string) => void;
   ui?: UIService;
   getLocale?: (profile?: string) => Locale;
   loading?: LoadingService;
@@ -239,7 +239,7 @@ export interface ErrorMessage {
 }
 export interface UIService {
   getValue(el: HTMLInputElement, locale?: Locale, currencyCode?: string): string | number | boolean | null | undefined;
-  decodeFromForm(form: HTMLFormElement, locale?: Locale, currencyCode?: string | null): any;
+  // decodeFromForm(form: HTMLFormElement, locale?: Locale, currencyCode?: string | null): any;
 
   validateForm(form?: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean): boolean;
   removeFormError(form: HTMLFormElement): void;
@@ -395,11 +395,11 @@ export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement)
   }
   return form;
 }
-export function error(err: any, gv: (key: string) => string, ae: (msg: string, header?: string, detail?: string, callback?: () => void) => void) {
+export function error(err: any, gv: (key: string) => string, ae: (msg: string, callback?: () => void, header?: string) => void) {
   const title = gv('error');
   let msg = gv('error_internal');
   if (!err) {
-    ae(msg, title);
+    ae(msg, undefined, title);
     return;
   }
   const data = err && err.response ? err.response : err;
@@ -408,9 +408,9 @@ export function error(err: any, gv: (key: string) => string, ae: (msg: string, h
     if (status && !isNaN(status)) {
       msg = messageByHttpStatus(status, gv);
     }
-    ae(msg, title);
+    ae(msg, undefined, title);
   } else {
-    ae(msg, title);
+    ae(msg, undefined, title);
   }
 }
 export function getName(d: string, n?: string): string {
@@ -494,12 +494,14 @@ export function getValidateForm(u?: UIParameter, vf?: (form: HTMLFormElement, lo
   }
   return (u && u.ui ? u.ui.validateForm : undefined);
 }
+/*
 export function getDecodeFromForm(u?: UIParameter, d?: (form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any): ((form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any) | undefined {
   if (d) {
     return d;
   }
   return (u && u.ui ? u.ui.decodeFromForm : undefined);
 }
+*/
 export function handleToggle(target?: HTMLInputElement, on?: boolean): void {
   if (target) {
     if (on) {

package/src/edit.ts

@@ -9,8 +9,8 @@ export interface ResultInfo<T> {
 export interface EditParameter {
   resource: ResourceService;
   showMessage: (msg: string, option?: string) => void;
-  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void;
-  confirm: (m2: string, header?: string, yesCallback?: () => void, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
+  showError: (m: string, callback?: () => void, header?: string) => void;
+  confirm: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
   ui?: UIService;
   getLocale?: (profile?: string) => Locale;
   loading?: LoadingService;

package/src/useEdit.ts

@@ -47,9 +47,9 @@ export interface HookBaseEditParameter<T, ID, S> extends BaseEditComponentParam<
   service: GenericService<T, ID, number|T|ErrorMessage[]>;
   resource: ResourceService;
   showMessage: (msg: string) => void;
-  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void;
+  showError: (m: string, callback?: () => void, header?: string) => void;
   getLocale?: () => Locale;
-  confirm: (m2: string, header?: string, yesCallback?: () => void, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
+  confirm: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
   ui?: UIService;
   loading?: LoadingService;
 }
@@ -213,7 +213,7 @@ export const useCoreEdit = <T, ID, S, P>(
     if (form) {
       setReadOnly(form);
     }
-    p1.showError(msg.message, msg.title, undefined, () => window.history.back);
+    p1.showError(msg.message, () => window.history.back, msg.title);
   };
   const handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
 
@@ -241,9 +241,9 @@ export const useCoreEdit = <T, ID, S, P>(
         navigate(-1);
       } else {
         const msg = message(p1.resource.value, 'msg_confirm_back', 'confirm', 'yes', 'no');
-        p1.confirm(msg.message, msg.title, () => {
+        p1.confirm(msg.message, () => {
           navigate(-1);
-        }, msg.no, msg.yes);
+        }, msg.title, msg.no, msg.yes);
       }
     }
   };
@@ -275,10 +275,10 @@ export const useCoreEdit = <T, ID, S, P>(
     if (p && p.readOnly) {
       if (flag.newMode === true) {
         const m = message(p1.resource.value, 'error_permission_add', 'error_permission');
-        p1.showError(m.message, m.title);
+        p1.showError(m.message, undefined, m.title);
       } else {
         const msg = message(p1.resource.value, 'error_permission_edit', 'error_permission');
-        p1.showError(msg.message, msg.title);
+        p1.showError(msg.message, undefined, msg.title);
       }
     } else {
 if (running === true) {
@@ -296,9 +296,9 @@ if (running === true) {
       if (flag.newMode) {
         validate(obj, () => {
           const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-          p1.confirm(msg.message, msg.title, () => {
+          p1.confirm(msg.message, () => {
             doSave(obj, undefined, version, isBack);
-          }, msg.no, msg.yes);
+          },  msg.title, msg.no, msg.yes);
         });
       } else {
         const diffObj = makeDiff(flag.originalModel, obj, keys, version);
@@ -308,9 +308,9 @@ if (running === true) {
         } else {
           validate(obj, () => {
             const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-            p1.confirm(msg.message, msg.title, () => {
+            p1.confirm(msg.message, () => {
               doSave(obj, diffObj as any, version, isBack);
-            }, msg.no, msg.yes);
+            }, msg.title, msg.no, msg.yes);
           });
         }
       }
@@ -364,17 +364,17 @@ if (running === true) {
         const t = p1.resource.value('error');
         if (p1.ui && p1.ui.buildErrorMessage) {
           const msg = p1.ui.buildErrorMessage(unmappedErrors);
-          p1.showError(msg, t);
+          p1.showError(msg, undefined, t);
         } else {
-          p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
+          p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, undefined, t);
         }
       }
     } else {
       const t = p1.resource.value('error');
       if (result.length > 0) {
-        p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, undefined, t);
       } else {
-        p1.showError(t, t);
+        p1.showError(t, undefined, t);
       }
     }
   };
@@ -384,13 +384,14 @@ if (running === true) {
     if (err) {
       setRunning(false);
       hideLoading(p1.loading);
+      const errHeader = p1.resource.value('error');
       const errMsg = p1.resource.value('error_internal');
       const data = (err && err.response) ? err.response : err;
       if (data.status === 400) {
         const errMsg = p1.resource.value('error_400');
-        p1.showError(errMsg, "Error");
+        p1.showError(errMsg, undefined, errHeader);
       } else{
-        p1.showError(errMsg, "Error");
+        p1.showError(errMsg, undefined, errHeader);
       }
     }
   };
@@ -416,7 +417,7 @@ if (running === true) {
         } else {
           const title = p1.resource.value('error');
           const err = p1.resource.value('error_version');
-          p1.showError(err, title);
+          p1.showError(err, undefined, title);
         }
       }
     } else {
@@ -438,7 +439,7 @@ if (running === true) {
 
   const _handleDuplicateKey = (result?: T) => {
     const msg = message(p1.resource.value, 'error_duplicate_key', 'error');
-    p1.showError(msg.message, msg.title);
+    p1.showError(msg.message, undefined, msg.title);
   };
   const handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
 
@@ -501,7 +502,7 @@ if (running === true) {
             if (data && (data.status === 401 || data.status === 403)) {
               setReadOnly(refForm.current);
             }
-            p1.showError(msg, title);
+            p1.showError(msg, undefined, title);
           } 
         }
         setRunning(false);

package/src/useSearch.ts

@@ -107,7 +107,7 @@ export interface HookBaseSearchParameter<T, S extends Filter, ST extends SearchC
   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;
+  showError: (m: string, callback?: () => void, header?: string) => void;
   getLocale?: () => Locale;
   autoSearch?: boolean;
 }