@etsoo/appscript 1.4.86 → 1.4.88

package/__tests__/app/CoreApp.ts

@@ -7,7 +7,13 @@ import {
     NotificationRenderProps
 } from '@etsoo/notificationbase';
 import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
-import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
+import {
+    DataTypes,
+    DomUtils,
+    IActionResult,
+    Utils,
+    WindowStorage
+} from '@etsoo/shared';
 import {
     AddressApi,
     en,
@@ -211,13 +217,15 @@ test('Tests for formatFullName', () => {
 });
 
 test('Tests for getRoles', () => {
-    var roles = app.getRoles(UserRole.User | UserRole.Manager | UserRole.Admin);
+    const roles = app.getRoles(
+        UserRole.User | UserRole.Manager | UserRole.Admin
+    );
     expect(roles.length).toBe(3);
     expect(roles.map((r) => r.id)).toEqual([8, 128, 8192]);
 });
 
 test('Tests for getStatusList', () => {
-    var statuses = app.getStatusList([
+    const statuses = app.getStatusList([
         EntityStatus.Normal,
         EntityStatus.Approved,
         EntityStatus.Doing,
@@ -230,6 +238,27 @@ test('Tests for getStatusList', () => {
     expect(app.getStatusList().length).toBe(9);
 });
 
+test('Tests for formatResult', () => {
+    const result: IActionResult = {
+        ok: false,
+        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'
+    };
+
+    const formatted = app.formatResult(result);
+    expect(formatted).toBe(
+        'One or more validation errors occurred. (400, https://tools.ietf.org/html/rfc9110#section-15.5.1)'
+    );
+});
+
 test('Tests for isValidPassword', () => {
     expect(app.isValidPassword('12345678')).toBeFalsy();
     expect(app.isValidPassword('abcd3')).toBeFalsy();

package/lib/cjs/business/BusinessUtils.d.ts

@@ -1,4 +1,4 @@
-import { IdType, ListType, ListType1 } from '@etsoo/shared';
+import { ListType, ListType1 } from '@etsoo/shared';
 import { CultureGridItem } from './CultureItem';
 /**
  * Business utils
@@ -27,13 +27,4 @@ export declare namespace BusinessUtils {
      * @returns 12 months
      */
     function getMonths(monthLabels: string[], startMonth?: number): ListType[];
-    /**
-     * Set id value
-     * @param item QueryRQ or TiplistRQ or similiar item
-     * @param id Id value
-     */
-    function setIdValue<T extends {
-        id?: number;
-        sid?: string;
-    }>(item: T, id?: IdType): void;
 }

package/lib/cjs/business/BusinessUtils.js

@@ -78,18 +78,4 @@ var BusinessUtils;
         return months;
     }
     BusinessUtils.getMonths = getMonths;
-    /**
-     * Set id value
-     * @param item QueryRQ or TiplistRQ or similiar item
-     * @param id Id value
-     */
-    function setIdValue(item, id) {
-        if (id == null)
-            return;
-        if (typeof id === 'number')
-            item.id = id;
-        else
-            item.sid = id;
-    }
-    BusinessUtils.setIdValue = setIdValue;
 })(BusinessUtils || (exports.BusinessUtils = BusinessUtils = {}));

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

@@ -9,10 +9,6 @@ export type QueryRQ<T extends IdType = number> = {
      * Number id
      */
     id?: T;
-    /**
-     * String id
-     */
-    sid?: string;
     /**
      * Query paging data
      */

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

@@ -8,10 +8,6 @@ export type TiplistRQ<T extends IdType = number> = {
      * number id
      */
     id?: T;
-    /**
-     * String id
-     */
-    sid?: string;
     /**
      * Excluded ids
      */

package/lib/cjs/result/ActionResultError.js

@@ -19,11 +19,7 @@ class ActionResultError extends Error {
         if (result.field)
             addtions.push(result.field);
         const add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
-        let title = result.title;
-        if (title && result.traceId) {
-            title += ` [${result.traceId}]`;
-        }
-        return `${title || 'Error'}${add}`;
+        return `${result.title || 'Error'}${add}`;
     }
     /**
      * Constructor

package/lib/mjs/business/BusinessUtils.d.ts

@@ -1,4 +1,4 @@
-import { IdType, ListType, ListType1 } from '@etsoo/shared';
+import { ListType, ListType1 } from '@etsoo/shared';
 import { CultureGridItem } from './CultureItem';
 /**
  * Business utils
@@ -27,13 +27,4 @@ export declare namespace BusinessUtils {
      * @returns 12 months
      */
     function getMonths(monthLabels: string[], startMonth?: number): ListType[];
-    /**
-     * Set id value
-     * @param item QueryRQ or TiplistRQ or similiar item
-     * @param id Id value
-     */
-    function setIdValue<T extends {
-        id?: number;
-        sid?: string;
-    }>(item: T, id?: IdType): void;
 }

package/lib/mjs/business/BusinessUtils.js

@@ -75,18 +75,4 @@ export var BusinessUtils;
         return months;
     }
     BusinessUtils.getMonths = getMonths;
-    /**
-     * Set id value
-     * @param item QueryRQ or TiplistRQ or similiar item
-     * @param id Id value
-     */
-    function setIdValue(item, id) {
-        if (id == null)
-            return;
-        if (typeof id === 'number')
-            item.id = id;
-        else
-            item.sid = id;
-    }
-    BusinessUtils.setIdValue = setIdValue;
 })(BusinessUtils || (BusinessUtils = {}));

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

@@ -9,10 +9,6 @@ export type QueryRQ<T extends IdType = number> = {
      * Number id
      */
     id?: T;
-    /**
-     * String id
-     */
-    sid?: string;
     /**
      * Query paging data
      */

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

@@ -8,10 +8,6 @@ export type TiplistRQ<T extends IdType = number> = {
      * number id
      */
     id?: T;
-    /**
-     * String id
-     */
-    sid?: string;
     /**
      * Excluded ids
      */

package/lib/mjs/result/ActionResultError.js

@@ -16,11 +16,7 @@ export class ActionResultError extends Error {
         if (result.field)
             addtions.push(result.field);
         const add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
-        let title = result.title;
-        if (title && result.traceId) {
-            title += ` [${result.traceId}]`;
-        }
-        return `${title || 'Error'}${add}`;
+        return `${result.title || 'Error'}${add}`;
     }
     /**
      * Constructor

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.86",
+    "version": "1.4.88",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.42",
         "@etsoo/restclient": "^1.1.3",
-        "@etsoo/shared": "^1.2.37",
+        "@etsoo/shared": "^1.2.40",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {

package/src/business/BusinessUtils.ts

@@ -1,4 +1,4 @@
-import { IdType, ListType, ListType1 } from '@etsoo/shared';
+import { ListType, ListType1 } from '@etsoo/shared';
 import { CultureGridItem } from './CultureItem';
 
 /**
@@ -94,18 +94,4 @@ export namespace BusinessUtils {
 
         return months;
     }
-
-    /**
-     * Set id value
-     * @param item QueryRQ or TiplistRQ or similiar item
-     * @param id Id value
-     */
-    export function setIdValue<T extends { id?: number; sid?: string }>(
-        item: T,
-        id?: IdType
-    ) {
-        if (id == null) return;
-        if (typeof id === 'number') item.id = id;
-        else item.sid = id;
-    }
 }

package/src/erp/rq/QueryRQ.ts

@@ -11,11 +11,6 @@ export type QueryRQ<T extends IdType = number> = {
      */
     id?: T;
 
-    /**
-     * String id
-     */
-    sid?: string;
-
     /**
      * Query paging data
      */

package/src/erp/rq/TiplistRQ.ts

@@ -10,11 +10,6 @@ export type TiplistRQ<T extends IdType = number> = {
      */
     id?: T;
 
-    /**
-     * String id
-     */
-    sid?: string;
-
     /**
      * Excluded ids
      */

package/src/result/ActionResultError.ts

@@ -16,12 +16,8 @@ export class ActionResultError extends Error {
         if (result.field) addtions.push(result.field);
 
         const add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
-        let title = result.title;
-        if (title && result.traceId) {
-            title += ` [${result.traceId}]`;
-        }
 
-        return `${title || 'Error'}${add}`;
+        return `${result.title || 'Error'}${add}`;
     }
 
     /**