Merge branch 'master' of github.com:scalableminds/webknossos into live-m3

Author: MichaelBuessemeyer

app/controllers/AuthenticationController.scala

@@ -537,13 +537,16 @@ class AuthenticationController @Inject()(
   }
 
   def logout: Action[AnyContent] = sil.UserAwareAction.async { implicit request =>
+    val redirectUrlStr: String = conf.SingleSignOn.OpenIdConnect.logoutRedirectUrl.getOrElse("/")
+    val rawResultWithRedirect = Ok(Json.toJson(redirectUrlStr))
     request.authenticator match {
       case Some(authenticator) =>
         for {
-          authenticatorResult <- combinedAuthenticatorService.discard(authenticator, Ok)
+          authenticatorResult <- combinedAuthenticatorService.discard(authenticator, rawResultWithRedirect)
           _ = logger.info(f"User ${request.identity.map(_._id).getOrElse("id unknown")} logged out.")
         } yield authenticatorResult
-      case _ => Future.successful(Ok)
+      case _ =>
+        Future.successful(rawResultWithRedirect)
     }
   }
 

app/utils/WkConf.scala

@@ -128,6 +128,7 @@ class WkConf @Inject()(configuration: Configuration, certificateValidationServic
       val clientSecret: String = get[String]("singleSignOn.openIdConnect.clientSecret")
       val scope: String = get[String]("singleSignOn.openIdConnect.scope")
       val verboseLoggingEnabled: Boolean = get[Boolean]("singleSignOn.openIdConnect.verboseLoggingEnabled")
+      val logoutRedirectUrl = getOptional[String]("singleSignOn.openIdConnect.logoutRedirectUrl")
     }
   }
 

conf/application.conf

@@ -142,6 +142,7 @@ singleSignOn {
       clientId = "myclient"
       clientSecret = "myClientSecret"
       scope = "openid profile email"
+      logoutRedirectUrl = null
       verboseLoggingEnabled = false # always set to false in production to avoid logging secrets
     }
 }

frontend/javascripts/admin/rest_api.ts

@@ -154,8 +154,8 @@ export async function loginUser(formValues: {
   return [activeUser, organization];
 }
 
-export async function logoutUser(): Promise<void> {
-  await Request.receiveJSON("/api/auth/logout", { method: "POST" });
+export async function logoutUser(): Promise<string> {
+  return await Request.receiveJSON("/api/auth/logout", { method: "POST" });
 }
 
 export async function logoutUserEverywhere(): Promise<void> {

frontend/javascripts/admin/team/create_team_modal_view.tsx

@@ -9,7 +9,7 @@ type Props = {
   isOpen: boolean;
 };
 
-function CreateTeamModalForm({ onOk: onOkCallback, onCancel, isOpen }: Props) {
+function CreateTeamModalForm({ onOk: onOkCallback, onCancel: onCancelCallback, isOpen }: Props) {
   const [form] = Form.useForm();
 
   const onOk = async () => {
@@ -26,10 +26,16 @@ function CreateTeamModalForm({ onOk: onOkCallback, onCancel, isOpen }: Props) {
         ],
       };
       const team = await createTeam(newTeam);
+      form.resetFields();
       onOkCallback(team);
     });
   };
 
+  const onCancel = () => {
+    form.resetFields();
+    onCancelCallback();
+  };
+
   return (
     <Modal open={isOpen} title="Add a New Team" okText="Ok" onCancel={onCancel} onOk={onOk}>
       <Shortcut keys="enter" onTrigger={onOk} supportInputElements />

frontend/javascripts/navbar.tsx

@@ -775,10 +775,10 @@ function Navbar({ isAuthenticated }: { isAuthenticated: boolean }) {
 
   const handleLogout = async (event: React.SyntheticEvent) => {
     event.preventDefault();
-    await logoutUser();
+    const redirectUrl = await logoutUser();
     Store.dispatch(logoutUserAction());
     // Hard navigation
-    location.href = "/";
+    location.href = redirectUrl;
   };
 
   const version = useFetch(getVersion, null, []);

frontend/javascripts/viewer/controller/combinations/segmentation_handlers.ts

@@ -4,7 +4,11 @@ import {
   getSegmentIdForPosition,
   getSegmentIdForPositionAsync,
 } from "viewer/controller/combinations/volume_handlers";
-import { getMappingInfo } from "viewer/model/accessors/dataset_accessor";
+import {
+  getMappingInfo,
+  getVisibleSegmentationLayer,
+} from "viewer/model/accessors/dataset_accessor";
+import { globalToLayerTransformedPosition } from "viewer/model/accessors/dataset_layer_transformation_accessor";
 import { getTreeNameForAgglomerateSkeleton } from "viewer/model/accessors/skeletontracing_accessor";
 import { calculateGlobalPos } from "viewer/model/accessors/view_mode_accessor";
 import {
@@ -79,9 +83,22 @@ export function handleClickSegment(clickPosition: Point2) {
   const state = Store.getState();
   const globalPosition = calculateGlobalPos(state, clickPosition);
   const segmentId = getSegmentIdForPosition(globalPosition.rounded);
+  const visibleSegmentationLayer = getVisibleSegmentationLayer(state);
+  const positionInSegmentationLayerSpace =
+    visibleSegmentationLayer != null
+      ? (globalToLayerTransformedPosition(
+          globalPosition.rounded,
+          visibleSegmentationLayer.name,
+          "segmentation",
+          state,
+        ).map(Math.floor) as Vector3)
+      : null;
+
   const { additionalCoordinates } = state.flycam;
 
-  if (segmentId > 0) {
-    Store.dispatch(clickSegmentAction(segmentId, globalPosition.rounded, additionalCoordinates));
+  if (segmentId > 0 && positionInSegmentationLayerSpace != null) {
+    Store.dispatch(
+      clickSegmentAction(segmentId, positionInSegmentationLayerSpace, additionalCoordinates),
+    );
   }
 }

frontend/javascripts/viewer/controller/combinations/skeleton_handlers.ts

@@ -136,10 +136,10 @@ export function handleOpenContextMenu(
   meshIntersectionPosition?: Vector3 | null | undefined,
   unmappedSegmentId?: number | null | undefined,
 ) {
-  const { activeViewport } = Store.getState().viewModeData.plane;
+  const state = Store.getState();
+  const { activeViewport } = state.viewModeData.plane;
 
   const nodeId = maybeGetNodeIdFromPosition(planeView, position, plane, isTouch);
-  const state = Store.getState();
   // Use calculateMaybeGlobalPos instead of calculateGlobalPos, since calculateGlobalPos
   // only works for the data viewports, but this function is also called for the 3d viewport.
   const globalPosition = calculateMaybeGlobalPos(state, position);

frontend/javascripts/viewer/model/accessors/dataset_layer_transformation_accessor.ts

@@ -504,3 +504,24 @@ export function globalToLayerTransformedPosition(
   }
   return globalPos;
 }
+
+export function layerToGlobalTransformedPosition(
+  layerPos: Vector3,
+  layerName: string,
+  layerCategory: APIDataLayer["category"] | "skeleton",
+  state: WebknossosState,
+): Vector3 {
+  const layerDescriptor =
+    layerCategory !== "skeleton"
+      ? getLayerByName(state.dataset, layerName, true)
+      : ({ name: "skeleton", category: "skeleton" } as APISkeletonLayer);
+  const layerTransforms = getTransformsForLayerOrNull(
+    state.dataset,
+    layerDescriptor,
+    state.datasetConfiguration.nativelyRenderedLayerName,
+  );
+  if (layerTransforms) {
+    return transformPointUnscaled(layerTransforms)(layerPos);
+  }
+  return layerPos;
+}

frontend/javascripts/viewer/model/reducers/ui_reducer.ts

@@ -18,6 +18,7 @@ function UiReducer(state: WebknossosState, action: Action): WebknossosState {
         activeOrganization: state.activeOrganization,
         uiInformation: {
           ...defaultState.uiInformation,
+          theme: state.uiInformation.theme,
           storedLayouts: state.uiInformation.storedLayouts,
           navbarHeight: state.uiInformation.navbarHeight,
         },