1 files changed, 12 insertions, 10 deletions
diff --git a/src/hydrilla/proxy/state.py b/src/hydrilla/proxy/state.py
index f882b2d..03b6291 100644
--- a/src/hydrilla/proxy/state.py
+++ b/src/hydrilla/proxy/state.py
@@ -227,6 +227,10 @@ class MappingDisplayInfo(item_infos.CorrespondsToMappingDCMixin):
     active_version: t.Optional['MappingVersionDisplayInfo']
 
 @dc.dataclass(frozen=True)
+class RichMappingDisplayInfo(MappingDisplayInfo):
+    all_versions: t.Sequence['MappingVersionDisplayInfo']
+
+@dc.dataclass(frozen=True)
 class MappingVersionDisplayInfo(item_infos.CorrespondsToMappingDCMixin):
     ref:             'MappingVersionRef'
     info:            item_infos.MappingInfo
@@ -234,8 +238,6 @@ class MappingVersionDisplayInfo(item_infos.CorrespondsToMappingDCMixin):
     active:          ActiveStatus
     is_orphan:       bool
     is_local:        bool
-    mapping_enabled: EnabledStatus
-    mapping_frozen:  t.Optional[FrozenStatus]
 
 @dc.dataclass(frozen=True, unsafe_hash=True) # type: ignore[misc]
 class MappingRef(Ref, item_infos.CorrespondsToMappingDCMixin):
@@ -249,8 +251,7 @@ class MappingRef(Ref, item_infos.CorrespondsToMappingDCMixin):
         ...
 
     @abstractmethod
-    def get_version_display_infos(self) \
-        -> t.Sequence[MappingVersionDisplayInfo]:
+    def get_display_info(self) -> RichMappingDisplayInfo:
         ...
 
 
@@ -278,8 +279,7 @@ class MappingVersionRef(Ref, item_infos.CorrespondsToMappingDCMixin):
         ...
 
     @abstractmethod
-    def get_all_version_display_infos(self) \
-        -> t.Sequence[MappingVersionDisplayInfo]:
+    def get_item_display_info(self) -> RichMappingDisplayInfo:
         ...
 
 class MappingVersionStore(Store[MappingVersionRef]):
@@ -292,6 +292,10 @@ class ResourceDisplayInfo(item_infos.CorrespondsToResourceDCMixin):
     identifier:     str
 
 @dc.dataclass(frozen=True)
+class RichResourceDisplayInfo(ResourceDisplayInfo):
+    all_versions: t.Sequence['ResourceVersionDisplayInfo']
+
+@dc.dataclass(frozen=True)
 class ResourceVersionDisplayInfo(item_infos.CorrespondsToResourceDCMixin):
     ref:             'ResourceVersionRef'
     info:            item_infos.ResourceInfo
@@ -303,8 +307,7 @@ class ResourceVersionDisplayInfo(item_infos.CorrespondsToResourceDCMixin):
 @dc.dataclass(frozen=True, unsafe_hash=True) # type: ignore[misc]
 class ResourceRef(Ref, item_infos.CorrespondsToResourceDCMixin):
     @abstractmethod
-    def get_version_display_infos(self) \
-        -> t.Sequence[ResourceVersionDisplayInfo]:
+    def get_display_info(self) -> RichResourceDisplayInfo:
         ...
 
 class ResourceStore(Store[ResourceRef]):
@@ -324,8 +327,7 @@ class ResourceVersionRef(Ref, item_infos.CorrespondsToResourceDCMixin):
         ...
 
     @abstractmethod
-    def get_all_version_display_infos(self) \
-        -> t.Sequence[ResourceVersionDisplayInfo]:
+    def get_item_display_info(self) -> RichResourceDisplayInfo:
         ...
 
 class ResourceVersionStore(Store[ResourceVersionRef]):