feat: workflows drag and drop enhancements

* feat: render album name in step card body

* clean up

* i18n

web/src/lib/attachments/drag-auto-scroll.svelte.ts

@@ -1,65 +0,0 @@
-import type { Attachment } from 'svelte/attachments';
-
-const EDGE_ZONE = 72;
-const MAX_SCROLL_SPEED = 22;
-
-const findScrollContainer = (element: HTMLElement): HTMLElement | null => {
-  let node = element.parentElement;
-  while (node) {
-    const overflowY = getComputedStyle(node).overflowY;
-    if (/(auto|scroll|overlay)/.test(overflowY) && node.scrollHeight > node.clientHeight) {
-      return node;
-    }
-    node = node.parentElement;
-  }
-  return null;
-};
-
-export function dragAutoScroll(isActive: () => boolean): Attachment {
-  return (node) => {
-    const element = node as HTMLElement;
-    let scrollContainer: HTMLElement | null = null;
-    let pointerY = -1;
-    let frame: number | null = null;
-
-    const trackPointer = (event: DragEvent) => {
-      pointerY = event.clientY;
-    };
-
-    const tick = () => {
-      if (scrollContainer && pointerY >= 0) {
-        const { top, bottom } = scrollContainer.getBoundingClientRect();
-        let delta = 0;
-        if (pointerY < top + EDGE_ZONE) {
-          delta = -MAX_SCROLL_SPEED * Math.min(1, (top + EDGE_ZONE - pointerY) / EDGE_ZONE);
-        } else if (pointerY > bottom - EDGE_ZONE) {
-          delta = MAX_SCROLL_SPEED * Math.min(1, (pointerY - (bottom - EDGE_ZONE)) / EDGE_ZONE);
-        }
-        if (delta !== 0) {
-          scrollContainer.scrollBy(0, delta);
-        }
-      }
-      frame = requestAnimationFrame(tick);
-    };
-
-    $effect(() => {
-      if (!isActive()) {
-        return;
-      }
-
-      scrollContainer = findScrollContainer(element);
-      pointerY = -1;
-      globalThis.addEventListener('dragover', trackPointer);
-      frame = requestAnimationFrame(tick);
-
-      return () => {
-        globalThis.removeEventListener('dragover', trackPointer);
-        if (frame !== null) {
-          cancelAnimationFrame(frame);
-          frame = null;
-        }
-        scrollContainer = null;
-      };
-    });
-  };
-}

web/src/routes/(user)/workflows/[workflowId]/+page.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import { beforeNavigate, goto, invalidate } from '$app/navigation';
-  import { dragAutoScroll } from '$lib/attachments/drag-auto-scroll.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
   import WorkflowAddStepModal from '$lib/modals/WorkflowAddStepModal.svelte';
   import WorkflowEditStepModal from '$lib/modals/WorkflowEditStepModal.svelte';
@@ -44,14 +43,13 @@
     mdiPlus,
   } from '@mdi/js';
   import { cloneDeep, isEqual } from 'lodash-es';
-  import { flip } from 'svelte/animate';
-  import { fade } from 'svelte/transition';
   import { t } from 'svelte-i18n';
-  import { createListReorder, GHOST_KEY, type ReorderEntry } from './list-reorder.svelte';
   import type { PageData } from './$types';
   import WorkflowJsonEditor from './WorkflowJsonEditor.svelte';
   import WorkflowStepCard from './WorkflowStepCard.svelte';
   import WorkflowSummary from './WorkflowSummary.svelte';
+  import { flip } from 'svelte/animate';
+  import { generateId } from '$lib/utils/generate-id';
 
   type WorkflowJsonContent = Required<
     Pick<WorkflowUpdateDto, 'description' | 'enabled' | 'name' | 'steps' | 'trigger'>
@@ -66,18 +64,14 @@
   let { data }: Props = $props();
 
   let { id, enabled, name, description, trigger } = $derived(data.workflow);
-  let steps = $state(data.workflow.steps);
+  let steps = $state(data.workflow.steps.map((step) => ({ ...step, id: generateId() })));
+  let tempSteps = $state<(WorkflowStepDto & { id: string })[]>();
   let savedWorkflow = $state(cloneDeep(data.workflow));
   let allowNavigation = $state(false);
   let isShowingNavigationDialog = $state(false);
   let isSaving = $state(false);
   let editMode = $state<EditMode>('visual');
 
-  const reorder = createListReorder(
-    () => steps,
-    (next) => (steps = next),
-  );
-
   const workflowSummary = $derived({ name, description, trigger, steps });
   const workflowJsonContent = $derived<WorkflowJsonContent>({ name, description, enabled, trigger, steps });
 
@@ -86,20 +80,23 @@
       name !== savedWorkflow.name ||
       description !== savedWorkflow.description ||
       !isEqual(trigger, savedWorkflow.trigger) ||
-      !isEqual(steps, savedWorkflow.steps),
+      !isEqual(
+        steps.map(({ id: _, ...step }) => step),
+        savedWorkflow.steps,
+      ),
   );
 
   const handleAddStep = async () => {
     const step = await modalManager.show(WorkflowAddStepModal, { trigger });
     if (step) {
-      steps.push(step);
+      steps.push({ ...step, id: generateId() });
     }
   };
 
   const handleInsertStep = async (index: number) => {
     const step = await modalManager.show(WorkflowAddStepModal, { trigger });
     if (step) {
-      steps = [...steps.slice(0, index), step, ...steps.slice(index)];
+      steps = [...steps.slice(0, index), { ...step, id: generateId() }, ...steps.slice(index)];
     }
   };
 
@@ -111,10 +108,47 @@
 
     const result = await modalManager.show(WorkflowEditStepModal, { trigger, step: cloneDeep(step) });
     if (result) {
-      steps[index] = result;
+      steps[index] = { ...result, id: generateId() };
     }
   };
 
+  const handleDragEnd = (index: number, event: DragEvent) => {
+    if (!event.dataTransfer) {
+      return;
+    }
+    tempSteps = undefined;
+
+    const from = Number(event.dataTransfer.getData('text/plain'));
+
+    if (from === index) {
+      return;
+    }
+
+    const next = [...steps];
+    const [moved] = next.splice(from, 1);
+    next.splice(index, 0, moved);
+    steps = next;
+  };
+
+  const handleDragOver = (index: number, event: DragEvent) => {
+    if (!event.dataTransfer) {
+      return;
+    }
+
+    const from = Number(event.dataTransfer.getData('text/plain'));
+
+    if (from === index) {
+      return;
+    }
+
+    const next = [...steps];
+    next.splice(index, 0, { ...next[from], id: generateId() });
+    steps = next;
+    event.dataTransfer.setData('text/plain', String(index));
+  };
+
+  $effect(() => console.log(tempSteps));
+
   const handleDeleteStep = async (index: number) => {
     const confirmed = await modalManager.showDialog({ title: $t('step_delete'), prompt: $t('step_delete_confirm') });
     if (confirmed) {
@@ -127,7 +161,7 @@
     name = content.name;
     description = content.description;
     trigger = content.trigger;
-    steps = cloneDeep(content.steps);
+    steps = cloneDeep(content.steps).map((step) => ({ ...step, id: generateId() }));
   };
 
   const onClose = () => goto(Route.workflows());
@@ -340,51 +374,22 @@
           </CardHeader>
         </Card>
 
-        <div class="hidden" aria-hidden="true" {@attach dragAutoScroll(() => reorder.isDragging)}></div>
-
-        {#snippet stepCard(entry: ReorderEntry<WorkflowStepDto>)}
-          <WorkflowStepCard
-            step={entry.item}
-            index={entry.index}
-            position={entry.index + 1}
-            isGhost={entry.isGhost}
-            isSource={entry.isSource}
-            isDragging={reorder.isDragging}
-            onEdit={handleEditStep}
-            onDelete={handleDeleteStep}
-            onInsertBefore={handleInsertStep}
-            onDragStart={reorder.start}
-            onDragOver={reorder.over}
-            onDragEnd={reorder.end}
-            onDrop={reorder.drop}
-          />
-        {/snippet}
-
-        {#each reorder.entries as entry (entry.isGhost ? GHOST_KEY : entry.item)}
-          <div class="w-full" animate:flip={{ duration: 200 }}>
-            {#if entry.isGhost}
-              <div transition:fade={{ duration: 120 }}>{@render stepCard(entry)}</div>
-            {:else}
-              {@render stepCard(entry)}
-            {/if}
+        {#each tempSteps ?? steps as step, index (step.id)}
+          <div class="w-full" animate:flip={{ duration: 120 }}>
+            <WorkflowStepCard
+              {step}
+              {index}
+              ghost={!!tempSteps}
+              onEdit={handleEditStep}
+              onDelete={handleDeleteStep}
+              onInsertBefore={handleInsertStep}
+              onDrop={() => {}}
+              onDragOver={handleDragOver}
+              onDragEnd={handleDragEnd}
+            />
           </div>
         {/each}
 
-        {#if reorder.isDragging}
-          <div
-            class="-mt-4 min-h-12 w-full"
-            role="listitem"
-            ondragover={(event) => {
-              event.preventDefault();
-              reorder.toEnd();
-            }}
-            ondrop={(event) => {
-              event.preventDefault();
-              reorder.drop();
-            }}
-          ></div>
-        {/if}
-
         <Button
           size="small"
           fullWidth

web/src/routes/(user)/workflows/[workflowId]/WorkflowStepCard.svelte

@@ -1,6 +1,8 @@
 <script lang="ts">
+  import { authManager } from '$lib/managers/auth-manager.svelte';
   import { pluginManager } from '$lib/managers/plugin-manager.svelte';
-  import type { WorkflowStepDto } from '@immich/sdk';
+  import type { JSONSchemaProperty } from '$lib/types';
+  import { getAlbumInfo, type WorkflowStepDto } from '@immich/sdk';
   import { Badge, Card, CardBody, CardDescription, CardHeader, CardTitle, Icon, IconButton } from '@immich/ui';
   import {
     mdiAutoFix,
@@ -17,58 +19,42 @@
   type Props = {
     step: WorkflowStepDto;
     index: number;
-    position: number;
-    isGhost: boolean;
-    isSource: boolean;
-    isDragging: boolean;
+    ghost: boolean;
     onEdit: (index: number) => void;
     onDelete: (index: number) => void;
     onInsertBefore: (index: number) => void;
-    onDragStart: (index: number) => void;
-    onDragOver: (index: number, after: boolean) => void;
-    onDragEnd: () => void;
-    onDrop: () => void;
+    onDrop: (index: number, event: DragEvent) => void;
+    onDragOver: (index: number, event: DragEvent) => void;
+    onDragEnd: (index: number, event: DragEvent) => void;
   };
 
-  let {
-    step,
-    index,
-    position,
-    isGhost,
-    isSource,
-    isDragging,
-    onEdit,
-    onDelete,
-    onInsertBefore,
-    onDragStart,
-    onDragOver,
-    onDragEnd,
-    onDrop,
-  }: Props = $props();
+  let { step, index, ghost, onEdit, onDelete, onInsertBefore, onDrop, onDragOver, onDragEnd }: Props = $props();
 
   const method = $derived(pluginManager.getMethod(step.method));
   const isFilter = $derived(method?.uiHints?.includes('Filter') ?? false);
+  const schema = $derived(method?.schema as JSONSchemaProperty | undefined);
   const configEntries = $derived(
     Object.entries(step.config ?? {}).filter(([, value]) => value !== null && value !== undefined && value !== ''),
   );
+
+  const getUiHint = (key: string) => schema?.properties?.[key]?.uiHint;
+  const toIds = (value: unknown): string[] => (Array.isArray(value) ? value.map(String) : [String(value)]);
   let dragImage = $state<Element>();
+  let isDropTarget = $state(false);
   let hoverDrag = $state(false);
 
-  const cardStateClass = $derived.by(() => {
-    if (isGhost) {
-      return 'pointer-events-none border-2 border-dashed border-primary bg-primary-50/40 shadow-lg';
+  // eslint-disable-next-line svelte/prefer-svelte-reactivity
+  const albumNameCache = new Map<string, Promise<string>>();
+  const getAlbumName = (id: string): Promise<string> => {
+    let albumName = albumNameCache.get(id);
+    if (!albumName) {
+      albumName = getAlbumInfo({ ...authManager.params, id })
+        .then((album) => album.albumName)
+        .catch(() => id);
+      albumNameCache.set(id, albumName);
     }
-
-    if (isSource) {
-      return 'border-dashed border-primary-300 bg-primary-50/20';
-    }
-
-    if (hoverDrag) {
-      return 'border-dashed border-primary';
-    }
-
-    return '';
-  });
+    return albumName;
+  };
 
   const truncate = (input: string, max = 24) => (input.length > max ? input.slice(0, max - 1) + '…' : input);
 
@@ -119,31 +105,28 @@
 
     dragImage = document.body.querySelector('#workflow-step-drag-image')!;
     event.dataTransfer.setDragImage(dragImage, 16, 22);
-
-    onDragStart(index);
   };
 
-  const handleDrop = (event: DragEvent) => {
-    event.preventDefault();
-    onDrop();
-  };
-
-  const handleDragOver = (event: DragEvent & { currentTarget: HTMLElement }) => {
-    event.preventDefault();
-    if (isGhost) {
+  const handleDrop = (index: number, event: DragEvent) => {
+    if (!event.dataTransfer) {
       return;
     }
+    event.preventDefault();
 
-    const rect = event.currentTarget.getBoundingClientRect();
-    const after = event.clientY > rect.top + rect.height / 2;
-    onDragOver(index, after);
+    onDrop(index, event);
   };
 
-  const handleDragEnd = () => {
+  const handleDragOver = (event: DragEvent) => {
+    event.preventDefault();
+    isDropTarget = true;
+    onDragOver(index, event);
+  };
+
+  const handleDragEnd = (event: DragEvent) => {
     dragImage?.remove();
     dragImage = undefined;
-    hoverDrag = false;
-    onDragEnd();
+    isDropTarget = false;
+    onDragEnd(index, event);
   };
 </script>
 
@@ -154,7 +137,6 @@
       <button
         type="button"
         class="absolute top-1/2 left-1/2 z-10 -translate-1/2 cursor-pointer rounded-full border border-dashed border-primary-200 bg-light p-0.5 text-primary opacity-0 transition-opacity group-hover/step-row:opacity-100 hover:bg-primary-50"
-        class:hidden={isDragging}
         aria-label={$t('add_step')}
         title={$t('add_step')}
         onclick={() => onInsertBefore(index)}
@@ -166,12 +148,20 @@
 
   <div
     class="w-full transition-all"
-    class:opacity-50={isSource}
+    class:opacity-40={!!dragImage}
+    class:scale-[0.99]={!!dragImage}
     ondragover={handleDragOver}
-    ondrop={handleDrop}
+    ondragleave={() => (isDropTarget = false)}
+    ondrop={(event) => handleDrop(index, event)}
     role="listitem"
   >
-    <Card class="shadow-none transition-colors {cardStateClass}">
+    <Card
+      class="shadow-none transition-colors {isDropTarget
+        ? 'border-primary ring-2 ring-primary-200'
+        : hoverDrag
+          ? 'border-dashed border-primary'
+          : ''}"
+    >
       <CardHeader>
         <div class="flex items-center gap-2">
           <!-- svelte-ignore a11y_no_static_element_interactions -->
@@ -200,9 +190,7 @@
           </div>
           <div class="flex min-w-0 flex-1 flex-col">
             <CardTitle class="truncate">
-              {#if !isGhost}
-                <span class="mr-1 font-bold text-light-500">{position}</span>
-              {/if}
+              <span class="mr-1 font-bold text-light-500">{index + 1}</span>
               {pluginManager.getMethodLabel(step.method)}
             </CardTitle>
             {#if method?.description}
@@ -235,15 +223,28 @@
       {#if configEntries.length > 0}
         <CardBody class="py-3">
           <div class="flex flex-wrap items-center gap-1.5">
-            {#each configEntries as [key, value] (key)}
+            {#snippet badge(key: string, content: string)}
               <Badge
                 color={isFilter ? 'info' : 'warning'}
                 shape="round"
                 size="small"
                 class="border font-mono {isFilter ? 'border-primary-200' : 'border-warning-200'}"
               >
-                <span class="opacity-60">{key}</span>{formatConfigValue(value)}
+                <span class="opacity-60">{key}</span>{content}
               </Badge>
+            {/snippet}
+            {#each configEntries as [key, value] (key)}
+              {#if getUiHint(key) === 'AlbumId'}
+                {#each toIds(value) as albumId (albumId)}
+                  {#await getAlbumName(albumId)}
+                    {@render badge($t('album'), '…')}
+                  {:then albumName}
+                    {@render badge($t('album'), `"${truncate(albumName)}"`)}
+                  {/await}
+                {/each}
+              {:else}
+                {@render badge(key, formatConfigValue(value))}
+              {/if}
             {/each}
           </div>
         </CardBody>

web/src/routes/(user)/workflows/[workflowId]/list-reorder.svelte.ts

@@ -1,78 +0,0 @@
-export const GHOST_KEY = 'reorder-ghost';
-
-export type ReorderEntry<T> = {
-  item: T;
-  index: number;
-  isGhost: boolean;
-  isSource: boolean;
-};
-
-export function createListReorder<T>(getItems: () => T[], setItems: (items: T[]) => void) {
-  let draggingIndex = $state<number | null>(null);
-  let dropIndex = $state<number | null>(null);
-
-  const entries = $derived.by<ReorderEntry<T>[]>(() => {
-    const items = getItems();
-    const list: ReorderEntry<T>[] = items.map((item, index) => ({
-      item,
-      index,
-      isGhost: false,
-      isSource: index === draggingIndex,
-    }));
-
-    if (
-      draggingIndex !== null &&
-      dropIndex !== null &&
-      dropIndex !== draggingIndex &&
-      dropIndex !== draggingIndex + 1
-    ) {
-      list.splice(dropIndex, 0, { item: items[draggingIndex], index: draggingIndex, isGhost: true, isSource: false });
-    }
-
-    return list;
-  });
-
-  return {
-    get isDragging() {
-      return draggingIndex !== null;
-    },
-    get entries() {
-      return entries;
-    },
-    start(index: number) {
-      draggingIndex = index;
-      dropIndex = index;
-    },
-    over(index: number, after: boolean) {
-      if (draggingIndex === null) {
-        return;
-      }
-      dropIndex = Math.max(0, Math.min(index + (after ? 1 : 0), getItems().length));
-    },
-    toEnd() {
-      if (draggingIndex !== null) {
-        dropIndex = getItems().length;
-      }
-    },
-    end() {
-      draggingIndex = null;
-      dropIndex = null;
-    },
-    drop() {
-      if (draggingIndex === null || dropIndex === null) {
-        return;
-      }
-
-      const target = dropIndex > draggingIndex ? dropIndex - 1 : dropIndex;
-      if (target !== draggingIndex) {
-        const next = [...getItems()];
-        const [moved] = next.splice(draggingIndex, 1);
-        next.splice(target, 0, moved);
-        setItems(next);
-      }
-
-      draggingIndex = null;
-      dropIndex = null;
-    },
-  };
-}