windmill-components 1.687.0 → 1.695.1

package/package/components/GitRepoViewer.svelte

@@ -3,15 +3,24 @@ import { untrack } from 'svelte';
 import { Alert, Button } from './common';
 import S3FilePickerInner from './S3FilePickerInner.svelte';
 import { workspaceStore } from '../stores';
-import { Loader, Loader2 } from 'lucide-svelte';
+import { base } from '../base';
+import { Loader, Loader2, ChevronDown, ChevronRight, ExternalLink } from 'lucide-svelte';
 import { hubPaths } from '../hub';
-import { tryEvery } from '../utils';
+import { sleep } from '../utils';
+const CLONE_MARKER_FILE = '.windmill_clone_complete';
+const POLL_INTERVAL_MS = 1500;
+const MAX_POLL_DURATION_MS = 30 * 60 * 1000; // 30 minutes
 let s3FilePicker = $state();
 let isLoadingCommitHash = $state(false);
 let isLoadingRepoClone = $state(false);
 let isCheckingPathExists = $state(false);
 let pathExists = $state(null);
 let error = $state(null);
+// Live job state for the running clone
+let runningJobId = $state(null);
+let runningLogs = $state('');
+let logsExpanded = $state(false);
+let cancelRequested = $state(false);
 let { gitRepoResourcePath, gitSshIdentity, commitHashInput = $bindable() } = $props();
 let commitHash = $derived(commitHashInput);
 async function populateS3WithGitRepo() {
@@ -19,110 +28,251 @@ async function populateS3WithGitRepo() {
     if (!workspace)
         return;
     const payload = {
-        workspace: workspace,
+        workspace,
         resource_path: gitRepoResourcePath,
         git_ssh_identity: gitSshIdentity,
-        commit: commitHash,
+        commit: commitHash
     };
     isLoadingRepoClone = true;
-    const jobId = await JobService.runScriptByPath({
-        workspace,
-        path: hubPaths.cloneRepoToS3forGitRepoViewer,
-        requestBody: payload,
-        skipPreprocessor: true
-    });
-    let jobSuccess = false;
-    await tryEvery({
-        tryCode: async () => {
-            const testResult = await JobService.getCompletedJob({ workspace, id: jobId });
-            jobSuccess = !!testResult.success;
-            if (jobSuccess) {
-                await JobService.getCompletedJobResult({ workspace, id: jobId });
-            }
-            else {
-                error = testResult.result.error.message ?? "Failed to clone";
+    error = null;
+    runningLogs = '';
+    cancelRequested = false;
+    logsExpanded = true;
+    let jobId;
+    try {
+        jobId = await JobService.runScriptByPath({
+            workspace,
+            path: hubPaths.cloneRepoToS3forGitRepoViewer,
+            requestBody: payload,
+            skipPreprocessor: true
+        });
+    }
+    catch (err) {
+        error = `Failed to start clone job: ${err?.message ?? err}`;
+        isLoadingRepoClone = false;
+        return;
+    }
+    runningJobId = jobId;
+    const startedAt = Date.now();
+    let logOffset = 0;
+    let isCompleted = false;
+    while (!isCompleted) {
+        if (cancelRequested) {
+            try {
+                await JobService.cancelQueuedJob({
+                    workspace,
+                    id: jobId,
+                    requestBody: { reason: 'cancelled by user from git repo viewer' }
+                });
             }
-        },
-        timeoutCode: async () => {
+            catch (_err) { }
+            error = 'Repository clone cancelled.';
+            break;
+        }
+        if (Date.now() - startedAt > MAX_POLL_DURATION_MS) {
             try {
                 await JobService.cancelQueuedJob({
                     workspace,
                     id: jobId,
-                    requestBody: { reason: `job timed out after 60s` }
+                    requestBody: { reason: 'git repo clone exceeded 30 min' }
                 });
             }
-            catch (err) { }
-        },
-        interval: 1000,
-        timeout: 60000
-    });
-    isLoadingRepoClone = false;
-    if (jobSuccess) {
-        pathExists = true;
+            catch (_err) { }
+            error = `Repository clone exceeded ${Math.round(MAX_POLL_DURATION_MS / 60000)} min and was cancelled.`;
+            break;
+        }
+        try {
+            const update = await JobService.getJobUpdates({
+                workspace,
+                id: jobId,
+                running: true,
+                logOffset
+            });
+            if (update.new_logs) {
+                runningLogs += update.new_logs;
+            }
+            if (typeof update.log_offset === 'number') {
+                logOffset = update.log_offset;
+            }
+            if (update.completed) {
+                isCompleted = true;
+                break;
+            }
+        }
+        catch (_err) {
+            // Transient API failure — keep polling.
+        }
+        await sleep(POLL_INTERVAL_MS);
+    }
+    if (isCompleted) {
+        try {
+            const completed = await JobService.getCompletedJob({ workspace, id: jobId });
+            if (completed.success) {
+                // Verify the marker so partial uploads aren't shown as complete.
+                const s3Path = `gitrepos/${workspace}/${gitRepoResourcePath}/${commitHash}/`;
+                try {
+                    const check = await HelpersService.checkS3FolderExists({
+                        workspace,
+                        fileKey: s3Path,
+                        markerFile: CLONE_MARKER_FILE
+                    });
+                    if (check.exists) {
+                        pathExists = true;
+                        logsExpanded = false;
+                    }
+                    else {
+                        pathExists = false;
+                        error =
+                            'Clone job finished but the completion marker is missing. The repository may have been synced with an older clone script — re-run to refresh.';
+                    }
+                }
+                catch (err) {
+                    error = `Failed to verify clone completion: ${err?.message ?? err}`;
+                }
+            }
+            else {
+                const errMsg = completed.result?.error?.message ??
+                    completed.result?.error ??
+                    'Clone job failed without an error message.';
+                error = typeof errMsg === 'string' ? errMsg : JSON.stringify(errMsg);
+            }
+        }
+        catch (err) {
+            error = `Failed to read clone job result: ${err?.message ?? err}`;
+        }
     }
+    isLoadingRepoClone = false;
 }
-async function fetchGitRepoData() {
+function cancelClone() {
+    cancelRequested = true;
+}
+async function fetchCommitHash() {
+    if (commitHash)
+        return;
     try {
         error = null;
-        // Step 1: Fetch commit hash if not provided
-        if (!commitHash) {
-            isLoadingCommitHash = true;
-            error = null;
-            const result = await ResourceService.getGitCommitHash({
-                workspace: $workspaceStore,
-                path: gitRepoResourcePath,
-                gitSshIdentity: gitSshIdentity?.join(",")
-            });
-            commitHashInput = result.commit_hash;
-            isLoadingCommitHash = false;
-        }
-        // Step 2: Check if S3 path exists
-        if (commitHash) {
-            isCheckingPathExists = true;
-            const s3Path = `gitrepos/${$workspaceStore}/${gitRepoResourcePath}/${commitHash}/`;
-            const pathCheck = await HelpersService.checkS3FolderExists({
-                workspace: $workspaceStore,
-                fileKey: s3Path
-            });
-            pathExists = pathCheck.exists && pathCheck.is_folder;
-            isCheckingPathExists = false;
-        }
+        isLoadingCommitHash = true;
+        const result = await ResourceService.getGitCommitHash({
+            workspace: $workspaceStore,
+            path: gitRepoResourcePath,
+            gitSshIdentity: gitSshIdentity?.join(',')
+        });
+        commitHashInput = result.commit_hash;
     }
     catch (err) {
         error = `Failed to load git repository ${gitRepoResourcePath}: ${err.status} -  ${err.message || 'Unknown error'}: ${err.body}`;
+    }
+    finally {
         isLoadingCommitHash = false;
+    }
+}
+async function checkS3Path() {
+    if (!commitHash)
+        return;
+    try {
+        error = null;
+        isCheckingPathExists = true;
+        const s3Path = `gitrepos/${$workspaceStore}/${gitRepoResourcePath}/${commitHash}/`;
+        const pathCheck = await HelpersService.checkS3FolderExists({
+            workspace: $workspaceStore,
+            fileKey: s3Path,
+            markerFile: CLONE_MARKER_FILE
+        });
+        pathExists = pathCheck.exists && pathCheck.is_folder;
+    }
+    catch (err) {
+        error = `Failed to load git repository ${gitRepoResourcePath}: ${err.status} -  ${err.message || 'Unknown error'}: ${err.body}`;
+    }
+    finally {
         isCheckingPathExists = false;
     }
 }
+$effect(() => {
+    gitRepoResourcePath;
+    untrack(() => fetchCommitHash());
+});
 $effect(() => {
     ;
-    [commitHashInput, gitRepoResourcePath];
-    untrack(() => {
-        fetchGitRepoData();
-    });
+    [commitHash, gitRepoResourcePath];
+    untrack(() => checkS3Path());
 });
 $effect(() => {
     ;
-    [commitHash, pathExists, isCheckingPathExists, isLoadingCommitHash];
-    untrack(() => {
-        s3FilePicker?.open(undefined);
-    });
+    [s3FilePicker, commitHash, gitRepoResourcePath, pathExists];
+    untrack(() => s3FilePicker?.reloadContent());
 });
 </script>
 
-{#if error}
-	<Alert type="error" title="Error Loading Repository">
-		<p>{error}</p>
-	</Alert>
+{#if error && !isLoadingRepoClone}
+	<div class="p-4 space-y-3">
+		<Alert type="error" title="Error Loading Repository">
+			<p class="whitespace-pre-wrap break-words">{error}</p>
+			{#if runningJobId}
+				<a
+					class="inline-flex items-center gap-1 mt-2 text-sm underline"
+					href={`${base}/run/${runningJobId}?workspace=${$workspaceStore}`}
+					target="_blank"
+					rel="noreferrer noopener"
+				>
+					View job logs <ExternalLink size={12} />
+				</a>
+			{/if}
+		</Alert>
+		{#if runningLogs}
+			<details class="text-xs">
+				<summary class="cursor-pointer text-secondary">Last clone logs</summary>
+				<pre
+					class="mt-2 p-2 bg-surface-secondary rounded max-h-64 overflow-auto whitespace-pre-wrap"
+					>{runningLogs}</pre
+				>
+			</details>
+		{/if}
+		<Button onclick={populateS3WithGitRepo} color="blue">Retry</Button>
+	</div>
 {:else if isLoadingCommitHash}
 	<div class="flex items-center gap-2 p-4">
 		<Loader2 class="h-4 w-4 animate-spin" />
 		<span class="text-secondary">Fetching latest commit hash...</span>
 	</div>
 {:else if isLoadingRepoClone}
-	<div class="flex items-center gap-2 p-4">
-		<Loader class="h-4 w-4 animate-spin" />
-		<span class="text-secondary">Cloning repository...</span>
+	<div class="p-4 space-y-3">
+		<div class="flex items-center justify-between gap-2">
+			<div class="flex items-center gap-2">
+				<Loader class="h-4 w-4 animate-spin" />
+				<span class="text-secondary">Cloning repository...</span>
+			</div>
+			<div class="flex items-center gap-2">
+				{#if runningJobId}
+					<a
+						class="inline-flex items-center gap-1 text-xs underline text-secondary"
+						href={`${base}/run/${runningJobId}?workspace=${$workspaceStore}`}
+						target="_blank"
+						rel="noreferrer noopener"
+					>
+						Job <ExternalLink size={12} />
+					</a>
+				{/if}
+				<Button size="xs" color="light" variant="border" onclick={cancelClone}>Cancel</Button>
+			</div>
+		</div>
+		<button
+			type="button"
+			class="flex items-center gap-1 text-xs text-secondary hover:text-primary"
+			onclick={() => (logsExpanded = !logsExpanded)}
+		>
+			{#if logsExpanded}
+				<ChevronDown size={12} />
+			{:else}
+				<ChevronRight size={12} />
+			{/if}
+			Logs
+		</button>
+		{#if logsExpanded}
+			<pre
+				class="mt-1 p-2 bg-surface-secondary rounded text-xs max-h-64 overflow-auto whitespace-pre-wrap"
+				>{runningLogs || '(waiting for output...)'}</pre
+			>
+		{/if}
 	</div>
 {:else if commitHash && isCheckingPathExists}
 	<div class="flex items-center gap-2 p-4">
@@ -137,31 +287,35 @@ $effect(() => {
 		<Button onclick={populateS3WithGitRepo} color="blue">Load Repository Contents</Button>
 	</div>
 {:else if commitHash && pathExists === true}
-	<S3FilePickerInner
-		bind:this={s3FilePicker}
-		readOnlyMode
-		hideS3SpecificDetails
-		rootPath={`gitrepos/${$workspaceStore}/${gitRepoResourcePath}/${commitHash}/`}
-		listStoredFilesRequest={HelpersService.listGitRepoFiles}
-		loadFilePreviewRequest={HelpersService.loadGitRepoFilePreview}
-		testConnectionRequest={(async (_d) => {
-			const bucketConfig: any = await SettingService.getGlobal({ key: 'object_store_cache_config' })
-			return SettingService.testObjectStorageConfig({
-				requestBody: bucketConfig
-			})
-		}) as any}
-		loadFileMetadataRequest={HelpersService.loadGitRepoFileMetadata}
-	>
-		{#snippet replaceUnauthorizedWarning()}
-			<div class="mb-2">
-				<Alert type="error" title="Cannot view git repo">
-					<p>
-						The git repo resource you are trying to access either doesn't exist or you don't have
-						access to it. Make sure the resource path is correct and that you have visibility over
-						the resource.
-					</p>
-				</Alert>
-			</div>
-		{/snippet}
-	</S3FilePickerInner>
+	{#key `${gitRepoResourcePath}-${commitHash}`}
+		<S3FilePickerInner
+			bind:this={s3FilePicker}
+			readOnlyMode
+			hideS3SpecificDetails
+			rootPath={`gitrepos/${$workspaceStore}/${gitRepoResourcePath}/${commitHash}/`}
+			listStoredFilesRequest={HelpersService.listGitRepoFiles}
+			loadFilePreviewRequest={HelpersService.loadGitRepoFilePreview}
+			testConnectionRequest={(async (_d) => {
+				const bucketConfig: any = await SettingService.getGlobal({
+					key: 'object_store_cache_config'
+				})
+				return SettingService.testObjectStorageConfig({
+					requestBody: bucketConfig
+				})
+			}) as any}
+			loadFileMetadataRequest={HelpersService.loadGitRepoFileMetadata}
+		>
+			{#snippet replaceUnauthorizedWarning()}
+				<div class="mb-2">
+					<Alert type="error" title="Cannot view git repo">
+						<p>
+							The git repo resource you are trying to access either doesn't exist or you don't have
+							access to it. Make sure the resource path is correct and that you have visibility over
+							the resource.
+						</p>
+					</Alert>
+				</div>
+			{/snippet}
+		</S3FilePickerInner>
+	{/key}
 {/if}

package/package/components/InputTransformSchemaForm.svelte

@@ -38,7 +38,7 @@ let s3StorageConfigured = $state(true);
 async function checkS3Storage() {
     try {
         if ($workspaceStore) {
-            const settings = await WorkspaceService.getSettings({ workspace: $workspaceStore });
+            const settings = await WorkspaceService.getPublicSettings({ workspace: $workspaceStore });
             s3StorageConfigured = settings.large_file_storage?.s3_resource_path !== undefined;
         }
     }

package/package/components/InstanceSettings.svelte

@@ -156,6 +156,33 @@ export async function saveSettings() {
         }
         // Build the full global_settings object for the bulk PUT
         const globalSettings = { ...$values };
+        // Send explicit null for keys that were set on load but are now
+        // missing/cleared, so the Merge-mode bulk endpoint deletes them
+        // instead of silently preserving the old DB value. Covers both:
+        //   - YAML mode: user removed a line / set it to null / set it to {}.
+        //   - Form mode: user toggled a setting off (e.g.
+        //     object_store_cache_config), making the value undefined.
+        const isClearedValue = (v) => {
+            if (v === undefined || v === null)
+                return true;
+            if (typeof v === 'object') {
+                return Array.isArray(v) ? v.length === 0 : Object.keys(v).length === 0;
+            }
+            return false;
+        };
+        for (const key of Object.keys(initialValues ?? {})) {
+            if (excludedKeys.has(key))
+                continue;
+            if (key === 'oauths' || key === 'require_preexisting_user_for_oauth')
+                continue;
+            if (!isClearedValue(globalSettings[key]))
+                continue;
+            // Only flag for deletion if it was non-empty before — otherwise
+            // every save would delete-then-recreate harmless `{}`/`[]` defaults.
+            if (isClearedValue(initialValues[key]))
+                continue;
+            globalSettings[key] = null;
+        }
         // Include oauths and require_preexisting_user_for_oauth
         if (!deepEqual(initialOauths, oauths)) {
             globalSettings['oauths'] = oauths;
@@ -273,7 +300,7 @@ function stripEmpty(obj) {
 }
 function getSettingsForCategory(category) {
     if (category === 'Auth/OAuth/SAML') {
-        return scimSamlSetting;
+        return [...(settings[category] ?? []), ...scimSamlSetting];
     }
     const base = settings[category] ?? [];
     // In quick setup, reorder Core: base settings (without license_key), then extras from Jobs
@@ -383,27 +410,20 @@ export function isDirty(category) {
     return dirtyCategories[category] ?? false;
 }
 export function discardCategory(category) {
+    const categorySettings = getSettingsForCategory(category);
+    for (const s of categorySettings) {
+        const v = initialValues[s.key];
+        $values[s.key] = v !== undefined ? JSON.parse(JSON.stringify(v)) : undefined;
+    }
     if (category === 'Auth/OAuth/SAML') {
-        for (const s of scimSamlSetting) {
-            const v = initialValues[s.key];
-            $values[s.key] = v !== undefined ? JSON.parse(JSON.stringify(v)) : undefined;
-        }
         oauths = JSON.parse(JSON.stringify(initialOauths));
         requirePreexistingUserForOauth = initialRequirePreexistingUserForOauth;
         const account_identifier = initialOauths?.snowflake_oauth?.connect_config?.extra_params?.account_identifier;
         snowflakeAccountIdentifier = account_identifier ?? '';
     }
-    else {
-        const categorySettings = getSettingsForCategory(category);
-        for (const s of categorySettings) {
-            const v = initialValues[s.key];
-            $values[s.key] = v !== undefined ? JSON.parse(JSON.stringify(v)) : undefined;
-        }
-        if (category === 'Registries') {
-            const v = initialValues['workspace_registries'];
-            $values['workspace_registries'] =
-                v !== undefined ? JSON.parse(JSON.stringify(v)) : undefined;
-        }
+    else if (category === 'Registries') {
+        const v = initialValues['workspace_registries'];
+        $values['workspace_registries'] = v !== undefined ? JSON.parse(JSON.stringify(v)) : undefined;
     }
 }
 export function discardAll() {