Merge pull request #1 from TMSchipper/fix/response-data

feat: add response.data and fix styling for layout with download zip …
pluginpal · Oct 16, 2024 · a794d30 · a794d30
2 parents 3a71083 + 9911e78
commit a794d30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/admin/src/components/ActionButtons/index.jsx b/admin/src/components/ActionButtons/index.jsx
@@ -37,10 +37,10 @@ const ActionButtons = () => {
         )}
         onSubmit={(force) => dispatch(exportAllConfig(partialDiff, toggleNotification, formatMessage, post, get))}
       />
-      <Button onClick={() => dispatch(downloadZip(toggleNotification, formatMessage, post, get))}>{formatMessage({ id: 'config-sync.Buttons.DownloadConfig' })}</Button>
       {!isEmpty(partialDiff) && (
         <Typography variant="epsilon">{Object.keys(partialDiff).length} {Object.keys(partialDiff).length === 1 ? "config change" : "config changes"}</Typography>
       )}
+      <Button onClick={() => dispatch(downloadZip(toggleNotification, formatMessage, post, get))}>{formatMessage({ id: 'config-sync.Buttons.DownloadConfig' })}</Button>
     </ActionButtonsStyling>
   );
 };
@@ -53,6 +53,9 @@ const ActionButtonsStyling = styled.div`
   > button {
     margin-right: 10px;
   }
+  > button:last-of-type {
+    margin-left: auto;
+  }
 `;
 
 export default ActionButtons;
diff --git a/admin/src/state/actions/Config.js b/admin/src/state/actions/Config.js
@@ -56,7 +56,7 @@ export function downloadZip(toggleNotification, formatMessage, post, get) {
   return async function(dispatch) {
     dispatch(setLoadingState(true));
     try {
-      const { message, base64Data, name } = await get('/config-sync/zip');
+      const { message, base64Data, name } = (await get('/config-sync/zip')).data;
       toggleNotification({ type: 'success', message });
       if (base64Data) {
         saveAs(b64toBlob(base64Data, 'application/zip'), name, { type: 'application/zip' });