feat(gui): improve annotation merging (#816)

* feat(gui): merge pure annotations

* feat(gui): merge remove annotations

* feat(gui): merge calledAfter annotations

* feat(gui): merge complete annotations

* test(gui): additional merging tests

* test(gui): more failing tests

* feat(gui): get these tests working

* refactor(gui): reduce duplication

* feat(gui): merge group annotations

* refactor(gui): rename variable

* test(gui): additional merging tests

* feat(gui): get some tests passing

* feat(gui): get all tests passing

* style: apply automatic fixes of linters

Co-authored-by: lars-reimann <[email protected]>

Author: lars-reimann

api-editor/gui/src/features/annotations/annotationSlice.ts

@@ -2,6 +2,7 @@ import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import * as idb from 'idb-keyval';
 import { RootState } from '../../app/store';
 import { isValidUsername } from '../../common/util/validation';
+import { mergeAnnotationStores } from './mergeAnnotationStores';
 
 export const EXPECTED_ANNOTATION_STORE_SCHEMA_VERSION = 1;
 export const EXPECTED_ANNOTATION_SLICE_SCHEMA_VERSION = 1;
@@ -383,27 +384,7 @@ const annotationsSlice = createSlice({
             updateQueue(state);
         },
         mergeAnnotationStore(state, action: PayloadAction<AnnotationStore>) {
-            for (const annotationType of Object.keys(action.payload)) {
-                if (annotationType === 'calledAfters' || annotationType === 'groups') {
-                    for (const target of Object.keys(action.payload[annotationType])) {
-                        // @ts-ignore
-                        state.annotations[annotationType][target] = {
-                            // @ts-ignore
-                            ...(state.annotations[annotationType][target] ?? {}),
-                            // @ts-ignore
-                            ...action.payload[annotationType][target],
-                        };
-                    }
-                } else {
-                    // @ts-ignore
-                    state.annotations[annotationType] = {
-                        // @ts-ignore
-                        ...state.annotations[annotationType],
-                        // @ts-ignore
-                        ...action.payload[annotationType],
-                    };
-                }
-            }
+            state.annotations = mergeAnnotationStores(state.annotations, action.payload);
 
             updateQueue(state);
         },