windmill-components 1.677.1 → 1.695.0

package/package/components/triggers/nats/NatsTriggerEditorInner.svelte

@@ -7,6 +7,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { NatsTriggerService } from '../../../gen';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, capitalize, emptyString, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import Section from '../../Section.svelte';
 import { Loader2 } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -121,6 +122,9 @@ export async function openNew(nis_flow, fixedScriptPath_, nDefaultValues) {
         error_handler_args = nDefaultValues?.error_handler_args ?? {};
         retry = nDefaultValues?.retry ?? undefined;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -149,8 +153,8 @@ async function loadTriggerConfig(cfg) {
     retry = cfg?.retry;
     errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     permissionedAs = cfg?.permissioned_as;
-    selectedPermissionedAs = undefined;
-    preservePermissionedAs = false;
+    selectedPermissionedAs = cfg?.permissioned_as;
+    preservePermissionedAs = !!cfg?.permissioned_as;
 }
 async function loadTrigger(defaultConfig) {
     if (defaultConfig) {
@@ -210,13 +214,18 @@ function useDefaultValues() {
         defaultValues.servers.some((broker) => broker.trim() !== ''));
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await NatsTriggerService.setNatsTriggerMode({
+        const ok = await withForkConflictRetry((force) => NatsTriggerService.setNatsTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'NATS trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} NATS trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -312,15 +321,14 @@ $effect(() => {
 			<Loader2 class="animate-spin" />
 		{/if}
 	{:else}
-		{#if edit}
-			<PermissionedAsLine
-				{permissionedAs}
-				onPermissionedAsChange={(pa, preserve) => {
-					selectedPermissionedAs = pa
-					preservePermissionedAs = preserve
-				}}
-			/>
-		{/if}
+		<PermissionedAsLine
+			{permissionedAs}
+			{path}
+			onPermissionedAsChange={(pa, preserve) => {
+				selectedPermissionedAs = pa
+				preservePermissionedAs = preserve
+			}}
+		/>
 		<div class="flex flex-col gap-4">
 			{#if description}
 				{@render description()}

package/package/components/triggers/postgres/PostgresTriggerEditor.svelte.d.ts

@@ -1,6 +1,7 @@
-declare const PostgresTriggerEditor: import("svelte").Component<{
-    onUpdate: any;
-}, {
+type $$ComponentProps = {
+    onUpdate?: (path?: string) => void;
+};
+declare const PostgresTriggerEditor: import("svelte").Component<$$ComponentProps, {
     openEdit: (ePath: string, isFlow: boolean) => Promise<void>;
     openNew: (is_flow: boolean, initial_script_path?: string, defaultValues?: Record<string, any>) => Promise<void>;
 }, "">;

package/package/components/triggers/postgres/PostgresTriggerEditorInner.svelte

@@ -7,6 +7,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { PostgresTriggerService } from '../../../gen';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, emptyString, emptyStringTrimmed, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import Section from '../../Section.svelte';
 import { Loader2 } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -229,6 +230,9 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues, newDraf
         retry = defaultValues?.retry ?? undefined;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
         mode = defaultValues?.mode ?? 'enabled';
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -277,8 +281,8 @@ async function loadTriggerConfig(cfg) {
     errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     mode = cfg?.mode ?? 'enabled';
     permissionedAs = cfg?.permissioned_as;
-    selectedPermissionedAs = undefined;
-    preservePermissionedAs = false;
+    selectedPermissionedAs = cfg?.permissioned_as;
+    preservePermissionedAs = !!cfg?.permissioned_as;
 }
 async function loadTrigger(defaultConfig) {
     if (defaultConfig) {
@@ -359,13 +363,18 @@ const getTemplateScript = async () => {
     }
 };
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await PostgresTriggerService.setPostgresTriggerMode({
+        const ok = await withForkConflictRetry((force) => PostgresTriggerService.setPostgresTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'postgres trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} postgres trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -477,15 +486,14 @@ $effect(() => {
 			</div>
 		{/if}
 	{:else}
-		{#if edit}
-			<PermissionedAsLine
-				{permissionedAs}
-				onPermissionedAsChange={(pa, preserve) => {
-					selectedPermissionedAs = pa
-					preservePermissionedAs = preserve
-				}}
-			/>
-		{/if}
+		<PermissionedAsLine
+			{permissionedAs}
+			{path}
+			onPermissionedAsChange={(pa, preserve) => {
+				selectedPermissionedAs = pa
+				preservePermissionedAs = preserve
+			}}
+		/>
 		<div class="flex flex-col gap-4">
 			{#if description}
 				{@render description()}

package/package/components/triggers/schedules/ScheduleEditorInner.svelte

@@ -26,6 +26,7 @@ import Label from '../../Label.svelte';
 import WorkerTagPicker from '../../WorkerTagPicker.svelte';
 import { runScheduleNow } from '../scheduled/utils';
 import { handleConfigChange } from '../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import TextInput from '../../text_input/TextInput.svelte';
 import { twMerge } from 'tailwind-merge';
 import PermissionedAsLine from '../PermissionedAsLine.svelte';
@@ -274,6 +275,9 @@ export async function openNew(nis_flow, initial_script_path, defaultValues, sche
         wsErrorHandlerMuted = s?.ws_error_handler_muted ?? false;
         retry = s?.retry ?? undefined;
         await setScheduleHandler(s);
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
     }
     finally {
         clearTimeout(loadingTimeout);
@@ -478,8 +482,8 @@ async function loadScheduleCfg(cfg) {
     can_write = canWrite(cfg.path, cfg.extra_perms, $userStore);
     tag = cfg.tag;
     permissionedAs = cfg.permissioned_as;
-    selectedPermissionedAs = undefined;
-    preservePermissionedAs = false;
+    selectedPermissionedAs = cfg.permissioned_as;
+    preservePermissionedAs = !!cfg.permissioned_as;
     loading = false;
 }
 async function scheduleScript() {
@@ -572,13 +576,18 @@ function getScheduleCfg() {
     };
 }
 async function handleToggleEnabled(nEnabled) {
+    const previousEnabled = enabled;
     enabled = nEnabled;
     if (!trigger?.draftConfig) {
-        await ScheduleService.setScheduleEnabled({
+        const ok = await withForkConflictRetry((force) => ScheduleService.setScheduleEnabled({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { enabled: nEnabled }
-        });
+            requestBody: { enabled: nEnabled, force }
+        }), 'schedule');
+        if (!ok) {
+            enabled = previousEnabled;
+            return;
+        }
         sendUserToast(`${nEnabled ? 'enabled' : 'disabled'} schedule ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -643,15 +652,14 @@ $effect(() => {
 			<Loader2 class="animate-spin" />
 		{/if}
 	{:else}
-		{#if edit}
-			<PermissionedAsLine
-				{permissionedAs}
-				onPermissionedAsChange={(pa, preserve) => {
-					selectedPermissionedAs = pa
-					preservePermissionedAs = preserve
-				}}
-			/>
-		{/if}
+		<PermissionedAsLine
+			{permissionedAs}
+			{path}
+			onPermissionedAsChange={(pa, preserve) => {
+				selectedPermissionedAs = pa
+				preservePermissionedAs = preserve
+			}}
+		/>
 		<div class="flex flex-col gap-8">
 			<Section label="Metadata">
 				<div class="flex flex-col gap-6">

package/package/components/triggers/sqs/SqsTriggerEditor.svelte.d.ts

@@ -1,6 +1,7 @@
-declare const SqsTriggerEditor: import("svelte").Component<{
-    onUpdate: any;
-}, {
+type $$ComponentProps = {
+    onUpdate?: (path?: string) => void;
+};
+declare const SqsTriggerEditor: import("svelte").Component<$$ComponentProps, {
     openEdit: (ePath: string, isFlow: boolean) => Promise<void>;
     openNew: (is_flow: boolean, initial_script_path?: string, defaultValues?: Record<string, any>) => Promise<void>;
 }, "">;

package/package/components/triggers/sqs/SqsTriggerEditorInner.svelte

@@ -4,6 +4,7 @@ import DrawerContent from '../../common/drawer/DrawerContent.svelte';
 import Path from '../../Path.svelte';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, capitalize, emptyString, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import { Loader2 } from 'lucide-svelte';
 import Label from '../../Label.svelte';
 import { SqsTriggerService } from '../../../gen';
@@ -114,6 +115,9 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         error_handler_args = defaultValues?.error_handler_args ?? {};
         retry = defaultValues?.retry ?? undefined;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -140,8 +144,8 @@ async function loadTriggerConfig(cfg) {
         retry = cfg?.retry;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
         permissionedAs = cfg?.permissioned_as;
-        selectedPermissionedAs = undefined;
-        preservePermissionedAs = false;
+        selectedPermissionedAs = cfg?.permissioned_as;
+        preservePermissionedAs = !!cfg?.permissioned_as;
     }
     catch (error) {
         sendUserToast(`Could not load SQS trigger config: ${error.body}`, true);
@@ -183,13 +187,18 @@ function getSaveCfg() {
     };
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await SqsTriggerService.setSqsTriggerMode({
+        const ok = await withForkConflictRetry((force) => SqsTriggerService.setSqsTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'SQS trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} SQS trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -306,15 +315,14 @@ $effect(() => {
 			<Loader2 class="animate-spin" />
 		{/if}
 	{:else}
-		{#if edit}
-			<PermissionedAsLine
-				{permissionedAs}
-				onPermissionedAsChange={(pa, preserve) => {
-					selectedPermissionedAs = pa
-					preservePermissionedAs = preserve
-				}}
-			/>
-		{/if}
+		<PermissionedAsLine
+			{permissionedAs}
+			{path}
+			onPermissionedAsChange={(pa, preserve) => {
+				selectedPermissionedAs = pa
+				preservePermissionedAs = preserve
+			}}
+		/>
 		<div class="flex flex-col gap-4">
 			{#if description}
 				{@render description()}

package/package/components/triggers/triggers.svelte.d.ts

@@ -26,6 +26,7 @@ export declare class Triggers {
     fetchMqttTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchSqsTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchGcpTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
+    fetchAzureTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchHttpTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchEmailTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchNativeTriggers(triggersCountStore: Writable<TriggersCount | undefined>, serviceName: NativeServiceName, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;

package/package/components/triggers/triggers.svelte.js

@@ -1,4 +1,4 @@
-import { KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService, NativeTriggerService, HttpTriggerService, GcpTriggerService, EmailTriggerService } from '../../gen';
+import { KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService, NativeTriggerService, HttpTriggerService, GcpTriggerService, AzureTriggerService, EmailTriggerService } from '../../gen';
 import { enterpriseLicense } from '../../stores';
 import { getLightConfig, sortTriggers, updateTriggersCount } from './utils';
 import { get } from 'svelte/store';
@@ -298,6 +298,27 @@ export class Triggers {
             console.error('Failed to fetch GCP Pub/Sub triggers:', error);
         }
     }
+    async fetchAzureTriggers(triggersCountStore, workspaceId, path, isFlow, user = undefined) {
+        if (!workspaceId)
+            return;
+        try {
+            const azureTriggers = await AzureTriggerService.listAzureTriggers({
+                workspace: workspaceId,
+                path,
+                isFlow
+            });
+            const azureCount = this.updateTriggers(azureTriggers, 'azure', user);
+            triggersCountStore.update((triggersCount) => {
+                return {
+                    ...(triggersCount ?? {}),
+                    azure_count: azureCount
+                };
+            });
+        }
+        catch (error) {
+            console.error('Failed to fetch Azure triggers:', error);
+        }
+    }
     async fetchHttpTriggers(triggersCountStore, workspaceId, path, isFlow, user = undefined) {
         if (!workspaceId)
             return;
@@ -383,11 +404,13 @@ export class Triggers {
             this.fetchMqttTriggers(triggersCountStore, workspaceId, path, isFlow, user),
             this.fetchNativeTriggers(triggersCountStore, 'nextcloud', workspaceId, path, isFlow, user),
             this.fetchNativeTriggers(triggersCountStore, 'google', workspaceId, path, isFlow, user),
+            this.fetchNativeTriggers(triggersCountStore, 'github', workspaceId, path, isFlow, user),
             ...(get(enterpriseLicense)
                 ? [
                     this.fetchKafkaTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchSqsTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchGcpTriggers(triggersCountStore, workspaceId, path, isFlow, user),
+                    this.fetchAzureTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchEmailTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchNatsTriggers(triggersCountStore, workspaceId, path, isFlow, user)
                 ]

package/package/components/triggers/utils.js

@@ -4,6 +4,7 @@ import NatsIcon from '../icons/NatsIcon.svelte';
 import MqttIcon from '../icons/MqttIcon.svelte';
 import AwsIcon from '../icons/AwsIcon.svelte';
 import GoogleCloudIcon from '../icons/GoogleCloudIcon.svelte';
+import AzureIcon from '../icons/AzureIcon.svelte';
 import SchedulePollIcon from '../icons/SchedulePollIcon.svelte';
 import { saveScheduleFromCfg } from '../flows/scheduleUtils';
 import { saveHttpRouteFromCfg } from './http/utils';
@@ -14,10 +15,12 @@ import { saveSqsTriggerFromCfg } from './sqs/utils';
 import { saveNatsTriggerFromCfg } from './nats/utils';
 import { saveMqttTriggerFromCfg } from './mqtt/utils';
 import { saveGcpTriggerFromCfg } from './gcp/utils';
+import { saveAzureTriggerFromCfg } from './azure/utils';
 import { emptyString } from '../../utils';
 import { saveEmailTriggerFromCfg } from './email/utils';
 import NextcloudIcon from '../icons/NextcloudIcon.svelte';
 import GoogleIcon from '../icons/GoogleIcon.svelte';
+import GithubIcon from '../icons/GithubIcon.svelte';
 import { saveNativeTriggerFromCfg } from './native/utils';
 export const CLOUD_DISABLED_TRIGGER_TYPES = [
     'nats',
@@ -25,6 +28,7 @@ export const CLOUD_DISABLED_TRIGGER_TYPES = [
     'sqs',
     'mqtt',
     'gcp',
+    'azure',
     'websocket',
     'postgres'
 ];
@@ -41,7 +45,9 @@ export const jobTriggerKinds = [
     'postgres',
     'schedule',
     'gcp',
-    'google'
+    'azure',
+    'google',
+    'github'
 ];
 // Map of trigger kinds to icons
 export const triggerIconMap = {
@@ -57,11 +63,13 @@ export const triggerIconMap = {
     mqtt: MqttIcon,
     sqs: AwsIcon,
     gcp: GoogleCloudIcon,
+    azure: AzureIcon,
     primary_schedule: Calendar,
     poll: SchedulePollIcon,
     cli: Terminal,
     nextcloud: NextcloudIcon,
-    google: GoogleIcon
+    google: GoogleIcon,
+    github: GithubIcon
 };
 export const triggerDisplayNamesMap = {
     schedule: 'Schedule',
@@ -73,13 +81,15 @@ export const triggerDisplayNamesMap = {
     mqtt: 'MQTT',
     sqs: 'SQS',
     gcp: 'GCP Pub/Sub',
+    azure: 'Azure Event Grid',
     email: 'Email',
     poll: 'Scheduled Poll',
     webhook: 'Webhook',
     default_email: 'Default Email',
     cli: 'CLI',
     nextcloud: 'Nextcloud',
-    google: 'Google'
+    google: 'Google',
+    github: 'GitHub'
 };
 /**
  * Converts a TriggerType to a CaptureTriggerKind when a mapping exists
@@ -100,6 +110,7 @@ export function triggerTypeToCaptureKind(triggerType) {
         'mqtt',
         'sqs',
         'gcp',
+        'azure',
         'cli'
     ];
     if (capturableTriggerTypes.includes(triggerType)) {
@@ -121,11 +132,13 @@ export function updateTriggersCount(triggersCountStore, type, action, primaryCfg
         mqtt: 'mqtt_count',
         sqs: 'sqs_count',
         gcp: 'gcp_count',
+        azure: 'azure_count',
         email: 'email_count',
         poll: undefined,
         cli: undefined,
         nextcloud: 'nextcloud_count',
-        google: 'google_count'
+        google: 'google_count',
+        github: 'github_count'
     };
     const countProperty = countPropertyMap[type];
     triggersCountStore.update((triggersCount) => {
@@ -189,6 +202,8 @@ export function triggerKindToTriggerType(kind) {
             return 'sqs';
         case 'gcp':
             return 'gcp';
+        case 'azure':
+            return 'azure';
         case 'scheduledPoll':
             return 'poll';
         default:
@@ -228,11 +243,13 @@ export async function deployTriggers(triggersToDeploy, workspaceId, isAdmin, use
         mqtt: (trigger) => saveMqttTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
         sqs: (trigger) => saveSqsTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
         gcp: (trigger) => saveGcpTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
+        azure: (trigger) => saveAzureTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
         email: (trigger) => saveEmailTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, isAdmin, usedTriggerKinds),
         poll: undefined,
         cli: undefined,
         nextcloud: (trigger) => saveNativeTriggerFromCfg('nextcloud', trigger.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
-        google: (trigger) => saveNativeTriggerFromCfg('google', trigger.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds)
+        google: (trigger) => saveNativeTriggerFromCfg('google', trigger.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
+        github: (trigger) => saveNativeTriggerFromCfg('github', trigger.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds)
     };
     await Promise.all(triggersToDeploy.map(async (trigger) => {
         const saveFunction = triggerSaveFunctions[trigger.type];
@@ -310,6 +327,14 @@ export function getLightConfig(triggerType, trigger) {
     else if (triggerType === 'gcp') {
         return { gcp_resource_path: trigger.gcp_resource_path, topic: trigger.topic };
     }
+    else if (triggerType === 'azure') {
+        return {
+            azure_resource_path: trigger.azure_resource_path,
+            azure_mode: trigger.azure_mode,
+            scope_resource_id: trigger.scope_resource_id,
+            topic_name: trigger.topic_name
+        };
+    }
     else if (triggerType === 'email') {
         return { local_part: trigger.local_part };
     }
@@ -326,6 +351,14 @@ export function getLightConfig(triggerType, trigger) {
             summary: trigger.summary
         };
     }
+    else if (triggerType === 'github') {
+        return {
+            owner: trigger.service_config?.owner ?? trigger.owner,
+            repo: trigger.service_config?.repo ?? trigger.repo,
+            events: trigger.service_config?.events ?? trigger.events,
+            summary: trigger.summary
+        };
+    }
     else {
         return undefined;
     }
@@ -390,6 +423,12 @@ export function getTriggerLabel(trigger) {
             return name ? `Drive: ${name}` : config?.resource_id ? `Drive: ${path}` : `Drive: All changes`;
         }
     }
+    else if (type === 'github' && config?.summary) {
+        return `${config.summary}`;
+    }
+    else if (type === 'github' && config?.owner && config?.repo) {
+        return `${config.owner}/${config.repo}`;
+    }
     else if (isDraft && draftConfig?.path) {
         return `${draftConfig?.path}`;
     }
@@ -415,9 +454,11 @@ export function sortTriggers(triggers) {
         'mqtt',
         'sqs',
         'gcp',
+        'azure',
         'email',
         'nextcloud',
-        'google'
+        'google',
+        'github'
     ];
     return triggers.sort((a, b) => {
         // Draft triggers always come last

package/package/components/triggers/websocket/WebsocketTriggerEditorInner.svelte

@@ -8,6 +8,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { FlowService, ScriptService, WebsocketTriggerService } from '../../../gen';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, emptySchema, emptyString, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import Section from '../../Section.svelte';
 import { Loader2, X, Plus } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -152,6 +153,9 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         retry = defaultValues?.retry ?? undefined;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
         mode = defaultValues?.mode ?? 'enabled';
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -184,8 +188,8 @@ function loadTriggerConfig(cfg) {
     errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     mode = cfg?.mode ?? 'enabled';
     permissionedAs = cfg?.permissioned_as;
-    selectedPermissionedAs = undefined;
-    preservePermissionedAs = false;
+    selectedPermissionedAs = cfg?.permissioned_as;
+    preservePermissionedAs = !!cfg?.permissioned_as;
 }
 function getSaveCfg() {
     return {
@@ -279,13 +283,18 @@ function getCaptureConfig() {
     };
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await WebsocketTriggerService.setWebsocketTriggerMode({
+        const ok = await withForkConflictRetry((force) => WebsocketTriggerService.setWebsocketTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'websocket trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} websocket trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -378,15 +387,14 @@ $effect(() => {
 			<Loader2 class="animate-spin" />
 		{/if}
 	{:else}
-		{#if edit}
-			<PermissionedAsLine
-				{permissionedAs}
-				onPermissionedAsChange={(pa, preserve) => {
-					selectedPermissionedAs = pa
-					preservePermissionedAs = preserve
-				}}
-			/>
-		{/if}
+		<PermissionedAsLine
+			{permissionedAs}
+			{path}
+			onPermissionedAsChange={(pa, preserve) => {
+				selectedPermissionedAs = pa
+				preservePermissionedAs = preserve
+			}}
+		/>
 		<div class="flex flex-col gap-4">
 			{#if mode === 'suspended'}
 				<TriggerSuspendedJobsAlert {suspendedJobsModal} />

package/package/components/triggers.d.ts

@@ -16,5 +16,5 @@ export type TriggerContext = {
     triggersState: Triggers;
 };
 export declare function setScheduledPollSchedule(triggersState: Triggers, triggersCount: Writable<TriggersCount | undefined>): void;
-export type TriggerKind = 'webhooks' | 'emails' | 'default_emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll' | 'kafka' | 'nats' | 'postgres' | 'mqtt' | 'sqs' | 'gcp' | 'nextcloud' | 'google';
+export type TriggerKind = 'webhooks' | 'emails' | 'default_emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll' | 'kafka' | 'nats' | 'postgres' | 'mqtt' | 'sqs' | 'gcp' | 'azure' | 'nextcloud' | 'google' | 'github';
 export declare function captureTriggerKindToTriggerKind(kind: CaptureTriggerKind): TriggerKind;

package/package/components/useFolderDefaultPermissionedAs.svelte.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Resolves the folder's `default_permissioned_as` rule that matches a given item path.
+ * Returns `undefined` when the user is not admin/wm_deployer, the path is not under a
+ * folder, the folder has no matching rules, or the fetch fails.
+ *
+ * Tracks workspace/user store changes reactively so the value refreshes on workspace
+ * switch or permission change. Uses `runed`'s `resource()` which handles race conditions
+ * and loading state automatically.
+ */
+export declare function useFolderDefaultPermissionedAs(pathGetter: () => string | undefined): {
+    readonly value: string | undefined;
+    readonly loading: boolean;
+};