misc

Author: philippotto

frontend/javascripts/test/helpers/saveHelpers.ts

@@ -21,7 +21,7 @@ export function createSaveQueueFromUpdateActions(
   }));
 }
 
-export function withoutUpdateTracing(
+export function withoutUpdateActiveItemTracing(
   items: UpdateActionWithoutIsolationRequirement[],
 ): UpdateActionWithoutIsolationRequirement[] {
   return items.filter(

frontend/javascripts/test/reducers/update_action_application/skeleton.spec.ts

@@ -222,8 +222,8 @@ describe("Update Action Application for SkeletonTracing", () => {
       mag,
     );
     const newState = applyActions(initialState, [
-      createNode, // 1
-      createNode, // 2
+      createNode, // nodeId=1
+      createNode, // nodeId=2
       SkeletonTracingActions.setActiveNodeAction(2),
     ]);
     expect(getActiveNode(enforceSkeletonTracing(newState.annotation))?.id).toBe(2);
@@ -250,8 +250,8 @@ describe("Update Action Application for SkeletonTracing", () => {
       mag,
     );
     const newState = applyActions(initialState, [
-      createNode, // 1
-      createNode, // 2
+      createNode, // nodeId=1
+      createNode, // nodeId=2
       SkeletonTracingActions.setActiveTreeAction(2),
     ]);
     expect(getActiveTree(enforceSkeletonTracing(newState.annotation))?.treeId).toBe(2);

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

@@ -10,7 +10,7 @@ import {
 } from "viewer/model/sagas/update_actions";
 import {
   withoutUpdateSegment,
-  withoutUpdateTracing,
+  withoutUpdateActiveItemTracing,
   withoutUpdateTree,
 } from "test/helpers/saveHelpers";
 import DiffableMap from "libs/diffable_map";
@@ -162,7 +162,7 @@ function testSkeletonDiffing(prevState: WebknossosState, nextState: WebknossosSt
   // are creating completely new trees, so that we don't have to go through the
   // action->reducer pipeline)
   return withoutUpdateTree(
-    withoutUpdateTracing(
+    withoutUpdateActiveItemTracing(
       Array.from(
         diffSkeletonTracing(
           enforceSkeletonTracing(prevState.annotation),
@@ -179,7 +179,7 @@ function testVolumeDiffing(prevState: WebknossosState, nextState: WebknossosStat
   // are creating completely new trees, so that we don't have to go through the
   // action->reducer pipeline)
   return withoutUpdateSegment(
-    withoutUpdateTracing(
+    withoutUpdateActiveItemTracing(
       Array.from(
         diffVolumeTracing(prevState.annotation.volumes[0], nextState.annotation.volumes[0]),
       ),

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

@@ -2,7 +2,6 @@ import { setupWebknossosForTesting, type WebknossosTestContext } from "test/help
 import type { SkeletonTracing, StoreAnnotation } from "viewer/store";
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
 import Store from "viewer/store";
-import { hasRootSagaCrashed } from "viewer/model/sagas/root_saga";
 
 import { chainReduce } from "test/helpers/chainReducer";
 import DiffableMap from "libs/diffable_map";
@@ -11,7 +10,10 @@ import compactSaveQueue from "viewer/model/helpers/compaction/compact_save_queue
 import compactUpdateActions from "viewer/model/helpers/compaction/compact_update_actions";
 import defaultState from "viewer/default_state";
 import update from "immutability-helper";
-import { createSaveQueueFromUpdateActions, withoutUpdateTracing } from "../helpers/saveHelpers";
+import {
+  createSaveQueueFromUpdateActions,
+  withoutUpdateActiveItemTracing,
+} from "../helpers/saveHelpers";
 import { MISSING_GROUP_ID } from "viewer/view/right-border-tabs/trees_tab/tree_hierarchy_view_helpers";
 import { TreeTypeEnum } from "viewer/constants";
 import { enforceSkeletonTracing } from "viewer/model/accessors/skeletontracing_accessor";
@@ -27,7 +29,7 @@ import { Model } from "viewer/singletons";
 const actionTracingId = "tracingId";
 
 function testDiffing(prevAnnotation: StoreAnnotation, nextAnnotation: StoreAnnotation) {
-  return withoutUpdateTracing(
+  return withoutUpdateActiveItemTracing(
     Array.from(
       diffSkeletonTracing(
         enforceSkeletonTracing(prevAnnotation),
@@ -135,11 +137,6 @@ 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
-      // occur (e.g., a promise gets resolved which interferes with the next test).
-      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,7 +21,6 @@ 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",
@@ -87,12 +86,6 @@ describe("VolumeTracingSaga", () => {
       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
-      // occur (e.g., a promise gets resolved which interferes with the next test).
-      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/types/bounding_box.ts

@@ -1,23 +1,20 @@
 import type { Point3, Vector3 } from "viewer/constants";
 
-// 51 matches
 export type BoundingBoxMinMaxType = {
   min: Vector3;
   max: Vector3;
 };
 
-// 10 matches
-export type BoundingBoxProto = {
-  topLeft: Point3;
-  width: number;
-  height: number;
-  depth: number;
-};
-
-// 39 matches
 export type BoundingBoxObject = {
   readonly topLeft: Vector3;
   readonly width: number;
   readonly height: number;
   readonly depth: number;
 };
+
+export type BoundingBoxProto = {
+  topLeft: Point3;
+  width: number;
+  height: number;
+  depth: number;
+};

frontend/javascripts/viewer/model/reducers/skeletontracing_reducer.ts

@@ -673,7 +673,6 @@ function SkeletonTracingReducer(state: WebknossosState, action: Action): Webknos
         return state;
       }
 
-      // use this code as template
       const { position, rotation, viewport, mag, treeId, timestamp, additionalCoordinates } =
         action;
       const tree = getOrCreateTree(state, skeletonTracing, treeId, timestamp, TreeTypeEnum.DEFAULT);

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

@@ -847,11 +847,9 @@ function* tryToIncorporateActions(newerActions: APIUpdateActionBatch[]): Saga<bo
         case "removeFallbackLayer":
         case "updateMappingName": // Refactor mapping activation first before implementing this.
 
-        // Skeleton
-        case "mergeTree": // todop: this action is never used? legacy?
-
         // Legacy! The following actions are legacy actions and don't
         // need to be supported.
+        case "mergeTree":
         case "updateSkeletonTracing":
         case "updateVolumeTracing":
         case "updateUserBoundingBoxesInSkeletonTracing":

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

@@ -23,7 +23,7 @@ type PartialBoundingBoxWithoutVisibility = Partial<Omit<UserBoundingBox, "isVisi
 export type UpdateTreeUpdateAction = ReturnType<typeof updateTree> | ReturnType<typeof createTree>;
 export type DeleteTreeUpdateAction = ReturnType<typeof deleteTree>;
 export type MoveTreeComponentUpdateAction = ReturnType<typeof moveTreeComponent>;
-export type MergeTreeUpdateAction = ReturnType<typeof mergeTree>;
+export type LEGACY_MergeTreeUpdateAction = ReturnType<typeof LEGACY_mergeTree>;
 export type CreateNodeUpdateAction = ReturnType<typeof createNode>;
 export type UpdateNodeUpdateAction = ReturnType<typeof updateNode>;
 export type UpdateTreeVisibilityUpdateAction = ReturnType<typeof updateTreeVisibility>;
@@ -141,7 +141,7 @@ export type UpdateActionWithIsolationRequirement =
 export type UpdateActionWithoutIsolationRequirement =
   | UpdateTreeUpdateAction
   | DeleteTreeUpdateAction
-  | MergeTreeUpdateAction
+  | LEGACY_MergeTreeUpdateAction
   | MoveTreeComponentUpdateAction
   | CreateNodeUpdateAction
   | UpdateNodeUpdateAction
@@ -313,7 +313,11 @@ export function updateTreeGroupVisibility(
     },
   } as const;
 }
-export function mergeTree(sourceTreeId: number, targetTreeId: number, actionTracingId: string) {
+export function LEGACY_mergeTree(
+  sourceTreeId: number,
+  targetTreeId: number,
+  actionTracingId: string,
+) {
   return {
     name: "mergeTree",
     value: {

frontend/javascripts/viewer/view/version_entry.tsx

@@ -43,7 +43,7 @@ import type {
   LEGACY_UpdateUserBoundingBoxesInSkeletonTracingUpdateAction,
   LEGACY_UpdateUserBoundingBoxesInVolumeTracingUpdateAction,
   MergeAgglomerateUpdateAction,
-  MergeTreeUpdateAction,
+  LEGACY_MergeTreeUpdateAction,
   MoveTreeComponentUpdateAction,
   RevertToVersionUpdateAction,
   ServerUpdateAction,
@@ -387,7 +387,7 @@ const descriptionFns: Record<
     icon: <EditOutlined />,
   }),
   // This should never be shown since currently this update action is never dispatched.
-  mergeTree: (action: AsServerAction<MergeTreeUpdateAction>): Description => ({
+  mergeTree: (action: AsServerAction<LEGACY_MergeTreeUpdateAction>): Description => ({
     description: `Merged the trees with id ${action.value.sourceId} and ${action.value.targetId}.`,
     icon: <EditOutlined />,
   }),