@etsoo/appscript 1.5.90 → 1.5.92

package/__tests__/app/CoreApp.ts

@@ -90,6 +90,14 @@ test("Tests for formatFullName", () => {
   expect(app.formatFullName("Xiao", "Garry")).toBe("Garry Xiao");
 });
 
+test("Tests for getRoleLabel", () => {
+  const labels = app.getRoleLabel(
+    UserRole.User | UserRole.Manager | UserRole.Admin,
+    "-"
+  );
+  expect(labels).toBe("User-Manager-Admin");
+});
+
 test("Tests for getRoles", () => {
   const roles = app.getRoles(UserRole.User | UserRole.Manager | UserRole.Admin);
   expect(roles.length).toBe(3);

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

@@ -509,11 +509,18 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get role label
+     * @param role Role value
+     * @param joinChar Join char
+     * @returns Label(s)
+     */
+    getRoleLabel(role: number | null | undefined, joinChar?: string): string;
     /**
      * Get roles
-     * @param role Combination role value
+     * @param role Combination role value, null for all roles
      */
-    getRoles(role: number): ListType[];
+    getRoles(role?: number): ListType[];
     /**
      * Get status list
      * @param ids Limited ids

package/lib/cjs/app/CoreApp.js

@@ -1235,11 +1235,26 @@ class CoreApp {
             return AddressRegion_1.AddressRegion.getById(id);
         });
     }
+    /**
+     * Get role label
+     * @param role Role value
+     * @param joinChar Join char
+     * @returns Label(s)
+     */
+    getRoleLabel(role, joinChar) {
+        if (role == null)
+            return "";
+        joinChar ?? (joinChar = ", ");
+        const roles = this.getRoles(role);
+        return roles.map((r) => r.label).join(joinChar);
+    }
     /**
      * Get roles
-     * @param role Combination role value
+     * @param role Combination role value, null for all roles
      */
     getRoles(role) {
+        if (role == null)
+            return this.getEnumList(UserRole_1.UserRole, "role");
         return this.getEnumList(UserRole_1.UserRole, "role", (id, _key) => {
             if ((id & role) > 0)
                 return id;

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

@@ -455,11 +455,18 @@ export interface IApp {
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get role label
+     * @param role Role value
+     * @param joinChar Join char
+     * @returns Label(s)
+     */
+    getRoleLabel(role: number | null | undefined, joinChar?: string): string;
     /**
      * Get roles
-     * @param role Combination role value
+     * @param role Combination role value, null for all roles
      */
-    getRoles(role: number): ListType[];
+    getRoles(role?: number): ListType[];
     /**
      * Get status label
      * @param status Status value

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

@@ -509,11 +509,18 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get role label
+     * @param role Role value
+     * @param joinChar Join char
+     * @returns Label(s)
+     */
+    getRoleLabel(role: number | null | undefined, joinChar?: string): string;
     /**
      * Get roles
-     * @param role Combination role value
+     * @param role Combination role value, null for all roles
      */
-    getRoles(role: number): ListType[];
+    getRoles(role?: number): ListType[];
     /**
      * Get status list
      * @param ids Limited ids

package/lib/mjs/app/CoreApp.js

@@ -1232,11 +1232,26 @@ export class CoreApp {
             return AddressRegion.getById(id);
         });
     }
+    /**
+     * Get role label
+     * @param role Role value
+     * @param joinChar Join char
+     * @returns Label(s)
+     */
+    getRoleLabel(role, joinChar) {
+        if (role == null)
+            return "";
+        joinChar ?? (joinChar = ", ");
+        const roles = this.getRoles(role);
+        return roles.map((r) => r.label).join(joinChar);
+    }
     /**
      * Get roles
-     * @param role Combination role value
+     * @param role Combination role value, null for all roles
      */
     getRoles(role) {
+        if (role == null)
+            return this.getEnumList(UserRole, "role");
         return this.getEnumList(UserRole, "role", (id, _key) => {
             if ((id & role) > 0)
                 return id;

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

@@ -455,11 +455,18 @@ export interface IApp {
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get role label
+     * @param role Role value
+     * @param joinChar Join char
+     * @returns Label(s)
+     */
+    getRoleLabel(role: number | null | undefined, joinChar?: string): string;
     /**
      * Get roles
-     * @param role Combination role value
+     * @param role Combination role value, null for all roles
      */
-    getRoles(role: number): ListType[];
+    getRoles(role?: number): ListType[];
     /**
      * Get status label
      * @param status Status value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.90",
+  "version": "1.5.92",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -35,9 +35,9 @@
   },
   "homepage": "https://github.com/ETSOO/AppScript#readme",
   "dependencies": {
-    "@etsoo/notificationbase": "^1.1.56",
-    "@etsoo/restclient": "^1.1.19",
-    "@etsoo/shared": "^1.2.58",
+    "@etsoo/notificationbase": "^1.1.57",
+    "@etsoo/restclient": "^1.1.20",
+    "@etsoo/shared": "^1.2.59",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
@@ -50,6 +50,6 @@
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.3",
-    "vitest": "^2.1.8"
+    "vitest": "^3.0.2"
   }
 }

package/src/app/CoreApp.ts

@@ -1734,11 +1734,28 @@ export abstract class CoreApp<
     });
   }
 
+  /**
+   * Get role label
+   * @param role Role value
+   * @param joinChar Join char
+   * @returns Label(s)
+   */
+  getRoleLabel(role: number | null | undefined, joinChar?: string) {
+    if (role == null) return "";
+
+    joinChar ??= ", ";
+
+    const roles = this.getRoles(role);
+    return roles.map((r) => r.label).join(joinChar);
+  }
+
   /**
    * Get roles
-   * @param role Combination role value
+   * @param role Combination role value, null for all roles
    */
-  getRoles(role: number) {
+  getRoles(role?: number) {
+    if (role == null) return this.getEnumList(UserRole, "role");
+
     return this.getEnumList(UserRole, "role", (id, _key) => {
       if ((id & role) > 0) return id;
     });

package/src/app/IApp.ts

@@ -610,11 +610,19 @@ export interface IApp {
    */
   getRegions(): AddressRegion[];
 
+  /**
+   * Get role label
+   * @param role Role value
+   * @param joinChar Join char
+   * @returns Label(s)
+   */
+  getRoleLabel(role: number | null | undefined, joinChar?: string): string;
+
   /**
    * Get roles
-   * @param role Combination role value
+   * @param role Combination role value, null for all roles
    */
-  getRoles(role: number): ListType[];
+  getRoles(role?: number): ListType[];
 
   /**
    * Get status label