windmill-components 1.558.4 → 1.596.0

package/package/components/flows/propPicker/PropPickerWrapper.svelte

@@ -1,4 +1,4 @@
-<script context="module" lang="ts">export const CONNECT = 'connect';
+<script module lang="ts">export const CONNECT = 'connect';
 </script>
 
 <script lang="ts">import PropPicker from '../../propertyPicker/PropPicker.svelte';
@@ -7,24 +7,15 @@ import { clickOutside } from '../../../utils';
 import { createEventDispatcher, getContext, setContext } from 'svelte';
 import { Pane, Splitpanes } from 'svelte-splitpanes';
 import { writable } from 'svelte/store';
-import { twMerge } from 'tailwind-merge';
 import AnimatedButton from '../../common/button/AnimatedButton.svelte';
-export let pickableProperties;
-export let result = undefined;
-export let extraResults = undefined;
-export let flow_input = undefined;
-export let error = false;
-export let displayContext = true;
-export let notSelectable = false;
-export let noPadding = false;
-export let alwaysOn = false;
-export let paneClass = '';
-export let noFlowPlugConnect = false;
+let { pickableProperties, result = undefined, extraResults = undefined, flow_input = undefined, error = false, displayContext = true, notSelectable = false, noPadding = false, paneClass = '', noFlowPlugConnect = false, children } = $props();
 const propPickerConfig = writable(undefined);
 const inputMatches = writable(undefined);
 const dispatch = createEventDispatcher();
 const { flowPropPickerConfig } = getContext('PropPickerContext');
 flowPropPickerConfig.set(undefined);
+const { flowStore } = getContext('FlowEditorContext');
+let flow_env = $derived(pickableProperties?.flow_env || flowStore.val.value.flow_env);
 setContext('PropPickerWrapper', {
     propPickerConfig,
     inputMatches,
@@ -57,68 +48,72 @@ setContext('PropPickerWrapper', {
 async function getPropPickerElements() {
     return Array.from(document.querySelectorAll('[data-prop-picker], [data-prop-picker] *'));
 }
+let rightPaneHeight = $state(0);
 </script>
 
 <div
 	class="h-full w-full"
 	data-prop-picker-root
-	use:clickOutside={{ capture: true, exclude: getPropPickerElements }}
-	on:click_outside={() => {
-		propPickerConfig.set(undefined)
-		flowPropPickerConfig.set(undefined)
+	use:clickOutside={{
+		capture: true,
+		exclude: getPropPickerElements,
+		onClickOutside: () => {
+			propPickerConfig.set(undefined)
+			flowPropPickerConfig.set(undefined)
+		}
 	}}
 >
 	<Splitpanes class={$propPickerConfig ? 'splitpanes-remove-splitter' : ''}>
-		<Pane
-			minSize={20}
-			size={60}
-			class={twMerge('relative !transition-none ', noPadding ? '' : 'p-2')}
-		>
-			<slot />
+		<Pane minSize={20} size={60} class={'relative !transition-none'}>
+			<div style="height: {rightPaneHeight}px;" class={noPadding ? '' : 'p-2'}>
+				{@render children?.()}
+			</div>
 		</Pane>
-		<Pane minSize={20} size={40} class="!transition-none z-1000 {paneClass}">
-			<AnimatedButton
-				animate={$propPickerConfig?.insertionMode == 'connect'}
-				baseRadius="4px"
-				wrapperClasses="prop-picker-inputs h-full w-full pt-1 !bg-surface "
-				marginWidth="3px"
-				ringColor={$propPickerConfig?.insertionMode == 'insert' ||
-				$propPickerConfig?.insertionMode == 'append'
-					? '#3b82f6'
-					: 'transparent'}
-				animationDuration="4s"
-			>
-				{#if result != undefined}
-					<PropPickerResult
-						{result}
-						{extraResults}
-						{flow_input}
-						allowCopy={!notSelectable && !$propPickerConfig}
-						on:select={({ detail }) => {
-							dispatch('select', detail)
-							if ($propPickerConfig?.onSelect(detail)) {
-								$propPickerConfig?.clearFocus()
-							}
-						}}
-					/>
-				{:else if pickableProperties}
-					<PropPicker
-						{alwaysOn}
-						{displayContext}
-						{error}
-						previousId={pickableProperties?.previousId}
-						{pickableProperties}
-						allowCopy={!notSelectable && !$propPickerConfig}
-						on:select={({ detail }) => {
-							// console.log('selecting', detail)
-							dispatch('select', detail)
-							if ($propPickerConfig?.onSelect(detail)) {
-								$propPickerConfig?.clearFocus()
-							}
-						}}
-					/>
-				{/if}
-			</AnimatedButton>
+		<Pane minSize={20} size={40} class="!transition-none z-1000 relative {paneClass}">
+			<div bind:clientHeight={rightPaneHeight} class="min-h-40 h-full !bg-surface-secondary">
+				<AnimatedButton
+					animate={$propPickerConfig?.insertionMode == 'connect'}
+					baseRadius="4px"
+					wrapperClasses="prop-picker-inputs h-full w-full pt-1"
+					marginWidth="3px"
+					ringColor={$propPickerConfig?.insertionMode == 'insert' ||
+					$propPickerConfig?.insertionMode == 'append'
+						? '#3b82f6'
+						: 'transparent'}
+					animationDuration="4s"
+				>
+					{#if result != undefined}
+						<PropPickerResult
+							{result}
+							{extraResults}
+							{flow_input}
+							allowCopy={!notSelectable && !$propPickerConfig}
+							on:select={({ detail }) => {
+								dispatch('select', detail)
+								if ($propPickerConfig?.onSelect(detail)) {
+									$propPickerConfig?.clearFocus()
+								}
+							}}
+						/>
+					{:else if pickableProperties}
+						<PropPicker
+							{displayContext}
+							{error}
+							{flow_env}
+							previousId={pickableProperties?.previousId}
+							{pickableProperties}
+							allowCopy={!notSelectable && !$propPickerConfig}
+							on:select={({ detail }) => {
+								// console.log('selecting', detail)
+								dispatch('select', detail)
+								if ($propPickerConfig?.onSelect(detail)) {
+									$propPickerConfig?.clearFocus()
+								}
+							}}
+						/>
+					{/if}
+				</AnimatedButton>
+			</div>
 		</Pane>
 	</Splitpanes>
 </div>

package/package/components/flows/propPicker/PropPickerWrapper.svelte.d.ts

@@ -17,6 +17,19 @@ export type PropPickerWrapperContext = {
 };
 import { type Writable } from 'svelte/store';
 import type { PickableProperties } from '../previousResults';
+interface Props {
+    pickableProperties: PickableProperties | undefined;
+    result?: any;
+    extraResults?: any;
+    flow_input?: any;
+    error?: boolean;
+    displayContext?: boolean;
+    notSelectable?: boolean;
+    noPadding?: boolean;
+    paneClass?: string;
+    noFlowPlugConnect?: boolean;
+    children?: import('svelte').Snippet;
+}
 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;
@@ -30,31 +43,10 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     };
     z_$$bindings?: Bindings;
 }
-type $$__sveltets_2_PropsWithChildren<Props, Slots> = Props & (Slots extends {
-    default: any;
-} ? Props extends Record<string, never> ? any : {
-    children?: any;
-} : {});
-declare const PropPickerWrapper: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren<{
-    pickableProperties: PickableProperties | undefined;
-    result?: any;
-    extraResults?: any;
-    flow_input?: any;
-    error?: boolean;
-    displayContext?: boolean;
-    notSelectable?: boolean;
-    noPadding?: boolean;
-    alwaysOn?: boolean;
-    paneClass?: string;
-    noFlowPlugConnect?: boolean;
-}, {
-    default: {};
-}>, {
+declare const PropPickerWrapper: $$__sveltets_2_IsomorphicComponent<Props, {
     select: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
-}, {
-    default: {};
-}, {}, string>;
+}, {}, {}, "">;
 type PropPickerWrapper = InstanceType<typeof PropPickerWrapper>;
 export default PropPickerWrapper;

package/package/components/flows/propPicker/StepHistory.svelte

@@ -118,7 +118,7 @@ export function deselect() {
 		<JobPickerLight job={item} />
 	{/snippet}
 	{#snippet empty()}
-		<div class="text-center text-tertiary text-xs py-2 px-2">
+		<div class="text-center text-primary text-xs py-2 px-2">
 			{noHistory === 'isLoop'
 				? 'History is not available with loops.'
 				: noHistory === 'isInsideLoop'

package/package/components/flows/stepsInputArgs.svelte.js

@@ -1,5 +1,5 @@
 import { dfs, getPreviousModule, getStepPropPicker } from './previousResults';
-import { evalValue } from './utils';
+import { evalValue } from './utils.svelte';
 export class StepsInputArgs {
     #stepsEvaluated = $state({});
     #steps = $state({});

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

@@ -14,6 +14,8 @@ import type DbManagerDrawer from '../DBManagerDrawer.svelte';
 import type ResourceEditorDrawer from '../ResourceEditorDrawer.svelte';
 import type { ModulesTestStates } from '../modulesTest.svelte';
 import type { ButtonProp } from '../DiffEditor.svelte';
+import type { SelectionManager } from '../graph/selectionUtils.svelte';
+import type { InferAssetsSqlQueryDetails } from '../../infer';
 export type FlowInput = Record<string, {
     flowStepWarnings?: Record<string, {
         message: string;
@@ -48,7 +50,7 @@ export type CurrentEditor = (({
     stepId: string;
 }) | undefined;
 export type FlowEditorContext = {
-    selectedId: Writable<string>;
+    selectionManager: SelectionManager;
     currentEditor: Writable<CurrentEditor>;
     moving: Writable<{
         id: string;
@@ -81,6 +83,7 @@ export type FlowGraphAssetContext = StateStore<{
     } | undefined>;
     additionalAssetsMap: Record<string, AssetWithAccessType[]>;
     computeAssetsCount: (asset: Asset) => number;
+    sqlQueries: Record<string, InferAssetsSqlQueryDetails[] | undefined>;
 }>;
 export type OutputViewerJob = ((Job | {
     id: string;

package/package/components/flows/{utils.d.ts → utils.svelte.d.ts}

@@ -13,7 +13,7 @@ export declare function filteredContentForExport(flow: ExtendedOpenFlow): {
         [key: string]: unknown;
     } | undefined;
 };
-export declare function cleanInputs(flow: OpenFlow | any): OpenFlow & {
+export declare function cleanFlow(flow: OpenFlow | any): OpenFlow & {
     tag?: string;
     ws_error_handler_muted?: boolean;
     dedicated_worker?: boolean;
@@ -24,7 +24,7 @@ export declare function getDefaultExpr(key: string | undefined, previousModuleId
 export declare function jobsToResults(jobs: Job[]): any;
 export declare function runFlowPreview(args: Record<string, any>, flow: OpenFlow & {
     tag?: string;
-}, path: string, restartedFrom: RestartedFrom | undefined): Promise<string>;
+}, path: string, restartedFrom: RestartedFrom | undefined, conversationId?: string | undefined): Promise<string>;
 export declare function codeToStaticTemplate(code?: string): string | undefined;
 export declare function emptyFlowModuleState(): FlowModuleState;
 export declare function checkIfParentLoop(flowStore: ExtendedOpenFlow, modId: string): {

package/package/components/flows/{utils.js → utils.svelte.js}

@@ -71,9 +71,10 @@ export function filteredContentForExport(flow) {
     }
     return o;
 }
-export function cleanInputs(flow) {
-    const newFlow = JSON.parse(JSON.stringify(flow));
-    newFlow.value.modules.forEach((mod) => {
+import { dfs as dfsApply } from './dfs';
+export function cleanFlow(flow) {
+    const newFlow = $state.snapshot(flow);
+    dfsApply(newFlow.value.modules, (mod) => {
         if (mod.value.type == 'rawscript' || mod.value.type == 'script') {
             Object.values(mod.value.input_transforms ?? {}).forEach((inp) => {
                 // for now we use the value for dynamic expression when done in the static editor so we have to resort to this
@@ -88,6 +89,9 @@ export function cleanInputs(flow) {
                 }
             });
         }
+        if (mod.value.type == 'rawscript' && mod.value.assets?.length == 0) {
+            mod.value.assets = undefined;
+        }
     });
     if (newFlow.value.concurrency_key == '') {
         newFlow.value.concurrency_key = undefined;
@@ -107,7 +111,7 @@ export function jobsToResults(jobs) {
         }
     });
 }
-export async function runFlowPreview(args, flow, path, restartedFrom) {
+export async function runFlowPreview(args, flow, path, restartedFrom, conversationId) {
     const newFlow = flow;
     return await JobService.runFlowPreview({
         workspace: get(workspaceStore) ?? '',
@@ -117,7 +121,8 @@ export async function runFlowPreview(args, flow, path, restartedFrom) {
             path: path,
             tag: newFlow.tag,
             restarted_from: restartedFrom
-        }
+        },
+        memoryId: conversationId
     });
 }
 export function codeToStaticTemplate(code) {

package/package/components/git_sync/DetectionFlow.svelte

@@ -9,16 +9,19 @@ import GitSyncModeDisplay from './GitSyncModeDisplay.svelte';
 let { idx, mode } = $props();
 const gitSyncContext = getGitSyncContext();
 const repo = $derived(gitSyncContext.getRepository(idx));
-let targetBranch = $state('main');
+let targetBranch = $state(undefined);
 // Update target branch when repository changes
 $effect(() => {
     const abortController = new AbortController();
     if (repo?.git_repo_resource_path) {
-        gitSyncContext.getTargetBranch(repo).then(branch => {
+        gitSyncContext
+            .getTargetBranch(repo)
+            .then((branch) => {
             if (!abortController.signal.aborted) {
                 targetBranch = branch;
             }
-        }).catch(error => {
+        })
+            .catch((error) => {
             if (!abortController.signal.aborted) {
                 console.warn('Failed to get target branch:', error);
             }
@@ -67,7 +70,6 @@ async function handleSaveConnection() {
 }
 </script>
 
-
 {#if repo}
 	<div class="space-y-4">
 		{#if !repo.detectionState || repo.detectionState === 'idle'}
@@ -167,7 +169,7 @@ async function handleSaveConnection() {
 
 		<!-- Job status display -->
 		{#if repo.detectionJobId && (repo.detectionState === 'loading' || repo.detectionState === 'error')}
-			<div class="flex items-center gap-2 text-xs text-tertiary">
+			<div class="flex items-center gap-2 text-xs text-primary">
 				{#if repo.detectionJobStatus === 'running'}
 					<Loader2 class="animate-spin" size={14} />
 				{:else if repo.detectionJobStatus === 'success'}

package/package/components/git_sync/GitSyncContext.svelte.d.ts

@@ -18,6 +18,7 @@ export type GitSyncRepository = BackendGitRepositorySettings & {
 export type GitSyncTestJob = {
     jobId: string;
     status: 'running' | 'success' | 'failure' | undefined;
+    error?: string;
 };
 export type GitSyncSettings = {
     repositories: GitSyncRepository[];
@@ -93,11 +94,11 @@ export declare function createGitSyncContext(workspace: string): {
         repo: GitSyncRepository;
         idx: number;
     }[];
-    getLegacyPromotionRepositories: () => {
+    getSecondaryPromotionRepositories: () => {
         repo: GitSyncRepository;
         idx: number;
     }[];
-    getTargetBranch: (repo: GitSyncRepository) => Promise<string>;
+    getTargetBranch: (repo: GitSyncRepository) => Promise<string | undefined>;
 };
 export type GitSyncContextType = ReturnType<typeof createGitSyncContext>;
 export declare function setGitSyncContext(workspace: string): GitSyncContextType;

package/package/components/git_sync/GitSyncContext.svelte.js

@@ -420,13 +420,26 @@ export function createGitSyncContext(workspace) {
                 onProgress: (status) => {
                     gitSyncTestJobs[idx].status = status.status === 'success' ? 'success' :
                         status.status === 'failure' ? 'failure' : 'running';
+                    if (status.status === 'failure') {
+                        gitSyncTestJobs[idx].error = status.error;
+                    }
                 }
             });
-            // If we get here, the job completed successfully
-            gitSyncTestJobs[idx].status = 'success';
         }
         catch (error) {
-            gitSyncTestJobs[idx].status = 'failure';
+            // Initialize the job entry if it doesn't exist (e.g., job creation failed)
+            const errorMessage = (typeof error?.body === 'string' ? error.body : error?.body?.message) || error?.message || error?.toString() || 'Failed to run test job';
+            if (!gitSyncTestJobs[idx]) {
+                gitSyncTestJobs[idx] = {
+                    jobId: '',
+                    status: 'failure',
+                    error: errorMessage
+                };
+            }
+            else {
+                gitSyncTestJobs[idx].status = 'failure';
+                gitSyncTestJobs[idx].error = errorMessage;
+            }
         }
     }
     function getPrimarySyncRepository() {
@@ -452,7 +465,7 @@ export function createGitSyncContext(workspace) {
         });
         return result;
     }
-    function getLegacyPromotionRepositories() {
+    function getSecondaryPromotionRepositories() {
         const result = [];
         let foundFirst = false;
         repositories.forEach((repo, idx) => {
@@ -520,9 +533,11 @@ export function createGitSyncContext(workspace) {
     // Helper to get target branch from git resource
     async function getTargetBranch(repo) {
         if (!repo.git_repo_resource_path) {
-            return 'main';
+            return undefined;
         }
         if (repo._targetBranch) {
+            if (repo._targetBranch === '')
+                return undefined;
             return repo._targetBranch;
         }
         try {
@@ -532,14 +547,16 @@ export function createGitSyncContext(workspace) {
             });
             // Extract branch from git resource value
             const resourceValue = resource.value;
-            const targetBranch = resourceValue?.branch || 'main';
+            const targetBranch = resourceValue?.branch;
             // Cache the result
             repo._targetBranch = targetBranch;
+            if (targetBranch === '')
+                return undefined;
             return targetBranch;
         }
         catch (error) {
             console.warn('Failed to fetch git resource for branch info:', error);
-            return 'main';
+            return undefined;
         }
     }
     // Return context object
@@ -583,7 +600,7 @@ export function createGitSyncContext(workspace) {
         getPrimarySyncRepository,
         getPrimaryPromotionRepository,
         getSecondarySyncRepositories,
-        getLegacyPromotionRepositories,
+        getSecondaryPromotionRepositories,
         // Helper methods
         getTargetBranch,
     };

package/package/components/git_sync/GitSyncModeDisplay.svelte

@@ -4,11 +4,16 @@ export {};
 
 <div class="text-base">
 	{#if mode === 'promotion'}
-		<div><span class="font-bold">Promotion:</span> Creating branches whose promotion target is {targetBranch}</div>
+		<div
+			><span class="font-bold">Promotion:</span> Creating branches whose promotion target is {targetBranch? `'${targetBranch}'` :
+				"the repo's default branch"}</div
+		>
 		{#if repository?.group_by_folder}
-			<div class="text-sm text-tertiary mt-1">Grouped by folder</div>
+			<div class="text-sm text-primary mt-1">Grouped by folder</div>
 		{/if}
+	{:else if targetBranch}
+		<div><span class="font-bold">Sync:</span> Syncing back to branch '{targetBranch}'</div>
 	{:else}
-		<div><span class="font-bold">Sync:</span> Syncing back to branch {targetBranch}</div>
+		<div><span class="font-bold">Sync:</span> Syncing back to the repo's default branch</div>
 	{/if}
-</div>
+</div>

package/package/components/git_sync/GitSyncModeDisplay.svelte.d.ts

@@ -1,7 +1,7 @@
 import type { GitSyncRepository } from './GitSyncContext.svelte';
 type $$ComponentProps = {
     mode?: 'sync' | 'promotion' | null;
-    targetBranch: string;
+    targetBranch: string | undefined;
     repository?: GitSyncRepository | null;
 };
 declare const GitSyncModeDisplay: import("svelte").Component<$$ComponentProps, {}, "">;