react-hook-core 0.3.4 → 0.3.5

package/lib/core.js

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var formutil_1 = require("./formutil");
 exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
-exports.size = exports.pageSizes;
-var resource = (function () {
-  function resource() {
-  }
-  resource.phone = / |-|\.|\(|\)/g;
-  resource._cache = {};
-  resource.cache = true;
-  return resource;
+var resources = (function () {
+  function resources() {
+  }
+  resources.phone = / |-|\.|\(|\)/g;
+  resources._cache = {};
+  resources.cache = true;
+  resources.limit = 24;
+  resources.pages = exports.pageSizes;
+  resources.pageMaxSize = 7;
+  return resources;
 }());
-exports.resource = resource;
+exports.resources = resources;
+exports.size = exports.pageSizes;
 function getCurrencyCode(form) {
   if (form) {
     var x = form.getAttribute('currency-code');
@@ -24,7 +27,7 @@ function getCurrencyCode(form) {
 exports.getCurrencyCode = getCurrencyCode;
 function removePhoneFormat(phone) {
   if (phone) {
-    return phone.replace(resource.phone, '');
+    return phone.replace(resources.phone, '');
   }
   else {
     return phone;

package/lib/edit.js

@@ -5,11 +5,11 @@ function build(attributes, name) {
   if (!attributes) {
     return undefined;
   }
-  if (core_1.resource.cache && name && name.length > 0) {
-    var meta = core_1.resource._cache[name];
+  if (core_1.resources.cache && name && name.length > 0) {
+    var meta = core_1.resources._cache[name];
     if (!meta) {
       meta = buildMetaModel(attributes);
-      core_1.resource._cache[name] = meta;
+      core_1.resources._cache[name] = meta;
     }
     return meta;
   }
@@ -102,3 +102,35 @@ function handleVersion(obj, version) {
   }
 }
 exports.handleVersion = handleVersion;
+function isSuccessful(x) {
+  if (Array.isArray(x)) {
+    return false;
+  }
+  else if (typeof x === 'object') {
+    return true;
+  }
+  else if (typeof x === 'number' && x > 0) {
+    return true;
+  }
+  return false;
+}
+exports.isSuccessful = isSuccessful;
+function afterSaved(res, form, resource, showFormError, alertSuccess, alertError, navigate) {
+  if (Array.isArray(res)) {
+    showFormError(form, res);
+  }
+  else if (isSuccessful(res)) {
+    alertSuccess(resource.msg_save_success, function () {
+      if (navigate) {
+        navigate(-1);
+      }
+    });
+  }
+  else if (res === 0) {
+    alertError(resource.error_not_found);
+  }
+  else {
+    alertError(resource.error_conflict);
+  }
+}
+exports.afterSaved = afterSaved;

package/lib/search.js

@@ -7,16 +7,8 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
   return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var core_1 = require("./core");
 var reflect_1 = require("./reflect");
-var resources = (function () {
-  function resources() {
-  }
-  resources.limit = 24;
-  resources.pages = [12, 24, 60, 100, 120, 180, 300, 600];
-  resources.pageMaxSize = 7;
-  return resources;
-}());
-exports.resources = resources;
 function getOffset(limit, page, firstLimit) {
   var p = page && page > 0 ? page : 1;
   if (firstLimit && firstLimit > 0) {
@@ -442,7 +434,7 @@ function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
         if (key !== fields) {
           if (typeof objValue === 'string' || typeof objValue === 'number') {
             if (key === limit) {
-              if (objValue !== resources.limit) {
+              if (objValue !== core_1.resources.limit) {
                 url += getPrefix(url) + (key + "=" + objValue);
               }
             }

package/lib/useEdit.js

@@ -477,16 +477,3 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     load: load,
     doSave: doSave });
 };
-function isSuccessful(x) {
-  if (Array.isArray(x)) {
-    return false;
-  }
-  else if (typeof x === 'object') {
-    return true;
-  }
-  else if (typeof x === 'number' && x > 0) {
-    return true;
-  }
-  return false;
-}
-exports.isSuccessful = isSuccessful;

package/package.json

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

package/src/core.ts

@@ -2,6 +2,15 @@ import { Params } from 'react-router';
 import { focusFirstElement } from './formutil';
 
 export const pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
+// tslint:disable-next-line:class-name
+export class resources {
+  static phone = / |-|\.|\(|\)/g;
+  static _cache: any = {};
+  static cache = true;
+  static limit = 24;
+  static pages = pageSizes;
+  static pageMaxSize = 7;
+}
 export const size = pageSizes;
 export interface ModelMap {
   [key: string]: any;
@@ -148,12 +157,6 @@ export interface DiffState<T> {
   disabled: boolean;
 }
 
-// tslint:disable-next-line:class-name
-export class resource {
-  static phone = / |-|\.|\(|\)/g;
-  static _cache: any = {};
-  static cache = true;
-}
 export function getCurrencyCode(form?: HTMLFormElement | null): string | undefined {
   if (form) {
     const x = form.getAttribute('currency-code');
@@ -165,7 +168,7 @@ export function getCurrencyCode(form?: HTMLFormElement | null): string | undefin
 }
 export function removePhoneFormat(phone: string): string {
   if (phone) {
-    return phone.replace(resource.phone, '');
+    return phone.replace(resources.phone, '');
   } else {
     return phone;
   }

package/src/edit.ts

@@ -1,4 +1,5 @@
-import {Attribute, Attributes, ErrorMessage, LoadingService, Locale, resource, ResourceService, UIService, ViewService} from './core';
+import { NavigateFunction } from 'react-router-dom';
+import {Attribute, Attributes, ErrorMessage, LoadingService, Locale, resources, ResourceService, StringMap, UIService, ViewService} from './core';
 
 export interface ResultInfo<T> {
   status: number|string;
@@ -30,11 +31,11 @@ export function build(attributes: Attributes, name?: string): MetaModel|undefine
   if (!attributes) {
     return undefined;
   }
-  if (resource.cache && name && name.length > 0) {
-    let meta: MetaModel = resource._cache[name];
+  if (resources.cache && name && name.length > 0) {
+    let meta: MetaModel = resources._cache[name];
     if (!meta) {
       meta = buildMetaModel(attributes);
-      resource._cache[name] = meta;
+      resources._cache[name] = meta;
     }
     return meta;
   } else {
@@ -151,3 +152,37 @@ export function handleVersion<T>(obj: T, version?: string): void {
     }
   }
 }
+export function isSuccessful<T>(x: number|T|ErrorMessage[]): boolean {
+  if (Array.isArray(x)) {
+    return false;
+  } else if (typeof x === 'object') {
+    return true;
+  } else if (typeof x === 'number' && x > 0) {
+    return true;
+  }
+  return false;
+}
+type Result<T> = number | T | ErrorMessage[]
+export function afterSaved<T>(
+  res: Result<T>,
+  form: HTMLFormElement | undefined,
+  resource: StringMap,
+  showFormError: (form?: HTMLFormElement, errors?: ErrorMessage[]) => ErrorMessage[],
+  alertSuccess: (msg: string, callback?: () => void) => void,
+  alertError: (msg: string) => void,
+  navigate?: NavigateFunction,
+) {
+  if (Array.isArray(res)) {
+    showFormError(form, res)
+  } else if (isSuccessful(res)) {
+    alertSuccess(resource.msg_save_success, () => {
+      if (navigate) {
+        navigate(-1)
+      }
+    })
+  } else if (res === 0) {
+    alertError(resource.error_not_found)
+  } else {
+    alertError(resource.error_conflict)
+  }
+}

package/src/reflect.ts

@@ -1,3 +1,4 @@
+import { StringMap } from "core";
 import { NavigateFunction } from "react-router-dom"
 
 export function clone(obj: any): any {
@@ -141,9 +142,7 @@ export function hasDiff<T>(o1: T, o2: T, keys?: string[], version?: string): boo
   const diff = makeDiff(o1, o2, keys, version)
   return !isEmptyObject(diff)
 }
-interface StringMap {
-  [key: string]: string;
-}
+
 export function goBack<T>(
   navigate: NavigateFunction,
   confirm: (msg: string, yesCallback?: () => void) => void,

package/src/search.ts

@@ -1,19 +1,6 @@
-import { StringMap } from "./core";
+import { Filter, resources, StringMap } from "./core";
 import { clone } from "./reflect";
 
-// tslint:disable-next-line:class-name
-export class resources {
-  static limit = 24;
-  static pages = [12, 24, 60, 100, 120, 180, 300, 600];
-  static pageMaxSize = 7;
-}
-interface Filter {
-  page?: number;
-  limit: number;
-  firstLimit?: number;
-  fields?: string[];
-  sort?: string;
-}
 interface Locale {
   id?: string;
   countryCode: string;

package/src/useEdit.ts

@@ -550,13 +550,3 @@ if (running === true) {
     doSave
   };
 };
-export function isSuccessful<T>(x: number|T|ErrorMessage[]): boolean {
-  if (Array.isArray(x)) {
-    return false;
-  } else if (typeof x === 'object') {
-    return true;
-  } else if (typeof x === 'number' && x > 0) {
-    return true;
-  }
-  return false;
-}

package/src/useSearch.ts

@@ -1,5 +1,5 @@
 import {useEffect, useState} from 'react';
-import {error, getName, getRemoveError, getValidateForm, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
+import {error, Filter, getName, getRemoveError, getValidateForm, 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';
@@ -11,13 +11,6 @@ export interface Searchable extends Pagination, Sortable {
   nextPageToken?: string;
   excluding?: string[]|number[];
 }
-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);