refactor fixtures

Author: philippotto

frontend/javascripts/test/fixtures/dataset_server_object.ts

@@ -59,54 +59,60 @@ export const sampleTracingLayer: APISegmentationLayer = {
   tracingId: "tracingId",
 };
 
-const apiDataset: APIDataset = {
-  id: "66f3c82966010034942e9740",
-  name: "ROI2017_wkw",
-  dataSource: {
-    id: {
-      name: "ROI2017_wkw",
-      team: "Connectomics department",
+function createDataset(dataLayers: Array<APIColorLayer | APISegmentationLayer>): APIDataset {
+  return {
+    id: "66f3c82966010034942e9740",
+    name: "ROI2017_wkw",
+    dataSource: {
+      id: {
+        name: "ROI2017_wkw",
+        team: "Connectomics department",
+      },
+      dataLayers,
+      scale: { factor: [11.239999771118164, 11.239999771118164, 28], unit: UnitLong.nm },
     },
-    dataLayers: [sampleColorLayer, sampleSegmentationLayer],
-    scale: { factor: [11.239999771118164, 11.239999771118164, 28], unit: UnitLong.nm },
-  },
-  dataStore: {
-    name: "localhost",
-    url: "http://localhost:9000",
-    allowsUpload: true,
-    jobsSupportedByAvailableWorkers: [],
-    jobsEnabled: false,
-  },
-  owningOrganization: "Connectomics department",
-  allowedTeams: [
-    {
-      id: "5b1e45f9a00000a000abc2c3",
-      name: "Connectomics department",
-      organization: "Connectomics department",
-    },
-  ],
-  allowedTeamsCumulative: [
-    {
-      id: "5b1e45f9a00000a000abc2c3",
-      name: "Connectomics department",
-      organization: "Connectomics department",
+    dataStore: {
+      name: "localhost",
+      url: "http://localhost:9000",
+      allowsUpload: true,
+      jobsSupportedByAvailableWorkers: [],
+      jobsEnabled: false,
     },
-  ],
-  isActive: true,
-  isPublic: false,
-  description: null,
-  created: 1502288550432,
-  isEditable: true,
-  directoryName: "ROI2017_wkw",
-  isUnreported: false,
-  tags: [],
-  folderId: "66f3c82466010002752e972c",
-  metadata: [],
-  logoUrl: "/assets/images/logo.svg",
-  lastUsedByUser: 1727268949322,
-  sortingKey: 1727252521746,
-  publication: null,
-  usedStorageBytes: 0,
-};
+    owningOrganization: "Connectomics department",
+    allowedTeams: [
+      {
+        id: "5b1e45f9a00000a000abc2c3",
+        name: "Connectomics department",
+        organization: "Connectomics department",
+      },
+    ],
+    allowedTeamsCumulative: [
+      {
+        id: "5b1e45f9a00000a000abc2c3",
+        name: "Connectomics department",
+        organization: "Connectomics department",
+      },
+    ],
+    isActive: true,
+    isPublic: false,
+    description: null,
+    created: 1502288550432,
+    isEditable: true,
+    directoryName: "ROI2017_wkw",
+    isUnreported: false,
+    tags: [],
+    folderId: "66f3c82466010002752e972c",
+    metadata: [],
+    logoUrl: "/assets/images/logo.svg",
+    lastUsedByUser: 1727268949322,
+    sortingKey: 1727252521746,
+    publication: null,
+    usedStorageBytes: 0,
+  };
+}
+
+const apiDataset = createDataset([sampleColorLayer, sampleSegmentationLayer]);
+
+export const apiDatasetForVolumeTracing = createDataset([sampleTracingLayer]);
 
 export default apiDataset;

frontend/javascripts/test/fixtures/volumetracing_object.ts

@@ -1,24 +1,37 @@
 import update from "immutability-helper";
-import { AnnotationTool } from "viewer/model/accessors/tool_accessor";
 import Constants from "viewer/constants";
 import defaultState from "viewer/default_state";
+import { combinedReducer, type VolumeTracing } from "viewer/store";
+import DiffableMap from "libs/diffable_map";
+import { setDatasetAction } from "viewer/model/actions/dataset_actions";
+import { convertFrontendBoundingBoxToServer } from "viewer/model/reducers/reducer_helpers";
+import { apiDatasetForVolumeTracing } from "./dataset_server_object";
 
-const volumeTracing = {
+const volumeTracing: VolumeTracing = {
   type: "volume",
+  segments: new DiffableMap(),
+  segmentGroups: [],
+  hasSegmentIndex: true,
+  contourTracingMode: "DRAW",
+  hideUnregisteredSegments: false,
   activeCellId: 0,
-  activeTool: AnnotationTool.MOVE,
   largestSegmentId: 0,
   contourList: [],
   lastLabelActions: [],
   tracingId: "tracingId",
-};
+  createdTimestamp: 1234,
+  boundingBox: { min: [0, 1, 2], max: [10, 11, 12] },
+  userBoundingBoxes: [],
+  additionalAxes: [],
+} as const;
 const notEmptyViewportRect = {
   top: 0,
   left: 0,
   width: Constants.VIEWPORT_WIDTH,
   height: Constants.VIEWPORT_WIDTH,
 };
-export const initialState = update(defaultState, {
+
+const stateWithoutDatasetInitialization = update(defaultState, {
   annotation: {
     annotationType: {
       $set: "Explorational",
@@ -45,7 +58,6 @@ export const initialState = update(defaultState, {
       },
     },
     volumes: {
-      // @ts-expect-error ts-migrate(2322) FIXME: Type '{ type: string; activeCellId: number; active... Remove this comment to see the full error message
       $set: [volumeTracing],
     },
   },
@@ -62,12 +74,12 @@ export const initialState = update(defaultState, {
               [4, 4, 4],
             ],
             category: "segmentation",
+            largestSegmentId: volumeTracing.largestSegmentId ?? 0,
             elementClass: "uint32",
             name: volumeTracing.tracingId,
             tracingId: volumeTracing.tracingId,
-            // @ts-expect-error ts-migrate(2322) FIXME: Type '{ resolutions: [number, number, number][]; c... Remove this comment to see the full error message
-            isDisabled: false,
-            alpha: 100,
+            additionalAxes: [],
+            boundingBox: convertFrontendBoundingBoxToServer(volumeTracing.boundingBox!),
           },
         ],
       },
@@ -109,3 +121,8 @@ export const initialState = update(defaultState, {
     },
   },
 });
+
+export const initialState = combinedReducer(
+  stateWithoutDatasetInitialization,
+  setDatasetAction(apiDatasetForVolumeTracing),
+);

frontend/javascripts/viewer/api/wk_dev.ts

@@ -11,7 +11,7 @@ import type ApiLoader from "./api_loader";
 // Can be accessed via window.webknossos.DEV.flags. Only use this
 // for debugging or one off scripts.
 export const WkDevFlags = {
-  logActions: true,
+  logActions: false,
   sam: {
     useLocalMask: true,
   },

frontend/javascripts/viewer/controller/viewmodes/arbitrary_controller.tsx

@@ -40,13 +40,13 @@ import {
   toggleAllTreesAction,
   toggleInactiveTreesAction,
 } from "viewer/model/actions/skeletontracing_actions";
+import { deleteNodeAsUserAction } from "viewer/model/actions/skeletontracing_actions_with_effects";
 import { listenToStoreProperty } from "viewer/model/helpers/listener_helpers";
 import { api } from "viewer/singletons";
 import Store from "viewer/store";
 import ArbitraryView from "viewer/view/arbitrary_view";
 import { downloadScreenshot } from "viewer/view/rendering_utils";
 import { SkeletonToolController } from "../combinations/tool_controls";
-import { deleteNodeAsUserAction } from "viewer/model/actions/skeletontracing_actions_with_effects";
 
 const arbitraryViewportId = "inputcatcher_arbitraryViewport";
 type Props = {

frontend/javascripts/viewer/controller/viewmodes/plane_controller.tsx

@@ -48,6 +48,7 @@ import {
   toggleAllTreesAction,
   toggleInactiveTreesAction,
 } from "viewer/model/actions/skeletontracing_actions";
+import { deleteNodeAsUserAction } from "viewer/model/actions/skeletontracing_actions_with_effects";
 import {
   cycleToolAction,
   enterAction,
@@ -69,7 +70,6 @@ import { showToastWarningForLargestSegmentIdMissing } from "viewer/view/largest_
 import PlaneView from "viewer/view/plane_view";
 import { downloadScreenshot } from "viewer/view/rendering_utils";
 import { highlightAndSetCursorOnHoveredBoundingBox } from "../combinations/bounding_box_handlers";
-import { deleteNodeAsUserAction } from "viewer/model/actions/skeletontracing_actions_with_effects";
 
 function ensureNonConflictingHandlers(
   skeletonControls: Record<string, any>,

frontend/javascripts/viewer/model/actions/skeletontracing_actions_with_effects.tsx

@@ -10,12 +10,12 @@ import type { WebknossosState } from "viewer/store";
 import Store from "viewer/store";
 import RemoveTreeModal from "viewer/view/remove_tree_modal";
 import {
-  deleteNodeAction,
   type DeleteNodeAction,
-  deleteTreeAction,
   type DeleteTreeAction,
-  noAction,
   type NoAction,
+  deleteNodeAction,
+  deleteTreeAction,
+  noAction,
 } from "./skeletontracing_actions";
 
 // The following functions are used as a direct response to a user action.

frontend/javascripts/viewer/view/context_menu.tsx

@@ -137,14 +137,14 @@ import type {
   VolumeTracing,
 } from "viewer/store";
 
+import { deleteNodeAsUserAction } from "viewer/model/actions/skeletontracing_actions_with_effects";
 import { type MutableNode, type Tree, TreeMap } from "viewer/model/types/tree_types";
 import Store from "viewer/store";
 import {
   getVolumeRequestUrl,
   withMappingActivationConfirmation,
 } from "viewer/view/right-border-tabs/segments_tab/segments_view_helper";
 import { LoadMeshMenuItemLabel } from "./right-border-tabs/segments_tab/load_mesh_menu_item_label";
-import { deleteNodeAsUserAction } from "viewer/model/actions/skeletontracing_actions_with_effects";
 
 type ContextMenuContextValue = React.MutableRefObject<HTMLElement | null> | null;
 export const ContextMenuContext = createContext<ContextMenuContextValue>(null);

frontend/javascripts/viewer/view/right-border-tabs/trees_tab/skeleton_tab_view.tsx

@@ -54,6 +54,7 @@ import {
   toggleAllTreesAction,
   toggleInactiveTreesAction,
 } from "viewer/model/actions/skeletontracing_actions";
+import { handleDeleteTreeByUser } from "viewer/model/actions/skeletontracing_actions_with_effects";
 import { setDropzoneModalVisibilityAction } from "viewer/model/actions/ui_actions";
 import {
   importVolumeTracingAction,
@@ -86,7 +87,6 @@ import {
 } from "viewer/view/right-border-tabs/trees_tab/tree_hierarchy_view_helpers";
 import AdvancedSearchPopover from "../advanced_search_popover";
 import DeleteGroupModalView from "../delete_group_modal_view";
-import { handleDeleteTreeByUser } from "viewer/model/actions/skeletontracing_actions_with_effects";
 
 const { confirm } = Modal;
 const treeTabId = "tree-list";