@etsoo/appscript 1.2.93 → 1.2.95

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

@@ -8,7 +8,7 @@ import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
-import { IApp, IAppFields, IDetectIPCallback, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
 /**
  * Core application interface
@@ -407,14 +407,15 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
     /**
-     * Callback where exit a page
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    pageExit(): void;
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
-     * Redirect to the Url
-     * @param url Url
+     * Callback where exit a page
      */
-    redirectTo(url: string): void;
+    pageExit(): void;
     /**
      * Refresh countdown
      * @param seconds Seconds

package/lib/cjs/app/CoreApp.js

@@ -978,6 +978,31 @@ class CoreApp {
             return true;
         return false;
     }
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate(to, options) {
+        if (typeof to === 'number') {
+            globalThis.history.go(to);
+        }
+        else {
+            const { state, replace = false } = options !== null && options !== void 0 ? options : {};
+            if (replace) {
+                if (state)
+                    globalThis.history.replaceState(state, '', to);
+                else
+                    globalThis.location.replace(to);
+            }
+            else {
+                if (state)
+                    globalThis.history.pushState(state, '', to);
+                else
+                    globalThis.location.assign(to);
+            }
+        }
+    }
     /**
      * Callback where exit a page
      */
@@ -985,13 +1010,6 @@ class CoreApp {
         var _a;
         (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
     }
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url) {
-        globalThis.location.href = url;
-    }
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -1089,8 +1107,8 @@ class CoreApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const url = this.settings.homepage + '/' + (tryLogin ? '' : '?tryLogin=false');
-        this.redirectTo(url);
+        const url = '/' + (tryLogin ? '' : '?tryLogin=false');
+        this.navigate(url);
     }
     /**
      * Try login, returning false means is loading

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

@@ -13,6 +13,13 @@ import { UserRole } from './UserRole';
 export interface IDetectIPCallback {
     (): void;
 }
+/**
+ * Navigate options
+ */
+export interface NavigateOptions {
+    replace?: boolean;
+    state?: any;
+}
 /**
  * Refresh token result type
  * true means success, false means failed but no any message
@@ -335,6 +342,12 @@ export interface IApp {
      * @param password Input password
      */
     isValidPassword(password: string): boolean;
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Callback where exit a page
      */
@@ -359,11 +372,6 @@ export interface IApp {
      * Persist settings to source when application exit
      */
     persist(): void;
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url: string): void;
     /**
      * Switch organization
      * @param id Organization id

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

@@ -8,7 +8,7 @@ import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
-import { IApp, IAppFields, IDetectIPCallback, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
 /**
  * Core application interface
@@ -407,14 +407,15 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
     /**
-     * Callback where exit a page
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    pageExit(): void;
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
-     * Redirect to the Url
-     * @param url Url
+     * Callback where exit a page
      */
-    redirectTo(url: string): void;
+    pageExit(): void;
     /**
      * Refresh countdown
      * @param seconds Seconds

package/lib/mjs/app/CoreApp.js

@@ -975,6 +975,31 @@ export class CoreApp {
             return true;
         return false;
     }
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate(to, options) {
+        if (typeof to === 'number') {
+            globalThis.history.go(to);
+        }
+        else {
+            const { state, replace = false } = options !== null && options !== void 0 ? options : {};
+            if (replace) {
+                if (state)
+                    globalThis.history.replaceState(state, '', to);
+                else
+                    globalThis.location.replace(to);
+            }
+            else {
+                if (state)
+                    globalThis.history.pushState(state, '', to);
+                else
+                    globalThis.location.assign(to);
+            }
+        }
+    }
     /**
      * Callback where exit a page
      */
@@ -982,13 +1007,6 @@ export class CoreApp {
         var _a;
         (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
     }
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url) {
-        globalThis.location.href = url;
-    }
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -1086,8 +1104,8 @@ export class CoreApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const url = this.settings.homepage + '/' + (tryLogin ? '' : '?tryLogin=false');
-        this.redirectTo(url);
+        const url = '/' + (tryLogin ? '' : '?tryLogin=false');
+        this.navigate(url);
     }
     /**
      * Try login, returning false means is loading

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

@@ -13,6 +13,13 @@ import { UserRole } from './UserRole';
 export interface IDetectIPCallback {
     (): void;
 }
+/**
+ * Navigate options
+ */
+export interface NavigateOptions {
+    replace?: boolean;
+    state?: any;
+}
 /**
  * Refresh token result type
  * true means success, false means failed but no any message
@@ -335,6 +342,12 @@ export interface IApp {
      * @param password Input password
      */
     isValidPassword(password: string): boolean;
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Callback where exit a page
      */
@@ -359,11 +372,6 @@ export interface IApp {
      * Persist settings to source when application exit
      */
     persist(): void;
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url: string): void;
     /**
      * Switch organization
      * @param id Organization id

package/package.json

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

package/src/app/CoreApp.ts

@@ -46,6 +46,7 @@ import {
     IApp,
     IAppFields,
     IDetectIPCallback,
+    NavigateOptions,
     RefreshTokenProps,
     RefreshTokenResult
 } from './IApp';
@@ -1304,18 +1305,34 @@ export abstract class CoreApp<
     }
 
     /**
-     * Callback where exit a page
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    pageExit() {
-        this.lastWarning?.dismiss();
+    navigate<T extends number | string | URL>(
+        to: T,
+        options?: T extends number ? never : NavigateOptions
+    ) {
+        if (typeof to === 'number') {
+            globalThis.history.go(to);
+        } else {
+            const { state, replace = false } = options ?? {};
+
+            if (replace) {
+                if (state) globalThis.history.replaceState(state, '', to);
+                else globalThis.location.replace(to);
+            } else {
+                if (state) globalThis.history.pushState(state, '', to);
+                else globalThis.location.assign(to);
+            }
+        }
     }
 
     /**
-     * Redirect to the Url
-     * @param url Url
+     * Callback where exit a page
      */
-    redirectTo(url: string): void {
-        globalThis.location.href = url;
+    pageExit() {
+        this.lastWarning?.dismiss();
     }
 
     /**
@@ -1437,9 +1454,8 @@ export abstract class CoreApp<
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean) {
-        const url =
-            this.settings.homepage + '/' + (tryLogin ? '' : '?tryLogin=false');
-        this.redirectTo(url);
+        const url = '/' + (tryLogin ? '' : '?tryLogin=false');
+        this.navigate(url);
     }
 
     /**

package/src/app/IApp.ts

@@ -21,6 +21,14 @@ export interface IDetectIPCallback {
     (): void;
 }
 
+/**
+ * Navigate options
+ */
+export interface NavigateOptions {
+    replace?: boolean;
+    state?: any;
+}
+
 /**
  * Refresh token result type
  * true means success, false means failed but no any message
@@ -437,6 +445,16 @@ export interface IApp {
      */
     isValidPassword(password: string): boolean;
 
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate<T extends number | string | URL>(
+        to: T,
+        options?: T extends number ? never : NavigateOptions
+    ): void;
+
     /**
      * Callback where exit a page
      */
@@ -471,12 +489,6 @@ export interface IApp {
      */
     persist(): void;
 
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url: string): void;
-
     /**
      * Switch organization
      * @param id Organization id