windmill-components 1.511.0 → 1.511.1

package/package/components/ArgInput.svelte

@@ -510,7 +510,7 @@ onDestroy(() => {
 														onchange={(x) => fileChanged(x, (val) => (value[i] = val))}
 														multiple={false}
 													/>
-												{:else if itemsType?.type == 'object' && itemsType?.resourceType === undefined && itemsType?.properties === undefined}
+												{:else if itemsType?.type == 'object' && itemsType?.resourceType === undefined && itemsType?.properties === undefined && !(format?.startsWith('resource-') && resourceTypes?.includes(format.split('-')[1]))}
 													{#await import('./JsonEditor.svelte')}
 														<Loader2 class="animate-spin" />
 													{:then Module}
@@ -536,10 +536,16 @@ onDestroy(() => {
 														enum_={itemsType?.enum ?? []}
 														enumLabels={extra['enumLabels']}
 													/>
-												{:else if itemsType?.type == 'resource' && itemsType?.resourceType && resourceTypes?.includes(itemsType.resourceType)}
+												{:else if (itemsType?.type == 'resource' && itemsType?.resourceType && resourceTypes?.includes(itemsType.resourceType)) || (format?.startsWith('resource-') && resourceTypes?.includes(format.split('-')[1]))}
+													{@const resourceFormat =
+														itemsType?.type == 'resource' &&
+														itemsType.resourceType &&
+														resourceTypes.includes(itemsType.resourceType)
+															? `resource-${itemsType.resourceType}`
+															: format!}
 													<ObjectResourceInput
 														bind:value={value[i]}
-														format={'resource-' + itemsType?.resourceType}
+														format={resourceFormat}
 														defaultValue={undefined}
 													/>
 												{:else if itemsType?.type == 'resource'}
@@ -607,7 +613,11 @@ onDestroy(() => {
 									if (itemsType?.type == 'number') {
 										value = value.concat(0)
 									} else if (
-										itemsType?.type == 'object' ||
+										(itemsType?.type == 'object' &&
+											!(
+												format?.startsWith('resource-') &&
+												resourceTypes?.includes(format.split('-')[1])
+											)) ||
 										(itemsType?.type == 'resource' &&
 											!(
 												itemsType?.resourceType && resourceTypes?.includes(itemsType?.resourceType)

package/package/components/FlowPreviewContent.svelte

@@ -494,6 +494,7 @@ export function flowHasChanged() {
 					bind:rightColumnSelect
 					bind:isOwner
 					{render}
+					customUi={customUi}
 				/>
 			{:else}
 				<div class="italic text-tertiary h-full grow"> Flow status will be displayed here </div>

package/package/components/FlowPreviewContent.svelte.d.ts

@@ -20,6 +20,9 @@ interface Props {
     render?: boolean;
     onJobDone?: () => void;
     upToId?: string | undefined;
+    customUi?: {
+        tagLabel?: string | 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> & {

package/package/components/FlowStatusViewer.svelte

@@ -3,7 +3,7 @@ import FlowStatusViewerInner from './FlowStatusViewerInner.svelte';
 import { createEventDispatcher, setContext, untrack } from 'svelte';
 import { isOwner as loadIsOwner } from '../utils';
 import { userStore, workspaceStore } from '../stores';
-let { jobId, initialJob = undefined, workspaceId = undefined, flowStateStore = writable({}), selectedJobStep = $bindable(undefined), hideFlowResult = false, hideTimeline = false, hideDownloadInGraph = false, hideNodeDefinition = false, hideJobId = false, hideDownloadLogs = false, rightColumnSelect = $bindable('timeline'), isOwner = $bindable(false), wideResults = false, localModuleStates = $bindable(writable({})), localDurationStatuses = $bindable(writable({})), job = $bindable(undefined), render = true, suspendStatus = $bindable(writable({})) } = $props();
+let { jobId, initialJob = undefined, workspaceId = undefined, flowStateStore = writable({}), selectedJobStep = $bindable(undefined), hideFlowResult = false, hideTimeline = false, hideDownloadInGraph = false, hideNodeDefinition = false, hideJobId = false, hideDownloadLogs = false, rightColumnSelect = $bindable('timeline'), isOwner = $bindable(false), wideResults = false, localModuleStates = $bindable(writable({})), localDurationStatuses = $bindable(writable({})), job = $bindable(undefined), render = true, suspendStatus = $bindable(writable({})), customUi } = $props();
 let lastJobId = jobId;
 let retryStatus = writable({});
 setContext('FlowStatusViewer', {
@@ -61,4 +61,5 @@ $effect.pre(() => {
 	{wideResults}
 	bind:rightColumnSelect
 	{render}
+	{customUi}
 />

package/package/components/FlowStatusViewer.svelte.d.ts

@@ -22,6 +22,9 @@ interface Props {
     job?: Job | undefined;
     render?: boolean;
     suspendStatus?: any;
+    customUi?: {
+        tagLabel?: string | 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> & {

package/package/components/FlowStatusViewerInner.svelte

@@ -27,7 +27,7 @@ import { createState } from '../svelte5Utils.svelte';
 import JobLoader from './JobLoader.svelte';
 const dispatch = createEventDispatcher();
 let { flowStateStore, retryStatus, suspendStatus, hideDownloadInGraph, hideTimeline, hideNodeDefinition, hideDownloadLogs, hideJobId } = getContext('FlowStatusViewer');
-let { jobId, initialJob = undefined, workspaceId = undefined, flowJobIds = undefined, innerModule = undefined, globalRefreshes = $bindable({}), render = true, isOwner = false, selectedNode = $bindable(undefined), globalModuleStates, globalDurationStatuses, childFlow = false, isSubflow = false, reducedPolling = false, wideResults = false, hideFlowResult = false, workspace = $workspaceStore, prefix = undefined, subflowParentsGlobalModuleStates = [], subflowParentsDurationStatuses = [], isForloopSelected = false, parentRecursiveRefresh = $bindable({}), job = $bindable(undefined), rightColumnSelect = $bindable('timeline'), localModuleStates = writable({}), localDurationStatuses = writable({}) } = $props();
+let { jobId, initialJob = undefined, workspaceId = undefined, flowJobIds = undefined, innerModule = undefined, globalRefreshes = $bindable({}), render = true, isOwner = false, selectedNode = $bindable(undefined), globalModuleStates, globalDurationStatuses, childFlow = false, isSubflow = false, reducedPolling = false, wideResults = false, hideFlowResult = false, workspace = $workspaceStore, prefix = undefined, subflowParentsGlobalModuleStates = [], subflowParentsDurationStatuses = [], isForloopSelected = false, parentRecursiveRefresh = $bindable({}), job = $bindable(undefined), rightColumnSelect = $bindable('timeline'), localModuleStates = writable({}), localDurationStatuses = writable({}), customUi } = $props();
 let recursiveRefresh = $state({});
 // Add support for the input args assets shown as an asset node
 const _flowGraphAssetsCtx = getContext('FlowGraphAssetContext');
@@ -1113,6 +1113,7 @@ let selected = $derived(isListJob ? 'sequence' : 'graph');
 
 									{#if selectedNode == 'end'}
 										<FlowJobResult
+											tagLabel={customUi?.tagLabel}
 											workspaceId={job?.workspace_id}
 											jobId={job?.id}
 											filename={job.id}
@@ -1188,6 +1189,7 @@ let selected = $derived(isListJob ? 'sequence' : 'graph');
 											</div>
 										{/if}
 										<FlowJobResult
+											tagLabel={customUi?.tagLabel}
 											workspaceId={job?.workspace_id}
 											jobId={node.job_id}
 											noBorder

package/package/components/FlowStatusViewerInner.svelte.d.ts

@@ -35,6 +35,9 @@ interface Props {
     rightColumnSelect?: 'timeline' | 'node_status' | 'node_definition' | 'user_states';
     localModuleStates?: Writable<Record<string, GraphModuleState>>;
     localDurationStatuses?: Writable<Record<string, DurationStatus>>;
+    customUi?: {
+        tagLabel?: string | 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> & {

package/package/components/custom_ui.d.ts

@@ -41,6 +41,7 @@ export type FlowBuilderWhitelabelCustomUi = {
     downloadLogs?: boolean;
     tagSelectPlaceholder?: string;
     tagSelectNoLabel?: boolean;
+    tagLabel?: string;
 };
 export type DisplayResultUi = {
     disableAiFix?: boolean;

package/package/components/flows/content/FlowModuleComponent.svelte

@@ -796,6 +796,7 @@ let rawScriptLang = $derived(flowModule.value.type == 'rawscript' ? flowModule.v
 											disableMock={preprocessorModule || failureModule}
 											disableHistory={failureModule}
 											loadingJob={stepHistoryLoader?.stepStates[flowModule.id]?.loadingJobs}
+											tagLabel={customUi?.tagLabel}
 										/>
 									</Pane>
 								{/if}

package/package/gen/core/OpenAPI.js

@@ -21,7 +21,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: undefined,
     USERNAME: undefined,
-    VERSION: '1.509.2',
+    VERSION: '1.511.0',
     WITH_CREDENTIALS: false,
     interceptors: {
         request: new Interceptors(),

package/package/gen/schemas.gen.d.ts

@@ -1743,27 +1743,35 @@ export declare const $MainArgSignature: {
                             readonly type: "object";
                             readonly properties: {
                                 readonly object: {
-                                    readonly type: "array";
-                                    readonly items: {
-                                        readonly type: "object";
-                                        readonly properties: {
-                                            readonly key: {
-                                                readonly type: "string";
-                                            };
-                                            readonly typ: {
-                                                readonly oneOf: readonly [{
-                                                    readonly type: "string";
-                                                    readonly enum: readonly ["float", "int", "bool", "email", "unknown", "bytes", "dict", "datetime", "sql"];
-                                                }, {
-                                                    readonly type: "object";
-                                                    readonly properties: {
-                                                        readonly str: {};
+                                    readonly type: "object";
+                                    readonly properties: {
+                                        readonly name: {
+                                            readonly type: "string";
+                                        };
+                                        readonly props: {
+                                            readonly type: "array";
+                                            readonly items: {
+                                                readonly type: "object";
+                                                readonly properties: {
+                                                    readonly key: {
+                                                        readonly type: "string";
+                                                    };
+                                                    readonly typ: {
+                                                        readonly oneOf: readonly [{
+                                                            readonly type: "string";
+                                                            readonly enum: readonly ["float", "int", "bool", "email", "unknown", "bytes", "dict", "datetime", "sql"];
+                                                        }, {
+                                                            readonly type: "object";
+                                                            readonly properties: {
+                                                                readonly str: {};
+                                                            };
+                                                            readonly required: readonly ["str"];
+                                                        }];
                                                     };
-                                                    readonly required: readonly ["str"];
-                                                }];
+                                                };
+                                                readonly required: readonly ["key", "typ"];
                                             };
                                         };
-                                        readonly required: readonly ["key", "typ"];
                                     };
                                 };
                             };

package/package/gen/schemas.gen.js

@@ -1782,30 +1782,38 @@ export const $MainArgSignature = {
                                 type: 'object',
                                 properties: {
                                     object: {
-                                        type: 'array',
-                                        items: {
-                                            type: 'object',
-                                            properties: {
-                                                key: {
-                                                    type: 'string'
-                                                },
-                                                typ: {
-                                                    oneOf: [
-                                                        {
-                                                            type: 'string',
-                                                            enum: ['float', 'int', 'bool', 'email', 'unknown', 'bytes', 'dict', 'datetime', 'sql']
+                                        type: 'object',
+                                        properties: {
+                                            name: {
+                                                type: 'string'
+                                            },
+                                            props: {
+                                                type: 'array',
+                                                items: {
+                                                    type: 'object',
+                                                    properties: {
+                                                        key: {
+                                                            type: 'string'
                                                         },
-                                                        {
-                                                            type: 'object',
-                                                            properties: {
-                                                                str: {}
-                                                            },
-                                                            required: ['str']
+                                                        typ: {
+                                                            oneOf: [
+                                                                {
+                                                                    type: 'string',
+                                                                    enum: ['float', 'int', 'bool', 'email', 'unknown', 'bytes', 'dict', 'datetime', 'sql']
+                                                                },
+                                                                {
+                                                                    type: 'object',
+                                                                    properties: {
+                                                                        str: {}
+                                                                    },
+                                                                    required: ['str']
+                                                                }
+                                                            ]
                                                         }
-                                                    ]
+                                                    },
+                                                    required: ['key', 'typ']
                                                 }
-                                            },
-                                            required: ['key', 'typ']
+                                            }
                                         }
                                     }
                                 },

package/package/gen/types.gen.d.ts

@@ -546,12 +546,15 @@ export type MainArgSignature = {
         } | {
             str: Array<(string)> | null;
         } | {
-            object: Array<{
-                key: string;
-                typ: 'float' | 'int' | 'bool' | 'email' | 'unknown' | 'bytes' | 'dict' | 'datetime' | 'sql' | {
-                    str: unknown;
-                };
-            }>;
+            object: {
+                name?: string;
+                props?: Array<{
+                    key: string;
+                    typ: 'float' | 'int' | 'bool' | 'email' | 'unknown' | 'bytes' | 'dict' | 'datetime' | 'sql' | {
+                        str: unknown;
+                    };
+                }>;
+            };
         } | {
             list: 'float' | 'int' | 'bool' | 'email' | 'unknown' | 'bytes' | 'dict' | 'datetime' | 'sql' | {
                 str: unknown;
@@ -3006,6 +3009,10 @@ export type CreateAccountData = {
          * OAuth client secret for resource-level credentials (client_credentials flow only)
          */
         cc_client_secret?: string;
+        /**
+         * OAuth token URL override for resource-level authentication (client_credentials flow only)
+         */
+        cc_token_url?: string;
     };
     workspace: string;
 };
@@ -3028,6 +3035,10 @@ export type ConnectClientCredentialsData = {
          * OAuth client secret for resource-level authentication
          */
         cc_client_secret: string;
+        /**
+         * OAuth token URL override for resource-level authentication
+         */
+        cc_token_url?: string;
     };
 };
 export type ConnectClientCredentialsResponse = TokenResponse;
@@ -9572,6 +9583,10 @@ export type $OpenApiTs = {
                      * OAuth client secret for resource-level credentials (client_credentials flow only)
                      */
                     cc_client_secret?: string;
+                    /**
+                     * OAuth token URL override for resource-level authentication (client_credentials flow only)
+                     */
+                    cc_token_url?: string;
                 };
                 workspace: string;
             };
@@ -9603,6 +9618,10 @@ export type $OpenApiTs = {
                      * OAuth client secret for resource-level authentication
                      */
                     cc_client_secret: string;
+                    /**
+                     * OAuth token URL override for resource-level authentication
+                     */
+                    cc_token_url?: string;
                 };
             };
             res: {

package/package/inferArgSig.d.ts

@@ -3,7 +3,8 @@ export declare function argSigToJsonSchemaType(t: string | {
     resource: string | null;
 } | {
     list: (string | {
-        object: {
+        name?: string;
+        props?: {
             key: string;
             typ: any;
         }[];
@@ -11,9 +12,12 @@ export declare function argSigToJsonSchemaType(t: string | {
         str: any;
     } | {
         object: {
-            key: string;
-            typ: any;
-        }[];
+            name?: string;
+            props?: {
+                key: string;
+                typ: any;
+            }[];
+        };
     } | null;
 } | {
     dynselect: string;
@@ -21,9 +25,12 @@ export declare function argSigToJsonSchemaType(t: string | {
     str: string[] | null;
 } | {
     object: {
-        key: string;
-        typ: any;
-    }[];
+        name?: string;
+        props?: {
+            key: string;
+            typ: any;
+        }[];
+    };
 } | {
     oneof: {
         label: string;

package/package/inferArgSig.js

@@ -56,9 +56,12 @@ export function argSigToJsonSchemaType(t, oldS) {
     }
     else if (typeof t !== 'string' && `object` in t) {
         newS.type = 'object';
-        if (t.object) {
+        if (t.object.name) {
+            newS.format = `resource-${t.object.name}`;
+        }
+        if (t.object.props) {
             const properties = {};
-            for (const prop of t.object) {
+            for (const prop of t.object.props) {
                 if (oldS.properties && prop.key in oldS.properties) {
                     properties[prop.key] = oldS.properties[prop.key];
                 }
@@ -118,17 +121,21 @@ export function argSigToJsonSchemaType(t, oldS) {
             };
             newS.originalType = 'resource[]';
         }
-        else if (t.list &&
-            typeof t.list == 'object' &&
-            'object' in t.list &&
-            t.list.object &&
-            t.list.object.length > 0) {
-            const properties = {};
-            for (const prop of t.list.object) {
-                properties[prop.key] = { description: '', type: '' };
-                argSigToJsonSchemaType(prop.typ, properties[prop.key]);
+        else if (t.list && typeof t.list == 'object' && 'object' in t.list && t.list.object) {
+            if (t.list.object.name) {
+                newS.format = `resource-${t.list.object.name}`;
+            }
+            if (t.list.object.props && t.list.object.props.length > 0) {
+                const properties = {};
+                for (const prop of t.list.object.props) {
+                    properties[prop.key] = { description: '', type: '' };
+                    argSigToJsonSchemaType(prop.typ, properties[prop.key]);
+                }
+                newS.items = { type: 'object', properties: properties };
+            }
+            else {
+                newS.items = { type: 'object' };
             }
-            newS.items = { type: 'object', properties: properties };
             newS.originalType = 'record[]';
         }
         else {
@@ -180,12 +187,12 @@ export function argSigToJsonSchemaType(t, oldS) {
     else if (oldS.items?.type != newS.items?.type) {
         delete oldS.items;
     }
+    if (oldS.format && !newS.format) {
+        oldS.format = undefined;
+    }
     Object.assign(oldS, newS);
     // if (sameItems && savedItems != undefined && savedItems.enum != undefined) {
     // 	sendUserToast(JSON.stringify(savedItems))
     // 	oldS.items = savedItems
     // }
-    if (oldS.format?.startsWith('resource-') && newS.type != 'object') {
-        oldS.format = undefined;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.511.0",
+	"version": "1.511.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -141,17 +141,17 @@
 		"vscode-languageclient": "~9.0.1",
 		"vscode-uri": "~3.1.0",
 		"vscode-ws-jsonrpc": "~3.4.0",
-		"windmill-parser-wasm-csharp": "^1.437.1",
-		"windmill-parser-wasm-go": "^1.429.0",
-		"windmill-parser-wasm-java": "^1.478.1",
-		"windmill-parser-wasm-nu": "^1.474.1",
-		"windmill-parser-wasm-php": "^1.429.0",
-		"windmill-parser-wasm-py": "^1.510.0",
-		"windmill-parser-wasm-regex": "^1.510.0",
-		"windmill-parser-wasm-rust": "^1.429.0",
-		"windmill-parser-wasm-ts": "^1.510.0",
-		"windmill-parser-wasm-yaml": "^1.429.0",
-		"windmill-sql-datatype-parser-wasm": "^1.318.0",
+		"windmill-parser-wasm-csharp": "1.510.1",
+		"windmill-parser-wasm-go": "1.510.1",
+		"windmill-parser-wasm-java": "1.510.1",
+		"windmill-parser-wasm-nu": "1.510.1",
+		"windmill-parser-wasm-php": "1.510.1",
+		"windmill-parser-wasm-py": "1.510.1",
+		"windmill-parser-wasm-regex": "1.510.1",
+		"windmill-parser-wasm-rust": "1.510.1",
+		"windmill-parser-wasm-ts": "1.510.1",
+		"windmill-parser-wasm-yaml": "1.510.1",
+		"windmill-sql-datatype-parser-wasm": "1.318.0",
 		"xterm": "^5.3.0",
 		"xterm-readline": "^1.1.2",
 		"y-monaco": "^0.1.4",