starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-06 00:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show the fork banner to a superadmin who is not a workspace member (#10465)

Browse Source 
* fix: show the fork banner to a superadmin who is not a workspace member

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* fix: scope the non-member workspace cache to the current workspace

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* fix: make the non-member workspace cache own exactly one workspace

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* fix: drop the non-member workspace cache when no workspace is open

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ruben Fiszel
2026-08-03 19:13:12 +02:00
committed by GitHub
co-authored by Claude Opus 5
parent 4f03aa91a7
commit 3cef678b5f
11 changed files with 463 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-api-workspaces/src/workspaces.rs
+19 -5
View File
@@ -247,6 +247,8 @@ struct Workspace {
premium: bool,
color: Option<String>,
parent_workspace_id: Option<String>,
is_dev_workspace: bool,
dev_workspace_label: Option<String>,
}
#[derive(FromRow, Serialize, Debug)]
@@ -749,7 +751,7 @@ async fn list_workspaces(
let mut tx = user_db.begin(&authed).await?;
let workspaces = sqlx::query_as!(
Workspace,
"SELECT workspace.id, workspace.name, workspace.owner, workspace.deleted, workspace.premium, workspace_settings.color, workspace.parent_workspace_id
"SELECT workspace.id, workspace.name, workspace.owner, workspace.deleted, workspace.premium, workspace_settings.color, workspace.parent_workspace_id, workspace.is_dev_workspace, workspace.dev_workspace_label
FROM workspace
LEFT JOIN workspace_settings ON workspace.id = workspace_settings.workspace_id
JOIN usr ON usr.workspace_id = workspace.id
@@ -4827,7 +4829,9 @@ async fn get_workspace_as_superadmin(
workspace.deleted AS \"deleted!\",
workspace.premium AS \"premium!\",
workspace_settings.color AS \"color\",
workspace.parent_workspace_id AS \"parent_workspace_id\"
workspace.parent_workspace_id AS \"parent_workspace_id\",
workspace.is_dev_workspace AS \"is_dev_workspace!\",
workspace.dev_workspace_label AS \"dev_workspace_label\"
FROM workspace
LEFT JOIN workspace_settings ON workspace.id = workspace_settings.workspace_id
WHERE workspace.id = $1",
@@ -4861,7 +4865,9 @@ async fn list_workspaces_as_super_admin(
workspace.deleted AS \"deleted!\",
workspace.premium AS \"premium!\",
workspace_settings.color AS \"color\",
workspace.parent_workspace_id AS \"parent_workspace_id\"
workspace.parent_workspace_id AS \"parent_workspace_id\",
workspace.is_dev_workspace AS \"is_dev_workspace!\",
workspace.dev_workspace_label AS \"dev_workspace_label\"
FROM workspace
LEFT JOIN workspace_settings ON workspace.id = workspace_settings.workspace_id
LIMIT $1 OFFSET $2",
@@ -5966,7 +5972,14 @@ async fn clone_scripts(
.execute(&mut **tx)
.await?;
clear_orphaned_compat_address(tx, "script", "hash", source_workspace_id, target_workspace_id).await?;
clear_orphaned_compat_address(
tx,
"script",
"hash",
source_workspace_id,
target_workspace_id,
)
.await?;
Ok(())
}
@@ -6204,7 +6217,8 @@ async fn clone_flows(
.execute(&mut **tx)
.await?;
clear_orphaned_compat_address(tx, "flow", "path", source_workspace_id, target_workspace_id).await?;
clear_orphaned_compat_address(tx, "flow", "path", source_workspace_id, target_workspace_id)
.await?;
// Then clone flow versions
let flow_versions = sqlx::query!(