Fix workspace selection and secret modal layout

crates/crank-registry/src/postgres/auth.rs

@@ -272,17 +272,23 @@ impl PostgresRegistry {
         };
         let memberships = self.list_workspaces_for_user(&user_id).await?;
         let stored_workspace_id = row.current_workspace_id.map(WorkspaceId::new);
-        let current_workspace_id = stored_workspace_id
-            .filter(|workspace_id| {
-                memberships
-                    .iter()
-                    .any(|membership| membership.workspace.id == *workspace_id)
-            })
-            .or_else(|| {
-                memberships
-                    .first()
-                    .map(|membership| membership.workspace.id.clone())
-            });
+        let default_workspace_id = memberships
+            .iter()
+            .find(|membership| membership.workspace.id.as_str() == "ws_default")
+            .map(|membership| membership.workspace.id.clone());
+        let current_workspace_id = default_workspace_id.or_else(|| {
+            stored_workspace_id
+                .filter(|workspace_id| {
+                    memberships
+                        .iter()
+                        .any(|membership| membership.workspace.id == *workspace_id)
+                })
+                .or_else(|| {
+                    memberships
+                        .first()
+                        .map(|membership| membership.workspace.id.clone())
+                })
+        });
 
         Ok(Some(SessionRecord {
             session_id: UserSessionId::new(row.id),

crates/crank-registry/src/postgres/workspace.rs

@@ -38,22 +38,22 @@ impl PostgresRegistry {
         &self,
         user_id: &UserId,
     ) -> Result<Vec<WorkspaceMembershipRecord>, RegistryError> {
-        let rows = sqlx::query!(
+        let rows = sqlx::query(
             "select
                 w.id,
                 w.slug,
                 w.display_name,
                 w.status,
                 w.settings_json,
-                w.created_at as \"created_at!: time::OffsetDateTime\",
-                w.updated_at as \"updated_at!: time::OffsetDateTime\",
+                w.created_at,
+                w.updated_at,
                 m.role
              from memberships m
              join workspaces w on w.id = m.workspace_id
              where m.user_id = $1
-             order by w.slug asc",
-            user_id.as_str(),
+             order by (w.id = 'ws_default') desc, w.slug asc",
         )
+        .bind(user_id.as_str())
         .fetch_all(&self.pool)
         .await?;
 
@@ -61,15 +61,18 @@ impl PostgresRegistry {
             .map(|row| {
                 Ok(WorkspaceMembershipRecord {
                     workspace: Workspace {
-                        id: WorkspaceId::new(row.id),
-                        slug: row.slug,
-                        display_name: row.display_name,
-                        status: deserialize_enum_text(&row.status, "status")?,
-                        settings: row.settings_json,
-                        created_at: row.created_at,
-                        updated_at: row.updated_at,
+                        id: WorkspaceId::new(row.try_get::<String, _>("id")?),
+                        slug: row.try_get("slug")?,
+                        display_name: row.try_get("display_name")?,
+                        status: deserialize_enum_text(
+                            &row.try_get::<String, _>("status")?,
+                            "status",
+                        )?,
+                        settings: row.try_get("settings_json")?,
+                        created_at: row.try_get("created_at")?,
+                        updated_at: row.try_get("updated_at")?,
                     },
-                    role: deserialize_enum_text(&row.role, "role")?,
+                    role: deserialize_enum_text(&row.try_get::<String, _>("role")?, "role")?,
                 })
             })
             .collect()