From 2b1b20ab0becee393649d239583dfbf79eb09773 Mon Sep 17 00:00:00 2001 From: Arno <46051866+arnolicious@users.noreply.github.com> Date: Thu, 29 May 2025 16:50:11 +0200 Subject: [PATCH] refactor: library-exclusion-pattern-form modal (#18654) Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> --- .../forms/library-scan-settings-form.svelte | 103 +++++++----------- .../LibraryExclusionPatternModal.svelte} | 24 ++-- 2 files changed, 52 insertions(+), 75 deletions(-) rename web/src/lib/{components/forms/library-exclusion-pattern-form.svelte => modals/LibraryExclusionPatternModal.svelte} (84%) diff --git a/web/src/lib/components/forms/library-scan-settings-form.svelte b/web/src/lib/components/forms/library-scan-settings-form.svelte index 137cfa1277..398c54b89c 100644 --- a/web/src/lib/components/forms/library-scan-settings-form.svelte +++ b/web/src/lib/components/forms/library-scan-settings-form.svelte @@ -1,12 +1,13 @@ -{#if addExclusionPattern} - (addExclusionPattern = false)} - /> -{/if} - -{#if editExclusionPattern != undefined} - (editExclusionPattern = null)} - /> -{/if} -
@@ -136,10 +122,7 @@ icon={mdiPencilOutline} title={$t('edit_exclusion_pattern')} size="16" - onclick={() => { - editExclusionPattern = listIndex; - editedExclusionPattern = exclusionPattern; - }} + onclick={() => onEditExclusionPattern(listIndex)} /> @@ -153,13 +136,9 @@ {/if} diff --git a/web/src/lib/components/forms/library-exclusion-pattern-form.svelte b/web/src/lib/modals/LibraryExclusionPatternModal.svelte similarity index 84% rename from web/src/lib/components/forms/library-exclusion-pattern-form.svelte rename to web/src/lib/modals/LibraryExclusionPatternModal.svelte index e069e5c7a2..d182a89684 100644 --- a/web/src/lib/components/forms/library-exclusion-pattern-form.svelte +++ b/web/src/lib/modals/LibraryExclusionPatternModal.svelte @@ -9,9 +9,7 @@ exclusionPatterns?: string[]; isEditing?: boolean; submitText?: string; - onCancel: () => void; - onSubmit: (exclusionPattern: string) => void; - onDelete?: () => void; + onClose: (data?: { action: 'delete' } | { action: 'submit'; exclusionPattern: string }) => void; } let { @@ -19,9 +17,7 @@ exclusionPatterns = $bindable([]), isEditing = false, submitText = $t('submit'), - onCancel, - onSubmit, - onDelete, + onClose, }: Props = $props(); onMount(() => { @@ -36,12 +32,12 @@ const onsubmit = (event: Event) => { event.preventDefault(); if (canSubmit) { - onSubmit(exclusionPattern); + onClose({ action: 'submit', exclusionPattern }); } }; - +

@@ -68,13 +64,15 @@

- + {#if isEditing} - + {/if} - +
- +