@etsoo/appscript 1.2.73 → 1.2.74

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/lib/cjs/app/CoreApp.d.ts

@@ -262,16 +262,19 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
     getCacheToken(): string | undefined;
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getEntityStatusLabel(status: number | null | undefined): string;
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -707,13 +710,16 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto<number>[];
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getEntityStatusLabel(status: number | null | undefined): string;
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

package/lib/cjs/app/CoreApp.js

@@ -10,6 +10,7 @@ const AddressUtils_1 = require("../address/AddressUtils");
 const BridgeUtils_1 = require("../bridges/BridgeUtils");
 const BusinessUtils_1 = require("../business/BusinessUtils");
 const ActionResultError_1 = require("../result/ActionResultError");
+const UserRole_1 = require("./UserRole");
 /**
  * App fields
  */
@@ -837,14 +838,33 @@ class CoreApp {
             return AddressRegion_1.AddressRegion.getById(id);
         });
     }
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role) {
+        var _a;
+        var roles = [];
+        var keys = shared_1.DataTypes.getEnumKeys(UserRole_1.UserRole);
+        for (var key of keys) {
+            var id = UserRole_1.UserRole[key];
+            if ((id & role) > 0) {
+                roles.push({
+                    id,
+                    label: (_a = this.get(`role${key}`)) !== null && _a !== void 0 ? _a : key
+                });
+            }
+        }
+        return roles;
+    }
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel(data) {
-        if (data == null || data.entityStatus == null)
+    getEntityStatusLabel(status) {
+        if (status == null)
             return '';
-        return BusinessUtils_1.BusinessUtils.getEntityStatusLabel(data.entityStatus, this.labelDelegate);
+        return BusinessUtils_1.BusinessUtils.getEntityStatusLabel(status, this.labelDelegate);
     }
     /**
      * Get refresh token from response headers

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

@@ -38,7 +38,7 @@ export declare namespace BusinessUtils {
      * @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/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/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

@@ -262,16 +262,19 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
     getCacheToken(): string | undefined;
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getEntityStatusLabel(status: number | null | undefined): string;
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -707,13 +710,16 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto<number>[];
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getEntityStatusLabel(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,13 @@
 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 { ActionResultError } from '../result/ActionResultError';
+import { UserRole } from './UserRole';
 /**
  * App fields
  */
@@ -834,14 +835,33 @@ export class CoreApp {
             return AddressRegion.getById(id);
         });
     }
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role) {
+        var _a;
+        var roles = [];
+        var keys = DataTypes.getEnumKeys(UserRole);
+        for (var key of keys) {
+            var id = UserRole[key];
+            if ((id & role) > 0) {
+                roles.push({
+                    id,
+                    label: (_a = this.get(`role${key}`)) !== null && _a !== void 0 ? _a : key
+                });
+            }
+        }
+        return roles;
+    }
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel(data) {
-        if (data == null || data.entityStatus == null)
+    getEntityStatusLabel(status) {
+        if (status == null)
             return '';
-        return BusinessUtils.getEntityStatusLabel(data.entityStatus, this.labelDelegate);
+        return BusinessUtils.getEntityStatusLabel(status, this.labelDelegate);
     }
     /**
      * Get refresh token from response headers

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

@@ -38,7 +38,7 @@ export declare namespace BusinessUtils {
      * @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/mjs/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/mjs/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/mjs/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.73",
+    "version": "1.2.74",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.5",
         "@etsoo/restclient": "^1.0.70",
-        "@etsoo/shared": "^1.1.41",
+        "@etsoo/shared": "^1.1.42",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -65,8 +65,8 @@
         "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
         "@types/jest": "^28.1.6",
-        "@typescript-eslint/eslint-plugin": "^5.32.0",
-        "@typescript-eslint/parser": "^5.32.0",
+        "@typescript-eslint/eslint-plugin": "^5.33.0",
+        "@typescript-eslint/parser": "^5.33.0",
         "eslint": "^8.21.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",

package/src/app/CoreApp.ts

@@ -37,7 +37,7 @@ import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
-import { IUser, IUserData } from '../state/User';
+import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 
@@ -376,9 +376,9 @@ export interface ICoreApp<
 
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends { entityStatus?: number }>(data?: D): string;
+    getEntityStatusLabel(status: number | null | undefined): string;
 
     /**
      * Get all regions
@@ -386,6 +386,12 @@ export interface ICoreApp<
      */
     getRegions(): AddressRegion[];
 
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
+
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -1602,16 +1608,34 @@ export abstract class CoreApp<
         });
     }
 
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number) {
+        var roles: IdLabelDto[] = [];
+
+        var keys = DataTypes.getEnumKeys(UserRole);
+        for (var key of keys) {
+            var id = UserRole[key as keyof typeof UserRole];
+            if ((id & role) > 0) {
+                roles.push({
+                    id,
+                    label: this.get<string>(`role${key}`) ?? key
+                });
+            }
+        }
+
+        return roles;
+    }
+
     /**
      * Get entity status label
-     * @param data Input data
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends { entityStatus?: number }>(data?: D) {
-        if (data == null || data.entityStatus == null) return '';
-        return BusinessUtils.getEntityStatusLabel(
-            data.entityStatus,
-            this.labelDelegate
-        );
+    getEntityStatusLabel(status: number | null | undefined) {
+        if (status == null) return '';
+        return BusinessUtils.getEntityStatusLabel(status, this.labelDelegate);
     }
 
     /**

package/src/dto/IdLabelDto.ts

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

package/src/index.ts

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

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

@@ -1,10 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Dto with id field
- */
-export declare type IdDto<T extends DataTypes.IdType = number> = {
-    /**
-     * Id
-     */
-    readonly id: T;
-};

package/lib/cjs/dto/IdDto.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/mjs/dto/IdDto.d.ts

@@ -1,10 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Dto with id field
- */
-export declare type IdDto<T extends DataTypes.IdType = number> = {
-    /**
-     * Id
-     */
-    readonly id: T;
-};

package/lib/mjs/dto/IdDto.js

@@ -1 +0,0 @@
-export {};

package/src/dto/IdDto.ts

@@ -1,11 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-
-/**
- * Dto with id field
- */
-export type IdDto<T extends DataTypes.IdType = number> = {
-    /**
-     * Id
-     */
-    readonly id: T;
-};