Elgato_dark/cli
1
0
Fork 0
mirror of https://github.com/railwayapp/cli synced 2026-04-21 14:07:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: dedupe workspaces in list output (#852)

Browse source 
Workspaces returned by `me.workspaces` and `externalWorkspaces` can
overlap when a user has both workspace membership and project-level
access to the same workspace, causing duplicates in `railway list`,
`railway project list`, and `railway whoami --json`. Dedupe by id
while merging, preferring the Member variant (richer data).

Closes #844, #831.
This commit is contained in:
Mahmoud Abdelwahab 2026-04-21 15:52:26 +02:00 committed by GitHub
parent 6cd0335391
commit 8b13b75256
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/workspace.rs
View file

@ -1,5 +1,6 @@
use chrono::{DateTime, Utc};
use serde::Serialize;
use std::collections::HashSet;
use std::fmt::Display;
use super::{
@ -17,18 +18,22 @@ pub async fn workspaces() -> Result<Vec<Workspace>> {
let response =
post_graphql::<queries::UserProjects, _>(&client, configs.get_backboard(), vars).await?;
// Member variants are yielded first so that a workspace the user both owns
// and is an external member of keeps the richer Member representation.
let mut seen: HashSet<String> = HashSet::new();
let mut workspaces: Vec<Workspace> = response
.me
.workspaces
.into_iter()
.map(Workspace::Member)
.chain(
response
.external_workspaces
.into_iter()
.map(Workspace::External),
)
.filter(|w| seen.insert(w.id().to_string()))
.collect();
workspaces.extend(
response
.external_workspaces
.into_iter()
.map(Workspace::External),
);
workspaces.sort_by(|a, b| b.id().cmp(a.id()));
Ok(workspaces)
}