@etsoo/appscript 1.2.17 → 1.2.21

package/lib/cjs/app/CoreApp.d.ts

@@ -1,4 +1,4 @@
-import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent } from '@etsoo/notificationbase';
+import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
@@ -105,8 +105,9 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result: IActionResult): void;
+    alertResult(result: IActionResult, callback?: NotificationReturn<void>): void;
     /**
      * Authorize
      * @param token New token
@@ -485,8 +486,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result: IActionResult): void;
+    alertResult(result: IActionResult, callback?: NotificationReturn<void>): void;
     /**
      * Authorize
      * @param token New token

package/lib/cjs/app/CoreApp.js

@@ -349,10 +349,11 @@ class CoreApp {
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result) {
+    alertResult(result, callback) {
         this.formatResult(result);
-        this.notifier.alert(ActionResultError_1.ActionResultError.format(result));
+        this.notifier.alert(ActionResultError_1.ActionResultError.format(result), callback);
     }
     /**
      * Authorize
@@ -649,6 +650,7 @@ class CoreApp {
      * @param forceToLocal Force to local labels
      */
     formatResult(result, forceToLocal) {
+        var _a;
         const title = result.title;
         if (title && /^\w+$/.test(title)) {
             const key = title.formatInitial(false);
@@ -665,6 +667,12 @@ class CoreApp {
             const key = result.type.formatInitial(false);
             result.title = this.get(key);
         }
+        // When title contains {0}, replace with the field label
+        if (result.field && ((_a = result.title) === null || _a === void 0 ? void 0 : _a.includes('{0}'))) {
+            const fieldLabel = this.get(result.field.formatInitial(false));
+            if (fieldLabel)
+                result.title = result.title.format(fieldLabel);
+        }
     }
     /**
      * Get culture resource

package/lib/cjs/i18n/en-US.json

@@ -10,6 +10,7 @@
     "completeTip": "{0} completed",
     "copy": "Copy",
     "creation": "Creation",
+    "currency": "Currency",
     "delete": "Delete",
     "description": "Description",
     "done": "Done",
@@ -59,6 +60,7 @@
     "send": "Send",
     "setAsDefault": "Set as default",
     "settings": "Settings",
+    "showIt": "Show it",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

package/lib/cjs/i18n/zh-CN.json

@@ -10,6 +10,7 @@
     "completeTip": "已完成 {0}",
     "copy": "复制",
     "creation": "登记时间",
+    "currency": "币种",
     "delete": "删除",
     "description": "描述",
     "done": "完成",
@@ -59,6 +60,7 @@
     "send": "发送",
     "setAsDefault": "设为默认",
     "settings": "系统设置",
+    "showIt": "显示",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

package/lib/cjs/i18n/zh-HK.json

@@ -10,6 +10,7 @@
     "completeTip": "已完成 {0}",
     "copy": "複製",
     "creation": "登記時間",
+    "currency": "幣種",
     "delete": "刪除",
     "description": "描述",
     "done": "完成",
@@ -59,6 +60,7 @@
     "send": "發送",
     "setAsDefault": "設為默認",
     "settings": "系統設置",
+    "showIt": "顯示",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

package/lib/cjs/result/ActionResultError.js

@@ -26,8 +26,10 @@ class ActionResultError extends Error {
         var addtions = [];
         if (result.status != null)
             addtions.push(result.status);
-        if (result.type && result.type != 'about:blank')
+        if (result.type)
             addtions.push(result.type);
+        if (result.field)
+            addtions.push(result.field);
         var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }

package/lib/cjs/result/IActionResult.d.ts

@@ -52,7 +52,11 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Type
      */
-    type: string;
+    type?: string;
+    /**
+     * Field name
+     */
+    field?: string;
     /**
      * Success or not
      */

package/lib/mjs/app/CoreApp.d.ts

@@ -1,4 +1,4 @@
-import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent } from '@etsoo/notificationbase';
+import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
@@ -105,8 +105,9 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result: IActionResult): void;
+    alertResult(result: IActionResult, callback?: NotificationReturn<void>): void;
     /**
      * Authorize
      * @param token New token
@@ -485,8 +486,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result: IActionResult): void;
+    alertResult(result: IActionResult, callback?: NotificationReturn<void>): void;
     /**
      * Authorize
      * @param token New token

package/lib/mjs/app/CoreApp.js

@@ -346,10 +346,11 @@ export class CoreApp {
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result) {
+    alertResult(result, callback) {
         this.formatResult(result);
-        this.notifier.alert(ActionResultError.format(result));
+        this.notifier.alert(ActionResultError.format(result), callback);
     }
     /**
      * Authorize
@@ -646,6 +647,7 @@ export class CoreApp {
      * @param forceToLocal Force to local labels
      */
     formatResult(result, forceToLocal) {
+        var _a;
         const title = result.title;
         if (title && /^\w+$/.test(title)) {
             const key = title.formatInitial(false);
@@ -662,6 +664,12 @@ export class CoreApp {
             const key = result.type.formatInitial(false);
             result.title = this.get(key);
         }
+        // When title contains {0}, replace with the field label
+        if (result.field && ((_a = result.title) === null || _a === void 0 ? void 0 : _a.includes('{0}'))) {
+            const fieldLabel = this.get(result.field.formatInitial(false));
+            if (fieldLabel)
+                result.title = result.title.format(fieldLabel);
+        }
     }
     /**
      * Get culture resource

package/lib/mjs/i18n/en-US.json

@@ -10,6 +10,7 @@
     "completeTip": "{0} completed",
     "copy": "Copy",
     "creation": "Creation",
+    "currency": "Currency",
     "delete": "Delete",
     "description": "Description",
     "done": "Done",
@@ -59,6 +60,7 @@
     "send": "Send",
     "setAsDefault": "Set as default",
     "settings": "Settings",
+    "showIt": "Show it",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

package/lib/mjs/i18n/zh-CN.json

@@ -10,6 +10,7 @@
     "completeTip": "已完成 {0}",
     "copy": "复制",
     "creation": "登记时间",
+    "currency": "币种",
     "delete": "删除",
     "description": "描述",
     "done": "完成",
@@ -59,6 +60,7 @@
     "send": "发送",
     "setAsDefault": "设为默认",
     "settings": "系统设置",
+    "showIt": "显示",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

package/lib/mjs/i18n/zh-HK.json

@@ -10,6 +10,7 @@
     "completeTip": "已完成 {0}",
     "copy": "複製",
     "creation": "登記時間",
+    "currency": "幣種",
     "delete": "刪除",
     "description": "描述",
     "done": "完成",
@@ -59,6 +60,7 @@
     "send": "發送",
     "setAsDefault": "設為默認",
     "settings": "系統設置",
+    "showIt": "顯示",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

package/lib/mjs/result/ActionResultError.js

@@ -23,8 +23,10 @@ export class ActionResultError extends Error {
         var addtions = [];
         if (result.status != null)
             addtions.push(result.status);
-        if (result.type && result.type != 'about:blank')
+        if (result.type)
             addtions.push(result.type);
+        if (result.field)
+            addtions.push(result.field);
         var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }

package/lib/mjs/result/IActionResult.d.ts

@@ -52,7 +52,11 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Type
      */
-    type: string;
+    type?: string;
+    /**
+     * Field name
+     */
+    field?: string;
     /**
      * Success or not
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.17",
+    "version": "1.2.21",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/restclient": "^1.0.64",
-        "@etsoo/shared": "^1.1.0",
+        "@etsoo/shared": "^1.1.1",
         "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
@@ -70,7 +70,7 @@
         "eslint": "^8.6.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",
-        "jest": "^27.4.5",
+        "jest": "^27.4.7",
         "ts-jest": "^27.1.2",
         "typescript": "^4.5.4"
     }

package/src/app/CoreApp.ts

@@ -4,7 +4,8 @@ import {
     NotificationAlign,
     NotificationCallProps,
     NotificationContent,
-    NotificationMessageType
+    NotificationMessageType,
+    NotificationReturn
 } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import {
@@ -161,8 +162,12 @@ export interface ICoreApp<
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result: IActionResult): void;
+    alertResult(
+        result: IActionResult,
+        callback?: NotificationReturn<void>
+    ): void;
 
     /**
      * Authorize
@@ -938,10 +943,11 @@ export abstract class CoreApp<
     /**
      * Alert action result
      * @param result Action result
+     * @param callback Callback
      */
-    alertResult(result: IActionResult) {
+    alertResult(result: IActionResult, callback?: NotificationReturn<void>) {
         this.formatResult(result);
-        this.notifier.alert(ActionResultError.format(result));
+        this.notifier.alert(ActionResultError.format(result), callback);
     }
 
     /**
@@ -1325,6 +1331,12 @@ export abstract class CoreApp<
             const key = result.type.formatInitial(false);
             result.title = this.get(key);
         }
+
+        // When title contains {0}, replace with the field label
+        if (result.field && result.title?.includes('{0}')) {
+            const fieldLabel = this.get(result.field.formatInitial(false));
+            if (fieldLabel) result.title = result.title.format(fieldLabel);
+        }
     }
 
     /**

package/src/i18n/en-US.json

@@ -10,6 +10,7 @@
     "completeTip": "{0} completed",
     "copy": "Copy",
     "creation": "Creation",
+    "currency": "Currency",
     "delete": "Delete",
     "description": "Description",
     "done": "Done",
@@ -59,6 +60,7 @@
     "send": "Send",
     "setAsDefault": "Set as default",
     "settings": "Settings",
+    "showIt": "Show it",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

package/src/i18n/zh-CN.json

@@ -10,6 +10,7 @@
     "completeTip": "已完成 {0}",
     "copy": "复制",
     "creation": "登记时间",
+    "currency": "币种",
     "delete": "删除",
     "description": "描述",
     "done": "完成",
@@ -59,6 +60,7 @@
     "send": "发送",
     "setAsDefault": "设为默认",
     "settings": "系统设置",
+    "showIt": "显示",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

package/src/i18n/zh-HK.json

@@ -10,6 +10,7 @@
     "completeTip": "已完成 {0}",
     "copy": "複製",
     "creation": "登記時間",
+    "currency": "幣種",
     "delete": "刪除",
     "description": "描述",
     "done": "完成",
@@ -59,6 +60,7 @@
     "send": "發送",
     "setAsDefault": "設為默認",
     "settings": "系統設置",
+    "showIt": "顯示",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

package/src/result/ActionResultError.ts

@@ -12,8 +12,8 @@ export class ActionResultError extends Error {
         // Additional data
         var addtions = [];
         if (result.status != null) addtions.push(result.status);
-        if (result.type && result.type != 'about:blank')
-            addtions.push(result.type);
+        if (result.type) addtions.push(result.type);
+        if (result.field) addtions.push(result.field);
 
         var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
 

package/src/result/IActionResult.ts

@@ -61,7 +61,12 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Type
      */
-    type: string;
+    type?: string;
+
+    /**
+     * Field name
+     */
+    field?: string;
 
     /**
      * Success or not