windmill-components 1.60.3 → 1.83.1

package/components/SuperadminSettings.svelte.d.ts

@@ -3,6 +3,7 @@ declare const __propDef: {
     props: {
         openDrawer?: (() => void) | undefined;
         toggleDrawer?: (() => void) | undefined;
+        closeDrawer?: (() => void) | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;
@@ -15,5 +16,6 @@ export type SuperadminSettingsSlots = typeof __propDef.slots;
 export default class SuperadminSettings extends SvelteComponentTyped<SuperadminSettingsProps, SuperadminSettingsEvents, SuperadminSettingsSlots> {
     get openDrawer(): () => void;
     get toggleDrawer(): () => void;
+    get closeDrawer(): () => void;
 }
 export {};

package/components/TemplateEditor.svelte

@@ -495,9 +495,11 @@ async function loadMonaco() {
     });
     editor.onDidBlurEditorText(() => {
         code = getCode();
-        dispatch('blur');
     });
 }
+export function focus() {
+    editor?.focus();
+}
 onMount(() => {
     if (browser) {
         loadMonaco();
@@ -517,7 +519,7 @@ onDestroy(() => {
 <div
 	bind:this={divEl}
 	style="height: 18px;"
-	class="{$$props.class} template rounded-lg min-h-4 mx-0.5"
+	class="{$$props.class ?? ''} template rounded-lg min-h-4 mx-0.5 overflow-clip"
 	bind:clientWidth={width}
 />
 

package/components/TemplateEditor.svelte.d.ts

@@ -1 +1,206 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        [x: string]: any;
+        conf?: {
+            wordPattern: RegExp;
+            comments: {
+                lineComment: string;
+                blockComment: [string, string];
+            };
+            brackets: [string, string][];
+            onEnterRules: never[];
+            autoClosingPairs: ({
+                open: string;
+                close: string;
+                notIn?: undefined;
+            } | {
+                open: string;
+                close: string;
+                notIn: string[];
+            })[];
+            folding: {
+                markers: {
+                    start: RegExp;
+                    end: RegExp;
+                };
+            };
+        } | undefined;
+        language?: {
+            defaultToken: string;
+            tokenPostfix: string;
+            keywords: string[];
+            operators: string[];
+            symbols: RegExp;
+            escapes: RegExp;
+            digits: RegExp;
+            octaldigits: RegExp;
+            binarydigits: RegExp;
+            hexdigits: RegExp;
+            regexpctl: RegExp;
+            regexpesc: RegExp;
+            tokenizer: {
+                root: ((string | RegExp)[] | (RegExp | {
+                    token: string;
+                    next: string;
+                })[])[];
+                common: ((string | RegExp)[] | (RegExp | {
+                    cases: {
+                        '@keywords': string;
+                        '@default': string;
+                    };
+                })[] | {
+                    include: string;
+                } | (RegExp | {
+                    token: string;
+                    bracket: string;
+                    next: string;
+                })[] | (RegExp | {
+                    cases: {
+                        '@operators': string;
+                        '@default': string;
+                    };
+                })[])[];
+                whitespace: (string | RegExp)[][];
+                comment: (string | RegExp)[][];
+                jsdoc: (string | RegExp)[][];
+                regexp: ((string | RegExp)[] | (RegExp | (string | {
+                    token: string;
+                    next: string;
+                })[])[] | (RegExp | (string | {
+                    token: string;
+                    bracket: string;
+                    next: string;
+                })[])[])[];
+                regexrange: ((string | RegExp)[] | (RegExp | {
+                    token: string;
+                    next: string;
+                    bracket: string;
+                })[])[];
+                string_double: (string | RegExp)[][];
+                string_single: (string | RegExp)[][];
+                string_backtick: ((string | RegExp)[] | (RegExp | {
+                    token: string;
+                    next: string;
+                })[])[];
+                bracketCounting: ((string | RegExp)[] | {
+                    include: string;
+                })[];
+            };
+        } | undefined;
+        code?: string | undefined;
+        hash?: string | undefined;
+        automaticLayout?: boolean | undefined;
+        extraLib?: string | undefined;
+        autoHeight?: boolean | undefined;
+        fixedOverflowWidgets?: boolean | undefined;
+        fontSize?: number | undefined;
+        insertAtCursor?: ((code: string) => void) | undefined;
+        setCode?: ((ncode: string) => void) | undefined;
+        getCode?: (() => string) | undefined;
+        focus?: (() => void) | undefined;
+    };
+    events: {
+        change: CustomEvent<any>;
+        focus: CustomEvent<any>;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type TemplateEditorProps = typeof __propDef.props;
+export type TemplateEditorEvents = typeof __propDef.events;
+export type TemplateEditorSlots = typeof __propDef.slots;
+export default class TemplateEditor extends SvelteComponentTyped<TemplateEditorProps, TemplateEditorEvents, TemplateEditorSlots> {
+    get conf(): {
+        wordPattern: RegExp;
+        comments: {
+            lineComment: string;
+            blockComment: [string, string];
+        };
+        brackets: [string, string][];
+        onEnterRules: never[];
+        autoClosingPairs: ({
+            open: string;
+            close: string;
+            notIn?: undefined;
+        } | {
+            open: string;
+            close: string;
+            notIn: string[];
+        })[];
+        folding: {
+            markers: {
+                start: RegExp;
+                end: RegExp;
+            };
+        };
+    };
+    get language(): {
+        defaultToken: string;
+        tokenPostfix: string;
+        keywords: string[];
+        operators: string[];
+        symbols: RegExp;
+        escapes: RegExp;
+        digits: RegExp;
+        octaldigits: RegExp;
+        binarydigits: RegExp;
+        hexdigits: RegExp;
+        regexpctl: RegExp;
+        regexpesc: RegExp;
+        tokenizer: {
+            root: ((string | RegExp)[] | (RegExp | {
+                token: string;
+                next: string;
+            })[])[];
+            common: ((string | RegExp)[] | (RegExp | {
+                cases: {
+                    '@keywords': string;
+                    '@default': string;
+                };
+            })[] | {
+                include: string;
+            } | (RegExp | {
+                token: string;
+                bracket: string;
+                next: string;
+            })[] | (RegExp | {
+                cases: {
+                    '@operators': string;
+                    '@default': string;
+                };
+            })[])[];
+            whitespace: (string | RegExp)[][];
+            comment: (string | RegExp)[][];
+            jsdoc: (string | RegExp)[][];
+            regexp: ((string | RegExp)[] | (RegExp | (string | {
+                token: string;
+                next: string;
+            })[])[] | (RegExp | (string | {
+                token: string;
+                bracket: string;
+                next: string;
+            })[])[])[];
+            regexrange: ((string | RegExp)[] | (RegExp | {
+                token: string;
+                next: string;
+                bracket: string;
+            })[])[];
+            string_double: (string | RegExp)[][];
+            string_single: (string | RegExp)[][];
+            string_backtick: ((string | RegExp)[] | (RegExp | {
+                token: string;
+                next: string;
+            })[])[];
+            bracketCounting: ((string | RegExp)[] | {
+                include: string;
+            })[];
+        };
+    };
+    get insertAtCursor(): (code: string) => void;
+    get setCode(): (ncode: string) => void;
+    get getCode(): () => string;
+    get focus(): () => void;
+}
 export {};

package/components/TestJobLoader.svelte

@@ -80,11 +80,9 @@ export async function cancelJob() {
             console.error(err);
         }
     }
-    console.debug('cancelled');
 }
 export async function clearCurrentJob() {
     if (currentId) {
-        console.debug('clear');
         job = undefined;
         await cancelJob();
     }
@@ -115,6 +113,9 @@ async function loadTestJob(id) {
                 if (previewJobUpdates.new_logs) {
                     job.logs = (job?.logs ?? '').concat(previewJobUpdates.new_logs);
                 }
+                if (previewJobUpdates.mem_peak) {
+                    job.mem_peak = previewJobUpdates.mem_peak;
+                }
                 if ((previewJobUpdates.running ?? false) || (previewJobUpdates.completed ?? false)) {
                     job = await JobService.getJob({ workspace: workspace, id });
                 }
@@ -148,16 +149,15 @@ async function loadTestJob(id) {
 }
 async function syncer(id) {
     if (currentId != id) {
-        console.debug('stop');
         return;
     }
     syncIteration++;
     await loadTestJob(id);
     let nextIteration = 50;
-    if (syncIteration == ITERATIONS_BEFORE_SLOW_REFRESH) {
+    if (syncIteration > ITERATIONS_BEFORE_SLOW_REFRESH) {
         nextIteration = 500;
     }
-    else if (syncIteration == ITERATIONS_BEFORE_SUPER_SLOW_REFRESH) {
+    else if (syncIteration > ITERATIONS_BEFORE_SUPER_SLOW_REFRESH) {
         nextIteration = 2000;
     }
     setTimeout(() => syncer(id), nextIteration);

package/components/Toggle.svelte

@@ -1,8 +1,11 @@
-<script>import { classNames } from '../utils';
-import { createEventDispatcher } from 'svelte';
+<script>import { createEventDispatcher } from 'svelte';
+import { twMerge } from 'tailwind-merge';
 export let options = {};
 export let checked = false;
 export let disabled = false;
+export let textClass = '';
+export let textStyle = '';
+export let color = 'blue';
 export let size = 'sm';
 const id = (Math.random() + 1).toString(36).substring(10);
 const dispatch = createEventDispatcher();
@@ -17,13 +20,19 @@ const dispatch = createEventDispatcher();
 	>
 		{#if Boolean(options?.left)}
 			<span
-				class="mr-2 text-sm font-medium duration-200 {disabled ? 'text-gray-600' : 'text-gray-900'}"
+				class={twMerge(
+					'mr-2 font-medium duration-200',
+					disabled ? 'text-gray-500' : 'text-gray-900',
+					size === 'xs' ? 'text-xs' : 'text-sm',
+					textClass
+				)}
+				style={textStyle}
 			>
 				{options?.left}
 			</span>
 		{/if}
 		<!-- svelte-ignore a11y-click-events-have-key-events -->
-		<div class="relative" on:pointerdown on:click|stopPropagation>
+		<div class="relative" on:click|stopPropagation>
 			<input
 				on:focus
 				on:click
@@ -41,14 +50,20 @@ const dispatch = createEventDispatcher();
 				class="w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 
 				peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] 
 				after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 
-				after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-blue-600"
+				after:border after:rounded-full after:h-5 after:w-5 after:transition-all {color == 'red'
+					? 'peer-checked:bg-red-600'
+					: 'peer-checked:bg-blue-600'}"
 			/>
 		</div>
 		{#if Boolean(options?.right)}
 			<span
-				class="ml-2 text-sm font-medium duration-200
-				{disabled ? 'text-gray-500' : 'text-gray-900'} 
-				{size === 'xs' ? 'text-xs' : 'text-sm'}"
+				class={twMerge(
+					'ml-2 font-medium duration-200',
+					disabled ? 'text-gray-500' : 'text-gray-900',
+					size === 'xs' ? 'text-xs' : 'text-sm',
+					textClass
+				)}
+				style={textStyle}
 			>
 				{options?.right}
 			</span>

package/components/Toggle.svelte.d.ts

@@ -8,10 +8,12 @@ declare const __propDef: {
         } | undefined;
         checked?: boolean | undefined;
         disabled?: boolean | undefined;
+        textClass?: string | undefined;
+        textStyle?: string | undefined;
+        color?: "blue" | "red" | undefined;
         size?: "xs" | "sm" | undefined;
     };
     events: {
-        pointerdown: PointerEvent;
         click: MouseEvent;
         focus: FocusEvent;
         change: CustomEvent<any>;

package/components/Tooltip.svelte

@@ -10,10 +10,12 @@ export let placement = undefined;
 <Popover notClickable {placement} class={wrapperClass}>
 	<Icon
 		class="{light
-			? 'text-gray-300'
+			? 'text-gray-400'
 			: ' text-gray-500'} font-thin inline-block align-middle w-4 {$$props.class}"
 		data={faInfoCircle}
 		{scale}
 	/>
-	<span slot="text"> <slot /> </span>
+	<svelte:fragment slot="text">
+		<slot />
+	</svelte:fragment>
 </Popover>

package/components/UserSettings.svelte

@@ -1,6 +1,6 @@
 <script>import { usersWorkspaceStore } from '../stores';
 import { UserService, SettingsService } from '../gen';
-import { displayDate, sendUserToast, getToday, copyToClipboard, truncate } from '../utils';
+import { displayDate, sendUserToast, copyToClipboard } from '../utils';
 import { faClipboard, faPlus } from '@fortawesome/free-solid-svg-icons';
 import TableCustom from './TableCustom.svelte';
 import { Button } from './common';
@@ -16,6 +16,8 @@ let displayCreateToken = false;
 let login_type = 'none';
 import Drawer from './common/drawer/Drawer.svelte';
 import DrawerContent from './common/drawer/DrawerContent.svelte';
+import { page } from '$app/stores';
+import { goto } from '$app/navigation';
 let drawer;
 export function openDrawer() {
     loadVersion();
@@ -26,6 +28,14 @@ export function openDrawer() {
 export function toggleDrawer() {
     drawer?.toggleDrawer();
 }
+export function closeDrawer() {
+    drawer?.closeDrawer();
+    const index = $page.url.href.lastIndexOf('#');
+    if (index === -1)
+        return;
+    const hashRemoved = $page.url.href.slice(0, index);
+    goto(hashRemoved);
+}
 async function setPassword() {
     if (newPassword) {
         await UserService.setPassword({
@@ -47,12 +57,13 @@ async function loadLoginType() {
 }
 async function createToken() {
     newToken = undefined;
-    let expirationISO;
+    let date;
     if (newTokenExpiration) {
-        expirationISO = new Date(newTokenExpiration);
+        date = new Date();
+        date.setDate(date.getDate() + newTokenExpiration);
     }
     newToken = await UserService.createToken({
-        requestBody: { label: newTokenLabel, expiration: expirationISO?.toISOString() }
+        requestBody: { label: newTokenLabel, expiration: date?.toISOString() }
     });
     listTokens();
     displayCreateToken = false;
@@ -68,14 +79,14 @@ async function deleteToken(tokenPrefix) {
 </script>
 
 <Drawer bind:this={drawer} size="800px">
-	<DrawerContent title="User Settings" on:close={drawer.toggleDrawer}>
+	<DrawerContent title="User Settings" on:close={closeDrawer}>
 		<div class="flex flex-col h-full">
 			<div>
 				<div class="text-xs pt-1 pb-2 text-gray-500 ">
 					Windmill {version}
 				</div>
 
-				<h2 class="border-b">User info</h2>
+				<h2 class="border-b mt-4">User info</h2>
 				<div class="">
 					{#if passwordError}
 						<div class="text-red-600 text-2xs grow">{passwordError}</div>
@@ -149,10 +160,10 @@ async function deleteToken(tokenPrefix) {
 					>
 						<div>
 							Added token: <button on:click={() => copyToClipboard(newToken ?? '')} class="inline"
-								>{truncate(newToken ?? '', 10, '****')} <Icon data={faClipboard} />
+								>{newToken} <Icon data={faClipboard} />
 							</button>
 						</div>
-						<div class="pt-1 text-xs text-right">
+						<div class="pt-1 text-xs ml-2">
 							Make sure to copy your personal access token now. You won’t be able to see it again!
 						</div>
 					</div>
@@ -173,29 +184,17 @@ async function deleteToken(tokenPrefix) {
 							</div>
 							<div class="flex flex-col ">
 								<label for="expires"
-									>Expires on <span class="text-xs text-gray-500">(optional)</span>
+									>Expires In<span class="text-xs text-gray-500">(optional)</span>
 								</label>
-								<input
-									class="block md:w-1/2"
-									type="date"
-									id="expires"
-									name="expiration-date"
-									bind:value={newTokenExpiration}
-									min={getToday().getFullYear() +
-										'/' +
-										getToday().getMonth() +
-										'/' +
-										getToday().getDate()}
-									max={getToday().getFullYear() +
-										1 +
-										'/' +
-										getToday().getMonth() +
-										'/' +
-										getToday().getDate()}
-								/>
+								<select bind:value={newTokenExpiration}>
+									<option value={undefined}>No expiration</option>
+									<option value={7}>7d</option>
+									<option value={30}>30d</option>
+									<option value={90}>90d</option>
+								</select>
 							</div>
 							<div class="flex items-end">
-								<Button btnClasses="!mt-2" on:click={createToken}>Submit</Button>
+								<Button btnClasses="!mt-2" on:click={createToken}>New Token</Button>
 							</div>
 						</div>
 					</div>

package/components/UserSettings.svelte.d.ts

@@ -3,6 +3,7 @@ declare const __propDef: {
     props: {
         openDrawer?: (() => void) | undefined;
         toggleDrawer?: (() => void) | undefined;
+        closeDrawer?: (() => void) | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;
@@ -15,5 +16,6 @@ export type UserSettingsSlots = typeof __propDef.slots;
 export default class UserSettings extends SvelteComponentTyped<UserSettingsProps, UserSettingsEvents, UserSettingsSlots> {
     get openDrawer(): () => void;
     get toggleDrawer(): () => void;
+    get closeDrawer(): () => void;
 }
 export {};

package/components/VariableEditor.svelte

@@ -46,7 +46,8 @@ export async function editVariable(edit_path) {
         decryptSecret: false
     });
     can_write =
-        getV.workspace_id == $workspaceStore && canWrite(path, getV.extra_perms ?? {}, $userStore);
+        getV.workspace_id == $workspaceStore &&
+            canWrite(edit_path, getV.extra_perms ?? {}, $userStore);
     variable = {
         value: getV.value ?? '',
         is_secret: getV.is_secret,
@@ -131,7 +132,7 @@ let editor = undefined;
 						bind:error={pathError}
 						bind:path
 						{initialPath}
-						namePlaceholder="my_variable"
+						namePlaceholder="variable"
 						kind="variable"
 					/>
 				</div>

package/components/WhitelistIp.svelte

@@ -0,0 +1,21 @@
+<script>import { WorkerService } from '../gen';
+import { Alert } from './common';
+let ips = undefined;
+WorkerService.listWorkers({}).then((workers) => {
+    ips = [
+        ...new Set(workers
+            .filter((worker) => {
+            return worker.ip != 'unretrievable IP' && worker.last_ping && worker.last_ping < 300;
+        })
+            .map((worker) => worker.ip))
+    ];
+});
+</script>
+
+{#if ips}
+	<div class="mt-2" />
+	<Alert size="xs" type="info" title="IPs to whitelist">
+		<span class="text-gray-600">If necessary, the workers IPs to whitelist are:</span>
+		{ips.join(', ')}
+	</Alert>
+{/if}

package/components/WhitelistIp.svelte.d.ts

@@ -0,0 +1,14 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: Record<string, never>;
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type WhitelistIpProps = typeof __propDef.props;
+export type WhitelistIpEvents = typeof __propDef.events;
+export type WhitelistIpSlots = typeof __propDef.slots;
+export default class WhitelistIp extends SvelteComponentTyped<WhitelistIpProps, WhitelistIpEvents, WhitelistIpSlots> {
+}
+export {};