windmill-components 1.70.0 → 1.77.0

package/components/GroupEditor.svelte

@@ -219,6 +219,14 @@ function getRole(x) {
 											name,
 											requestBody: { username: member_name }
 										})
+										await GranularAclService.removeGranularAcls({
+											workspace: $workspaceStore ?? '',
+											path: name,
+											kind: 'group_',
+											requestBody: {
+												owner: 'u/' + member_name
+											}
+										})
 										loadGroup()
 									}}>remove</button
 								>

package/components/InputTransformForm.svelte

@@ -57,17 +57,10 @@ function isStaticTemplate(inputCat) {
     return inputCat === 'string' || inputCat === 'sql' || inputCat == 'yaml';
 }
 function connectProperty(rawValue) {
-    if (isStaticTemplate(inputCat)) {
-        arg.value = `\$\{${rawValue}}`;
-        setPropertyType(arg.value);
-        monacoTemplate?.setCode(arg.value);
-    }
-    else {
-        arg.expr = getDefaultExpr(undefined, previousModuleId, rawValue);
-        arg.type = 'javascript';
-        propertyType = 'javascript';
-        monaco?.setCode(arg.expr);
-    }
+    arg.expr = getDefaultExpr(undefined, previousModuleId, rawValue);
+    arg.type = 'javascript';
+    propertyType = 'javascript';
+    monaco?.setCode(arg.expr);
 }
 function onFocus() {
     if (isStaticTemplate(inputCat)) {
@@ -126,7 +119,7 @@ $: schema.properties[argName].default && setDefaultCode();
 			{/if}
 		</div>
 		{#if !noDynamicToggle}
-			<div class="flex flex-row gap-x-4 gap-y-1 flex-wrap">
+			<div class="flex flex-row gap-x-4 gap-y-1 flex-wrap z-10">
 				<ToggleButtonGroup
 					bind:selected={propertyType}
 					on:selected={(e) => {
@@ -168,10 +161,10 @@ $: schema.properties[argName].default && setDefaultCode();
 				>
 					{#if isStaticTemplate(inputCat)}
 						<ToggleButton light position="left" value="static" size="xs">
-							{'${} '}Template &nbsp; <Tooltip
-								>Write javascript expressions between "{openBracket}" and "{closeBracket}". You may
-								refer to contextual objects like 'flow_input', or 'result' or functions like
-								'resource' and 'variable'
+							{'${} '}&nbsp;
+							<Tooltip
+								>Write text or surround javascript with "{openBracket}" and "{closeBracket}". Use
+								`result` to connect to another node's output.
 							</Tooltip></ToggleButton
 						>
 					{:else}
@@ -184,9 +177,11 @@ $: schema.properties[argName].default && setDefaultCode();
 						value="javascript"
 						startIcon={{ icon: faCode }}
 						size="xs"
+						>&nbsp;<Tooltip
+							>Write javascript expressions directly, using 'flow_input' or 'result'. You can use
+							multiline javascript.
+						</Tooltip></ToggleButton
 					>
-						Dynamic (JS)
-					</ToggleButton>
 				</ToggleButtonGroup>
 				<Button
 					variant="contained"
@@ -277,6 +272,4 @@ $: schema.properties[argName].default && setDefaultCode();
 			Not recognized input type {argName}
 		{/if}
 	</div>
-{:else}
-	<p class="text-sm text-gray-700">Argument at {argName} is undefined</p>
 {/if}

package/components/InputTransformSchemaForm.svelte

@@ -0,0 +1,103 @@
+<script>import { VariableService } from '../gen';
+import { workspaceStore } from '../stores';
+import { allTrue } from '../utils';
+import { faPlus } from '@fortawesome/free-solid-svg-icons';
+import { Button } from './common';
+import InputTransformForm from './InputTransformForm.svelte';
+import ItemPicker from './ItemPicker.svelte';
+import VariableEditor from './VariableEditor.svelte';
+export let schema;
+export let args = {};
+export let isValid = true;
+export let extraLib = 'missing extraLib';
+export let previousModuleId = undefined;
+export let filter = undefined;
+export let noDynamicToggle = false;
+let clazz = '';
+export { clazz as class };
+let inputCheck = {};
+$: isValid = allTrue(inputCheck) ?? false;
+$: if (args == undefined || typeof args !== 'object') {
+    args = {};
+}
+function removeExtraKey() {
+    const nargs = {};
+    Object.keys(args ?? {}).forEach((key) => {
+        if (keys.includes(key)) {
+            nargs[key] = args[key];
+        }
+    });
+    args = nargs;
+}
+let pickForField;
+let itemPicker = undefined;
+let variableEditor = undefined;
+let keys = [];
+$: {
+    let lkeys = Object.keys(schema?.properties ?? {});
+    if (schema?.properties && JSON.stringify(lkeys) != JSON.stringify(keys)) {
+        keys = lkeys;
+        removeExtraKey();
+    }
+}
+</script>
+
+<div class="w-full {clazz}">
+	{#if keys.length > 0}
+		{#each keys as argName, i (argName)}
+			{#if (!filter || filter.includes(argName)) && Object.keys(schema.properties ?? {}).includes(argName)}
+				<div class="z-10">
+					<InputTransformForm
+						{previousModuleId}
+						bind:arg={args[argName]}
+						bind:schema
+						bind:argName
+						bind:inputCheck={inputCheck[argName]}
+						bind:extraLib
+						{variableEditor}
+						{itemPicker}
+						bind:pickForField
+						{noDynamicToggle}
+					/>
+				</div>
+			{/if}
+		{/each}
+	{:else}
+		<div class="text-gray-500 text-sm">No inputs</div>
+	{/if}
+</div>
+
+<ItemPicker
+	bind:this={itemPicker}
+	pickCallback={(path, _) => {
+		if (pickForField) {
+			args[pickForField].value = '$var:' + path
+		}
+	}}
+	itemName="Variable"
+	extraField="path"
+	loadItems={async () =>
+		(await VariableService.listVariable({ workspace: $workspaceStore ?? '' })).map((x) => ({
+			name: x.path,
+			...x
+		}))}
+>
+	<div
+		slot="submission"
+		class="flex flex-row-reverse w-full bg-white border-t border-gray-200 rounded-bl-lg rounded-br-lg"
+	>
+		<Button
+			variant="border"
+			color="blue"
+			size="sm"
+			startIcon={{ icon: faPlus }}
+			on:click={() => {
+				variableEditor?.initNew?.()
+			}}
+		>
+			New variable
+		</Button>
+	</div>
+</ItemPicker>
+
+<VariableEditor bind:this={variableEditor} />

package/components/InputTransformSchemaForm.svelte.d.ts

@@ -0,0 +1,24 @@
+import { SvelteComponentTyped } from "svelte";
+import type { Schema } from '../common';
+declare const __propDef: {
+    props: {
+        schema: Schema;
+        args?: Record<string, any> | undefined;
+        isValid?: boolean | undefined;
+        extraLib?: string | undefined;
+        previousModuleId?: string | undefined;
+        filter?: string[] | undefined;
+        noDynamicToggle?: boolean | undefined;
+        class?: string | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type InputTransformSchemaFormProps = typeof __propDef.props;
+export type InputTransformSchemaFormEvents = typeof __propDef.events;
+export type InputTransformSchemaFormSlots = typeof __propDef.slots;
+export default class InputTransformSchemaForm extends SvelteComponentTyped<InputTransformSchemaFormProps, InputTransformSchemaFormEvents, InputTransformSchemaFormSlots> {
+}
+export {};

package/components/LogViewer.svelte

@@ -35,7 +35,7 @@ let logViewer;
 				<button on:click={logViewer.openDrawer}>Expand</button>
 				<div class="py-2 pr-2 text-xs flex gap-2 items-center">
 					Auto scroll
-					<input type="checkbox" bind:checked={scroll} />
+					<input class="windmillapp" type="checkbox" bind:checked={scroll} />
 				</div>
 			</div>
 		</div>

package/components/ModulePreview.svelte

@@ -6,12 +6,12 @@ import TestJobLoader from './TestJobLoader.svelte';
 import LogViewer from './LogViewer.svelte';
 import DisplayResult from './DisplayResult.svelte';
 import Button from './common/button/Button.svelte';
-import { flowStateStore, testStepStore } from './flows/flowState';
-import { flowStore } from './flows/flowStore';
 import { workspaceStore } from '../stores';
 import { Loader2 } from 'lucide-svelte';
+import { getContext } from 'svelte';
 export let mod;
 export let schema;
+const { flowStore, flowStateStore, testStepStore } = getContext('FlowEditorContext');
 // Test
 let testJobLoader;
 let testIsLoading = false;
@@ -78,6 +78,7 @@ function jobDone() {
 			detailed={false}
 			topButton
 			bind:args={stepArgs}
+			isFlow={false}
 		/>
 		{#if testIsLoading}
 			<Button on:click={testJobLoader?.cancelJob} btnClasses="w-full mt-4" color="red" size="sm">

package/components/Multiselect.svelte

@@ -167,7 +167,7 @@
 	{#if showOptions}
 		<ul
 			class="options"
-			transition:fly={{ duration: 200, y: 5 }}
+			transition:fly|local={{ duration: 200, y: 5 }}
 			on:mousedown|preventDefault={handleOptionMousedown}
 		>
 			{#each filtered as option}

package/components/PageHeader.svelte

@@ -9,7 +9,7 @@ export let primary = true;
 		<span class="flex items-center space-x-2 mb-2">
 			<h1>{title}</h1>
 			{#if tooltip}
-				<Tooltip>{tooltip}</Tooltip>
+				<Tooltip scale={0.9}>{tooltip}</Tooltip>
 			{/if}
 		</span>
 	{:else}

package/components/Path.svelte

@@ -12,6 +12,7 @@ import Tooltip from './Tooltip.svelte';
 import FolderEditor from './FolderEditor.svelte';
 import GroupEditor from './GroupEditor.svelte';
 import { random_adj } from './random_positive_adjetive';
+import Badge from './common/badge/Badge.svelte';
 let meta = undefined;
 export let namePlaceholder = '';
 export let initialPath;
@@ -243,15 +244,19 @@ async function addGroup() {
 			folderCreated = undefined
 		}}
 	>
-		<div class="flex flex-row">
-			<input class="mr-2" placeholder="New folder name" bind:value={newFolderName} />
-			<Button size="md" startIcon={{ icon: faPlus }} disabled={!newFolderName} on:click={addFolder}>
-				New&nbsp;folder
-			</Button>
-		</div>
-
-		{#if folderCreated}
-			<div class="mt-8" />
+		{#if !folderCreated}
+			<div class="flex flex-row">
+				<input class="mr-2" placeholder="New folder name" bind:value={newFolderName} />
+				<Button
+					size="md"
+					startIcon={{ icon: faPlus }}
+					disabled={!newFolderName}
+					on:click={addFolder}
+				>
+					New&nbsp;folder
+				</Button>
+			</div>
+		{:else}
 			<FolderEditor name={folderCreated} />
 		{/if}
 	</DrawerContent>
@@ -268,7 +273,7 @@ async function addGroup() {
 		{#if meta != undefined}
 			<div class="flex gap-4 shrink">
 				<label class="block">
-					<span class="text-gray-700 text-sm whitespace-nowrap">&nbsp;</span>
+					<span class="text-gray-700 text-sm whitespace-nowrap">Owner</span>
 
 					<ToggleButtonGroup
 						class="mt-0.5"
@@ -371,8 +376,26 @@ async function addGroup() {
 		{/if}
 	</div>
 
-	<div class="flex-row flex justify-between">
-		<div><span class="font-mono text-sm">{path}</span></div>
+	<div class="flex flex-col w-full mt-4">
+		<div class="flex justify-start w-full">
+			<Badge
+				color="gray"
+				class="center-center !bg-gray-300 !text-gray-600 !w-[70px] !h-[24px] rounded-r-none"
+			>
+				Full path
+			</Badge>
+			<input
+				type="text"
+				readonly
+				value={path}
+				size={path?.length || 50}
+				class="font-mono !text-xs max-w-[calc(100%-70px)] !w-auto !h-[24px] !py-0 !border-l-0 !rounded-l-none"
+				on:focus={({ currentTarget }) => {
+					currentTarget.select()
+				}}
+			/>
+			<!-- <span class="font-mono text-sm break-all">{path}</span> -->
+		</div>
 		<div class="text-red-600 text-2xs">{error}</div>
 	</div>
 </div>

package/components/Popover.svelte

@@ -42,22 +42,11 @@ function close() {
 </script>
 
 {#if notClickable}
-	<span
-		use:popperRef
-		on:mouseenter={open}
-		on:mouseleave={close}
-		class={$$props.class}
-	>
+	<span use:popperRef on:mouseenter={open} on:mouseleave={close} class={$$props.class}>
 		<slot />
 	</span>
 {:else}
-	<button
-		use:popperRef
-		on:mouseenter={open}
-		on:mouseleave={close}
-		on:click
-		class={$$props.class}
-	>
+	<button use:popperRef on:mouseenter={open} on:mouseleave={close} on:click class={$$props.class}>
 		<slot />
 	</button>
 {/if}

package/components/ResourcePicker.svelte

@@ -7,15 +7,30 @@ import { Button } from './common';
 import Select from 'svelte-select';
 import AppConnect from './AppConnect.svelte';
 import ResourceEditor from './ResourceEditor.svelte';
+import { SELECT_INPUT_DEFAULT_STYLE } from '../defaults';
 const dispatch = createEventDispatcher();
-let resources = [];
 export let initialValue = undefined;
 export let value = initialValue;
 export let resourceType = undefined;
+let valueSelect = initialValue || value
+    ? {
+        value: value ?? initialValue,
+        label: value ?? initialValue
+    }
+    : undefined;
+let collection = [valueSelect];
 async function loadResources(resourceType) {
-    const v = value;
-    resources = await ResourceService.listResource({ workspace: $workspaceStore, resourceType });
-    value = v;
+    const nc = (await ResourceService.listResource({
+        workspace: $workspaceStore,
+        resourceType
+    })).map((x) => ({
+        value: x.path,
+        label: x.path
+    }));
+    if (!nc.find((x) => x.value == value) && (initialValue || value)) {
+        nc.push({ value: value ?? initialValue, label: value ?? initialValue });
+    }
+    collection = nc;
 }
 $: {
     if ($workspaceStore) {
@@ -23,10 +38,6 @@ $: {
     }
 }
 $: dispatch('change', value);
-$: collection = resources.map((x) => ({
-    value: x.path,
-    label: x.path
-}));
 let appConnect;
 let resourceEditor;
 </script>
@@ -35,6 +46,7 @@ let resourceEditor;
 	on:refresh={async (e) => {
 		await loadResources(resourceType)
 		value = e.detail
+		valueSelect = { value: e.detail, label: e.detail }
 	}}
 	newPageOAuth
 	bind:this={appConnect}
@@ -44,22 +56,29 @@ let resourceEditor;
 	bind:this={resourceEditor}
 	on:refresh={async (e) => {
 		await loadResources(resourceType)
-		console.log(e)
 		if (e.detail) {
 			value = e.detail
+			valueSelect = { value: e.detail, label: e.detail }
 		}
 	}}
 />
 
 <div class="flex flex-row gap-x-1 w-full">
 	<Select
-		listAutoWidth={false}
-		--height="34px"
-		value={collection.find((x) => x.value == value)}
-		bind:justValue={value}
+		value={valueSelect}
+		on:change={(e) => {
+			value = e.detail.value
+			valueSelect = e.detail
+		}}
+		on:clear={() => {
+			value = undefined
+			valueSelect = undefined
+		}}
 		items={collection}
 		class="text-clip grow min-w-0"
-		placeholder="{resourceType} resource"
+		placeholder="{resourceType ?? 'any'} resource"
+		inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
+		containerStyles={SELECT_INPUT_DEFAULT_STYLE.containerStyles}
 	/>
 	{#if value && value != ''}
 		<Button variant="border" size="xs" on:click={() => resourceEditor?.initEdit?.(value ?? '')}>

package/components/RunChart.svelte

@@ -16,7 +16,7 @@ $: data = {
             backgroundColor: '#f87171',
             label: 'Failed',
             data: failed?.map((job) => ({
-                x: job.created_at,
+                x: job.started_at,
                 y: job.duration_ms,
                 id: job.id,
                 path: job.script_path
@@ -27,7 +27,7 @@ $: data = {
             backgroundColor: '#4ade80',
             label: 'Successful',
             data: success?.map((job) => ({
-                x: job.created_at,
+                x: job.started_at,
                 y: job.duration_ms,
                 id: job.id,
                 path: job.script_path
@@ -40,7 +40,10 @@ const zoomOptions = {
         enabled: true,
         modifierKey: 'ctrl',
         onPanComplete: ({ chart }) => {
-            dispatch('zoom', { min: new Date(chart.scales.x.min), max: new Date(chart.scales.x.max) });
+            dispatch('zoom', {
+                min: addSeconds(new Date(chart.scales.x.min), -1),
+                max: addSeconds(new Date(chart.scales.x.max), 1)
+            });
         }
     },
     zoom: {
@@ -49,13 +52,28 @@ const zoomOptions = {
         },
         mode: 'x',
         onZoom: ({ chart }) => {
-            dispatch('zoom', { min: new Date(chart.scales.x.min), max: new Date(chart.scales.x.max) });
+            dispatch('zoom', {
+                min: addSeconds(new Date(chart.scales.x.min), -1),
+                max: addSeconds(new Date(chart.scales.x.max), 1)
+            });
         }
     }
 };
 function getPath(x) {
     return x.path;
 }
+$: minTime = getMinTime(jobs);
+function addSeconds(date, seconds) {
+    date.setTime(date.getTime() + seconds * 1000);
+    return date;
+}
+function getMinTime(jobs) {
+    return addSeconds(new Date(jobs?.[jobs?.length - 1]?.started_at ?? new Date().toString()), -15);
+}
+$: maxTime = getMaxTime(jobs);
+function getMaxTime(jobs) {
+    return addSeconds(new Date(jobs?.[0]?.started_at ?? new Date().toString()), 15);
+}
 </script>
 
 <Scatter
@@ -83,7 +101,8 @@ function getPath(x) {
 					display: false
 				},
 				type: 'time',
-				min: jobs?.[jobs?.length - 1]?.created_at ?? new Date().toString()
+				min: minTime,
+				max: maxTime
 			},
 			y: {
 				grid: {

package/components/RunForm.svelte

@@ -20,6 +20,7 @@ export let topButton = false;
 export let loading = false;
 export let noVariablePicker = false;
 export let viewCliRun = false;
+export let isFlow;
 export let args = decodeArgs($page.url.searchParams.get('args') ?? undefined);
 export function run() {
     runAction(scheduledForStr, args, invisible_to_owner);
@@ -29,9 +30,7 @@ let viewOptions = false;
 let viewCliOptions = false;
 let scheduledForStr;
 let invisible_to_owner;
-$: cliCommand = `wmill ${runnable?.kind} run ${runnable?.path} ${Object.entries(args)
-    .map(([k, v]) => `-i ${k}=${JSON.stringify(v)}`)
-    .join(' ')}`;
+$: cliCommand = `wmill ${isFlow ? 'flow' : 'script'} run ${runnable?.path} -d '${JSON.stringify(args)}'`;
 </script>
 
 <div class="max-w-6xl">
@@ -110,7 +109,7 @@ $: cliCommand = `wmill ${runnable?.kind} run ${runnable?.path} ${Object.entries(
 					</Button>
 				</div>
 				{#if viewOptions}
-					<div transition:slide class="mt-6">
+					<div transition:slide|local class="mt-6">
 						<div class="border rounded-md p-3 pt-4">
 							<div class="flex flex-row items-end">
 								<div class="w-max md:w-2/3 mt-2 mb-1">
@@ -178,14 +177,14 @@ $: cliCommand = `wmill ${runnable?.kind} run ${runnable?.path} ${Object.entries(
 		<div class="my-10" />
 		<Button
 			color="light"
-			size="sm"
+			size="xs"
 			endIcon={{ icon: viewCliOptions ? faChevronUp : faChevronDown }}
 			on:click={() => (viewCliOptions = !viewCliOptions)}
 		>
 			Run it from the CLI
 		</Button>
 		{#if viewCliOptions}
-			<div transition:slide class="mt-2 px-4 pt-2">
+			<div transition:slide|local class="mt-2 px-4 pt-2">
 				<InlineCodeCopy content={cliCommand} />
 				<CliHelpBox />
 			</div>

package/components/RunForm.svelte.d.ts

@@ -24,6 +24,7 @@ declare const __propDef: {
         loading?: boolean | undefined;
         noVariablePicker?: boolean | undefined;
         viewCliRun?: boolean | undefined;
+        isFlow: boolean;
         args?: Record<string, any> | undefined;
         run?: (() => void) | undefined;
         isValid?: boolean | undefined;