@etsoo/appscript 1.1.44 → 1.1.45

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

@@ -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

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/mjs/app/CoreApp.d.ts

@@ -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

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.44",
+    "version": "1.1.45",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -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();
     }
 
     /**