@etsoo/appscript 1.5.91 → 1.5.93

package/__tests__/app/CoreApp.ts

@@ -101,7 +101,7 @@ test("Tests for getRoleLabel", () => {
 test("Tests for getRoles", () => {
   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]);
+  expect(roles.map((r) => r.id)).toEqual([16, 128, 8192]);
 });
 
 test("Tests for getStatusList", () => {

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

@@ -559,7 +559,13 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hashHex(message: string, passphrase?: string): string;
     /**
-     * Check use has the specific role permission or not
+     * Check user has the minimum role permission or not
+     * @param role Minumum role
+     * @returns Result
+     */
+    hasMinPermission(role: UserRole): boolean;
+    /**
+     * Check user has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
@@ -575,10 +581,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     isFinanceUser(): boolean;
     /**
-     * Is HR user
+     * Is Manager user
      * @returns Result
      */
-    isHRUser(): boolean;
+    isManagerUser(): boolean;
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/cjs/app/CoreApp.js

@@ -1325,7 +1325,18 @@ class CoreApp {
             return HmacSHA512(message, passphrase).toString(enc.Hex);
     }
     /**
-     * Check use has the specific role permission or not
+     * Check user has the minimum role permission or not
+     * @param role Minumum role
+     * @returns Result
+     */
+    hasMinPermission(role) {
+        const userRole = this.userData?.role;
+        if (userRole == null)
+            return false;
+        return userRole >= role;
+    }
+    /**
+     * Check user has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
@@ -1346,7 +1357,7 @@ class CoreApp {
      * @returns Result
      */
     isAdminUser() {
-        return this.hasPermission([UserRole_1.UserRole.Admin, UserRole_1.UserRole.Founder]);
+        return this.hasMinPermission(UserRole_1.UserRole.Admin);
     }
     /**
      * Is Finance user
@@ -1356,11 +1367,11 @@ class CoreApp {
         return this.hasPermission(UserRole_1.UserRole.Finance) || this.isAdminUser();
     }
     /**
-     * Is HR user
+     * Is Manager user
      * @returns Result
      */
-    isHRUser() {
-        return this.hasPermission(UserRole_1.UserRole.HRManager) || this.isAdminUser();
+    isManagerUser() {
+        return this.hasMinPermission(UserRole_1.UserRole.Manager);
     }
     /**
      * Navigate to Url or delta

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

@@ -505,7 +505,13 @@ export interface IApp {
      */
     hashHex(message: string, passphrase?: string): string;
     /**
-     * Check use has the specific role permission or not
+     * Check user has the minimum role permission or not
+     * @param role Minumum role
+     * @returns Result
+     */
+    hasMinPermission(role: UserRole): boolean;
+    /**
+     * Check user has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
@@ -528,10 +534,10 @@ export interface IApp {
      */
     isFinanceUser(): boolean;
     /**
-     * Is HR user
+     * Is Manager user
      * @returns Result
      */
-    isHRUser(): boolean;
+    isManagerUser(): boolean;
     /**
      * Is valid password, override to implement custom check
      * @param password Input password

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

@@ -5,38 +5,67 @@
 export declare enum UserRole {
     /**
      * Guest
+     * 访客
      */
     Guest = 1,
     /**
      * Outsourcing
+     * 外包
      */
     Outsourcing = 2,
     /**
      * Operator
+     * 操作员
      */
     Operator = 4,
+    /**
+     * Partner
+     * 渠道合作伙伴
+     */
+    Partner = 8,
     /**
      * User
+     * 用户
+     */
+    User = 16,
+    /**
+     * Team leader
+     * 团队负责人
      */
-    User = 8,
+    Leader = 64,
     /**
      * Manager
+     * 经理
      */
     Manager = 128,
     /**
      * Finance
+     * 财务
      */
     Finance = 256,
     /**
-     * HR Manager
+     * Executives
+     * 高管
+     */
+    Executive = 512,
+    /**
+     * Shareholder
+     * 股东
+     */
+    Shareholder = 1024,
+    /**
+     * API
+     * 接口
      */
-    HRManager = 512,
+    API = 4096,
     /**
      * Administrator
+     * 管理员
      */
     Admin = 8192,
     /**
      * Founder, takes all ownership
+     * 创始人，所有权限
      */
     Founder = 16384
 }

package/lib/cjs/app/UserRole.js

@@ -9,38 +9,67 @@ var UserRole;
 (function (UserRole) {
     /**
      * Guest
+     * 访客
      */
     UserRole[UserRole["Guest"] = 1] = "Guest";
     /**
      * Outsourcing
+     * 外包
      */
     UserRole[UserRole["Outsourcing"] = 2] = "Outsourcing";
     /**
      * Operator
+     * 操作员
      */
     UserRole[UserRole["Operator"] = 4] = "Operator";
+    /**
+     * Partner
+     * 渠道合作伙伴
+     */
+    UserRole[UserRole["Partner"] = 8] = "Partner";
     /**
      * User
+     * 用户
+     */
+    UserRole[UserRole["User"] = 16] = "User";
+    /**
+     * Team leader
+     * 团队负责人
      */
-    UserRole[UserRole["User"] = 8] = "User";
+    UserRole[UserRole["Leader"] = 64] = "Leader";
     /**
      * Manager
+     * 经理
      */
     UserRole[UserRole["Manager"] = 128] = "Manager";
     /**
      * Finance
+     * 财务
      */
     UserRole[UserRole["Finance"] = 256] = "Finance";
     /**
-     * HR Manager
+     * Executives
+     * 高管
+     */
+    UserRole[UserRole["Executive"] = 512] = "Executive";
+    /**
+     * Shareholder
+     * 股东
+     */
+    UserRole[UserRole["Shareholder"] = 1024] = "Shareholder";
+    /**
+     * API
+     * 接口
      */
-    UserRole[UserRole["HRManager"] = 512] = "HRManager";
+    UserRole[UserRole["API"] = 4096] = "API";
     /**
      * Administrator
+     * 管理员
      */
     UserRole[UserRole["Admin"] = 8192] = "Admin";
     /**
      * Founder, takes all ownership
+     * 创始人，所有权限
      */
     UserRole[UserRole["Founder"] = 16384] = "Founder";
 })(UserRole || (exports.UserRole = UserRole = {}));

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

@@ -559,7 +559,13 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hashHex(message: string, passphrase?: string): string;
     /**
-     * Check use has the specific role permission or not
+     * Check user has the minimum role permission or not
+     * @param role Minumum role
+     * @returns Result
+     */
+    hasMinPermission(role: UserRole): boolean;
+    /**
+     * Check user has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
@@ -575,10 +581,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     isFinanceUser(): boolean;
     /**
-     * Is HR user
+     * Is Manager user
      * @returns Result
      */
-    isHRUser(): boolean;
+    isManagerUser(): boolean;
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/mjs/app/CoreApp.js

@@ -1322,7 +1322,18 @@ export class CoreApp {
             return HmacSHA512(message, passphrase).toString(enc.Hex);
     }
     /**
-     * Check use has the specific role permission or not
+     * Check user has the minimum role permission or not
+     * @param role Minumum role
+     * @returns Result
+     */
+    hasMinPermission(role) {
+        const userRole = this.userData?.role;
+        if (userRole == null)
+            return false;
+        return userRole >= role;
+    }
+    /**
+     * Check user has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
@@ -1343,7 +1354,7 @@ export class CoreApp {
      * @returns Result
      */
     isAdminUser() {
-        return this.hasPermission([UserRole.Admin, UserRole.Founder]);
+        return this.hasMinPermission(UserRole.Admin);
     }
     /**
      * Is Finance user
@@ -1353,11 +1364,11 @@ export class CoreApp {
         return this.hasPermission(UserRole.Finance) || this.isAdminUser();
     }
     /**
-     * Is HR user
+     * Is Manager user
      * @returns Result
      */
-    isHRUser() {
-        return this.hasPermission(UserRole.HRManager) || this.isAdminUser();
+    isManagerUser() {
+        return this.hasMinPermission(UserRole.Manager);
     }
     /**
      * Navigate to Url or delta

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

@@ -505,7 +505,13 @@ export interface IApp {
      */
     hashHex(message: string, passphrase?: string): string;
     /**
-     * Check use has the specific role permission or not
+     * Check user has the minimum role permission or not
+     * @param role Minumum role
+     * @returns Result
+     */
+    hasMinPermission(role: UserRole): boolean;
+    /**
+     * Check user has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
@@ -528,10 +534,10 @@ export interface IApp {
      */
     isFinanceUser(): boolean;
     /**
-     * Is HR user
+     * Is Manager user
      * @returns Result
      */
-    isHRUser(): boolean;
+    isManagerUser(): boolean;
     /**
      * Is valid password, override to implement custom check
      * @param password Input password

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

@@ -5,38 +5,67 @@
 export declare enum UserRole {
     /**
      * Guest
+     * 访客
      */
     Guest = 1,
     /**
      * Outsourcing
+     * 外包
      */
     Outsourcing = 2,
     /**
      * Operator
+     * 操作员
      */
     Operator = 4,
+    /**
+     * Partner
+     * 渠道合作伙伴
+     */
+    Partner = 8,
     /**
      * User
+     * 用户
+     */
+    User = 16,
+    /**
+     * Team leader
+     * 团队负责人
      */
-    User = 8,
+    Leader = 64,
     /**
      * Manager
+     * 经理
      */
     Manager = 128,
     /**
      * Finance
+     * 财务
      */
     Finance = 256,
     /**
-     * HR Manager
+     * Executives
+     * 高管
+     */
+    Executive = 512,
+    /**
+     * Shareholder
+     * 股东
+     */
+    Shareholder = 1024,
+    /**
+     * API
+     * 接口
      */
-    HRManager = 512,
+    API = 4096,
     /**
      * Administrator
+     * 管理员
      */
     Admin = 8192,
     /**
      * Founder, takes all ownership
+     * 创始人，所有权限
      */
     Founder = 16384
 }

package/lib/mjs/app/UserRole.js

@@ -6,38 +6,67 @@ export var UserRole;
 (function (UserRole) {
     /**
      * Guest
+     * 访客
      */
     UserRole[UserRole["Guest"] = 1] = "Guest";
     /**
      * Outsourcing
+     * 外包
      */
     UserRole[UserRole["Outsourcing"] = 2] = "Outsourcing";
     /**
      * Operator
+     * 操作员
      */
     UserRole[UserRole["Operator"] = 4] = "Operator";
+    /**
+     * Partner
+     * 渠道合作伙伴
+     */
+    UserRole[UserRole["Partner"] = 8] = "Partner";
     /**
      * User
+     * 用户
+     */
+    UserRole[UserRole["User"] = 16] = "User";
+    /**
+     * Team leader
+     * 团队负责人
      */
-    UserRole[UserRole["User"] = 8] = "User";
+    UserRole[UserRole["Leader"] = 64] = "Leader";
     /**
      * Manager
+     * 经理
      */
     UserRole[UserRole["Manager"] = 128] = "Manager";
     /**
      * Finance
+     * 财务
      */
     UserRole[UserRole["Finance"] = 256] = "Finance";
     /**
-     * HR Manager
+     * Executives
+     * 高管
+     */
+    UserRole[UserRole["Executive"] = 512] = "Executive";
+    /**
+     * Shareholder
+     * 股东
+     */
+    UserRole[UserRole["Shareholder"] = 1024] = "Shareholder";
+    /**
+     * API
+     * 接口
      */
-    UserRole[UserRole["HRManager"] = 512] = "HRManager";
+    UserRole[UserRole["API"] = 4096] = "API";
     /**
      * Administrator
+     * 管理员
      */
     UserRole[UserRole["Admin"] = 8192] = "Admin";
     /**
      * Founder, takes all ownership
+     * 创始人，所有权限
      */
     UserRole[UserRole["Founder"] = 16384] = "Founder";
 })(UserRole || (UserRole = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.91",
+  "version": "1.5.93",
   "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.21",
+    "@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": "^3.0.2"
+    "vitest": "^3.0.3"
   }
 }

package/src/app/CoreApp.ts

@@ -1828,7 +1828,18 @@ export abstract class CoreApp<
   }
 
   /**
-   * Check use has the specific role permission or not
+   * Check user has the minimum role permission or not
+   * @param role Minumum role
+   * @returns Result
+   */
+  hasMinPermission(role: UserRole) {
+    const userRole = this.userData?.role;
+    if (userRole == null) return false;
+    return userRole >= role;
+  }
+
+  /**
+   * Check user has the specific role permission or not
    * @param roles Roles to check
    * @returns Result
    */
@@ -1851,7 +1862,7 @@ export abstract class CoreApp<
    * @returns Result
    */
   isAdminUser() {
-    return this.hasPermission([UserRole.Admin, UserRole.Founder]);
+    return this.hasMinPermission(UserRole.Admin);
   }
 
   /**
@@ -1863,11 +1874,11 @@ export abstract class CoreApp<
   }
 
   /**
-   * Is HR user
+   * Is Manager user
    * @returns Result
    */
-  isHRUser() {
-    return this.hasPermission(UserRole.HRManager) || this.isAdminUser();
+  isManagerUser() {
+    return this.hasMinPermission(UserRole.Manager);
   }
 
   /**

package/src/app/IApp.ts

@@ -668,7 +668,14 @@ export interface IApp {
   hashHex(message: string, passphrase?: string): string;
 
   /**
-   * Check use has the specific role permission or not
+   * Check user has the minimum role permission or not
+   * @param role Minumum role
+   * @returns Result
+   */
+  hasMinPermission(role: UserRole): boolean;
+
+  /**
+   * Check user has the specific role permission or not
    * @param roles Roles to check
    * @returns Result
    */
@@ -698,10 +705,10 @@ export interface IApp {
   isFinanceUser(): boolean;
 
   /**
-   * Is HR user
+   * Is Manager user
    * @returns Result
    */
-  isHRUser(): boolean;
+  isManagerUser(): boolean;
 
   /**
    * Is valid password, override to implement custom check

package/src/app/UserRole.ts

@@ -5,46 +5,79 @@
 export enum UserRole {
   /**
    * Guest
+   * 访客
    */
   Guest = 1,
 
   /**
    * Outsourcing
+   * 外包
    */
   Outsourcing = 2,
 
   /**
    * Operator
+   * 操作员
    */
   Operator = 4,
 
+  /**
+   * Partner
+   * 渠道合作伙伴
+   */
+  Partner = 8,
+
   /**
    * User
+   * 用户
+   */
+  User = 16,
+
+  /**
+   * Team leader
+   * 团队负责人
    */
-  User = 8,
+  Leader = 64,
 
   /**
    * Manager
+   * 经理
    */
   Manager = 128,
 
   /**
    * Finance
+   * 财务
    */
   Finance = 256,
 
   /**
-   * HR Manager
+   * Executives
+   * 高管
+   */
+  Executive = 512,
+
+  /**
+   * Shareholder
+   * 股东
+   */
+  Shareholder = 1024,
+
+  /**
+   * API
+   * 接口
    */
-  HRManager = 512,
+  API = 4096,
 
   /**
    * Administrator
+   * 管理员
    */
   Admin = 8192,
 
   /**
    * Founder, takes all ownership
+   * 创始人，所有权限
    */
   Founder = 16384
 }