windmill-components 1.60.4 → 1.83.1

package/components/common/modal/Modal.svelte

@@ -0,0 +1,79 @@
+<script>import { createEventDispatcher } from 'svelte';
+import { fade } from 'svelte/transition';
+import Button from '../button/Button.svelte';
+import Badge from '../badge/Badge.svelte';
+import { twMerge } from 'tailwind-merge';
+export let title;
+export let open = false;
+let c = '';
+export { c as class };
+export let style = '';
+const dispatch = createEventDispatcher();
+function onKeyDown(event) {
+    if (open) {
+        switch (event.key) {
+            case 'Enter':
+                event.stopPropagation();
+                event.preventDefault();
+                dispatch('confirmed');
+                break;
+            case 'Escape':
+                event.stopPropagation();
+                event.preventDefault();
+                dispatch('canceled');
+                break;
+        }
+    }
+}
+function fadeFast(node) {
+    return fade(node, { duration: 100 });
+}
+</script>
+
+<svelte:window on:keydown={onKeyDown} />
+
+{#if open}
+	<div
+		transition:fadeFast|local
+		class={'absolute top-0 bottom-0 left-0 right-0 z-50'}
+		role="dialog"
+	>
+		<div
+			class={twMerge(
+				'fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity',
+				open ? 'ease-out duration-300 opacity-100' : 'ease-in duration-200 opacity-0'
+			)}
+		/>
+
+		<div class="fixed inset-0 z-10 overflow-y-auto">
+			<div class="flex min-h-full items-center justify-center p-4">
+				<div
+					class={twMerge(
+						'relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6',
+						c,
+						open
+							? 'ease-out duration-300 opacity-100 translate-y-0 sm:scale-100'
+							: 'ease-in duration-200 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95'
+					)}
+					{style}
+				>
+					<div class="flex">
+						<div class="ml-4 text-left flex-1">
+							<h3 class="text-lg font-medium text-gray-900">
+								{title}
+							</h3>
+							<div class="mt-2 text-sm text-gray-500">
+								<slot />
+							</div>
+						</div>
+					</div>
+					<div class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4">
+						<Button on:click={() => dispatch('canceled')} color="light" size="sm">
+							<span class="gap-2">Cancel <Badge color="dark-gray">Escape</Badge></span>
+						</Button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+{/if}

package/components/common/modal/Modal.svelte.d.ts

@@ -0,0 +1,24 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        title: string;
+        open?: boolean | undefined;
+        class?: string | undefined;
+        style?: string | undefined;
+    };
+    events: {
+        canceled: CustomEvent<any>;
+        confirmed: CustomEvent<any>;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {};
+    };
+};
+export type ModalProps = typeof __propDef.props;
+export type ModalEvents = typeof __propDef.events;
+export type ModalSlots = typeof __propDef.slots;
+export default class Modal extends SvelteComponentTyped<ModalProps, ModalEvents, ModalSlots> {
+}
+export {};

package/components/common/popup/Popup.svelte

@@ -1,43 +1,47 @@
 <svelte:options accessors />
 
-<script>import { onMount, onDestroy } from 'svelte';
+<script>import { onDestroy } from 'svelte';
 import { slide } from 'svelte/transition';
 import { createPopperActions } from 'svelte-popperjs';
 import { clickOutside } from '../../../utils';
 import { createStateMachine } from '../../../stateMachine';
 export let ref;
-export let options = { placement: 'auto' };
+export let options = { placement: 'auto', strategy: 'fixed' };
 /** Events on the reference element */
 export let openOn = ['focus'];
 /** Events on the reference element */
 export let closeOn = ['blur'];
 export let innerClasses = '';
 export let outerClasses = '';
+export let transition = slide;
+export { openFocusIn as open, closed as close };
 const states = ['closed', 'open-focus-in', 'open-focus-out'];
 const stateMachine = createStateMachine(states, {
     to: {
         closed: ({ previousState, currentState }) => {
-            const activeElem = document.activeElement;
-            const revert = popup.contains(activeElem) || ref.contains(activeElem);
-            return revert ? previousState : currentState;
+            return isFocusContained() ? previousState : currentState;
         }
     }
 });
-const [popperRef, popperContent] = createPopperActions();
+const [popperRef, popperContent, getInstance] = createPopperActions();
 let popup;
 let focusableElements;
 function getFocusableElements() {
     let elements = [];
     popup
-        .querySelectorAll('a[href], button, input, textarea, select, details, [tabindex]:not([tabindex="-1"])')
+        ?.querySelectorAll('a[href], button, input, textarea, select, details, [tabindex]:not([tabindex="-1"])')
         .forEach((elem) => elements.push(elem));
     focusableElements = elements.filter((el) => !el.hasAttribute('disabled') && !el.getAttribute('aria-hidden'));
     focusableElements.forEach((el) => {
         el.tabIndex = -1;
         el.addEventListener('click', openFocusIn);
-        el.addEventListener('blur', closed);
+        el.addEventListener('blur', conditionalClosed);
     });
 }
+function isFocusContained() {
+    const activeElem = document.activeElement;
+    return popup?.contains(activeElem) || ref?.contains(activeElem);
+}
 function closed() {
     if ($stateMachine.currentState === 'open-focus-out') {
         setTimeout(() => {
@@ -48,6 +52,11 @@ function closed() {
         stateMachine.setState('closed');
     }
 }
+function conditionalClosed() {
+    if (isFocusContained())
+        return;
+    closed();
+}
 function openFocusOut() {
     stateMachine.setState('open-focus-out');
 }
@@ -62,18 +71,20 @@ function keyDown(event) {
     if (event.key === 'Escape') {
         return document.activeElement?.blur();
     }
-    if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown')
+    const prev = ['Up', 'Left'];
+    const next = ['Down', 'Right'];
+    if (![...prev, ...next].some((dir) => `Arrow${dir}` === event.key))
         return;
     event.preventDefault();
-    if (popup.contains(document.activeElement)) {
+    if (popup?.contains(document.activeElement)) {
         const index = focusableElements.findIndex((elem) => elem === document.activeElement);
         if (index === -1)
             return;
         let targetIndex = undefined;
-        if (event.key === 'ArrowUp') {
+        if (prev.some((dir) => `Arrow${dir}` === event.key)) {
             targetIndex = index === 0 ? focusableElements.length - 1 : index - 1;
         }
-        else if (event.key === 'ArrowDown') {
+        else if (next.some((dir) => `Arrow${dir}` === event.key)) {
             targetIndex = index + 1 === focusableElements.length ? 0 : index + 1;
         }
         if (targetIndex !== undefined) {
@@ -90,12 +101,16 @@ function keyDown(event) {
     }
 }
 function addRefListeners() {
+    if (!ref)
+        return;
     openOn.forEach((action) => ref.addEventListener(action, openFocusOut));
     closeOn.forEach((action) => ref.addEventListener(action, closed));
 }
 function removeAllListeners() {
     focusableElements?.forEach((el) => el.removeEventListener('click', openFocusIn));
-    focusableElements?.forEach((el) => el.removeEventListener('blur', closed));
+    focusableElements?.forEach((el) => el.removeEventListener('blur', conditionalClosed));
+    if (!ref)
+        return;
     openOn.forEach((action) => ref.removeEventListener(action, openFocusOut));
     closeOn.forEach((action) => ref.removeEventListener(action, closed));
 }
@@ -105,18 +120,21 @@ $: if ($stateMachine.currentState === 'closed') {
 else {
     setTimeout(() => {
         getFocusableElements();
+        getInstance()?.update();
     }, 0);
 }
-onMount(() => {
+$: if (ref) {
     popperRef(ref);
     addRefListeners();
-});
+}
+$: $$slots.default && getInstance()?.update();
 onDestroy(removeAllListeners);
 </script>
 
 <svelte:window on:keydown={keyDown} />
 
 <div
+	class="z-50"
 	bind:this={popup}
 	use:popperContent={options}
 	use:clickOutside
@@ -125,9 +143,9 @@ onDestroy(removeAllListeners);
 	aria-expanded={$stateMachine.currentState !== 'closed'}
 >
 	{#if $stateMachine.currentState !== 'closed'}
-		<div transition:slide|local={{ duration: 200 }} class={outerClasses}>
+		<div transition:transition|local={{ duration: 200 }} class={outerClasses}>
 			<div class={innerClasses}>
-				<slot />
+				<slot open={openFocusIn} close={closed} />
 			</div>
 		</div>
 	{/if}

package/components/common/popup/Popup.svelte.d.ts

@@ -1,28 +1,35 @@
 import { SvelteComponentTyped } from "svelte";
+import { type TransitionConfig } from 'svelte/transition';
 import { type PopperOptions } from 'svelte-popperjs';
 declare const __propDef: {
     props: {
-        ref: HTMLElement;
+        ref: HTMLElement | undefined;
         options?: PopperOptions<any>;
         /** Events on the reference element */ openOn?: (keyof HTMLElementEventMap)[] | undefined;
         /** Events on the reference element */ closeOn?: (keyof HTMLElementEventMap)[] | undefined;
         innerClasses?: string | undefined;
         outerClasses?: string | undefined;
+        transition?: ((node: Element, params?: Record<string, any>) => TransitionConfig) | undefined;
+        open?: (() => void) | undefined;
+        close?: (() => void) | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;
     };
     slots: {
-        default: {};
+        default: {
+            open: () => void;
+            close: () => void;
+        };
     };
 };
 export type PopupProps = typeof __propDef.props;
 export type PopupEvents = typeof __propDef.events;
 export type PopupSlots = typeof __propDef.slots;
 export default class Popup extends SvelteComponentTyped<PopupProps, PopupEvents, PopupSlots> {
-    get ref(): HTMLElement;
+    get ref(): HTMLElement | undefined;
     /**accessor*/
-    set ref(_: HTMLElement);
+    set ref(_: HTMLElement | undefined);
     get options(): PopperOptions<any>;
     /**accessor*/
     set options(_: PopperOptions<any>);
@@ -38,5 +45,14 @@ export default class Popup extends SvelteComponentTyped<PopupProps, PopupEvents,
     get outerClasses(): string | undefined;
     /**accessor*/
     set outerClasses(_: string | undefined);
+    get transition(): ((node: Element, params?: Record<string, any> | undefined) => TransitionConfig) | undefined;
+    /**accessor*/
+    set transition(_: ((node: Element, params?: Record<string, any> | undefined) => TransitionConfig) | undefined);
+    get open(): (() => void) | undefined;
+    /**accessor*/
+    set open(_: (() => void) | undefined);
+    get close(): (() => void) | undefined;
+    /**accessor*/
+    set close(_: (() => void) | undefined);
 }
 export {};

package/components/common/skeleton/Skeleton.svelte

@@ -9,7 +9,7 @@ export let overlay = false;
 {#if loading}
 	<div class="relative flex justify-center">
 		<div
-			in:fade={{ duration: 1000 }}
+			in:fade|local={{ duration: 1000 }}
 			class="flex grow flex-col overflow-hidden {overlay
 				? 'absolute w-full h-full z-[1000]'
 				: ''} {$$props.class}"

package/components/common/table/AppRow.svelte

@@ -12,6 +12,7 @@ export let marked;
 export let starred;
 export let shareModal;
 export let moveDrawer;
+export let deleteConfirmedCallback;
 let { summary, path, extra_perms, canWrite, workspace_id } = app;
 const dispatch = createEventDispatcher();
 </script>
@@ -71,7 +72,6 @@ const dispatch = createEventDispatcher();
 		</span>
 		<Dropdown
 			placement="bottom-end"
-			btnClasses="!text-gray-700 !bg-transparent hover:!bg-gray-400/20 !p-[6px]"
 			dropdownItems={[
 				{
 					displayName: 'View',
@@ -81,7 +81,8 @@ const dispatch = createEventDispatcher();
 				{
 					displayName: 'Edit',
 					icon: faPen,
-					href: `/apps/edit/${path}?nodraft=true`
+					href: `/apps/edit/${path}?nodraft=true`,
+					disabled: !canWrite
 				},
 				{
 					displayName: 'Use as template',
@@ -106,16 +107,21 @@ const dispatch = createEventDispatcher();
 				{
 					displayName: 'Delete',
 					icon: faTrashAlt,
-					action: async () => {
-						await AppService.deleteApp({ workspace: $workspaceStore ?? '', path })
-						dispatch('change')
+					action: async (event) => {
+						if (event?.shiftKey) {
+							await AppService.deleteApp({ workspace: $workspaceStore ?? '', path })
+							dispatch('change')
+						} else {
+							deleteConfirmedCallback = async () => {
+								await AppService.deleteApp({ workspace: $workspaceStore ?? '', path })
+								dispatch('change')
+							}
+						}
 					},
 					type: 'delete',
 					disabled: !canWrite
 				}
 			]}
-		>
-			<MoreVertical size={20} />
-		</Dropdown>
+		/>
 	</svelte:fragment>
 </Row>

package/components/common/table/AppRow.svelte.d.ts

@@ -11,6 +11,7 @@ declare const __propDef: {
         starred: boolean;
         shareModal: ShareModal;
         moveDrawer: MoveDrawer;
+        deleteConfirmedCallback: (() => void) | undefined;
     };
     events: {
         change: CustomEvent<any>;

package/components/common/table/FlowRow.svelte

@@ -5,9 +5,10 @@ import SharedBadge from '../../SharedBadge.svelte';
 import { FlowService } from '../../../gen';
 import { userStore, workspaceStore } from '../../../stores';
 import { sendUserToast } from '../../../utils';
-import { faArchive, faCalendarAlt, faCodeFork, faEdit, faEye, faFileExport, faList, faPlay, faShare } from '@fortawesome/free-solid-svg-icons';
+import { faArchive, faCalendarAlt, faCodeFork, faEdit, faEye, faFileExport, faList, faPlay, faShare, faTrashAlt } from '@fortawesome/free-solid-svg-icons';
 import { MoreVertical } from 'lucide-svelte';
 import { createEventDispatcher } from 'svelte';
+import Badge from '../badge/Badge.svelte';
 import Button from '../button/Button.svelte';
 import Row from './Row.svelte';
 export let flow;
@@ -15,7 +16,8 @@ export let marked;
 export let starred;
 export let shareModal;
 export let moveDrawer;
-let { summary, path, extra_perms, canWrite, workspace_id } = flow;
+export let deleteConfirmedCallback;
+let { summary, path, extra_perms, canWrite, workspace_id, archived } = flow;
 const dispatch = createEventDispatcher();
 async function archiveFlow(path) {
     try {
@@ -27,6 +29,16 @@ async function archiveFlow(path) {
         sendUserToast(`Could not archive this flow ${err.body}`, true);
     }
 }
+async function deleteFlow(path) {
+    try {
+        await FlowService.deleteFlowByPath({ workspace: $workspaceStore, path });
+        dispatch('change');
+        sendUserToast(`Deleted flow ${path}`);
+    }
+    catch (err) {
+        sendUserToast(`Could not delete this flow ${err.body}`, true);
+    }
+}
 let scheduleEditor;
 </script>
 
@@ -43,11 +55,15 @@ let scheduleEditor;
 >
 	<svelte:fragment slot="badges">
 		<SharedBadge {canWrite} extraPerms={extra_perms} />
+
+		{#if archived}
+			<Badge color="red" baseClass="border">archived</Badge>
+		{/if}
 	</svelte:fragment>
 	<svelte:fragment slot="actions">
 		<span class="hidden md:inline-flex gap-x-1">
 			{#if !$userStore?.operator}
-				{#if canWrite}
+				{#if canWrite && !archived}
 					<div>
 						<Button
 							color="light"
@@ -75,7 +91,7 @@ let scheduleEditor;
 			{/if}
 
 			<Button
-				href="/flows/get/{path}"
+				href="/flows/get/{path}?workspace_id={$workspaceStore}"
 				color="light"
 				variant="border"
 				size="xs"
@@ -97,18 +113,17 @@ let scheduleEditor;
 
 		<Dropdown
 			placement="bottom-end"
-			btnClasses="!text-gray-700 !bg-transparent hover:!bg-gray-400/20 !p-[6px]"
 			dropdownItems={[
 				{
 					displayName: 'View flow',
 					icon: faEye,
-					href: `/flows/get/${path}`
+					href: `/flows/get/${path}?workspace_id=${$workspaceStore}`
 				},
 				{
 					displayName: 'Edit',
 					icon: faEdit,
 					href: `/flows/edit/${path}?nodraft=true`,
-					disabled: !canWrite
+					disabled: !canWrite || archived
 				},
 				{
 					displayName: 'Use as template/Fork',
@@ -126,14 +141,15 @@ let scheduleEditor;
 					action: () => {
 						moveDrawer.openDrawer(path, summary, 'flow')
 					},
-					disabled: !canWrite
+					disabled: !canWrite || archived
 				},
 				{
 					displayName: 'Schedule',
 					icon: faCalendarAlt,
 					action: () => {
 						scheduleEditor.openNew(true, path)
-					}
+					},
+					disabled: archived
 				},
 				{
 					displayName: canWrite ? 'Share' : 'See Permissions',
@@ -149,11 +165,24 @@ let scheduleEditor;
 						path ? archiveFlow(path) : null
 					},
 					type: 'delete',
+					disabled: !canWrite || archived
+				},
+				{
+					displayName: 'Delete',
+					icon: faTrashAlt,
+					action: (event) => {
+						if (event?.shiftKey) {
+							deleteFlow(path)
+						} else {
+							deleteConfirmedCallback = () => {
+								deleteFlow(path)
+							}
+						}
+					},
+					type: 'delete',
 					disabled: !canWrite
 				}
 			]}
-		>
-			<MoreVertical size={20} />
-		</Dropdown>
+		/>
 	</svelte:fragment>
 </Row>

package/components/common/table/FlowRow.svelte.d.ts

@@ -11,6 +11,7 @@ declare const __propDef: {
         starred: boolean;
         shareModal: ShareModal;
         moveDrawer: MoveDrawer;
+        deleteConfirmedCallback: (() => void) | undefined;
     };
     events: {
         change: CustomEvent<any>;

package/components/common/table/LanguageBadge.svelte

@@ -2,6 +2,7 @@
 import { classNames } from '../../../utils';
 import Badge from '../badge/Badge.svelte';
 import { LanguageIcon } from '../languageIcons';
+import Popover from '../../Popover.svelte';
 export let language;
 const languageLabel = {
     [Script.language.PYTHON3]: 'Python',
@@ -27,8 +28,13 @@ const colorByLanguage = {
 	color={colorByLanguage}
 	baseClass={classNames(baseClassByLanguage, 'flex gap-1 items-center')}
 >
-	<LanguageIcon lang={language} width={12} height={12} />
-	<span class="hidden lg:inline">
-		{languageLabel}
-	</span>
+	<Popover notClickable>
+		<LanguageIcon lang={language} width={12} height={12} />
+		<span slot="text">
+			{languageLabel}
+		</span>
+	</Popover>
+
+	<!-- <span class="hidden xl:inline">
+	</span> -->
 </Badge>

package/components/common/table/Row.svelte

@@ -36,7 +36,7 @@ first-of-type:rounded-t-md last-of-type:rounded-b-md {color}"
 		</div>
 	</a>
 	{#if $$slots.badges}
-		<div class="hidden md:flex flex-row gap-1 items-start flex-wrap">
+		<div class="hidden lg:flex flex-row gap-1 items-start">
 			<slot name="badges" />
 		</div>
 	{/if}