@etsoo/appscript 1.3.88 → 1.3.90

package/__tests__/app/CoreApp.ts

@@ -11,6 +11,7 @@ import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
 import {
     AddressApi,
     en,
+    EntityStatus,
     ExternalSettings,
     IUser,
     OrgApi,
@@ -205,6 +206,20 @@ test('Tests for getRoles', () => {
     expect(roles.map((r) => r.id)).toEqual([8, 128, 8192]);
 });
 
+test('Tests for getStatusList', () => {
+    var statuses = app.getStatusList([
+        EntityStatus.Normal,
+        EntityStatus.Approved,
+        EntityStatus.Doing,
+        EntityStatus.Completed,
+        EntityStatus.Deleted
+    ]);
+    expect(statuses.length).toBe(5);
+    expect(statuses.some((s) => s.id === EntityStatus.Doing)).toBeTruthy();
+
+    expect(app.getStatusList().length).toBe(9);
+});
+
 test('Tests for isValidPassword', () => {
     expect(app.isValidPassword('12345678')).toBeFalsy();
     expect(app.isValidPassword('abcd3')).toBeFalsy();

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

@@ -2,6 +2,7 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
+import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
@@ -402,9 +403,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     getRoles(role: number): ListType[];
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList(): ListType[];
+    getStatusList(ids?: EntityStatus[]): ListType[];
     /**
      * Get status label
      * @param status Status value

package/lib/cjs/app/CoreApp.js

@@ -978,10 +978,13 @@ class CoreApp {
     }
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList() {
-        return this.getEnumList(EntityStatus_1.EntityStatus, 'status');
+    getStatusList(ids = []) {
+        return this.getEnumList(EntityStatus_1.EntityStatus, 'status', ids.length > 0
+            ? (id, _key) => (ids.includes(id) ? id : undefined)
+            : undefined);
     }
     /**
      * Get status label

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

@@ -6,6 +6,7 @@ import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
+import { EntityStatus } from '../business/EntityStatus';
 /**
  * Detect IP callback interface
  */
@@ -343,9 +344,10 @@ export interface IApp {
     getStatusLabel(status: number | null | undefined): string;
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList(): ListType[];
+    getStatusList(ids?: EntityStatus[]): ListType[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

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

@@ -16,10 +16,14 @@ export declare enum EntityStatus {
      * Approved
      */
     Approved = 100,
+    /**
+     * Doing
+     */
+    Doing = 110,
     /**
      * Audited
      */
-    Audited = 111,
+    Audited = 120,
     /**
      * Inactivated
      */

package/lib/cjs/business/EntityStatus.js

@@ -20,10 +20,14 @@ var EntityStatus;
      * Approved
      */
     EntityStatus[EntityStatus["Approved"] = 100] = "Approved";
+    /**
+     * Doing
+     */
+    EntityStatus[EntityStatus["Doing"] = 110] = "Doing";
     /**
      * Audited
      */
-    EntityStatus[EntityStatus["Audited"] = 111] = "Audited";
+    EntityStatus[EntityStatus["Audited"] = 120] = "Audited";
     /**
      * Inactivated
      */

package/lib/cjs/i18n/en.json

@@ -177,6 +177,7 @@
     "statusAudited": "Audited",
     "statusCompleted": "Completed",
     "statusDeleted": "Deleted",
+    "statusDoing": "Doing",
     "statusFlaged": "Flaged",
     "statusNormal": "Normla",
     "statusInactivated": "Inactivated",

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

@@ -177,6 +177,7 @@
     "statusAudited": "已审核",
     "statusCompleted": "已完成",
     "statusDeleted": "已删除",
+    "statusDoing": "处理中",
     "statusFlaged": "已标记",
     "statusNormal": "正常",
     "statusInactivated": "已停用",

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

@@ -177,6 +177,7 @@
     "statusAudited": "已審核",
     "statusCompleted": "已完成",
     "statusDeleted": "已刪除",
+    "statusDoing": "處理中",
     "statusFlaged": "已標記",
     "statusNormal": "正常",
     "statusInactivated": "已停用",

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

@@ -2,6 +2,7 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
+import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
@@ -402,9 +403,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     getRoles(role: number): ListType[];
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList(): ListType[];
+    getStatusList(ids?: EntityStatus[]): ListType[];
     /**
      * Get status label
      * @param status Status value

package/lib/mjs/app/CoreApp.js

@@ -975,10 +975,13 @@ export class CoreApp {
     }
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList() {
-        return this.getEnumList(EntityStatus, 'status');
+    getStatusList(ids = []) {
+        return this.getEnumList(EntityStatus, 'status', ids.length > 0
+            ? (id, _key) => (ids.includes(id) ? id : undefined)
+            : undefined);
     }
     /**
      * Get status label

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

@@ -6,6 +6,7 @@ import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
+import { EntityStatus } from '../business/EntityStatus';
 /**
  * Detect IP callback interface
  */
@@ -343,9 +344,10 @@ export interface IApp {
     getStatusLabel(status: number | null | undefined): string;
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList(): ListType[];
+    getStatusList(ids?: EntityStatus[]): ListType[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

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

@@ -16,10 +16,14 @@ export declare enum EntityStatus {
      * Approved
      */
     Approved = 100,
+    /**
+     * Doing
+     */
+    Doing = 110,
     /**
      * Audited
      */
-    Audited = 111,
+    Audited = 120,
     /**
      * Inactivated
      */

package/lib/mjs/business/EntityStatus.js

@@ -17,10 +17,14 @@ export var EntityStatus;
      * Approved
      */
     EntityStatus[EntityStatus["Approved"] = 100] = "Approved";
+    /**
+     * Doing
+     */
+    EntityStatus[EntityStatus["Doing"] = 110] = "Doing";
     /**
      * Audited
      */
-    EntityStatus[EntityStatus["Audited"] = 111] = "Audited";
+    EntityStatus[EntityStatus["Audited"] = 120] = "Audited";
     /**
      * Inactivated
      */

package/lib/mjs/i18n/en.json

@@ -177,6 +177,7 @@
     "statusAudited": "Audited",
     "statusCompleted": "Completed",
     "statusDeleted": "Deleted",
+    "statusDoing": "Doing",
     "statusFlaged": "Flaged",
     "statusNormal": "Normla",
     "statusInactivated": "Inactivated",

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

@@ -177,6 +177,7 @@
     "statusAudited": "已审核",
     "statusCompleted": "已完成",
     "statusDeleted": "已删除",
+    "statusDoing": "处理中",
     "statusFlaged": "已标记",
     "statusNormal": "正常",
     "statusInactivated": "已停用",

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

@@ -177,6 +177,7 @@
     "statusAudited": "已審核",
     "statusCompleted": "已完成",
     "statusDeleted": "已刪除",
+    "statusDoing": "處理中",
     "statusFlaged": "已標記",
     "statusNormal": "正常",
     "statusInactivated": "已停用",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.88",
+    "version": "1.3.90",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.24",
         "@etsoo/restclient": "^1.0.87",
-        "@etsoo/shared": "^1.1.95",
+        "@etsoo/shared": "^1.2.0",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -67,7 +67,7 @@
         "@types/jest": "^29.5.0",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
-        "ts-jest": "^29.0.5",
-        "typescript": "^5.0.3"
+        "ts-jest": "^29.1.0",
+        "typescript": "^5.0.4"
     }
 }

package/src/app/CoreApp.ts

@@ -1319,10 +1319,17 @@ export abstract class CoreApp<
 
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList() {
-        return this.getEnumList(EntityStatus, 'status');
+    getStatusList(ids: EntityStatus[] = []) {
+        return this.getEnumList(
+            EntityStatus,
+            'status',
+            ids.length > 0
+                ? (id, _key) => (ids.includes(id) ? id : undefined)
+                : undefined
+        );
     }
 
     /**

package/src/app/IApp.ts

@@ -18,6 +18,7 @@ import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
+import { EntityStatus } from '../business/EntityStatus';
 
 /**
  * Detect IP callback interface
@@ -466,9 +467,10 @@ export interface IApp {
 
     /**
      * Get status list
+     * @param ids Limited ids
      * @returns list
      */
-    getStatusList(): ListType[];
+    getStatusList(ids?: EntityStatus[]): ListType[];
 
     /**
      * Get refresh token from response headers

package/src/business/EntityStatus.ts

@@ -19,10 +19,15 @@ export enum EntityStatus {
      */
     Approved = 100,
 
+    /**
+     * Doing
+     */
+    Doing = 110,
+
     /**
      * Audited
      */
-    Audited = 111,
+    Audited = 120,
 
     /**
      * Inactivated

package/src/i18n/en.json

@@ -177,6 +177,7 @@
     "statusAudited": "Audited",
     "statusCompleted": "Completed",
     "statusDeleted": "Deleted",
+    "statusDoing": "Doing",
     "statusFlaged": "Flaged",
     "statusNormal": "Normla",
     "statusInactivated": "Inactivated",

package/src/i18n/zh-Hans.json

@@ -177,6 +177,7 @@
     "statusAudited": "已审核",
     "statusCompleted": "已完成",
     "statusDeleted": "已删除",
+    "statusDoing": "处理中",
     "statusFlaged": "已标记",
     "statusNormal": "正常",
     "statusInactivated": "已停用",

package/src/i18n/zh-Hant.json

@@ -177,6 +177,7 @@
     "statusAudited": "已審核",
     "statusCompleted": "已完成",
     "statusDeleted": "已刪除",
+    "statusDoing": "處理中",
     "statusFlaged": "已標記",
     "statusNormal": "正常",
     "statusInactivated": "已停用",