@etsoo/appscript 1.1.44 → 1.1.48

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

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

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

@@ -182,7 +182,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -278,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
@@ -414,7 +415,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/app/CoreApp.js

@@ -32,38 +32,11 @@ class CoreApp {
          * Token refresh count down seed
          */
         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));
-            }
-        };
         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);
@@ -103,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

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

@@ -24,12 +24,11 @@ export interface IExternalSettings {
     readonly coreApi?: string;
 }
 /**
- * External settings host
- * Usually passed by window global settings property
+ * External settings namespace
  */
-export interface IExternalSettingsHost {
+export declare namespace ExternalSettings {
     /**
-     * Configurable API settings
+     * Create instance
      */
-    readonly settings: IExternalSettings;
+    function Create(): IExternalSettings | undefined;
 }

package/lib/cjs/app/ExternalSettings.js

@@ -1,2 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExternalSettings = void 0;
+/**
+ * External settings namespace
+ */
+var ExternalSettings;
+(function (ExternalSettings) {
+    /**
+     * Create instance
+     */
+    function Create() {
+        if ('settings' in globalThis) {
+            const settings = Reflect.get(globalThis, 'settings');
+            if (typeof settings === 'object') {
+                if (typeof window !== 'undefined') {
+                    const hostname = window.location.hostname;
+                    // replace {hostname}
+                    for (const key in settings) {
+                        const value = settings[key];
+                        if (typeof value === 'string') {
+                            settings[key] = value.replace('{hostname}', hostname);
+                        }
+                    }
+                }
+                return settings;
+            }
+        }
+        return undefined;
+    }
+    ExternalSettings.Create = Create;
+})(ExternalSettings = exports.ExternalSettings || (exports.ExternalSettings = {}));

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

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

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

@@ -182,7 +182,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -278,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
@@ -414,7 +415,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/app/CoreApp.js

@@ -29,38 +29,11 @@ export class CoreApp {
          * Token refresh count down seed
          */
         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));
-            }
-        };
         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);
@@ -100,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

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

@@ -24,12 +24,11 @@ export interface IExternalSettings {
     readonly coreApi?: string;
 }
 /**
- * External settings host
- * Usually passed by window global settings property
+ * External settings namespace
  */
-export interface IExternalSettingsHost {
+export declare namespace ExternalSettings {
     /**
-     * Configurable API settings
+     * Create instance
      */
-    readonly settings: IExternalSettings;
+    function Create(): IExternalSettings | undefined;
 }

package/lib/mjs/app/ExternalSettings.js

@@ -1 +1,29 @@
-export {};
+/**
+ * External settings namespace
+ */
+export var ExternalSettings;
+(function (ExternalSettings) {
+    /**
+     * Create instance
+     */
+    function Create() {
+        if ('settings' in globalThis) {
+            const settings = Reflect.get(globalThis, 'settings');
+            if (typeof settings === 'object') {
+                if (typeof window !== 'undefined') {
+                    const hostname = window.location.hostname;
+                    // replace {hostname}
+                    for (const key in settings) {
+                        const value = settings[key];
+                        if (typeof value === 'string') {
+                            settings[key] = value.replace('{hostname}', hostname);
+                        }
+                    }
+                }
+                return settings;
+            }
+        }
+        return undefined;
+    }
+    ExternalSettings.Create = Create;
+})(ExternalSettings || (ExternalSettings = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.44",
+    "version": "1.1.48",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.93",
         "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.73"
+        "@etsoo/shared": "^1.0.75"
     },
     "devDependencies": {
         "@babel/cli": "^7.16.0",
@@ -62,14 +62,14 @@
         "@babel/plugin-transform-runtime": "^7.16.4",
         "@babel/preset-env": "^7.16.4",
         "@babel/runtime-corejs3": "^7.16.3",
-        "@types/jest": "^27.0.2",
+        "@types/jest": "^27.0.3",
         "@typescript-eslint/eslint-plugin": "^5.4.0",
         "@typescript-eslint/parser": "^5.4.0",
-        "eslint": "^8.2.0",
+        "eslint": "^8.3.0",
         "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"
+        "typescript": "^4.5.2"
     }
 }

package/src/app/AppSettings.ts

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

package/src/app/CoreApp.ts

@@ -244,7 +244,7 @@ export interface ICoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
 
     /**
      * User logout
@@ -385,17 +385,34 @@ 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;
         };
@@ -412,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();
     }
 
     /**
@@ -825,7 +829,7 @@ export abstract class CoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep: boolean = false) {
+    userLogin(user: IUserData, refreshToken: string, keep: boolean = false) {
         this.userData = user;
         this.authorize(user.token, refreshToken, keep);
     }

package/src/app/ExternalSettings.ts

@@ -29,12 +29,33 @@ export interface IExternalSettings {
 }
 
 /**
- * External settings host
- * Usually passed by window global settings property
+ * External settings namespace
  */
-export interface IExternalSettingsHost {
+export namespace ExternalSettings {
     /**
-     * Configurable API settings
+     * Create instance
      */
-    readonly settings: IExternalSettings;
+    export function Create(): IExternalSettings | undefined {
+        if ('settings' in globalThis) {
+            const settings = Reflect.get(globalThis, 'settings');
+            if (typeof settings === 'object') {
+                if (typeof window !== 'undefined') {
+                    const hostname = window.location.hostname;
+                    // replace {hostname}
+                    for (const key in settings) {
+                        const value = settings[key];
+                        if (typeof value === 'string') {
+                            settings[key] = value.replace(
+                                '{hostname}',
+                                hostname
+                            );
+                        }
+                    }
+                }
+
+                return settings as IExternalSettings;
+            }
+        }
+        return undefined;
+    }
 }