Increase performance of comments tab

CHANGELOG.md

@@ -15,6 +15,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
 
  ### Changed
 - Reported datasets can now overwrite existing ones that are reported as missing, this ignores the isScratch precedence. [#4465](https://github.com/scalableminds/webknossos/pull/4465)
+- Improved the performance for large skeleton tracings with lots of comments. [#4473](https://github.com/scalableminds/webknossos/pull/4473)
 
  ### Fixed
 - Users only get tasks of datasets that they can access. [#4488](https://github.com/scalableminds/webknossos/pull/4488)

frontend/javascripts/oxalis/geometries/cube.js

@@ -15,7 +15,7 @@ import {
   type Vector3,
 } from "oxalis/constants";
 import { getPosition } from "oxalis/model/accessors/flycam_accessor";
-import Store from "oxalis/store";
+import Store from "oxalis/throttled_store";
 import app from "app";
 import dimensions from "oxalis/model/dimensions";
 

frontend/javascripts/oxalis/model/helpers/nml_helpers.js

@@ -363,10 +363,6 @@ function _parseEntities(obj: Object, key: string): string {
   return Saxophone.parseEntities(obj[key]);
 }
 
-function findTreeByNodeId(trees: TreeMap, nodeId: number): ?Tree {
-  return _.values(trees).find(tree => tree.nodes.has(nodeId));
-}
-
 function isTreeConnected(tree: Tree): boolean {
   const seenNodes = new Map();
 
@@ -442,6 +438,7 @@ export function parseNml(
     let currentTree: ?Tree = null;
     let currentGroup: ?TreeGroup = null;
     const groupIdToParent: { [number]: ?TreeGroup } = {};
+    const nodeIdToTreeId = {};
     let datasetName = null;
     parser
       .on("tagopen", node => {
@@ -475,8 +472,9 @@ export function parseNml(
             break;
           }
           case "node": {
+            const nodeId = _parseInt(attr, "id");
             const currentNode = {
-              id: _parseInt(attr, "id"),
+              id: nodeId,
               position: [_parseFloat(attr, "x"), _parseFloat(attr, "y"), _parseFloat(attr, "z")],
               rotation: [
                 _parseFloat(attr, "rotX", DEFAULT_ROTATION[0]),
@@ -494,6 +492,7 @@ export function parseNml(
               throw new NmlParseError(`${messages["nml.node_outside_tree"]} ${currentNode.id}`);
             if (existingNodeIds.has(currentNode.id))
               throw new NmlParseError(`${messages["nml.duplicate_node_id"]} ${currentNode.id}`);
+            nodeIdToTreeId[nodeId] = currentTree.treeId;
             currentTree.nodes.mutableSet(currentNode.id, currentNode);
             existingNodeIds.add(currentNode.id);
             break;
@@ -534,7 +533,7 @@ export function parseNml(
               nodeId: _parseInt(attr, "node"),
               content: _parseEntities(attr, "content"),
             };
-            const tree = findTreeByNodeId(trees, currentComment.nodeId);
+            const tree = trees[nodeIdToTreeId[currentComment.nodeId]];
             if (tree == null)
               throw new NmlParseError(
                 `${messages["nml.comment_without_tree"]} ${currentComment.nodeId}`,
@@ -547,7 +546,7 @@ export function parseNml(
               nodeId: _parseInt(attr, "id"),
               timestamp: _parseInt(attr, "time", DEFAULT_TIMESTAMP),
             };
-            const tree = findTreeByNodeId(trees, currentBranchpoint.nodeId);
+            const tree = trees[nodeIdToTreeId[currentBranchpoint.nodeId]];
             if (tree == null)
               throw new NmlParseError(
                 `${messages["nml.branchpoint_without_tree"]} ${currentBranchpoint.nodeId}`,

frontend/javascripts/oxalis/model/reducers/skeletontracing_reducer_helpers.js

@@ -516,6 +516,14 @@ export function addTreesAndGroups(
     const { allowUpdate } = restrictions;
 
     if (allowUpdate) {
+      const needsReassignedIds = Object.keys(skeletonTracing.trees) > 0;
+
+      if (!needsReassignedIds) {
+        // Without reassigning ids, the code is considerably faster.
+        const newMaxNodeId = getMaximumNodeId(trees);
+        return Maybe.Just([trees, treeGroups, newMaxNodeId]);
+      }
+
       // Check whether any group ids collide and assign new ids
       const groupIdMap = {};
       let nextGroupId = getMaximumGroupId(skeletonTracing.treeGroups) + 1;

frontend/javascripts/oxalis/view/right-menu/comment_tab/comment.js

@@ -25,6 +25,8 @@ type CommentProps = {
   style: Object,
 };
 
+export const commentListId = "commentList";
+
 function ActiveCommentPopover({
   comment,
   children,
@@ -41,7 +43,7 @@ function ActiveCommentPopover({
       visible
       autoAdjustOverflow={false}
       placement="rightTop"
-      getPopupContainer={() => document.getElementById("comment-list")}
+      getPopupContainer={() => document.getElementById(commentListId)}
       style={{ maxHeight: 200, overflowY: "auto" }}
     >
       {children}