improvements

Author: jnumainville

plugins/ui/src/deephaven/ui/_internal/RenderContext.py

@@ -455,6 +455,14 @@ def get_href(self) -> str:
         """
         return self._root.get_href()
 
+    def get_base_url(self) -> str:
+        """
+        Get the base URL from the frontend (import.meta.env.BASE_URL).
+        Returns:
+            The base URL string.
+        """
+        return self._root.get_base_url()
+
     def update_url_state(self, query_params: QueryParams) -> None:
         """
         Update the URL query parameters.
@@ -665,6 +673,8 @@ def import_state(self, state: dict[str, Any]) -> None:
             self._root.set_fragment(state.pop("__fragment"))
         if "__href" in state:
             self._root.set_href(state.pop("__href"))
+        if "__baseUrl" in state:
+            self._root.set_base_url(state.pop("__baseUrl"))
 
         if "state" in state:
             for key, value in state["state"].items():

plugins/ui/src/deephaven/ui/_internal/RootRenderContextProtocol.py

@@ -67,3 +67,11 @@ def get_href(self) -> str:
     def set_href(self, href: str) -> None:
         """Update the full URL href."""
         ...
+
+    def get_base_url(self) -> str:
+        """Get the base URL (from import.meta.env.BASE_URL on the frontend)."""
+        ...
+
+    def set_base_url(self, base_url: str) -> None:
+        """Update the base URL."""
+        ...

plugins/ui/src/deephaven/ui/components/router.py

@@ -8,6 +8,7 @@
 from ..hooks.use_path import use_path
 from ..hooks.use_url_components import use_url_components
 from ..types import WidgetPath, EnterpriseWidgetPath, resolve_widget_path
+from .._internal import get_context
 from .make_component import make_component as component
 from .route import _Route
 from .text import text
@@ -98,6 +99,7 @@ def _compile_routes(
     routes: list[_Route],
     parent_path: str,
     current_url_path: str,
+    base_url: str = "/",
 ) -> list[_CompiledRoute]:
     """
     Recursively compile route definitions into a flat list of _CompiledRoute objects.
@@ -106,6 +108,7 @@ def _compile_routes(
         routes: The list of _Route objects to compile.
         parent_path: The accumulated parent path prefix.
         current_url_path: The current absolute URL path (for WidgetPath resolution).
+        base_url: The base URL from the frontend.
 
     Returns:
         A flat list of compiled routes.
@@ -136,7 +139,7 @@ def _compile_routes(
         elif r.path is not None:
             # Resolve WidgetPath / EnterpriseWidgetPath
             if isinstance(r.path, (WidgetPath, EnterpriseWidgetPath)):
-                resolved_path = resolve_widget_path(r.path, current_url_path)
+                resolved_path = resolve_widget_path(r.path, current_url_path, base_url)
             else:
                 path_str = r.path
                 if not path_str.startswith("/"):
@@ -170,13 +173,15 @@ def _compile_routes(
             # Recurse into children
             if r.children:
                 compiled.extend(
-                    _compile_routes(r.children, resolved_path, current_url_path)
+                    _compile_routes(
+                        r.children, resolved_path, current_url_path, base_url
+                    )
                 )
         else:
             # No path and not index — just a grouping node, recurse children
             if r.children:
                 compiled.extend(
-                    _compile_routes(r.children, parent_path, current_url_path)
+                    _compile_routes(r.children, parent_path, current_url_path, base_url)
                 )
 
     return compiled
@@ -237,9 +242,10 @@ def _router_render(*routes: _Route) -> Element:
     path = use_path()
     url_components = use_url_components()
     current_url_path = url_components.path
+    base_url = get_context().get_base_url()
 
     # Compile all routes
-    compiled = _compile_routes(list(routes), "", current_url_path)
+    compiled = _compile_routes(list(routes), "", current_url_path, base_url)
 
     # Match
     matched, params = _match_route(compiled, path)

plugins/ui/src/deephaven/ui/hooks/use_widget_path.py

@@ -2,6 +2,7 @@
 
 from ..types import WidgetPath, EnterpriseWidgetPath, resolve_widget_path
 from .use_url_components import use_url_components
+from .._internal import get_context
 
 
 def use_widget_path(widget_path: WidgetPath | EnterpriseWidgetPath) -> str:
@@ -19,4 +20,5 @@ def use_widget_path(widget_path: WidgetPath | EnterpriseWidgetPath) -> str:
         The resolved absolute URL path string.
     """
     url = use_url_components()
-    return resolve_widget_path(widget_path, url.path)
+    context = get_context()
+    return resolve_widget_path(widget_path, url.path, context.get_base_url())

plugins/ui/src/deephaven/ui/object_types/ElementMessageStream.py

@@ -42,6 +42,7 @@
         "__absolutePath": str,
         "__fragment": str,
         "__href": str,
+        "__baseUrl": str,
     },
     total=False,
 )
@@ -213,6 +214,11 @@ class ElementMessageStream(MessageStream, RootRenderContextProtocol):
     The full URL href, populated from the frontend.
     """
 
+    _base_url: str
+    """
+    The base URL from import.meta.env.BASE_URL on the frontend.
+    """
+
     def __init__(self, element: Element, connection: MessageStream):
         """
         Create a new ElementMessageStream. Renders the element in a render context, and sends the rendered result to the
@@ -234,6 +240,7 @@ def __init__(self, element: Element, connection: MessageStream):
         self._absolute_path = "/"
         self._fragment = ""
         self._href = ""
+        self._base_url = "/"
         self._context = RenderContext(self)
         self._event_context = EventContext(self._send_event)
         self._renderer = Renderer(self._context)
@@ -378,6 +385,12 @@ def get_href(self) -> str:
     def set_href(self, href: str) -> None:
         self._href = href
 
+    def get_base_url(self) -> str:
+        return self._base_url
+
+    def set_base_url(self, base_url: str) -> None:
+        self._base_url = base_url
+
     def start(self) -> None:
         """
         Start the message stream. All we do is send a blank message to start. Client will respond with the initial state.
@@ -492,6 +505,7 @@ def _set_url_state(self, url_state: _UrlState) -> None:
         self.set_absolute_path(url_state.get("__absolutePath", "/"))
         self.set_fragment(url_state.get("__fragment", ""))
         self.set_href(url_state.get("__href", ""))
+        self.set_base_url(url_state.get("__baseUrl", "/"))
         self._mark_dirty()
 
     def _serialize_callables(self, node: Any) -> Any:

plugins/ui/src/deephaven/ui/types/widget_path.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from deephaven.plugin.utilities import is_enterprise_environment
+
 import re
 from dataclasses import dataclass
 from typing import TypedDict, Union
@@ -75,43 +77,27 @@ class NavigationTarget(TypedDict, total=False):
 
 # Patterns for detecting embed/app/iframe routes in a URL path.
 _EMBED_WIDGET_RE = re.compile(r"/embed/widget/")
-_APP_WIDGET_RE = re.compile(r"/app/widget/")
+_DASHBOARD_RE = re.compile(r"/dashboard/")
 _IFRAME_WIDGET_RE = re.compile(r"/iframe/widget/")
 
-# Patterns for extracting the base URL from a path.
-_WIDGET_ROUTE_RE = re.compile(r"^(.*?)(?:/embed/widget/|/app/widget/|/iframe/widget/)")
-
-
 try:
-    from deephaven_enterprise.client.session_manager import (
+    # Import SessionManager for enterprise widget path resolution.
+    from deephaven_enterprise.client.session_manager import (  # pyright: ignore[reportMissingImports]
         SessionManager,
     )
-
-    _has_enterprise = True
 except ImportError:
-    _has_enterprise = False
+    pass
 
 
 def _get_serial_for_name(name: str) -> int:
-    if not _has_enterprise:
+    if not is_enterprise_environment():
         raise RuntimeError(
-            "deephaven_enterprise is required for embed to app path conversion"
+            "deephaven_enterprise is required for embed to dashboard path conversion"
         )
-    sm = SessionManager()
+    sm = SessionManager()  # pyright: ignore[reportUnboundVariable]
     return sm.controller_client.get_serial_for_name(name=name)
 
 
-def _extract_base_url(current_url_path: str) -> str:
-    """
-    Extract the base URL from a URL path by finding the portion before
-    /embed/widget/, /app/widget/, or /iframe/widget/.
-
-    Returns an empty string if no known prefix is found.
-    """
-    m = _WIDGET_ROUTE_RE.match(current_url_path)
-    return m.group(1) if m else ""
-
-
 def _detect_embed(current_url_path: str) -> bool:
     """
     Detect whether the current URL is an embed/iframe route (True) or
@@ -121,26 +107,31 @@ def _detect_embed(current_url_path: str) -> bool:
         current_url_path
     ):
         return True
-    if _APP_WIDGET_RE.search(current_url_path):
+    if _DASHBOARD_RE.search(current_url_path):
         return False
     return True
 
 
 def resolve_widget_path(
     widget_path: WidgetPath | EnterpriseWidgetPath,
     current_url_path: str,
+    base_url: str = "/",
 ) -> str:
     """
     Resolve a WidgetPath or EnterpriseWidgetPath to an absolute URL path string.
 
     Args:
         widget_path: The widget path descriptor.
         current_url_path: The current absolute URL path from the browser.
+        base_url: The base URL from the frontend (import.meta.env.BASE_URL).
+                  Defaults to "/".
 
     Returns:
         The resolved absolute URL path string.
     """
-    base_url = _extract_base_url(current_url_path)
+    # Normalize base_url: ensure no trailing slash for clean concatenation
+    base = base_url.rstrip("/")
+
     embed = widget_path.embed
     if embed is None:
         embed = _detect_embed(current_url_path)
@@ -152,11 +143,9 @@ def resolve_widget_path(
 
     if isinstance(widget_path, WidgetPath):
         if embed:
-            # Non-enterprise embed route
-            path = f"{base_url}/iframe/widget/{widget_path.widget}{local_suffix}"
+            path = f"{base}/iframe/widget/{widget_path.widget}{local_suffix}"
         else:
-            # Non-enterprise app route (future work — use iframe for now)
-            path = f"{base_url}/iframe/widget/{widget_path.widget}{local_suffix}"
+            path = f"{base}{local_suffix}" if local_suffix else (base or "/")
         return path
 
     # EnterpriseWidgetPath
@@ -168,14 +157,14 @@ def resolve_widget_path(
             if widget_path.replica_slot is not None
             else ""
         )
-        path = f"{base_url}/embed/widget/{query_part}/{widget_path.widget}{replica}{local_suffix}"
+        path = f"{base}/embed/widget/{query_part}/{widget_path.widget}{replica}{local_suffix}"
     else:
-        # Enterprise app route: <base>/app/widget/<serial>-<widget>[/local/...]
+        # Enterprise app route: <base>/dashboard/<serial>_<widget>[/local/...]
         query = widget_path.query
         if isinstance(query, str):
             serial = _get_serial_for_name(query)
         else:
             serial = query
-        path = f"{base_url}/app/widget/{serial}-{widget_path.widget}{local_suffix}"
+        path = f"{base}/dashboard/{serial}_{widget_path.widget}{local_suffix}"
 
     return path

plugins/ui/src/js/src/events/Navigate.ts

@@ -19,6 +19,7 @@ export const PATH_PARAM = '__path';
 export const ABSOLUTE_PATH_PARAM = '__absolutePath';
 export const FRAGMENT_PARAM = '__fragment';
 export const HREF_PARAM = '__href';
+export const BASE_URL_PARAM = '__baseUrl';
 
 /** The local path prefix that separates platform routing from user routing. */
 const LOCAL_PREFIX = '/local/';

plugins/ui/src/js/src/widget/WidgetHandler.tsx

@@ -59,6 +59,7 @@ import Navigate, {
   QUERY_PARAM,
   PATH_PARAM,
   ABSOLUTE_PATH_PARAM,
+  BASE_URL_PARAM,
   FRAGMENT_PARAM,
   HREF_PARAM,
   getLocalPath,
@@ -177,6 +178,7 @@ function WidgetHandler({
       [ABSOLUTE_PATH_PARAM]: window.location.pathname,
       [FRAGMENT_PARAM]: window.location.hash.replace(/^#/, ''),
       [HREF_PARAM]: window.location.href,
+      [BASE_URL_PARAM]: import.meta.env.BASE_URL,
     };
   }, []);