@etsoo/appscript 1.4.87 → 1.4.89

package/__tests__/app/CoreApp.ts

@@ -6,8 +6,19 @@ import {
     NotificationContainer,
     NotificationRenderProps
 } from '@etsoo/notificationbase';
-import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
-import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
+import {
+    ApiAuthorizationScheme,
+    ApiDataError,
+    ApiMethod,
+    createClient
+} from '@etsoo/restclient';
+import {
+    DataTypes,
+    DomUtils,
+    IActionResult,
+    Utils,
+    WindowStorage
+} from '@etsoo/shared';
 import {
     AddressApi,
     en,
@@ -211,13 +222,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 +243,55 @@ 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 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/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/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.87",
+    "version": "1.4.89",
     "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/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}`;
     }
 
     /**