windmill-components 1.677.1 → 1.695.0

package/package/utils_deployable.js

@@ -1,5 +1,5 @@
 import { minimatch } from 'minimatch';
-import { GcpTriggerService, HttpTriggerService, KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService } from './gen';
+import { AzureTriggerService, EmailTriggerService, GcpTriggerService, HttpTriggerService, KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService } from './gen';
 import { base } from './base';
 export const ALL_DEPLOYABLE = {
     include_path: [],
@@ -44,10 +44,30 @@ export async function existsTrigger(data, triggerKind) {
     else if (triggerKind === 'nats') {
         return await NatsTriggerService.existsNatsTrigger(data);
     }
+    else if (triggerKind === 'azure') {
+        return await AzureTriggerService.existsAzureTrigger(data);
+    }
+    else if (triggerKind === 'emails') {
+        return await EmailTriggerService.existsEmailTrigger(data);
+    }
     else if (triggerKind === 'schedules') {
         return await ScheduleService.existsSchedule(data);
     }
-    throw new Error(`Unexpected trigger kind ${triggerKind}. Allowed kinds are: routes, kafka, mqtt, postgres, sqs, gcp, websockets, nats, schedules.`);
+    throw new Error(`Unexpected trigger kind ${triggerKind}. Allowed kinds are: routes, kafka, mqtt, postgres, sqs, gcp, websockets, nats, azure, emails, schedules.`);
+}
+/**
+ * Strip operational state (`mode`, `enabled`) from a trigger/schedule payload
+ * before sending it to an update endpoint via the merge UI. The backend's
+ * `update_trigger` handler preserves the target row's existing `mode` when
+ * both fields are absent from the request (`is_mode_unspecified()`), so
+ * stripping here lets a fork→parent (or parent→fork) deploy carry config
+ * changes without flipping the target's enabled/disabled state. Schedules'
+ * `EditSchedule` already lacks `enabled` on the backend, but stripping keeps
+ * the intent explicit and matches the YAML/CLI round-trip behavior.
+ */
+function stripOperationalState(payload) {
+    const { mode: _mode, enabled: _enabled, ...rest } = payload;
+    return rest;
 }
 /**
  * Get trigger deployment data with optional permissioned_as preservation.
@@ -62,7 +82,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...sqsTrigger,
+                ...stripOperationalState(sqsTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -77,7 +97,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...kafkaTrigger,
+                ...stripOperationalState(kafkaTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -92,7 +112,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...mqttTrigger,
+                ...stripOperationalState(mqttTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -107,7 +127,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...natsTrigger,
+                ...stripOperationalState(natsTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -126,7 +146,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
             gcpTrigger.delivery_config.audience = '';
         }
         const data = {
-            ...gcpTrigger,
+            ...stripOperationalState(gcpTrigger),
             delivery_config: gcpTrigger.delivery_config ?? undefined,
             base_endpoint: gcpTrigger.delivery_type === 'push' ? `${window.location.origin}${base}` : undefined,
             permissioned_as: onBehalfOf,
@@ -145,7 +165,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...postgresTrigger,
+                ...stripOperationalState(postgresTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -160,7 +180,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...websocketTrigger,
+                ...stripOperationalState(websocketTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -175,7 +195,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...httpTrigger,
+                ...stripOperationalState(httpTrigger),
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs
             },
@@ -183,6 +203,36 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
             updateFn: HttpTriggerService.updateHttpTrigger
         };
     }
+    else if (kind === 'azure') {
+        const azureTrigger = await AzureTriggerService.getAzureTrigger({
+            workspace: workspace,
+            path: path
+        });
+        return {
+            data: {
+                ...stripOperationalState(azureTrigger),
+                permissioned_as: onBehalfOf,
+                preserve_permissioned_as: preservePermissionedAs
+            },
+            createFn: AzureTriggerService.createAzureTrigger,
+            updateFn: AzureTriggerService.updateAzureTrigger
+        };
+    }
+    else if (kind === 'emails') {
+        const emailTrigger = await EmailTriggerService.getEmailTrigger({
+            workspace: workspace,
+            path: path
+        });
+        return {
+            data: {
+                ...stripOperationalState(emailTrigger),
+                permissioned_as: onBehalfOf,
+                preserve_permissioned_as: preservePermissionedAs
+            },
+            createFn: EmailTriggerService.createEmailTrigger,
+            updateFn: EmailTriggerService.updateEmailTrigger
+        };
+    }
     else if (kind === 'schedules') {
         const schedulesTrigger = await ScheduleService.getSchedule({
             workspace: workspace,
@@ -190,7 +240,7 @@ export async function getTriggersDeployData(kind, path, workspace, onBehalfOf) {
         });
         return {
             data: {
-                ...schedulesTrigger,
+                ...stripOperationalState(schedulesTrigger),
                 // permissioned_as is only set on create, not update
                 permissioned_as: onBehalfOf,
                 preserve_permissioned_as: preservePermissionedAs

package/package/utils_workspace_deploy.d.ts

@@ -1,4 +1,6 @@
 import { type AdditionalInformation, type Kind } from './utils_deployable';
+import { type DeployResult } from 'windmill-utils-internal';
+export type { DeployResult };
 export interface DeployItemParams {
     kind: Kind;
     path: string;
@@ -15,15 +17,17 @@ export interface DeployItemParams {
      */
     onBehalfOf?: string;
 }
-export interface DeployResult {
-    success: boolean;
-    error?: string;
-}
 /**
  * Deploy an item from one workspace to another.
  * Handles all item kinds: flow, script, app, variable, resource, resource_type, folder, trigger.
  */
 export declare function deployItem(params: DeployItemParams): Promise<DeployResult>;
+/**
+ * Delete/archive an item in a workspace.
+ * Used when deploying a deletion from one workspace to another.
+ * Scripts and flows are archived (reversible). Other types are deleted.
+ */
+export declare function deleteItemInWorkspace(kind: Kind, path: string, workspace: string): Promise<DeployResult>;
 /**
  * Check if an item already exists in the target workspace.
  */
@@ -34,9 +38,5 @@ export declare function checkItemExists(kind: Kind, path: string, workspace: str
 export declare function getItemValue(kind: Kind, path: string, workspace: string, additionalInformation?: AdditionalInformation): Promise<unknown>;
 /**
  * Get the on_behalf_of value for a deployable item.
- *
- * Return type varies by item kind:
- * - For flows/scripts/apps: returns on_behalf_of_email (an email address)
- * - For triggers/schedules: returns permissioned_as (u/username or g/group format)
  */
 export declare function getOnBehalfOf(kind: Kind, path: string, workspace: string, additionalInformation?: AdditionalInformation): Promise<string | undefined>;