@etsoo/appscript 1.4.88 → 1.4.90

package/__tests__/app/CoreApp.ts

@@ -6,7 +6,12 @@ import {
     NotificationContainer,
     NotificationRenderProps
 } from '@etsoo/notificationbase';
-import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
+import {
+    ApiAuthorizationScheme,
+    ApiDataError,
+    ApiMethod,
+    createClient
+} from '@etsoo/restclient';
 import {
     DataTypes,
     DomUtils,
@@ -259,6 +264,34 @@ test('Tests for formatResult', () => {
     );
 });
 
+test('Tests for formatError', () => {
+    const error: ApiDataError = {
+        name: 'ApiDataError',
+        message: 'Api data error',
+        response: {
+            type: 'https://tools.ietf.org/html/rfc9110#section-15.5.1',
+            title: 'One or more validation errors occurred.',
+            status: 400,
+            errors: {
+                $: [
+                    'JSON deserialization for type \u0027com.etsoo.CMS.RQ.User.UserCreateRQ\u0027 was missing required properties, including the following: password'
+                ],
+                rq: ['The rq field is required.']
+            },
+            traceId: '00-ed96a4f0c83f066594ecc69b77da9803-df770e3cd714fedd-00'
+        },
+        data: {
+            data: undefined,
+            headers: [],
+            method: ApiMethod.POST,
+            params: {},
+            url: ''
+        }
+    };
+
+    expect(app.formatError(error)).toBe('Api data error (ApiDataError)');
+});
+
 test('Tests for isValidPassword', () => {
     expect(app.isValidPassword('12345678')).toBeFalsy();
     expect(app.isValidPassword('abcd3')).toBeFalsy();

package/lib/cjs/erp/EntityApi.js

@@ -38,7 +38,11 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     listBase(rq, payload) {
-        return this.api.post(`${this.flag}/List`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === 'number') {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
     }
     /**
      * Merge

package/lib/cjs/erp/OrgApi.js

@@ -33,7 +33,7 @@ class OrgApi extends EntityApi_1.EntityApi {
         else {
             if (typeof serviceId === 'object')
                 return undefined;
-            return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
+            return this.listBase({ queryPaging: items, serviceId }, { defaultValue: [], showLoading: false });
         }
     }
     /**

package/lib/cjs/erp/rq/TiplistRQ.d.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
@@ -17,7 +18,7 @@ export type TiplistRQ<T extends IdType = number> = {
      */
     keyword?: string;
     /**
-     * Max items to return
+     * Query paging data or items to read
      */
-    items?: number;
+    queryPaging?: QueryPagingData | number;
 };

package/lib/mjs/erp/EntityApi.js

@@ -35,7 +35,11 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     listBase(rq, payload) {
-        return this.api.post(`${this.flag}/List`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === 'number') {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
     }
     /**
      * Merge

package/lib/mjs/erp/OrgApi.js

@@ -30,7 +30,7 @@ export class OrgApi extends EntityApi {
         else {
             if (typeof serviceId === 'object')
                 return undefined;
-            return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
+            return this.listBase({ queryPaging: items, serviceId }, { defaultValue: [], showLoading: false });
         }
     }
     /**

package/lib/mjs/erp/rq/TiplistRQ.d.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
@@ -17,7 +18,7 @@ export type TiplistRQ<T extends IdType = number> = {
      */
     keyword?: string;
     /**
-     * Max items to return
+     * Query paging data or items to read
      */
-    items?: number;
+    queryPaging?: QueryPagingData | number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.88",
+    "version": "1.4.90",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -53,7 +53,7 @@
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.42",
-        "@etsoo/restclient": "^1.1.3",
+        "@etsoo/restclient": "^1.1.4",
         "@etsoo/shared": "^1.2.40",
         "crypto-js": "^4.2.0"
     },

package/src/erp/EntityApi.ts

@@ -74,7 +74,15 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
         RQ extends TiplistRQ<T>,
         R extends object
     >(rq: RQ, payload?: IApiPayload<R[]>) {
-        return this.api.post(`${this.flag}/List`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === 'number') {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return this.api.post(
+            `${this.flag}/List`,
+            { queryPaging, ...rest },
+            payload
+        );
     }
 
     /**

package/src/erp/OrgApi.ts

@@ -58,7 +58,7 @@ export class OrgApi extends EntityApi {
         } else {
             if (typeof serviceId === 'object') return undefined;
             return this.listBase<number, OrgListRQ, ListType>(
-                { items, serviceId },
+                { queryPaging: items, serviceId },
                 { defaultValue: [], showLoading: false }
             );
         }

package/src/erp/rq/TiplistRQ.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 
 /**
  * Tiplist request data
@@ -21,7 +22,7 @@ export type TiplistRQ<T extends IdType = number> = {
     keyword?: string;
 
     /**
-     * Max items to return
+     * Query paging data or items to read
      */
-    items?: number;
+    queryPaging?: QueryPagingData | number;
 };