- implemented #1376

- also fixed bug in download structures dialog where only first download got added to the dropdown menu

Author: boriskovar-m2ms

js/components/snapshot/modals/downloadStructuresDialog.js

@@ -470,6 +470,13 @@ export const DownloadStructureDialog = memo(({}) => {
     }
   };
 
+  const resetDownloadOnChange = () => {
+    setSelectedDownload(newDownload);
+    setDownloadTagUrl(null);
+    setFileSize(null);
+    setDownloadUrl(null);
+  };
+
   const copyPOSTJson = () => {
     const requestObject = prepareRequestObject();
     const jsonString = JSON.stringify(requestObject);
@@ -563,7 +570,14 @@ export const DownloadStructureDialog = memo(({}) => {
                       <FormControlLabel
                         key={flag}
                         value={flag}
-                        control={<Radio disabled={zipPreparing} />}
+                        control={
+                          <Radio
+                            disabled={zipPreparing}
+                            onChange={() => {
+                              resetDownloadOnChange();
+                            }}
+                          />
+                        }
                         label={text}
                       />
                     );
@@ -578,11 +592,12 @@ export const DownloadStructureDialog = memo(({}) => {
                       control={
                         <Checkbox
                           checked={mapFiles[flag]}
-                          onChange={() =>
+                          onChange={() => {
                             setMapFiles(prevState => {
                               return { ...prevState, [flag]: !prevState[flag] };
-                            })
-                          }
+                            });
+                            resetDownloadOnChange();
+                          }}
                           disabled={zipPreparing}
                         />
                       }
@@ -599,11 +614,12 @@ export const DownloadStructureDialog = memo(({}) => {
                       control={
                         <Checkbox
                           checked={crystallographicFiles[flag]}
-                          onChange={() =>
+                          onChange={() => {
                             setCrystallographicFiles(prevState => {
                               return { ...prevState, [flag]: !prevState[flag] };
-                            })
-                          }
+                            });
+                            resetDownloadOnChange();
+                          }}
                           disabled={zipPreparing || disabled}
                         />
                       }
@@ -626,14 +642,22 @@ export const DownloadStructureDialog = memo(({}) => {
                   name="radio-group-download-type"
                   onChange={event => {
                     setLinkType(event.currentTarget.value);
+                    resetDownloadOnChange();
                   }}
                 >
                   {PERMALINK_OPTIONS.map(({ flag, text }) => {
                     return (
                       <FormControlLabel
                         key={flag}
                         value={flag}
-                        control={<Radio disabled={zipPreparing} />}
+                        control={
+                          <Radio
+                            disabled={zipPreparing}
+                            onChange={() => {
+                              resetDownloadOnChange();
+                            }}
+                          />
+                        }
                         label={text}
                       />
                     );
@@ -648,11 +672,12 @@ export const DownloadStructureDialog = memo(({}) => {
                       control={
                         <Checkbox
                           checked={other[flag]}
-                          onChange={() =>
+                          onChange={() => {
                             setOthers(prevState => {
                               return { ...prevState, [flag]: !prevState[flag] };
-                            })
-                          }
+                            });
+                            resetDownloadOnChange();
+                          }}
                           disabled={zipPreparing}
                         />
                       }

js/reducers/api/apiReducers.js

@@ -266,8 +266,8 @@ export default function apiReducers(state = INITIAL_STATE, action = {}) {
       return { ...state, downloadTags: [...action.downloadTags] };
 
     case constants.APPEND_TO_DOWNLOAD_TAGS:
-      if (!state.downloadTags.find(dt => action.tag.tag)) {
-        return { ...state, downloadTags: [...state.downloadTags, action.tag] };
+      if (!state.downloadTags.find(dt => dt.tag === action.tag.tag)) {
+        return { ...state, downloadTags: [...state.downloadTags, { ...action.tag }] };
       } else {
         return state;
       }