Merge pull request #286 from specklesystems/bilal/cnx-2013-implement-workspace-dropdown

Bilal/cnx 2013 implement workspace dropdown

Author: dogukankaratas

bpy_speckle/__init__.py

@@ -89,6 +89,12 @@
     unregister as unregister_speckle_state,
 )
 
+
+from .connector.ui.workspace_selection_dialog import (
+    SPECKLE_OT_workspace_selection_dialog,
+    SPECKLE_UL_workspaces_list,
+)
+
 # Utils
 from .connector.ui.account_selection_dialog import (
     SPECKLE_OT_account_selection_dialog,
@@ -104,7 +110,7 @@ def invoke_window_manager_properties():
     WindowManager.speckle_workspaces = bpy.props.CollectionProperty(
         type=speckle_workspace
     )
-    WindowManager.selected_workspace_id = bpy.props.StringProperty()
+    WindowManager.selected_workspace = bpy.props.PointerProperty(type=speckle_workspace)
     WindowManager.can_create_project_in_workspace = bpy.props.BoolProperty()
     # Projects
     WindowManager.speckle_projects = bpy.props.CollectionProperty(type=speckle_project)
@@ -163,6 +169,8 @@ def invoke_window_manager_properties():
     SPECKLE_OT_create_project,
     SPECKLE_OT_create_model,
     speckle_account,
+    SPECKLE_UL_workspaces_list,
+    SPECKLE_OT_workspace_selection_dialog,
     SPECKLE_OT_account_selection_dialog,
     SPECKLE_UL_accounts_list,
 )

bpy_speckle/connector/blender_operators/create_project.py

@@ -26,8 +26,8 @@ def execute(self, context: Context) -> set[str]:
             wm.selected_account_id,
             self.project_name,
             None
-            if wm.selected_workspace_id == "personal"
-            else wm.selected_workspace_id,
+            if wm.selected_workspace.id == "personal"
+            else wm.selected_workspace.id,
         )
         wm.selected_project_id = project_id
         wm.selected_project_name = project_name

bpy_speckle/connector/ui/account_selection_dialog.py

@@ -6,7 +6,7 @@
     speckle_account,
     speckle_workspace,
     get_workspaces,
-    get_default_workspace_id,
+    get_active_workspace,
     get_account_from_id,
 )
 from ..utils.project_manager import get_projects_for_account
@@ -123,15 +123,15 @@ def update_workspaces_list(context: Context) -> None:
         workspace: speckle_workspace = wm.speckle_workspaces.add()
         workspace.id = id
         workspace.name = name
-    wm.selected_workspace_id = get_default_workspace_id(wm.selected_account_id)
+    wm.selected_workspace.id = get_active_workspace(wm.selected_account_id)["id"]
     print("Updated Workspaces List!")
 
 
 def update_projects_list(context: Context) -> None:
     wm = context.window_manager
     wm.speckle_projects.clear()
     projects: List[Tuple[str, str, str, str, bool]] = get_projects_for_account(
-        wm.selected_account_id, workspace_id=wm.selected_workspace_id
+        wm.selected_account_id, workspace_id=wm.selected_workspace.id
     )
     for name, role, updated, id, can_receive in projects:
         project: speckle_project = wm.speckle_projects.add()

bpy_speckle/connector/ui/project_selection_dialog.py

@@ -7,24 +7,14 @@
     get_workspaces,
     speckle_workspace,
     can_create_project_in_workspace,
+    get_active_workspace,
     get_default_account_id,
     get_account_from_id,
 )
 from ..utils.project_manager import get_projects_for_account
 from ..utils.property_groups import speckle_project
 
 
-def get_workspaces_callback(self, context):
-    """
-    Callback to dynamically fetch workspace enum items.
-    """
-    wm = context.window_manager
-    return [
-        (workspace.id, workspace.name, "", "WORKSPACE", i)
-        for i, workspace in enumerate(wm.speckle_workspaces)
-    ]
-
-
 class SPECKLE_UL_projects_list(bpy.types.UIList):
     """
     UIList for displaying a list of Speckle projects
@@ -74,16 +64,16 @@ def update_projects_list(self, context: Context) -> None:
         """
         wm = context.window_manager
 
-        wm.selected_workspace_id = self.workspaces
+
         wm.can_create_project_in_workspace = can_create_project_in_workspace(
-            wm.selected_account_id, self.workspaces
+            wm.selected_account_id, wm.selected_workspace.id
         )
         wm.speckle_projects.clear()
 
         # get projects for the selected account, using search if provided
         search = self.search_query if self.search_query.strip() else None
         projects: List[Tuple[str, str, str, str, bool]] = get_projects_for_account(
-            wm.selected_account_id, search=search, workspace_id=self.workspaces
+            wm.selected_account_id, search=search, workspace_id=wm.selected_workspace.id
         )
 
         for name, role, updated, id, can_receive in projects:
@@ -103,13 +93,6 @@ def update_projects_list(self, context: Context) -> None:
         update=update_projects_list,
     )
 
-    workspaces: bpy.props.EnumProperty(  # type: ignore
-        name="Workspace",
-        description="Selected workspace to filter projects by",
-        items=get_workspaces_callback,
-        update=update_projects_list,
-    )
-
     project_index: bpy.props.IntProperty(name="Project Index", default=0)  # type: ignore
 
     def execute(self, context: Context) -> set[str]:
@@ -138,25 +121,16 @@ def invoke(self, context: Context, event: Event) -> set[str]:
 
         # Clear existing projects
         wm.speckle_projects.clear()
-        wm.speckle_workspaces.clear()
 
         if wm.selected_account_id == "":
             wm.selected_account_id = get_default_account_id()
 
-        # Fetch workspaces from server
-        for id, name in get_workspaces(wm.selected_account_id):
-            workspace: speckle_workspace = wm.speckle_workspaces.add()
-            workspace.id = id
-            workspace.name = name
-        selected_workspace_id = self.workspaces
-        wm.selected_workspace_id = selected_workspace_id
-        wm.can_create_project_in_workspace = can_create_project_in_workspace(
-            wm.selected_account_id, selected_workspace_id
-        )
+        wm.selected_workspace.id = get_active_workspace(wm.selected_account_id)["id"]
+        wm.selected_workspace.name = get_active_workspace(wm.selected_account_id)["name"]
 
         # Fetch projects from server
         projects: List[Tuple[str, str, str, str, bool]] = get_projects_for_account(
-            wm.selected_account_id, workspace_id=selected_workspace_id
+            wm.selected_account_id, wm.selected_workspace.id
         )
 
         for name, role, updated, id, can_receive in projects:
@@ -190,8 +164,11 @@ def draw(self, context: Context) -> None:
             )
             # Workspace selection
             row = layout.row()
-            if wm.selected_workspace_id != "NO_WORKSPACES":
-                row.prop(self, "workspaces", text="")
+            row.operator(
+                "speckle.workspace_selection_dialog",
+                icon="WORKSPACE",
+                text=wm.selected_workspace.name,
+            )
 
             # Search field
             row = layout.row(align=True)

bpy_speckle/connector/ui/workspace_selection_dialog.py

@@ -0,0 +1,108 @@
+import bpy
+from bpy.types import Context, UILayout, Event, PropertyGroup
+from typing import List, Tuple
+from ..utils.account_manager import get_workspaces, speckle_workspace
+from ..utils.project_manager import get_projects_for_account
+from ..utils.account_manager import can_create_project_in_workspace
+
+
+class SPECKLE_UL_workspaces_list(bpy.types.UIList):
+    """
+    UIList for workspaces
+    """
+
+    def draw_item(
+        self,
+        context: Context,
+        layout: UILayout,
+        data: PropertyGroup,
+        item: PropertyGroup,
+        icon: str,
+        active_data: PropertyGroup,
+        active_propname: str,
+    ) -> None:
+        if self.layout_type in {"DEFAULT", "COMPACT"}:
+            row = layout.row(align=True)
+            row.label(text=item.name)
+
+        elif self.layout_type == "GRID":
+            layout.alignment = "CENTER"
+            layout.label(text=item.name)
+
+
+class SPECKLE_OT_workspace_selection_dialog(bpy.types.Operator):
+    """
+    Operator for selecting a workspace
+    """
+
+    bl_idname = "speckle.workspace_selection_dialog"
+    bl_label = "Select Workspace"
+    bl_description = "Select a workspace to load projects from"
+
+    workspace_index: bpy.props.IntProperty(name="Workspace Index", default=0)  # type: ignore
+
+    def invoke(self, context: Context, event: Event) -> set[str]:
+        wm = context.window_manager
+        wm.speckle_workspaces.clear()
+        workspaces: List[Tuple[str, str]] = get_workspaces(wm.selected_account_id)
+        current_workspace_index = 0
+        for i, (id, name) in enumerate(workspaces):
+            workspace: speckle_workspace = wm.speckle_workspaces.add()
+            workspace.id = id
+            workspace.name = name
+            if id == wm.selected_workspace.id:
+                current_workspace_index = i
+        self.workspace_index = current_workspace_index
+        return context.window_manager.invoke_props_dialog(self)
+
+    def draw(self, context: Context) -> None:
+        layout: UILayout = self.layout
+        wm = context.window_manager
+        layout.label(text=f"Selected Workspace: {wm.selected_workspace.name}")
+        layout.template_list(
+            "SPECKLE_UL_workspaces_list",
+            "",
+            context.window_manager,
+            "speckle_workspaces",
+            self,
+            "workspace_index",
+        )
+
+    def execute(self, context: Context) -> set[str]:
+        wm = context.window_manager
+        if 0 <= self.workspace_index < len(wm.speckle_workspaces):
+            selected_workspace = wm.speckle_workspaces[self.workspace_index]
+            wm.selected_workspace.id = selected_workspace.id
+            wm.selected_workspace.name = selected_workspace.name
+            update_projects_list(context)
+            context.area.tag_redraw()
+        return {"FINISHED"}
+
+
+def update_projects_list(context):
+    """Update projects list when workspace changes"""
+
+    wm = context.window_manager
+    wm.speckle_projects.clear()
+
+    # get projects for the selected account and workspace
+    projects = get_projects_for_account(
+        wm.selected_account_id, wm.selected_workspace.id
+    )
+
+    for name, role, updated, id, can_receive in projects:
+        project = wm.speckle_projects.add()
+        project.name = name
+        project.role = role
+        project.updated = updated
+        project.id = id
+        project.can_receive = can_receive
+
+    # Update can_create_project_in_workspace flag
+    wm.can_create_project_in_workspace = can_create_project_in_workspace(
+        wm.selected_account_id, wm.selected_workspace.id
+    )
+    print(f"Workspace changed to: {wm.selected_workspace.id}")
+    print("Projects list updated")
+
+    context.area.tag_redraw()

bpy_speckle/connector/utils/account_manager.py

@@ -1,6 +1,6 @@
 import bpy
 from specklepy.core.api.credentials import get_local_accounts
-from typing import List, Tuple, Optional
+from typing import List, Tuple, Optional, Dict
 from specklepy.core.api.credentials import Account
 from specklepy.core.api.client import SpeckleClient
 from specklepy.core.api.wrapper import StreamWrapper
@@ -99,18 +99,17 @@ def get_server_url_by_account_id(account_id: str) -> Optional[str]:
     return None
 
 
-def get_default_workspace_id(account_id: str) -> Optional[str]:
+def get_active_workspace(account_id: str) -> Optional[Dict[str, str]]:
     """
     retrieves the ID of the default workspace for a given account ID
     """
     account = next((acc for acc in get_local_accounts() if acc.id == account_id), None)
     client = SpeckleClient(host=account.serverInfo.url)
     client.authenticate_with_account(account)
-    return (
-        client.active_user.get_active_workspace().id
-        if client.active_user.get_active_workspace()
-        else "personal"
-    )
+    active_workspace = client.active_user.get_active_workspace()
+    if active_workspace:
+        return {"id": active_workspace.id, "name": active_workspace.name}
+    return {"id": "personal", "name": "Personal Projects"}
 
 
 def get_account_from_id(account_id: str) -> Optional[Account]: