windmill-components 1.511.0 → 1.522.0

package/package/components/PullGitRepoPopover.svelte

@@ -1,355 +0,0 @@
-<script lang="ts">import { Button } from './common';
-import Popover from './meltComponents/Popover.svelte';
-import { Loader2, Eye, Save, CheckCircle2, XCircle, DownloadCloud, AlertTriangle, Terminal, ChevronDown, ChevronUp } from 'lucide-svelte';
-import { workspaceStore } from '../stores';
-import hubPaths from '../hubPaths.json';
-import { JobService } from '../gen';
-import { tryEvery } from '../utils';
-import { sendUserToast } from '../toast';
-import GitDiffPreview from './GitDiffPreview.svelte';
-import { page } from '$app/stores';
-let { gitRepoResourcePath, uiState, onFilterUpdate } = $props();
-let previewResult = $state(undefined);
-let isPreviewLoading = $state(false);
-let isPulling = $state(false);
-let pullGitRepoPopover = $state(null);
-let jobStatus = $state({
-    id: null,
-    status: undefined,
-    type: 'preview'
-});
-let isCliInfoExpanded = $state(false);
-async function handleJobCompletion(jobId, workspace) {
-    let success = false;
-    await tryEvery({
-        tryCode: async () => {
-            const result = await JobService.getCompletedJob({
-                workspace,
-                id: jobId
-            });
-            success = !!result.success;
-        },
-        timeoutCode: async () => {
-            try {
-                await JobService.cancelQueuedJob({
-                    workspace,
-                    id: jobId,
-                    requestBody: {
-                        reason: 'Job timed out after 5s'
-                    }
-                });
-            }
-            catch (err) {
-                console.error(err);
-            }
-        },
-        interval: 500,
-        timeout: 10000
-    });
-    return success;
-}
-async function previewChanges() {
-    const workspace = $workspaceStore;
-    if (!workspace)
-        return;
-    console.log('Previewing changes for repo:', gitRepoResourcePath);
-    isPreviewLoading = true;
-    jobStatus = { id: null, status: undefined, type: 'preview' };
-    try {
-        // Always use the simplified JSON approach
-        const jobId = await JobService.runScriptByPath({
-            workspace,
-            path: hubPaths.gitInitRepo,
-            requestBody: {
-                workspace_id: workspace,
-                repo_url_resource_path: gitRepoResourcePath,
-                dry_run: true,
-                pull: true,
-                only_wmill_yaml: false,
-                settings_json: JSON.stringify(uiState)
-            },
-            skipPreprocessor: true
-        });
-        jobStatus = { id: jobId, status: 'running', type: 'preview' };
-        const success = await handleJobCompletion(jobId, workspace);
-        if (success) {
-            const rawResult = await JobService.getCompletedJobResult({ workspace, id: jobId });
-            console.log('Preview result:', rawResult);
-            // Convert new CLI format to expected format
-            const added = [];
-            const deleted = [];
-            const modified = [];
-            if (rawResult &&
-                rawResult.changes &&
-                Array.isArray(rawResult.changes)) {
-                for (const change of rawResult.changes) {
-                    if (change.type === 'added') {
-                        added.push(change.path);
-                    }
-                    else if (change.type === 'deleted') {
-                        deleted.push(change.path);
-                    }
-                    else if (change.type === 'modified') {
-                        modified.push(change.path);
-                    }
-                }
-            }
-            // For full sync mode, just use the CLI results directly
-            // The CLI already handles wmill.yaml changes with --include-wmill-yaml flag
-            previewResult = { added, deleted, modified };
-            jobStatus.status = 'success';
-        }
-        else {
-            previewResult = undefined;
-            jobStatus.status = 'failure';
-        }
-    }
-    catch (error) {
-        console.error('Failed to preview changes:', error);
-        previewResult = undefined;
-        jobStatus = {
-            ...jobStatus,
-            status: 'failure',
-            error: error instanceof Error ? error.message : String(error)
-        };
-    }
-    finally {
-        isPreviewLoading = false;
-    }
-}
-async function pullFromRepo() {
-    const workspace = $workspaceStore;
-    if (!workspace)
-        return;
-    console.log('Pulling from repo:', gitRepoResourcePath);
-    isPulling = true;
-    jobStatus = { id: null, status: undefined, type: 'pull' };
-    try {
-        // Use init git repo script with dry_run: false (actual pull operation)
-        // The script will read wmill.yaml directly from the cloned repo, no need to pass settings
-        const jobId = await JobService.runScriptByPath({
-            workspace,
-            path: hubPaths.gitInitRepo,
-            requestBody: {
-                workspace_id: workspace,
-                repo_url_resource_path: gitRepoResourcePath,
-                dry_run: false,
-                branch_to_push: '',
-                only_wmill_yaml: false,
-                pull: true,
-                settings_json: undefined // Let script use wmill.yaml from repo
-            },
-            skipPreprocessor: true
-        });
-        jobStatus = { id: jobId, status: 'running', type: 'pull' };
-        const success = await handleJobCompletion(jobId, workspace);
-        jobStatus.status = success ? 'success' : 'failure';
-        if (success) {
-            // Get the result which should contain the local git repo settings as JSON
-            const result = (await JobService.getCompletedJobResult({ workspace, id: jobId }));
-            console.log('Pull result:', result);
-            // Apply the settings from the sync operation result to the UI
-            if (result?.settings_json) {
-                // Directly update the UI state with the JSON result - no YAML conversion needed!
-                const settingsJson = result.settings_json;
-                onFilterUpdate({
-                    include_path: settingsJson.include_path || ['f/**'],
-                    exclude_path: settingsJson.exclude_path || [],
-                    extra_include_path: settingsJson.extra_include_path || [],
-                    include_type: settingsJson.include_type || ['script', 'flow', 'app', 'folder']
-                });
-                sendUserToast('Successfully pulled workspace content from repository');
-                // Reset popover state after successful pull
-                previewResult = undefined;
-                jobStatus = { id: null, status: undefined, type: 'preview' };
-                pullGitRepoPopover?.close();
-            }
-            else {
-                console.warn('No settings_json returned from pull operation');
-                sendUserToast('Pull completed but could not update filter settings', true);
-            }
-        }
-    }
-    catch (error) {
-        console.error('Failed to pull from repo:', error);
-        jobStatus = {
-            ...jobStatus,
-            status: 'failure',
-            error: error instanceof Error ? error.message : String(error)
-        };
-    }
-    finally {
-        isPulling = false;
-    }
-}
-</script>
-
-<Popover
-	bind:this={pullGitRepoPopover}
-	floatingConfig={{
-		placement: 'top-start',
-		strategy: 'fixed',
-		flip: false,
-		shift: true
-	}}
-	contentClasses="p-4 w-1/3"
->
-	<svelte:fragment slot="trigger">
-		<Button
-			color="dark"
-			size="sm"
-			nonCaptureEvent
-			onclick={pullGitRepoPopover?.open}
-			startIcon={{ icon: DownloadCloud }}
-		>
-			Pull workspace from Git repo
-		</Button>
-	</svelte:fragment>
-
-	<svelte:fragment slot="content" let:close>
-		<div class="flex flex-col gap-4">
-			<div class="flex flex-col gap-2">
-				<h3 class="text-lg font-semibold">Pull workspace from Git repository</h3>
-				<div class="prose max-w-none text-2xs text-tertiary">
-					This action will pull all workspace objects from your Git repository according to the
-					filters set in the Git repository wmill.yaml file and apply those filter settings to the
-					workspace.
-					<span class="text-orange-600 flex items-center gap-1">
-						<AlertTriangle size={14} /> This will overwrite your current workspace content and Git sync
-						filter settings with the content from the Git repository.
-					</span>
-
-					<!-- Collapsible CLI Info Section -->
-					<div class="mt-2 border rounded-md">
-						<button
-							class="w-full flex items-center justify-between p-1.5 bg-surface-secondary hover:bg-surface-hover"
-							onclick={() => (isCliInfoExpanded = !isCliInfoExpanded)}
-						>
-							<span class="font-medium flex items-center gap-2">
-								<Terminal size={14} />
-								Windmill CLI to push local files to Windmill
-							</span>
-							{#if isCliInfoExpanded}
-								<ChevronUp size={16} />
-							{:else}
-								<ChevronDown size={16} />
-							{/if}
-						</button>
-
-						{#if isCliInfoExpanded}
-							<div class="p-1 bg-surface-tertiary">
-								<div class="text-2xs mb-2">
-									Not familiar with Windmill CLI? <a
-										href="https://www.windmill.dev/docs/advanced/cli/sync"
-										class="text-blue-500 hover:text-blue-600 underline"
-										target="_blank"
-										rel="noopener noreferrer">Check out the docs</a
-									>
-								</div>
-								<div class="font-mono text-2xs">
-									<pre class="overflow-auto max-h-60"
-										><code
-											>npm install -g windmill-cli
-# Clone your git repository
-git clone $REPO_URL
-cd $REPO_NAME
-# Configure Windmill CLI
-wmill workspace add {$workspaceStore} {$workspaceStore} {`${$page.url.protocol}//${$page.url.hostname}/`}
-# Push the content to Windmill
-wmill sync push --yes
-# Optional: add --skip-secrets --skip-variables --skip-resources flags as needed</code
-										></pre
-									>
-								</div>
-							</div>
-						{/if}
-					</div>
-				</div>
-			</div>
-
-			{#if previewResult}
-				<GitDiffPreview {previewResult} />
-			{/if}
-
-			{#if jobStatus.id}
-				<div class="flex items-center gap-2 text-xs text-tertiary">
-					{#if jobStatus.status === 'running'}
-						<Loader2 class="animate-spin" size={14} />
-					{:else if jobStatus.status === 'success'}
-						<CheckCircle2 size={14} class="text-green-600" />
-					{:else if jobStatus.status === 'failure'}
-						<XCircle size={14} class="text-red-700" />
-					{/if}
-					{jobStatus.type === 'preview' ? 'Preview' : 'Pull'} job:
-					<a
-						target="_blank"
-						class="underline"
-						href={`/run/${jobStatus.id}?workspace=${$workspaceStore}`}
-					>
-						{jobStatus.id}
-					</a>
-				</div>
-				{#if jobStatus.error}
-					<div class="text-xs text-red-600">{jobStatus.error}</div>
-				{/if}
-			{/if}
-
-			<div class="flex justify-between items-center mt-4">
-				<Button
-					color="light"
-					size="xs"
-					on:click={() => {
-						previewResult = undefined
-						jobStatus = { id: null, status: undefined, type: 'preview' }
-						close()
-					}}
-					disabled={isPreviewLoading || isPulling}
-				>
-					Cancel
-				</Button>
-				<div class="flex gap-2">
-					{#if !previewResult}
-						<Button
-							size="xs"
-							on:click={previewChanges}
-							disabled={isPreviewLoading || isPulling}
-							startIcon={{
-								icon: isPreviewLoading ? Loader2 : Eye,
-								classes: isPreviewLoading ? 'animate-spin' : ''
-							}}
-						>
-							Preview
-						</Button>
-					{:else}
-						<Button
-							size="xs"
-							on:click={previewChanges}
-							disabled={isPreviewLoading || isPulling}
-							startIcon={{
-								icon: isPreviewLoading ? Loader2 : Eye,
-								classes: isPreviewLoading ? 'animate-spin' : ''
-							}}
-							title="Preview changes again"
-						>
-							Preview
-						</Button>
-						{#if previewResult.added?.length || previewResult.deleted?.length || previewResult.modified?.length}
-							<Button
-								color="red"
-								size="xs"
-								on:click={pullFromRepo}
-								disabled={isPreviewLoading || isPulling}
-								startIcon={{
-									icon: isPulling ? Loader2 : Save,
-									classes: isPulling ? 'animate-spin' : ''
-								}}
-							>
-								{isPulling ? 'Pulling...' : 'Pull'}
-							</Button>
-						{/if}
-					{/if}
-				</div>
-			</div>
-		</div>
-	</svelte:fragment>
-</Popover>

package/package/components/PullGitRepoPopover.svelte.d.ts

@@ -1,18 +0,0 @@
-type $$ComponentProps = {
-    gitRepoResourcePath: string;
-    uiState: {
-        include_path: string[];
-        exclude_path: string[];
-        extra_include_path: string[];
-        include_type: string[];
-    };
-    onFilterUpdate: (filters: {
-        include_path: string[];
-        exclude_path: string[];
-        extra_include_path: string[];
-        include_type: string[];
-    }) => void;
-};
-declare const PullGitRepoPopover: import("svelte").Component<$$ComponentProps, {}, "">;
-type PullGitRepoPopover = ReturnType<typeof PullGitRepoPopover>;
-export default PullGitRepoPopover;

package/package/inferArgSig.d.ts

@@ -1,35 +0,0 @@
-import type { SchemaProperty } from './common';
-export declare function argSigToJsonSchemaType(t: string | {
-    resource: string | null;
-} | {
-    list: (string | {
-        object: {
-            key: string;
-            typ: any;
-        }[];
-    }) | {
-        str: any;
-    } | {
-        object: {
-            key: string;
-            typ: any;
-        }[];
-    } | null;
-} | {
-    dynselect: string;
-} | {
-    str: string[] | null;
-} | {
-    object: {
-        key: string;
-        typ: any;
-    }[];
-} | {
-    oneof: {
-        label: string;
-        properties: {
-            key: string;
-            typ: any;
-        }[];
-    }[];
-}, oldS: SchemaProperty): void;

package/package/inferArgSig.js

@@ -1,191 +0,0 @@
-export function argSigToJsonSchemaType(t, oldS) {
-    const newS = { type: '' };
-    if (t === 'int') {
-        newS.type = 'integer';
-    }
-    else if (t === 'float') {
-        newS.type = 'number';
-    }
-    else if (t === 'bool') {
-        newS.type = 'boolean';
-    }
-    else if (t === 'email') {
-        newS.type = 'string';
-        newS.format = 'email';
-    }
-    else if (t === 'sql') {
-        newS.type = 'string';
-        newS.format = 'sql';
-    }
-    else if (t === 'yaml') {
-        newS.type = 'string';
-        newS.format = 'yaml';
-    }
-    else if (t === 'bytes') {
-        newS.type = 'string';
-        newS.contentEncoding = 'base64';
-        newS.originalType = 'bytes';
-    }
-    else if (t === 'datetime') {
-        newS.type = 'string';
-        newS.format = 'date-time';
-    }
-    else if (typeof t !== 'string' && 'oneof' in t) {
-        newS.type = 'object';
-        if (t.oneof) {
-            newS.oneOf = t.oneof.map((obj) => {
-                const oldObjS = oldS.oneOf?.find((o) => o?.title === obj.label) ?? undefined;
-                const properties = {};
-                for (const prop of obj.properties) {
-                    if (oldObjS?.properties && prop.key in oldObjS?.properties) {
-                        properties[prop.key] = oldObjS?.properties[prop.key];
-                    }
-                    else {
-                        properties[prop.key] = { description: '', type: '' };
-                    }
-                    argSigToJsonSchemaType(prop.typ, properties[prop.key]);
-                }
-                return {
-                    type: 'object',
-                    title: obj.label,
-                    properties,
-                    order: oldObjS?.order ?? undefined
-                };
-            });
-        }
-    }
-    else if (typeof t !== 'string' && `object` in t) {
-        newS.type = 'object';
-        if (t.object) {
-            const properties = {};
-            for (const prop of t.object) {
-                if (oldS.properties && prop.key in oldS.properties) {
-                    properties[prop.key] = oldS.properties[prop.key];
-                }
-                else {
-                    properties[prop.key] = { description: '', type: '' };
-                }
-                argSigToJsonSchemaType(prop.typ, properties[prop.key]);
-            }
-            newS.properties = properties;
-        }
-    }
-    else if (typeof t !== 'string' && `str` in t) {
-        newS.type = 'string';
-        if (t.str) {
-            newS.originalType = 'enum';
-            newS.enum = t.str;
-        }
-        else if (oldS.originalType == 'string' && oldS.enum) {
-            newS.originalType = 'string';
-            newS.enum = oldS.enum;
-        }
-        else {
-            newS.originalType = 'string';
-            newS.enum = undefined;
-        }
-    }
-    else if (typeof t !== 'string' && `resource` in t) {
-        newS.type = 'object';
-        newS.format = `resource-${t.resource}`;
-    }
-    else if (typeof t !== 'string' && `dynselect` in t) {
-        newS.type = 'object';
-        newS.format = `dynselect-${t.dynselect}`;
-    }
-    else if (typeof t !== 'string' && `list` in t) {
-        newS.type = 'array';
-        if (t.list === 'int' || t.list === 'float') {
-            newS.items = { type: 'number' };
-            newS.originalType = 'number[]';
-        }
-        else if (t.list === 'bytes') {
-            newS.items = { type: 'string', contentEncoding: 'base64' };
-            newS.originalType = 'bytes[]';
-        }
-        else if (t.list && typeof t.list == 'object' && 'str' in t.list && t.list.str) {
-            newS.items = { type: 'string', enum: t.list.str };
-            newS.originalType = 'enum[]';
-        }
-        else if (t.list == 'string' || (t.list && typeof t.list == 'object' && 'str' in t.list)) {
-            newS.items = { type: 'string', enum: oldS.items?.enum };
-            newS.originalType = 'string[]';
-        }
-        else if (t.list && typeof t.list == 'object' && 'resource' in t.list && t.list.resource) {
-            newS.items = {
-                type: 'resource',
-                resourceType: t.list.resource
-            };
-            newS.originalType = 'resource[]';
-        }
-        else if (t.list &&
-            typeof t.list == 'object' &&
-            'object' in t.list &&
-            t.list.object &&
-            t.list.object.length > 0) {
-            const properties = {};
-            for (const prop of t.list.object) {
-                properties[prop.key] = { description: '', type: '' };
-                argSigToJsonSchemaType(prop.typ, properties[prop.key]);
-            }
-            newS.items = { type: 'object', properties: properties };
-            newS.originalType = 'record[]';
-        }
-        else {
-            newS.items = { type: 'object' };
-            newS.originalType = 'object[]';
-        }
-    }
-    else {
-        newS.type = 'object';
-    }
-    const preservedFields = [
-        'description',
-        'pattern',
-        'min',
-        'max',
-        'currency',
-        'currencyLocale',
-        'multiselect',
-        'customErrorMessage',
-        'required',
-        'showExpr',
-        'password',
-        'order',
-        'dateFormat',
-        'title',
-        'placeholder'
-    ];
-    preservedFields.forEach((field) => {
-        // @ts-ignore
-        if (oldS[field] !== undefined) {
-            // @ts-ignore
-            newS[field] = oldS[field];
-        }
-    });
-    if (oldS.type != newS.type) {
-        for (const prop of Object.getOwnPropertyNames(newS)) {
-            if (prop != 'description') {
-                // @ts-ignore
-                delete oldS[prop];
-            }
-        }
-    }
-    else if ((oldS.format == 'date' || oldS.format === 'date-time') && newS.format == 'string') {
-        newS.format = oldS.format;
-    }
-    else if (newS.format == 'date-time' && oldS.format == 'date') {
-        newS.format = 'date';
-    }
-    else if (oldS.items?.type != newS.items?.type) {
-        delete oldS.items;
-    }
-    Object.assign(oldS, newS);
-    // if (sameItems && savedItems != undefined && savedItems.enum != undefined) {
-    // 	sendUserToast(JSON.stringify(savedItems))
-    // 	oldS.items = savedItems
-    // }
-    if (oldS.format?.startsWith('resource-') && newS.type != 'object') {
-        oldS.format = undefined;
-    }
-}