fix merge-related problems in specs

Author: philippotto

frontend/javascripts/test/fixtures/dataset_server_object.ts

@@ -55,8 +55,8 @@ const sampleSegmentationLayer: APISegmentationLayer = {
 
 export const sampleTracingLayer: APISegmentationLayer = {
   ...sampleSegmentationLayer,
-  name: "tracingId",
-  tracingId: "tracingId",
+  name: "volumeTracingId",
+  tracingId: "volumeTracingId",
 };
 
 function createDataset(dataLayers: Array<APIColorLayer | APISegmentationLayer>): APIDataset {

frontend/javascripts/test/sagas/skeletontracing_saga.spec.ts

@@ -25,6 +25,7 @@ import SkeletonTracingReducer from "viewer/model/reducers/skeletontracing_reduce
 import { TIMESTAMP } from "test/global_mocks";
 import { type Tree, TreeMap } from "viewer/model/types/tree_types";
 import { Model } from "viewer/singletons";
+import { hasRootSagaCrashed } from "viewer/model/sagas/root_saga";
 
 const actionTracingId = "tracingId";
 
@@ -137,6 +138,10 @@ describe("SkeletonTracingSaga", () => {
       context.tearDownPullQueues();
       // Saving after each test and checking that the root saga didn't crash,
       // ensures that each test is cleanly exited. Without it weird output can
+      expect(hasRootSagaCrashed()).toBe(false);
+    });
+
+    it("shouldn't do anything if unchanged (saga test)", async (context: WebknossosTestContext) => {
       await Model.ensureSavedState();
       expect(context.receivedDataPerSaveRequest.length).toBe(0);
     });

frontend/javascripts/test/sagas/volumetracing/volumetracing_saga.spec.ts

@@ -21,6 +21,7 @@ import {
 import VolumeLayer from "viewer/model/volumetracing/volumelayer";
 import { serverVolumeToClientVolumeTracing } from "viewer/model/reducers/volumetracing_reducer";
 import { Model, Store } from "viewer/singletons";
+import { hasRootSagaCrashed } from "viewer/model/sagas/root_saga";
 
 const serverVolumeTracing: ServerVolumeTracing = {
   typ: "Volume",
@@ -84,8 +85,11 @@ describe("VolumeTracingSaga", () => {
 
     afterEach<WebknossosTestContext>(async (context) => {
       context.tearDownPullQueues();
-
       // Saving after each test and checking that the root saga didn't crash,
+      expect(hasRootSagaCrashed()).toBe(false);
+    });
+
+    it("shouldn't do anything if unchanged (saga test)", async (context: WebknossosTestContext) => {
       await Model.ensureSavedState();
       expect(context.receivedDataPerSaveRequest.length).toBe(0);
     });

frontend/javascripts/viewer/model/sagas/save_saga.ts

@@ -1,7 +1,7 @@
 import {
   getNewestVersionForAnnotation,
-  sendSaveRequestWithToken,
   getUpdateActionLog,
+  sendSaveRequestWithToken,
 } from "admin/rest_api";
 import Date from "libs/date";
 import ErrorHandling from "libs/error_handling";

frontend/javascripts/viewer/view/version_entry.tsx

@@ -40,10 +40,10 @@ import type {
   DeleteTreeUpdateAction,
   DeleteUserBoundingBoxInSkeletonTracingAction,
   DeleteUserBoundingBoxInVolumeTracingAction,
+  LEGACY_MergeTreeUpdateAction,
   LEGACY_UpdateUserBoundingBoxesInSkeletonTracingUpdateAction,
   LEGACY_UpdateUserBoundingBoxesInVolumeTracingUpdateAction,
   MergeAgglomerateUpdateAction,
-  LEGACY_MergeTreeUpdateAction,
   MoveTreeComponentUpdateAction,
   RevertToVersionUpdateAction,
   ServerUpdateAction,