windmill-components 1.677.1 → 1.687.0

package/package/components/ScriptBuilder.svelte

@@ -415,7 +415,6 @@ async function editScript(stay, parentHash, deploymentMsg, triggersToDeploy) {
                 ws_error_handler_muted: script.ws_error_handler_muted,
                 priority: script.priority,
                 restart_unless_cancelled: script.restart_unless_cancelled,
-                delete_after_use: script.delete_after_use,
                 timeout: script.timeout,
                 concurrency_key: emptyString(script.concurrency_key) ? undefined : script.concurrency_key,
                 visible_to_runner_only: script.visible_to_runner_only,
@@ -557,7 +556,6 @@ async function saveDraft(forceSave = false) {
                     ws_error_handler_muted: script.ws_error_handler_muted,
                     priority: script.priority,
                     restart_unless_cancelled: script.restart_unless_cancelled,
-                    delete_after_use: script.delete_after_use,
                     timeout: script.timeout,
                     concurrency_key: emptyString(script.concurrency_key)
                         ? undefined
@@ -1112,6 +1110,38 @@ async function loadWorkerTags() {
 												WAC Python
 											</Button>
 										</span>
+										<Button
+											size="xs2"
+											variant="border"
+											color="light"
+											startIcon={{
+												icon: LanguageIcon,
+												props: { lang: 'bun', width: 16, height: 16 }
+											} as ButtonType.Icon}
+											on:click={() => {
+												template = 'ci_test_bun'
+												script.language = 'bun'
+												initContent('bun', script.kind, template)
+											}}
+										>
+											CI Test TypeScript
+										</Button>
+										<Button
+											size="xs2"
+											variant="border"
+											color="light"
+											startIcon={{
+												icon: LanguageIcon,
+												props: { lang: 'python3', width: 16, height: 16 }
+											} as ButtonType.Icon}
+											on:click={() => {
+												template = 'ci_test_python'
+												script.language = 'python3'
+												initContent('python3', script.kind, template)
+											}}
+										>
+											CI Test Python
+										</Button>
 									</div>
 									{#if customUi?.settingsPanel?.metadata?.disableScriptKind !== true}
 										<Section label="Script kind">
@@ -1403,7 +1433,7 @@ async function loadWorkerTags() {
 											>
 										{/snippet}
 									</Section>
-									<Section label="Delete after use">
+									<Section label="Delete after completion">
 										{#snippet header()}
 											<Tooltip
 												documentationLink="https://www.windmill.dev/docs/script_editor/settings#delete-after-use"
@@ -1414,7 +1444,8 @@ async function loadWorkerTags() {
 												<br />
 												<br />
 												The logs, arguments and results of the job will be completely deleted from Windmill
-												once it is complete and the result has been returned.
+												after the specified delay once it is complete and the result has been returned.
+												Set to 0 for immediate deletion.
 												<br />
 												<br />
 												The deletion is irreversible.
@@ -1429,18 +1460,24 @@ async function loadWorkerTags() {
 											<Toggle
 												disabled={!$enterpriseLicense}
 												size="sm"
-												checked={Boolean(script.delete_after_use)}
+												checked={script.delete_after_secs != null}
 												on:change={() => {
-													if (script.delete_after_use) {
-														script.delete_after_use = undefined
+													if (script.delete_after_secs != null) {
+														script.delete_after_secs = undefined
 													} else {
-														script.delete_after_use = true
+														script.delete_after_secs = 0
 													}
 												}}
 												options={{
-													right: 'Delete logs, arguments and results after use'
+													right: 'Delete logs, arguments and results after completion'
 												}}
 											/>
+											{#if script.delete_after_secs != null}
+												<SecondsInput
+													bind:seconds={script.delete_after_secs}
+													disabled={!$enterpriseLicense}
+												/>
+											{/if}
 										</div>
 									</Section>
 									{#if !isCloudHosted()}
@@ -1518,11 +1555,15 @@ async function loadWorkerTags() {
 											/>
 										</div>
 									</Section>
-									<Section label="On behalf of last editor">
+									<Section
+										label={canPreserve
+											? 'Run on behalf of a specified user'
+											: 'On behalf of last editor'}
+									>
 										{#snippet header()}
 											<Tooltip>
 												When this option is enabled, the script will be run with the permissions of
-												the last editor.
+												{canPreserve ? 'the specified user' : 'the last editor'}.
 											</Tooltip>
 										{/snippet}
 										<div class="flex gap-2 shrink flex-col">

package/package/components/ScriptEditor.svelte

@@ -1373,9 +1373,7 @@ $effect(() => {
 										{/key}
 										{#if showPsCommonParams}
 											<div class="mt-2">
-												<PowerShellCommonParams
-														bind:args={psCommonParams}
-												/>
+												<PowerShellCommonParams bind:args={psCommonParams} />
 											</div>
 										{/if}
 									</div>

package/package/components/ScriptEditor.svelte.d.ts

@@ -11,7 +11,7 @@ interface Props {
     path: string | undefined;
     lang: Preview['language'];
     kind?: string | undefined;
-    template?: 'pgsql' | 'mysql' | 'script' | 'docker' | 'powershell' | 'bunnative' | 'claudesandbox' | 'wac_python' | 'wac_typescript';
+    template?: 'pgsql' | 'mysql' | 'script' | 'docker' | 'powershell' | 'bunnative' | 'claudesandbox' | 'wac_python' | 'wac_typescript' | 'ci_test_bun' | 'ci_test_python';
     tag: string | undefined;
     initialArgs?: Record<string, any>;
     fixedOverflowWidgets?: boolean;

package/package/components/ShareModal.svelte

@@ -1,16 +1,16 @@
 <script lang="ts">import TableCustom from './TableCustom.svelte';
-import { GroupService, UserService, GranularAclService } from '../gen';
+import { GroupService, UserService, GranularAclService, ResourceService, FolderService } from '../gen';
 import { createEventDispatcher } from 'svelte';
 import { userStore, workspaceStore } from '../stores';
 import { Alert, Button, Drawer } from './common';
 import DrawerContent from './common/drawer/DrawerContent.svelte';
-import Tooltip from './Tooltip.svelte';
 import { sendUserToast } from '../toast';
 import { isOwner } from '../utils';
 import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte';
 import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte';
 import Select from './select/Select.svelte';
 import { safeSelectItems } from './select/utils.svelte';
+import Toggle from './Toggle.svelte';
 import { Trash } from 'lucide-svelte';
 const dispatch = createEventDispatcher();
 let kind;
@@ -23,13 +23,100 @@ let acls = $state([]);
 let groups = $state([]);
 let usernames = $state([]);
 let drawer = $state();
+let linkedVarPaths = $state([]);
+let alsoApplyToLinked = $state(true);
+let defaultPerms = $state([]);
+let defaultPermsLabel = $state('');
+async function loadDefaultPerms() {
+    const currentPath = path;
+    const parts = currentPath.split('/');
+    if (parts[0] === 'f' && parts.length >= 2) {
+        const folderName = parts[1];
+        defaultPermsLabel = `Folder f/${folderName} permissions`;
+        try {
+            const folder = await FolderService.getFolder({
+                workspace: $workspaceStore,
+                name: folderName
+            });
+            if (path !== currentPath)
+                return;
+            const perms = [];
+            for (const owner of folder.owners) {
+                perms.push({ label: owner, write: true });
+            }
+            for (const [owner, write] of Object.entries(folder.extra_perms ?? {})) {
+                if (!folder.owners.includes(owner)) {
+                    perms.push({ label: owner, write });
+                }
+            }
+            defaultPerms = perms;
+        }
+        catch {
+            if (path !== currentPath)
+                return;
+            defaultPerms = [];
+        }
+    }
+    else if (parts[0] === 'u' && parts.length >= 2) {
+        defaultPermsLabel = `User u/${parts[1]} permissions`;
+        defaultPerms = [{ label: `u/${parts[1]}`, write: true }];
+    }
+    else if (parts[0] === 'g' && parts.length >= 2) {
+        defaultPermsLabel = `Group g/${parts[1]} permissions`;
+        defaultPerms = [{ label: `g/${parts[1]}`, write: true }];
+    }
+    else {
+        defaultPerms = [];
+        defaultPermsLabel = '';
+    }
+}
+function collectVarRefs(value) {
+    const paths = [];
+    function walk(v) {
+        if (typeof v === 'string' && v.startsWith('$var:')) {
+            paths.push(v.substring('$var:'.length));
+        }
+        else if (Array.isArray(v)) {
+            v.forEach(walk);
+        }
+        else if (v && typeof v === 'object') {
+            Object.values(v).forEach(walk);
+        }
+    }
+    walk(value);
+    return [...new Set(paths)];
+}
+async function loadLinkedVarPaths() {
+    if (kind !== 'resource') {
+        linkedVarPaths = [];
+        return;
+    }
+    const currentPath = path;
+    try {
+        const resource = await ResourceService.getResource({
+            workspace: $workspaceStore,
+            path: currentPath
+        });
+        if (path !== currentPath)
+            return;
+        linkedVarPaths = collectVarRefs(resource.value);
+    }
+    catch {
+        if (path !== currentPath)
+            return;
+        linkedVarPaths = [];
+    }
+}
 let own = $state(false);
 export async function openDrawer(newPath, kind_l, isOwnerOverride) {
     path = newPath;
     kind = kind_l;
+    alsoApplyToLinked = true;
     loadAcls();
     loadGroups();
     loadUsernames();
+    loadLinkedVarPaths();
+    loadDefaultPerms();
     if (isOwnerOverride !== undefined) {
         own = isOwnerOverride;
     }
@@ -58,6 +145,21 @@ async function deleteAcl(owner) {
             kind,
             requestBody: { owner }
         });
+        if (alsoApplyToLinked) {
+            for (const varPath of linkedVarPaths) {
+                try {
+                    await GranularAclService.removeGranularAcls({
+                        workspace: $workspaceStore,
+                        path: varPath,
+                        kind: 'variable',
+                        requestBody: { owner }
+                    });
+                }
+                catch (err) {
+                    sendUserToast(`Failed to update variable ${varPath}: ${err}`, true);
+                }
+            }
+        }
         loadAcls();
         dispatch('change', { path, kind });
     }
@@ -72,111 +174,147 @@ async function addAcl(owner, write) {
         kind,
         requestBody: { owner, write }
     });
+    if (alsoApplyToLinked) {
+        for (const varPath of linkedVarPaths) {
+            try {
+                await GranularAclService.addGranularAcls({
+                    workspace: $workspaceStore,
+                    path: varPath,
+                    kind: 'variable',
+                    requestBody: { owner, write }
+                });
+            }
+            catch (err) {
+                sendUserToast(`Failed to update variable ${varPath}: ${err}`, true);
+            }
+        }
+    }
     loadAcls();
     dispatch('change', { path, kind });
 }
 </script>
 
 <Drawer bind:this={drawer}>
-	<DrawerContent title="Share {path}" on:close={drawer?.closeDrawer}>
-		<div class="flex flex-col gap-2">
-			<h1 class="text-sm font-semibold text-emphasis">{path}</h1>
-			<span class="text-xs font-semibold text-emphasis"
-				>Extra Permissions ({acls?.length ?? 0}) &nbsp; <Tooltip
-					>Items already have default permissions. If belonging to an user or group, that group or
-					user owns it and can write to it as well as modify its permisions and move it. Folders
-					have read/write that apply to the whole folder and are additive to the items permissions.</Tooltip
-				></span
-			>
-			{#if !own}
-				<Alert type="warning" title="Not owner"
-					>Since you do not own this item, you cannot modify its permission</Alert
-				>
-			{/if}
-			<div>
-				{#if own}
-					<div class="flex flex-row flex-wrap gap-2 items-center">
-						<div>
-							<ToggleButtonGroup bind:selected={ownerKind} on:selected={() => (owner = '')}>
-								{#snippet children({ item })}
-									<ToggleButton value="user" label="User" {item} />
-									<ToggleButton value="group" label="Group" {item} />
-								{/snippet}
-							</ToggleButtonGroup>
+	<DrawerContent title="Permissions for {path}" on:close={drawer?.closeDrawer}>
+		<div class="flex flex-col gap-4">
+			{#if defaultPerms.length > 0}
+				<div class="flex flex-col gap-1">
+					<span class="text-sm font-semibold text-emphasis">{defaultPermsLabel}</span>
+					{#each defaultPerms as perm (perm.label)}
+						<div class="flex items-center justify-between text-xs text-primary">
+							<span>{perm.label}</span>
+							<span class="text-tertiary">{perm.write ? 'Writer' : 'Viewer'}</span>
 						</div>
-						{#key ownerKind}
-							<Select
-								items={safeSelectItems(
-									(ownerKind === 'user' ? usernames : groups).map((x) => x.toString())
-								)}
-								bind:value={owner}
-								class="grow min-w-48"
-							/>
-						{/key}
-						<Button
-							size="lg"
-							variant="accent"
-							disabled={!newOwner}
-							on:click={() => addAcl(newOwner, write)}>Add permission</Button
-						>
+					{/each}
+				</div>
+			{/if}
+			<div class="flex flex-col gap-2">
+				<span class="text-sm font-semibold text-emphasis"
+					>Extra permissions ({acls?.length ?? 0})</span
+				>
+				{#if linkedVarPaths.length > 0}
+					<div class="flex flex-col gap-1.5 p-3 border rounded bg-surface-secondary text-xs">
+						<Toggle
+							size="xs"
+							bind:checked={alsoApplyToLinked}
+							options={{ right: 'Also apply to linked variables' }}
+						/>
+						<ul class="text-2xs text-secondary list-disc ml-4">
+							{#each linkedVarPaths as varPath (varPath)}
+								<li>{varPath}</li>
+							{/each}
+						</ul>
 					</div>
 				{/if}
-				{#if acls?.length > 0}
-					<TableCustom>
-
-						{#snippet headerRow()}
-												<tr >
-								<th>owner</th>
-								<th></th>
-								<th></th>
-							</tr>
-											{/snippet}
-						{#snippet body()}
-							<tbody>
-								{#each acls as [owner, write]}
-									<tr>
-										<td>{owner}</td>
-										<td
-											>{#if own}
-												<div>
-													<ToggleButtonGroup
-														selected={write ? 'writer' : 'viewer'}
-														on:selected={async (e) => {
-															const role = e.detail
-															if (role == 'writer') {
-																await addAcl(owner, true)
-															} else {
-																await addAcl(owner, false)
-															}
-															loadAcls()
-														}}
-													>
-														{#snippet children({ item })}
-															<ToggleButton value="viewer" small label="Viewer" {item} />
-															<ToggleButton value="writer" small label="Writer" {item} />
-														{/snippet}
-													</ToggleButtonGroup>
-												</div>
-											{:else}{write}{/if}</td
-										>
-										<td>
-											{#if own}
-												<Button
-													variant="default"
-													destructive
-													size="xs"
-													on:click={() => deleteAcl(owner)}
-													startIcon={{ icon: Trash }}
-												/>
-											{/if}
-										</td>
-									</tr>
-								{/each}
-							</tbody>
-						{/snippet}
-					</TableCustom>
+				{#if !own}
+					<Alert type="warning" title="Not owner"
+						>Since you do not own this item, you cannot modify its permission</Alert
+					>
 				{/if}
+				<div>
+					{#if own}
+						<div class="flex flex-row flex-wrap gap-2 items-center">
+							<div>
+								<ToggleButtonGroup bind:selected={ownerKind} on:selected={() => (owner = '')}>
+									{#snippet children({ item })}
+										<ToggleButton value="user" label="User" {item} />
+										<ToggleButton value="group" label="Group" {item} />
+									{/snippet}
+								</ToggleButtonGroup>
+							</div>
+							{#key ownerKind}
+								<Select
+									items={safeSelectItems(
+										(ownerKind === 'user' ? usernames : groups).map((x) => x.toString())
+									)}
+									bind:value={owner}
+									class="grow min-w-48"
+								/>
+							{/key}
+							<Button
+								size="lg"
+								variant="accent"
+								disabled={!newOwner}
+								on:click={() => addAcl(newOwner, write)}>Add permission</Button
+							>
+						</div>
+					{/if}
+					{#if acls?.length > 0}
+						<TableCustom>
+							{#snippet headerRow()}
+								<tr>
+									<th>owner</th>
+									<th></th>
+									<th></th>
+								</tr>
+							{/snippet}
+							{#snippet body()}
+								<tbody>
+									{#each acls as [owner, write]}
+										<tr>
+											<td>{owner}</td>
+											<td
+												>{#if own}
+													<div>
+														<ToggleButtonGroup
+															selected={write ? 'writer' : 'viewer'}
+															on:selected={async (e) => {
+																const role = e.detail
+																if (role == 'writer') {
+																	await addAcl(owner, true)
+																} else {
+																	await addAcl(owner, false)
+																}
+																loadAcls()
+															}}
+														>
+															{#snippet children({ item })}
+																<ToggleButton value="viewer" small label="Viewer" {item} />
+																<ToggleButton value="writer" small label="Writer" {item} />
+															{/snippet}
+														</ToggleButtonGroup>
+													</div>
+												{:else}{write}{/if}</td
+											>
+											<td>
+												{#if own}
+													<Button
+														variant="default"
+														destructive
+														size="xs"
+														on:click={() => deleteAcl(owner)}
+														startIcon={{ icon: Trash }}
+													/>
+												{/if}
+											</td>
+										</tr>
+									{/each}
+								</tbody>
+							{/snippet}
+						</TableCustom>
+					{/if}
+				</div>
 			</div>
-		</div>
-	</DrawerContent>
+		</div></DrawerContent
+	>
 </Drawer>