Segment group batch actions

CHANGELOG.unreleased.md

@@ -18,6 +18,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Added a search feature for segments and segment groups. Listed segments/groups can be searched by id and name. [#7175](https://github.com/scalableminds/webknossos/pull/7175)
 - Added support for transformations with thin plate splines. [#7131](https://github.com/scalableminds/webknossos/pull/7131)
 - WEBKNOSSOS can now read S3 remote dataset credentials from environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_KEY`. Those will be used, if available, when accessing remote datasets for which no explicit credentials are supplied. [#7170](https://github.com/scalableminds/webknossos/pull/7170)
+- Added security.txt according to [RFC 9116](https://www.rfc-editor.org/rfc/rfc9116). The content is configurable and it can be disabled. [#7182](https://github.com/scalableminds/webknossos/pull/7182)
+- Added tooltips to explain the task actions "Reset" and "Reset and Cancel". [#7201](https://github.com/scalableminds/webknossos/pull/7201)
 - Added batch actions for segment groups, such as changing the color and loading or downloading all corresponding meshes. [#7164](https://github.com/scalableminds/webknossos/pull/7164).
 
 ### Changed

frontend/javascripts/admin/dataset/dataset_upload_view.tsx

@@ -32,7 +32,7 @@ import Toast from "libs/toast";
 import * as Utils from "libs/utils";
 import messages from "messages";
 import { trackAction } from "oxalis/model/helpers/analytics";
-import { BlobReader, ZipReader, Entry } from "@zip.js/zip.js";
+import Zip from "libs/zipjs_wrapper";
 import {
   CardContainer,
   DatasetNameFormItem,
@@ -490,16 +490,16 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
 
       if (fileExtension === "zip") {
         try {
-          const reader = new ZipReader(new BlobReader(file));
+          const reader = new Zip.ZipReader(new Zip.BlobReader(file));
           const entries = await reader.getEntries();
           await reader.close();
-          const wkwFile = entries.find((entry: Entry) =>
+          const wkwFile = entries.find((entry: any) =>
             Utils.isFileExtensionEqualTo(entry.filename, "wkw"),
           );
           const needsConversion = wkwFile == null;
           this.handleNeedsConversionInfo(needsConversion);
 
-          const nmlFile = entries.find((entry: Entry) =>
+          const nmlFile = entries.find((entry: any) =>
             Utils.isFileExtensionEqualTo(entry.filename, "nml"),
           );
           if (nmlFile) {

frontend/javascripts/libs/zipjs_wrapper.ts

@@ -0,0 +1,14 @@
+class TransFormStream {}
+
+let mockedWindow = false;
+
+// Mock zip.js and TransformStream during tests
+if (!global.window) {
+  // @ts-expect-error
+  global.TransformStream = TransFormStream;
+  mockedWindow = true;
+}
+
+const Zip = require("@zip.js/zip.js");
+
+export default Zip;

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

@@ -43,7 +43,7 @@ export type StartedLoadingIsosurfaceAction = ReturnType<typeof startedLoadingIso
 export type FinishedLoadingIsosurfaceAction = ReturnType<typeof finishedLoadingIsosurfaceAction>;
 export type UpdateMeshFileListAction = ReturnType<typeof updateMeshFileListAction>;
 export type UpdateCurrentMeshFileAction = ReturnType<typeof updateCurrentMeshFileAction>;
-export type ImportIsosurfaceFromStlAction = ReturnType<typeof importIsosurfaceFromStlAction>;
+export type ImportIsosurfaceFromSTLAction = ReturnType<typeof importIsosurfaceFromSTLAction>;
 export type RemoveIsosurfaceAction = ReturnType<typeof removeIsosurfaceAction>;
 export type AddAdHocIsosurfaceAction = ReturnType<typeof addAdHocIsosurfaceAction>;
 export type AddPrecomputedIsosurfaceAction = ReturnType<typeof addPrecomputedIsosurfaceAction>;
@@ -74,7 +74,7 @@ export type AnnotationActionTypes =
   | FinishedLoadingIsosurfaceAction
   | UpdateMeshFileListAction
   | UpdateCurrentMeshFileAction
-  | ImportIsosurfaceFromStlAction
+  | ImportIsosurfaceFromSTLAction
   | RemoveIsosurfaceAction
   | AddAdHocIsosurfaceAction
   | AddPrecomputedIsosurfaceAction
@@ -213,23 +213,23 @@ export const maybeFetchMeshFilesAction = (
   } as const);
 
 export const triggerIsosurfaceDownloadAction = (
-  cellName: string,
+  segmentName: string,
   segmentId: number,
   layerName: string,
 ) =>
   ({
     type: "TRIGGER_ISOSURFACE_DOWNLOAD",
-    cellName,
+    segmentName,
     segmentId,
     layerName,
   } as const);
 
 export const triggerIsosurfacesDownloadAction = (
-  surfaceArray: { cellName: string; segmentId: number; layerName: string }[],
+  segmentsArray: Array<{ segmentName: string; segmentId: number; layerName: string }>,
 ) =>
   ({
     type: "TRIGGER_ISOSURFACES_DOWNLOAD",
-    surfaceArray,
+    segmentsArray,
   } as const);
 
 export const refreshIsosurfacesAction = () =>
@@ -275,7 +275,7 @@ export const updateCurrentMeshFileAction = (
     meshFileName,
   } as const);
 
-export const importIsosurfaceFromStlAction = (layerName: string, buffer: ArrayBuffer) =>
+export const importIsosurfaceFromSTLAction = (layerName: string, buffer: ArrayBuffer) =>
   ({
     type: "IMPORT_ISOSURFACE_FROM_STL",
     layerName,

frontend/javascripts/oxalis/model/sagas/isosurface_saga.ts

@@ -24,7 +24,7 @@ import type { Action } from "oxalis/model/actions/actions";
 import type { Vector3 } from "oxalis/constants";
 import { MappingStatusEnum } from "oxalis/constants";
 import {
-  ImportIsosurfaceFromStlAction,
+  ImportIsosurfaceFromSTLAction,
   UpdateIsosurfaceVisibilityAction,
   RemoveIsosurfaceAction,
   RefreshIsosurfaceAction,
@@ -74,7 +74,7 @@ import processTaskWithPool from "libs/task_pool";
 import { getBaseSegmentationName } from "oxalis/view/right-border-tabs/segments_tab/segments_view_helper";
 import { RemoveSegmentAction, UpdateSegmentAction } from "../actions/volumetracing_actions";
 import { ResolutionInfo } from "../helpers/resolution_info";
-import { BlobReader, BlobWriter, ZipWriter } from "@zip.js/zip.js";
+import Zip from "libs/zipjs_wrapper";
 
 export const NO_LOD_MESH_INDEX = -1;
 const MAX_RETRY_COUNT = 5;
@@ -104,7 +104,7 @@ function marchingCubeSizeInMag1(): Vector3 {
     : [128, 128, 128];
 }
 const modifiedCells: Set<number> = new Set();
-export function isIsosurfaceStl(buffer: ArrayBuffer): boolean {
+export function isIsosurfaceSTL(buffer: ArrayBuffer): boolean {
   const dataView = new DataView(buffer);
   const isIsosurface = stlIsosurfaceConstants.isosurfaceMarker.every(
     (marker, index) => dataView.getUint8(index) === marker,
@@ -948,14 +948,7 @@ function* downloadIsosurfaceCellById(
   }
 
   try {
-    const stlDataViews = exportToStl(geometry);
-    // Encode isosurface and cell id property
-    const { isosurfaceMarker, segmentIdIndex } = stlIsosurfaceConstants;
-    isosurfaceMarker.forEach((marker, index) => {
-      stlDataViews[0].setUint8(index, marker);
-    });
-    stlDataViews[0].setUint32(segmentIdIndex, segmentId, true);
-    const blob = new Blob(stlDataViews);
+    const blob = getSTLBlob(geometry, segmentId);
     yield* call(saveAs, blob, `${cellName}-${segmentId}.stl`);
   } catch (exception) {
     ErrorHandling.notify(exception as Error);
@@ -965,12 +958,12 @@ function* downloadIsosurfaceCellById(
 }
 
 function* downloadIsosurfaceCellsAsZIP(
-  arrayOfCells: { cellName: string; segmentId: number; layerName: string }[],
+  segments: Array<{ segmentName: string; segmentId: number; layerName: string }>,
 ): Saga<void> {
   const { segmentMeshController } = getSceneController();
-  const zipWriter = new ZipWriter(new BlobWriter("application/zip"));
+  const zipWriter = new Zip.ZipWriter(new Zip.BlobWriter("application/zip"));
   try {
-    const promises = arrayOfCells.map((element) => {
+    const addFileToZipWriterPromises = segments.map((element) => {
       const geometry = segmentMeshController.getIsosurfaceGeometryInBestLOD(
         element.segmentId,
         element.layerName,
@@ -983,35 +976,39 @@ function* downloadIsosurfaceCellsAsZIP(
         });
         return;
       }
-      const stlDataViews = exportToStl(geometry);
-      // Encode isosurface and cell id property
-      const { isosurfaceMarker, segmentIdIndex } = stlIsosurfaceConstants;
-      isosurfaceMarker.forEach((marker, index) => {
-        stlDataViews[0].setUint8(index, marker);
-      });
-      stlDataViews[0].setUint32(segmentIdIndex, element.segmentId, true);
-      const stlDataReader = new BlobReader(new Blob(stlDataViews));
-      return zipWriter.add(`${element.cellName}-${element.segmentId}.stl`, stlDataReader);
+      const stlDataReader = new Zip.BlobReader(getSTLBlob(geometry, element.segmentId));
+      return zipWriter.add(`${element.segmentName}-${element.segmentId}.stl`, stlDataReader);
     });
-    yield all(promises);
+    yield all(addFileToZipWriterPromises);
     const result = yield* call([zipWriter, zipWriter.close]);
-    saveAs(result, "mesh-export.zip");
+    yield* call(saveAs, result as Blob, "mesh-export.zip");
   } catch (exception) {
     ErrorHandling.notify(exception as Error);
     console.error(exception);
-    Toast.error("Could not export to STL. See console for details");
+    Toast.error("Could not export meshes as STL files. See console for details");
   }
 }
 
+const getSTLBlob = (geometry: THREE.Group, segmentId: number): Blob => {
+  const stlDataViews = exportToStl(geometry);
+  // Encode isosurface and cell id property
+  const { isosurfaceMarker, segmentIdIndex } = stlIsosurfaceConstants;
+  isosurfaceMarker.forEach((marker, index) => {
+    stlDataViews[0].setUint8(index, marker);
+  });
+  stlDataViews[0].setUint32(segmentIdIndex, segmentId, true);
+  return new Blob(stlDataViews);
+};
+
 function* downloadIsosurfaceCell(action: TriggerIsosurfaceDownloadAction): Saga<void> {
-  yield* call(downloadIsosurfaceCellById, action.cellName, action.segmentId, action.layerName);
+  yield* call(downloadIsosurfaceCellById, action.segmentName, action.segmentId, action.layerName);
 }
 
 function* downloadIsosurfaceCells(action: TriggerIsosurfacesDownloadAction): Saga<void> {
-  yield* call(downloadIsosurfaceCellsAsZIP, action.surfaceArray);
+  yield* call(downloadIsosurfaceCellsAsZIP, action.segmentsArray);
 }
 
-function* importIsosurfaceFromStl(action: ImportIsosurfaceFromStlAction): Saga<void> {
+function* importIsosurfaceFromSTL(action: ImportIsosurfaceFromSTLAction): Saga<void> {
   const { layerName, buffer } = action;
   const dataView = new DataView(buffer);
   const segmentId = dataView.getUint32(stlIsosurfaceConstants.segmentIdIndex, true);
@@ -1081,7 +1078,7 @@ export default function* isosurfaceSaga(): Saga<void> {
   yield* takeEvery(loadPrecomputedMeshActionChannel, loadPrecomputedMesh);
   yield* takeEvery("TRIGGER_ISOSURFACE_DOWNLOAD", downloadIsosurfaceCell);
   yield* takeEvery("TRIGGER_ISOSURFACES_DOWNLOAD", downloadIsosurfaceCells);
-  yield* takeEvery("IMPORT_ISOSURFACE_FROM_STL", importIsosurfaceFromStl);
+  yield* takeEvery("IMPORT_ISOSURFACE_FROM_STL", importIsosurfaceFromSTL);
   yield* takeEvery("REMOVE_ISOSURFACE", removeIsosurface);
   yield* takeEvery("REMOVE_SEGMENT", handleRemoveSegment);
   yield* takeEvery("REFRESH_ISOSURFACES", refreshIsosurfaces);