Use ViewerImportUrl for updating history, adds more unit tests (#11034)

Co-authored-by: Antoine Beyeler <[email protected]>

Author: Wumpf

crates/store/re_data_source/src/data_source.rs

@@ -15,7 +15,7 @@ pub enum LogDataSource {
     /// Could be either an `.rrd` recording or a `.rbl` blueprint.
     RrdHttpUrl {
         /// This is a canonicalized URL path without any parameters or fragments.
-        url: String,
+        url: url::Url,
 
         /// If `follow` is `true`, the viewer will open the stream in `Following` mode rather than `Playing` mode.
         follow: bool,
@@ -125,14 +125,12 @@ impl LogDataSource {
         } else if let Ok(uri) = url.parse::<re_uri::ProxyUri>() {
             Some(Self::RedapProxy(uri))
         } else {
-            let mut parsed_url = url::Url::parse(url)
+            let url = url::Url::parse(url)
                 .or_else(|_| url::Url::parse(&format!("http://{url}")))
                 .ok()?;
+            let path = url.path();
 
-            // Ignore any parameters, we don't support them for http urls.
-            parsed_url.set_query(None);
-            let url = parsed_url.to_string();
-            (url.ends_with(".rrd") || url.ends_with(".rbl"))
+            (path.ends_with(".rrd") || path.ends_with(".rbl"))
                 .then_some(Self::RrdHttpUrl { url, follow: false })
         }
     }
@@ -156,7 +154,9 @@ impl LogDataSource {
         match self {
             Self::RrdHttpUrl { url, follow } => Ok(
                 re_log_encoding::stream_rrd_from_http::stream_rrd_from_http_to_channel(
-                    url, follow, on_msg,
+                    url.to_string(),
+                    follow,
+                    on_msg,
                 ),
             ),
 

crates/store/re_log_types/src/path/data_path.rs

@@ -23,7 +23,9 @@ pub struct DataPath {
 impl std::fmt::Display for DataPath {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.entity_path.fmt(f)?;
-        if let Some(instance) = &self.instance {
+        if let Some(instance) = &self.instance
+            && instance != &Instance::ALL
+        {
             write!(f, "[#{instance}]")?;
         }
         if let Some(component_descriptor) = &self.component_descriptor {

crates/viewer/re_global_context/src/item.rs

@@ -63,6 +63,34 @@ impl Item {
             }
         }
     }
+
+    /// Converts this item to a data path if possible.
+    pub fn to_data_path(&self) -> Option<DataPath> {
+        match self {
+            Self::AppId(_)
+            | Self::TableId(_)
+            | Self::DataSource(_)
+            | Self::View(_)
+            | Self::Container(_)
+            | Self::StoreId(_)
+            | Self::RedapServer(_)
+            | Self::RedapEntry(_) => None,
+
+            Self::ComponentPath(component_path) => Some(DataPath {
+                entity_path: component_path.entity_path.clone(),
+                instance: None,
+                component_descriptor: Some(component_path.component_descriptor.clone()),
+            }),
+
+            Self::InstancePath(instance_path) | Self::DataResult(_, instance_path) => {
+                Some(DataPath {
+                    entity_path: instance_path.entity_path.clone(),
+                    instance: Some(instance_path.instance),
+                    component_descriptor: None,
+                })
+            }
+        }
+    }
 }
 
 impl From<ViewId> for Item {

crates/viewer/re_viewer/src/app.rs

@@ -648,6 +648,9 @@ impl App {
             }
 
             SystemCommand::AddRedapServer(origin) => {
+                if origin == *re_redap_browser::EXAMPLES_ORIGIN {
+                    return;
+                }
                 if self.state.redap_servers.has_server(&origin) {
                     return;
                 }
@@ -865,7 +868,7 @@ impl App {
         match data_source {
             LogDataSource::RrdHttpUrl { url, follow } => {
                 let new_source = SmartChannelSource::RrdHttpStream {
-                    url: url.clone(),
+                    url: url.to_string(),
                     follow: *follow,
                 };
                 if all_sources.any(|source| source.is_same_ignoring_uri_fragments(&new_source)) {
@@ -3150,7 +3153,13 @@ fn update_web_address_bar(
     if !enable_history {
         return None;
     }
-    let url = crate::open_url::display_mode_to_content_url(store_hub, display_mode)?;
+    let Ok(url) =
+        crate::open_url::ViewerImportUrl::from_display_mode(store_hub, display_mode.clone())
+            // History entries expect the url parameter, not the full url, therefore don't pass a base url.
+            .and_then(|url| url.sharable_url(None))
+    else {
+        return None;
+    };
 
     re_log::debug!("Updating navigation bar");