Add optional viewer url parameter to web app options (#11296)

Author: IsseW

crates/build/re_types_builder/src/codegen/common.rs

@@ -157,7 +157,7 @@ impl<'a> ImageStack<'a> {
 
     /// Set the snippet ID.
     ///
-    /// If set, the resulting `<picture>` element will have the `data-inline-viewr`
+    /// If set, the resulting `<picture>` element will have the `data-inline-viewer`
     /// attribute set with the value of this ID.
     /// `data-inline-viewer` is not set for `<img>` elements.
     #[inline]

crates/viewer/re_viewer/src/app.rs

@@ -630,7 +630,10 @@ impl App {
                 self.go_to_dataset_data(store_id, fragment);
             }
             SystemCommand::CopyViewerUrl(url) => {
-                match combine_with_base_url(web_viewer_base_url().as_ref(), [url]) {
+                match combine_with_base_url(
+                    self.startup_options.web_viewer_base_url().as_ref(),
+                    [url],
+                ) {
                     Ok(url) => {
                         self.copy_text(url);
                     }
@@ -1683,7 +1686,7 @@ impl App {
     }
 
     fn run_copy_link_command(&mut self, content_url: &ViewerOpenUrl) {
-        let base_url = web_viewer_base_url();
+        let base_url = self.startup_options.web_viewer_base_url();
 
         match content_url.sharable_url(base_url.as_ref()) {
             Ok(url) => {
@@ -1857,6 +1860,7 @@ impl App {
 
                         self.state.show(
                             &self.app_env,
+                            &self.startup_options,
                             app_blueprint,
                             ui,
                             render_ctx,
@@ -3243,16 +3247,3 @@ async fn async_save_dialog(
     )?;
     file_handle.write(&bytes).await.context("Failed to save")
 }
-
-pub fn web_viewer_base_url() -> Option<url::Url> {
-    #[cfg(target_arch = "wasm32")]
-    {
-        crate::web_tools::current_base_url().ok()
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        // TODO(RR-1878): Would be great to grab this from the dataplatform when available.
-        url::Url::parse("https://rerun.io/viewer").ok()
-    }
-}

crates/viewer/re_viewer/src/app_state.rs

@@ -25,7 +25,7 @@ use re_viewport_blueprint::ViewportBlueprint;
 use re_viewport_blueprint::ui::add_view_or_container_modal_ui;
 
 use crate::{
-    app::web_viewer_base_url, app_blueprint::AppBlueprint, event::ViewerEventDispatcher,
+    StartupOptions, app_blueprint::AppBlueprint, event::ViewerEventDispatcher,
     navigation::Navigation, open_url_description::ViewerOpenUrlDescription, ui::settings_screen_ui,
 };
 
@@ -159,6 +159,7 @@ impl AppState {
     pub fn show(
         &mut self,
         app_env: &crate::AppEnvironment,
+        startup_options: &StartupOptions,
         app_blueprint: &AppBlueprint<'_>,
         ui: &mut egui::Ui,
         render_ctx: &re_renderer::RenderContext,
@@ -676,7 +677,7 @@ impl AppState {
                 self.redap_servers.modals_ui(&ctx.global_context, ui);
                 self.open_url_modal.ui(ui);
                 self.share_modal
-                    .ui(&ctx, ui, web_viewer_base_url().as_ref());
+                    .ui(&ctx, ui, startup_options.web_viewer_base_url().as_ref());
             }
         }
 

crates/viewer/re_viewer/src/lib.rs

@@ -170,7 +170,7 @@ impl AppEnvironment {
 
     pub fn url(&self) -> Option<&String> {
         match self {
-            Self::Web { url } => Some(url),
+            Self::Web { url, .. } => Some(url),
             _ => None,
         }
     }

crates/viewer/re_viewer/src/startup_options.rs

@@ -78,6 +78,10 @@ pub struct StartupOptions {
     /// open example or redap recording, see [`crate::history`].
     #[cfg(target_arch = "wasm32")]
     pub enable_history: bool,
+
+    /// The base viewer url that's used when sharing a link in this viewer.
+    #[cfg(target_arch = "wasm32")]
+    pub viewer_url: Option<String>,
 }
 
 impl StartupOptions {
@@ -94,6 +98,24 @@ impl StartupOptions {
             false
         }
     }
+
+    /// The url to use for the web viewer when sharing links.
+    #[allow(clippy::unused_self)] // Only used on web.
+    pub fn web_viewer_base_url(&self) -> Option<url::Url> {
+        #[cfg(target_arch = "wasm32")]
+        {
+            self.viewer_url
+                .as_ref()
+                .and_then(|url| url.parse().ok())
+                .or_else(|| crate::web_tools::current_base_url().ok())
+        }
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            // TODO(RR-1878): Would be great to grab this from the dataplatform when available.
+            url::Url::parse("https://rerun.io/viewer").ok()
+        }
+    }
 }
 
 impl Default for StartupOptions {
@@ -130,6 +152,9 @@ impl Default for StartupOptions {
 
             #[cfg(target_arch = "wasm32")]
             enable_history: false,
+
+            #[cfg(target_arch = "wasm32")]
+            viewer_url: None,
         }
     }
 }

crates/viewer/re_viewer/src/web.rs

@@ -661,6 +661,7 @@ impl From<PanelState> for re_types::blueprint::components::PanelState {
 // Keep in sync with the `AppOptions` interface in `rerun_js/web-viewer/index.ts`.
 #[derive(Clone, Default, Deserialize)]
 pub struct AppOptions {
+    viewer_url: Option<String>,
     url: Option<StringOrStringArray>,
     manifest_url: Option<String>,
     render_backend: Option<String>,
@@ -713,11 +714,13 @@ fn create_app(
     app_options: AppOptions,
 ) -> Result<crate::App, re_renderer::RenderContextError> {
     let build_info = re_build_info::build_info!();
+
     let app_env = crate::AppEnvironment::Web {
         url: cc.integration_info.web_info.location.url.clone(),
     };
 
     let AppOptions {
+        viewer_url,
         url,
         manifest_url,
         render_backend,
@@ -781,6 +784,7 @@ fn create_app(
         panel_state_overrides: panel_state_overrides.unwrap_or_default().into(),
 
         enable_history,
+        viewer_url,
     };
     crate::customize_eframe_and_setup_renderer(cc)?;
 

crates/viewer/re_viewer/src/web_tools.rs

@@ -112,7 +112,7 @@ impl Callback {
 }
 
 // Deserializes from JS string or array of strings.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct StringOrStringArray(Vec<String>);
 
 impl StringOrStringArray {

rerun_js/web-viewer/index.ts

@@ -112,6 +112,8 @@ export interface WebViewerOptions {
  * @private
  */
 export interface AppOptions extends WebViewerOptions {
+  /** The url that's used when sharing web viewer urls */
+  viewer_url?: string;
   url?: string;
   manifest_url?: string;
   video_decoder?: VideoDecoder;