From 23fbf1edfe62339eaff2b576aeea32d81e37d97b Mon Sep 17 00:00:00 2001 From: hugocasa Date: Mon, 2 Nov 2026 16:00:50 +0100 Subject: [PATCH] feat: publish a folder sub-path to the Hub as its own project (#12081) * feat: accept nested folder paths for Hub project publish and import A Hub project can be published from, and imported into, a sub-path of a folder (`hub/billing`, i.e. items under `f/hub/billing/...`). The backend folder check and the import wizard's folder check accept `/`-separated segments; an import into a nested destination creates only the base folder. Co-Authored-By: Claude Opus 5.5 * docs: describe nested folder source keys on HubPublishCtx Co-Authored-By: Claude Opus 5.5 * feat: choose a folder sub-path when publishing to or importing from the Hub Publishing keeps each item's sub-path under the project slug instead of flattening items outside `f//` to their last segment, so a nested source folder is bundled like a root one. The publish drawer gets a scope select listing the folder's sub-paths, and the import wizard an optional sub-path field next to the folder picker. A nested project's name defaults to its last segment. Co-Authored-By: Claude Opus 5.5 * feat: pick the Hub publish scope from a folder tree, drop nested import Co-Authored-By: Claude Opus 5.5 * feat: show sub-folders already published to the Hub in the publish drawer Co-Authored-By: Claude Opus 5.5 * feat: open the Hub publish drawer on the folder's projects, tree only for a new one Co-Authored-By: Claude Opus 5.5 * fix: let the last sub-folder become a Hub project and keep other projects' items out of updates Co-Authored-By: Claude Opus 5.5 * fix: open sub-folder Hub projects from a list and block only nested projects on update Co-Authored-By: Claude Opus 5.5 * refactor: render the Hub project list with ListRow Co-Authored-By: Claude Opus 5.5 * revert: keep the Hub project list as bordered card rows like the drawer's other lists Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- backend/windmill-api/src/hub_publish.rs | 44 +++- .../components/WorkspaceDeployLayout.svelte | 207 ++++++++++++------ .../lib/components/home/TreeOwnerRow.svelte | 9 + .../src/lib/components/home/TreeView.svelte | 23 +- .../lib/components/home/TreeViewRoot.svelte | 10 +- .../workspaceSettings/DeployToHub.svelte | 180 ++++++++++++++- .../deployToHubItems.test.ts | 25 +++ .../workspaceSettings/deployToHubItems.ts | 34 +++ .../deployToHubSession.svelte.ts | 143 ++++++++++-- .../workspaceSettings/projectBundle.test.ts | 14 ++ .../workspaceSettings/projectBundle.ts | 26 ++- 11 files changed, 606 insertions(+), 109 deletions(-) diff --git a/backend/windmill-api/src/hub_publish.rs b/backend/windmill-api/src/hub_publish.rs index 4e79aba943..64154c3764 100644 --- a/backend/windmill-api/src/hub_publish.rs +++ b/backend/windmill-api/src/hub_publish.rs @@ -57,12 +57,16 @@ struct HubScope { folder: Option, } +/// A base folder name, or one followed by `/`-separated sub-path segments +/// (`hub/billing`): every segment non-empty, so no leading, trailing or doubled `/`. fn validate_folder(folder: &str) -> Result<(), Error> { - let ok = !folder.is_empty() - && folder.len() <= 255 - && folder - .bytes() - .all(|b| b.is_ascii_alphanumeric() || b == b'_' || b == b'-'); + let ok = folder.len() <= 255 + && folder.split('/').all(|seg| { + !seg.is_empty() + && seg + .bytes() + .all(|b| b.is_ascii_alphanumeric() || b == b'_' || b == b'-') + }); if ok { Ok(()) } else { @@ -118,10 +122,11 @@ impl std::fmt::Display for ProjectSlug { /// Handlers can only reach the Hub via this extractor's methods, so a new /// endpoint cannot forget the admin check or folder validation. /// -/// A workspace can publish one Hub project per folder. The stable, never-mutated -/// link key is `workspace_id:folder_name` (folder name is the path segment and is +/// A workspace can publish one Hub project per folder or folder sub-path. The +/// stable, never-mutated link key is `workspace_id:folder` (`folder` is the base +/// folder name, optionally followed by `/`-separated sub-path segments, and is /// never renamed — only display_name changes). `:` is safe: neither workspace ids -/// nor folder names (alphanumeric, underscore, hyphen) contain it. +/// nor folder paths (alphanumeric, underscore, hyphen, `/`) contain it. struct HubPublishCtx { source_id: Option, token: String, @@ -740,7 +745,28 @@ async fn forward_to_hub( #[cfg(test)] mod tests { - use super::is_public_hub; + use super::{is_public_hub, validate_folder}; + + #[test] + fn folder_accepts_nested_sub_paths() { + for ok in ["hub", "my-folder_2", "hub/billing", "hub/billing/v-2"] { + assert!(validate_folder(ok).is_ok(), "{ok} should be valid"); + } + let too_long = format!("a/{}", "b".repeat(254)); + for bad in [ + "", + "/hub", + "hub/", + "hub//billing", + "hub/../x", + "hub/./x", + "hub/bil ling", + "hub\\billing", + too_long.as_str(), + ] { + assert!(validate_folder(bad).is_err(), "{bad} should be rejected"); + } + } #[test] fn public_hub_recognized_in_every_spelling() { diff --git a/frontend/src/lib/components/WorkspaceDeployLayout.svelte b/frontend/src/lib/components/WorkspaceDeployLayout.svelte index 62894ea508..1cd1f858f2 100644 --- a/frontend/src/lib/components/WorkspaceDeployLayout.svelte +++ b/frontend/src/lib/components/WorkspaceDeployLayout.svelte @@ -1,3 +1,7 @@ + + +{#snippet itemRow(item: DeployableItem, depth: number, subPath: string)} + {@const isSelectable = selectablePredicate(item)} + {@const isSelected = selectedItems.includes(item.key)} + {@const status = deploymentStatus[item.key]} + {@const isDeployed = status?.status === 'deployed'} + {@const blockedReason = !isSelectable && !isDeployed ? selectBlockedReason?.(item) : undefined} + + {@const showPath = + isAgent?.(item) || + (item.kind !== 'resource' && item.kind !== 'variable' && item.kind !== 'resource_type')} + + handleSelect(item)} + path={showPath ? item.path : ''} + marked={undefined} + kind={isAgent?.(item) ? 'agent' : item.kind} + triggerKind={item.triggerKind} + canFavorite={false} + workspaceId="" + {depth} + > + {#snippet customSummary()} + {#if itemSummary} + {@render itemSummary(item)} + {:else} + {item.path} + {/if} + {/snippet} + {#snippet pathDisplay()} + {#if itemPath} + {@render itemPath(item)} + {:else} + {showPath ? subPath : ''} + {/if} + {/snippet} + {#snippet actions()} + {#if itemActions} + {@render itemActions(item)} + {/if} + + {#if status} + {#if status.status === 'loading'} + + {:else if status.status === 'deployed'} + Deployed + {:else if status.status === 'failed'} +
+ Failed + {status.error} +
+ {/if} + {/if} + {/snippet} +
+{/snippet} + +{#snippet treeLeaf(leaf: ItemType, depth: number)} + {@const item = leaf as unknown as DeployableItem} + {@render itemRow(item, depth, item.path.split('/').pop() ?? item.path)} +{/snippet} + +{#snippet prefixCheckbox(prefix: string)} + {@const under = underPrefix(prefix)} + {@const selectable = bulkSelectable(under)} + {@const selectedCount = selectable.filter((i) => selectedItems.includes(i.key)).length} + 0 && selectedCount === selectable.length} + indeterminate={selectedCount > 0 && selectedCount < selectable.length} + disabled={selectable.length === 0} + title={selectedCount === selectable.length + ? `Deselect all in ${prefix}` + : `Select all in ${prefix}`} + onChange={() => toggleGroup({ items: under })} + /> +{/snippet} +
{#if header} @@ -197,7 +311,20 @@
{/if} - {#if items.length > 0} + {#if items.length > 0 && nested} +
+ {}} + sortCompare={(a, b) => a.path.localeCompare(b.path)} + leaf={treeLeaf} + ownerLead={hideSelection ? undefined : prefixCheckbox} + ownerDetail={folderDetail} + /> +
+ {:else if items.length > 0}
@@ -248,73 +375,15 @@
{/if} {#each group.items as item (item.key)} - {@const isSelectable = selectablePredicate(item)} - {@const isSelected = selectedItems.includes(item.key)} - {@const status = deploymentStatus[item.key]} - {@const isDeployed = status?.status === 'deployed'} - {@const blockedReason = - !isSelectable && !isDeployed ? selectBlockedReason?.(item) : undefined} - - {@const showPath = - isAgent?.(item) || - (item.kind !== 'resource' && - item.kind !== 'variable' && - item.kind !== 'resource_type')} - {@const subPath = - group.key && item.path.startsWith(group.key + '/') + {@render itemRow( + item, + 0, + showGroupHeaders && group.key && item.path.startsWith(group.key + '/') ? item.path.slice(group.key.length + 1) - : item.path} - - handleSelect(item)} - path={showPath ? item.path : ''} - marked={undefined} - kind={isAgent?.(item) ? 'agent' : item.kind} - triggerKind={item.triggerKind} - canFavorite={false} - workspaceId="" - > - {#snippet customSummary()} - {#if itemSummary} - {@render itemSummary(item)} - {:else} - {item.path} - {/if} - {/snippet} - {#snippet pathDisplay()} - {#if itemPath} - {@render itemPath(item)} - {:else} - {showPath ? (showGroupHeaders ? subPath : item.path) : ''} - {/if} - {/snippet} - {#snippet actions()} - {#if itemActions} - {@render itemActions(item)} - {/if} - - {#if status} - {#if status.status === 'loading'} - - {:else if status.status === 'deployed'} - Deployed - {:else if status.status === 'failed'} -
- Failed - {status.error} -
- {/if} - {/if} - {/snippet} -
+ : item.path + )} {/each} {/each}
diff --git a/frontend/src/lib/components/home/TreeOwnerRow.svelte b/frontend/src/lib/components/home/TreeOwnerRow.svelte index 0786c1f9f4..7a815b28a2 100644 --- a/frontend/src/lib/components/home/TreeOwnerRow.svelte +++ b/frontend/src/lib/components/home/TreeOwnerRow.svelte @@ -20,6 +20,9 @@ detail: Snippet /** Controls rendered next to the name. Clicks on them do not toggle the row. */ actions?: Snippet + /** Always-visible control before the icon (e.g. a checkbox). Clicks on it do not + * toggle the row. */ + lead?: Snippet /** Always-visible controls before the chevron. They stop their own clicks. */ trailing?: Snippet /** False for a row known to group nothing: it renders without a chevron and does not toggle. */ @@ -35,6 +38,7 @@ toggleLabel, detail, actions, + lead, trailing, expandable = true }: Props = $props() @@ -54,6 +58,11 @@ class="flex flex-row items-center gap-4" style={indent > 0 ? `padding-left: ${indent}px;` : ''} > + {#if lead} + + +
e.stopPropagation()}>{@render lead()}
+ {/if}
diff --git a/frontend/src/lib/components/home/TreeView.svelte b/frontend/src/lib/components/home/TreeView.svelte index 3df43e0fd0..e3723fd475 100644 --- a/frontend/src/lib/components/home/TreeView.svelte +++ b/frontend/src/lib/components/home/TreeView.svelte @@ -64,10 +64,15 @@ leaf?: Snippet<[ItemType, number]> // Remembers which nodes the user opened by hand, so they reopen on the next visit // while expand/collapse-all is in its collapsed state. - openMemory?: TreeOpenMemory + openMemory?: Pick // Adds a "Manage folder" menu ("View folder" for a non-owner) to top-level folder rows. // Subfolders are path segments, not folders with permissions of their own, so get none. onManageFolder?: (folderName: string) => void + // An always-visible control before a folder/user row's icon, given the node's + // full path prefix (e.g. a checkbox selecting everything under it). + ownerLead?: Snippet<[string]> + // Appended to a folder/user row's item count, given the node's full path prefix. + ownerDetail?: Snippet<[string]> } let { @@ -88,7 +93,9 @@ indent = 0, leaf, openMemory, - onManageFolder + onManageFolder, + ownerLead, + ownerDetail }: Props = $props() const unruled = inUnruledList() @@ -335,6 +342,12 @@ {/if} {/snippet} +{#snippet ownerLeadForNode()} + {#if nodePrefix != undefined} + {@render ownerLead?.(nodePrefix)} + {/if} +{/snippet} + {#if isFolder(item) || isUser(item)}
{#snippet detail()} @@ -362,6 +376,9 @@ {:else} ({pluralize(loadedHere, ' item')}) {/if} + {#if ownerDetail && nodePrefix != undefined} + {@render ownerDetail(nodePrefix)} + {/if} {/snippet}