Refactor volume undo/redo mechanism and fix subtle bugs

CHANGELOG.unreleased.md

@@ -23,6 +23,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Re-enabled jobs planned to be paid with credits for organizations without a paid plan. [#8478](https://github.com/scalableminds/webknossos/pull/8478)
 - Fixed that the dataset extent tooltip in the right details bar in the dashboard did not properly update when switching datasets. [#8477](https://github.com/scalableminds/webknossos/pull/8477)
 - Fixed a bug where task creation with volume zip as input would fail. [#8468](https://github.com/scalableminds/webknossos/pull/8468)
+- Fixed a rare and subtle bug related to volume annotation and undo/redo. [#7506](https://github.com/scalableminds/webknossos/pull/7506)
+- Fixed that a warning message about a newer version of an annotation was shown multiple times. [#8486](https://github.com/scalableminds/webknossos/pull/8486)
 - Fixed a bug where segment statistics would sometimes be wrong in case of an on-disk segmentation fallback layer with segment index file. [#8460](https://github.com/scalableminds/webknossos/pull/8460)
 - Fixed a bug where sometimes outdated segment statistics would be displayed. [#8460](https://github.com/scalableminds/webknossos/pull/8460)
 

frontend/javascripts/admin/api/mesh.ts

@@ -18,8 +18,8 @@ type MeshLodInfo = {
 };
 
 type MeshSegmentInfo = {
-  chunkShape: Vector3;
-  gridOrigin: Vector3;
+  chunkShape: Vector3; // unused
+  gridOrigin: Vector3; // unused
   lods: Array<MeshLodInfo>;
 };
 

frontend/javascripts/libs/async/deferred.ts

@@ -1,8 +1,6 @@
 class Deferred<T, U> {
-  // @ts-expect-error ts-migrate(2564) FIXME: Property '_internalResolve' has no initializer and... Remove this comment to see the full error message
-  _internalResolve: (arg0: T) => void;
-  // @ts-expect-error ts-migrate(2564) FIXME: Property '_internalReject' has no initializer and ... Remove this comment to see the full error message
-  _internalReject: (arg0: U) => void;
+  _internalResolve!: (arg0: T) => void;
+  _internalReject!: (arg0: U) => void;
   _internalPromise: Promise<T>;
 
   // Wrapper around `Promise` that keeps a reference to `resolve` and `reject`

frontend/javascripts/oxalis/api/api_latest.ts

@@ -139,7 +139,6 @@ import {
 } from "oxalis/model/actions/volumetracing_actions";
 import BoundingBox from "oxalis/model/bucket_data_handling/bounding_box";
 import type { Bucket, DataBucket } from "oxalis/model/bucket_data_handling/bucket";
-import { getConstructorForElementClass } from "oxalis/model/bucket_data_handling/bucket";
 import type DataLayer from "oxalis/model/data_layer";
 import dimensions from "oxalis/model/dimensions";
 import { MagInfo } from "oxalis/model/helpers/mag_info";
@@ -151,6 +150,7 @@ import {
   scaleGlobalPositionWithMagnification,
   zoomedAddressToZoomedPosition,
 } from "oxalis/model/helpers/position_converter";
+import { getConstructorForElementClass } from "oxalis/model/helpers/typed_buffer";
 import { getMaximumGroupId } from "oxalis/model/reducers/skeletontracing_reducer_helpers";
 import { getHalfViewportExtentsInUnitFromState } from "oxalis/model/sagas/saga_selectors";
 import { Model, api } from "oxalis/singletons";
@@ -1617,14 +1617,15 @@ class DataApi {
     layerName: string,
     predicateFn?: (bucket: DataBucket) => boolean,
   ): Promise<void> {
+    const truePredicate = () => true;
     await Promise.all(
       Utils.values(this.model.dataLayers).map(async (dataLayer: DataLayer) => {
         if (dataLayer.name === layerName) {
           if (dataLayer.cube.isSegmentation) {
             await Model.ensureSavedState();
           }
 
-          dataLayer.cube.collectBucketsIf(predicateFn || (() => true));
+          dataLayer.cube.collectBucketsIf(predicateFn || truePredicate);
           dataLayer.layerRenderingManager.refresh();
         }
       }),

frontend/javascripts/oxalis/model/actions/volumetracing_actions.ts

@@ -1,13 +1,17 @@
 import Deferred from "libs/async/deferred";
-import type { BucketAddress, ContourMode, OrthoView, Vector2, Vector3 } from "oxalis/constants";
+import type { ContourMode, OrthoView, Vector2, Vector3 } from "oxalis/constants";
 import type { QuickSelectGeometry } from "oxalis/geometries/helper_geometries";
 import { AllUserBoundingBoxActions } from "oxalis/model/actions/annotation_actions";
-import type { BucketDataArray } from "oxalis/model/bucket_data_handling/bucket";
 import type { NumberLike, Segment, SegmentGroup, SegmentMap } from "oxalis/store";
 import type { Dispatch } from "redux";
 import { batchActions } from "redux-batched-actions";
-import type { ServerEditableMapping, ServerVolumeTracing } from "types/api_flow_types";
+import type {
+  BucketDataArray,
+  ServerEditableMapping,
+  ServerVolumeTracing,
+} from "types/api_flow_types";
 import type { AdditionalCoordinate } from "types/api_flow_types";
+import type BucketSnapshot from "../bucket_data_handling/bucket_snapshot";
 
 export type InitializeVolumeTracingAction = ReturnType<typeof initializeVolumeTracingAction>;
 export type InitializeEditableMappingAction = ReturnType<typeof initializeEditableMappingAction>;
@@ -26,7 +30,7 @@ export type ClickSegmentAction = ReturnType<typeof clickSegmentAction>;
 export type InterpolateSegmentationLayerAction = ReturnType<
   typeof interpolateSegmentationLayerAction
 >;
-export type MaybeUnmergedBucketLoadedPromise = null | Promise<BucketDataArray>;
+export type MaybeUnmergedBucketLoadedPromise = Promise<BucketDataArray> | null;
 export type AddBucketToUndoAction = ReturnType<typeof addBucketToUndoAction>;
 type RegisterLabelPointAction = ReturnType<typeof registerLabelPointAction>;
 type ResetContourAction = ReturnType<typeof resetContourAction>;
@@ -343,20 +347,10 @@ export const setContourTracingModeAction = (mode: ContourMode) =>
     mode,
   }) as const;
 
-export const addBucketToUndoAction = (
-  zoomedBucketAddress: BucketAddress,
-  bucketData: BucketDataArray,
-  maybeUnmergedBucketLoadedPromise: MaybeUnmergedBucketLoadedPromise,
-  pendingOperations: Array<(arg0: BucketDataArray) => void>,
-  tracingId: string,
-) =>
+export const addBucketToUndoAction = (bucketSnapshot: BucketSnapshot) =>
   ({
     type: "ADD_BUCKET_TO_UNDO",
-    zoomedBucketAddress,
-    bucketData,
-    maybeUnmergedBucketLoadedPromise,
-    pendingOperations: pendingOperations.slice(),
-    tracingId,
+    bucketSnapshot,
   }) as const;
 
 export const importVolumeTracingAction = () =>