@etsoo/appscript 1.2.73 → 1.2.76

package/__tests__/app/CoreApp.ts

@@ -8,7 +8,7 @@ import {
 } from '@etsoo/notificationbase';
 import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
-import { BusinessUtils, IUser } from '../../src';
+import { BusinessUtils, IUser, UserRole } from '../../src';
 import { AddressUtils } from '../../src/address/AddressUtils';
 import { IAppSettings } from '../../src/app/AppSettings';
 import { CoreApp } from '../../src/app/CoreApp';
@@ -161,6 +161,12 @@ test('Tests for initCallUpdateLocal', () => {
     expect(passphrase).not.toBeNull();
 });
 
+test('Tests for getRoles', () => {
+    var 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 getUnitLabel', () => {
     expect(app.getUnitLabel(12, true)).toBe('每年');
 });

package/__tests__/business/BusinessUtils.ts

@@ -0,0 +1,9 @@
+import { BusinessUtils } from '../../src/business/BusinessUtils';
+
+test('Tests for BusinessUtils.formatAvatarTitle', () => {
+    // Assert
+    expect(BusinessUtils.formatAvatarTitle('Garry Xiao')).toBe('GX');
+    expect(BusinessUtils.formatAvatarTitle('Etsoo')).toBe('ME');
+    expect(BusinessUtils.formatAvatarTitle('Etsoo', 3, 'E')).toBe('E');
+    expect(BusinessUtils.formatAvatarTitle('Etsoo', 5)).toBe('ETSOO');
+});

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

@@ -260,18 +260,26 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
-    /**
-     * Get entity status label
-     * @param data Input data
-     */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status: number | null | undefined): string;
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -702,18 +710,42 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto[];
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto<string>[];
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto<number>[];
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto<number>[];
+    /**
+     * Get status label
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getStatusLabel(status: number | null | undefined): string;
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

package/lib/cjs/app/CoreApp.js

@@ -9,7 +9,9 @@ const AddressRegion_1 = require("../address/AddressRegion");
 const AddressUtils_1 = require("../address/AddressUtils");
 const BridgeUtils_1 = require("../bridges/BridgeUtils");
 const BusinessUtils_1 = require("../business/BusinessUtils");
+const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
+const UserRole_1 = require("./UserRole");
 /**
  * App fields
  */
@@ -828,6 +830,56 @@ class CoreApp {
             return this.cachedRefreshToken;
         return this.storage.getData(this.fields.headerToken);
     }
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = shared_1.DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            if (typeof id !== 'number')
+                continue;
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id, label });
+        }
+        return list;
+    }
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumStrList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = shared_1.DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id: id.toString(), label });
+        }
+        return list;
+    }
     /**
      * Get all regions
      * @returns Regions
@@ -838,13 +890,32 @@ class CoreApp {
         });
     }
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
      */
-    getEntityStatusLabel(data) {
-        if (data == null || data.entityStatus == null)
+    getRoles(role) {
+        return this.getEnumList(UserRole_1.UserRole, 'role', (id, _key) => {
+            if ((id & role) > 0)
+                return id;
+        });
+    }
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList() {
+        return this.getEnumList(EntityStatus_1.EntityStatus, 'status');
+    }
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status) {
+        var _a;
+        if (status == null)
             return '';
-        return BusinessUtils_1.BusinessUtils.getEntityStatusLabel(data.entityStatus, this.labelDelegate);
+        const key = EntityStatus_1.EntityStatus[status];
+        return (_a = this.get('status' + key)) !== null && _a !== void 0 ? _a : key;
     }
     /**
      * Get refresh token from response headers

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

@@ -1,12 +1,19 @@
 import { DataTypes } from '@etsoo/shared';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
-import { EntityStatus } from './EntityStatus';
 import { ProductUnit } from './ProductUnit';
 /**
  * Business utils
  */
 export declare namespace BusinessUtils {
+    /**
+     * Format avatar title
+     * @param title Title
+     * @param maxChars Max characters
+     * @param defaultTitle Default title
+     * @returns Result
+     */
+    function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
     /**
      * Get currency collection
      * @param currencyNames Names like CNY, USD
@@ -14,31 +21,13 @@ export declare namespace BusinessUtils {
      * @returns Collection
      */
     function getCurrencies(currencyNames: string[], func: ICultureGet): IdLabelDto<string>[];
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatusLabel(status: EntityStatus, func: ICultureGet): string;
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatus(func: ICultureGet): {
-        id: EntityStatus;
-        label: string;
-    }[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
      * @param startMonth Start month, 0 as Jan.
      * @returns 12 months
      */
-    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem[];
+    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem<number>[];
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

package/lib/cjs/business/BusinessUtils.js

@@ -2,14 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BusinessUtils = void 0;
 const shared_1 = require("@etsoo/shared");
-const __1 = require("..");
-const EntityStatus_1 = require("./EntityStatus");
 const ProductUnit_1 = require("./ProductUnit");
+const RepeatOption_1 = require("./RepeatOption");
 /**
  * Business utils
  */
 var BusinessUtils;
 (function (BusinessUtils) {
+    /**
+     * Format avatar title
+     * @param title Title
+     * @param maxChars Max characters
+     * @param defaultTitle Default title
+     * @returns Result
+     */
+    function formatAvatarTitle(title, maxChars = 3, defaultTitle = 'ME') {
+        // Just return for empty cases
+        if (title == null || title === '')
+            return defaultTitle;
+        // split with words
+        const items = title.trim().split(/\s+/g);
+        if (items.length === 1) {
+            // 2-3 Chinese names
+            const titleLen = title.length;
+            if (titleLen <= maxChars)
+                return title.toUpperCase();
+            // Return default for simplicity
+            return defaultTitle;
+        }
+        // First letter of each item
+        var firstLetters = items
+            .map((item) => item[0])
+            .join('')
+            .toUpperCase();
+        const flen = firstLetters.length;
+        if (flen <= maxChars)
+            return firstLetters;
+        return defaultTitle;
+    }
+    BusinessUtils.formatAvatarTitle = formatAvatarTitle;
     /**
      * Get currency collection
      * @param currencyNames Names like CNY, USD
@@ -26,35 +57,6 @@ var BusinessUtils;
         });
     }
     BusinessUtils.getCurrencies = getCurrencies;
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatusLabel(status, func) {
-        var _a;
-        const key = EntityStatus_1.EntityStatus[status];
-        return (_a = func('status' + key)) !== null && _a !== void 0 ? _a : key;
-    }
-    BusinessUtils.getEntityStatusLabel = getEntityStatusLabel;
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatus(func) {
-        return shared_1.DataTypes.getEnumKeys(EntityStatus_1.EntityStatus).map((key) => {
-            const id = shared_1.DataTypes.getEnumByKey(EntityStatus_1.EntityStatus, key);
-            return {
-                id,
-                label: getEntityStatusLabel(id, func)
-            };
-        });
-    }
-    BusinessUtils.getEntityStatus = getEntityStatus;
     /**
      * Get 12-month items
      * @param monthLabels Month labels
@@ -120,7 +122,7 @@ var BusinessUtils;
      * @returns Units
      */
     function getRepeatOptions(func, options, isJoined = true) {
-        options !== null && options !== void 0 ? options : (options = shared_1.DataTypes.getEnumKeys(__1.RepeatOption));
+        options !== null && options !== void 0 ? options : (options = shared_1.DataTypes.getEnumKeys(RepeatOption_1.RepeatOption));
         isJoined !== null && isJoined !== void 0 ? isJoined : (isJoined = true);
         return getUnits(func, options, isJoined);
     }

package/lib/cjs/dto/IdLabelDto.d.ts

@@ -1,9 +1,8 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdDto } from './IdDto';
 /**
  * Dto with id and label field
  */
-export declare type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> & {
+export declare type IdLabelDto<T extends DataTypes.IdType = number> = DataTypes.IdItem<T> & {
     /**
      * Label
      */
@@ -12,4 +11,4 @@ export declare type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> &
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto[] : IdLabelDto<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto<number>[] : IdLabelDto<string>[];

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

@@ -43,6 +43,7 @@
     "enabled": "Enabled",
     "entityStatus": "Status",
     "environmentChanged": "The operating environment has changed, please log in again",
+    "error": "Error",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",
@@ -52,6 +53,7 @@
     "itemExists": "'{0}' already exists",
     "loading": "Loading...",
     "login": "Login",
+    "me": "ME",
     "menuHome": "Home",
     "message": "Message",
     "mobile": "Mobile number",
@@ -139,6 +141,7 @@
     "taxUSEIN": "Employer identification number",
     "timeDifferenceInvalid": "The time difference between the device and the server is {0}, which exceeds the limit of {1} seconds. Please adjust the device time. If it is abnormal, please inform the administrator",
     "tokenExpiry": "Your session is about to expire. Click the Cancel button to continue",
+    "type": "Type",
     "yes": "Yes",
     "unknownError": "Unknown Error",
     "unitJoin": "per {0}",

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

@@ -43,6 +43,7 @@
     "enabled": "已启用",
     "entityStatus": "状态",
     "environmentChanged": "运行环境已改变，请重新登录",
+    "error": "错误",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",
@@ -52,6 +53,7 @@
     "itemExists": "'{0}'已经存在",
     "loading": "正在加载...",
     "login": "登录",
+    "me": "我",
     "menuHome": "首页",
     "message": "留言",
     "mobile": "手机号码",
@@ -139,6 +141,7 @@
     "taxUSEIN": "雇主识别号码(EIN)",
     "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
+    "type": "类型",
     "yes": "是",
     "unknownError": "未知错误",
     "unitJoin": "每{0}",

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

@@ -43,6 +43,7 @@
     "enabled": "已啟用",
     "entityStatus": "狀態",
     "environmentChanged": "運行環境已改變，請重新登錄",
+    "error": "錯誤",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",
@@ -52,6 +53,7 @@
     "itemExists": "'{0}'已经存在",
     "loading": "正在加載...",
     "login": "登錄",
+    "me": "我",
     "menuHome": "首頁",
     "message": "留言",
     "mobilePhone": "手機號碼",
@@ -139,6 +141,7 @@
     "taxUSEIN": "雇主識別號碼(EIN)",
     "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
+    "type": "類型",
     "yes": "是",
     "unknownError": "未知錯誤",
     "unitJoin": "每{0}",

package/lib/cjs/index.d.ts

@@ -13,7 +13,6 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './def/ListItem';
-export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
 export * from './dto/InitCallDto';

package/lib/cjs/index.js

@@ -36,7 +36,6 @@ __exportStar(require("./business/RepeatOption"), exports);
 // def
 __exportStar(require("./def/ListItem"), exports);
 // dto
-__exportStar(require("./dto/IdDto"), exports);
 __exportStar(require("./dto/IdLabelDto"), exports);
 __exportStar(require("./dto/IdLabelPrimaryDto"), exports);
 __exportStar(require("./dto/InitCallDto"), exports);

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

@@ -260,18 +260,26 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
-    /**
-     * Get entity status label
-     * @param data Input data
-     */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status: number | null | undefined): string;
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -702,18 +710,42 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto[];
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto<string>[];
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto<number>[];
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto<number>[];
+    /**
+     * Get status label
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getStatusLabel(status: number | null | undefined): string;
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

package/lib/mjs/app/CoreApp.js

@@ -1,12 +1,14 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
 import { ApiDataError } from '@etsoo/restclient';
-import { DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
+import { DataTypes, DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, SHA3 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
+import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
+import { UserRole } from './UserRole';
 /**
  * App fields
  */
@@ -825,6 +827,56 @@ export class CoreApp {
             return this.cachedRefreshToken;
         return this.storage.getData(this.fields.headerToken);
     }
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            if (typeof id !== 'number')
+                continue;
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id, label });
+        }
+        return list;
+    }
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumStrList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id: id.toString(), label });
+        }
+        return list;
+    }
     /**
      * Get all regions
      * @returns Regions
@@ -835,13 +887,32 @@ export class CoreApp {
         });
     }
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
      */
-    getEntityStatusLabel(data) {
-        if (data == null || data.entityStatus == null)
+    getRoles(role) {
+        return this.getEnumList(UserRole, 'role', (id, _key) => {
+            if ((id & role) > 0)
+                return id;
+        });
+    }
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList() {
+        return this.getEnumList(EntityStatus, 'status');
+    }
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status) {
+        var _a;
+        if (status == null)
             return '';
-        return BusinessUtils.getEntityStatusLabel(data.entityStatus, this.labelDelegate);
+        const key = EntityStatus[status];
+        return (_a = this.get('status' + key)) !== null && _a !== void 0 ? _a : key;
     }
     /**
      * Get refresh token from response headers