@etsoo/react 1.5.8 → 1.5.12

package/lib/app/ReactApp.d.ts

@@ -108,6 +108,19 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @returns Parsed Url
+     */
+    protected getHostUrl(url: string): string;
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @param name App name in the host environment
+     * @returns Parsed Url
+     */
+    protected getHostUrlBase(url: string, name: string): string;
     /**
      * Override alert action result
      * @param result Action result

package/lib/app/ReactApp.js

@@ -67,7 +67,7 @@ export class ReactApp extends CoreApp {
         this.userState = new UserState();
         this.history =
             window.location.hostname === ''
-                ? Utils.getMemoryHistory()
+                ? Utils.getMemoryHistory(this.getHostUrl(window.location.href))
                 : undefined;
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState();
@@ -91,6 +91,31 @@ export class ReactApp extends CoreApp {
         ReactApp._notifierProvider = NotifierMU.setup();
         return NotifierMU.instance;
     }
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @returns Parsed Url
+     */
+    getHostUrl(url) {
+        return this.getHostUrlBase(url, 'core');
+    }
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @param name App name in the host environment
+     * @returns Parsed Url
+     */
+    getHostUrlBase(url, name) {
+        if (url.startsWith('/'))
+            return url;
+        const identifier = `/${name}/`;
+        const pos = url.indexOf(identifier);
+        if (pos === -1)
+            return '/';
+        return url
+            .substring(pos + identifier.length - 1)
+            .replace('/index.html', '/'); // Router take / as start
+    }
     /**
      * Override alert action result
      * @param result Action result

package/lib/app/ServiceApp.d.ts

@@ -32,6 +32,12 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @returns Parsed Url
+     */
+    protected getHostUrl(url: string): string;
     /**
      * Go to the login page
      * @param tryLogin Try to login again

package/lib/app/ServiceApp.js

@@ -39,6 +39,14 @@ export class ServiceApp extends ReactApp {
     set serviceUser(value) {
         this._serviceUser = value;
     }
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @returns Parsed Url
+     */
+    getHostUrl(url) {
+        return this.getHostUrlBase(url, 's' + this.settings.serviceId);
+    }
     /**
      * Go to the login page
      * @param tryLogin Try to login again

package/lib/app/Utils.d.ts

@@ -12,9 +12,10 @@ export declare namespace Utils {
     function formatInputValue(value: unknown): string | number | any[] | undefined;
     /**
      * Get memory history
+     * @param initialPath Initial path
      * @returns History
      */
-    function getMemoryHistory(): History;
+    function getMemoryHistory(initialPath?: string): History;
     /**
      * Is safe click
      * @param event Mouse event

package/lib/app/Utils.js

@@ -26,11 +26,12 @@ export var Utils;
     Utils.formatInputValue = formatInputValue;
     /**
      * Get memory history
+     * @param initialPath Initial path
      * @returns History
      */
-    function getMemoryHistory() {
+    function getMemoryHistory(initialPath = '/') {
         if (memoryHistory == null) {
-            memoryHistory = createHistory(createMemorySource('/'));
+            memoryHistory = createHistory(createMemorySource(initialPath));
         }
         return memoryHistory;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.8",
+    "version": "1.5.12",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.47",
+        "@etsoo/appscript": "^1.2.48",
         "@etsoo/notificationbase": "^1.1.1",
         "@etsoo/shared": "^1.1.11",
         "@mui/icons-material": "^5.4.1",

package/src/app/ReactApp.ts

@@ -223,7 +223,7 @@ export class ReactApp<
         );
         this.history =
             window.location.hostname === ''
-                ? Utils.getMemoryHistory()
+                ? Utils.getMemoryHistory(this.getHostUrl(window.location.href))
                 : undefined;
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState<P>();
@@ -231,6 +231,33 @@ export class ReactApp<
         globalApp = this;
     }
 
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @returns Parsed Url
+     */
+    protected getHostUrl(url: string) {
+        return this.getHostUrlBase(url, 'core');
+    }
+
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @param name App name in the host environment
+     * @returns Parsed Url
+     */
+    protected getHostUrlBase(url: string, name: string) {
+        if (url.startsWith('/')) return url;
+
+        const identifier = `/${name}/`;
+        const pos = url.indexOf(identifier);
+        if (pos === -1) return '/';
+
+        return url
+            .substring(pos + identifier.length - 1)
+            .replace('/index.html', '/'); // Router take / as start
+    }
+
     /**
      * Override alert action result
      * @param result Action result

package/src/app/ServiceApp.ts

@@ -68,6 +68,15 @@ export class ServiceApp<
         this.serviceApi = api;
     }
 
+    /**
+     * Get parsed Url under bridge host
+     * @param url Url
+     * @returns Parsed Url
+     */
+    protected override getHostUrl(url: string) {
+        return this.getHostUrlBase(url, 's' + this.settings.serviceId);
+    }
+
     /**
      * Go to the login page
      * @param tryLogin Try to login again

package/src/app/Utils.ts

@@ -28,11 +28,12 @@ export namespace Utils {
 
     /**
      * Get memory history
+     * @param initialPath Initial path
      * @returns History
      */
-    export function getMemoryHistory() {
+    export function getMemoryHistory(initialPath: string = '/') {
         if (memoryHistory == null) {
-            memoryHistory = createHistory(createMemorySource('/'));
+            memoryHistory = createHistory(createMemorySource(initialPath));
         }
         return memoryHistory;
     }