windmill-components 1.89.1 → 1.103.1

package/package/components/flows/previousResults.js

@@ -1,4 +1,4 @@
-import { schemaToObject } from '../../utils';
+import { schemaToObject } from '../../schema';
 function getSubModules(flowModule) {
     if (flowModule.value.type === 'forloopflow') {
         return [flowModule.value.modules];
@@ -7,18 +7,17 @@ function getSubModules(flowModule) {
         return flowModule.value.branches.map((branch) => branch.modules);
     }
     else if (flowModule.value.type == 'branchone') {
-        return [
-            ...flowModule.value.branches.map((branch) => branch.modules),
-            flowModule.value.default
-        ];
+        return [...flowModule.value.branches.map((branch) => branch.modules), flowModule.value.default];
     }
     return [];
 }
 function getAllSubmodules(flowModule) {
     return getSubModules(flowModule).map((modules) => {
-        return modules.map((module) => {
+        return modules
+            .map((module) => {
             return [module, ...getAllSubmodules(module).flat()];
-        }).flat();
+        })
+            .flat();
     });
 }
 function dfs(id, flow, getParents = true) {
@@ -61,7 +60,7 @@ function getFlowInput(parentModules, flowState, args, schema) {
                         value: "Iteration's value",
                         index: "Iteration's index"
                     },
-                    ...parentFlowInput,
+                    ...parentFlowInput
                 };
             }
             else {
@@ -75,15 +74,19 @@ function getFlowInput(parentModules, flowState, args, schema) {
 }
 export function getStepPropPicker(flowState, parentModule, previousModule, id, flow, args, include_node) {
     const flowInput = getFlowInput(dfs(parentModule?.id, flow), flowState, args, flow.schema);
-    const previousIds = dfs(id, flow, false).map((x) => {
-        let submodules = getAllSubmodules(x).flat().map((x) => x.id);
+    const previousIds = dfs(id, flow, false)
+        .map((x) => {
+        let submodules = getAllSubmodules(x)
+            .flat()
+            .map((x) => x.id);
         if (submodules.includes(id)) {
             return [x.id];
         }
         else {
             return [x.id, ...submodules];
         }
-    }).flat();
+    })
+        .flat();
     if (!include_node) {
         previousIds.shift();
     }
@@ -92,10 +95,10 @@ export function getStepPropPicker(flowState, parentModule, previousModule, id, f
         flow_input: flowInput,
         priorIds: priorIds,
         previousId: previousIds[0],
-        hasResume: previousModule?.suspend != undefined,
+        hasResume: previousModule?.suspend != undefined
     };
     if (pickableProperties.hasResume) {
-        pickableProperties["approvers"] = "The list of approvers";
+        pickableProperties['approvers'] = 'The list of approvers';
     }
     return {
         extraLib: buildExtraLib(flowInput, priorIds, previousModule?.suspend != undefined),
@@ -131,7 +134,8 @@ declare const params: any;
  */
 declare const results = ${JSON.stringify(results)};
 
-${resume ? `
+${resume
+        ? `
 /**
  * resume payload
  */
@@ -141,6 +145,7 @@ declare const resume: any
  * The list of approvers separated by ,
  */
 declare const approvers: string
-` : ''}
+`
+        : ''}
 `;
 }

package/package/components/flows/types.d.ts

@@ -17,4 +17,6 @@ export type FlowEditorContext = {
     flowStore: Writable<Flow>;
     flowStateStore: Writable<FlowState>;
     testStepStore: Writable<Record<string, any>>;
+    saveDraft: () => void;
+    initialPath: string;
 };

package/package/components/flows/utils.d.ts

@@ -1,9 +1,10 @@
 import type { Schema } from '../../common';
 import { type Flow, type FlowModule, type InputTransform, type Job } from '../../gen';
 import type { FlowModuleState } from './flowState';
+import type { PickableProperties } from './previousResults';
+export declare function evalValue(k: string, mod: FlowModule, testStepStore: Record<string, any>, pickableProperties: PickableProperties | undefined, showError: boolean): any;
 export declare function cleanInputs(flow: Flow | any): Flow;
 export declare function cleanExpr(expr: string): string;
-export declare function getTypeAsString(arg: any): string;
 export declare function loadSchemaFromModule(module: FlowModule): Promise<{
     input_transforms: Record<string, InputTransform>;
     schema: Schema;
@@ -13,6 +14,5 @@ export declare function getDefaultExpr(key: string | undefined, previousModuleId
 export declare function jobsToResults(jobs: Job[]): any;
 export declare function runFlowPreview(args: Record<string, any>, flow: Flow): Promise<string>;
 export declare function codeToStaticTemplate(code?: string): string | undefined;
-export declare const NEVER_TESTED_THIS_FAR = "never tested this far";
 export declare function emptyFlowModuleState(): FlowModuleState;
 export declare function findNextAvailablePath(path: string): Promise<string>;

package/package/components/flows/utils.js

@@ -4,6 +4,52 @@ import { loadSchema, loadSchemaFlow } from '../../scripts';
 import { workspaceStore } from '../../stores';
 import { emptySchema } from '../../utils';
 import { get } from 'svelte/store';
+import { NEVER_TESTED_THIS_FAR } from './models';
+import { sendUserToast } from '../../toast';
+function create_context_function_template(eval_string, context) {
+    return `
+return function (context) {
+"use strict";
+${Object.keys(context).length > 0
+        ? `let ${Object.keys(context).map((key) => ` ${key} = context['${key}']`)};`
+        : ``}
+return ${eval_string}
+}`;
+}
+function make_context_evaluator(eval_string, context) {
+    let template = create_context_function_template(eval_string, context);
+    let functor = Function(template);
+    return functor();
+}
+export function evalValue(k, mod, testStepStore, pickableProperties, showError) {
+    let inputTransforms = (mod.value['input_transforms'] ?? {});
+    let v = testStepStore[mod.id]?.[k];
+    let t = inputTransforms?.[k];
+    if (!v) {
+        if (t.type == 'static') {
+            v = t.value;
+        }
+        else {
+            try {
+                let context = {
+                    flow_input: pickableProperties?.flow_input,
+                    results: pickableProperties?.priorIds
+                };
+                v = make_context_evaluator(t.expr, context)(context);
+            }
+            catch (e) {
+                if (showError) {
+                    sendUserToast(`Error evaluating ${k}: ${e.message}`, true);
+                }
+                v = undefined;
+            }
+        }
+    }
+    if (v == NEVER_TESTED_THIS_FAR) {
+        return undefined;
+    }
+    return v;
+}
 export function cleanInputs(flow) {
     const newFlow = JSON.parse(JSON.stringify(flow));
     newFlow.value.modules.forEach((mod) => {
@@ -30,15 +76,6 @@ export function cleanExpr(expr) {
         .filter((x) => x != '' && !x.startsWith(`import `))
         .join('\n');
 }
-export function getTypeAsString(arg) {
-    if (arg === null) {
-        return 'null';
-    }
-    if (arg === undefined) {
-        return 'undefined';
-    }
-    return typeof arg;
-}
 export async function loadSchemaFromModule(module) {
     const mod = module.value;
     if (mod.type == 'rawscript' || mod.type === 'script' || mod.type === 'flow') {
@@ -130,7 +167,6 @@ export function codeToStaticTemplate(code) {
     }
     return undefined;
 }
-export const NEVER_TESTED_THIS_FAR = 'never tested this far';
 export function emptyFlowModuleState() {
     return {
         schema: emptySchema(),

package/package/components/graph/FlowGraph.svelte

@@ -172,8 +172,8 @@ function flowModuleToNode(parentIds, mod, edgeLabel, annotation, loopDepth, inse
                         if (!notSelectable) {
                             if ($selectedId != mod.id) {
                                 $selectedId = mod.id;
-                                dispatch('select', mod);
                             }
+                            dispatch('select', mod);
                         }
                     }
                     else if (e == 'insert') {
@@ -421,7 +421,6 @@ function createErrorHandler(mod, parent_module) {
                     id: mod.id
                 },
                 cb: (e, detail) => {
-                    console.log(detail);
                     if (e == 'select') {
                         $selectedId = detail;
                         dispatch('select', detail);

package/package/components/graph/svelvet/container/views/GraphView.svelte

@@ -187,6 +187,11 @@ function handleZoom(e) {
 		border-radius: 4px;
 		background-color: white;
 		border: #bbb solid 1px;
+		transition: all;
+	}
+
+	#buttons > button:hover {
+		background-color: #eee;
 	}
 
 	.Nodes {

package/package/components/home/ItemsList.svelte

@@ -2,9 +2,8 @@
 import { Alert, Badge, Skeleton } from '../common';
 import ShareModal from '../ShareModal.svelte';
 import Toggle from '../Toggle.svelte';
-import { AppService, FlowService, ListableApp, Script, ScriptService } from '../../gen';
+import { AppService, FlowService, ListableApp, Script, ScriptService, RawAppService } from '../../gen';
 import { userStore, workspaceStore } from '../../stores';
-import { canWrite } from '../../utils';
 import { Code2, LayoutDashboard } from 'lucide-svelte';
 export let filter = '';
 import AppRow from '../common/table/AppRow.svelte';
@@ -19,9 +18,12 @@ import NoItemFound from './NoItemFound.svelte';
 import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte';
 import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte';
 import FlowIcon from './FlowIcon.svelte';
+import RawAppRow from '../common/table/RawAppRow.svelte';
+import { canWrite } from '../../utils';
 let scripts;
 let flows;
 let apps;
+let raw_apps;
 let filteredItems = [];
 let itemKind = 'all';
 let shareModal;
@@ -37,9 +39,7 @@ async function loadScripts() {
     });
     scripts = loadedScripts.map((script) => {
         return {
-            canWrite: canWrite(script.path, script.extra_perms, $userStore) &&
-                script.workspace_id == $workspaceStore &&
-                !$userStore?.operator,
+            canWrite: canWrite(script.path, script.extra_perms, $userStore) && !$userStore?.operator,
             ...script
         };
     });
@@ -70,10 +70,21 @@ async function loadApps() {
     });
     loading = false;
 }
+async function loadRawApps() {
+    raw_apps = (await RawAppService.listRawApps({ workspace: $workspaceStore })).map((app) => {
+        return {
+            canWrite: canWrite(app.path, app.extra_perms, $userStore) &&
+                app.workspace_id == $workspaceStore &&
+                !$userStore?.operator,
+            ...app
+        };
+    });
+    loading = false;
+}
 $: owners = Array.from(new Set(filteredItems?.map((x) => x.path.split('/').slice(0, 2).join('/')) ?? [])).sort();
 let combinedItems = undefined;
 $: combinedItems =
-    flows == undefined || scripts == undefined || apps == undefined
+    flows == undefined || scripts == undefined || apps == undefined || raw_apps == undefined
         ? undefined
         : [
             ...flows.map((x) => ({
@@ -90,6 +101,11 @@ $: combinedItems =
                 ...x,
                 type: 'app',
                 time: new Date(x.edited_at).getTime()
+            })),
+            ...raw_apps.map((x) => ({
+                ...x,
+                type: 'raw_app',
+                time: new Date(x.edited_at).getTime()
             }))
         ].sort((a, b) => a.starred != b.starred ? (a.starred ? -1 : 1) : a.time - b.time > 0 ? -1 : 1);
 $: preFilteredItems =
@@ -106,9 +122,11 @@ $: {
         loadFlows();
         if (!archived) {
             loadApps();
+            loadRawApps();
         }
         else {
             apps = [];
+            raw_apps = [];
         }
     }
 }
@@ -170,6 +188,7 @@ let archived = false;
 		loadScripts()
 		loadApps()
 		loadFlows()
+		loadRawApps()
 	}}
 />
 
@@ -179,6 +198,7 @@ let archived = false;
 		loadScripts()
 		loadApps()
 		loadFlows()
+		loadRawApps()
 	}}
 />
 
@@ -261,37 +281,51 @@ let archived = false;
 			<div class="border rounded-md divide-y divide-gray-200">
 				<!-- <VirtualList {items} let:item bind:start bind:end> -->
 				{#each (items ?? []).slice(0, nbDisplayed) as item (item.type + '/' + item.path)}
-					{#if item.type == 'script'}
-						<ScriptRow
-							bind:deleteConfirmedCallback
-							starred={item.starred ?? false}
-							marked={item.marked}
-							on:change={loadScripts}
-							script={item}
-							{shareModal}
-							{moveDrawer}
-						/>
-					{:else if item.type == 'flow'}
-						<FlowRow
-							bind:deleteConfirmedCallback
-							starred={item.starred ?? false}
-							marked={item.marked}
-							on:change={loadFlows}
-							flow={item}
-							{shareModal}
-							{moveDrawer}
-						/>
-					{:else if item.type == 'app'}
-						<AppRow
-							bind:deleteConfirmedCallback
-							starred={item.starred ?? false}
-							marked={item.marked}
-							on:change={loadApps}
-							app={item}
-							{moveDrawer}
-							{shareModal}
-						/>
-					{/if}
+					{#key item.summary}
+						{#key item.starred}
+							{#if item.type == 'script'}
+								<ScriptRow
+									bind:deleteConfirmedCallback
+									starred={item.starred ?? false}
+									marked={item.marked}
+									on:change={loadScripts}
+									script={item}
+									{shareModal}
+									{moveDrawer}
+								/>
+							{:else if item.type == 'flow'}
+								<FlowRow
+									bind:deleteConfirmedCallback
+									starred={item.starred ?? false}
+									marked={item.marked}
+									on:change={loadFlows}
+									flow={item}
+									{shareModal}
+									{moveDrawer}
+								/>
+							{:else if item.type == 'app'}
+								<AppRow
+									bind:deleteConfirmedCallback
+									starred={item.starred ?? false}
+									marked={item.marked}
+									on:change={loadApps}
+									app={item}
+									{moveDrawer}
+									{shareModal}
+								/>
+							{:else if item.type == 'raw_app'}
+								<RawAppRow
+									bind:deleteConfirmedCallback
+									starred={item.starred ?? false}
+									marked={item.marked}
+									on:change={loadRawApps}
+									app={item}
+									{moveDrawer}
+									{shareModal}
+								/>
+							{/if}
+						{/key}
+					{/key}
 				{/each}
 				<!-- </VirtualList> -->
 			</div>

package/package/components/icons/DockerIcon.svelte

@@ -0,0 +1,22 @@
+<script>export let height = '24px';
+export let width = '24px';
+</script>
+
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	aria-label="Docker"
+	role="img"
+	viewBox="0 0 512 512"
+	x="0px"
+	y="0px"
+	{width}
+	{height}
+	><rect width="512" height="512" rx="15%" fill="#ffffff" /><path
+		stroke="#066da5"
+		stroke-width="38"
+		d="M296 226h42m-92 0h42m-91 0h42m-91 0h41m-91 0h42m8-46h41m8 0h42m7 0h42m-42-46h42"
+	/><path
+		fill="#066da5"
+		d="m472 228s-18-17-55-11c-4-29-35-46-35-46s-29 35-8 74c-6 3-16 7-31 7H68c-5 19-5 145 133 145 99 0 173-46 208-130 52 4 63-39 63-39"
+	/></svg
+>

package/package/components/icons/DockerIcon.svelte.d.ts

@@ -0,0 +1,17 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        height?: string | undefined;
+        width?: string | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type DockerIconProps = typeof __propDef.props;
+export type DockerIconEvents = typeof __propDef.events;
+export type DockerIconSlots = typeof __propDef.slots;
+export default class DockerIcon extends SvelteComponentTyped<DockerIconProps, DockerIconEvents, DockerIconSlots> {
+}
+export {};

package/package/components/jobs/JobPreview.svelte

@@ -21,31 +21,23 @@ let loaded = false;
 let wrapper;
 let popupOnTop = true;
 $: open = $openStore === job?.id;
-$: completed = job?.type === Job.type.COMPLETED_JOB;
-$: running = job && `running` in job ? job.running : false;
-$: logs = job?.logs || logs;
 async function instantOpen() {
-    hovered = true;
-    if (!job) {
-        return;
+    if (!open) {
+        hovered = true;
+        if (!job) {
+            return;
+        }
+        popupOnTop = wrapper.getBoundingClientRect().top > POPUP_HEIGHT;
+        openStore.set(job.id);
+        if (!loaded) {
+            await tick();
+            watchJob && watchJob(job.id);
+        }
     }
-    popupOnTop = wrapper.getBoundingClientRect().top > POPUP_HEIGHT;
-    openStore.set(job.id);
-    if (!loaded) {
-        await tick();
-        watchJob && watchJob(job.id);
+    else {
+        timeout && clearTimeout(timeout);
     }
 }
-function staggeredOpen() {
-    hovered = true;
-    if (timeout) {
-        clearTimeout(timeout);
-    }
-    timeout = setTimeout(async () => {
-        timeout = undefined;
-        await instantOpen();
-    }, loaded ? 100 : 300);
-}
 function close() {
     hovered = false;
     if (timeout) {
@@ -58,6 +50,9 @@ function close() {
 }
 function staggeredClose() {
     hovered = false;
+    if (timeout) {
+        clearTimeout(timeout);
+    }
     timeout = setTimeout(async () => {
         timeout = undefined;
         close();
@@ -79,17 +74,15 @@ onDestroy(() => {
 {/if}
 
 <div
-	on:mouseenter={staggeredOpen}
+	on:mouseenter={instantOpen}
 	on:mouseleave={staggeredClose}
-	on:focusin={instantOpen}
-	on:focusout={close}
 	bind:this={wrapper}
 	class="relative"
 >
 	<slot {open} />
 	{#if open}
 		<div
-			transition:fade|local={{ duration: 100 }}
+			transition:fade|local={{ duration: 50 }}
 			class="absolute z-50 {popupOnTop ? 'bottom-[35px]' : 'top-[35px]'} -left-10 bg-white rounded
 			border border-gray-300 shadow-xl flex justify-start items-start w-[600px] h-80
 			overflow-hidden"
@@ -104,11 +97,11 @@ onDestroy(() => {
 						<div>{new Date(job?.['scheduled_for']).toLocaleString()}</div>
 					</div>
 				{/if}
-				{#if completed}
+				{#if job?.type === Job.type.COMPLETED_JOB}
 					<DisplayResult {result} disableExpand />
-				{:else if running}
+				{:else if job && `running` in job ? job.running : false}
 					<div class="text-sm font-semibold text-gray-600 mb-1"> Job is still running </div>
-					<LogViewer content={logs} isLoading />
+					<LogViewer content={job?.logs} isLoading />
 				{/if}
 			</div>
 		</div>

package/package/components/propertyPicker/ObjectViewer.svelte

@@ -1,10 +1,9 @@
 <script>import { copyToClipboard, pluralize, truncate } from '../../utils';
 import { createEventDispatcher } from 'svelte';
 import { Badge } from '../common';
-import { NEVER_TESTED_THIS_FAR } from '../flows/utils';
-import { getTypeAsString } from '../flows/utils';
 import { computeKey } from './utils';
 import WarningMessage from './WarningMessage.svelte';
+import { NEVER_TESTED_THIS_FAR } from '../flows/models';
 export let json;
 export let level = 0;
 export let currentPath = '';
@@ -25,6 +24,15 @@ $: {
     openBracket = isArray ? '[' : '{';
     closeBracket = isArray ? ']' : '}';
 }
+export function getTypeAsString(arg) {
+    if (arg === null) {
+        return 'null';
+    }
+    if (arg === undefined) {
+        return 'undefined';
+    }
+    return typeof arg;
+}
 function collapse() {
     collapsed = !collapsed;
 }
@@ -127,7 +135,7 @@ let keyLimit = 100;
 {:else if topBrackets}
 	<span class="text-black">{openBracket}{closeBracket}</span>
 {:else}
-	<span class="text-gray-400 text-xs ml-2">No items</span>
+	<span class="text-gray-400 text-xs ml-2">No items ([])</span>
 {/if}
 
 <style>
@@ -139,11 +147,11 @@ let keyLimit = 100;
 
 	.val.undefined {
 		--tw-text-opacity: 1;
-		color: rgb(239 68 68 / var(--tw-text-opacity));
+		color: rgb(75 85 99 / var(--tw-text-opacity));
 }
 	.val.null {
 		--tw-text-opacity: 1;
-		color: rgb(239 68 68 / var(--tw-text-opacity));
+		color: rgb(75 85 99 / var(--tw-text-opacity));
 }
 	.val.string {
 		--tw-text-opacity: 1;

package/package/components/propertyPicker/ObjectViewer.svelte.d.ts

@@ -10,6 +10,7 @@ declare const __propDef: {
         topBrackets?: boolean | undefined;
         topLevelNode?: boolean | undefined;
         allowCopy?: boolean | undefined;
+        getTypeAsString?: ((arg: any) => string) | undefined;
     };
     events: {
         select: CustomEvent<any>;
@@ -22,5 +23,6 @@ export type ObjectViewerProps = typeof __propDef.props;
 export type ObjectViewerEvents = typeof __propDef.events;
 export type ObjectViewerSlots = typeof __propDef.slots;
 export default class ObjectViewer extends SvelteComponentTyped<ObjectViewerProps, ObjectViewerEvents, ObjectViewerSlots> {
+    get getTypeAsString(): (arg: any) => string;
 }
 export {};

package/package/components/propertyPicker/PropPicker.svelte

@@ -50,7 +50,7 @@ async function loadResources() {
 						{`Mode: ${$propPickerConfig?.insertionMode}`}
 					</Badge>
 				{:else}
-					<Badge large color="blue">&leftarrow; Edit or link an input</Badge>
+					<Badge large color="blue">&leftarrow; Edit or connect an input</Badge>
 				{/if}
 			</div>
 		{/if}
@@ -151,14 +151,16 @@ async function loadResources() {
 			<span class="font-bold text-sm">Variables </span>
 			<div class="overflow-y-auto mb-2">
 				{#if displayVariable}
-					<Button
-						color="light"
-						size="xs"
-						variant="border"
-						on:click={() => {
-							displayVariable = false
-						}}>-</Button
-					>
+					<div class="flex">
+						<Button
+							color="light"
+							size="xs"
+							variant="border"
+							on:click={() => {
+								displayVariable = false
+							}}>-</Button
+						>
+					</div>
 					<ObjectViewer
 						allowCopy={false}
 						pureViewer={!$propPickerConfig}

package/package/components/propertyPicker/utils.d.ts

@@ -1,3 +1,2 @@
 export declare function keepByKey(json: Object | undefined, key: string): Object;
-export declare function getTypeAsString(arg: any): string;
 export declare function computeKey(key: string, isArray: boolean, currentPath?: string): string;