windmill-components 1.522.0 → 1.531.0

package/package/components/modulesTest.svelte.d.ts

@@ -1,12 +1,15 @@
 import type { Job } from '../gen';
-type moduleTestState = {
+import type { GraphModuleState } from './graph';
+export type ModuleTestState = {
     loading: boolean;
     cancel?: () => Promise<void>;
     testJob?: Job;
+    hiddenInGraph?: boolean;
 };
 export declare class ModulesTestStates {
-    states: Record<string, moduleTestState>;
+    states: Record<string, ModuleTestState>;
     runTestCb?: (moduleId: string) => void;
+    hideJobsInGraph(): void;
     constructor(runTestCb?: (moduleId: string) => void);
 }
-export {};
+export declare function jobToGraphModuleState(testState: ModuleTestState): GraphModuleState | undefined;

package/package/components/modulesTest.svelte.js

@@ -1,8 +1,40 @@
 export class ModulesTestStates {
     states = $state({});
     runTestCb;
+    hideJobsInGraph() {
+        for (const state of Object.values(this.states)) {
+            state.hiddenInGraph = true;
+        }
+    }
     constructor(runTestCb) {
         this.states = {};
         this.runTestCb = runTestCb;
     }
 }
+export function jobToGraphModuleState(testState) {
+    if (testState.hiddenInGraph) {
+        return undefined;
+    }
+    else if (testState.loading) {
+        return {
+            type: 'InProgress',
+            args: {}
+        };
+    }
+    else if (testState.testJob) {
+        return {
+            args: testState.testJob.args,
+            type: testState.testJob.type === 'QueuedJob'
+                ? 'InProgress'
+                : testState.testJob['success']
+                    ? 'Success'
+                    : 'Failure',
+            job_id: testState.testJob.id,
+            tag: testState.testJob.tag,
+            duration_ms: testState.testJob['duration_ms'],
+            started_at: testState.testJob.started_at
+                ? new Date(testState.testJob.started_at).getTime()
+                : undefined
+        };
+    }
+}

package/package/components/preview/FlowPreviewStatus.svelte

@@ -16,7 +16,9 @@ let { job, hideJobId = false, extra } = $props();
 	{#if job && !hideJobId}
 		<div>
 			<div class="text-primary whitespace-nowrap truncate text-sm">
-				<span class="font-semibold mr-1">Flow:</span>
+				{#if ['flow', 'flowpreview', 'flownode'].includes(job.job_kind)}
+					<span class="font-semibold mr-1">Flow:</span>
+				{/if}
 				<a
 					rel="noreferrer"
 					target="_blank"

package/package/components/raw_apps/RawAppEditor.svelte

@@ -1,4 +1,5 @@
-<script lang="ts">import { Pane, Splitpanes } from 'svelte-splitpanes';
+<script lang="ts">import { run } from 'svelte/legacy';
+import { Pane, Splitpanes } from 'svelte-splitpanes';
 import { writable } from 'svelte/store';
 import RawAppInlineScriptsPanel from './RawAppInlineScriptsPanel.svelte';
 import RawAppEditorHeader from './RawAppEditorHeader.svelte';
@@ -11,19 +12,10 @@ import { workspaceStore } from '../../stores';
 import { genWmillTs } from './utils';
 import HideButton from '../apps/editor/settingsPanel/HideButton.svelte';
 import DarkModeObserver from '../DarkModeObserver.svelte';
-export let initFiles;
-export let initRunnables;
-export let newApp;
-export let policy;
-export let summary = '';
-export let path;
-export let newPath = undefined;
-export let savedApp = undefined;
-export let diffDrawer = undefined;
+let { initFiles, initRunnables, newApp, policy, summary = $bindable(''), path, newPath = undefined, savedApp = $bindable(undefined), diffDrawer = undefined } = $props();
 export const version = undefined;
 let runnables = writable(initRunnables);
-let files = initFiles;
-$: $runnables && files && saveFrontendDraft();
+let files = $state(initFiles);
 let draftTimeout = undefined;
 function saveFrontendDraft() {
     draftTimeout && clearTimeout(draftTimeout);
@@ -39,16 +31,11 @@ function saveFrontendDraft() {
         }
     }, 500);
 }
-let iframe = undefined;
-let appPanelSize = 70;
-let jobs = [];
-let jobsById = {};
-let iframeLoaded = false; // @hmr:keep
-$: iframe && iframeLoaded && initFiles && populateFiles();
-$: iframe && iframeLoaded && $runnables && populateRunnables();
-$: iframe?.addEventListener('load', () => {
-    iframeLoaded = true;
-});
+let iframe = $state(undefined);
+let appPanelSize = $state(70);
+let jobs = $state([]);
+let jobsById = $state({});
+let iframeLoaded = $state(false); // @hmr:keep
 function populateFiles() {
     iframe?.contentWindow?.postMessage({
         type: 'setFiles',
@@ -61,7 +48,7 @@ function populateRunnables() {
         dts: genWmillTs($runnables)
     }, '*');
 }
-let selectedRunnable = undefined;
+let selectedRunnable = $state(undefined);
 function listener(e) {
     if (e.data.type === 'setFiles') {
         files = e.data.files;
@@ -79,10 +66,24 @@ async function getBundle() {
         }, '*');
     });
 }
-let darkMode = undefined;
+let darkMode = $state(false);
+run(() => {
+    $runnables && files && saveFrontendDraft();
+});
+run(() => {
+    iframe?.addEventListener('load', () => {
+        iframeLoaded = true;
+    });
+});
+run(() => {
+    iframe && iframeLoaded && initFiles && populateFiles();
+});
+run(() => {
+    iframe && iframeLoaded && $runnables && populateRunnables();
+});
 </script>
 
-<svelte:window on:message={listener} />
+<svelte:window onmessage={listener} />
 <DarkModeObserver bind:darkMode />
 
 <RawAppBackgroundRunner
@@ -127,7 +128,7 @@ let darkMode = undefined;
 			></iframe>
 		</Pane>
 		<Pane>
-			<!-- svelte-ignore a11y-no-static-element-interactions -->
+			<!-- svelte-ignore a11y_no_static_element_interactions -->
 			<div class="flex h-full w-full">
 				<RawAppInlineScriptsPanel
 					on:hidePanel={() => {

package/package/components/raw_apps/RawAppEditor.svelte.d.ts

@@ -1,20 +1,7 @@
 import type { HiddenRunnable } from '../apps/types';
 import { type Policy } from '../../gen';
 import DiffDrawer from '../DiffDrawer.svelte';
-interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
-    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
-        $$bindings?: Bindings;
-    } & Exports;
-    (internal: unknown, props: Props & {
-        $$events?: Events;
-        $$slots?: Slots;
-    }): Exports & {
-        $set?: any;
-        $on?: any;
-    };
-    z_$$bindings?: Bindings;
-}
-declare const RawAppEditor: $$__sveltets_2_IsomorphicComponent<{
+interface Props {
     initFiles: Record<string, string>;
     initRunnables: Record<string, HiddenRunnable>;
     newApp: boolean;
@@ -32,14 +19,27 @@ declare const RawAppEditor: $$__sveltets_2_IsomorphicComponent<{
         custom_path?: string;
     } | undefined;
     diffDrawer?: DiffDrawer | undefined;
-    version?: number | undefined;
-}, {
+}
+interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
+    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
+        $$bindings?: Bindings;
+    } & Exports;
+    (internal: unknown, props: Props & {
+        $$events?: Events;
+        $$slots?: Slots;
+    }): Exports & {
+        $set?: any;
+        $on?: any;
+    };
+    z_$$bindings?: Bindings;
+}
+declare const RawAppEditor: $$__sveltets_2_IsomorphicComponent<Props, {
     restore: CustomEvent<any>;
     savedNewAppPath: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
 }, {}, {
     version: number | undefined;
-}, string>;
+}, "summary" | "savedApp">;
 type RawAppEditor = InstanceType<typeof RawAppEditor>;
 export default RawAppEditor;

package/package/components/runs/{JobPreview.svelte → JobRunsPreview.svelte}

@@ -51,16 +51,13 @@ $effect(() => {
             }
         }));
 });
-$effect(() => {
-    job?.logs == undefined && job && viewTab == 'logs' && untrack(() => jobLoader?.getLogs());
-});
 $effect(() => {
     job?.id && lastJobId !== job.id && untrack(() => job && getConcurrencyKey(job));
 });
 let jobLoader = $state(undefined);
 </script>
 
-<JobLoader noLogs workspaceOverride={workspace} bind:job={currentJob} bind:this={jobLoader} />
+<JobLoader workspaceOverride={workspace} bind:job={currentJob} bind:this={jobLoader} />
 
 <div class="p-4 flex flex-col gap-2 items-start h-full">
 	{#if job}

package/package/components/runs/{JobPreview.svelte.d.ts → JobRunsPreview.svelte.d.ts}

@@ -16,11 +16,11 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     };
     z_$$bindings?: Bindings;
 }
-declare const JobPreview: $$__sveltets_2_IsomorphicComponent<Props, {
+declare const JobRunsPreview: $$__sveltets_2_IsomorphicComponent<Props, {
     filterByConcurrencyKey: CustomEvent<any>;
     filterByWorker: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
 }, {}, {}, "">;
-type JobPreview = InstanceType<typeof JobPreview>;
-export default JobPreview;
+type JobRunsPreview = InstanceType<typeof JobRunsPreview>;
+export default JobRunsPreview;

package/package/components/runs/RunRow.svelte

@@ -107,7 +107,11 @@ $: isExternal = job && job.id === '-';
 				{:else if `scheduled_for` in job && job.scheduled_for && forLater(job.scheduled_for)}
 					Scheduled for {displayDate(job.scheduled_for)}
 				{:else if job.canceled}
-					Cancelling job... (created <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />)
+					{#if job.type == 'CompletedJob'}
+						Cancelled <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />
+					{:else}
+						Cancelling job... (created <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />)
+					{/if}
 				{:else if `scheduled_for` in job && job.scheduled_for && forLater(job.scheduled_for)}
 					Waiting for executor (scheduled for <TimeAgo
 						agoOnlyIfRecent

package/package/components/schema/AddProperty.svelte

@@ -20,26 +20,26 @@ let argError = '';
 let editing = false;
 let oldArgName; // when editing argument and changing name
 let jsonEditor;
-reorder();
-function reorder() {
-    if (schema.order && Array.isArray(schema.order)) {
+reorder(schema);
+function reorder(s) {
+    if (s.order && Array.isArray(s.order)) {
         const n = {};
-        schema.order.forEach((x) => {
-            if (schema.properties && schema.properties[x] != undefined) {
-                n[x] = schema.properties[x];
+        s.order.forEach((x) => {
+            if (s.properties && s.properties[x] != undefined) {
+                n[x] = s.properties[x];
             }
         });
-        Object.keys(schema.properties ?? {})
-            .filter((x) => !schema.order?.includes(x))
+        Object.keys(s.properties ?? {})
+            .filter((x) => !s.order?.includes(x))
             .forEach((x) => {
-            n[x] = schema.properties[x];
+            n[x] = s.properties[x];
         });
         schema.properties = n;
     }
 }
-function syncOrders() {
-    if (schema) {
-        schema.order = Object.keys(schema.properties ?? {});
+function syncOrders(s) {
+    if (s) {
+        s.order = Object.keys(s.properties ?? {});
     }
 }
 function handleAddOrEditArgument(modalProperty) {
@@ -54,51 +54,55 @@ function handleAddOrEditArgument(modalProperty) {
         argError = 'There is already an argument with this name';
     }
     else {
-        if (!schema.properties) {
-            schema.properties = {};
+        let newSchema = { ...schema };
+        if (!newSchema.properties) {
+            newSchema.properties = {};
         }
-        if (!schema.required) {
-            schema.required = [];
+        if (!newSchema.required) {
+            newSchema.required = [];
         }
-        if (!schema.order || !Array.isArray(schema.order)) {
-            syncOrders();
+        if (!newSchema.order || !Array.isArray(newSchema.order)) {
+            syncOrders(newSchema);
         }
-        schema.properties[modalProperty.name] = modalToSchema(modalProperty);
+        newSchema.properties = {
+            ...newSchema.properties,
+            [modalProperty.name]: modalToSchema(modalProperty)
+        };
         if (modalProperty.required) {
-            if (!schema.required.includes(modalProperty.name)) {
-                schema.required.push(modalProperty.name);
+            if (!newSchema.required.includes(modalProperty.name)) {
+                newSchema.required.push(modalProperty.name);
             }
         }
-        else if (schema.required.includes(modalProperty.name)) {
-            const index = schema.required.indexOf(modalProperty.name, 0);
+        else if (newSchema.required.includes(modalProperty.name)) {
+            const index = newSchema.required.indexOf(modalProperty.name, 0);
             if (index > -1) {
-                schema.required.splice(index, 1);
+                newSchema.required.splice(index, 1);
             }
         }
         if (editing && oldArgName && oldArgName !== modalProperty.name) {
-            let oldPosition = schema.order.indexOf(oldArgName);
-            schema.order[oldPosition] = modalProperty.name;
-            reorder();
-            handleDeleteArgument([oldArgName]);
+            let oldPosition = newSchema.order.indexOf(oldArgName);
+            newSchema.order[oldPosition] = modalProperty.name;
+            reorder(newSchema);
+            handleDeleteArgument([oldArgName], newSchema);
         }
-        if (!schema.order?.includes(modalProperty.name)) {
-            schema.order.push(modalProperty.name);
+        if (!newSchema.order?.includes(modalProperty.name)) {
+            newSchema.order.push(modalProperty.name);
         }
         modalProperty = Object.assign({}, DEFAULT_PROPERTY);
         editing = false;
         oldArgName = undefined;
+        schema = newSchema;
+        schemaString = JSON.stringify(schema, null, '\t');
+        jsonEditor?.setCode(schemaString);
     }
-    schema = schema;
-    schemaString = JSON.stringify(schema, null, '\t');
-    jsonEditor?.setCode(schemaString);
     if (argError !== '') {
         sendUserToast(argError, true);
     }
     dispatch('change', schema);
 }
-export function handleDeleteArgument(argPath) {
+export function handleDeleteArgument(argPath, nschema) {
     try {
-        let modifiedObject = schema;
+        let modifiedObject = { ...(nschema ?? schema) };
         let modifiedProperties = modifiedObject.properties;
         let argName = argPath.pop();
         argPath.forEach((property) => {
@@ -118,7 +122,7 @@ export function handleDeleteArgument(argPath) {
             if (modifiedObject.order) {
                 modifiedObject.order = modifiedObject.order.filter((arg) => arg !== argName);
             }
-            schema = schema;
+            schema = modifiedObject;
             schemaString = JSON.stringify(schema, null, '\t');
             dispatch('change', schema);
         }
@@ -144,6 +148,7 @@ export function handleDeleteArgument(argPath) {
 				})
 			} catch (err) {
 				sendUserToast(`Could not add argument: ${err}`, true)
+				console.log('Could not add argument', err)
 			}
 		}}
 	/>

package/package/components/schema/AddProperty.svelte.d.ts

@@ -15,14 +15,14 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
 declare const AddProperty: $$__sveltets_2_IsomorphicComponent<{
     schema?: Schema | any;
     DEFAULT_PROPERTY?: ModalSchemaProperty;
-    handleDeleteArgument?: (argPath: string[]) => void;
+    handleDeleteArgument?: (argPath: string[], nschema?: Schema) => void;
 }, {
     change: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
 }, {}, {
     DEFAULT_PROPERTY: ModalSchemaProperty;
-    handleDeleteArgument: (argPath: string[]) => void;
+    handleDeleteArgument: (argPath: string[], nschema?: Schema) => void;
 }, string>;
 type AddProperty = InstanceType<typeof AddProperty>;
 export default AddProperty;

package/package/components/schema/AddPropertyV2.svelte

@@ -17,26 +17,26 @@ if (!schema) {
 let argError = '';
 let editing = false;
 let oldArgName; // when editing argument and changing name
-reorder();
-function reorder() {
-    if (schema.order && Array.isArray(schema.order)) {
+reorder(schema);
+function reorder(s) {
+    if (s.order && Array.isArray(s.order)) {
         const n = {};
-        schema.order.forEach((x) => {
-            if (schema.properties && schema.properties[x] != undefined) {
-                n[x] = schema.properties[x];
+        s.order.forEach((x) => {
+            if (s.properties && s.properties[x] != undefined) {
+                n[x] = s.properties[x];
             }
         });
-        Object.keys(schema.properties ?? {})
-            .filter((x) => !schema.order?.includes(x))
+        Object.keys(s.properties ?? {})
+            .filter((x) => !s.order?.includes(x))
             .forEach((x) => {
-            n[x] = schema.properties[x];
+            n[x] = s.properties[x];
         });
-        schema.properties = n;
+        s.properties = n;
     }
 }
-function syncOrders() {
-    if (schema) {
-        schema.order = Object.keys(schema.properties ?? {});
+function syncOrders(s) {
+    if (s) {
+        s.order = Object.keys(s.properties ?? {});
     }
 }
 export function handleAddOrEditArgument(modalProperty) {
@@ -51,49 +51,53 @@ export function handleAddOrEditArgument(modalProperty) {
         argError = 'There is already an argument with this name';
     }
     else {
-        if (!schema.properties) {
-            schema.properties = {};
+        let newSchema = { ...schema };
+        if (!newSchema.properties) {
+            newSchema.properties = {};
         }
-        if (!schema.required) {
-            schema.required = [];
+        if (!newSchema.required) {
+            newSchema.required = [];
         }
-        if (!schema.order || !Array.isArray(schema.order)) {
-            syncOrders();
+        if (!newSchema.order || !Array.isArray(newSchema.order)) {
+            syncOrders(newSchema);
         }
-        schema.properties[modalProperty.name] = modalToSchema(modalProperty);
+        newSchema.properties = {
+            ...newSchema.properties,
+            [modalProperty.name]: modalToSchema(modalProperty)
+        };
         if (modalProperty.required) {
-            if (!schema.required.includes(modalProperty.name)) {
-                schema.required.push(modalProperty.name);
+            if (!newSchema.required.includes(modalProperty.name)) {
+                newSchema.required.push(modalProperty.name);
             }
         }
-        else if (schema.required.includes(modalProperty.name)) {
-            const index = schema.required.indexOf(modalProperty.name, 0);
+        else if (newSchema.required.includes(modalProperty.name)) {
+            const index = newSchema.required.indexOf(modalProperty.name, 0);
             if (index > -1) {
-                schema.required.splice(index, 1);
+                newSchema.required.splice(index, 1);
             }
         }
         if (editing && oldArgName && oldArgName !== modalProperty.name) {
-            let oldPosition = schema.order.indexOf(oldArgName);
-            schema.order[oldPosition] = modalProperty.name;
-            reorder();
-            handleDeleteArgument([oldArgName]);
+            let oldPosition = newSchema.order.indexOf(oldArgName);
+            newSchema.order[oldPosition] = modalProperty.name;
+            reorder(newSchema);
+            handleDeleteArgument([oldArgName], newSchema);
         }
-        if (!schema.order?.includes(modalProperty.name)) {
-            schema.order.push(modalProperty.name);
+        if (!newSchema.order?.includes(modalProperty.name)) {
+            newSchema.order.push(modalProperty.name);
         }
         modalProperty = Object.assign({}, DEFAULT_PROPERTY);
         editing = false;
         oldArgName = undefined;
+        schema = $state.snapshot(newSchema);
+        dispatch('change', schema);
     }
-    schema = $state.snapshot(schema);
     if (argError !== '') {
         sendUserToast(argError, true);
     }
-    dispatch('change', schema);
 }
-export function handleDeleteArgument(argPath) {
+export function handleDeleteArgument(argPath, nschema) {
     try {
-        let modifiedObject = schema;
+        let modifiedObject = { ...(nschema ?? schema) };
         let modifiedProperties = modifiedObject.properties;
         let argName = argPath.pop();
         argPath.forEach((property) => {
@@ -118,8 +122,8 @@ export function handleDeleteArgument(argPath) {
         else {
             throw Error('Argument not found!');
         }
-        syncOrders();
-        schema = $state.snapshot(schema);
+        syncOrders(modifiedObject);
+        schema = $state.snapshot(modifiedObject);
         dispatch('change', schema);
     }
     catch (err) {

package/package/components/schema/AddPropertyV2.svelte.d.ts

@@ -25,7 +25,7 @@ declare const AddPropertyV2: $$__sveltets_2_IsomorphicComponent<Props, {
 }, {}, {
     DEFAULT_PROPERTY: ModalSchemaProperty;
     handleAddOrEditArgument: (modalProperty: ModalSchemaProperty) => void;
-    handleDeleteArgument: (argPath: string[]) => void;
+    handleDeleteArgument: (argPath: string[], nschema?: Schema) => void;
 }, "schema">;
 type AddPropertyV2 = InstanceType<typeof AddPropertyV2>;
 export default AddPropertyV2;

package/package/components/schema/FlowPropertyEditor.svelte

@@ -183,13 +183,16 @@ let isDynSelect = $derived(format?.startsWith('dynselect-') ?? false);
 				bind:schema={
 					() => {
 						if (oneOf?.[idx]) {
+							let properties = Object.fromEntries(
+								Object.entries(oneOf[idx].properties ?? {}).filter(
+									([k]) => k !== 'label' && k !== 'kind'
+								)
+							)
 							return {
 								...oneOf[idx],
-								properties: Object.fromEntries(
-									Object.entries(oneOf[idx].properties ?? {}).filter(
-										([k]) => k !== 'label' && k !== 'kind'
-									)
-								)
+								properties: properties,
+								order: Object.keys(properties),
+								required: oneOf[idx].required ?? []
 							}
 						}
 					},
@@ -198,7 +201,6 @@ let isDynSelect = $derived(format?.startsWith('dynselect-') ?? false);
 							const tagKey = oneOf?.find((o) => Object.keys(o.properties ?? {}).includes('kind'))
 								? 'kind'
 								: 'label'
-
 							oneOf[idx] = {
 								...(v ?? {}),
 								type: 'object',

package/package/components/search/RunsSearch.svelte

@@ -8,7 +8,7 @@ import { Alert } from '../common';
 import QuickMenuItem from './QuickMenuItem.svelte';
 import { goto } from '$app/navigation';
 import { displayDateOnly } from '../../utils';
-import JobPreview from '../runs/JobPreview.svelte';
+import JobPreview from '../runs/JobRunsPreview.svelte';
 let debounceTimeout = undefined;
 const debouncePeriod = 1000;
 let loadingCompletedRuns = $state(false);