Merge branch 'master' into eslintrc

sillsdev · Nov 6, 2023 · a6e5707 · a6e5707
2 parents 9adbdd0 + 3b54858
commit a6e5707
Show file tree

Hide file tree

Showing 10 changed files with 929 additions and 808 deletions.
diff --git a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DropWord.tsx b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DropWord.tsx
@@ -43,7 +43,7 @@ export default function DropWord(props: DropWordProps): ReactElement {
 
   // reset vern if not in vern list
   if (treeWord && !verns.includes(treeWord.vern)) {
-    dispatch(setVern(props.wordId, verns[0] || ""));
+    dispatch(setVern({ wordId: props.wordId, vern: verns[0] || "" }));
   }
 
   return (
@@ -69,7 +69,12 @@ export default function DropWord(props: DropWordProps): ReactElement {
                 variant="standard"
                 value={treeWord.vern}
                 onChange={(e) =>
-                  dispatch(setVern(props.wordId, e.target.value as string))
+                  dispatch(
+                    setVern({
+                      wordId: props.wordId,
+                      vern: e.target.value as string,
+                    })
+                  )
                 }
               >
                 {verns.map((vern) => (
@@ -94,7 +99,7 @@ export default function DropWord(props: DropWordProps): ReactElement {
               <FlagButton
                 flag={treeWord.flag}
                 updateFlag={(newFlag: Flag) => {
-                  dispatch(flagWord(props.wordId, newFlag));
+                  dispatch(flagWord({ wordId: props.wordId, flag: newFlag }));
                 }}
                 buttonId={`word-${props.wordId}-flag`}
               />

diff --git a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/index.tsx b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/index.tsx
@@ -55,7 +55,13 @@ export default function MergeDragDrop(): ReactElement {
         // Case 2a: Cannot merge a protected sense into another sense.
         if (sourceId !== res.combine.droppableId) {
           // The target sense is in a different word, so move instead of combine.
-          dispatch(moveSense(senseRef, res.combine.droppableId, 0));
+          dispatch(
+            moveSense({
+              ref: senseRef,
+              destWordId: res.combine.droppableId,
+              destOrder: 0,
+            })
+          );
         }
         return;
       }
@@ -66,7 +72,7 @@ export default function MergeDragDrop(): ReactElement {
         // Case 2b: If the target is a sidebar sub-sense, it cannot receive a combine.
         return;
       }
-      dispatch(combineSense(senseRef, combineRef));
+      dispatch(combineSense({ src: senseRef, dest: combineRef }));
     } else if (res.destination) {
       const destId = res.destination.droppableId;
       // Case 3: The sense was dropped in a droppable.
@@ -77,7 +83,13 @@ export default function MergeDragDrop(): ReactElement {
           return;
         }
         // Move the sense to the dest MergeWord.
-        dispatch(moveSense(senseRef, destId, res.destination.index));
+        dispatch(
+          moveSense({
+            ref: senseRef,
+            destWordId: destId,
+            destOrder: res.destination.index,
+          })
+        );
       } else {
         // Case 3b: The source & dest droppables are the same, so we reorder, not move.
         const order = res.destination.index;
@@ -90,7 +102,7 @@ export default function MergeDragDrop(): ReactElement {
           // If the sense wasn't moved or was moved within the sidebar above a protected sense, do nothing.
           return;
         }
-        dispatch(orderSense(senseRef, order));
+        dispatch(orderSense({ ref: senseRef, order: order }));
       }
     }
   }

diff --git a/src/goals/MergeDuplicates/MergeDupsTreeTypes.ts b/src/goals/MergeDuplicates/MergeDupsTreeTypes.ts
@@ -55,12 +55,12 @@ export function newMergeTreeWord(
 }
 
 export function convertSenseToMergeTreeSense(
-  sense?: Sense,
+  sense: Sense,
   srcWordId = "",
   order = 0
 ): MergeTreeSense {
   return {
-    ...(sense ?? newSense()),
+    ...sense,
     srcWordId,
     order,
     protected: sense?.accessibility === Status.Protected,