react-hook-core 0.4.14 → 0.4.15

package/lib/common.js

@@ -13,7 +13,7 @@ function error(err, resource, ae) {
   var title = resource.error
   var msg = resource.error_internal
   if (!err) {
-    ae(msg, title)
+    ae(msg, undefined, title)
     return
   }
   var data = err && err.response ? err.response : err
@@ -22,9 +22,9 @@ function error(err, resource, ae) {
     if (status_1 && !isNaN(status_1)) {
       msg = messageByHttpStatus(status_1, resource)
     }
-    ae(msg, title)
+    ae(msg, undefined, title)
   } else {
-    ae(msg, title)
+    ae(msg, undefined, title)
   }
 }
 exports.error = error

package/lib/useEdit.js

@@ -229,9 +229,13 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       formutil_1.setReadOnly(form)
     }
     var resource = p1.resource.resource()
-    p1.showError(resource.error_404, resource.error, function () {
-      return window.history.back
-    })
+    p1.showError(
+      resource.error_404,
+      function () {
+        return window.history.back
+      },
+      resource.error,
+    )
   }
   var handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
   var _getModel = function () {
@@ -295,9 +299,9 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     var resource = p1.resource.resource()
     if (p && p.readOnly) {
       if (flag.newMode === true) {
-        p1.showError(resource.error_permission_add, resource.error_permission)
+        p1.showError(resource.error_permission_add, undefined, resource.error_permission)
       } else {
-        p1.showError(resource.error_permission_edit, resource.error_permission)
+        p1.showError(resource.error_permission_edit, undefined, resource.error_permission)
       }
     } else {
       if (running === true) {
@@ -390,17 +394,17 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         var t = resource.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 = resource.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)
       }
     }
   }
@@ -415,9 +419,9 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       var data = err && err.response ? err.response : err
       if (data.status === 400) {
         var errMsg_1 = resource.error_400
-        p1.showError(errMsg_1, errHeader)
+        p1.showError(errMsg_1, undefined, errHeader)
       } else {
-        p1.showError(errMsg, errHeader)
+        p1.showError(errMsg, undefined, errHeader)
       }
     }
   }
@@ -442,7 +446,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         } else {
           var title = resource.error
           var err = resource.error_version
-          p1.showError(err, title)
+          p1.showError(err, undefined, title)
         }
       }
     } else {
@@ -464,7 +468,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var postSave = p && p.postSave ? p.postSave : _postSave
   var _handleDuplicateKey = function (result) {
     var resource = p1.resource.resource()
-    p1.showError(resource.error_duplicate_key, resource.error)
+    p1.showError(resource.error_duplicate_key, undefined, resource.error)
   }
   var handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
   var _doSave = function (obj, body, version, isBack) {
@@ -541,7 +545,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/package.json

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

package/src/common.ts

@@ -8,11 +8,11 @@ export function messageByHttpStatus(status: number, resource: StringMap): string
   }
   return msg
 }
-export function error(err: any, resource: StringMap, ae: (msg: string, header?: string, callback?: () => void) => void) {
+export function error(err: any, resource: StringMap, ae: (msg: string, callback?: () => void, header?: string) => void) {
   const title = resource.error
   let msg = resource.error_internal
   if (!err) {
-    ae(msg, title)
+    ae(msg, undefined, title)
     return
   }
   const data = err && err.response ? err.response : err
@@ -21,8 +21,8 @@ export function error(err: any, resource: StringMap, ae: (msg: string, header?:
     if (status && !isNaN(status)) {
       msg = messageByHttpStatus(status, resource)
     }
-    ae(msg, title)
+    ae(msg, undefined, title)
   } else {
-    ae(msg, title)
+    ae(msg, undefined, title)
   }
 }

package/src/useEdit.ts

@@ -52,7 +52,7 @@ export function buildId<ID>(p: Readonly<Params<string>>, keys?: string[]): ID |
 export interface EditParameter {
   resource: ResourceService
   showMessage: (msg: string, option?: string) => void
-  showError: (m: string, header?: string, callback?: () => 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
@@ -164,7 +164,7 @@ 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, callback?: () => void) => void
+  showError: (m: string, callback?: () => void, header?: string) => void
   getLocale?: () => Locale
   confirm: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void
   ui?: UIService
@@ -340,7 +340,7 @@ export const useCoreEdit = <T, ID, S, P>(
       setReadOnly(form)
     }
     const resource = p1.resource.resource()
-    p1.showError(resource.error_404, resource.error, () => window.history.back)
+    p1.showError(resource.error_404, () => window.history.back, resource.error)
   }
   const handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
 
@@ -408,9 +408,9 @@ export const useCoreEdit = <T, ID, S, P>(
     const resource = p1.resource.resource()
     if (p && p.readOnly) {
       if (flag.newMode === true) {
-        p1.showError(resource.error_permission_add, resource.error_permission)
+        p1.showError(resource.error_permission_add, undefined, resource.error_permission)
       } else {
-        p1.showError(resource.error_permission_edit, resource.error_permission)
+        p1.showError(resource.error_permission_edit, undefined, resource.error_permission)
       }
     } else {
       if (running === true) {
@@ -507,17 +507,17 @@ export const useCoreEdit = <T, ID, S, P>(
         const t = resource.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 = resource.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)
       }
     }
   }
@@ -533,9 +533,9 @@ export const useCoreEdit = <T, ID, S, P>(
       const data = err && err.response ? err.response : err
       if (data.status === 400) {
         const errMsg = resource.error_400
-        p1.showError(errMsg, errHeader)
+        p1.showError(errMsg, undefined, errHeader)
       } else {
-        p1.showError(errMsg, errHeader)
+        p1.showError(errMsg, undefined, errHeader)
       }
     }
   }
@@ -562,7 +562,7 @@ export const useCoreEdit = <T, ID, S, P>(
         } else {
           const title = resource.error
           const err = resource.error_version
-          p1.showError(err, title)
+          p1.showError(err, undefined, title)
         }
       }
     } else {
@@ -584,7 +584,7 @@ export const useCoreEdit = <T, ID, S, P>(
 
   const _handleDuplicateKey = (result?: T) => {
     const resource = p1.resource.resource()
-    p1.showError(resource.error_duplicate_key, resource.error)
+    p1.showError(resource.error_duplicate_key, undefined, resource.error)
   }
   const handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
 
@@ -659,7 +659,7 @@ export const useCoreEdit = <T, ID, S, P>(
               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

@@ -38,7 +38,7 @@ interface Searchable extends Pagination, Sortable {
 export interface SearchParameter {
   resource: ResourceService
   showMessage: (msg: string, option?: string) => void
-  showError: (m: string, h?: string, callback?: () => void) => void
+  showError: (m: string, callback?: () => void, h?: string) => void
   ui?: UIService
   getLocale?: (profile?: string) => Locale
   loading?: LoadingService
@@ -327,7 +327,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, callback?: () => void) => void
+  showError: (m: string, callback?: () => void, header?: string) => void
   getLocale?: () => Locale
   autoSearch?: boolean
 }