windmill-components 1.677.1 → 1.695.0

package/package/components/workspaceSettings/CustomInstanceDbWizardModal.svelte

@@ -7,12 +7,13 @@ import Button from '../common/button/Button.svelte';
 import { sendUserToast } from '../../toast';
 import { isCustomInstanceDbEnabled } from './utils.svelte';
 import ExploreAssetButton from '../ExploreAssetButton.svelte';
-import { ArrowRight, InfoIcon } from 'lucide-svelte';
+import { ArrowRight, InfoIcon, Trash2 } from 'lucide-svelte';
 import { truncate } from '../../utils';
 import Tooltip from '../meltComponents/Tooltip.svelte';
 import { superadmin } from '../../stores';
 let { customInstanceDbs, confirmationModal, bottomHint, opened = $bindable(), tag } = $props();
 let customInstanceDbSetupIsRunning = $state(false);
+let dropIsRunning = $state(false);
 let preventClose = false;
 </script>
 
@@ -45,13 +46,50 @@ let preventClose = false;
 							{@render bottomHint()}
 						</div>
 					{/if}
-					<ExploreAssetButton
-						class="flex-1"
-						asset={{ kind: 'resource', path: 'CUSTOM_INSTANCE_DB/' + dbname }}
-						_resourceMetadata={{ resource_type: 'postgresql' }}
-						disabled={!$isCustomInstanceDbEnabled || !enableManageButton}
-						onClick={() => (opened = undefined)}
-					/>
+					<div class="flex gap-2">
+						<ExploreAssetButton
+							class="flex-1"
+							asset={{ kind: 'resource', path: 'CUSTOM_INSTANCE_DB/' + dbname }}
+							_resourceMetadata={{ resource_type: 'postgresql' }}
+							disabled={!$isCustomInstanceDbEnabled || !enableManageButton}
+							onClick={() => (opened = undefined)}
+						/>
+						{#if $superadmin}
+							<Button
+								size="sm"
+								destructive
+								iconOnly
+								variant="accent"
+								startIcon={{ icon: Trash2 }}
+								loading={dropIsRunning}
+								onClick={async () => {
+									preventClose = true
+									let confirm = await confirmationModal.ask({
+										title: 'Drop database',
+										children: `This will permanently drop the database "${dbname}". All data will be lost. This action is irreversible.`,
+										confirmationText: 'Drop database'
+									})
+									preventClose = false
+									if (!confirm) return
+
+									try {
+										dropIsRunning = true
+										await SettingService.dropCustomInstanceDb({ name: dbname })
+										await customInstanceDbs.refetch()
+										sendUserToast(`Database "${dbname}" dropped successfully`)
+										opened = undefined
+									} catch (e) {
+										sendUserToast(`Failed to drop database: ${e}`, true)
+										console.error('Error dropping custom instance database', e)
+									} finally {
+										dropIsRunning = false
+									}
+								}}
+							>
+								Drop database
+							</Button>
+						{/if}
+					</div>
 				</div>
 			</div>
 			<div class="flex-1 shrink-0 flex flex-col pl-4 gap-2">

package/package/components/workspaceSettings/DataTableSettings.svelte

@@ -2,7 +2,10 @@
     const s = { dataTables: [] };
     if (settings?.datatables) {
         for (const [name, rest] of Object.entries(settings.datatables)) {
-            s.dataTables.push({ name, ...rest });
+            s.dataTables.push({
+                name,
+                ...rest
+            });
         }
     }
     return s;
@@ -77,7 +80,7 @@ function onNewDataTable() {
         }
     });
 }
-const customInstanceDbs = resource([], SettingService.listCustomInstanceDbs);
+const customInstanceDbs = resource([() => $workspaceStore], SettingService.listCustomInstanceDbs);
 async function onSave() {
     try {
         if ($isCustomInstanceDbEnabled &&
@@ -213,27 +216,29 @@ let hasUnsavedChanges = $derived.by(() => {
 						</div>
 					</div>
 				</Cell>
+
 				<Cell class="w-12">
-					{#if dirtyMap[dataTable.name]}
-						<Popover
-							openOnHover
-							contentClasses="p-2 text-sm text-secondary italic"
-							class="cursor-not-allowed"
-						>
-							{#snippet trigger()}
-								<ExploreAssetButton
-									class="h-9"
-									asset={{ kind: 'datatable', path: dataTable.name }}
-									disabled
-								/>
-							{/snippet}
-							{#snippet content()}
-								Please save settings first
-							{/snippet}
-						</Popover>
-					{:else}
-						<ExploreAssetButton class="h-9" asset={{ kind: 'datatable', path: dataTable.name }} />
-					{/if}
+					<div class="flex gap-2">
+						{#if dirtyMap[dataTable.name]}
+							<Popover
+								openOnHover
+								contentClasses="p-2 text-sm text-secondary italic"
+								class="cursor-not-allowed"
+							>
+								{#snippet trigger()}
+									<ExploreAssetButton
+										asset={{ kind: 'datatable', path: dataTable.name }}
+										disabled
+									/>
+								{/snippet}
+								{#snippet content()}
+									Please save settings first
+								{/snippet}
+							</Popover>
+						{:else}
+							<ExploreAssetButton asset={{ kind: 'datatable', path: dataTable.name }} />
+						{/if}
+					</div>
 				</Cell>
 				<Cell class="w-12">
 					<CloseButton small on:close={() => removeDataTable(dataTableIndex)} />

package/package/components/workspaceSettings/DucklakeSettings.svelte

@@ -85,7 +85,7 @@ const ducklakeIsDirty = $derived(Object.fromEntries(ducklakeSettings.ducklakes.m
 })));
 let hasUnsavedChanges = $derived(ducklakeSavedSettings.ducklakes.length !== ducklakeSettings.ducklakes.length ||
     !Object.values(ducklakeIsDirty).every((v) => v === false));
-const customInstanceDbs = resource([], SettingService.listCustomInstanceDbs);
+const customInstanceDbs = resource([() => $workspaceStore], SettingService.listCustomInstanceDbs);
 async function onSave() {
     try {
         if ($isCustomInstanceDbEnabled &&

package/package/components/workspaceSettings/ForkDatatableSection.svelte

@@ -0,0 +1,228 @@
+<script module lang="ts">export {};
+</script>
+
+<script lang="ts">import { WorkspaceService } from '../../gen';
+import { workspaceStore, userStore } from '../../stores';
+import { isCloudHosted } from '../../cloud';
+import { resource } from 'runed';
+import Select from '../select/Select.svelte';
+import Label from '../Label.svelte';
+import Alert from '../common/alert/Alert.svelte';
+import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte';
+import { Check, X, Loader2 } from 'lucide-svelte';
+let { onAllDone, onCanceled } = $props();
+let allDatatables = resource([], async () => $workspaceStore
+    ? WorkspaceService.listDataTables({ workspace: $workspaceStore ?? '' })
+    : undefined);
+let datatableBehaviors = $state({});
+let cloneModalOpen = $state(false);
+let currentCloneJob = $state(undefined);
+let cloneQueue = $state([]);
+let cloneRunning = $state(false);
+export function hasDatatables() {
+    return (allDatatables.current?.length ?? 0) > 0;
+}
+export function buildCloneQueue(targetWorkspaceId) {
+    return (allDatatables.current ?? [])
+        .filter((dt) => {
+        const behavior = datatableBehaviors[dt.name] ?? 'keep_original';
+        return behavior !== 'keep_original';
+    })
+        .map((dt) => {
+        const behavior = datatableBehaviors[dt.name];
+        const isInstance = dt.resource_type === 'instance';
+        const newDbName = `${targetWorkspaceId.replace(/-/g, '_')}__${dt.name}`;
+        const steps = [
+            {
+                label: `CREATE DATABASE "${newDbName}"`,
+                status: 'pending'
+            },
+            {
+                label: `pg_dump → pg_import (${behavior === 'schema_only' ? 'schema only' : 'schema + data'})`,
+                status: 'pending'
+            }
+        ];
+        return {
+            name: dt.name,
+            resourceType: dt.resource_type,
+            behavior,
+            steps,
+            _newDbName: newDbName,
+            _isInstance: isInstance,
+            _sourceWorkspace: $workspaceStore,
+            _targetWorkspace: targetWorkspaceId,
+            _resourcePath: dt.resource_path
+        };
+    });
+}
+let completedJobs = $state([]);
+export function startCloning(queue) {
+    completedJobs = [];
+    cloneQueue = queue;
+    currentCloneJob = cloneQueue[0];
+    cloneModalOpen = true;
+}
+export function getCompletedCloneJobs() {
+    return completedJobs;
+}
+async function executeCloneJob(job) {
+    cloneRunning = true;
+    let stepIdx = 0;
+    // Step 1: Create the database
+    job.steps[stepIdx].status = 'running';
+    try {
+        await WorkspaceService.createPgDatabase({
+            workspace: job._sourceWorkspace,
+            requestBody: {
+                source: `datatable://${job.name}`,
+                target_dbname: job._newDbName
+            }
+        });
+        job.steps[stepIdx].status = 'done';
+    }
+    catch (e) {
+        job.steps[stepIdx].status = 'error';
+        job.steps[stepIdx].error = e?.body ?? e?.message ?? String(e);
+        cloneRunning = false;
+        return;
+    }
+    stepIdx++;
+    // Step 2: Import data
+    job.steps[stepIdx].status = 'running';
+    try {
+        await WorkspaceService.importPgDatabase({
+            workspace: job._sourceWorkspace,
+            requestBody: {
+                source: `datatable://${job.name}`,
+                target: `datatable://${job.name}`,
+                target_dbname_override: job._newDbName,
+                fork_behavior: job.behavior
+            }
+        });
+        job.steps[stepIdx].status = 'done';
+    }
+    catch (e) {
+        job.steps[stepIdx].status = 'error';
+        job.steps[stepIdx].error = e?.body ?? e?.message ?? String(e);
+        cloneRunning = false;
+        return;
+    }
+    stepIdx++;
+    cloneRunning = false;
+}
+function advanceCloneQueue() {
+    if (currentCloneJob) {
+        completedJobs.push(currentCloneJob);
+    }
+    const idx = cloneQueue.indexOf(currentCloneJob);
+    if (idx < cloneQueue.length - 1) {
+        currentCloneJob = cloneQueue[idx + 1];
+    }
+    else {
+        cloneModalOpen = false;
+        currentCloneJob = undefined;
+        cloneQueue = [];
+        onAllDone?.();
+    }
+}
+</script>
+
+{#if allDatatables.current && allDatatables.current.length > 0}
+	<Label label="Data table behavior">
+		<span class="text-xs text-secondary"> Choose how to handle each datatable when forking </span>
+		<div class="border rounded-md divide-y">
+			{#each allDatatables.current as dt}
+				<div class="flex items-center gap-2 justify-between px-4 py-1.5">
+					<div class="flex flex-col">
+						<span class="text-xs font-medium">{dt.name}</span>
+						<span class="text-2xs text-tertiary"
+							>{dt.resource_type === 'instance' ? 'Instance DB' : 'Resource DB'}</span
+						>
+					</div>
+					<Select
+						dropdownClass="max-w-96"
+						bind:value={
+							() => datatableBehaviors[dt.name] ?? 'keep_original',
+							(v) => (datatableBehaviors[dt.name] = v)
+						}
+						items={[
+							{ value: 'keep_original', label: 'Keep original' },
+							{ value: 'schema_only', label: 'Clone schema only' },
+							...(!isCloudHosted() && $userStore?.is_admin
+								? [{ value: 'schema_and_data', label: 'Clone schema and data' }]
+								: [])
+						]}
+					/>
+				</div>
+			{/each}
+		</div>
+	</Label>
+{/if}
+
+{#if cloneModalOpen && currentCloneJob}
+	<ConfirmationModal
+		title="Clone datatable: {currentCloneJob.name}"
+		confirmationText={cloneRunning ? 'Running...' : 'Start'}
+		open={cloneModalOpen}
+		loading={cloneRunning}
+		onConfirmed={async () => {
+			await executeCloneJob(currentCloneJob!)
+			advanceCloneQueue()
+		}}
+		onCanceled={() => {
+			cloneModalOpen = false
+			currentCloneJob = undefined
+			cloneQueue = []
+			onCanceled?.()
+		}}
+	>
+		{#if currentCloneJob.behavior === 'schema_and_data'}
+			<Alert type="error" title="Heavy operation">
+				This will copy the <b>entire database</b> including all data. The pg_dump output is temporarily
+				stored on disk and may consume significant server disk space during the operation.
+			</Alert>
+		{:else}
+			<Alert type="info" title="Schema only">
+				This will copy the database schema only. All tables will be empty. This is a lightweight
+				operation.
+			</Alert>
+		{/if}
+
+		{#if currentCloneJob.resourceType === 'instance'}
+			<p class="text-xs text-secondary mt-2">
+				This will run <code
+					>CREATE DATABASE {currentCloneJob.steps[0]?.label.match(/"([^"]+)"/)?.[1] ?? ''}</code
+				> on the Windmill PostgreSQL instance.
+			</p>
+		{:else}
+			<p class="text-xs text-secondary mt-2">
+				This will run <code>CREATE DATABASE</code> on the resource's PostgreSQL server.
+			</p>
+		{/if}
+
+		<div class="mt-4 flex flex-col gap-2">
+			{#each currentCloneJob.steps as step}
+				<div class="flex items-center gap-2 text-xs">
+					{#if step.status === 'done'}
+						<Check class="w-4 h-4 shrink-0 text-green-500" />
+					{:else if step.status === 'running'}
+						<Loader2 class="w-4 h-4 shrink-0 animate-spin text-blue-500" />
+					{:else if step.status === 'error'}
+						<X class="w-4 h-4 shrink-0 text-red-500" />
+					{:else}
+						<div class="w-4 h-4 shrink-0 rounded-full border border-gray-300"></div>
+					{/if}
+					<span
+						class:text-tertiary={step.status === 'pending'}
+						class:font-medium={step.status === 'running'}
+					>
+						{step.label}
+					</span>
+				</div>
+				{#if step.error}
+					<p class="text-2xs text-red-500 ml-6">{step.error}</p>
+				{/if}
+			{/each}
+		</div>
+	</ConfirmationModal>
+{/if}

package/package/components/workspaceSettings/ForkDatatableSection.svelte.d.ts

@@ -0,0 +1,28 @@
+export type ForkStep = {
+    label: string;
+    status: 'pending' | 'running' | 'done' | 'error';
+    error?: string;
+};
+export type DatatableCloneJob = {
+    name: string;
+    resourceType: string;
+    behavior: 'schema_only' | 'schema_and_data';
+    steps: ForkStep[];
+    _newDbName: string;
+    _isInstance: boolean;
+    _sourceWorkspace: string;
+    _targetWorkspace: string;
+    _resourcePath: string;
+};
+interface Props {
+    onAllDone?: () => void;
+    onCanceled?: () => void;
+}
+declare const ForkDatatableSection: import("svelte").Component<Props, {
+    hasDatatables: () => boolean;
+    buildCloneQueue: (targetWorkspaceId: string) => DatatableCloneJob[];
+    startCloning: (queue: DatatableCloneJob[]) => void;
+    getCompletedCloneJobs: () => DatatableCloneJob[];
+}, "">;
+type ForkDatatableSection = ReturnType<typeof ForkDatatableSection>;
+export default ForkDatatableSection;

package/package/components/workspaceSettings/GitSyncFilterSettings.svelte

@@ -6,7 +6,13 @@ import { Tabs, Tab, Button, Section } from '../common';
 import { workspaceStore } from '../../stores';
 import { twMerge } from 'tailwind-merge';
 import { slide } from 'svelte/transition';
-let { git_repo_resource_path = $bindable(''), include_path = $bindable(['f/**']), include_type = $bindable(['script', 'flow', 'app', 'folder']), exclude_types_override = $bindable([]), isLegacyRepo = false, excludes = $bindable([]), extraIncludes = $bindable([]), isInitialSetup = false, requiresMigration = false, actions = undefined, useIndividualBranch = false } = $props();
+let { git_repo_resource_path = $bindable(''), include_path = $bindable(['f/**']), include_type = $bindable([
+    'script',
+    'flow',
+    'app',
+    'folder',
+    'workspacedependencies'
+]), exclude_types_override = $bindable([]), isLegacyRepo = false, excludes = $bindable([]), extraIncludes = $bindable([]), isInitialSetup = false, requiresMigration = false, actions = undefined, useIndividualBranch = false } = $props();
 // Component state
 let collapsed = $state(false);
 // Determine if component should be editable or read-only
@@ -381,7 +387,7 @@ git push
 										> file:</div
 									>
 									<pre class="text-xs bg-surface p-2 rounded mt-2 overflow-x-auto"
-										>gitBranches:
+										>workspaces:
   main:
     promotionOverrides:
       # Add your promotion-specific settings here</pre

package/package/components/workspaceSettings/RulesetEditor.svelte

@@ -19,12 +19,14 @@ const hasRule = (ruleKind) => rule?.rules?.includes(ruleKind) ?? false;
 let name = $state(untrack(() => rule)?.name ?? '');
 let disableDirectDeployment = $state(hasRule('DisableDirectDeployment'));
 let disableFork = $state(hasRule('DisableWorkspaceForking'));
+let restrictDeployToDeployers = $state(hasRule('RestrictDeployToDeployers'));
 let selectedGroups = $state(untrack(() => rule)?.bypass_groups?.map((g) => g.replace('g/', '')) ?? []);
 let selectedUsers = $state(untrack(() => rule)?.bypass_users?.map((u) => u.replace('u/', '')) ?? []);
 // Initial state for unsaved changes tracking
 let initialName = $state(untrack(() => rule)?.name ?? '');
 let initialDisableDirectDeployment = $state(hasRule('DisableDirectDeployment'));
 let initialDisableFork = $state(hasRule('DisableWorkspaceForking'));
+let initialRestrictDeployToDeployers = $state(hasRule('RestrictDeployToDeployers'));
 let initialSelectedGroups = $state(untrack(() => rule)?.bypass_groups
     ? untrack(() => rule).bypass_groups.map((g) => g.replace('g/', ''))
     : []);
@@ -77,11 +79,13 @@ const hasUnsavedChanges = $derived(isCreateMode
     ? name.trim() !== '' ||
         disableDirectDeployment ||
         disableFork ||
+        restrictDeployToDeployers ||
         selectedGroups.length > 0 ||
         selectedUsers.length > 0
     : name !== initialName ||
         disableDirectDeployment !== initialDisableDirectDeployment ||
         disableFork !== initialDisableFork ||
+        restrictDeployToDeployers !== initialRestrictDeployToDeployers ||
         JSON.stringify([...selectedGroups].sort()) !==
             JSON.stringify([...initialSelectedGroups].sort()) ||
         JSON.stringify([...selectedUsers].sort()) !==
@@ -116,7 +120,10 @@ async function create() {
                 name,
                 rules: [
                     ...(disableDirectDeployment ? ['DisableDirectDeployment'] : []),
-                    ...(disableFork ? ['DisableWorkspaceForking'] : [])
+                    ...(disableFork ? ['DisableWorkspaceForking'] : []),
+                    ...(restrictDeployToDeployers
+                        ? ['RestrictDeployToDeployers']
+                        : [])
                 ],
                 bypass_groups: selectedGroups,
                 bypass_users: selectedUsers
@@ -140,7 +147,10 @@ async function save() {
             requestBody: {
                 rules: [
                     ...(disableDirectDeployment ? ['DisableDirectDeployment'] : []),
-                    ...(disableFork ? ['DisableWorkspaceForking'] : [])
+                    ...(disableFork ? ['DisableWorkspaceForking'] : []),
+                    ...(restrictDeployToDeployers
+                        ? ['RestrictDeployToDeployers']
+                        : [])
                 ],
                 bypass_groups: selectedGroups,
                 bypass_users: selectedUsers
@@ -151,6 +161,7 @@ async function save() {
         initialName = name;
         initialDisableDirectDeployment = disableDirectDeployment;
         initialDisableFork = disableFork;
+        initialRestrictDeployToDeployers = restrictDeployToDeployers;
         initialSelectedGroups = clone(selectedGroups);
         initialSelectedUsers = clone(selectedUsers);
         onUpdate?.();
@@ -270,6 +281,20 @@ async function save() {
 				/>
 				<div class="text-xs text-secondary ml-6">Users cannot create forks of this workspace.</div>
 			</div>
+
+			<!-- Restrict deploy to deployers -->
+			<div class="flex flex-col gap-2">
+				<Toggle
+					bind:checked={restrictDeployToDeployers}
+					options={{
+						right: 'Restrict deployment to wm_deployers'
+					}}
+				/>
+				<div class="text-xs text-secondary ml-6">
+					Only workspace admins and members of <code>wm_deployers</code> can deploy to this workspace.
+					Non-deployers can still fork, browse, and request a review.
+				</div>
+			</div>
 		</div>
 	</Section>