windmill-components 1.665.1 → 1.677.1

package/package/utils.js

@@ -1245,6 +1245,27 @@ export function validateFileExtension(ext) {
 export function isFlowPreview(job_kind) {
     return !!job_kind && (job_kind === 'flowpreview' || job_kind === 'flownode');
 }
+export function isHubFlowPath(scriptPath) {
+    return !!scriptPath && scriptPath.startsWith('hub/flows/');
+}
+export function getHubFlowIdFromPath(scriptPath) {
+    if (!scriptPath || !isHubFlowPath(scriptPath)) {
+        return undefined;
+    }
+    const hubFlowPath = scriptPath.substring('hub/flows/'.length);
+    const [idPart] = hubFlowPath.split('/');
+    const id = Number(idPart);
+    return Number.isInteger(id) && id > 0 ? id : undefined;
+}
+export function getJobKindDisplayLabel(jobKind, scriptPath) {
+    if (jobKind === 'script_hub') {
+        return 'Script from hub';
+    }
+    if (isFlowPreview(jobKind) && isHubFlowPath(scriptPath)) {
+        return 'Flow from hub';
+    }
+    return jobKind ?? '';
+}
 export function isNotFlow(job_kind) {
     return job_kind !== 'flow' && job_kind !== 'singlestepflow' && !isFlowPreview(job_kind);
 }

package/package/utils_deployable.d.ts

@@ -31,6 +31,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         queue_url: string;
         aws_auth_resource_type: import("./gen").AwsAuthResourceType;
         aws_resource_path: string;
@@ -58,6 +59,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         kafka_resource_path: string;
         group_id: string;
         topics: Array<(string)>;
@@ -65,6 +67,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
             key: string;
             value: unknown;
         }>;
+        filter_logic?: "and" | "or";
         auto_offset_reset?: "latest" | "earliest";
         auto_commit?: boolean;
         server_id?: string;
@@ -90,6 +93,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         mqtt_resource_path: string;
         subscribe_topics: Array<import("./gen").MqttSubscribeTopic>;
         v3_config?: import("./gen").MqttV3Config | null;
@@ -119,6 +123,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         nats_resource_path: string;
         use_jetstream: boolean;
         stream_name?: string | null;
@@ -151,6 +156,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         postgres_resource_path: string;
         publication_name: string;
         server_id?: string;
@@ -177,6 +183,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         url: string;
         server_id?: string;
         last_server_ping?: string;
@@ -185,10 +192,12 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
             key: string;
             value: unknown;
         }>;
+        filter_logic?: "and" | "or";
         initial_messages?: Array<import("./gen").WebsocketTriggerInitialMessage> | null;
         url_runnable_args?: import("./gen").ScriptArgs | null;
         can_return_message: boolean;
         can_return_error_result: boolean;
+        heartbeat?: import("./gen").WebsocketHeartbeat | null;
         error_handler_path?: string;
         error_handler_args?: import("./gen").ScriptArgs;
         retry?: import("./gen").Retry;
@@ -209,6 +218,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         edited_at: string;
         is_flow: boolean;
         mode: import("./gen").TriggerMode;
+        labels?: Array<(string)>;
         route_path: string;
         static_asset_config?: {
             s3: string;
@@ -267,6 +277,7 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         paused_until?: string | null;
         cron_version?: string | null;
         dynamic_skip?: string | null;
+        labels?: Array<(string)>;
     };
     createFn: typeof ScheduleService.createSchedule;
     updateFn: typeof ScheduleService.updateSchedule;

package/package/utils_workspace_deploy.js

@@ -1,6 +1,10 @@
 import { AppService, FlowService, FolderService, ResourceService, ScheduleService, ScriptService, VariableService } from './gen';
 import { getAllModules } from './components/flows/flowExplorer';
 import { existsTrigger, getTriggersDeployData, getTriggerPermissionedAs, getTriggerValue } from './utils_deployable';
+/** Folder diff paths carry the `f/` prefix (e.g. `f/test`), but folder API endpoints expect just the name. */
+function folderName(path) {
+    return path.replace(/^f\//, '');
+}
 /**
  * Deploy an item from one workspace to another.
  * Handles all item kinds: flow, script, app, variable, resource, resource_type, folder, trigger.
@@ -224,12 +228,33 @@ export async function deployItem(params) {
             }
         }
         else if (kind === 'folder') {
-            await FolderService.createFolder({
-                workspace: workspaceTo,
-                requestBody: {
-                    name: path
-                }
+            const name = folderName(path);
+            const folder = await FolderService.getFolder({
+                workspace: workspaceFrom,
+                name
             });
+            if (alreadyExists) {
+                await FolderService.updateFolder({
+                    workspace: workspaceTo,
+                    name,
+                    requestBody: {
+                        owners: folder.owners,
+                        extra_perms: folder.extra_perms,
+                        summary: folder.summary ?? undefined
+                    }
+                });
+            }
+            else {
+                await FolderService.createFolder({
+                    workspace: workspaceTo,
+                    requestBody: {
+                        name,
+                        owners: folder.owners,
+                        extra_perms: folder.extra_perms,
+                        summary: folder.summary ?? undefined
+                    }
+                });
+            }
         }
         else if (kind === 'trigger') {
             if (additionalInformation?.triggers) {
@@ -310,7 +335,7 @@ export async function checkItemExists(kind, path, workspace, additionalInformati
     else if (kind === 'folder') {
         return await FolderService.existsFolder({
             workspace: workspace,
-            name: path
+            name: folderName(path)
         });
     }
     else if (kind === 'trigger') {
@@ -399,10 +424,13 @@ export async function getItemValue(kind, path, workspace, additionalInformation)
         else if (kind === 'folder') {
             const folder = await FolderService.getFolder({
                 workspace: workspace,
-                name: path
+                name: folderName(path)
             });
             return {
-                name: folder.name
+                name: folder.name,
+                owners: folder.owners,
+                extra_perms: folder.extra_perms,
+                summary: folder.summary
             };
         }
         else if (kind === 'trigger') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.665.1",
+	"version": "1.677.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -148,18 +148,19 @@
 		"vscode-languageclient": "~9.0.1",
 		"vscode-uri": "~3.1.0",
 		"vscode-ws-jsonrpc": "~3.5.0",
-		"windmill-parser-wasm": "file:../backend/parsers/windmill-parser-wasm/pkg-ts",
-		"windmill-parser-wasm-asset": "1.653.0",
+		"windmill-parser-wasm-asset": "1.673.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.647.1",
 		"windmill-parser-wasm-py": "1.657.2",
-		"windmill-parser-wasm-regex": "1.653.0",
+		"windmill-parser-wasm-r": "1.668.1",
+		"windmill-parser-wasm-regex": "^1.670.0",
 		"windmill-parser-wasm-ruby": "1.526.1",
 		"windmill-parser-wasm-rust": "1.647.1",
 		"windmill-parser-wasm-ts": "1.657.2",
+		"windmill-parser-wasm-wac": "1.668.6",
 		"windmill-parser-wasm-yaml": "1.593.0",
 		"windmill-sql-datatype-parser-wasm": "1.512.0",
 		"windmill-utils-internal": "^1.3.4",