windmill-components 1.60.3 → 1.70.0

package/components/SuperadminSettings.svelte

@@ -2,10 +2,11 @@
 import TableCustom from './TableCustom.svelte';
 import PageHeader from './PageHeader.svelte';
 import InviteGlobalUser from './InviteGlobalUser.svelte';
-import { Alert, Badge, Drawer, DrawerContent } from './common';
-import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte';
+import { Badge, Drawer, DrawerContent } from './common';
 import { sendUserToast } from '../utils';
 import SearchItems from './SearchItems.svelte';
+import { page } from '$app/stores';
+import { goto } from '$app/navigation';
 let drawer;
 let filter = '';
 export function openDrawer() {
@@ -16,6 +17,13 @@ export function openDrawer() {
 export function toggleDrawer() {
     drawer?.toggleDrawer?.();
 }
+export function closeDrawer() {
+    drawer?.closeDrawer();
+    const index = $page.url.href.lastIndexOf('#');
+    const href = $page.url.href;
+    const hashRemoved = index === -1 ? href : href.slice(0, index);
+    goto(hashRemoved);
+}
 let version;
 let users = [];
 let filteredUsers = [];
@@ -35,7 +43,7 @@ async function listUsers() {
 />
 
 <Drawer bind:this={drawer} on:open={listUsers} size="900px">
-	<DrawerContent overflow_y={false} title="Superadmin Settings" on:close={drawer.closeDrawer}>
+	<DrawerContent overflow_y={false} title="Superadmin Settings" on:close={closeDrawer}>
 		<div class="flex flex-col h-full">
 			<div>
 				<div class="text-xs pt-1 text-gray-500 ">

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.d.ts

@@ -1 +1,205 @@
+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;
+    };
+    events: {
+        change: CustomEvent<any>;
+        focus: CustomEvent<any>;
+        blur: 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;
+}
 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,7 +149,6 @@ async function loadTestJob(id) {
 }
 async function syncer(id) {
     if (currentId != id) {
-        console.debug('stop');
         return;
     }
     syncIteration++;

package/components/Toggle.svelte

@@ -1,5 +1,4 @@
-<script>import { classNames } from '../utils';
-import { createEventDispatcher } from 'svelte';
+<script>import { createEventDispatcher } from 'svelte';
 export let options = {};
 export let checked = false;
 export let disabled = false;

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,12 @@ export function openDrawer() {
 export function toggleDrawer() {
     drawer?.toggleDrawer();
 }
+export function closeDrawer() {
+    drawer?.closeDrawer();
+    const index = $page.url.href.lastIndexOf('#');
+    const hashRemoved = $page.url.href.slice(0, index);
+    goto(hashRemoved);
+}
 async function setPassword() {
     if (newPassword) {
         await UserService.setPassword({
@@ -47,12 +55,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 +77,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 +158,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 +182,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

@@ -131,7 +131,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,23 @@
+<script>import { WorkerService } from '../gen';
+import { Alert } from './common';
+let ips = undefined;
+WorkerService.listWorkers({}).then((workers) => {
+    ips = [
+        ...new Set(workers
+            .filter((worker) => {
+            const date = new Date().getTime() - 300 * 60;
+            const ping_at = new Date(worker.ping_at).getTime();
+            return worker.ip != 'unretrievable IP' && ping_at > date;
+        })
+            .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 {};

package/components/apps/components/buttons/AppButton.svelte

@@ -1,9 +1,10 @@
 <script>import { Button } from '../../../common';
-import { Loader2 } from 'lucide-svelte';
 import { getContext } from 'svelte';
 import AlignWrapper from '../helpers/AlignWrapper.svelte';
 import InputValue from '../helpers/InputValue.svelte';
 import RunnableWrapper from '../helpers/RunnableWrapper.svelte';
+import { loadIcon } from '../icon';
+import { twMerge } from 'tailwind-merge';
 export let id;
 export let componentInput;
 export let configuration;
@@ -12,16 +13,38 @@ export let extraQueryParams = {};
 export let horizontalAlignment = undefined;
 export let verticalAlignment = undefined;
 export let noWFull = false;
+export let preclickAction = undefined;
+export let customCss = undefined;
 export const staticOutputs = ['loading', 'result'];
-const { runnableComponents, worldStore } = getContext('AppEditorContext');
+const { runnableComponents, worldStore, app } = getContext('AppEditorContext');
 let labelValue;
 let color;
 let size;
 let runnableComponent;
 let disabled = undefined;
+let fillContainer = undefined;
+let goto = undefined;
 let isLoading = false;
 let ownClick = false;
+let triggerOnAppLoad = false;
+let beforeIcon = undefined;
+let afterIcon = undefined;
+let beforeIconComponent;
+let afterIconComponent;
+$: beforeIcon && handleBeforeIcon();
+$: afterIcon && handleAfterIcon();
+async function handleBeforeIcon() {
+    if (beforeIcon) {
+        beforeIconComponent = await loadIcon(beforeIcon);
+    }
+}
+async function handleAfterIcon() {
+    if (afterIcon) {
+        afterIconComponent = await loadIcon(afterIcon);
+    }
+}
 $: outputs = $worldStore?.outputsById[id];
+$: triggerOnAppLoad && runnableComponent?.runComponent();
 $: if (outputs?.loading != undefined) {
     outputs.loading.set(false, true);
 }
@@ -41,15 +64,20 @@ $: errorsMessage = Object.values(errors)
 </script>
 
 <InputValue {id} input={configuration.label} bind:value={labelValue} />
+<InputValue {id} input={configuration.goto} bind:value={goto} />
 <InputValue {id} input={configuration.color} bind:value={color} />
 <InputValue {id} input={configuration.size} bind:value={size} />
+<InputValue {id} input={configuration.beforeIcon} bind:value={beforeIcon} />
+<InputValue {id} input={configuration.afterIcon} bind:value={afterIcon} />
+<InputValue {id} input={configuration.triggerOnAppLoad} bind:value={triggerOnAppLoad} />
+
 <InputValue
-	row={extraQueryParams['row']}
 	{id}
 	input={configuration.disabled}
 	bind:value={disabled}
 	bind:error={errors.disabled}
 />
+<InputValue {id} input={configuration.fillContainer} bind:value={fillContainer} />
 
 <RunnableWrapper
 	flexWrap
@@ -58,22 +86,32 @@ $: errorsMessage = Object.values(errors)
 	{id}
 	{extraQueryParams}
 	autoRefresh={false}
+	{goto}
 >
 	<AlignWrapper {noWFull} {horizontalAlignment} {verticalAlignment}>
 		{#if errorsMessage}
 			<div class="text-red-500 text-xs">{errorsMessage}</div>
 		{/if}
 		<Button
+			btnClasses={twMerge(
+				$app.css?.['buttoncomponent']?.['button']?.class,
+				customCss?.button.class,
+				fillContainer ? 'w-full h-full' : ''
+			)}
+			style={[$app.css?.['buttoncomponent']?.['button']?.style, customCss?.button.style].join(';')}
 			{disabled}
 			on:pointerdown={(e) => {
 				e?.stopPropagation()
 				window.dispatchEvent(new Event('pointerup'))
 			}}
-			on:click={(e) => {
+			on:click={async (e) => {
+				if (preclickAction) {
+					await preclickAction()
+				}
 				e?.stopPropagation()
 				e?.preventDefault()
 				ownClick = true
-				runnableComponent?.runComponent()
+				await runnableComponent?.runComponent()
 
 				if (recomputeIds) {
 					recomputeIds.forEach((id) => {
@@ -85,7 +123,15 @@ $: errorsMessage = Object.values(errors)
 			{color}
 			{loading}
 		>
-			{labelValue}
+			<span class="truncate inline-flex gap-2 items-center">
+				{#if beforeIconComponent}
+					<svelte:component this={beforeIconComponent} size={14} />
+				{/if}
+				<div>{labelValue}</div>
+				{#if afterIconComponent}
+					<svelte:component this={afterIconComponent} size={14} />
+				{/if}
+			</span>
 		</Button>
 	</AlignWrapper>
 </RunnableWrapper>

package/components/apps/components/buttons/AppButton.svelte.d.ts

@@ -1,5 +1,6 @@
 import { SvelteComponentTyped } from "svelte";
 import type { AppInput } from '../../inputType';
+import type { ComponentCustomCSS } from '../../types';
 declare const __propDef: {
     props: {
         id: string;
@@ -10,6 +11,8 @@ declare const __propDef: {
         horizontalAlignment?: 'left' | 'center' | 'right' | undefined;
         verticalAlignment?: 'top' | 'center' | 'bottom' | undefined;
         noWFull?: boolean | undefined;
+        preclickAction?: (() => Promise<void>) | undefined;
+        customCss?: ComponentCustomCSS<'button'> | undefined;
         staticOutputs?: string[] | undefined;
     };
     events: {

package/components/apps/components/{form → buttons}/AppForm.svelte

@@ -17,6 +17,7 @@ let labelValue = 'Default label';
 let color;
 let size;
 let runnableComponent;
+let goto = undefined;
 let isLoading = false;
 $: noInputs =
     componentInput?.type != 'runnable' || Object.keys(componentInput?.fields ?? {}).length == 0;
@@ -31,16 +32,17 @@ $: outputs?.loading.subscribe({
 });
 </script>
 
+<InputValue {id} input={configuration.goto} bind:value={goto} />
 <InputValue {id} input={configuration.label} bind:value={labelValue} />
 <InputValue {id} input={configuration.color} bind:value={color} />
 <InputValue {id} input={configuration.size} bind:value={size} />
 
 <RunnableWrapper
 	defaultUserInput
-	noMinH
 	bind:runnableComponent
 	bind:componentInput
 	{id}
+	{goto}
 	{extraQueryParams}
 	autoRefresh={false}
 	forceSchemaDisplay={true}