windmill-components 1.677.1 → 1.695.0

package/package/components/triggers/gcp/GcpTriggerEditorInner.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 { GcpTriggerService } from '../../../gen';
@@ -112,6 +113,9 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         auto_acknowledge_msg = defaultValues?.auto_acknowledge_msg ?? true;
         ack_deadline = defaultValues?.ack_deadline;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -155,8 +159,8 @@ async function loadTriggerConfig(cfg) {
     ack_deadline = cfg?.ack_deadline;
     errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     permissionedAs = cfg?.permissioned_as;
-    selectedPermissionedAs = undefined;
-    preservePermissionedAs = false;
+    selectedPermissionedAs = cfg?.permissioned_as;
+    preservePermissionedAs = !!cfg?.permissioned_as;
 }
 async function updateTrigger() {
     deploymentLoading = true;
@@ -213,13 +217,18 @@ function getGcpCaptureConfig() {
     };
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await GcpTriggerService.setGcpTriggerMode({
+        const ok = await withForkConflictRetry((force) => GcpTriggerService.setGcpTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'GCP Pub/Sub trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} GCP Pub/Sub trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -313,15 +322,14 @@ $effect(() => {
 			<p>Loading...</p>
 		</div>
 	{: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-5">
 			{#if mode === 'suspended'}
 				<TriggerSuspendedJobsAlert {suspendedJobsModal} />

package/package/components/triggers/http/RouteEditorConfigSection.svelte

@@ -63,8 +63,9 @@ $effect.pre(() => {
     route_path === undefined && (route_path = '');
 });
 let userIsAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin);
-let userCanEditConfig = $derived(userIsAdmin || isDraftOnly); // User can edit config if they are admin or if the trigger is a draft which will not be saved
 let globalHttpWorkspacedRoute = $state(false);
+let effectiveWorkspaced = $derived(workspaced_route || globalHttpWorkspacedRoute);
+let userCanEditConfig = $derived(userIsAdmin || isDraftOnly || effectiveWorkspaced);
 async function loadGlobalHttpWorkspacedRouteSetting() {
     try {
         const setting = await SettingService.getGlobal({ key: 'http_route_workspaced_route' });
@@ -76,7 +77,11 @@ async function loadGlobalHttpWorkspacedRouteSetting() {
 }
 loadGlobalHttpWorkspacedRouteSetting();
 $effect.pre(() => {
-    if (globalHttpWorkspacedRoute && !workspaced_route) {
+    // Force workspaced route for non-admins on new triggers only.
+    // Existing non-workspaced triggers created by admins can still be edited by non-admins
+    // (with restricted fields), so we don't override their workspaced_route value.
+    const isNewTrigger = !initialTriggerPath;
+    if ((globalHttpWorkspacedRoute || (!userIsAdmin && isNewTrigger)) && !workspaced_route) {
         workspaced_route = true;
         dirtyRoutePath = true;
     }
@@ -90,9 +95,10 @@ $effect.pre(() => {
 				<TestingBadge />
 			{/if}
 		{/snippet}
-		{#if !userCanEditConfig && isDraftOnly}
-			<Alert type="info" title="Admin only" collapsible size="xs">
-				Route endpoints can only be edited by workspace admins
+		{#if !userCanEditConfig}
+			<Alert type="info" title="Route config restricted" collapsible size="xs">
+				Route path, HTTP method, and workspace prefix can only be changed by workspace admins on
+				non-workspaced routes
 			</Alert>
 			<div class="my-2"></div>
 		{/if}
@@ -147,7 +153,7 @@ $effect.pre(() => {
 					<Toggle
 						size="sm"
 						checked={workspaced_route}
-						disabled={!can_write || !userCanEditConfig || globalHttpWorkspacedRoute}
+						disabled={!can_write || !userIsAdmin || globalHttpWorkspacedRoute}
 						on:change={() => {
 							workspaced_route = !workspaced_route
 							dirtyRoutePath = true
@@ -155,7 +161,9 @@ $effect.pre(() => {
 						options={{
 							right: globalHttpWorkspacedRoute
 								? 'Prefix with workspace (enforced by instance setting)'
-								: 'Prefix with workspace',
+								: !userIsAdmin
+									? 'Prefix with workspace (required for non-admin users)'
+									: 'Prefix with workspace',
 							rightTooltip:
 								'Prefixes the route with the workspace ID (e.g., {base_url}/api/r/{workspace_id}/{route}). Note: deploying the HTTP trigger to another workspace updates the route workspace prefix accordingly.',
 							rightDocumentationLink:

package/package/components/triggers/http/RouteEditorInner.svelte

@@ -98,7 +98,6 @@ let originalConfig = $state(undefined);
 let userSettings = $state(undefined);
 let hasChanged = $derived(!deepEqual(getRouteConfig(), originalConfig ?? {}));
 let scopes = $derived(['http_triggers:read:' + path]);
-const isAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin);
 const routeConfig = $derived.by(getRouteConfig);
 const captureConfig = $derived.by(untrack(() => isEditor) ? getCaptureConfig : () => ({}));
 const saveDisabled = $derived(drawerLoading ||
@@ -213,6 +212,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 {
@@ -256,8 +258,8 @@ 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) {
@@ -329,6 +331,8 @@ function getRouteConfig() {
 async function handleToggleMode(newMode) {
     mode = newMode;
     if (!trigger?.draftConfig) {
+        // HTTP routes are always workspace-prefixed at runtime, so fork
+        // and parent live at distinct URLs — no fork-conflict warning.
         await HttpTriggerService.setHttpTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
@@ -409,15 +413,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">
 			{#if mode === 'suspended'}
 				<TriggerSuspendedJobsAlert {suspendedJobsModal} />
@@ -446,7 +449,6 @@ $effect(() => {
 							checkInitialPathExistence={!edit}
 							namePlaceholder="route"
 							kind="http_trigger"
-							hideUser
 							disableEditing={!can_write}
 						/>
 					</Label>
@@ -874,7 +876,7 @@ $effect(() => {
 	{#if !drawerLoading}
 		<TriggerEditorToolbar
 			{trigger}
-			permissions={drawerLoading || !can_write ? 'none' : can_write && isAdmin ? 'create' : 'write'}
+			permissions={drawerLoading || !can_write ? 'none' : 'create'}
 			{saveDisabled}
 			{allowDraft}
 			{edit}

package/package/components/triggers/http/RoutesGenerator.svelte

@@ -9,7 +9,7 @@ import Subsection from '../../Subsection.svelte';
 import RouteEditor from './RouteEditor.svelte';
 import { generateHttpTriggerFromOpenApi } from './utils';
 import { isCloudHosted } from '../../../cloud';
-import { usedTriggerKinds, workspaceStore } from '../../../stores';
+import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import FileInput from '../../common/fileInput/FileInput.svelte';
 import { emptyStringTrimmed, sendUserToast } from '../../../utils';
 import FolderPicker from '../../FolderPicker.svelte';
@@ -113,10 +113,15 @@ async function saveHttpTrigger() {
         isCreating = false;
     }
 }
+let userIsAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin);
 async function generateHttpTrigger() {
     try {
         isGeneratingHttpRoutes = true;
         httpTriggers = await generateHttpTriggerFromOpenApi(code, folderName);
+        // Force workspaced routes for non-admins or when the global setting is enabled
+        if (!userIsAdmin || globalHttpWorkspacedRoute) {
+            httpTriggers = httpTriggers.map((t) => ({ ...t, workspaced_route: true }));
+        }
         if (httpTriggers.length === 0) {
             sendUserToast('No paths defined in the OpenAPI spec. Cannot generate HTTP routes.', true);
         }

package/package/components/triggers/http/RoutesPanel.svelte

@@ -38,7 +38,7 @@ onMount(() => {
 			>
 
 			{#if !$userStore?.is_admin && !$userStore?.is_super_admin && selectedTrigger.isDraft}
-				<Alert title="Only workspace admins can create routes" type="info" size="xs" />
+				<Alert title="Non-admin users are limited to workspaced routes" type="info" size="xs" />
 			{/if}
 		</div>
 	{/snippet}

package/package/components/triggers/http/utils.d.ts

@@ -6,6 +6,6 @@ export declare const SIGNATURE_TEMPLATE_SCRIPT_HUB_PATH: string;
 export declare const SIGNATURE_TEMPLATE_FLOW_HUB_ID = "67";
 export declare function getHttpRoute(route_prefix: string, route_path: string | undefined, workspaced_route: boolean, workspace_id: string): string;
 export declare function replacePlaceholderForSignatureScriptTemplate(content: string): string;
-export declare function saveHttpRouteFromCfg(initialPath: string, routeCfg: Record<string, any>, edit: boolean, workspace: string, isAdmin: boolean, usedTriggerKinds: Writable<string[]>): Promise<boolean>;
+export declare function saveHttpRouteFromCfg(initialPath: string, routeCfg: Record<string, any>, edit: boolean, workspace: string, _isAdmin: boolean, usedTriggerKinds: Writable<string[]>): Promise<boolean>;
 export type Source = 'OpenAPI' | 'OpenAPI_File' | 'OpenAPI_URL';
 export declare function generateHttpTriggerFromOpenApi(api: string, folderName: string): Promise<NewHttpTrigger[]>;

package/package/components/triggers/http/utils.js

@@ -18,7 +18,7 @@ export function replacePlaceholderForSignatureScriptTemplate(content) {
     const secret_key_path = params.get(SECRET_KEY_PATH) ?? '';
     return content.replace(/(const\s+SECRET_KEY_VARIABLE_PATH\s*=\s*")[^"]*(";)/, `$1${secret_key_path}$2`);
 }
-export async function saveHttpRouteFromCfg(initialPath, routeCfg, edit, workspace, isAdmin, usedTriggerKinds) {
+export async function saveHttpRouteFromCfg(initialPath, routeCfg, edit, workspace, _isAdmin, usedTriggerKinds) {
     const requestBody = {
         path: routeCfg.path,
         script_path: routeCfg.script_path,
@@ -49,7 +49,7 @@ export async function saveHttpRouteFromCfg(initialPath, routeCfg, edit, workspac
                 path: initialPath,
                 requestBody: {
                     ...requestBody,
-                    route_path: isAdmin || !edit ? routeCfg.route_path : undefined
+                    route_path: routeCfg.route_path
                 }
             });
             sendUserToast(`Route ${routeCfg.path} updated`);

package/package/components/triggers/kafka/KafkaTriggerEditorInner.svelte

@@ -8,6 +8,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { KafkaTriggerService } 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, RotateCcw } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -141,6 +142,9 @@ export async function openNew(nis_flow, fixedScriptPath_, nDefaultValues) {
         filterLogic = 'and';
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
         mode = nDefaultValues?.mode ?? 'enabled';
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -171,8 +175,8 @@ function loadTriggerConfig(cfg) {
     filterLogic = cfg?.filter_logic ?? 'and';
     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) {
@@ -249,13 +253,18 @@ async function resetOffsets() {
     }
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await KafkaTriggerService.setKafkaTriggerMode({
+        const ok = await withForkConflictRetry((force) => KafkaTriggerService.setKafkaTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'Kafka trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} Kafka trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -360,15 +369,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/mqtt/MqttTriggerEditorInner.svelte

@@ -7,6 +7,7 @@ import Required from '../../Required.svelte';
 import ScriptPicker from '../../ScriptPicker.svelte';
 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';
@@ -128,6 +129,9 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         v5_config = defaultValues?.v5_config ?? DEFAULT_V5_CONFIG;
         activateV5Options.topic_alias_maximum = Boolean(defaultValues?.v5_config?.topic_alias_maximum);
         activateV5Options.session_expiry_interval = Boolean(defaultValues?.v5_config?.session_expiry_interval);
+        permissionedAs = undefined;
+        selectedPermissionedAs = undefined;
+        preservePermissionedAs = false;
         originalConfig = undefined;
     }
     finally {
@@ -157,8 +161,8 @@ async function loadTriggerConfig(cfg) {
         activateV5Options.topic_alias_maximum = Boolean(v5_config.topic_alias_maximum);
         activateV5Options.session_expiry_interval = Boolean(v5_config.session_expiry_interval);
         permissionedAs = cfg?.permissioned_as;
-        selectedPermissionedAs = undefined;
-        preservePermissionedAs = false;
+        selectedPermissionedAs = cfg?.permissioned_as;
+        preservePermissionedAs = !!cfg?.permissioned_as;
     }
     catch (error) {
         sendUserToast(`Could not load mqtt trigger config: ${error.body}`, true);
@@ -228,13 +232,18 @@ async function updateTrigger() {
     deploymentLoading = false;
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await MqttTriggerService.setMqttTriggerMode({
+        const ok = await withForkConflictRetry((force) => MqttTriggerService.setMqttTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'MQTT trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} MQTT trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }
@@ -327,15 +336,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/native/NativeTriggerEditor.svelte

@@ -12,6 +12,7 @@ import Section from '../../Section.svelte';
 import Required from '../../Required.svelte';
 import NextcloudTriggerForm from './services/nextcloud/NextcloudTriggerForm.svelte';
 import GoogleTriggerForm from './services/google/GoogleTriggerForm.svelte';
+import GitHubTriggerForm from './services/github/GitHubTriggerForm.svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
 import { handleConfigChange } from '../utils';
 import { deepEqual } from 'fast-equals';
@@ -32,6 +33,8 @@ const ServiceFormComponent = $derived.by(() => {
             return NextcloudTriggerForm;
         case 'google':
             return GoogleTriggerForm;
+        case 'github':
+            return GitHubTriggerForm;
         default:
             return null;
     }

package/package/components/triggers/native/services/github/GitHubTriggerForm.svelte

@@ -0,0 +1,118 @@
+<script lang="ts">import Section from '../../../../Section.svelte';
+import Select from '../../../../select/Select.svelte';
+import MultiSelect from '../../../../select/MultiSelect.svelte';
+import { NativeTriggerService } from '../../../../../gen/services.gen';
+import { workspaceStore } from '../../../../../stores';
+import { sendUserToast } from '../../../../../toast';
+import { Loader2 } from 'lucide-svelte';
+let { serviceConfig = $bindable(), errors = $bindable(), loading = $bindable(), disabled = false, externalData } = $props();
+const GITHUB_EVENTS = [
+    { label: 'Push', value: 'push' },
+    { label: 'Pull Request', value: 'pull_request' },
+    { label: 'Issues', value: 'issues' },
+    { label: 'Issue Comment', value: 'issue_comment' },
+    { label: 'Create (branch/tag)', value: 'create' },
+    { label: 'Delete (branch/tag)', value: 'delete' },
+    { label: 'Release', value: 'release' },
+    { label: 'Workflow Run', value: 'workflow_run' },
+    { label: 'Pull Request Review', value: 'pull_request_review' },
+    { label: 'Fork', value: 'fork' },
+    { label: 'Star', value: 'star' },
+    { label: 'Deployment', value: 'deployment' },
+    { label: 'Deployment Status', value: 'deployment_status' }
+];
+let repos = $state([]);
+let selectedRepo = $state(externalData?.owner && externalData?.repo
+    ? `${externalData.owner}/${externalData.repo}`
+    : serviceConfig.owner && serviceConfig.repo
+        ? `${serviceConfig.owner}/${serviceConfig.repo}`
+        : '');
+let selectedEvents = $state(externalData?.events ?? serviceConfig.events ?? ['push']);
+async function loadRepos() {
+    if (!$workspaceStore) {
+        repos = [];
+        return;
+    }
+    loading = true;
+    try {
+        repos = await NativeTriggerService.listGithubRepos({
+            workspace: $workspaceStore
+        });
+    }
+    catch (err) {
+        console.error('Failed to load GitHub repositories:', err);
+        sendUserToast(`Failed to load repositories: ${err.body || err.message}`, true);
+        repos = [];
+    }
+    finally {
+        loading = false;
+    }
+}
+$effect(() => {
+    if ($workspaceStore) {
+        loadRepos();
+    }
+});
+$effect(() => {
+    const parts = selectedRepo.split('/');
+    const owner = parts[0] ?? '';
+    const repo = parts.slice(1).join('/') ?? '';
+    serviceConfig = {
+        owner,
+        repo,
+        events: selectedEvents
+    };
+});
+let repoItems = $derived(repos.map((r) => ({
+    label: `${r.full_name}${r.private ? ' (private)' : ''}`,
+    value: r.full_name
+})));
+export function validate() {
+    let serviceErrors = {};
+    if (!selectedRepo?.trim()) {
+        serviceErrors.repo = 'Repository is required';
+    }
+    if (!selectedEvents || selectedEvents.length === 0) {
+        serviceErrors.events = 'At least one event is required';
+    }
+    return serviceErrors;
+}
+</script>
+
+<Section label="GitHub Trigger Configuration">
+	<div class="flex flex-col gap-4">
+		<div class="flex flex-col gap-1">
+			<p class="block text-xs font-semibold text-primary">Repository</p>
+			{#if loading}
+				<div class="flex items-center gap-2 text-secondary text-xs">
+					<Loader2 class="animate-spin" size={14} />
+					Loading repositories...
+				</div>
+			{:else}
+				<Select
+					items={repoItems}
+					bind:value={selectedRepo}
+					placeholder="Select a repository"
+					{disabled}
+				/>
+			{/if}
+			{#if errors.repo}
+				<p class="text-red-500 text-xs">{errors.repo}</p>
+			{/if}
+		</div>
+
+		<div class="flex flex-col gap-1">
+			<p class="block text-xs font-semibold text-primary">Events</p>
+			<MultiSelect
+				items={GITHUB_EVENTS}
+				bind:value={selectedEvents}
+				placeholder="Select events"
+				{disabled}
+				reorderable={false}
+			/>
+			{#if errors.events}
+				<p class="text-red-500 text-xs">{errors.events}</p>
+			{/if}
+		</div>
+	</div>
+</Section>

package/package/components/triggers/native/services/github/GitHubTriggerForm.svelte.d.ts

@@ -0,0 +1,17 @@
+interface Props {
+    serviceConfig: Record<string, any>;
+    errors: Record<string, string>;
+    disabled?: boolean;
+    externalData?: any;
+    loading: boolean;
+    path?: string;
+    isFlow?: boolean;
+    token?: string;
+    triggerTokens?: any;
+    scopes?: any[];
+}
+declare const GitHubTriggerForm: import("svelte").Component<Props, {
+    validate: () => Record<string, string>;
+}, "loading" | "errors" | "serviceConfig">;
+type GitHubTriggerForm = ReturnType<typeof GitHubTriggerForm>;
+export default GitHubTriggerForm;

package/package/components/triggers/native/utils.js

@@ -23,6 +23,16 @@ export const NATIVE_TRIGGER_SERVICES = {
             script: '/scripts/add?hub=hub%2F28135',
             flow: '/flows/add?hub=75'
         }
+    },
+    github: {
+        serviceDisplayName: 'GitHub',
+        serviceKey: 'github',
+        supportsSync: true,
+        isCloudCompatible: true,
+        templates: {
+            script: '/scripts/add?hub=hub%2F28202',
+            flow: '/flows/add?hub=80'
+        }
     }
 };
 export async function isServiceAvailable(service, workspace) {
@@ -77,6 +87,8 @@ export function getTriggerIconName(service) {
             return 'NextcloudIcon';
         case 'google':
             return 'GoogleIcon';
+        case 'github':
+            return 'GithubIcon';
         default:
             return 'NextcloudIcon';
     }
@@ -87,6 +99,8 @@ export async function getServiceIcon(service) {
             return (await import('../../icons/NextcloudIcon.svelte')).default;
         case 'google':
             return (await import('../../icons/GoogleIcon.svelte')).default;
+        case 'github':
+            return (await import('../../icons/GithubIcon.svelte')).default;
     }
 }
 export function getServiceTemplates(service) {

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

@@ -1,6 +1,7 @@
-declare const NatsTriggerEditor: import("svelte").Component<{
-    onUpdate: any;
-}, {
+type $$ComponentProps = {
+    onUpdate?: (path?: string) => void;
+};
+declare const NatsTriggerEditor: 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>;
 }, "">;