Fix workspace selection and secret modal layout

2026-06-22 18:30:56 +00:00
parent 3472d06a70
commit 5f8149d0d1
14 changed files with 286 additions and 43 deletions
@@ -99,15 +99,21 @@ impl AdminService {
            .registry
            .list_workspaces_for_user(&authenticated.user.id)
            .await?;
-        let current_workspace_id = authenticated
-            .current_workspace_id
-            .as_ref()
-            .map(|workspace_id| workspace_id.as_str().to_owned())
-            .or_else(|| {
-                memberships
-                    .first()
-                    .map(|membership| membership.workspace.id.as_str().to_owned())
-            });
+        let default_workspace_id = memberships
+            .iter()
+            .find(|membership| membership.workspace.id.as_str() == "ws_default")
+            .map(|membership| membership.workspace.id.as_str().to_owned());
+        let current_workspace_id = default_workspace_id.or_else(|| {
+            authenticated
+                .current_workspace_id
+                .as_ref()
+                .map(|workspace_id| workspace_id.as_str().to_owned())
+                .or_else(|| {
+                    memberships
+                        .first()
+                        .map(|membership| membership.workspace.id.as_str().to_owned())
+                })
+        });
        let current_workspace_ref = current_workspace_id
            .as_ref()
            .map(|workspace_id| WorkspaceId::new(workspace_id.clone()));