Fix undefined access on not-existing segmentation layer (#5583)

* fix undefined access on not-existing segmentation layer * update changelog * Update CHANGELOG.unreleased.md Co-authored-by: Daniel <[email protected]> Co-authored-by: Daniel <[email protected]>
scalableminds · Jun 24, 2021 · 44080a7 · 44080a7
1 parent 0e42443
commit 44080a7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -23,6 +23,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 ### Fixed
 - Fixed that a disabled "Center new Nodes" option didn't work correctly in merger mode. [#5538](https://github.com/scalableminds/webknossos/pull/5538)
 - Fixed a bug where dataset uploads of zips with just one file inside failed. [#5534](https://github.com/scalableminds/webknossos/pull/5534)
+- Fixed a benign error message when a dataset without a segmentation layer was opened in view mode or with a skeleton-only annotation. [#5583](https://github.com/scalableminds/webknossos/pull/5583)
 - Fixed crashing tree tab which could happen when dragging a node and then switching directly to another tab (e.g., comments) and then back again. [#5573](https://github.com/scalableminds/webknossos/pull/5573)
 - Fixed that the UI allowed mutating trees in the tree tab (dragging/creating/deleting trees and groups) in read-only tracings. [#5573](https://github.com/scalableminds/webknossos/pull/5573)
 - Fixed "Create a new tree group for this file" setting in front-end import when a group id of 0 was used in the NML. [#5573](https://github.com/scalableminds/webknossos/pull/5573)

diff --git a/frontend/javascripts/oxalis/view/layouting/default_layout_configs.js b/frontend/javascripts/oxalis/view/layouting/default_layout_configs.js
@@ -8,6 +8,7 @@
 // @flow
 import _ from "lodash";
 
+import type { ExtractReturn } from "libs/type_helpers";
 import { getIsInIframe } from "libs/utils";
 import { navbarHeight } from "navbar";
 import Constants, {
@@ -298,7 +299,6 @@ export const resetDefaultLayouts = () => {
   getDefaultLayouts.cache.clear();
 };
 
-type ExtractReturn<Fn> = $Call<<T>(() => T) => T, Fn>;
 type Layout = $Keys<ExtractReturn<typeof _getDefaultLayouts>>;
 
 export const getCurrentDefaultLayoutConfig = () => {

diff --git a/frontend/javascripts/oxalis/view/node_context_menu.js b/frontend/javascripts/oxalis/view/node_context_menu.js
@@ -200,9 +200,7 @@ function NoNodeContextMenuOptions({
 }: NoNodeContextMenuProps) {
   useEffect(() => {
     (async () => {
-      if (segmentationLayer) {
-        await maybeFetchMeshFiles(segmentationLayer, dataset, false);
-      }
+      await maybeFetchMeshFiles(segmentationLayer, dataset, false);
     })();
   }, []);
 

diff --git a/frontend/javascripts/oxalis/view/right-menu/meshes_view.js b/frontend/javascripts/oxalis/view/right-menu/meshes_view.js
@@ -59,7 +59,7 @@ export const stlIsosurfaceConstants = {
 
 // This file defines the component MeshesView.
 
-const mapStateToProps = (state: OxalisState) => ({
+const mapStateToProps = (state: OxalisState): * => ({
   meshes: state.tracing != null ? state.tracing.meshes : [],
   isImporting: state.uiInformation.isImportingMesh,
   isosurfaces: state.isosurfaces,
@@ -75,7 +75,7 @@ const mapStateToProps = (state: OxalisState) => ({
   currentMeshFile: state.currentMeshFile,
 });
 
-const mapDispatchToProps = (dispatch: Dispatch<*>) => ({
+const mapDispatchToProps = (dispatch: Dispatch<*>): * => ({
   updateRemoteMeshMetadata(id: string, meshMetaData: $Shape<RemoteMeshMetaData>) {
     dispatch(updateRemoteMeshMetaDataAction(id, meshMetaData));
   },
@@ -121,8 +121,9 @@ const mapDispatchToProps = (dispatch: Dispatch<*>) => ({
 });
 
 type DispatchProps = ExtractReturn<typeof mapDispatchToProps>;
+type StateProps = ExtractReturn<typeof mapStateToProps>;
 
-type Props = {| ...DispatchProps |};
+type Props = {| ...DispatchProps, ...StateProps |};
 
 type State = { hoveredListItem: ?number };
 
@@ -257,6 +258,9 @@ class MeshesView extends React.Component<Props, State> {
         Toast.info("No cell found at centered position");
         return;
       }
+      if (!this.props.currentMeshFile || !this.props.segmentationLayer) {
+        return;
+      }
       await loadMeshFromFile(
         id,
         pos,
@@ -295,12 +299,12 @@ class MeshesView extends React.Component<Props, State> {
     );
 
     const getLoadPrecomputedMeshButton = () => {
-      const hasCurrenMeshFile = this.props.currentMeshFile;
+      const hasCurrentMeshFile = this.props.currentMeshFile;
       return (
         <Tooltip
           key="tooltip"
           title={
-            hasCurrenMeshFile
+            this.props.currentMeshFile != null
               ? `Load mesh for centered cell from file ${this.props.currentMeshFile}`
               : "There is no mesh file."
           }
@@ -312,7 +316,7 @@ class MeshesView extends React.Component<Props, State> {
             overlay={getMeshFilesDropdown()}
             buttonsRender={([leftButton, rightButton]) => [
               React.cloneElement(leftButton, {
-                disabled: !hasCurrenMeshFile,
+                disabled: !hasCurrentMeshFile,
                 style: { borderRightStyle: "dashed" },
               }),
               React.cloneElement(rightButton, { style: { borderLeftStyle: "dashed" } }),

diff --git a/frontend/javascripts/oxalis/view/right-menu/meshes_view_helper.js b/frontend/javascripts/oxalis/view/right-menu/meshes_view_helper.js
@@ -24,10 +24,13 @@ import processTaskWithPool from "libs/task_pool";
 const PARALLEL_MESH_LOADING_COUNT = 6;
 
 export async function maybeFetchMeshFiles(
-  segmentationLayer: APIDataLayer,
+  segmentationLayer: ?APIDataLayer,
   dataset: APIDataset,
   mustRequest: boolean,
 ): Promise<void> {
+  if (!segmentationLayer) {
+    return;
+  }
   const files = Store.getState().availableMeshFiles;
 
   // only send new get request, if it hasn't happened before (files in store are null)