windmill-components 1.60.4 → 1.75.0

package/components/SchemaForm.svelte

@@ -2,29 +2,23 @@
 import { workspaceStore } from '../stores';
 import { allTrue } from '../utils';
 import { faPlus } from '@fortawesome/free-solid-svg-icons';
-import { slide } from 'svelte/transition';
 import ArgInput from './ArgInput.svelte';
 import { Button } from './common';
-import InputTransformForm from './InputTransformForm.svelte';
 import ItemPicker from './ItemPicker.svelte';
 import VariableEditor from './VariableEditor.svelte';
-export let inputTransform = false;
 export let schema;
 export let args = {};
 export let disabledArgs = [];
 export let disabled = false;
 export let editableSchema = false;
 export let isValid = true;
-export let extraLib = 'missing extraLib';
 export let autofocus = false;
-export let previousModuleId = undefined;
 export let shouldHideNoInputs = false;
 export let compact = false;
 export let password = undefined;
 export let noVariablePicker = false;
-export let filter = undefined;
-export let noDynamicToggle = false;
 export let flexWrap = false;
+export let noDelete = false;
 let clazz = '';
 export { clazz as class };
 let inputCheck = {};
@@ -33,64 +27,86 @@ $: if (args == undefined || typeof args !== 'object') {
     args = {};
 }
 function removeExtraKey() {
+    const nargs = {};
     Object.keys(args ?? {}).forEach((key) => {
-        if (!Object.keys(schema?.properties ?? {}).includes(key)) {
-            delete args[key];
-            delete inputCheck[key];
+        if (keys.includes(key)) {
+            nargs[key] = args[key];
         }
     });
+    args = nargs;
 }
-$: schema?.properties && removeExtraKey();
 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;
+        if (!noDelete) {
+            removeExtraKey();
+        }
+    }
+}
 </script>
 
 <div class="w-full {clazz} {flexWrap ? 'flex flex-row flex-wrap gap-x-6 gap-y-2' : ''}">
-	{#if Object.keys(schema?.properties ?? {}).length > 0}
-		{#each Object.keys(schema?.properties ?? {}) as argName, i (argName)}
-			{#if !filter || filter.includes(argName)}
-				<div transition:slide|local>
-					{#if inputTransform}
-						<InputTransformForm
-							{previousModuleId}
-							bind:arg={args[argName]}
-							bind:schema
-							bind:argName
-							bind:inputCheck={inputCheck[argName]}
-							bind:extraLib
-							{variableEditor}
-							{itemPicker}
-							bind:pickForField
-							{noDynamicToggle}
-						/>
-					{:else if typeof args == 'object'}
-						<ArgInput
-							autofocus={i == 0 && autofocus}
-							label={argName}
-							bind:description={schema.properties[argName].description}
-							bind:value={args[argName]}
-							type={schema.properties[argName].type}
-							required={schema.required.includes(argName)}
-							bind:pattern={schema.properties[argName].pattern}
-							bind:valid={inputCheck[argName]}
-							defaultValue={schema.properties[argName].default}
-							bind:enum_={schema.properties[argName].enum}
-							bind:format={schema.properties[argName].format}
-							contentEncoding={schema.properties[argName].contentEncoding}
-							properties={schema.properties[argName].properties}
-							bind:itemsType={schema.properties[argName].items}
-							disabled={disabledArgs.includes(argName) || disabled}
-							{editableSchema}
-							{compact}
-							password={argName == password}
-							{variableEditor}
-							{itemPicker}
-							bind:pickForField
-							bind:extra={schema.properties[argName]}
-						/>
-					{:else}
-						Expected argument to be an object, got {JSON.stringify(args)} instead
+	{#if keys.length > 0}
+		{#each keys as argName, i (argName)}
+			{#if Object.keys(schema.properties ?? {}).includes(argName)}
+				<div>
+					{#if typeof args == 'object' && schema?.properties[argName]}
+						{#if editableSchema}
+							<ArgInput
+								autofocus={i == 0 && autofocus}
+								label={argName}
+								bind:description={schema.properties[argName].description}
+								bind:value={args[argName]}
+								type={schema.properties[argName].type}
+								required={schema.required.includes(argName)}
+								bind:pattern={schema.properties[argName].pattern}
+								bind:valid={inputCheck[argName]}
+								defaultValue={schema.properties[argName].default}
+								bind:enum_={schema.properties[argName].enum}
+								bind:format={schema.properties[argName].format}
+								contentEncoding={schema.properties[argName].contentEncoding}
+								properties={schema.properties[argName].properties}
+								bind:itemsType={schema.properties[argName].items}
+								disabled={disabledArgs.includes(argName) || disabled}
+								{editableSchema}
+								{compact}
+								password={argName == password}
+								{variableEditor}
+								{itemPicker}
+								bind:pickForField
+								bind:extra={schema.properties[argName]}
+							/>
+						{:else}
+							<ArgInput
+								autofocus={i == 0 && autofocus}
+								label={argName}
+								description={schema.properties[argName].description}
+								bind:value={args[argName]}
+								type={schema.properties[argName].type}
+								required={schema.required.includes(argName)}
+								pattern={schema.properties[argName].pattern}
+								bind:valid={inputCheck[argName]}
+								defaultValue={schema.properties[argName].default}
+								enum_={schema.properties[argName].enum}
+								format={schema.properties[argName].format}
+								contentEncoding={schema.properties[argName].contentEncoding}
+								properties={schema.properties[argName].properties}
+								itemsType={schema.properties[argName].items}
+								disabled={disabledArgs.includes(argName) || disabled}
+								{editableSchema}
+								{compact}
+								password={argName == password}
+								{variableEditor}
+								{itemPicker}
+								bind:pickForField
+								extra={schema.properties[argName]}
+							/>
+						{/if}
 					{/if}
 				</div>
 			{/if}
@@ -105,11 +121,7 @@ let variableEditor = undefined;
 		bind:this={itemPicker}
 		pickCallback={(path, _) => {
 			if (pickForField) {
-				if (inputTransform) {
-					args[pickForField].value = '$var:' + path
-				} else {
-					args[pickForField] = '$var:' + path
-				}
+				args[pickForField] = '$var:' + path
 			}
 		}}
 		itemName="Variable"

package/components/SchemaForm.svelte.d.ts

@@ -2,23 +2,19 @@ import { SvelteComponentTyped } from "svelte";
 import type { Schema } from '../common';
 declare const __propDef: {
     props: {
-        inputTransform?: boolean | undefined;
         schema: Schema;
         args?: Record<string, any> | undefined;
         disabledArgs?: string[] | undefined;
         disabled?: boolean | undefined;
         editableSchema?: boolean | undefined;
         isValid?: boolean | undefined;
-        extraLib?: string | undefined;
         autofocus?: boolean | undefined;
-        previousModuleId?: string | undefined;
         shouldHideNoInputs?: boolean | undefined;
         compact?: boolean | undefined;
         password?: string | undefined;
         noVariablePicker?: boolean | undefined;
-        filter?: string[] | undefined;
-        noDynamicToggle?: boolean | undefined;
         flexWrap?: boolean | undefined;
+        noDelete?: boolean | undefined;
         class?: string | undefined;
     };
     events: {

package/components/ScriptBuilder.svelte

@@ -10,17 +10,16 @@ import RadioButton from './RadioButton.svelte';
 import ScriptEditor from './ScriptEditor.svelte';
 import ScriptSchema from './ScriptSchema.svelte';
 import CenteredPage from './CenteredPage.svelte';
-import UnsavedConfirmationModal from './common/confirmationModal/UnsavedConfirmationModal.svelte';
 import { dirtyStore } from './common/confirmationModal/dirtyStore';
-import { Button } from './common';
+import { Button, ButtonPopup, ButtonPopupItem, Kbd } from './common';
 import { faChevronDown, faChevronUp, faPen, faSave } from '@fortawesome/free-solid-svg-icons';
 import Breadcrumb from './common/breadcrumb/Breadcrumb.svelte';
-import Toggle from './Toggle.svelte';
 import LanguageIcon from './common/languageIcons/LanguageIcon.svelte';
 export let script;
 export let initialPath = '';
 export let template = 'script';
 export let initialArgs = {};
+export let lockedLanguage = false;
 const langs = [
     ['Typescript', Script.language.DENO],
     ['Python', Script.language.PYTHON3],
@@ -31,7 +30,7 @@ let viewScriptKind = script.kind !== Script.kind.SCRIPT;
 let pathError = '';
 let summaryC = undefined;
 let pathC = undefined;
-$: setQueryWithoutLoad($page.url, 'state', encodeState(script));
+$: setQueryWithoutLoad($page.url, [{ key: 'state', value: encodeState(script) }]);
 $: step = Number($page.url.searchParams.get('step')) || 1;
 if (script.content == '') {
     initContent(script.language, script.kind, template);
@@ -39,14 +38,19 @@ if (script.content == '') {
 function initContent(language, kind, template) {
     script.content = initialCode(language, kind, template);
 }
-async function editScript() {
+let loadingSave = false;
+async function editScript(leave) {
+    loadingSave = true;
     try {
         $dirtyStore = false;
         localStorage.removeItem(script.path);
         script.schema = script.schema ?? emptySchema();
-        if (!script.schema) {
+        try {
             await inferArgs(script.language, script.content, script.schema);
         }
+        catch (error) {
+            sendUserToast(`Impossible to infer the schema. Assuming this is a script without main function`, true);
+        }
         const newHash = await ScriptService.createScript({
             workspace: $workspaceStore,
             requestBody: {
@@ -61,25 +65,41 @@ async function editScript() {
                 kind: script.kind
             }
         });
-        sendUserToast(`Success! New script version created with hash ${newHash}`);
-        goto(`/scripts/get/${newHash}`);
+        if (leave) {
+            history.replaceState(history.state, '', `/scripts/edit/${newHash}?step=2`);
+            goto(`/scripts/get/${newHash}?workspace_id=${$workspaceStore}`);
+        }
+        else {
+            await goto(`/scripts/edit/${newHash}?step=2`);
+            script.hash = newHash;
+        }
     }
     catch (error) {
-        sendUserToast(`Impossible to save the script: ${error.body}`, true);
+        sendUserToast(`Impossible to save the script: ${error.body || error.message}`, true);
     }
+    loadingSave = false;
 }
 async function changeStep(step) {
     if (step > 1) {
         script.schema = script.schema ?? emptySchema();
-        await inferArgs(script.language, script.content, script.schema);
+        try {
+            await inferArgs(script.language, script.content, script.schema);
+        }
+        catch (error) {
+            console.info('Impossible to infer the schema. Assuming this is a script without main function');
+        }
     }
     goto(`?step=${step}`);
 }
 $: kind = script.kind;
+function onKeyDown(event) {
+    if (event.key == 'Enter' && step == 1) {
+        changeStep(2);
+    }
+}
 </script>
 
 {#if !$userStore?.operator}
-	<UnsavedConfirmationModal />
 	<div class="flex flex-col h-screen">
 		<!-- Nav between steps-->
 		<div class="flex flex-col w-full px-2 py-1  border-b shadow-sm">
@@ -139,20 +159,30 @@ $: kind = script.kind;
 					<Button
 						size="sm"
 						variant={step == 1 ? 'contained' : 'border'}
-						btnClasses={step == 3 ? 'invisible' : ''}
+						btnClasses={step == 3 ? 'invisible' : 'inline-flex gap-2'}
 						disabled={step === 1 && pathError !== ''}
 						on:click={() => changeStep(step + 1)}
 					>
-						Next
+						Next {#if step == 1}<Kbd>Enter</Kbd>{/if}
 					</Button>
-					<Button
+					<ButtonPopup
+						loading={loadingSave}
 						size="sm"
 						variant={step == 1 ? 'border' : 'contained'}
 						disabled={step === 1 && pathError !== ''}
-						btnClasses={step == 1 && initialPath == '' ? 'invisible' : ''}
 						startIcon={{ icon: faSave }}
-						on:click={editScript}>Save</Button
+						on:click={() => editScript(false)}
 					>
+						<svelte:fragment slot="main">Save</svelte:fragment>
+						<ButtonPopupItem on:click={() => editScript(true)}>Save and exit</ButtonPopupItem>
+						{#if initialPath != ''}
+							<ButtonPopupItem
+								on:click={() => {
+									window.open(`/scripts/add?template=${initialPath}`)
+								}}>Fork</ButtonPopupItem
+							>
+						{/if}
+					</ButtonPopup>
 				</div>
 			</div>
 		</div>
@@ -160,24 +190,30 @@ $: kind = script.kind;
 		<!-- metadata -->
 		{#if step === 1}
 			<CenteredPage>
-				<h2 class="border-b pb-1 mt-4 mb-2">Path</h2>
+				<h2 class="border-b pb-1 mt-8 mb-2">Path</h2>
 				<Path
 					bind:this={pathC}
 					bind:error={pathError}
 					bind:path={script.path}
 					{initialPath}
 					on:enter={() => changeStep(2)}
-					namePlaceholder="my_script"
+					namePlaceholder="script"
 					kind="script"
 				/>
-				<h2 class="border-b pb-1 mt-8 mb-4">Summary</h2>
+				<h2 class="border-b pb-1 mt-12 mb-4">Summary</h2>
 				<input
 					type="text"
 					bind:this={summaryC}
 					bind:value={script.summary}
-					placeholder="A short summary of the script displayed when the script is listed"
+					placeholder="Short summary to be displayed when listed"
 				/>
-				<h2 class="border-b pb-1 mt-8 mb-6">Language</h2>
+
+				<h2 class="border-b pb-1 mt-12 mb-6">Language</h2>
+				{#if lockedLanguage}
+					<div class="text-sm text-gray-600 italic mb-2">
+						As a forked script, the language '{script.language}' cannot be modified.
+					</div>
+				{/if}
 				<div class="flex flex-row gap-2 flex-wrap">
 					{#each langs as [label, lang]}
 						{@const isPicked = script.language == lang && template == 'script'}
@@ -191,8 +227,9 @@ $: kind = script.kind;
 								template = 'script'
 								initContent(lang, script.kind, template)
 							}}
+							disabled={lockedLanguage}
 						>
-							<LanguageIcon {lang} /><span class="ml-2">{label}</span>
+							<LanguageIcon {lang} /><span class="ml-2 py-4">{label}</span>
 						</Button>
 					{/each}
 					<Button
@@ -200,15 +237,16 @@ $: kind = script.kind;
 						variant="border"
 						color={template == 'pgsql' ? 'blue' : 'dark'}
 						btnClasses={template == 'pgsql' ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
+						disabled={lockedLanguage}
 						on:click={() => {
 							script.language = Script.language.DENO
 							template = 'pgsql'
 							initContent(script.language, script.kind, template)
 						}}
 					>
-						<LanguageIcon lang="pgsql" /><span class="ml-2">PostgreSQL</span>
+						<LanguageIcon lang="pgsql" /><span class="ml-2 py-4">PostgreSQL</span>
 					</Button>
-					<Button
+					<!-- <Button
 						size="sm"
 						variant="border"
 						color={template == 'mysql' ? 'blue' : 'dark'}
@@ -219,11 +257,10 @@ $: kind = script.kind;
 							initContent(script.language, script.kind, template)
 						}}
 					>
-						<LanguageIcon lang="mysql" /><span class="ml-2">MySQL</span>
-					</Button>
+						<LanguageIcon lang="mysql" /><span class="ml-2 py-4">MySQL</span>
+					</Button> -->
 				</div>
-				<h2 class="border-b pb-1 mt-8 mb-4">Advanced</h2>
-				<div class="mb-4">
+				<div class="mt-16 mb-4">
 					<Button
 						color="light"
 						size="sm"
@@ -273,12 +310,12 @@ $: kind = script.kind;
 						/>
 					</div>
 				{/if}
-				<div class="ml-3">
+				<!-- <div class="ml-3">
 					<Toggle
 						bind:checked={script.is_template}
 						options={{ right: 'Save as a workspace template' }}
 					/>
-				</div>
+				</div> -->
 			</CenteredPage>
 		{:else if step === 2}
 			<ScriptEditor
@@ -298,3 +335,5 @@ $: kind = script.kind;
 {:else}
 	Script Builder not available to operators
 {/if}
+
+<svelte:window on:keydown={onKeyDown} />

package/components/ScriptBuilder.svelte.d.ts

@@ -6,6 +6,7 @@ declare const __propDef: {
         initialPath?: string | undefined;
         template?: "script" | "pgsql" | "mysql" | undefined;
         initialArgs?: Record<string, any> | undefined;
+        lockedLanguage?: boolean | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/components/ScriptEditor.svelte

@@ -83,6 +83,7 @@ async function inferSchema(code) {
 }
 onMount(() => {
     inferSchema(code);
+    loadPastTests();
 });
 </script>
 

package/components/ScriptPicker.svelte

@@ -7,6 +7,7 @@ import RadioButton from './RadioButton.svelte';
 import { Button, Drawer, DrawerContent } from './common';
 import HighlightCode from './HighlightCode.svelte';
 import FlowPathViewer from './flows/content/FlowPathViewer.svelte';
+import { SELECT_INPUT_DEFAULT_STYLE } from '../defaults';
 export let initialPath = undefined;
 export let scriptPath = undefined;
 export let allowFlow = false;
@@ -78,6 +79,8 @@ $: itemKind && $workspaceStore && loadItems();
 			bind:justValue={scriptPath}
 			{items}
 			placeholder="Pick a {itemKind}"
+			inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
+			containerStyles={SELECT_INPUT_DEFAULT_STYLE.containerStyles}
 		/>
 	{/if}
 

package/components/SharedBadge.svelte

@@ -1,6 +1,7 @@
 <script>import { userStore } from '../stores';
 import { Users } from 'lucide-svelte';
 import Badge from './common/badge/Badge.svelte';
+import Popover from './Popover.svelte';
 import Tooltip from './Tooltip.svelte';
 export let extraPerms = {};
 export let canWrite;
@@ -49,10 +50,9 @@ $: {
 
 {#if kind === 'read' || kind === 'write'}
 	<Badge capitalize color="blue" baseClass="border border-blue-200 flex gap-1 items-center">
-		<Users size={12} />
-		{kind}
-		{#if reason}
-			<Tooltip><span class="normal-case">{reason}</span></Tooltip>
-		{/if}
+		<Popover notClickable>
+			<Users size={12} />
+			<span slot="text">{kind == 'read' ? 'Shared & read-only' : 'Read & Write'} {reason}</span>
+		</Popover>
 	</Badge>
 {/if}

package/components/SimpleEditor.svelte

@@ -92,6 +92,9 @@ function format() {
         }
     }
 }
+export function focus() {
+    editor?.focus();
+}
 let width = 0;
 async function loadMonaco() {
     model = meditor.createModel(code, lang, mUri.parse(uri));
@@ -175,7 +178,7 @@ onDestroy(() => {
 });
 </script>
 
-<div bind:this={divEl} class="{$$props.class} editor" bind:clientWidth={width} />
+<div bind:this={divEl} class="{$$props.class ?? ''} editor" bind:clientWidth={width} />
 
 <style>
 	.editor {

package/components/SimpleEditor.svelte.d.ts

@@ -15,6 +15,7 @@ declare const __propDef: {
         getCode?: (() => string) | undefined;
         insertAtCursor?: ((code: string) => void) | undefined;
         setCode?: ((ncode: string) => void) | undefined;
+        focus?: (() => void) | undefined;
     };
     events: {
         change: CustomEvent<any>;
@@ -32,5 +33,6 @@ export default class SimpleEditor extends SvelteComponentTyped<SimpleEditorProps
     get getCode(): () => string;
     get insertAtCursor(): (code: string) => void;
     get setCode(): (ncode: string) => void;
+    get focus(): () => void;
 }
 export {};

package/components/Slider.svelte

@@ -0,0 +1,19 @@
+<script>import { ChevronDown, ChevronUp } from 'lucide-svelte';
+import { slide } from 'svelte/transition';
+import Button from './common/button/Button.svelte';
+import Tooltip from './Tooltip.svelte';
+export let text;
+export let tooltip = undefined;
+export let view = false;
+</script>
+
+<Button color="light" on:click={() => (view = !view)} variant="border"
+	>{text}
+	{#if tooltip}
+		<Tooltip wrapperClass="mx-1">{tooltip}</Tooltip>
+	{/if}
+	{#if !view}<ChevronDown />{:else}<ChevronUp />{/if}</Button
+>
+{#if view}
+	<div class="my-4 px-2" transition:slide|local><slot /></div>
+{/if}

package/components/Slider.svelte.d.ts

@@ -0,0 +1,20 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        text: string;
+        tooltip?: string | undefined;
+        view?: boolean | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {};
+    };
+};
+export type SliderProps = typeof __propDef.props;
+export type SliderEvents = typeof __propDef.events;
+export type SliderSlots = typeof __propDef.slots;
+export default class Slider extends SvelteComponentTyped<SliderProps, SliderEvents, SliderSlots> {
+}
+export {};

package/components/StringTypeNarrowing.svelte

@@ -61,7 +61,6 @@ function computeKind() {
 		['None', 'none'],
 		['File (base64)', 'base64'],
 		['Enum', 'enum'],
-		['Resource Path', 'resource'],
 		['Format', 'format'],
 		['Pattern', 'pattern']
 	]}

package/components/SuperadminSettings.svelte

@@ -2,10 +2,11 @@
 import TableCustom from './TableCustom.svelte';
 import PageHeader from './PageHeader.svelte';
 import InviteGlobalUser from './InviteGlobalUser.svelte';
-import { Alert, Badge, Drawer, DrawerContent } from './common';
-import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte';
+import { Badge, Drawer, DrawerContent } from './common';
 import { sendUserToast } from '../utils';
 import SearchItems from './SearchItems.svelte';
+import { page } from '$app/stores';
+import { goto } from '$app/navigation';
 let drawer;
 let filter = '';
 export function openDrawer() {
@@ -16,6 +17,13 @@ export function openDrawer() {
 export function toggleDrawer() {
     drawer?.toggleDrawer?.();
 }
+export function closeDrawer() {
+    drawer?.closeDrawer();
+    const index = $page.url.href.lastIndexOf('#');
+    const href = $page.url.href;
+    const hashRemoved = index === -1 ? href : href.slice(0, index);
+    goto(hashRemoved);
+}
 let version;
 let users = [];
 let filteredUsers = [];
@@ -35,7 +43,7 @@ async function listUsers() {
 />
 
 <Drawer bind:this={drawer} on:open={listUsers} size="900px">
-	<DrawerContent overflow_y={false} title="Superadmin Settings" on:close={drawer.closeDrawer}>
+	<DrawerContent overflow_y={false} title="Superadmin Settings" on:close={closeDrawer}>
 		<div class="flex flex-col h-full">
 			<div>
 				<div class="text-xs pt-1 text-gray-500 ">

package/components/SuperadminSettings.svelte.d.ts

@@ -3,6 +3,7 @@ declare const __propDef: {
     props: {
         openDrawer?: (() => void) | undefined;
         toggleDrawer?: (() => void) | undefined;
+        closeDrawer?: (() => void) | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;
@@ -15,5 +16,6 @@ export type SuperadminSettingsSlots = typeof __propDef.slots;
 export default class SuperadminSettings extends SvelteComponentTyped<SuperadminSettingsProps, SuperadminSettingsEvents, SuperadminSettingsSlots> {
     get openDrawer(): () => void;
     get toggleDrawer(): () => void;
+    get closeDrawer(): () => void;
 }
 export {};

package/components/TemplateEditor.svelte

@@ -517,7 +517,7 @@ onDestroy(() => {
 <div
 	bind:this={divEl}
 	style="height: 18px;"
-	class="{$$props.class} template rounded-lg min-h-4 mx-0.5"
+	class="{$$props.class ?? ''} template rounded-lg min-h-4 mx-0.5 overflow-clip"
 	bind:clientWidth={width}
 />