Update UI with upstream changes included

CHANGELOG.unreleased.md

@@ -36,13 +36,17 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - It is now possible to focus a bounding box in the bounding box tab by clicking its edges in a viewport or via a newly added context menu entry. [#8054](https://github.com/scalableminds/webknossos/pull/8054)
 ### Added
 - Added an assertion to the backend to ensure unique keys in the metadata info of datasets and folders. [#8068](https://github.com/scalableminds/webknossos/issues/8068)
+- It is now possible to add metadata in annotations to Trees and Segments. [#7875](https://github.com/scalableminds/webknossos/pull/7875)
+- Added a summary row to the time tracking overview, where times and annotations/tasks are summed. [#8092](https://github.com/scalableminds/webknossos/pull/8092)
+- Increased loading speed for precomputed meshes. [#8110](https://github.com/scalableminds/webknossos/pull/8110)
 
 ### Changed
 - Some mesh-related actions were disabled in proofreading-mode when using meshfiles that were created for a mapping rather than an oversegmentation. [#8091](https://github.com/scalableminds/webknossos/pull/8091)
 - Admins can now see and cancel all jobs. The owner of the job is shown in the job list. [#8112](https://github.com/scalableminds/webknossos/pull/8112)
 
 ### Fixed
->>>>>>> upstream/master
+- Fixed a bug during dataset upload in case the configured `datastore.baseFolder` is an absolute path. [#8098](https://github.com/scalableminds/webknossos/pull/8098) [#8103](https://github.com/scalableminds/webknossos/pull/8103)
+- Fixed a bug where you could not create annotations for public datasets of other organizations. [#8107](https://github.com/scalableminds/webknossos/pull/8107)
 
 ### Removed
 

frontend/javascripts/admin/dataset/composition_wizard/01_select_import_type.tsx

@@ -38,8 +38,8 @@ export default function SelectImportType({
         </div>
         In all three cases, you can tweak which layers should be used later.
       </div>
-      <Button type="primary" style={{ marginTop: 16 }} onClick={onNext}>
-        Next
+      <Button type="primary" style={{ marginTop: 16 }} onClick={onNext} disabled={true}>
+        For LINC, please use the 'Add Remote Dataset' functionality
       </Button>
     </div>
   );

frontend/javascripts/admin/dataset/dataset_upload_view.tsx

@@ -1057,12 +1057,12 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
                 size="large"
                 type="primary"
                 htmlType="submit"
-                disabled={hasPricingPlanExceededStorage(this.props.organization)}
+                disabled={true}
                 style={{
                   width: "100%",
                 }}
               >
-                Upload
+                For LINC, please use the 'Add Remote Dataset' functionality
               </Button>
             </FormItem>
           </Form>

frontend/javascripts/dashboard/explorative_annotations_view.tsx

@@ -877,13 +877,13 @@ function TopBar({
     search
   ) : (
     <div className="pull-right">
-      <Button
-        icon={<UploadOutlined />}
-        style={marginRight}
-        onClick={() => Store.dispatch(setDropzoneModalVisibilityAction(true))}
-      >
-        Upload Annotation(s)
-      </Button>
+      {/*<Button*/}
+      {/*  icon={<UploadOutlined />}*/}
+      {/*  style={marginRight}*/}
+      {/*  onClick={() => Store.dispatch(setDropzoneModalVisibilityAction(true))}*/}
+      {/*>*/}
+      {/*  Upload Annotation(s)*/}
+      {/*</Button>*/}
       <Button onClick={toggleShowArchived} style={marginRight}>
         Show {shouldShowArchivedTracings ? "Open" : "Archived"} Annotations
       </Button>