windmill-components 1.665.1 → 1.677.1

package/package/components/ResourceEditor.svelte

@@ -4,6 +4,7 @@ import { canWrite, emptyString, isOwner, urlize } from '../utils';
 import { createEventDispatcher, untrack } from 'svelte';
 import { Alert, Skeleton } from './common';
 import Path from './Path.svelte';
+import LabelsInput from './LabelsInput.svelte';
 import Required from './Required.svelte';
 import { userStore, workspaceStore } from '../stores';
 import SchemaForm from './SchemaForm.svelte';
@@ -30,6 +31,7 @@ let can_write = $state(true);
 let initialPath = path;
 let resourceToEdit = $state(undefined);
 let description = $state('');
+let labels = $state(undefined);
 let DESCRIPTION_PLACEHOLDER = `Describe what this resource is for`;
 let resourceSchema = $state(undefined);
 let args = $state({});
@@ -44,6 +46,7 @@ let rawCode = $state(undefined);
 async function initEdit() {
     resourceToEdit = await ResourceService.getResource({ workspace: effectiveWorkspace, path });
     description = resourceToEdit.description ?? '';
+    labels = resourceToEdit.labels ?? undefined;
     resource_type = resourceToEdit.resource_type;
     args = resourceToEdit?.value ?? {};
     loadResourceType();
@@ -68,7 +71,7 @@ export async function editResource() {
         await ResourceService.updateResource({
             workspace: effectiveWorkspace,
             path: resourceToEdit.path,
-            requestBody: { path, value: args, description }
+            requestBody: { path, value: args, description, labels }
         });
         if (resourceToEdit.resource_type === 'json_schema') {
             clearJsonSchemaResourceCache(resourceToEdit.path, effectiveWorkspace);
@@ -83,7 +86,7 @@ export async function editResource() {
 export async function createResource() {
     await ResourceService.createResource({
         workspace: effectiveWorkspace,
-        requestBody: { path, value: args, description, resource_type: resource_type }
+        requestBody: { path, value: args, description, resource_type: resource_type, labels }
     });
     sendUserToast(`Updated resource at ${path}`);
     dispatch('refresh', path);
@@ -190,6 +193,7 @@ run(() => {
 				/>
 			</div>
 		{/if}
+		<LabelsInput bind:labels class="-mt-4" />
 
 		{#if !emptyString(resourceTypeInfo?.description)}
 			<div class="flex flex-col gap-1">

package/package/components/RunForm.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">import { computeSharableHash as computeSharableHash, defaultIfEmptyString, emptyString, truncateHash } from '../utils';
+<script lang="ts">import { computeSharableHash as computeSharableHash, defaultIfEmptyString, emptyString, truncateHash, sendUserToast } from '../utils';
 import { Badge, Button } from './common';
 import SchemaForm from './SchemaForm.svelte';
 import SharedBadge from './SharedBadge.svelte';
@@ -12,23 +12,63 @@ import JsonInputs from './JsonInputs.svelte';
 import { triggerableByAI } from '../actions/triggerableByAI.svelte';
 import InputSelectedBadge from './schema/InputSelectedBadge.svelte';
 import { untrack } from 'svelte';
+import { processSecretArgs } from './secretArgUtils';
+import PowerShellCommonParams from './PowerShellCommonParams.svelte';
 let reloadArgs = $state(0);
 let jsonEditor = $state(undefined);
 let schemaHeight = $state(0);
 let showInputSelectedBadge = $state(false);
 let savedPreviousArgs = $state(undefined);
+let psCommonParams = $state({});
+function extractPsCommonParams(allArgs) {
+    const scriptArgs = {};
+    const commonParams = {};
+    for (const [k, v] of Object.entries(allArgs)) {
+        if (k.startsWith('_wm_ps_')) {
+            commonParams[k] = v;
+        }
+        else {
+            scriptArgs[k] = v;
+        }
+    }
+    return { scriptArgs, commonParams };
+}
 export async function setArgs(nargs) {
-    args = nargs;
+    const { scriptArgs, commonParams } = extractPsCommonParams(nargs);
+    args = scriptArgs;
+    psCommonParams = commonParams;
     reloadArgs++;
 }
-export function run() {
-    runAction(scheduledForStr, args ?? {}, invisible_to_owner, overrideTag);
+export async function run(overrideScheduledForStr) {
+    let processedArgs;
+    try {
+        processedArgs = await processSecretArgs(enforceDisabledDefaults(args ?? {}, true), runnable?.schema);
+    }
+    catch (e) {
+        sendUserToast('Failed to process sensitive args: ' + e, true);
+        return;
+    }
+    if (showPsCommonParams) {
+        for (const [k, v] of Object.entries(psCommonParams)) {
+            if (v !== undefined && v !== false && v !== '') {
+                processedArgs[k] = v;
+            }
+        }
+    }
+    runAction(overrideScheduledForStr === null ? undefined : (overrideScheduledForStr ?? scheduledForStr), processedArgs, invisible_to_owner, overrideTag);
 }
 let { runnable, runAction, buttonText = 'Run', schedulable = true, detailed = true, autofocus = false, loading = false, noVariablePicker = false, viewKeybinding = false, scheduledForStr = $bindable(), invisible_to_owner = $bindable(), overrideTag = $bindable(), args = $bindable(), jsonView = false, isValid = $bindable(true) } = $props();
+let showPsCommonParams = $derived(runnable?.language === 'powershell' && runnable?.schema?.['x-windmill-ps-cmd-binding'] === true);
 $effect.pre(() => {
     if (args == undefined) {
         args = {};
     }
+    // Extract _wm_ps_* keys from args on initial load (e.g. "Run again" via URL hash)
+    if (args && Object.keys(args).some((k) => k.startsWith('_wm_ps_'))) {
+        const { scriptArgs, commonParams } = extractPsCommonParams(args);
+        args = scriptArgs;
+        psCommonParams = commonParams;
+    }
 });
 let debounced = undefined;
 function onArgsChange(args) {
@@ -49,6 +89,25 @@ function onArgsChange(args) {
         console.error('Impossible to set hash in args', e);
     }
 }
+function enforceDisabledDefaults(args, notify = false) {
+    const schema = runnable?.schema;
+    if (!schema?.properties)
+        return args;
+    const result = { ...args };
+    const resetKeys = [];
+    for (const [key, prop] of Object.entries(schema.properties)) {
+        if (prop?.disabled && 'default' in prop) {
+            if (notify && result[key] !== prop.default) {
+                resetKeys.push(key);
+            }
+            result[key] = prop.default;
+        }
+    }
+    if (resetKeys.length > 0) {
+        sendUserToast(`Disabled field${resetKeys.length > 1 ? 's' : ''} ${resetKeys.map((k) => `'${k}'`).join(', ')} reset to default value${resetKeys.length > 1 ? 's' : ''}`);
+    }
+    return result;
+}
 export function setCode(code) {
     jsonEditor?.setCode(code);
 }
@@ -166,7 +225,7 @@ $effect(() => {
 					bind:this={jsonEditor}
 					on:select={(e) => {
 						if (e.detail) {
-							args = e.detail
+							args = enforceDisabledDefaults(e.detail)
 						}
 					}}
 					updateOnBlur={false}
@@ -197,6 +256,11 @@ $effect(() => {
 	{:else}
 		<div class="text-xs text-primary">No arguments</div>
 	{/if}
+	{#if showPsCommonParams}
+		<div class="mt-4">
+			<PowerShellCommonParams bind:args={psCommonParams} />
+		</div>
+	{/if}
 	{#if schedulable}
 		<div class="flex gap-2 items-start flex-wrap justify-between mt-2 md:mt-6">
 			<div class="flex-row-reverse flex-wrap flex w-full gap-4">
@@ -207,7 +271,7 @@ $effect(() => {
 					unifiedSize="md"
 					btnClasses="!inline-flex"
 					disabled={!isValid && !jsonView}
-					on:click={() => runAction(scheduledForStr, args ?? {}, invisible_to_owner, overrideTag)}
+					on:click={() => run()}
 					shortCut={{ Icon: CornerDownLeft, hide: !viewKeybinding }}
 				>
 					{scheduledForStr ? 'Schedule to run later' : buttonText}
@@ -246,7 +310,7 @@ $effect(() => {
 			btnClasses="!px-6 !py-1 w-full"
 			variant="accent"
 			disabled={!isValid && !jsonView}
-			on:click={() => runAction(undefined, args ?? {}, invisible_to_owner, overrideTag)}
+			on:click={() => run(null)}
 			shortCut={{ Icon: CornerDownLeft, hide: !viewKeybinding }}
 		>
 			{buttonText}

package/package/components/RunForm.svelte.d.ts

@@ -8,6 +8,7 @@ interface Props {
         is_template?: boolean;
         hash?: string;
         kind?: string;
+        language?: string;
         can_write?: boolean;
         created_at?: string;
         created_by?: string;
@@ -30,7 +31,7 @@ interface Props {
 }
 declare const RunForm: import("svelte").Component<Props, {
     setArgs: (nargs: Record<string, any>) => Promise<void>;
-    run: () => void;
+    run: (overrideScheduledForStr?: string | undefined | null) => Promise<void>;
     setCode: (code: string) => void;
 }, "args" | "invisible_to_owner" | "isValid" | "scheduledForStr" | "overrideTag">;
 type RunForm = ReturnType<typeof RunForm>;

package/package/components/ScriptBuilder.svelte

@@ -33,6 +33,7 @@ import { defaultScriptLanguages, processLangs } from '../scripts';
 import DefaultScripts from './DefaultScripts.svelte';
 import { onMount, setContext, untrack } from 'svelte';
 import Summary from './Summary.svelte';
+import LabelsInput from './LabelsInput.svelte';
 import DeployOverrideConfirmationModal from './common/confirmationModal/DeployOverrideConfirmationModal.svelte';
 import TriggersEditor from './triggers/TriggersEditor.svelte';
 import CaptureTable from './triggers/CaptureTable.svelte';
@@ -424,7 +425,8 @@ async function editScript(stay, parentHash, deploymentMsg, triggersToDeploy) {
                 on_behalf_of_email: script.on_behalf_of_email,
                 preserve_on_behalf_of: preserveOnBehalfOf || undefined,
                 assets: script.assets,
-                modules: script.modules
+                modules: script.modules,
+                labels: script.labels
             }
         });
         if (!initialPath) {
@@ -565,7 +567,8 @@ async function saveDraft(forceSave = false) {
                     has_preprocessor: script.has_preprocessor,
                     on_behalf_of_email: script.on_behalf_of_email,
                     assets: script.assets,
-                    modules: script.modules
+                    modules: script.modules,
+                    labels: script.labels
                 }
             });
         }
@@ -954,6 +957,7 @@ async function loadWorkerTags() {
 													}}
 												/>
 											</Label>
+											<LabelsInput bind:labels={script.labels} class="-mt-4" />
 											<Label label="Path">
 												{#snippet header()}
 													<Tooltip
@@ -1027,7 +1031,7 @@ async function loadWorkerTags() {
 															} as ButtonType.Icon}
 														>
 															<span class="truncate">{label}</span>
-															{#if lang === 'ruby'}
+															{#if lang === 'rlang'}
 																<span class="text-primary !text-xs"> BETA </span>
 															{/if}
 														</Button>