Basic ability to show components that only differ by archetype/field name on same entity (#9877)

Author: Wumpf

crates/store/re_entity_db/src/instance_path.rs

@@ -100,11 +100,13 @@ impl FromStr for InstancePath {
         let DataPath {
             entity_path,
             instance,
-            component_name,
+            component_descriptor,
         } = DataPath::from_str(s)?;
 
-        if let Some(component_name) = component_name {
-            return Err(PathParseError::UnexpectedComponentName(component_name));
+        if let Some(component_descriptor) = component_descriptor {
+            return Err(PathParseError::UnexpectedComponentDescriptor(
+                component_descriptor,
+            ));
         }
 
         let instance = instance.unwrap_or(Instance::ALL);

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

@@ -1,4 +1,4 @@
-use re_types_core::ComponentName;
+use re_types_core::{ComponentDescriptor, ComponentName};
 
 use crate::path::EntityPath;
 
@@ -11,16 +11,16 @@ pub struct ComponentPath {
     /// `camera / "left" / points / #42`
     pub entity_path: EntityPath,
 
-    /// "color"
-    pub component_name: ComponentName,
+    /// e.g. `Points3D:Color#color`
+    pub component_descriptor: ComponentDescriptor,
 }
 
 impl ComponentPath {
     #[inline]
-    pub fn new(entity_path: EntityPath, component_name: ComponentName) -> Self {
+    pub fn new(entity_path: EntityPath, component_descriptor: ComponentDescriptor) -> Self {
         Self {
             entity_path,
-            component_name,
+            component_descriptor,
         }
     }
 
@@ -30,16 +30,21 @@ impl ComponentPath {
     }
 
     #[inline]
-    pub fn component_name(&self) -> &ComponentName {
-        &self.component_name
+    pub fn component_name(&self) -> ComponentName {
+        self.component_descriptor.component_name
+    }
+
+    #[inline]
+    pub fn component_descriptor(&self) -> &ComponentDescriptor {
+        &self.component_descriptor
     }
 }
 
 impl std::fmt::Display for ComponentPath {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.entity_path.fmt(f)?;
         f.write_str(":")?;
-        self.component_name.fmt(f)?;
+        self.component_descriptor.fmt(f)?;
         Ok(())
     }
 }

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

@@ -1,11 +1,11 @@
-use re_types_core::ComponentName;
+use re_types_core::ComponentDescriptor;
 
 use crate::{EntityPath, Instance};
 
 /// A general path to some data.
 ///
 /// This always starts with an [`EntityPath`], followed by an optional instance index,
-/// followed by an optional [`ComponentName`].
+/// followed by an optional [`ComponentDescriptor`].
 ///
 /// For instance:
 ///
@@ -17,7 +17,7 @@ use crate::{EntityPath, Instance};
 pub struct DataPath {
     pub entity_path: EntityPath,
     pub instance: Option<Instance>,
-    pub component_name: Option<ComponentName>,
+    pub component_descriptor: Option<ComponentDescriptor>,
 }
 
 impl std::fmt::Display for DataPath {
@@ -26,8 +26,8 @@ impl std::fmt::Display for DataPath {
         if let Some(instance) = &self.instance {
             write!(f, "[#{instance}]")?;
         }
-        if let Some(component_name) = &self.component_name {
-            write!(f, ":{component_name:?}")?;
+        if let Some(component_descriptor) = &self.component_descriptor {
+            write!(f, ":{component_descriptor:?}")?;
         }
         Ok(())
     }