react-hook-core 0.1.20 → 0.1.22

package/lib/components.js

@@ -999,11 +999,9 @@ var EditComponent = (function (_super) {
     var com = this;
     var m = obj;
     var fn = this.newMode ? this.service.insert : this.service.update;
-    var isPatch = false;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
         m = body;
-        isPatch = true;
         fn = this.service.patch;
       }
     }

package/lib/state.js

@@ -91,7 +91,6 @@ function buildState(e, state, ctrl, modelName, tloc) {
       var dataField = ctrl.getAttribute('data-field');
       var field = (dataField ? dataField : ctrl.name);
       var model = Object.assign({}, ex);
-      var dType = 'array';
       if (type && type.toLowerCase() === 'checkbox') {
         var value = model[field];
         if (ctrl.id && ctrl.name !== ctrl.id) {

package/lib/useEdit.js

@@ -365,7 +365,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var _doSave = function (obj, body, version, isBack) {
     setRunning(true);
     core_1.showLoading(p1.loading);
-    var isBackO = (isBack == null || isBack === undefined ? true : isBack);
+    var isBackO = (isBack != null && isBack !== undefined ? isBack : false);
     var patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
       if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
@@ -408,7 +408,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         var r = p1.resource;
         var title = r.value('error');
         var msg = r.value('error_internal');
-        var st = core_1.createEditStatus(p ? p.status : undefined);
         if (data && data.status === 422) {
           fail((_a = err.response) === null || _a === void 0 ? void 0 : _a.data);
           var obj = (_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.value;

package/lib/useSearch.js

@@ -319,7 +319,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var appendList = (p && p.appendList ? p.appendList : appendListOfState);
   var setList = (p && p.setList ? p.setList : setListOfState);
   var _showResults = function (s, sr, lc) {
-    if (sr == undefined) {
+    if (sr === undefined) {
       return;
     }
     var results = (sr === null || sr === void 0 ? void 0 : sr.list) || [];

package/package.json

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

package/src/components.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {BaseDiffState, createDiffStatus, createEditStatus, DiffApprService, DiffParameter, DiffState, DiffStatusConfig, handleToggle, hideLoading, showLoading} from './core';
 import {Attributes, EditStatusConfig, error, ErrorMessage, Filter, getCurrencyCode, getModelName as getModelName2, initForm, LoadingService, Locale, message, messageByHttpStatus, PageChange, pageSizes, removePhoneFormat, ResourceService, SearchParameter, SearchResult, SearchService, SearchState, StringMap, UIService, ViewParameter, ViewService} from './core';
 import {formatDiffModel, getDataFields} from './diff';
-import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel, ResultInfo} from './edit';
+import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel} from './edit';
 import {focusFirstError, readOnly} from './formutil';
 import {getAutoSearch, getConfirmFunc, getDiffStatusFunc, getEditStatusFunc, getErrorFunc, getLoadingFunc, getLocaleFunc, getMsgFunc, getResource, getUIService} from './input';
 import {clone, diff, makeDiff} from './reflect';
@@ -421,7 +421,7 @@ export class BaseSearchComponent<T, F extends Filter, P, I extends SearchState<T
       lc = enLocale;
     }
     const fields = this.getFields();
-    const obj3 = getModel<T, F>(this.state, name, this, fields, this.excluding);
+    const obj3 = getModel<F>(this.state, name, this, fields, this.excluding);
     return obj3;
   }
   getFields(): string[]|undefined {
@@ -952,7 +952,7 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
     } else {
       const result: T = x;
       if (isPatch) {
-        const keys = Object.keys(result);
+        const keys = Object.keys(result as any);
         const a: any = origin;
         for (const k of keys) {
           a[k] = (result as any)[k];
@@ -1063,11 +1063,9 @@ export class EditComponent<T, ID, P, S> extends BaseEditComponent<T, P, S>  {
     const com = this;
     let m: T|Partial<T> = obj;
     let fn = this.newMode ? this.service.insert : this.service.update;
-    let isPatch = false;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
         m = body;
-        isPatch = true;
         fn = this.service.patch;
       }
     }

package/src/search.ts

@@ -579,7 +579,7 @@ export function toggleSortStyle(target: HTMLElement): string {
   }
   return field;
 }
-export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
+export function getModel<S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
   let obj2 = getModelFromState(state, modelName);
 
   const obj: any = obj2 ? obj2 : {};

package/src/state.ts

@@ -75,7 +75,6 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
       const dataField = ctrl.getAttribute('data-field');
       const field = (dataField ? dataField : ctrl.name);
       const model = Object.assign({}, ex);
-      const dType= 'array'
       if (type && type.toLowerCase() === 'checkbox') {
         let value = model[field];
         if (ctrl.id && ctrl.name !== ctrl.id) {

package/src/useEdit.ts

@@ -1,7 +1,7 @@
 import {useEffect, useState} from 'react';
 import {useNavigate, useParams} from 'react-router';
 import {Attributes, buildId, createEditStatus, EditStatusConfig, ErrorMessage, 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 {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel} from './edit';
 import {focusFirstError, readOnly as setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone, makeDiff} from './reflect';
@@ -410,7 +410,7 @@ export const useCoreEdit = <T, ID, S, P>(
     } else {
       const result = r as T;
       if (isPatch) {
-        const keys = Object.keys(result);
+        const keys = Object.keys(result as any);
         const a: any = origin;
         for (const k of keys) {
           a[k] = (result as any)[k];
@@ -433,7 +433,7 @@ export const useCoreEdit = <T, ID, S, P>(
   const _doSave = (obj: T, body?: Partial<T>, version?: string, isBack?: boolean) => {
     setRunning(true);
     showLoading(p1.loading);
-    const isBackO = (isBack == null || isBack === undefined ? true : isBack);
+    const isBackO = (isBack != null && isBack !== undefined ? isBack : false);
     const patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
       if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
@@ -473,7 +473,6 @@ export const useCoreEdit = <T, ID, S, P>(
         const r = p1.resource;
         const title = r.value('error');
         let msg = r.value('error_internal');
-        const st = createEditStatus(p ? p.status : undefined);
         if (data && data.status === 422) {
           fail(err.response?.data);
           const obj = err.response?.data?.value;

package/src/useSearch.ts

@@ -7,10 +7,9 @@ import {addParametersIntoUrl, append, buildMessage, formatResults, getFieldsFrom
 import {enLocale} from './state';
 import {useUpdate} from './update';
 
-export interface Searchable<T> extends Pagination, Sortable {
+export interface Searchable extends Pagination, Sortable {
   nextPageToken?: string;
   excluding?: string[]|number[];
-  list?: T[];
 }
 interface Filter {
   page?: number;
@@ -84,7 +83,7 @@ export interface SearchComponentParam<T, M extends Filter> {
   getModelName?: () => string;
   getCurrencyCode?: () => string;
   setFilter?: (s: M) => void;
-  getFilter?: (se?: Searchable<T>) => M;
+  getFilter?: (se?: Searchable) => M;
   getFields?: () => string[]|undefined;
   validateSearch?: (se: M, callback: () => void) => void;
   // prepareCustomData?: (data: any) => void;
@@ -269,7 +268,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   };
   const getFields = p && p.getFields ? p.getFields : _getFields;
 
-  const _getFilter = (se?: Searchable<T>): S => {
+  const _getFilter = (se?: Searchable): S => {
     if (!se) {
       se = component;
     }
@@ -282,7 +281,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    const obj3 = getModel<T, S>(state, n, se, fs, se.excluding);
+    const obj3 = getModel<S>(state, n, se, fs, se.excluding);
     return obj3;
   };
   const getFilter = p && p.getFilter ? p.getFilter : _getFilter;
@@ -303,13 +302,13 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     const runSearch = doSearch;
     if (auto) {
       setTimeout(() => {
-        runSearch((obj2 as Searchable<T>), true);
+        runSearch((obj2 as Searchable), true);
       }, 0);
     }
   };
   const load = p && p.load ? p.load : _load;
 
-  const doSearch = (se: Searchable<T>, isFirstLoad?: boolean) => {
+  const doSearch = (se: Searchable, isFirstLoad?: boolean) => {
     removeFormError(p1, refForm.current);
     const s = getFilter(se);
 
@@ -437,7 +436,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   const appendList = (p && p.appendList ? p.appendList : appendListOfState);
   const setList = (p && p.setList ? p.setList : setListOfState);
   const _showResults = (s: S, sr: SearchResult<T>, lc: Locale) => {
-    if (sr == undefined) {
+    if (sr === undefined) {
       return;
     }
     const results = sr?.list || [];