From f2b91572b163099b29c940cf6fe5814a047fdc51 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Wed, 31 Aug 2022 16:15:58 +0200 Subject: [proxy] make information about mapping version being frozen available to UI code --- src/hydrilla/proxy/state_impl/items.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/hydrilla/proxy/state_impl') diff --git a/src/hydrilla/proxy/state_impl/items.py b/src/hydrilla/proxy/state_impl/items.py index b538dc5..ddfef7c 100644 --- a/src/hydrilla/proxy/state_impl/items.py +++ b/src/hydrilla/proxy/state_impl/items.py @@ -128,6 +128,7 @@ class ConcreteMappingRef(st.MappingRef): ive.active, ive.is_orphan, ive.is_local, + ms.frozen, ms.enabled FROM item_versions_extra AS ive @@ -147,7 +148,7 @@ class ConcreteMappingRef(st.MappingRef): for (item_version_id, definition, repo, repo_iteration, installed_status, active_status, is_orphan, is_local, - enabled_status) in rows: + frozen_status, enabled_status) in rows: ref = ConcreteMappingVersionRef(str(item_version_id), self.state) item_info = item_infos.MappingInfo.load( @@ -163,7 +164,8 @@ class ConcreteMappingRef(st.MappingRef): active = st.ActiveStatus(active_status), is_orphan = is_orphan, is_local = is_local, - mapping_enabled = st.EnabledStatus(enabled_status) + mapping_enabled = st.EnabledStatus(enabled_status), + mapping_frozen = st.FrozenStatus.make(frozen_status) ) result.append(display_info) @@ -195,7 +197,8 @@ class ConcreteMappingStore(st.MappingStore): ive.active, ive.is_orphan, ive.is_local, - ms.enabled + ms.enabled, + ms.frozen FROM items AS i JOIN mapping_statuses AS ms @@ -213,7 +216,7 @@ class ConcreteMappingStore(st.MappingStore): for (item_id, identifier, item_version_id, definition, repo, repo_iteration, installed_status, active_status, is_orphan, - is_local, enabled_status) in rows: + is_local, enabled_status, frozen_status) in rows: ref = ConcreteMappingRef(str(item_id), self.state) active_version: t.Optional[st.MappingVersionDisplayInfo] = None @@ -237,14 +240,15 @@ class ConcreteMappingStore(st.MappingStore): active = st.ActiveStatus(active_status), is_orphan = is_orphan, is_local = is_local, - mapping_enabled = st.EnabledStatus(enabled_status) + mapping_enabled = st.EnabledStatus(enabled_status), + mapping_frozen = st.FrozenStatus.make(frozen_status) ) - display_info = st.MappingDisplayInfo( ref = ref, identifier = identifier, enabled = st.EnabledStatus(enabled_status), + frozen = st.FrozenStatus.make(frozen_status), active_version = active_version ) -- cgit v1.2.3