From b40d37cf85c8a47dd9c7a9e6149f06e393a349a9 Mon Sep 17 00:00:00 2001
From: Philipp Otto <philipp.4096@googlemail.com>
Date: Tue, 11 Jan 2022 16:32:43 +0100
Subject: [PATCH 1/2] fix selection of datastore when uploading dataset

---
 .../admin/dataset/dataset_add_boss_view.js    |  2 +-
 .../dataset/dataset_add_neuroglancer_view.js  |  2 +-
 .../admin/dataset/dataset_components.js       |  6 ++---
 .../admin/dataset/dataset_upload_view.js      | 24 +++++++++++++------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/frontend/javascripts/admin/dataset/dataset_add_boss_view.js b/frontend/javascripts/admin/dataset/dataset_add_boss_view.js
index 0a6957ee6a..e0cb52df7b 100644
--- a/frontend/javascripts/admin/dataset/dataset_add_boss_view.js
+++ b/frontend/javascripts/admin/dataset/dataset_add_boss_view.js
@@ -61,7 +61,7 @@ function DatasetAddBossView(props: Props) {
     };
 
     trackAction("Add BossDB dataset");
-    await addWkConnectDataset(formValues.datastore.url, datasetConfig);
+    await addWkConnectDataset(formValues.datastoreUrl, datasetConfig);
 
     Toast.success(messages["dataset.add_success"]);
     await Utils.sleep(3000); // wait for 3 seconds so the server can catch up / do its thing
diff --git a/frontend/javascripts/admin/dataset/dataset_add_neuroglancer_view.js b/frontend/javascripts/admin/dataset/dataset_add_neuroglancer_view.js
index 1dafa92316..b9a60e6464 100644
--- a/frontend/javascripts/admin/dataset/dataset_add_neuroglancer_view.js
+++ b/frontend/javascripts/admin/dataset/dataset_add_neuroglancer_view.js
@@ -92,7 +92,7 @@ function DatasetAddNeuroglancerView({ datastores, onAdded, activeUser }: Props)
     };
 
     trackAction("Add Neuroglancer dataset");
-    await addWkConnectDataset(formValues.datastore.url, datasetConfig);
+    await addWkConnectDataset(formValues.datastoreUrl, datasetConfig);
 
     Toast.success(messages["dataset.add_success"]);
     await Utils.sleep(3000); // wait for 3 seconds so the server can catch up / do its thing
diff --git a/frontend/javascripts/admin/dataset/dataset_components.js b/frontend/javascripts/admin/dataset/dataset_components.js
index 29ebe31cd7..b82f38b5e7 100644
--- a/frontend/javascripts/admin/dataset/dataset_components.js
+++ b/frontend/javascripts/admin/dataset/dataset_components.js
@@ -72,12 +72,12 @@ export function DatastoreFormItem({
 }) {
   return (
     <FormItem
-      name="datastore"
+      name="datastoreUrl"
       label="Datastore"
       hasFeedback
       hidden={hidden || false}
       rules={[{ required: true, message: messages["dataset.import.required.datastore"] }]}
-      initialValue={datastores.length ? datastores[0] : null}
+      initialValue={datastores.length ? datastores[0].url : null}
     >
       <Select
         showSearch
@@ -86,7 +86,7 @@ export function DatastoreFormItem({
         style={{ width: "100%" }}
         options={datastores.map((datastore: APIDataStore) => ({
           label: datastore.name,
-          value: datastore,
+          value: datastore.url,
         }))}
       />
     </FormItem>
diff --git a/frontend/javascripts/admin/dataset/dataset_upload_view.js b/frontend/javascripts/admin/dataset/dataset_upload_view.js
index 93efcb3f7c..2c92e5c7da 100644
--- a/frontend/javascripts/admin/dataset/dataset_upload_view.js
+++ b/frontend/javascripts/admin/dataset/dataset_upload_view.js
@@ -163,13 +163,13 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
     const uploadableDatastores = this.props.datastores.filter(datastore => datastore.allowsUpload);
     const currentFormRef = this.formRef.current;
     if (currentFormRef != null) {
-      const selectedDataStore = currentFormRef.getFieldValue("datastore");
+      const selectedDataStoreUrl = currentFormRef.getFieldValue("datastoreUrl");
       if (
         prevProps.datastores.length === 0 &&
         uploadableDatastores.length > 0 &&
-        (selectedDataStore == null || selectedDataStore.url !== uploadableDatastores[0].url)
+        (selectedDataStoreUrl == null || selectedDataStoreUrl !== uploadableDatastores[0].url)
       ) {
-        currentFormRef.setFieldsValue({ datastore: uploadableDatastores[0] });
+        currentFormRef.setFieldsValue({ datastoreUrl: uploadableDatastores[0].url });
       }
     }
   }
@@ -178,6 +178,11 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
     this.props.activeUser &&
     (this.props.activeUser.isAdmin || this.props.activeUser.isDatasetManager);
 
+  getDatastoreForUrl(url: string): ?APIDataStore {
+    const uploadableDatastores = this.props.datastores.filter(datastore => datastore.allowsUpload);
+    return uploadableDatastores.find(ds => ds.url === url);
+  }
+
   handleSubmit = async formValues => {
     const { activeUser } = this.props;
     const pathNameAtSubmit = window.location.pathname;
@@ -230,11 +235,11 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
         initialTeams: formValues.initialTeams.map(team => team.id),
       };
 
-      await reserveDatasetUpload(formValues.datastore.url, reserveUploadInformation);
+      await reserveDatasetUpload(formValues.datastoreUrl, reserveUploadInformation);
 
       const resumableUpload = await createResumableUpload(
         datasetId,
-        formValues.datastore.url,
+        formValues.datastoreUrl,
         uploadId,
       );
 
@@ -254,7 +259,7 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
 
         this.setState({ isFinishing: true });
 
-        finishDatasetUpload(formValues.datastore.url, uploadInfo).then(
+        finishDatasetUpload(formValues.datastoreUrl, uploadInfo).then(
           async () => {
             trackAction("Upload dataset");
             await Utils.sleep(3000); // wait for 3 seconds so the server can catch up / do its thing
@@ -262,11 +267,16 @@ class DatasetUploadView extends React.Component<PropsWithFormAndRouter, State> {
             let maybeError;
             if (this.state.needsConversion) {
               try {
+                const datastore = this.getDatastoreForUrl(formValues.datastoreUrl);
+                if (!datastore) {
+                  throw new Error("Selected datastore does not match available datastores");
+                }
+
                 await startConvertToWkwJob(
                   formValues.name,
                   activeUser.organization,
                   formValues.scale,
-                  formValues.datastore.name,
+                  datastore.name,
                 );
               } catch (error) {
                 maybeError = error;

From fd4a24c4147c513a8c04d5426a212e99e922a9e0 Mon Sep 17 00:00:00 2001
From: Philipp Otto <philipp.4096@googlemail.com>
Date: Tue, 11 Jan 2022 16:35:24 +0100
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.unreleased.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index b8c53bf8c2..029f84139c 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -21,6 +21,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Fixed a bug which caused that the keyboard delay wasn't respected properly when rapidly pressing a key. [#5947](https://github.com/scalableminds/webknossos/pull/5947)
 - Fixed a bug where an organization would be created for an already existing email address. [#5949](https://github.com/scalableminds/webknossos/pull/5949)
 - Fixed a bug where the paths of uploaded files were not checked correctly. [#5950](https://github.com/scalableminds/webknossos/pull/5950)
+- Fixed that the used datastore could not be changed in the UI when uploading a dataset. [#5952](https://github.com/scalableminds/webknossos/pull/5952)
 
 ### Removed