@vertesia/ui 1.3.0-dev.20260620.091720Z → 1.3.0-dev.20260621.091702Z

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertesia/ui",
-  "version": "1.3.0-dev.20260620.091720Z",
+  "version": "1.3.0-dev.20260621.091702Z",
   "description": "Vertesia UI components and and hooks",
   "type": "module",
   "main": "./lib/index.js",
@@ -90,10 +90,10 @@
     "vega": "^6.2.0",
     "vega-embed": "^7.1.0",
     "vega-lite": "^6.4.3",
-    "@vertesia/client": "1.3.0-dev.20260620.091720Z",
-    "@vertesia/common": "1.3.0-dev.20260620.091720Z",
-    "@vertesia/json": "1.3.0-dev.20260620.091720Z",
-    "@vertesia/fusion-ux": "1.3.0-dev.20260620.091720Z"
+    "@vertesia/client": "1.3.0-dev.20260621.091702Z",
+    "@vertesia/fusion-ux": "1.3.0-dev.20260621.091702Z",
+    "@vertesia/json": "1.3.0-dev.20260621.091702Z",
+    "@vertesia/common": "1.3.0-dev.20260621.091702Z"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.3",
@@ -185,7 +185,7 @@
     "url": "https://github.com/vertesia/composableai.git",
     "directory": "packages/ui"
   },
-  "gitHead": "1a76be81111643b66a7b11be9f328d159f1de4fc",
+  "gitHead": "0db27f8c9a71f3675a455c167e8b88c4d5f41e11",
   "scripts": {
     "build": "rm -rf ./lib ./tsconfig.tsbuildinfo && tsc --build && pnpm exec rollup -c",
     "lint": "biome lint src && pnpm run check:rtl-classes",

package/src/router/Router.tsx

@@ -1,7 +1,7 @@
 import { createContext, useContext, useEffect } from 'react';
 import { HistoryNavigator, type LocationChangeEvent, type NavigateOptions } from './HistoryNavigator';
 import { type PathMatch, PathMatcher } from './PathMatcher';
-import { isRootPath, joinPath, type PathMatchParams, stripMountBasename } from './path';
+import { getMountBasename, isRootPath, joinPath, type PathMatchParams, stripMountBasename } from './path';
 
 export type RouteComponentProps = PathMatchParams;
 export type LazyRouteModule = { default: React.ComponentType<Record<string, never>> };
@@ -186,8 +186,12 @@ export function useNavigate() {
 }
 
 export function useRouterBasePath() {
-    const { matchedRoutePath, router } = useRouterContext();
-    return router instanceof NestedRouter ? router.basePath : matchedRoutePath;
+    const { router } = useRouterContext();
+    // For a nested router the base is its mount segment within the parent. For a top-level router the
+    // base is the served `<base href>` mount prefix (empty for the origin-served Studio UI) — NOT the
+    // matched route, so apps can build mount-correct sibling links (e.g. `${base}/assistant`) and
+    // compare them against the full `useLocation().pathname`, which carries the mount.
+    return router instanceof NestedRouter ? router.basePath : getMountBasename();
 }
 
 type UseParamsReturn<T> = T extends string ? string : Record<string, string>;

package/src/session/UserSession.ts

@@ -5,7 +5,7 @@ import { jwtDecode } from 'jwt-decode';
 import { createContext, useContext } from 'react';
 
 import { getComposableToken } from './auth/composable';
-import { authReturnUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
+import { authReturnUrl, mountRootUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
 import { getFirebaseAuth } from './auth/firebase';
 
 import { LastSelectedAccountId_KEY, LastSelectedProjectId_KEY } from './constants';
@@ -168,12 +168,13 @@ class UserSession {
             this.authToken = undefined;
             this.setSession = undefined;
             this.client.withAuthCallback(undefined);
-            // Navigate to root to avoid React rendering errors when
+            // Navigate to the app root to avoid React rendering errors when
             // unmounting deeply nested route components during logout.
-            // Only navigate if user was actually logged in to avoid
-            // infinite reload loop on fresh/incognito sessions.
+            // Use the mount root (not bare '/') so a gateway-mounted app stays
+            // on its mount. Only navigate if user was actually logged in to
+            // avoid an infinite reload loop on fresh/incognito sessions.
             if (wasLoggedIn) {
-                location.replace('/');
+                location.replace(mountRootUrl().toString());
             }
         }
     }
@@ -188,7 +189,9 @@ class UserSession {
             }
         }
 
-        window.location.replace(`/?a=${targetAccountId}`);
+        const url = mountRootUrl();
+        url.searchParams.set('a', targetAccountId);
+        window.location.replace(url.toString());
     }
 
     async switchProject(targetProjectId: string) {
@@ -196,7 +199,12 @@ class UserSession {
             localStorage.setItem(`${LastSelectedProjectId_KEY}-${this.account.id}`, targetProjectId);
         }
 
-        window.location.replace(`/?a=${this.account?.id}&p=${targetProjectId}`);
+        const url = mountRootUrl();
+        if (this.account?.id) {
+            url.searchParams.set('a', this.account.id);
+        }
+        url.searchParams.set('p', targetProjectId);
+        window.location.replace(url.toString());
     }
 
     async fetchAccounts() {

package/src/session/auth/domainRouting.test.ts

@@ -1,9 +1,15 @@
 import { afterEach, describe, expect, it } from 'vitest';
-import { shouldRedirectToCentralAuth, shouldUseFirebaseAuth } from './domainRouting';
+import { mountRootUrl, shouldRedirectToCentralAuth, shouldUseFirebaseAuth } from './domainRouting';
+
+// Stub document.baseURI to simulate the served `<base href>` (deep gateway mount) or its absence.
+function setBaseURI(baseURI: string) {
+    (globalThis as { document?: unknown }).document = { baseURI };
+}
 
 describe('domainRouting', () => {
     afterEach(() => {
         delete (globalThis as { window?: unknown }).window;
+        delete (globalThis as { document?: unknown }).document;
     });
 
     it("uses Firebase auth when AUTH_MODE is 'firebase'", () => {
@@ -23,4 +29,25 @@ describe('domainRouting', () => {
         expect(shouldUseFirebaseAuth()).toBe(false);
         expect(shouldRedirectToCentralAuth()).toBe(true);
     });
+
+    describe('mountRootUrl', () => {
+        it('returns the deep gateway mount root (dropping any deep route / query / hash)', () => {
+            const mount = 'https://gw.example.com/tenants/05948c_5ed5f4/apps/furniture-catalog/versions/v1/app/';
+            setBaseURI(mount);
+            expect(mountRootUrl().toString()).toBe(mount);
+        });
+
+        it('strips an existing query and hash so callers control the reload target', () => {
+            setBaseURI('https://gw.example.com/tenants/t/apps/a/versions/v/app/');
+            const url = mountRootUrl();
+            url.searchParams.set('a', 'acct1');
+            url.searchParams.set('p', 'proj1');
+            expect(url.toString()).toBe('https://gw.example.com/tenants/t/apps/a/versions/v/app/?a=acct1&p=proj1');
+        });
+
+        it('is the origin root for the Studio UI (no <base> element)', () => {
+            setBaseURI('https://studio.vertesia.io/');
+            expect(mountRootUrl().toString()).toBe('https://studio.vertesia.io/');
+        });
+    });
 });

package/src/session/auth/domainRouting.ts

@@ -33,3 +33,19 @@ export function authReturnUrl(): URL {
     target.hash = '';
     return target;
 }
+
+/**
+ * The app's mount root URL — the served `<base href>` (or the origin root for the Studio UI).
+ *
+ * Used for full-reload navigations that intentionally reset to the app root (logout, account /
+ * project switch). Building these from a bare `/` drops a gateway-mounted app off its mount and
+ * lands on a URL that serves no app; resolving against `document.baseURI` keeps the reload inside
+ * the mount. For the Studio UI (no `<base>` element) `document.baseURI` is the origin root, so the
+ * behavior is unchanged.
+ */
+export function mountRootUrl(): URL {
+    const url = new URL(document.baseURI);
+    url.hash = '';
+    url.search = '';
+    return url;
+}

package/src/shell/login/SigninScreen.tsx

@@ -88,7 +88,15 @@ function SigninScreenImpl({
 
     useEffect(() => {
         if (!preservePath) {
-            history.replaceState({}, '', '/');
+            // Reset to the app's mount root, not the bare origin. A gateway-mounted app carries a
+            // served `<base href>` deep mount; collapsing to '/' drops the app off that mount (the
+            // bare origin serves no app) and the address bar can no longer be reloaded. This effect
+            // also flashes briefly for already-authenticated users during the loading transition, so
+            // a bare '/' here loses the URL even on a normal login. Deriving the root from
+            // `document.baseURI` keeps it inside the mount; for the origin-served Studio UI the
+            // pathname is '/', so the behavior is unchanged.
+            const mountRoot = new URL(document.baseURI).pathname || '/';
+            history.replaceState({}, '', mountRoot);
         }
     }, [preservePath]);