windmill-components 1.677.1 → 1.687.0

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

@@ -229,6 +229,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 +280,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) {
@@ -477,15 +480,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

@@ -274,6 +274,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 +481,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() {
@@ -643,15 +646,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

@@ -114,6 +114,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 +143,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);
@@ -306,15 +309,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.js

@@ -383,6 +383,7 @@ 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),

package/package/components/triggers/utils.js

@@ -18,6 +18,7 @@ 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',
@@ -41,7 +42,8 @@ export const jobTriggerKinds = [
     'postgres',
     'schedule',
     'gcp',
-    'google'
+    'google',
+    'github'
 ];
 // Map of trigger kinds to icons
 export const triggerIconMap = {
@@ -61,7 +63,8 @@ export const triggerIconMap = {
     poll: SchedulePollIcon,
     cli: Terminal,
     nextcloud: NextcloudIcon,
-    google: GoogleIcon
+    google: GoogleIcon,
+    github: GithubIcon
 };
 export const triggerDisplayNamesMap = {
     schedule: 'Schedule',
@@ -79,7 +82,8 @@ export const triggerDisplayNamesMap = {
     default_email: 'Default Email',
     cli: 'CLI',
     nextcloud: 'Nextcloud',
-    google: 'Google'
+    google: 'Google',
+    github: 'GitHub'
 };
 /**
  * Converts a TriggerType to a CaptureTriggerKind when a mapping exists
@@ -125,7 +129,8 @@ export function updateTriggersCount(triggersCountStore, type, action, primaryCfg
         poll: undefined,
         cli: undefined,
         nextcloud: 'nextcloud_count',
-        google: 'google_count'
+        google: 'google_count',
+        github: 'github_count'
     };
     const countProperty = countPropertyMap[type];
     triggersCountStore.update((triggersCount) => {
@@ -232,7 +237,8 @@ export async function deployTriggers(triggersToDeploy, workspaceId, isAdmin, use
         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];
@@ -326,6 +332,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 +404,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}`;
     }
@@ -417,7 +437,8 @@ export function sortTriggers(triggers) {
         'gcp',
         'email',
         'nextcloud',
-        'google'
+        'google',
+        'github'
     ];
     return triggers.sort((a, b) => {
         // Draft triggers always come last

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

@@ -152,6 +152,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 +187,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 {
@@ -378,15 +381,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' | '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;
+};

package/package/components/useFolderDefaultPermissionedAs.svelte.js

@@ -0,0 +1,63 @@
+import { FolderService } from '../gen';
+import { Minimatch } from 'minimatch';
+import { resource } from 'runed';
+import { workspaceStore, userStore } from '../stores';
+/**
+ * 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 function useFolderDefaultPermissionedAs(pathGetter) {
+    // Subscribe to the stores so the effect re-runs on changes.
+    let workspace = $state(undefined);
+    let user = $state(undefined);
+    $effect(() => {
+        const unsubWs = workspaceStore.subscribe((w) => (workspace = w));
+        const unsubUser = userStore.subscribe((u) => (user = u));
+        return () => {
+            unsubWs();
+            unsubUser();
+        };
+    });
+    const folderResource = resource(() => ({ path: pathGetter(), workspace, user }), async ({ path, workspace, user }) => {
+        const canPreserve = user?.is_admin || user?.is_super_admin || (user?.groups ?? []).includes('wm_deployers');
+        if (!canPreserve || !workspace || !path?.startsWith('f/')) {
+            return undefined;
+        }
+        const parts = path.split('/');
+        if (parts.length < 3)
+            return undefined;
+        const folderName = parts[1];
+        const relative = path.slice(`f/${folderName}/`.length);
+        if (!relative)
+            return undefined;
+        try {
+            const folder = await FolderService.getFolder({ workspace, name: folderName });
+            const rules = folder.default_permissioned_as ?? [];
+            const match = rules.find((rule) => {
+                try {
+                    return new Minimatch(rule.path_glob).match(relative);
+                }
+                catch {
+                    return false;
+                }
+            });
+            return match?.permissioned_as;
+        }
+        catch {
+            return undefined;
+        }
+    });
+    return {
+        get value() {
+            return folderResource.current;
+        },
+        get loading() {
+            return folderResource.loading;
+        }
+    };
+}