From f3197144895f8d2c6679afb5d0edac31e124cb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Fri, 14 Feb 2025 15:17:22 +0100
Subject: [PATCH] fix: duplicate chords crash

fix: duplicate confirm dialog does not show affected chord
fixes #137
fixes #163
---
 src/lib/dialogs/ConfirmDialog.svelte          | 22 ++++++++++---
 src/lib/dialogs/confirm-dialog.ts             | 25 ++++++++-------
 src/routes/(app)/config/EditActions.svelte    | 32 +++++++++++--------
 .../config/chords/ChordActionEdit.svelte      |  8 ++++-
 4 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/lib/dialogs/ConfirmDialog.svelte b/src/lib/dialogs/ConfirmDialog.svelte
index ab852030..2013ca6b 100644
--- a/src/lib/dialogs/ConfirmDialog.svelte
+++ b/src/lib/dialogs/ConfirmDialog.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import Dialog from "$lib/dialogs/Dialog.svelte";
-  import ActionString from "$lib/components/ActionString.svelte";
+  import type { Chord } from "$lib/serial/chord";
+  import ChordActionEdit from "../../routes/(app)/config/chords/ChordActionEdit.svelte";
 
   let {
     title,
     message,
     abortTitle,
     confirmTitle,
-    actions = [],
+    chord,
     onabort,
     onconfirm,
   }: {
@@ -15,7 +16,7 @@
     message?: string;
     abortTitle: string;
     confirmTitle: string;
-    actions: number[];
+    chord: Chord & { deleted: boolean };
     onabort: () => void;
     onconfirm: () => void;
   } = $props();
@@ -26,7 +27,20 @@
   {#if message}
     <p>{@html message}</p>
   {/if}
-  <p><ActionString {actions} /></p>
+  <p>
+    <ChordActionEdit
+      chord={{
+        ...chord,
+        isApplied: false,
+        phraseChanged: false,
+        actionsChanged: false,
+        sortBy: "",
+        id: chord.actions,
+      }}
+      interactive={false}
+      onsubmit={() => {}}
+    />
+  </p>
   <div class="buttons">
     <button onclick={onabort}>{abortTitle}</button>
     <button class="primary" onclick={onconfirm}>{confirmTitle}</button>
diff --git a/src/lib/dialogs/confirm-dialog.ts b/src/lib/dialogs/confirm-dialog.ts
index 94cd2e2d..32014cbb 100644
--- a/src/lib/dialogs/confirm-dialog.ts
+++ b/src/lib/dialogs/confirm-dialog.ts
@@ -1,33 +1,34 @@
 import ConfirmDialog from "$lib/dialogs/ConfirmDialog.svelte";
+import { mount, unmount } from "svelte";
+import type { Chord } from "$lib/serial/chord";
 
 export async function askForConfirmation(
   title: string,
   message: string,
   confirmTitle: string,
   abortTitle: string,
-  actions: number[],
+  chord: Chord,
 ): Promise<boolean> {
-  const dialog = new ConfirmDialog({
+  let resolvePromise: (value: boolean) => void;
+  const resultPromise = new Promise<boolean>((resolve) => {
+    resolvePromise = resolve;
+  });
+
+  const dialog = mount(ConfirmDialog, {
     target: document.body,
     props: {
       title,
       message,
       confirmTitle,
       abortTitle,
-      actions,
+      chord,
+      onabort: () => resolvePromise(false),
+      onconfirm: () => resolvePromise(true),
     },
   });
 
-  let resolvePromise: (value: boolean) => void;
-  const resultPromise = new Promise<boolean>((resolve) => {
-    resolvePromise = resolve;
-  });
-
-  dialog.$on("abort", () => resolvePromise(false));
-  dialog.$on("confirm", () => resolvePromise(true));
-
   const result = await resultPromise;
-  dialog.$destroy();
+  unmount(dialog);
 
   return result;
 }
diff --git a/src/routes/(app)/config/EditActions.svelte b/src/routes/(app)/config/EditActions.svelte
index 46c32c47..bc318b2b 100644
--- a/src/routes/(app)/config/EditActions.svelte
+++ b/src/routes/(app)/config/EditActions.svelte
@@ -39,7 +39,7 @@
       });
     }
   }
-  let redoQueue: Change[] = $state([]);
+  let redoQueue: Change[][] = $state([]);
 
   async function save() {
     try {
@@ -47,10 +47,10 @@
       if (!port) return;
       $syncStatus = "uploading";
 
-      for (const [id, { actions, phrase, deleted }] of $overlay.chords) {
-        if (!deleted) {
-          if (id !== JSON.stringify(actions)) {
-            const existingChord = await port.getChordPhrase(actions);
+      for (const [id, chord] of $overlay.chords) {
+        if (!chord.deleted) {
+          if (id !== JSON.stringify(chord.actions)) {
+            const existingChord = await port.getChordPhrase(chord.actions);
             if (
               existingChord !== undefined &&
               !(await askForConfirmation(
@@ -58,26 +58,30 @@
                 $LL.configure.chords.conflict.DESCRIPTION(),
                 $LL.configure.chords.conflict.CONFIRM(),
                 $LL.configure.chords.conflict.ABORT(),
-                actions.slice(0, actions.lastIndexOf(0)),
+                chord,
               ))
             ) {
               changes.update((changes) =>
-                changes.filter(
-                  (it) =>
-                    !(
-                      it.type === ChangeType.Chord &&
-                      JSON.stringify(it.id) === id
+                changes
+                  .map((it) =>
+                    it.filter(
+                      (it) =>
+                        !(
+                          it.type === ChangeType.Chord &&
+                          JSON.stringify(it.id) === id
+                        ),
                     ),
-                ),
+                  )
+                  .filter((it) => it.length > 0),
               );
               continue;
             }
 
             await port.deleteChord({ actions: JSON.parse(id) });
           }
-          await port.setChord({ actions, phrase });
+          await port.setChord({ actions: chord.actions, phrase: chord.phrase });
         } else {
-          await port.deleteChord({ actions });
+          await port.deleteChord({ actions: chord.actions });
         }
       }
 
diff --git a/src/routes/(app)/config/chords/ChordActionEdit.svelte b/src/routes/(app)/config/chords/ChordActionEdit.svelte
index 236b6174..ad95938f 100644
--- a/src/routes/(app)/config/chords/ChordActionEdit.svelte
+++ b/src/routes/(app)/config/chords/ChordActionEdit.svelte
@@ -13,7 +13,12 @@
   let {
     chord = undefined,
     onsubmit,
-  }: { chord?: ChordInfo; onsubmit: (actions: number[]) => void } = $props();
+    interactive = true,
+  }: {
+    chord?: ChordInfo;
+    interactive?: boolean;
+    onsubmit: (actions: number[]) => void;
+  } = $props();
 
   let pressedKeys = new SvelteSet<number>();
   let editing = $state(false);
@@ -129,6 +134,7 @@
   onkeydown={keydown}
   onkeyup={keyup}
   onblur={keyup}
+  disabled={!interactive}
 >
   {#if editing && pressedKeys.size === 0}
     <span>{$LL.configure.chords.HOLD_KEYS()}</span>