@etsoo/appscript 1.1.41 → 1.1.45

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

@@ -22,6 +22,10 @@ export interface IAppSettings extends IExternalSettings {
      * Detected culture
      */
     readonly detectedCulture: string;
+    /**
+     * Service id
+     */
+    readonly serviceId?: string;
     /**
      * Time zone
      */

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

@@ -262,8 +262,14 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     get authorized(): boolean;
     private set authorized(value);
     private _isTryingLogin;
-    private _lastCalled;
-    private _refreshCountdownSeed;
+    /**
+     * Last called with token refresh
+     */
+    protected lastCalled: boolean;
+    /**
+     * Token refresh count down seed
+     */
+    protected refreshCountdownSeed: number;
     /**
      * Protected constructor
      * @param settings Settings
@@ -272,6 +278,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param name Application name
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
+    protected setApi(api: IApi): void;
     /**
      * Alert action result
      * @param result Action result
@@ -377,8 +384,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Refresh countdown
      * @param seconds Seconds
      */
-    private refreshCountdown;
-    private refreshCountdownClear;
+    protected refreshCountdown(seconds: number): void;
+    protected refreshCountdownClear(): void;
     /**
      * Fresh countdown UI
      * @param callback Callback

package/lib/cjs/app/CoreApp.js

@@ -24,40 +24,19 @@ class CoreApp {
         this.headerTokenField = 'SmartERPRefreshToken';
         this._authorized = false;
         this._isTryingLogin = false;
-        this._lastCalled = false;
-        this._refreshCountdownSeed = 0;
-        // onRequest, show loading or not, rewrite the property to override default action
-        api.onRequest = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                notifier.showLoading();
-            }
-        };
-        // onComplete, hide loading, rewrite the property to override default action
-        api.onComplete = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                notifier.hideLoading();
-            }
-            this._lastCalled = true;
-        };
-        // Global API error handler
-        api.onError = (error) => {
-            // Error code
-            const status = error.response
-                ? api.transformResponse(error.response).status
-                : undefined;
-            if (status === 401) {
-                // When status is equal to 401, unauthorized, try login
-                this.tryLogin();
-            }
-            else {
-                // Report the error
-                notifier.alert(this.formatError(error));
-            }
-        };
+        /**
+         * Last called with token refresh
+         */
+        this.lastCalled = false;
+        /**
+         * Token refresh count down seed
+         */
+        this.refreshCountdownSeed = 0;
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
         this.name = name;
+        this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
         this.changeRegion(currentRegion);
@@ -97,6 +76,36 @@ class CoreApp {
     set authorized(value) {
         this._authorized = value;
     }
+    setApi(api) {
+        // onRequest, show loading or not, rewrite the property to override default action
+        api.onRequest = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.showLoading();
+            }
+        };
+        // onComplete, hide loading, rewrite the property to override default action
+        api.onComplete = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.hideLoading();
+            }
+            this.lastCalled = true;
+        };
+        // Global API error handler
+        api.onError = (error) => {
+            // Error code
+            const status = error.response
+                ? api.transformResponse(error.response).status
+                : undefined;
+            if (status === 401) {
+                // When status is equal to 401, unauthorized, try login
+                this.tryLogin();
+            }
+            else {
+                // Report the error
+                this.notifier.alert(this.formatError(error));
+            }
+        };
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -351,23 +360,23 @@ class CoreApp {
         // Reset last call flag
         // Any success call will update it to true
         // So first time after login will be always silent
-        this._lastCalled = false;
-        this._refreshCountdownSeed = window.setTimeout(() => {
-            if (this._lastCalled) {
+        this.lastCalled = false;
+        this.refreshCountdownSeed = window.setTimeout(() => {
+            if (this.lastCalled) {
                 // Call refreshToken to update access token
                 this.refreshToken();
             }
             else {
                 // Popup countdown for user action
-                this.freshCountdownUI(this.refreshToken);
+                this.freshCountdownUI();
             }
         }, 1000 * seconds);
     }
     refreshCountdownClear() {
         // Clear the current timeout seed
-        if (this._refreshCountdownSeed > 0) {
-            window.clearTimeout(this._refreshCountdownSeed);
-            this._refreshCountdownSeed = 0;
+        if (this.refreshCountdownSeed > 0) {
+            window.clearTimeout(this.refreshCountdownSeed);
+            this.refreshCountdownSeed = 0;
         }
     }
     /**

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

@@ -14,6 +14,14 @@ export interface IExternalSettings {
      * Cloud web url
      */
     readonly webUrl: string;
+    /**
+     * Core system Url
+     */
+    readonly coreUrl?: string;
+    /**
+     * Core system API
+     */
+    readonly coreApi?: string;
 }
 /**
  * External settings host

package/lib/cjs/index.d.ts

@@ -19,6 +19,8 @@ export * from './dto/UpdateDto';
 export * from './i18n/enUS';
 export * from './i18n/zhCN';
 export * from './i18n/zhHK';
+export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
+export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';

package/lib/cjs/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createClient = exports.ApiAuthorizationScheme = void 0;
 // address
 __exportStar(require("./address/AddressContinent"), exports);
 __exportStar(require("./address/AddressRegion"), exports);
@@ -38,6 +39,10 @@ __exportStar(require("./dto/UpdateDto"), exports);
 __exportStar(require("./i18n/enUS"), exports);
 __exportStar(require("./i18n/zhCN"), exports);
 __exportStar(require("./i18n/zhHK"), exports);
+// @etsoo/restclient
+var restclient_1 = require("@etsoo/restclient");
+Object.defineProperty(exports, "ApiAuthorizationScheme", { enumerable: true, get: function () { return restclient_1.ApiAuthorizationScheme; } });
+Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return restclient_1.createClient; } });
 // result
 __exportStar(require("./result/ActionResult"), exports);
 __exportStar(require("./result/ActionResultError"), exports);

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

@@ -22,6 +22,10 @@ export interface IAppSettings extends IExternalSettings {
      * Detected culture
      */
     readonly detectedCulture: string;
+    /**
+     * Service id
+     */
+    readonly serviceId?: string;
     /**
      * Time zone
      */

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

@@ -262,8 +262,14 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     get authorized(): boolean;
     private set authorized(value);
     private _isTryingLogin;
-    private _lastCalled;
-    private _refreshCountdownSeed;
+    /**
+     * Last called with token refresh
+     */
+    protected lastCalled: boolean;
+    /**
+     * Token refresh count down seed
+     */
+    protected refreshCountdownSeed: number;
     /**
      * Protected constructor
      * @param settings Settings
@@ -272,6 +278,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param name Application name
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
+    protected setApi(api: IApi): void;
     /**
      * Alert action result
      * @param result Action result
@@ -377,8 +384,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Refresh countdown
      * @param seconds Seconds
      */
-    private refreshCountdown;
-    private refreshCountdownClear;
+    protected refreshCountdown(seconds: number): void;
+    protected refreshCountdownClear(): void;
     /**
      * Fresh countdown UI
      * @param callback Callback

package/lib/mjs/app/CoreApp.js

@@ -21,40 +21,19 @@ export class CoreApp {
         this.headerTokenField = 'SmartERPRefreshToken';
         this._authorized = false;
         this._isTryingLogin = false;
-        this._lastCalled = false;
-        this._refreshCountdownSeed = 0;
-        // onRequest, show loading or not, rewrite the property to override default action
-        api.onRequest = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                notifier.showLoading();
-            }
-        };
-        // onComplete, hide loading, rewrite the property to override default action
-        api.onComplete = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                notifier.hideLoading();
-            }
-            this._lastCalled = true;
-        };
-        // Global API error handler
-        api.onError = (error) => {
-            // Error code
-            const status = error.response
-                ? api.transformResponse(error.response).status
-                : undefined;
-            if (status === 401) {
-                // When status is equal to 401, unauthorized, try login
-                this.tryLogin();
-            }
-            else {
-                // Report the error
-                notifier.alert(this.formatError(error));
-            }
-        };
+        /**
+         * Last called with token refresh
+         */
+        this.lastCalled = false;
+        /**
+         * Token refresh count down seed
+         */
+        this.refreshCountdownSeed = 0;
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
         this.name = name;
+        this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
         this.changeRegion(currentRegion);
@@ -94,6 +73,36 @@ export class CoreApp {
     set authorized(value) {
         this._authorized = value;
     }
+    setApi(api) {
+        // onRequest, show loading or not, rewrite the property to override default action
+        api.onRequest = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.showLoading();
+            }
+        };
+        // onComplete, hide loading, rewrite the property to override default action
+        api.onComplete = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.hideLoading();
+            }
+            this.lastCalled = true;
+        };
+        // Global API error handler
+        api.onError = (error) => {
+            // Error code
+            const status = error.response
+                ? api.transformResponse(error.response).status
+                : undefined;
+            if (status === 401) {
+                // When status is equal to 401, unauthorized, try login
+                this.tryLogin();
+            }
+            else {
+                // Report the error
+                this.notifier.alert(this.formatError(error));
+            }
+        };
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -348,23 +357,23 @@ export class CoreApp {
         // Reset last call flag
         // Any success call will update it to true
         // So first time after login will be always silent
-        this._lastCalled = false;
-        this._refreshCountdownSeed = window.setTimeout(() => {
-            if (this._lastCalled) {
+        this.lastCalled = false;
+        this.refreshCountdownSeed = window.setTimeout(() => {
+            if (this.lastCalled) {
                 // Call refreshToken to update access token
                 this.refreshToken();
             }
             else {
                 // Popup countdown for user action
-                this.freshCountdownUI(this.refreshToken);
+                this.freshCountdownUI();
             }
         }, 1000 * seconds);
     }
     refreshCountdownClear() {
         // Clear the current timeout seed
-        if (this._refreshCountdownSeed > 0) {
-            window.clearTimeout(this._refreshCountdownSeed);
-            this._refreshCountdownSeed = 0;
+        if (this.refreshCountdownSeed > 0) {
+            window.clearTimeout(this.refreshCountdownSeed);
+            this.refreshCountdownSeed = 0;
         }
     }
     /**

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

@@ -14,6 +14,14 @@ export interface IExternalSettings {
      * Cloud web url
      */
     readonly webUrl: string;
+    /**
+     * Core system Url
+     */
+    readonly coreUrl?: string;
+    /**
+     * Core system API
+     */
+    readonly coreApi?: string;
 }
 /**
  * External settings host

package/lib/mjs/index.d.ts

@@ -19,6 +19,8 @@ export * from './dto/UpdateDto';
 export * from './i18n/enUS';
 export * from './i18n/zhCN';
 export * from './i18n/zhHK';
+export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
+export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';

package/lib/mjs/index.js

@@ -26,6 +26,8 @@ export * from './dto/UpdateDto';
 export * from './i18n/enUS';
 export * from './i18n/zhCN';
 export * from './i18n/zhHK';
+// @etsoo/restclient
+export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 // result
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.41",
+    "version": "1.1.45",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -59,15 +59,15 @@
     "devDependencies": {
         "@babel/cli": "^7.16.0",
         "@babel/core": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.0",
-        "@babel/preset-env": "^7.16.0",
-        "@babel/runtime-corejs3": "^7.16.0",
+        "@babel/plugin-transform-runtime": "^7.16.4",
+        "@babel/preset-env": "^7.16.4",
+        "@babel/runtime-corejs3": "^7.16.3",
         "@types/jest": "^27.0.2",
-        "@typescript-eslint/eslint-plugin": "^5.3.1",
-        "@typescript-eslint/parser": "^5.3.1",
+        "@typescript-eslint/eslint-plugin": "^5.4.0",
+        "@typescript-eslint/parser": "^5.4.0",
         "eslint": "^8.2.0",
-        "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-plugin-import": "^2.25.2",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-import": "^2.25.3",
         "jest": "^27.3.1",
         "ts-jest": "^27.0.7",
         "typescript": "^4.4.4"

package/src/app/AppSettings.ts

@@ -27,6 +27,11 @@ export interface IAppSettings extends IExternalSettings {
      */
     readonly detectedCulture: string;
 
+    /**
+     * Service id
+     */
+    readonly serviceId?: string;
+
     /**
      * Time zone
      */

package/src/app/CoreApp.ts

@@ -362,8 +362,15 @@ export abstract class CoreApp<
 
     private _isTryingLogin = false;
 
-    private _lastCalled = false;
-    private _refreshCountdownSeed = 0;
+    /**
+     * Last called with token refresh
+     */
+    protected lastCalled = false;
+
+    /**
+     * Token refresh count down seed
+     */
+    protected refreshCountdownSeed = 0;
 
     /**
      * Protected constructor
@@ -378,19 +385,36 @@ export abstract class CoreApp<
         notifier: INotifier<N, C>,
         name: string
     ) {
+        this.settings = settings;
+        this.api = api;
+        this.notifier = notifier;
+        this.name = name;
+
+        this.setApi(api);
+
+        const { currentCulture, currentRegion } = settings;
+        this.changeCulture(currentCulture);
+
+        this.changeRegion(currentRegion);
+
+        // Setup callback
+        this.setup();
+    }
+
+    protected setApi(api: IApi) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
-                notifier.showLoading();
+                this.notifier.showLoading();
             }
         };
 
         // onComplete, hide loading, rewrite the property to override default action
         api.onComplete = (data) => {
             if (data.showLoading == null || data.showLoading) {
-                notifier.hideLoading();
+                this.notifier.hideLoading();
             }
-            this._lastCalled = true;
+            this.lastCalled = true;
         };
 
         // Global API error handler
@@ -405,22 +429,9 @@ export abstract class CoreApp<
                 this.tryLogin();
             } else {
                 // Report the error
-                notifier.alert(this.formatError(error));
+                this.notifier.alert(this.formatError(error));
             }
         };
-
-        this.settings = settings;
-        this.api = api;
-        this.notifier = notifier;
-        this.name = name;
-
-        const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture);
-
-        this.changeRegion(currentRegion);
-
-        // Setup callback
-        this.setup();
     }
 
     /**
@@ -727,7 +738,7 @@ export abstract class CoreApp<
      * Refresh countdown
      * @param seconds Seconds
      */
-    private refreshCountdown(seconds: number) {
+    protected refreshCountdown(seconds: number) {
         // Make sure is big than 60 seconds
         // Take action 60 seconds before expiry
         seconds -= 60;
@@ -739,24 +750,24 @@ export abstract class CoreApp<
         // Reset last call flag
         // Any success call will update it to true
         // So first time after login will be always silent
-        this._lastCalled = false;
+        this.lastCalled = false;
 
-        this._refreshCountdownSeed = window.setTimeout(() => {
-            if (this._lastCalled) {
+        this.refreshCountdownSeed = window.setTimeout(() => {
+            if (this.lastCalled) {
                 // Call refreshToken to update access token
                 this.refreshToken();
             } else {
                 // Popup countdown for user action
-                this.freshCountdownUI(this.refreshToken);
+                this.freshCountdownUI();
             }
         }, 1000 * seconds);
     }
 
-    private refreshCountdownClear() {
+    protected refreshCountdownClear() {
         // Clear the current timeout seed
-        if (this._refreshCountdownSeed > 0) {
-            window.clearTimeout(this._refreshCountdownSeed);
-            this._refreshCountdownSeed = 0;
+        if (this.refreshCountdownSeed > 0) {
+            window.clearTimeout(this.refreshCountdownSeed);
+            this.refreshCountdownSeed = 0;
         }
     }
 

package/src/app/ExternalSettings.ts

@@ -16,6 +16,16 @@ export interface IExternalSettings {
      * Cloud web url
      */
     readonly webUrl: string;
+
+    /**
+     * Core system Url
+     */
+    readonly coreUrl?: string;
+
+    /**
+     * Core system API
+     */
+    readonly coreApi?: string;
 }
 
 /**

package/src/index.ts

@@ -33,6 +33,10 @@ export * from './i18n/enUS';
 export * from './i18n/zhCN';
 export * from './i18n/zhHK';
 
+// @etsoo/restclient
+export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
+export type { IApi, IApiPayload } from '@etsoo/restclient';
+
 // result
 export * from './result/ActionResult';
 export * from './result/ActionResultError';