windmill-components 1.687.0 → 1.695.1

package/package/components/runs/JobDetailHeader.svelte

@@ -12,7 +12,7 @@ import RunBadges from './RunBadges.svelte';
 import WorkerHostname from '../WorkerHostname.svelte';
 import Button from '../common/button/Button.svelte';
 import DropdownV2 from '../DropdownV2.svelte';
-import { getRelevantFields, getTriggerInfo } from './JobDetailFieldConfig';
+import { getRelevantFields, getTriggerInfo, isFlowVersionHash } from './JobDetailFieldConfig';
 import { flowPathToHref } from '../../scripts';
 import { slide } from 'svelte/transition';
 import { twMerge } from 'tailwind-merge';
@@ -60,7 +60,8 @@ function getTruncatedValue(config, job, compact = false) {
         case 'run_id':
             return truncateRev(fullValue, 8);
         case 'script_hash':
-            return truncateHash(fullValue.toString());
+            // truncateHash drops leading digits of a decimal version id; skip it.
+            return isFlowVersionHash(job) ? fullValue.toString() : truncateHash(fullValue.toString());
         case 'parent_job':
             return truncateRev(fullValue, 6);
         case 'schedule_path':
@@ -164,6 +165,8 @@ function getJobKindDisplayName(job) {
 					{/snippet}
 					<a
 						href={`${base}/runs/?job_kinds=all&worker=${job?.worker}`}
+						target="_blank"
+						rel="noopener noreferrer"
 						class="flex items-center gap-1 text-primary"
 					>
 						<span class="truncate flex-shrink min-w-0">{displayValue}</span>
@@ -199,6 +202,8 @@ function getJobKindDisplayName(job) {
 			{/if}
 			<a
 				href={`${base}/run/${job.parent_job}?workspace=${$workspaceStore}`}
+				target="_blank"
+				rel="noopener noreferrer"
 				class="flex items-center gap-1"
 			>
 				{displayValue}
@@ -245,8 +250,18 @@ function getJobKindDisplayName(job) {
 	{:else if href}
 		<a
 			{href}
+			target="_blank"
+			rel="noopener noreferrer"
 			class="flex items-center gap-1 min-w-0 text-primary"
-			title={config.field === 'script_hash' ? `Script hash: ${fullValue}` : fullValue}
+			title={config.field === 'script_hash'
+				? `${
+						job.job_kind === 'appdependencies'
+							? 'App version'
+							: isFlowVersionHash(job)
+								? 'Flow version'
+								: 'Script hash'
+					}: ${fullValue}`
+				: fullValue}
 		>
 			<span class="truncate flex-shrink min-w-0">{displayValue}</span>
 			<ExternalLink size={12} class="flex-shrink-0" />
@@ -268,6 +283,8 @@ function getJobKindDisplayName(job) {
 						<span class="text-primary">
 							<a
 								href={`${base}/run/${job.id}?workspace=${job.workspace_id}`}
+								target="_blank"
+								rel="noopener noreferrer"
 								class="flex items-center gap-1 min-w-0"
 							>
 								<span class="truncate flex-shrink min-w-0">{truncateRev(job.id, 8)}</span>
@@ -360,6 +377,8 @@ function getJobKindDisplayName(job) {
 									: flowPathToHref(job?.script_path ?? '')}
 								<a
 									href={viewHref}
+									target="_blank"
+									rel="noopener noreferrer"
 									class="text-emphasis {compact
 										? 'text-xs'
 										: 'text-lg'} font-semibold flex items-center gap-1"
@@ -449,6 +468,8 @@ function getJobKindDisplayName(job) {
 								<span class="text-primary">
 									<a
 										href={`${base}/run/${job.id}?workspace=${job.workspace_id}`}
+										target="_blank"
+										rel="noopener noreferrer"
 										class="flex items-center gap-1 min-w-0"
 									>
 										<span class="truncate flex-shrink min-w-0">{truncateRev(job.id, 8)}</span>

package/package/components/runs/runsFilter.d.ts

@@ -178,7 +178,7 @@ export declare function buildRunsFilterSearchbarSchema({ paths, usernames, folde
         label: string;
         icon: typeof Zap;
         options: {
-            label: "Google" | "GitHub" | "Schedule" | "HTTP" | "WebSocket" | "Postgres" | "Kafka" | "NATS" | "MQTT" | "SQS" | "GCP Pub/Sub" | "Email" | "Webhook" | "Default Email";
+            label: "Google" | "GitHub" | "Schedule" | "HTTP" | "WebSocket" | "Postgres" | "Kafka" | "NATS" | "MQTT" | "SQS" | "GCP Pub/Sub" | "Azure Event Grid" | "Email" | "Webhook" | "Default Email";
             value: JobTriggerKind;
         }[];
         allowNegative: true;

package/package/components/schema/FlowPropertyEditor.svelte

@@ -13,7 +13,10 @@ import { Pen, Plus, Trash2 } from 'lucide-svelte';
 import Popover from '../meltComponents/Popover.svelte';
 import ResourcePicker from '../ResourcePicker.svelte';
 import { DynamicInput } from '../../utils';
-let { format = $bindable(undefined), contentEncoding = undefined, type = undefined, oneOf = $bindable(undefined), required = false, pattern = undefined, password = undefined, variableEditor = undefined, itemPicker = undefined, nullable = $bindable(undefined), disabled = $bindable(undefined), defaultValue = $bindable(undefined), propsNames = [], showExpr = $bindable(undefined), extra = {}, customErrorMessage = undefined, itemsType = undefined, properties = $bindable(undefined), order = $bindable(undefined), requiredProperty = $bindable(undefined), displayWebhookWarning = true, onDrawerClose = undefined } = $props();
+let { format = $bindable(undefined), contentEncoding = undefined, type = undefined, oneOf = $bindable(undefined), required = false, pattern = undefined, password = undefined, variableEditor = undefined, itemPicker = undefined, nullable = $bindable(undefined), disabled = $bindable(undefined), defaultValue = $bindable(undefined), propsNames = [], showExpr = $bindable(undefined), extra = {}, customErrorMessage = undefined, itemsType = undefined, properties = $bindable(undefined), order = $bindable(undefined), requiredProperty = $bindable(undefined), displayWebhookWarning = true, onDrawerClose = undefined, hideCatalogPicker = $bindable(undefined), hideRawInput = $bindable(undefined) } = $props();
+let isS3Field = $derived(format === 'resource-s3_object' ||
+    (type === 'array' &&
+        (itemsType?.resourceType === 's3_object' || itemsType?.resourceType === 's3object')));
 let oneOfSelected = $state(oneOf?.[0]?.title);
 $effect(() => {
     if (oneOf?.length && !oneOfSelected) {
@@ -351,6 +354,32 @@ let customObjectSelected = $state(format?.startsWith('jsonschema-') ? 'json-sche
 				}
 			}}
 		/>
+		{#if isS3Field}
+			<Toggle
+				options={{
+					right: 'Hide catalog picker',
+					rightTooltip: 'Hide the "Choose an object from the catalog" button below the file upload.'
+				}}
+				lightMode
+				size="xs"
+				checked={hideCatalogPicker}
+				on:change={(event) => {
+					hideCatalogPicker = event?.detail ? true : undefined
+				}}
+			/>
+			<Toggle
+				options={{
+					right: 'Hide raw input',
+					rightTooltip: 'Hide the "Raw S3 object input" toggle below the file upload.'
+				}}
+				lightMode
+				size="xs"
+				checked={hideRawInput}
+				on:change={(event) => {
+					hideRawInput = event?.detail ? true : undefined
+				}}
+			/>
+		{/if}
 	</div>
 
 	{#if displayWebhookWarning && !(type === 'object' && oneOf && oneOf.length >= 2)}

package/package/components/schema/FlowPropertyEditor.svelte.d.ts

@@ -19,16 +19,19 @@ interface Props {
     extra?: Record<string, any>;
     customErrorMessage?: string | undefined;
     itemsType?: {
-        type?: 'string' | 'number' | 'bytes' | 'object';
+        type?: 'string' | 'number' | 'bytes' | 'object' | 'resource';
         contentEncoding?: 'base64';
         enum?: string[];
         multiselect?: string[];
+        resourceType?: string;
     } | undefined;
     properties?: Record<string, any> | undefined;
     order?: string[] | undefined;
     requiredProperty?: string[] | undefined;
     displayWebhookWarning?: boolean;
     onDrawerClose?: () => void;
+    hideCatalogPicker?: boolean | undefined;
+    hideRawInput?: boolean | undefined;
 }
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
@@ -47,6 +50,6 @@ declare const FlowPropertyEditor: $$__sveltets_2_IsomorphicComponent<Props, {
     requiredChange: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
-}, {}, {}, "disabled" | "format" | "order" | "defaultValue" | "properties" | "oneOf" | "nullable" | "showExpr" | "requiredProperty">;
+}, {}, {}, "disabled" | "format" | "order" | "defaultValue" | "properties" | "oneOf" | "nullable" | "hideCatalogPicker" | "hideRawInput" | "showExpr" | "requiredProperty">;
 type FlowPropertyEditor = InstanceType<typeof FlowPropertyEditor>;
 export default FlowPropertyEditor;

package/package/components/search/GlobalSearchModal.svelte

@@ -13,7 +13,7 @@ import BarsStaggered from '../icons/BarsStaggered.svelte';
 import { Alert } from '../common';
 import Popover from '../Popover.svelte';
 import Logs from 'lucide-svelte/icons/logs';
-import { AwsIcon, GoogleCloudIcon, KafkaIcon, MqttIcon, NatsIcon } from '../icons';
+import { AwsIcon, AzureIcon, GoogleCloudIcon, KafkaIcon, MqttIcon, NatsIcon } from '../icons';
 import RunsSearch from './RunsSearch.svelte';
 import AskAiButton from '../copilot/AskAiButton.svelte';
 let open = $state(false);
@@ -95,6 +95,13 @@ let hiddenMenuItems = [
         icon: GoogleCloudIcon,
         disabled: $userStore?.operator
     },
+    {
+        search_id: 'nav:azure_event_grid',
+        label: 'Go to Azure Event Grid' + (!$enterpriseLicense ? '' : ' (EE)'),
+        action: (newtab = false) => gotoPage('/azure_triggers', newtab),
+        icon: AzureIcon,
+        disabled: $userStore?.operator
+    },
     {
         search_id: 'nav:mqtt_triggers',
         label: 'Go to MQTT triggers',

package/package/components/select/Select.svelte

@@ -74,7 +74,7 @@ let inputText = $derived.by(() => {
 			/>
 		</div>
 	{:else if RightIcon}
-		<div class="absolute z-10 right-2 h-full flex items-center">
+		<div class="absolute z-10 right-2 h-full flex items-center pointer-events-none">
 			<RightIcon size={iconSize} class="text-secondary" />
 		</div>
 	{/if}

package/package/components/settings/CreateToken.svelte

@@ -5,8 +5,7 @@ import { triggerableByAI } from '../../actions/triggerableByAI.svelte';
 import Toggle from '../Toggle.svelte';
 import { UserService } from '../../gen';
 import TokenDisplay from './TokenDisplay.svelte';
-import ScopeSelector from './ScopeSelector.svelte';
-import McpScopeSelector from '../mcp/McpScopeSelector.svelte';
+import ScopesPicker from './ScopesPicker.svelte';
 import TextInput from '../text_input/TextInput.svelte';
 import Select from '../select/Select.svelte';
 let { showMcpMode = false, openWithMcpMode = false, mcpOnly = false, lockWorkspace = false, title = 'Add a new token', defaultNewTokenWorkspace, scopes, onTokenCreated, newTokenLabel = $bindable(undefined), displayCreateToken = true } = $props();
@@ -15,11 +14,9 @@ let newMcpToken = $state(undefined);
 let newTokenExpiration = $state(undefined);
 let newTokenWorkspace = $state(untrack(() => defaultNewTokenWorkspace));
 let mcpCreationMode = $state(false);
-let mcpScope = $state('mcp:favorites');
 let lastRequestedMcpMode = $state(undefined);
 let mcpLabelAutofilled = $state(false);
-let customScopes = $state([]);
-let showCustomScopes = $state(false);
+let pickedScopes = $state(null);
 function ensureCurrentWorkspaceIncluded(workspacesList, currentWorkspace) {
     if (!currentWorkspace) {
         return workspacesList;
@@ -60,13 +57,7 @@ async function createToken(mcpMode = false) {
         if (newTokenExpiration) {
             date = new Date(new Date().getTime() + newTokenExpiration * 1000);
         }
-        let tokenScopes = scopes;
-        if (mcpMode) {
-            tokenScopes = mcpScope.split(' ').filter((s) => s.length > 0);
-        }
-        else if (showCustomScopes && customScopes.length > 0) {
-            tokenScopes = customScopes;
-        }
+        const tokenScopes = scopes ?? pickedScopes ?? undefined;
         const createdToken = await UserService.createToken({
             requestBody: {
                 label: newTokenLabel,
@@ -155,77 +146,58 @@ $effect(() => {
 			</div>
 		{/if}
 
-		{#if !mcpCreationMode && (!scopes || scopes.length === 0)}
-			<div class="flex flex-col gap-2">
-				<Toggle
-					checked={showCustomScopes}
-					on:change={(e) => {
-						showCustomScopes = e.detail
-					}}
-					options={{
-						right: 'Limit token permissions',
-						rightTooltip:
-							'By default, tokens have full API access. Enable this to restrict the token to specific scopes.'
-					}}
-					size="xs"
-				/>
-				{#if showCustomScopes}
-					<ScopeSelector bind:selectedScopes={customScopes} />
-				{/if}
-			</div>
+		{#if !scopes || scopes.length === 0}
+			<ScopesPicker
+				mode={mcpCreationMode ? 'mcp' : 'standard'}
+				workspaceId={newTokenWorkspace || $workspaceStore || ''}
+				bind:value={pickedScopes}
+			/>
 		{/if}
 
 		<div class="mt-2 grid grid-cols-1 md:grid-cols-2 gap-4">
-				{#if mcpCreationMode}
-					<div class="col-span-2">
-						<McpScopeSelector
-							workspaceId={newTokenWorkspace || $workspaceStore || ''}
-							bind:scope={mcpScope}
-						/>
-					</div>
-
-					{#if !lockWorkspace}
-						<div>
-							<span class="block mb-1 text-emphasis text-xs font-semibold">Workspace</span>
-							<Select
-								bind:value={newTokenWorkspace}
-								items={workspaces.map((w) => ({ label: w.name, value: w.id, subtitle: w.id }))}
-							/>
-						</div>
-					{/if}
-				{/if}
-
-				{#if !mcpOnly}
-					<div>
-						<span class="block mb-1 text-emphasis text-xs font-semibold"
-							>Label <span class="text-xs text-primary">(optional)</span></span
-						>
-						<TextInput inputProps={{ type: 'text' }} bind:value={newTokenLabel} class="w-full" />
-					</div>
-				{/if}
-
-				{#if !mcpCreationMode}
+			{#if mcpCreationMode}
+				{#if !lockWorkspace}
 					<div>
-						<span class="block mb-1 text-xs text-emphasis font-semibold"
-							>Expires In <span class="text-xs text-primary">(optional)</span></span
-						>
+						<span class="block mb-1 text-emphasis text-xs font-semibold">Workspace</span>
 						<Select
-							bind:value={newTokenExpiration}
-							placeholder="No expiration"
-							inputClass="w-full"
-							items={[
-								{ label: 'No expiration', value: undefined },
-								{ label: '15 minutes', value: 15 * 60 },
-								{ label: '30 minutes', value: 30 * 60 },
-								{ label: '1 hour', value: 1 * 60 * 60 },
-								{ label: '1 day', value: 1 * 24 * 60 * 60 },
-								{ label: '7 days', value: 7 * 24 * 60 * 60 },
-								{ label: '30 days', value: 30 * 24 * 60 * 60 },
-								{ label: '90 days', value: 90 * 24 * 60 * 60 }
-							]}
+							bind:value={newTokenWorkspace}
+							items={workspaces.map((w) => ({ label: w.name, value: w.id, subtitle: w.id }))}
 						/>
 					</div>
 				{/if}
+			{/if}
+
+			{#if !mcpOnly}
+				<div>
+					<span class="block mb-1 text-emphasis text-xs font-semibold"
+						>Label <span class="text-xs text-primary">(optional)</span></span
+					>
+					<TextInput inputProps={{ type: 'text' }} bind:value={newTokenLabel} class="w-full" />
+				</div>
+			{/if}
+
+			{#if !mcpCreationMode}
+				<div>
+					<span class="block mb-1 text-xs text-emphasis font-semibold"
+						>Expires In <span class="text-xs text-primary">(optional)</span></span
+					>
+					<Select
+						bind:value={newTokenExpiration}
+						placeholder="No expiration"
+						inputClass="w-full"
+						items={[
+							{ label: 'No expiration', value: undefined },
+							{ label: '15 minutes', value: 15 * 60 },
+							{ label: '30 minutes', value: 30 * 60 },
+							{ label: '1 hour', value: 1 * 60 * 60 },
+							{ label: '1 day', value: 1 * 24 * 60 * 60 },
+							{ label: '7 days', value: 7 * 24 * 60 * 60 },
+							{ label: '30 days', value: 30 * 24 * 60 * 60 },
+							{ label: '90 days', value: 90 * 24 * 60 * 60 }
+						]}
+					/>
+				</div>
+			{/if}
 		</div>
 
 		<div class="mt-4 flex justify-end gap-2 flex-row">
@@ -241,8 +213,7 @@ $effect(() => {
 			{/if}
 			<Button
 				on:click={() => createToken(mcpCreationMode)}
-				disabled={mcpCreationMode &&
-					(newTokenWorkspace == undefined || !mcpScope || mcpScope.trim().length === 0)}
+				disabled={mcpCreationMode && (newTokenWorkspace == undefined || !pickedScopes)}
 				variant="accent"
 			>
 				{mcpCreationMode ? 'Generate MCP URL' : 'New token'}

package/package/components/settings/EditTokenScopesModal.svelte

@@ -0,0 +1,57 @@
+<script lang="ts">import { UserService } from '../../gen';
+import { sendUserToast } from '../../toast';
+import { workspaceStore } from '../../stores';
+import Button from '../common/button/Button.svelte';
+import Modal from '../common/modal/Modal.svelte';
+import ScopesPicker from './ScopesPicker.svelte';
+let { open = $bindable(), tokenPrefix, initialScopes, tokenWorkspaceId, onSaved } = $props();
+// Treat as MCP only when *all* existing scopes are mcp:* — mixed-scope or
+// null-scope tokens fall back to the standard picker so non-MCP scopes are
+// never silently dropped.
+const isMcp = $derived((initialScopes ?? []).length > 0 && (initialScopes ?? []).every((s) => s.startsWith('mcp:')));
+const mcpWorkspaceId = $derived(tokenWorkspaceId ?? $workspaceStore ?? '');
+let pickedScopes = $state(null);
+let saving = $state(false);
+async function save() {
+    if (!tokenPrefix)
+        return;
+    saving = true;
+    try {
+        await UserService.updateTokenScopes({
+            tokenPrefix,
+            requestBody: { scopes: pickedScopes }
+        });
+        sendUserToast('Token scopes updated');
+        onSaved?.();
+        open = false;
+    }
+    catch (err) {
+        sendUserToast(`Failed to update scopes: ${err.body ?? err.message}`, true);
+    }
+    finally {
+        saving = false;
+    }
+}
+const saveDisabled = $derived(saving || !tokenPrefix || (isMcp && !pickedScopes));
+</script>
+
+<Modal bind:open title="Edit token scopes" class="!max-w-3xl">
+	<div class="flex flex-col gap-3">
+		<div class="text-xs text-secondary">
+			Token <span class="font-mono">{tokenPrefix}****</span>
+		</div>
+
+		{#key tokenPrefix}
+			<ScopesPicker
+				mode={isMcp ? 'mcp' : 'standard'}
+				workspaceId={mcpWorkspaceId}
+				{initialScopes}
+				bind:value={pickedScopes}
+			/>
+		{/key}
+	</div>
+
+	{#snippet actions()}
+		<Button size="sm" variant="accent" disabled={saveDisabled} on:click={save}>Save</Button>
+	{/snippet}
+</Modal>

package/package/components/settings/EditTokenScopesModal.svelte.d.ts

@@ -0,0 +1,10 @@
+interface Props {
+    open: boolean;
+    tokenPrefix?: string;
+    initialScopes?: string[];
+    tokenWorkspaceId?: string;
+    onSaved?: () => void;
+}
+declare const EditTokenScopesModal: import("svelte").Component<Props, {}, "open">;
+type EditTokenScopesModal = ReturnType<typeof EditTokenScopesModal>;
+export default EditTokenScopesModal;

package/package/components/settings/ScopesPicker.svelte

@@ -0,0 +1,43 @@
+<script lang="ts">import Toggle from '../Toggle.svelte';
+import ScopeSelector from './ScopeSelector.svelte';
+import McpScopeSelector from '../mcp/McpScopeSelector.svelte';
+let { mode, workspaceId = '', initialScopes, value = $bindable() } = $props();
+const initialMcpScope = $derived((initialScopes ?? []).length > 0 ? (initialScopes ?? []).join(' ') : undefined);
+// Standard-mode local state, seeded from initialScopes if any.
+let limited = $state((initialScopes ?? []).length > 0);
+let standardScopes = $state([...(initialScopes ?? [])]);
+// MCP-mode local state. When no initial scope is provided we fall back
+// to `mcp:favorites` (matches the create-token default).
+let mcpScope = $state(initialMcpScope ?? 'mcp:favorites');
+$effect(() => {
+    if (mode === 'mcp') {
+        const parts = mcpScope
+            .split(' ')
+            .map((s) => s.trim())
+            .filter((s) => s.length > 0);
+        value = parts.length > 0 ? parts : null;
+    }
+    else {
+        value = limited && standardScopes.length > 0 ? standardScopes : null;
+    }
+});
+</script>
+
+{#if mode === 'standard'}
+	<div class="flex flex-col gap-2">
+		<Toggle
+			bind:checked={limited}
+			options={{
+				right: 'Limit token permissions',
+				rightTooltip:
+					'When off, the token has full API access. Turn on to restrict it to specific scopes.'
+			}}
+			size="xs"
+		/>
+		{#if limited}
+			<ScopeSelector bind:selectedScopes={standardScopes} />
+		{/if}
+	</div>
+{:else}
+	<McpScopeSelector {workspaceId} bind:scope={mcpScope} initialScope={initialMcpScope} />
+{/if}

package/package/components/settings/ScopesPicker.svelte.d.ts

@@ -0,0 +1,11 @@
+interface Props {
+    mode: 'standard' | 'mcp';
+    workspaceId?: string;
+    /** Existing scopes (used for both initial standard selection and parsing MCP scope) */
+    initialScopes?: string[];
+    /** Final scope value: null = unrestricted/full access, array = explicit list */
+    value: string[] | null;
+}
+declare const ScopesPicker: import("svelte").Component<Props, {}, "value">;
+type ScopesPicker = ReturnType<typeof ScopesPicker>;
+export default ScopesPicker;

package/package/components/settings/TokensTable.svelte

@@ -4,15 +4,18 @@ import { displayDate } from '../../utils';
 import { UserService } from '../../gen';
 import { sendUserToast } from '../../toast';
 import CreateToken from './CreateToken.svelte';
+import EditTokenScopesModal from './EditTokenScopesModal.svelte';
 import Button from '../common/button/Button.svelte';
 import Badge from '../common/badge/Badge.svelte';
 import Alert from '../common/alert/Alert.svelte';
-import { Trash } from 'lucide-svelte';
+import { Pen, Trash } from 'lucide-svelte';
 let { showMcpMode = false, openWithMcpMode = false, defaultNewTokenLabel, defaultNewTokenWorkspace, scopes, onTokenCreated } = $props();
 // --- Local State ---
 let tokens = $state([]);
 let tokenPage = $state(1);
 let newTokenLabel = $state(untrack(() => defaultNewTokenLabel));
+let editingToken = $state(undefined);
+let editModalOpen = $state(false);
 $effect(() => {
     listTokens();
 });
@@ -69,6 +72,14 @@ async function handleDeleteClick(tokenPrefix) {
     sendUserToast('Successfully deleted token');
     listTokens();
 }
+function handleEditClick(tokenPrefix, tokenScopes, tokenWorkspaceId) {
+    editingToken = {
+        prefix: tokenPrefix,
+        scopes: tokenScopes,
+        workspaceId: tokenWorkspaceId
+    };
+    editModalOpen = true;
+}
 async function listTokens() {
     tokens = await UserService.listTokens({
         excludeEphemeral: true,
@@ -93,7 +104,11 @@ function handlePreviousPage() {
 	</div>
 	{#if expiringSoonCount > 0}
 		<div class="mb-2">
-			<Alert type="warning" title="{expiringSoonCount} token{expiringSoonCount > 1 ? 's' : ''} expiring within 7 days" size="xs" />
+			<Alert
+				type="warning"
+				title="{expiringSoonCount} token{expiringSoonCount > 1 ? 's' : ''} expiring within 7 days"
+				size="xs"
+			/>
 		</div>
 	{/if}
 	<CreateToken
@@ -106,20 +121,19 @@ function handlePreviousPage() {
 	/>
 	<div class="overflow-auto grow min-h-64 max-h-2/3">
 		<TableCustom>
-
 			{#snippet headerRow()}
-						<tr >
+				<tr>
 					<th>Prefix</th>
 					<th>Label</th>
 					<th>Expiration</th>
 					<th>Scopes</th>
 					<th></th>
 				</tr>
-					{/snippet}
+			{/snippet}
 			{#snippet body()}
 				<tbody>
 					{#if tokens && tokens.length > 0}
-						{#each tokens as { token_prefix, expiration, label, scopes } (token_prefix)}
+						{#each tokens as { token_prefix, expiration, label, scopes, workspace_id } (token_prefix)}
 							{@const badge = expirationBadge(expiration, label)}
 							<tr>
 								<td class="w-32 text-xs text-primary">{token_prefix}****</td>
@@ -136,15 +150,29 @@ function handlePreviousPage() {
 									class="min-w-0 max-w-48 truncate text-xs text-secondary"
 									title={scopes?.join(', ') ?? ''}>{scopes?.join(', ') ?? ''}</td
 								>
-								<td class="w-16 text-center">
-									<Button
-										variant="subtle"
-										destructive
-										on:click={() => handleDeleteClick(token_prefix)}
-										size="xs"
-										startIcon={{ icon: Trash }}
-										iconOnly
-									/>
+								<td class="w-24 text-center">
+									<div class="flex items-center justify-center gap-1">
+										<Button
+											variant="subtle"
+											on:click={() =>
+												handleEditClick(
+													token_prefix,
+													scopes ?? undefined,
+													workspace_id ?? undefined
+												)}
+											size="xs"
+											startIcon={{ icon: Pen }}
+											iconOnly
+										/>
+										<Button
+											variant="subtle"
+											destructive
+											on:click={() => handleDeleteClick(token_prefix)}
+											size="xs"
+											startIcon={{ icon: Trash }}
+											iconOnly
+										/>
+									</div>
 								</td>
 							</tr>
 						{/each}
@@ -168,3 +196,11 @@ function handlePreviousPage() {
 		</div>
 	</div>
 </div>
+
+<EditTokenScopesModal
+	bind:open={editModalOpen}
+	tokenPrefix={editingToken?.prefix}
+	initialScopes={editingToken?.scopes}
+	tokenWorkspaceId={editingToken?.workspaceId}
+	onSaved={listTokens}
+/>

package/package/components/sidebar/OperatorMenu.svelte

@@ -102,6 +102,12 @@ let allTriggerLinks = $derived([
         href: `${base}/gcp_triggers`,
         kind: 'gcp'
     },
+    {
+        label: 'Azure Event Grid triggers',
+        id: 'triggers',
+        href: `${base}/azure_triggers`,
+        kind: 'azure'
+    },
     { label: 'MQTT triggers', id: 'triggers', href: `${base}/mqtt_triggers`, kind: 'mqtt' },
     { label: 'Email triggers', id: 'triggers', href: `${base}/email_triggers`, kind: 'email' }
 ].filter(filterLink));

package/package/components/sidebar/SidebarContent.svelte

@@ -25,6 +25,7 @@ import { getAvailableNativeTriggerServices, getServiceConfig, getServiceIcon } f
 import { Menubar, Menu, MenuSingleItem, MenuItem, MeltButton } from '../meltComponents';
 import MenuButton from './MenuButton.svelte';
 import GoogleCloudIcon from '../icons/GoogleCloudIcon.svelte';
+import AzureIcon from '../icons/AzureIcon.svelte';
 async function leaveWorkspace() {
     await WorkspaceService.leaveWorkspace({ workspace: $workspaceStore ?? '' });
     sendUserToast('You left the workspace');
@@ -36,7 +37,7 @@ async function loadForkedDatatables() {
     if (!$workspaceStore)
         return;
     try {
-        const settings = await WorkspaceService.getSettings({ workspace: $workspaceStore });
+        const settings = await WorkspaceService.getPublicSettings({ workspace: $workspaceStore });
         const datatables = settings.datatable?.datatables ?? {};
         forkedDatatables = Object.entries(datatables)
             .filter(([_, dt]) => dt.forked_from != null)
@@ -286,6 +287,15 @@ let defaultExtraTriggerLinks = $derived([
         aiId: 'sidebar-menu-link-gcp',
         aiDescription: 'Button to navigate to GCP Pub/Sub triggers'
     },
+    {
+        label: 'Azure Event Grid' + ($enterpriseLicense ? '' : ' (EE)'),
+        href: '/azure_triggers',
+        icon: AzureIcon,
+        disabled: $userStore?.operator || !$enterpriseLicense,
+        kind: 'azure',
+        aiId: 'sidebar-menu-link-azure',
+        aiDescription: 'Button to navigate to Azure Event Grid triggers'
+    },
     {
         label: 'MQTT',
         href: '/mqtt_triggers',