windmill-components 1.60.3 → 1.83.1

package/components/ScriptBuilder.svelte

@@ -2,36 +2,57 @@
 import { goto } from '$app/navigation';
 import { page } from '$app/stores';
 import { inferArgs } from '../infer';
-import { initialCode, isInitialCode } from '../script_helpers';
+import { initialCode } from '../script_helpers';
 import { userStore, workspaceStore } from '../stores';
 import { emptySchema, encodeState, sendUserToast, setQueryWithoutLoad } from '../utils';
 import Path from './Path.svelte';
-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 { faChevronDown, faChevronUp, faPen, faSave } from '@fortawesome/free-solid-svg-icons';
+import { Button, ButtonPopup, ButtonPopupItem, Kbd } from './common';
+import { 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';
+import Tooltip from './Tooltip.svelte';
+import SettingSection from './SettingSection.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],
     ['Go', Script.language.GO],
     ['Bash', Script.language.BASH]
 ];
-let viewScriptKind = script.kind !== Script.kind.SCRIPT;
+const scriptKindOptions = [
+    {
+        value: Script.kind.SCRIPT,
+        title: 'Action'
+    },
+    {
+        value: Script.kind.TRIGGER,
+        title: 'Trigger',
+        desc: 'First module of flows to trigger them based on external changes. These kind of scripts are usually running on a schedule to periodically look for changes.'
+    },
+    {
+        value: Script.kind.APPROVAL,
+        title: 'Approval',
+        desc: 'Send notifications externally to ask for approval to continue a flow.'
+    },
+    {
+        value: Script.kind.FAILURE,
+        title: 'Error Handler',
+        desc: 'Handle errors in flows after all retry attempts have been exhausted.'
+    }
+];
 let pathError = '';
 let summaryC = undefined;
 let pathC = undefined;
-$: setQueryWithoutLoad($page.url, 'state', encodeState(script));
+let loadingSave = false;
+$: 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 +60,18 @@ if (script.content == '') {
 function initContent(language, kind, template) {
     script.content = initialCode(language, kind, template);
 }
-async function editScript() {
+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 +86,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 +180,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,125 +211,111 @@ $: kind = script.kind;
 		<!-- metadata -->
 		{#if step === 1}
 			<CenteredPage>
-				<h2 class="border-b pb-1 mt-4 mb-2">Path</h2>
-				<Path
-					bind:this={pathC}
-					bind:error={pathError}
-					bind:path={script.path}
-					{initialPath}
-					on:enter={() => changeStep(2)}
-					namePlaceholder="my_script"
-					kind="script"
-				/>
-				<h2 class="border-b pb-1 mt-8 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"
-				/>
-				<h2 class="border-b pb-1 mt-8 mb-6">Language</h2>
-				<div class="flex flex-row gap-2 flex-wrap">
-					{#each langs as [label, lang]}
-						{@const isPicked = script.language == lang && template == 'script'}
+				<SettingSection title="Path" element="h2">
+					<Path
+						bind:this={pathC}
+						bind:error={pathError}
+						bind:path={script.path}
+						{initialPath}
+						on:enter={() => changeStep(2)}
+						namePlaceholder="script"
+						kind="script"
+					/>
+				</SettingSection>
+				<SettingSection title="Summary" element="h2">
+					<input
+						type="text"
+						bind:this={summaryC}
+						bind:value={script.summary}
+						placeholder="Short summary to be displayed when listed"
+					/>
+				</SettingSection>
+				<SettingSection title="Language" element="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'}
+							<Button
+								size="sm"
+								variant="border"
+								color={isPicked ? 'blue' : 'dark'}
+								btnClasses={isPicked ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
+								on:click={() => {
+									script.language = lang
+									template = 'script'
+									initContent(lang, script.kind, template)
+								}}
+								disabled={lockedLanguage}
+							>
+								<LanguageIcon {lang} />
+								<span class="ml-2 py-2">{label}</span>
+							</Button>
+						{/each}
 						<Button
 							size="sm"
 							variant="border"
-							color={isPicked ? 'blue' : 'dark'}
-							btnClasses={isPicked ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
+							color={template == 'pgsql' ? 'blue' : 'dark'}
+							btnClasses={template == 'pgsql' ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
+							disabled={lockedLanguage}
 							on:click={() => {
-								script.language = lang
-								template = 'script'
-								initContent(lang, script.kind, template)
+								script.language = Script.language.DENO
+								template = 'pgsql'
+								initContent(script.language, script.kind, template)
 							}}
 						>
-							<LanguageIcon {lang} /><span class="ml-2">{label}</span>
+							<LanguageIcon lang="pgsql" /><span class="ml-2 py-2">PostgreSQL</span>
 						</Button>
-					{/each}
-					<Button
-						size="sm"
-						variant="border"
-						color={template == 'pgsql' ? 'blue' : 'dark'}
-						btnClasses={template == 'pgsql' ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
-						on:click={() => {
-							script.language = Script.language.DENO
-							template = 'pgsql'
-							initContent(script.language, script.kind, template)
-						}}
-					>
-						<LanguageIcon lang="pgsql" /><span class="ml-2">PostgreSQL</span>
-					</Button>
-					<Button
-						size="sm"
-						variant="border"
-						color={template == 'mysql' ? 'blue' : 'dark'}
-						btnClasses={template == 'mysql' ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
-						on:click={() => {
-							script.language = Script.language.DENO
-							template = 'mysql'
-							initContent(script.language, script.kind, template)
-						}}
-					>
-						<LanguageIcon lang="mysql" /><span class="ml-2">MySQL</span>
-					</Button>
-				</div>
-				<h2 class="border-b pb-1 mt-8 mb-4">Advanced</h2>
-				<div class="mb-4">
-					<Button
-						color="light"
-						size="sm"
-						endIcon={{ icon: viewScriptKind ? faChevronUp : faChevronDown }}
-						on:click={() => (viewScriptKind = !viewScriptKind)}
-					>
-						Tag this script as having a specific purpose inside flows
-					</Button>
-				</div>
-				{#if viewScriptKind}
-					<div class="max-w-lg">
-						<RadioButton
-							label="Script Type"
-							options={[
-								['Action', Script.kind.SCRIPT],
-								[
-									{
-										title: 'Trigger',
-										desc: `First module of flows to trigger them based on watching changes external periodically using an internal state`
-									},
-									Script.kind.TRIGGER
-								],
-								[
-									{
-										title: 'Approval',
-										desc: `Send notification externally to ask for approval to continue a flow`
-									},
-									Script.kind.APPROVAL
-								],
-								[
-									{
-										title: 'Error Handler',
-										desc: `Handle errors for flows after all retries attempts have been exhausted`
-									},
-									Script.kind.FAILURE
-								]
-
-								// ['Command Handler', Script.kind.COMMAND]
-							]}
-							on:change={(e) => {
-								if (isInitialCode(script.content)) {
-									template = 'script'
-									initContent(script.language, e.detail, template)
-								}
+						<!-- <Button
+							size="sm"
+							variant="border"
+							color={template == 'mysql' ? 'blue' : 'dark'}
+							btnClasses={template == 'mysql' ? '!border-2 !bg-blue-50/75' : 'm-[1px]'}
+							on:click={() => {
+								script.language = Script.language.DENO
+								template = 'mysql'
+								initContent(script.language, script.kind, template)
 							}}
-							bind:value={script.kind}
-						/>
+						>
+							<LanguageIcon lang="mysql" /><span class="ml-2 py-2">MySQL</span>
+						</Button> -->
 					</div>
-				{/if}
-				<div class="ml-3">
-					<Toggle
-						bind:checked={script.is_template}
-						options={{ right: 'Save as a workspace template' }}
-					/>
-				</div>
+				</SettingSection>
+				<SettingSection
+					title="Script kind"
+					element="h3"
+					tooltip="Tag this script as having a specific purpose inside flows. If it won't be used in flows,
+				you don't have to worry about this."
+					accordion
+				>
+					<div class="flex flex-wrap gap-2">
+						{#each scriptKindOptions as { value, title, desc }}
+							{@const isPicked = script.kind === value}
+							<Button
+								size="sm"
+								variant="border"
+								color={isPicked ? 'blue' : 'dark'}
+								btnClasses="font-medium {isPicked ? '!bg-blue-50/75' : ''}"
+								on:click={() => {
+									template = 'script'
+									script.kind = value
+									initContent(script.language, value, template)
+								}}
+								disabled={lockedLanguage}
+							>
+								{title}
+								{#if desc}
+									<Tooltip class="mb-0.5 ml-1">
+										{desc}
+									</Tooltip>
+								{/if}
+							</Button>
+						{/each}
+					</div>
+				</SettingSection>
 			</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/SettingSection.svelte

@@ -0,0 +1,44 @@
+<script>import { ChevronDown } from 'lucide-svelte';
+import { slide } from 'svelte/transition';
+import Tooltip from './Tooltip.svelte';
+export let title;
+export let tooltip = '';
+export let element = 'h2';
+export let accordion = false;
+let showContent = !accordion;
+</script>
+
+<div class="border-b [&:has(button:hover)]:border-gray-400 duration-200 pb-1 mt-8 mb-2">
+	{#if accordion}
+		<button
+			class="flex w-full justify-start items-center"
+			on:click={() => (showContent = !showContent)}
+		>
+			<span class="rounded-full hover:bg-gray-100 focus:bg-gray-100 p-1 mr-1">
+				<ChevronDown size={22} class="rotate-0 duration-300 {showContent ? '!-rotate-180' : ''}" />
+			</span>
+			<svelte:element this={element}>
+				{title}
+				{#if tooltip}
+					<Tooltip scale={0.9} class="mb-0.5">
+						{tooltip}
+					</Tooltip>
+				{/if}
+			</svelte:element>
+		</button>
+	{:else}
+		<svelte:element this={element}>
+			{title}
+			{#if tooltip}
+				<Tooltip scale={0.9} class="mb-0.5">
+					{tooltip}
+				</Tooltip>
+			{/if}
+		</svelte:element>
+	{/if}
+</div>
+{#if showContent}
+	<div transition:slide|local={{ duration: 300 }}>
+		<slot />
+	</div>
+{/if}

package/components/SettingSection.svelte.d.ts

@@ -0,0 +1,21 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        title: string;
+        tooltip?: string | undefined;
+        element?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | undefined;
+        accordion?: boolean | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {};
+    };
+};
+export type SettingSectionProps = typeof __propDef.props;
+export type SettingSectionEvents = typeof __propDef.events;
+export type SettingSectionSlots = typeof __propDef.slots;
+export default class SettingSection extends SvelteComponentTyped<SettingSectionProps, SettingSectionEvents, SettingSectionSlots> {
+}
+export {};

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

@@ -82,7 +82,7 @@ export function setCode(ncode) {
         editor.setValue(ncode);
     }
 }
-function format() {
+export function format() {
     if (editor) {
         code = getCode();
         editor.getAction('editor.action.formatDocument').run();
@@ -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));
@@ -143,7 +146,6 @@ async function loadMonaco() {
     });
     editor.onDidBlurEditorText(() => {
         code = getCode();
-        dispatch('blur');
     });
     if (lang == 'javascript') {
         const stdLib = { content: libStdContent, filePath: 'es5.d.ts' };
@@ -175,7 +177,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,11 +15,12 @@ declare const __propDef: {
         getCode?: (() => string) | undefined;
         insertAtCursor?: ((code: string) => void) | undefined;
         setCode?: ((ncode: string) => void) | undefined;
+        format?: (() => void) | undefined;
+        focus?: (() => void) | undefined;
     };
     events: {
         change: CustomEvent<any>;
         focus: CustomEvent<any>;
-        blur: CustomEvent<any>;
     } & {
         [evt: string]: CustomEvent<any>;
     };
@@ -32,5 +33,7 @@ export default class SimpleEditor extends SvelteComponentTyped<SimpleEditorProps
     get getCode(): () => string;
     get insertAtCursor(): (code: string) => void;
     get setCode(): (ncode: string) => void;
+    get format(): () => 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 ">