windmill-components 1.46.3 → 1.55.0

package/components/SuperadminSettings.svelte

@@ -1,101 +1,76 @@
-<script>import Fuse from 'fuse.js';
-import { UserService, SettingsService, GlobalUserInfo } from '../gen';
+<script>import { UserService, SettingsService, GlobalUserInfo } from '../gen';
 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 { sendUserToast } from '../utils';
+import SearchItems from './SearchItems.svelte';
 let drawer;
+let filter = '';
 export function openDrawer() {
     loadVersion();
     listUsers();
-    drawer?.openDrawer();
+    drawer?.openDrawer?.();
 }
 export function toggleDrawer() {
-    drawer?.toggleDrawer();
+    drawer?.toggleDrawer?.();
 }
 let version;
 let users = [];
-let filteredUsers;
-let userFilter = '';
-let deleteConfirmedCallback = undefined;
-$: openConfirmation = Boolean(deleteConfirmedCallback);
-const fuseOptions = {
-    includeScore: false,
-    keys: ['email', 'name', 'company']
-};
-const fuse = new Fuse(users, fuseOptions);
-$: filteredUsers = fuse?.search(userFilter).map((value) => value.item);
+let filteredUsers = [];
 async function loadVersion() {
     version = await SettingsService.backendVersion();
 }
 async function listUsers() {
     users = await UserService.listUsersAsSuperAdmin({ perPage: 100000 });
-    fuse?.setCollection(users);
 }
 </script>
 
+<SearchItems
+	{filter}
+	items={users}
+	bind:filteredItems={filteredUsers}
+	f={(x) => x.email + ' ' + x.name + ' ' + x.company}
+/>
+
 <Drawer bind:this={drawer} on:open={listUsers} size="900px">
 	<DrawerContent overflow_y={false} title="Superadmin Settings" on:close={drawer.closeDrawer}>
-		<ConfirmationModal
-			open={openConfirmation}
-			title="Remove user"
-			confirmationText="Remove"
-			on:canceled={() => {
-				deleteConfirmedCallback = undefined
-			}}
-			on:confirmed={() => {
-				if (deleteConfirmedCallback) {
-					deleteConfirmedCallback()
-				}
-				deleteConfirmedCallback = undefined
-			}}
-		>
-			<div class="flex flex-col w-full space-y-4">
-				<span>Are you sure you want to remove this user?</span>
-				<Alert type="info" title="Bypass confirmation">
-					<div>
-						You can press
-						<Badge color="dark-gray">SHIFT</Badge>
-						while removing a variable to bypass confirmation.
-					</div>
-				</Alert>
-			</div>
-		</ConfirmationModal>
-
 		<div class="flex flex-col h-full">
 			<div>
 				<div class="text-xs pt-1 text-gray-500 ">
 					Windmill {version}
 				</div>
 
-				<PageHeader title="All users" primary={false} />
+				<PageHeader title="All global users" primary={false} />
 
 				<div class="pb-1" />
 				<InviteGlobalUser on:new={listUsers} />
 				<div class="pb-1" />
 
-				<input placeholder="Search users" bind:value={userFilter} class="input mt-1" />
+				<input placeholder="Search users" bind:value={filter} class="input mt-1" />
 			</div>
 			<div class="mt-2 overflow-auto">
 				<TableCustom>
 					<tr slot="header-row" class="sticky top-0 bg-white border-b">
 						<th>email</th>
-						<th>superadmin</th>
 						<th>auth</th>
 						<th>name</th>
 						<th>company</th>
 						<th />
+						<th />
 					</tr>
 					<tbody slot="body" class="overflow-y-auto h-full max-h-full">
 						{#if filteredUsers && users}
-							{#each userFilter === '' ? users : filteredUsers as { email, super_admin, login_type, name, company }}
+							{#each filteredUsers as { email, super_admin, login_type, name, company } (email)}
 								<tr class="border">
 									<td>{email}</td>
-									<td>{super_admin ? 'yes' : ''}</td>
 									<td>{login_type}</td>
 									<td><span class="break-words">{name ?? ''}</span></td>
 									<td><span class="break-words">{company ?? ''}</span></td>
+									<td
+										>{#if super_admin}<Badge>Superadmin</Badge>{/if}</td
+									>
 									<td>
 										<div class="flex flex-row gap-x-1">
 											<button
@@ -107,18 +82,17 @@ async function listUsers() {
 															is_super_admin: !super_admin
 														}
 													})
+													sendUserToast('User updated')
 													listUsers()
-												}}>{super_admin ? 'demote' : 'promote'}</button
+												}}>{super_admin ? 'non-superadmin' : 'superadmin'}</button
 											>
 											|
 											<button
 												class="text-red-500"
 												on:click={async () => {
-													deleteConfirmedCallback = async () => {
-														await UserService.globalUserDelete({ email })
-														listUsers()
-													}
-													openConfirmation = true
+													await UserService.globalUserDelete({ email })
+													sendUserToast(`User ${email} removed`)
+													listUsers()
 												}}>remove</button
 											>
 										</div>

package/components/SuperadminSettings.svelte.d.ts

@@ -9,9 +9,9 @@ declare const __propDef: {
     };
     slots: {};
 };
-export declare type SuperadminSettingsProps = typeof __propDef.props;
-export declare type SuperadminSettingsEvents = typeof __propDef.events;
-export declare type SuperadminSettingsSlots = typeof __propDef.slots;
+export type SuperadminSettingsProps = typeof __propDef.props;
+export type SuperadminSettingsEvents = typeof __propDef.events;
+export type SuperadminSettingsSlots = typeof __propDef.slots;
 export default class SuperadminSettings extends SvelteComponentTyped<SuperadminSettingsProps, SuperadminSettingsEvents, SuperadminSettingsSlots> {
     get openDrawer(): () => void;
     get toggleDrawer(): () => void;

package/components/TableCustom.svelte

@@ -19,7 +19,7 @@ const dispatch = createEventDispatcher();
 		</table>
 	</div>
 	{#if paginated}
-		<div class="flex flex-row-reverse text-gray-500 mb-6">
+		<div class="sticky flex flex-row-reverse text-gray-500 mb-6">
 			<button
 				class="ml-2 drop-shadow-md {showNext ? 'visible' : 'invisible'}"
 				on:click={() => dispatch('next')}

package/components/TableCustom.svelte.d.ts

@@ -17,9 +17,9 @@ declare const __propDef: {
         body: {};
     };
 };
-export declare type TableCustomProps = typeof __propDef.props;
-export declare type TableCustomEvents = typeof __propDef.events;
-export declare type TableCustomSlots = typeof __propDef.slots;
+export type TableCustomProps = typeof __propDef.props;
+export type TableCustomEvents = typeof __propDef.events;
+export type TableCustomSlots = typeof __propDef.slots;
 export default class TableCustom extends SvelteComponentTyped<TableCustomProps, TableCustomEvents, TableCustomSlots> {
 }
 export {};

package/components/TableSimple.svelte

@@ -9,7 +9,7 @@ export let twTextSize = 'text-sm md:text-base';
 const dispatch = createEventDispatcher();
 </script>
 
-<div class="mt-8 flex flex-col {$$props.class}">
+<div class="mt-2 flex flex-col {$$props.class}">
 	<div class="inline-block min-w-full align-middle">
 		<table class="min-w-full divide-y divide-gray-300 table-auto">
 			<thead>

package/components/TableSimple.svelte.d.ts

@@ -16,9 +16,9 @@ declare const __propDef: {
     };
     slots: {};
 };
-export declare type TableSimpleProps = typeof __propDef.props;
-export declare type TableSimpleEvents = typeof __propDef.events;
-export declare type TableSimpleSlots = typeof __propDef.slots;
+export type TableSimpleProps = typeof __propDef.props;
+export type TableSimpleEvents = typeof __propDef.events;
+export type TableSimpleSlots = typeof __propDef.slots;
 export default class TableSimple extends SvelteComponentTyped<TableSimpleProps, TableSimpleEvents, TableSimpleSlots> {
 }
 export {};

package/components/TestJobLoader.svelte

@@ -2,35 +2,29 @@
 import { workspaceStore } from '../stores';
 import { onDestroy } from 'svelte';
 import { createEventDispatcher } from 'svelte';
-const dispatch = createEventDispatcher();
+import { setIntervalAsync, clearIntervalAsync } from 'set-interval-async';
 export let isLoading = false;
 export let job = undefined;
 export let workspaceOverride = undefined;
 export let notfound = false;
+const dispatch = createEventDispatcher();
 $: workspace = workspaceOverride ?? $workspaceStore;
-let intervalId;
+let intervalId = undefined;
 let syncIteration = 0;
-let ITERATIONS_BEFORE_SLOW_REFRESH = 100;
-export async function runPreview(path, code, lang, args) {
+let ITERATIONS_BEFORE_SLOW_REFRESH = 10;
+let ITERATIONS_BEFORE_SUPER_SLOW_REFRESH = 100;
+export async function abstractRun(fn) {
     try {
-        intervalId && clearInterval(intervalId);
+        intervalId && clearIntervalAsync(intervalId);
         if (isLoading && job) {
-            JobService.cancelQueuedJob({
+            await JobService.cancelQueuedJob({
                 workspace: workspace,
                 id: job.id,
                 requestBody: {}
             });
         }
         isLoading = true;
-        const testId = await JobService.runScriptPreview({
-            workspace: workspace,
-            requestBody: {
-                path,
-                content: code,
-                args,
-                language: lang
-            }
-        });
+        const testId = await fn();
         await watchJob(testId);
     }
     catch (err) {
@@ -38,25 +32,55 @@ export async function runPreview(path, code, lang, args) {
         throw err;
     }
 }
+export async function runScriptByPath(path, args) {
+    abstractRun(() => JobService.runScriptByPath({
+        workspace: $workspaceStore,
+        path: path ?? '',
+        requestBody: args
+    }));
+}
+export async function runFlowByPath(path, args) {
+    abstractRun(() => JobService.runFlowByPath({
+        workspace: $workspaceStore,
+        path: path ?? '',
+        requestBody: args
+    }));
+}
+export async function runPreview(path, code, lang, args) {
+    abstractRun(() => JobService.runScriptPreview({
+        workspace: $workspaceStore,
+        requestBody: {
+            path,
+            content: code,
+            args,
+            language: lang
+        }
+    }));
+}
 export async function cancelJob() {
-    await JobService.cancelQueuedJob({
-        workspace: $workspaceStore ?? '',
-        id: job?.id ?? '',
-        requestBody: {}
-    });
+    try {
+        await JobService.cancelQueuedJob({
+            workspace: $workspaceStore ?? '',
+            id: job?.id ?? '',
+            requestBody: {}
+        });
+    }
+    catch (err) {
+        console.error(err);
+    }
+    isLoading = false;
     console.log('cancelled');
 }
 export async function watchJob(testId) {
-    console.log('watch jobs');
-    intervalId && clearInterval(intervalId);
+    intervalId && clearIntervalAsync(intervalId);
     job = undefined;
     syncIteration = 0;
     const isCompleted = await loadTestJob(testId);
     if (!isCompleted) {
         isLoading = true;
-        intervalId = setInterval(() => {
-            syncer(testId);
-        }, 500);
+        intervalId = setIntervalAsync(async () => {
+            await syncer(testId);
+        }, 50);
     }
 }
 async function loadTestJob(id) {
@@ -82,7 +106,7 @@ async function loadTestJob(id) {
         if (job?.type === 'CompletedJob') {
             //only CompletedJob has success property
             isCompleted = true;
-            intervalId && clearInterval(intervalId);
+            intervalId && clearIntervalAsync(intervalId);
             if (isLoading) {
                 dispatch('done', job);
                 isLoading = false;
@@ -91,7 +115,8 @@ async function loadTestJob(id) {
         notfound = false;
     }
     catch (err) {
-        intervalId && clearInterval(intervalId);
+        intervalId && clearIntervalAsync(intervalId);
+        isLoading = false;
         if (err.status === 404) {
             notfound = true;
         }
@@ -99,15 +124,19 @@ async function loadTestJob(id) {
     }
     return isCompleted;
 }
-function syncer(id) {
+async function syncer(id) {
     if (syncIteration == ITERATIONS_BEFORE_SLOW_REFRESH) {
-        intervalId && clearInterval(intervalId);
-        intervalId = setInterval(() => syncer(id), 2000);
+        intervalId && clearIntervalAsync(intervalId);
+        intervalId = setIntervalAsync(async () => await syncer(id), 500);
+    }
+    else if (syncIteration == ITERATIONS_BEFORE_SUPER_SLOW_REFRESH) {
+        intervalId && clearIntervalAsync(intervalId);
+        intervalId = setIntervalAsync(async () => await syncer(id), 2000);
     }
     syncIteration++;
-    loadTestJob(id);
+    await loadTestJob(id);
 }
 onDestroy(() => {
-    intervalId && clearInterval(intervalId);
+    intervalId && clearIntervalAsync(intervalId);
 });
 </script>

package/components/TestJobLoader.svelte.d.ts

@@ -6,6 +6,9 @@ declare const __propDef: {
         job?: Job | undefined;
         workspaceOverride?: string | undefined;
         notfound?: boolean | undefined;
+        abstractRun?: ((fn: () => Promise<string>) => Promise<void>) | undefined;
+        runScriptByPath?: ((path: string | undefined, args: Record<string, any>) => Promise<void>) | undefined;
+        runFlowByPath?: ((path: string | undefined, args: Record<string, any>) => Promise<void>) | undefined;
         runPreview?: ((path: string | undefined, code: string, lang: 'deno' | 'go' | 'python3' | 'bash', args: Record<string, any>) => Promise<void>) | undefined;
         cancelJob?: (() => Promise<void>) | undefined;
         watchJob?: ((testId: string) => Promise<void>) | undefined;
@@ -17,10 +20,13 @@ declare const __propDef: {
     };
     slots: {};
 };
-export declare type TestJobLoaderProps = typeof __propDef.props;
-export declare type TestJobLoaderEvents = typeof __propDef.events;
-export declare type TestJobLoaderSlots = typeof __propDef.slots;
+export type TestJobLoaderProps = typeof __propDef.props;
+export type TestJobLoaderEvents = typeof __propDef.events;
+export type TestJobLoaderSlots = typeof __propDef.slots;
 export default class TestJobLoader extends SvelteComponentTyped<TestJobLoaderProps, TestJobLoaderEvents, TestJobLoaderSlots> {
+    get abstractRun(): (fn: () => Promise<string>) => Promise<void>;
+    get runScriptByPath(): (path: string | undefined, args: Record<string, any>) => Promise<void>;
+    get runFlowByPath(): (path: string | undefined, args: Record<string, any>) => Promise<void>;
     get runPreview(): (path: string | undefined, code: string, lang: "deno" | "python3" | "go" | "bash", args: Record<string, any>) => Promise<void>;
     get cancelJob(): () => Promise<void>;
     get watchJob(): (testId: string) => Promise<void>;

package/components/Toggle.svelte.d.ts

@@ -16,9 +16,9 @@ declare const __propDef: {
     };
     slots: {};
 };
-export declare type ToggleProps = typeof __propDef.props;
-export declare type ToggleEvents = typeof __propDef.events;
-export declare type ToggleSlots = typeof __propDef.slots;
+export type ToggleProps = typeof __propDef.props;
+export type ToggleEvents = typeof __propDef.events;
+export type ToggleSlots = typeof __propDef.slots;
 export default class Toggle extends SvelteComponentTyped<ToggleProps, ToggleEvents, ToggleSlots> {
 }
 export {};

package/components/ToggleHubWorkspace.svelte

@@ -0,0 +1,16 @@
+<script>import { faBuilding } from '@fortawesome/free-solid-svg-icons';
+import { ToggleButton, ToggleButtonGroup } from './common';
+import { WindmillIcon } from './icons';
+export let selected = 'hub';
+</script>
+
+<div class="max-w-min">
+	<ToggleButtonGroup bind:selected>
+		<ToggleButton position="left" value="hub" size="sm">
+			<WindmillIcon white={selected == 'hub'} height="16px" width="16px" /><div class="mr-1" />Hub
+		</ToggleButton>
+		<ToggleButton position="right" value="workspace" size="sm" startIcon={{ icon: faBuilding }}>
+			Workspace
+		</ToggleButton>
+	</ToggleButtonGroup>
+</div>

package/components/ToggleHubWorkspace.svelte.d.ts

@@ -0,0 +1,16 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        selected?: "workspace" | "hub" | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type ToggleHubWorkspaceProps = typeof __propDef.props;
+export type ToggleHubWorkspaceEvents = typeof __propDef.events;
+export type ToggleHubWorkspaceSlots = typeof __propDef.slots;
+export default class ToggleHubWorkspace extends SvelteComponentTyped<ToggleHubWorkspaceProps, ToggleHubWorkspaceEvents, ToggleHubWorkspaceSlots> {
+}
+export {};

package/components/Tooltip.svelte.d.ts

@@ -1,6 +1,6 @@
 import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
-    props: {};
+    props: Record<string, never>;
     events: {
         [evt: string]: CustomEvent<any>;
     };
@@ -8,9 +8,9 @@ declare const __propDef: {
         default: {};
     };
 };
-export declare type TooltipProps = typeof __propDef.props;
-export declare type TooltipEvents = typeof __propDef.events;
-export declare type TooltipSlots = typeof __propDef.slots;
+export type TooltipProps = typeof __propDef.props;
+export type TooltipEvents = typeof __propDef.events;
+export type TooltipSlots = typeof __propDef.slots;
 export default class Tooltip extends SvelteComponentTyped<TooltipProps, TooltipEvents, TooltipSlots> {
 }
 export {};

package/components/UserSettings.svelte.d.ts

@@ -9,9 +9,9 @@ declare const __propDef: {
     };
     slots: {};
 };
-export declare type UserSettingsProps = typeof __propDef.props;
-export declare type UserSettingsEvents = typeof __propDef.events;
-export declare type UserSettingsSlots = typeof __propDef.slots;
+export type UserSettingsProps = typeof __propDef.props;
+export type UserSettingsEvents = typeof __propDef.events;
+export type UserSettingsSlots = typeof __propDef.slots;
 export default class UserSettings extends SvelteComponentTyped<UserSettingsProps, UserSettingsEvents, UserSettingsSlots> {
     get openDrawer(): () => void;
     get toggleDrawer(): () => void;