@etsoo/appscript 1.2.91 → 1.2.93

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

@@ -458,12 +458,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean): void;
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/lib/cjs/app/CoreApp.js

@@ -990,7 +990,7 @@ class CoreApp {
      * @param url Url
      */
     redirectTo(url) {
-        window.location.href = url;
+        globalThis.location.href = url;
     }
     /**
      * Refresh countdown
@@ -1089,31 +1089,9 @@ class CoreApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const url = this.transformUrl('/' + (tryLogin ? '' : '?tryLogin=false'));
+        const url = this.settings.homepage + '/' + (tryLogin ? '' : '?tryLogin=false');
         this.redirectTo(url);
     }
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url) {
-        // Home page for the router
-        const home = this.settings.homepage;
-        // Default, just leave it
-        if (home === '')
-            return url;
-        // From relative root, like home:/react/, url: /about => /react/about
-        if (url.startsWith('/'))
-            return home + url.substring(1);
-        const pathname = window.location.pathname;
-        // Relative
-        const pos = pathname.indexOf(home);
-        if (pos == -1)
-            return url;
-        // To /a/b/../ => /a
-        return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
-    }
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

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

@@ -375,12 +375,6 @@ export interface IApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean): void;
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

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

@@ -458,12 +458,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean): void;
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/lib/mjs/app/CoreApp.js

@@ -987,7 +987,7 @@ export class CoreApp {
      * @param url Url
      */
     redirectTo(url) {
-        window.location.href = url;
+        globalThis.location.href = url;
     }
     /**
      * Refresh countdown
@@ -1086,31 +1086,9 @@ export class CoreApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const url = this.transformUrl('/' + (tryLogin ? '' : '?tryLogin=false'));
+        const url = this.settings.homepage + '/' + (tryLogin ? '' : '?tryLogin=false');
         this.redirectTo(url);
     }
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url) {
-        // Home page for the router
-        const home = this.settings.homepage;
-        // Default, just leave it
-        if (home === '')
-            return url;
-        // From relative root, like home:/react/, url: /about => /react/about
-        if (url.startsWith('/'))
-            return home + url.substring(1);
-        const pathname = window.location.pathname;
-        // Relative
-        const pos = pathname.indexOf(home);
-        if (pos == -1)
-            return url;
-        // To /a/b/../ => /a
-        return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
-    }
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

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

@@ -375,12 +375,6 @@ export interface IApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean): void;
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.91",
+    "version": "1.2.93",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -53,26 +53,26 @@
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.7",
-        "@etsoo/restclient": "^1.0.71",
-        "@etsoo/shared": "^1.1.55",
+        "@etsoo/restclient": "^1.0.73",
+        "@etsoo/shared": "^1.1.57",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.18.10",
-        "@babel/core": "^7.19.0",
-        "@babel/plugin-transform-runtime": "^7.18.10",
-        "@babel/preset-env": "^7.19.0",
-        "@babel/runtime-corejs3": "^7.19.0",
-        "@types/jest": "^29.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.36.2",
-        "@typescript-eslint/parser": "^5.36.2",
+        "@babel/core": "^7.19.1",
+        "@babel/plugin-transform-runtime": "^7.19.1",
+        "@babel/preset-env": "^7.19.1",
+        "@babel/runtime-corejs3": "^7.19.1",
+        "@types/jest": "^29.0.3",
+        "@typescript-eslint/eslint-plugin": "^5.37.0",
+        "@typescript-eslint/parser": "^5.37.0",
         "eslint": "^8.23.1",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.0.3",
         "jest-environment-jsdom": "^29.0.3",
-        "ts-jest": "^29.0.0",
+        "ts-jest": "^29.0.1",
         "typescript": "^4.8.3"
     }
 }

package/src/app/CoreApp.ts

@@ -1315,7 +1315,7 @@ export abstract class CoreApp<
      * @param url Url
      */
     redirectTo(url: string): void {
-        window.location.href = url;
+        globalThis.location.href = url;
     }
 
     /**
@@ -1437,37 +1437,11 @@ export abstract class CoreApp<
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean) {
-        const url = this.transformUrl(
-            '/' + (tryLogin ? '' : '?tryLogin=false')
-        );
+        const url =
+            this.settings.homepage + '/' + (tryLogin ? '' : '?tryLogin=false');
         this.redirectTo(url);
     }
 
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url: string) {
-        // Home page for the router
-        const home = this.settings.homepage;
-
-        // Default, just leave it
-        if (home === '') return url;
-
-        // From relative root, like home:/react/, url: /about => /react/about
-        if (url.startsWith('/')) return home + url.substring(1);
-
-        const pathname = window.location.pathname;
-
-        // Relative
-        const pos = pathname.indexOf(home);
-        if (pos == -1) return url;
-
-        // To /a/b/../ => /a
-        return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
-    }
-
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/src/app/IApp.ts

@@ -490,13 +490,6 @@ export interface IApp {
      */
     toLoginPage(tryLogin?: boolean): void;
 
-    /**
-     * Transform URL
-     * @param url URL
-     * @returns Transformed url
-     */
-    transformUrl(url: string): string;
-
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended