From 44e27f706a641ed2953dd170db8a15bd23d7a788 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Mon, 7 Jul 2025 13:29:02 +0500
Subject: [PATCH] Owner UI - further decouple data.py from Blender entities

---
 src/bonsai/bonsai/bim/module/owner/data.py | 14 ++++++--------
 src/bonsai/bonsai/bim/module/owner/ui.py   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/bonsai/bonsai/bim/module/owner/data.py b/src/bonsai/bonsai/bim/module/owner/data.py
index cd3b6db395..b70bddaca4 100644
--- a/src/bonsai/bonsai/bim/module/owner/data.py
+++ b/src/bonsai/bonsai/bim/module/owner/data.py
@@ -144,30 +144,28 @@ class OwnerData:
     @classmethod
     def load(cls):
         cls.data = {
-            "user_person": cls.get_user_person(),
-            "user_organisation": cls.get_user_organisation(),
-            "users": cls.get_users(),
+            "user_person": cls.user_person(),
+            "user_organisation": cls.user_organisation(),
+            "users": cls.users(),
         }
         cls.is_loaded = True
 
     @classmethod
-    def get_user_person(cls) -> tool.Blender.BLENDER_ENUM_ITEMS:
+    def user_person(cls) -> tool.Blender.BLENDER_ENUM_ITEMS:
         return [(str(p.id()), p[0] or "Unnamed", "") for p in tool.Ifc.get().by_type("IfcPerson")]
 
     @classmethod
-    def get_user_organisation(cls) -> tool.Blender.BLENDER_ENUM_ITEMS:
+    def user_organisation(cls) -> tool.Blender.BLENDER_ENUM_ITEMS:
         return [(str(p.id()), p[0] or "Unnamed", "") for p in tool.Ifc.get().by_type("IfcOrganization")]
 
     @classmethod
-    def get_users(cls) -> list[dict[str, Any]]:
-        props = tool.Owner.get_owner_props()
+    def users(cls) -> list[dict[str, Any]]:
         results: list[dict[str, Any]] = []
         for user in tool.Ifc.get().by_type("IfcPersonAndOrganization"):
             results.append(
                 {
                     "id": user.id(),
                     "label": "{} ({})".format(user.ThePerson[0] or "Unnamed", user.TheOrganization[0] or "Unnamed"),
-                    "is_active": props.active_user_id == user.id(),
                 }
             )
         return results
diff --git a/src/bonsai/bonsai/bim/module/owner/ui.py b/src/bonsai/bonsai/bim/module/owner/ui.py
index ed76daae2d..f348804d77 100644
--- a/src/bonsai/bonsai/bim/module/owner/ui.py
+++ b/src/bonsai/bonsai/bim/module/owner/ui.py
@@ -243,7 +243,7 @@ class BIM_PT_owner(bpy.types.Panel):
 
         for user in OwnerData.data["users"]:
             row = self.layout.row(align=True)
-            if user["is_active"]:
+            if props.active_user_id == user["id"]:
                 row.label(text=user["label"], icon="USER")
                 row.operator("bim.clear_user", icon="KEYFRAME", text="").user = user["id"]
             else: