Merge branch 'master' into resumable-uri

Author: fm3

frontend/javascripts/components/pricing_enforcers.tsx

@@ -16,7 +16,7 @@ import React from "react";
 import { Link } from "react-router-dom";
 import type { APIOrganization, APIUser } from "types/api_types";
 import { PRIMARY_COLOR } from "viewer/constants";
-import { SwitchSetting } from "viewer/view/components/setting_input_views";
+import SwitchSetting from "viewer/view/left_border_tabs/components/switch_setting";
 
 const PRIMARY_COLOR_HEX = rgbToHex(PRIMARY_COLOR);
 

frontend/javascripts/viewer/view/action_bar/dataset_rotation_popover_view.tsx

@@ -9,7 +9,7 @@ import type { Vector3 } from "viewer/constants";
 import { isRotated } from "viewer/model/accessors/flycam_accessor";
 import { setRotationAction } from "viewer/model/actions/flycam_actions";
 import { setViewModeAction } from "viewer/model/actions/settings_actions";
-import { NumberSliderSetting } from "../components/setting_input_views";
+import NumberSliderSetting from "../left_border_tabs/components/number_slider_setting";
 
 const warningColors: React.CSSProperties = {
   color: "rgb(255, 155, 85)",

frontend/javascripts/viewer/view/action_bar/quick_select_settings.tsx

@@ -14,7 +14,8 @@ import {
   fineTuneQuickSelectAction,
 } from "viewer/model/actions/volumetracing_actions";
 import ButtonComponent from "../components/button_component";
-import { NumberSliderSetting, SwitchSetting } from "../components/setting_input_views";
+import NumberSliderSetting from "../left_border_tabs/components/number_slider_setting";
+import SwitchSetting from "../left_border_tabs/components/switch_setting";
 
 // The maximum depth of 50 also needs to be adapted in the back-end
 // (at the time of writing, in segmentAnythingMask in DatasetController.scala).

frontend/javascripts/viewer/view/action_bar/tools/brush_presets.tsx

@@ -15,7 +15,7 @@ import { updateUserSettingAction } from "viewer/model/actions/settings_actions";
 import { setMousePositionAction } from "viewer/model/actions/volumetracing_actions";
 import Store, { type BrushPresets } from "viewer/store";
 import ButtonComponent from "viewer/view/components/button_component";
-import { LogSliderSetting } from "viewer/view/components/setting_input_views";
+import { LogSliderSetting } from "viewer/view/left_border_tabs/components/log_slider_setting";
 
 function BrushPresetButton({
   name,

frontend/javascripts/viewer/view/action_bar_view.tsx

@@ -50,7 +50,7 @@ import {
 } from "viewer/view/layouting/layout_persistence";
 import { ACTIONBAR_MARGIN_LEFT } from "./action_bar/tools/tool_helpers";
 import ToolkitView from "./action_bar/tools/toolkit_switcher_view";
-import { NumberSliderSetting } from "./components/setting_input_views";
+import NumberSliderSetting from "./left_border_tabs/components/number_slider_setting";
 
 const VersionRestoreWarning = (
   <Alert