windmill-components 1.596.1 → 1.612.2

package/package/components/runs/RunsFilter.svelte

@@ -1,3 +1,35 @@
+<script module lang="ts">export const runsFiltersSchema = z.object({
+    path: z.string().nullable().default(null),
+    worker: z.string().nullable().default(null),
+    user: z.string().nullable().default(null),
+    folder: z.string().nullable().default(null),
+    label: z.string().nullable().default(null),
+    concurrency_key: z.string().nullable().default(null),
+    tag: z.string().nullable().default(null),
+    allow_wildcards: z.boolean().default(false),
+    show_future_jobs: z.boolean().default(true),
+    success: z
+        .enum(['running', 'suspended', 'waiting', 'success', 'failure'])
+        .nullable()
+        .default(null),
+    show_skipped: z.boolean().default(false),
+    show_schedules: z.boolean().default(true),
+    min_ts: z.string().nullable().default(null),
+    max_ts: z.string().nullable().default(null),
+    schedule_path: z.string().nullable().default(null),
+    job_kinds: z.string().default('runs'),
+    all_workspaces: z.boolean().default(false),
+    arg: z.string().default(''),
+    result: z.string().default(''),
+    job_trigger_kind: z
+        .string()
+        .transform((s) => s)
+        .nullable()
+        .default(null),
+    per_page: z.number().default(1000)
+});
+</script>
+
 <script lang="ts">import { Button } from '../common';
 import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte';
 import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte';
@@ -7,7 +39,7 @@ import Toggle from '../Toggle.svelte';
 import Label from '../Label.svelte';
 import Section from '../Section.svelte';
 import { enterpriseLicense, workspaceStore } from '../../stores';
-import { createEventDispatcher, untrack } from 'svelte';
+import { createEventDispatcher } from 'svelte';
 import ToggleButtonMore from '../common/toggleButton-v2/ToggleButtonMore.svelte';
 import Popover from '../meltComponents/Popover.svelte';
 import Select from '../select/Select.svelte';
@@ -17,37 +49,37 @@ import DropdownSelect from '../DropdownSelect.svelte';
 import TooltipV2 from '../meltComponents/Tooltip.svelte';
 import TextInput from '../text_input/TextInput.svelte';
 import { jobTriggerKinds, triggerDisplayNamesMap } from '../triggers/utils';
-let { path = $bindable(null), label = $bindable(null), concurrencyKey = $bindable(null), worker = $bindable(null), tag = $bindable(null), success = $bindable(undefined), showSkipped = $bindable(undefined), argFilter = $bindable(), argError = $bindable(), resultFilter = $bindable(), jobTriggerKind = $bindable(), resultError = $bindable(), jobKindsCat = $bindable(), user = $bindable(null), folder = $bindable(null), mobile = false, schedulePath = $bindable(), allowWildcards = $bindable(false), paths = [], usernames = [], folders = [], allWorkspaces = $bindable(false), filterBy = $bindable('path'), small = false, calendarSmall = false } = $props();
-let copyArgFilter = $state(argFilter);
-let copyResultFilter = $state(resultFilter);
+import { Debounced, watch } from 'runed';
+import z from 'zod';
+let { path = $bindable(), label = $bindable(), concurrencyKey = $bindable(), worker = $bindable(), tag = $bindable(), success = $bindable(), showSkipped = $bindable(), argFilter = $bindable(), argError = $bindable(), resultFilter = $bindable(), jobTriggerKind = $bindable(), resultError = $bindable(), jobKindsCat = $bindable(), user = $bindable(), folder = $bindable(), mobile = false, schedulePath = $bindable(), allowWildcards = $bindable(), paths = [], usernames = [], folders = [], allWorkspaces = $bindable(), filterBy = $bindable(), small = false, calendarSmall = false } = $props();
 const dispatch = createEventDispatcher();
 function autosetFilter() {
-    if (path !== null && path !== '' && filterBy !== 'path') {
+    if (path && filterBy !== 'path') {
         filterBy = 'path';
     }
-    else if (user !== null && user !== '' && filterBy !== 'user') {
+    else if (user && filterBy !== 'user') {
         filterBy = 'user';
     }
-    else if (folder !== null && folder !== '' && filterBy !== 'folder') {
+    else if (folder && filterBy !== 'folder') {
         filterBy = 'folder';
     }
-    else if (label !== null && label !== '' && filterBy !== 'label') {
+    else if (label && filterBy !== 'label') {
         filterBy = 'label';
     }
-    else if (concurrencyKey !== null && concurrencyKey !== '' && filterBy !== 'concurrencyKey') {
+    else if (concurrencyKey && filterBy !== 'concurrencyKey') {
         filterBy = 'concurrencyKey';
     }
-    else if (tag !== null && tag !== '' && filterBy !== 'tag') {
+    else if (tag && filterBy !== 'tag') {
         filterBy = 'tag';
     }
-    else if (schedulePath !== undefined && schedulePath !== '' && filterBy !== 'schedulePath') {
+    else if (schedulePath && filterBy !== 'schedulePath') {
         filterBy = 'schedulePath';
     }
-    else if (worker !== null && worker !== '' && filterBy !== 'worker') {
+    else if (worker && filterBy !== 'worker') {
         filterBy = 'worker';
     }
 }
-let labelTimeout = $state(undefined);
+let labelTimeout = $state();
 let concurrencyKeyTimeout = $state(undefined);
 let tagTimeout = $state(undefined);
 let workerTimeout = $state(undefined);
@@ -55,12 +87,18 @@ let allWorkspacesValue = $state(allWorkspaces ? 'all' : 'admins');
 let displayedLabel = $derived(label);
 let displayedConcurrencyKey = $derived(concurrencyKey);
 let displayedTag = $derived(tag);
-let displayedSchedule = $derived(schedulePath);
+let displayedSchedule = $derived(schedulePath ?? undefined);
 let displayedWorker = $derived(worker);
-$effect(() => {
-    ;
-    (path || user || folder || label || worker || concurrencyKey || tag || schedulePath) &&
-        untrack(() => autosetFilter());
+watch([() => [path, user, folder, label, worker, concurrencyKey, tag, schedulePath]], () => {
+    autosetFilter();
+});
+let [copyArgFilter, copyResultFilter] = $state([argFilter, resultFilter]);
+let debouncedArgAndResultFilters = new Debounced(() => [copyArgFilter, copyResultFilter], 500);
+watch(() => debouncedArgAndResultFilters.current, () => {
+    if (!argError)
+        argFilter = copyArgFilter || '';
+    if (!resultError)
+        resultFilter = copyResultFilter || '';
 });
 function resetFilter() {
     path = null;
@@ -69,7 +107,7 @@ function resetFilter() {
     label = null;
     concurrencyKey = null;
     tag = null;
-    schedulePath = undefined;
+    schedulePath = null;
     worker = null;
 }
 </script>
@@ -342,7 +380,7 @@ function resetFilter() {
 							<button
 								class="absolute top-2 right-2 z-50"
 								onclick={() => {
-									schedulePath = undefined
+									schedulePath = null
 									dispatch('reset')
 								}}
 							>
@@ -361,7 +399,7 @@ function resetFilter() {
 									}
 
 									tagTimeout = setTimeout(() => {
-										schedulePath = displayedSchedule
+										schedulePath = displayedSchedule ?? null
 									}, 1000)
 								},
 								id: 'schedulePath'
@@ -515,7 +553,7 @@ function resetFilter() {
 		<ToggleButtonGroup
 			selected={success ?? 'all'}
 			on:selected={({ detail }) => {
-				success = detail === 'all' ? undefined : detail
+				success = detail === 'all' ? null : detail
 				dispatch('successChange', success)
 			}}
 			id="status"
@@ -622,7 +660,7 @@ function resetFilter() {
 										label = null
 										concurrencyKey = null
 										tag = null
-										schedulePath = undefined
+										schedulePath = null
 									}
 								}}
 							>
@@ -859,7 +897,7 @@ function resetFilter() {
 						<Label label="Status">
 							<ToggleButtonGroup
 								selected={success ?? 'all'}
-								on:selected={({ detail }) => (success = detail === 'all' ? undefined : detail)}
+								on:selected={({ detail }) => (success = detail === 'all' ? null : detail)}
 							>
 								{#snippet children({ item })}
 									<ToggleButton value={'all'} label="All" {item} />
@@ -904,49 +942,23 @@ function resetFilter() {
 								label: triggerDisplayNamesMap[value],
 								value
 							}))}
-							bind:value={jobTriggerKind}
+							bind:value={() => jobTriggerKind ?? undefined, (v) => (jobTriggerKind = v ?? null)}
 							clearable
 						/>
 					</Label>
 
-					<div class="flex flex-col gap-6">
-						<Label label="Filter by args">
-							<span class="text-2xs text-secondary">
-								{`Filter by a json being a subset of the args/result. Try '\{"foo": "bar"\}'`}
-							</span>
-							<JsonEditor bind:error={argError} bind:code={copyArgFilter} />
-						</Label>
-						<Label label="Filter by result">
-							<span class="text-2xs text-secondary">
-								{`Filter by a json being a subset of the args/result. Try '\{"foo": "bar"\}'`}
-							</span>
-							<JsonEditor bind:error={resultError} bind:code={copyResultFilter} />
-						</Label>
-					</div>
-
-					<div class="flex flex-row gap-2 justify-between">
-						<Button
-							unifiedSize="md"
-							variant="default"
-							on:click={() => {
-								argFilter = ''
-								resultFilter = ''
-							}}
-						>
-							Clear
-						</Button>
-
-						<Button
-							unifiedSize="md"
-							variant="accent"
-							on:click={() => {
-								argFilter = copyArgFilter
-								resultFilter = copyResultFilter
-							}}
-						>
-							Set args/result filter
-						</Button>
-					</div>
+					<Label label="Filter by args">
+						<span class="text-2xs text-secondary">
+							{`Filter by a json being a subset of the args/result. Try '\{"foo": "bar"\}'`}
+						</span>
+						<JsonEditor bind:error={argError} bind:code={copyArgFilter} />
+					</Label>
+					<Label label="Filter by result">
+						<span class="text-2xs text-secondary">
+							{`Filter by a json being a subset of the args/result. Try '\{"foo": "bar"\}'`}
+						</span>
+						<JsonEditor bind:error={resultError} bind:code={copyResultFilter} />
+					</Label>
 				</div>
 			</Section>
 		{/snippet}

package/package/components/runs/RunsFilter.svelte.d.ts

@@ -1,22 +1,53 @@
+export declare const runsFiltersSchema: z.ZodObject<{
+    path: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    worker: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    user: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    folder: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    label: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    concurrency_key: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    tag: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    allow_wildcards: z.ZodDefault<z.ZodBoolean>;
+    show_future_jobs: z.ZodDefault<z.ZodBoolean>;
+    success: z.ZodDefault<z.ZodNullable<z.ZodEnum<{
+        failure: "failure";
+        running: "running";
+        success: "success";
+        suspended: "suspended";
+        waiting: "waiting";
+    }>>>;
+    show_skipped: z.ZodDefault<z.ZodBoolean>;
+    show_schedules: z.ZodDefault<z.ZodBoolean>;
+    min_ts: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    max_ts: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    schedule_path: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    job_kinds: z.ZodDefault<z.ZodString>;
+    all_workspaces: z.ZodDefault<z.ZodBoolean>;
+    arg: z.ZodDefault<z.ZodString>;
+    result: z.ZodDefault<z.ZodString>;
+    job_trigger_kind: z.ZodDefault<z.ZodNullable<z.ZodPipe<z.ZodString, z.ZodTransform<"schedule" | "email" | "webhook" | "http" | "websocket" | "kafka" | "nats" | "postgres" | "sqs" | "gcp" | "default_email" | "mqtt", string>>>>;
+    per_page: z.ZodDefault<z.ZodNumber>;
+}, z.core.$strip>;
+export type RunsFilters = z.infer<typeof runsFiltersSchema>;
 import type { JobTriggerKind } from '../../gen';
+import z from 'zod';
 interface Props {
     path?: string | null;
     label?: string | null;
     concurrencyKey?: string | null;
     worker?: string | null;
     tag?: string | null;
-    success?: 'running' | 'waiting' | 'suspended' | 'queued' | 'success' | 'failure' | undefined;
+    success?: 'running' | 'waiting' | 'suspended' | 'queued' | 'success' | 'failure' | null;
     showSkipped?: boolean | undefined;
     argFilter: string;
     argError: string;
     resultFilter: string;
-    jobTriggerKind: JobTriggerKind | undefined;
+    jobTriggerKind: JobTriggerKind | null;
     resultError: string;
     jobKindsCat: string;
     user?: string | null;
     folder?: string | null;
     mobile?: boolean;
-    schedulePath: string | undefined;
+    schedulePath: string | null;
     allowWildcards?: boolean;
     paths?: string[];
     usernames?: string[];
@@ -44,6 +75,6 @@ declare const RunsFilter: $$__sveltets_2_IsomorphicComponent<Props, {
     successChange: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
-}, {}, {}, "path" | "user" | "folder" | "tag" | "success" | "worker" | "label" | "showSkipped" | "argFilter" | "resultFilter" | "jobTriggerKind" | "schedulePath" | "jobKindsCat" | "concurrencyKey" | "argError" | "resultError" | "allWorkspaces" | "allowWildcards" | "filterBy">;
+}, {}, {}, "path" | "user" | "folder" | "tag" | "success" | "worker" | "label" | "concurrencyKey" | "schedulePath" | "showSkipped" | "argFilter" | "argError" | "resultFilter" | "jobTriggerKind" | "resultError" | "jobKindsCat" | "allowWildcards" | "allWorkspaces" | "filterBy">;
 type RunsFilter = InstanceType<typeof RunsFilter>;
 export default RunsFilter;

package/package/components/runs/RunsQueue.svelte.d.ts

@@ -2,7 +2,7 @@ import type { Tweened } from 'svelte/motion';
 interface Props {
     queue_count?: Tweened<number> | undefined;
     suspended_count?: Tweened<number> | undefined;
-    success: string | undefined;
+    success: string | null;
     small?: boolean;
     onJobsWaiting?: () => void;
     onJobsSuspended?: () => void;

package/package/components/runs/RunsTable.svelte

@@ -6,7 +6,7 @@ import { AlertTriangle } from 'lucide-svelte';
 import Popover from '../Popover.svelte';
 import { workspaceStore } from '../../stores';
 import './runs-grid.css';
-let { jobs = undefined, externalJobs = [], omittedObscuredJobs, showExternalJobs = false, selectionMode = false, selectedIds = $bindable([]), selectedWorkspace = $bindable(undefined), activeLabel = null, lastFetchWentToEnd = $bindable(false), perPage = 1000 } = $props();
+let { jobs = undefined, externalJobs = [], omittedObscuredJobs, showExternalJobs = false, selectionMode = false, selectedIds = $bindable([]), selectedWorkspace = $bindable(undefined), activeLabel = null, lastFetchWentToEnd = false, perPage = 1000 } = $props();
 function getTime(job) {
     return job['completed_at'] ?? job['started_at'] ?? job['scheduled_for'] ?? job['created_at'];
 }

package/package/components/runs/RunsTable.svelte.d.ts

@@ -40,6 +40,6 @@ declare const RunsTable: $$__sveltets_2_IsomorphicComponent<Props, {
     [evt: string]: CustomEvent<any>;
 }, {}, {
     scrollToRun: (ids: string[]) => void;
-}, "selectedIds" | "lastFetchWentToEnd" | "selectedWorkspace">;
+}, "selectedIds" | "selectedWorkspace">;
 type RunsTable = InstanceType<typeof RunsTable>;
 export default RunsTable;

package/package/components/runs/useJobsLoader.svelte.d.ts

@@ -0,0 +1,34 @@
+import { type Job, type CompletedJob, type ExtendedJobs } from '../../gen';
+import { type Tweened } from 'svelte/motion';
+import type { RunsFilters } from './RunsFilter.svelte';
+export declare function computeJobKinds(jobKindsCat: string | null): string;
+export interface UseJobLoaderArgs {
+    currentWorkspace: string;
+    filters?: Partial<RunsFilters>;
+    jobKinds?: string;
+    autoRefresh?: boolean;
+    argError?: string;
+    resultError?: string;
+    refreshRate?: number;
+    syncQueuedRunsCount?: boolean;
+    skip?: boolean;
+    computeMinAndMax?: (() => {
+        minTs: string;
+        maxTs: string | null;
+    } | undefined) | undefined;
+    lookback?: number;
+    onSetMinMaxTs?: (minTs: string | null, maxTs: string | null) => void;
+    onSetPerPage?: (perPage: number) => void;
+}
+export declare function useJobsLoader(args: () => UseJobLoaderArgs): {
+    loadExtraJobs: () => Promise<void>;
+    loadJobs: (reset: boolean, shouldGetCount?: boolean) => Promise<void>;
+    readonly queue_count: Tweened<number> | undefined;
+    readonly suspended_count: Tweened<number> | undefined;
+    readonly loading: boolean;
+    readonly completedJobs: CompletedJob[] | undefined;
+    readonly externalJobs: Job[] | undefined;
+    readonly extendedJobs: ExtendedJobs | undefined;
+    readonly jobs: Job[] | undefined;
+    readonly lastFetchWentToEnd: boolean;
+};