Skip to content

A modern, self-hosted backup solution for secure, encrypted backups across local and cloud storage.

fix: minor ui issues

towfiqie47c602ed5f4
diff --git a/backend/src/controllers/RestoreController.ts b/backend/src/controllers/RestoreController.ts
index 7b256fe..9df45a9 100644
--- a/backend/src/controllers/RestoreController.ts
+++ b/backend/src/controllers/RestoreController.ts
@@ -99,7 +99,7 @@ export class RestoreController {
} catch (error: any) {
res.status(500).json({
success: false,
- error: 'Failed to restore plan',
+ error: 'Failed to perform dry restore. ' + (error.message || ''),
});
}
}
diff --git a/frontend/src/components/Plan/BackupEvents/BackupEvents.module.scss b/frontend/src/components/Plan/BackupEvents/BackupEvents.module.scss
index 32c4f59..ef4f0da 100644
--- a/frontend/src/components/Plan/BackupEvents/BackupEvents.module.scss
+++ b/frontend/src/components/Plan/BackupEvents/BackupEvents.module.scss
@@ -41,6 +41,14 @@
}
}
+.loading {
+ padding: 100px 40px;
+ text-align: center;
+ width: 100%;
+ box-sizing: border-box;
+ color: var(--icon-color);
+}
+
.eventList {
list-style-type: none;
margin: 0;
diff --git a/frontend/src/components/Plan/BackupEvents/BackupEvents.tsx b/frontend/src/components/Plan/BackupEvents/BackupEvents.tsx
index 3009e5f..599de17 100644
--- a/frontend/src/components/Plan/BackupEvents/BackupEvents.tsx
+++ b/frontend/src/components/Plan/BackupEvents/BackupEvents.tsx
@@ -22,7 +22,7 @@ interface BackupEventsProps {
const BackupEvents = ({ id, type = 'backup', sourceId, sourceType, planId, inProgress, progressData, close }: BackupEventsProps) => {
const [showError, setShowError] = useState<false | number>(false);
- const { data: fetchedProgressData } =
+ const { data: fetchedProgressData, isLoading } =
type === 'backup'
? useGetBackupProgressOnce({ id, sourceId, sourceType, planId })
: useGetRestoreProgressOnce({ id, sourceId, sourceType, planId });
@@ -61,6 +61,11 @@ const BackupEvents = ({ id, type = 'backup', sourceId, sourceType, planId, inPro
<Icon type="clock" size={14} /> {(progressDataToUse?.duration && formatDuration(progressDataToUse.duration / 1000)) || 'N/A'}
</div>
</div>
+ {isLoading && (
+ <div className={classes.loading}>
+ <Icon type={'loading'} size={30} />
+ </div>
+ )}
{progressDataToUse && progressDataToUse.events && progressDataToUse.events.length > 0 ? (
<ul className={classes.eventList}>
{progressDataToUse.events.map((event: any, index: number) => {
diff --git a/frontend/src/components/Plan/PlanSettings/PlanSourceSettings.tsx b/frontend/src/components/Plan/PlanSettings/PlanSourceSettings.tsx
index fa20dc0..66d81bb 100644
--- a/frontend/src/components/Plan/PlanSettings/PlanSourceSettings.tsx
+++ b/frontend/src/components/Plan/PlanSettings/PlanSourceSettings.tsx
@@ -21,7 +21,7 @@ const PlanSourceSettings = ({ plan, onUpdate, error, isEditing }: PlanSourceSett
...data.result.map((device: Device) => ({
label: `${device.name} ${device.id === 'main' ? '(Main)' : ''}`,
value: device.id,
- disabled: device.id === 'main' || device.connected ? false : true,
+ // disabled: device.id === 'main' || device.connected ? false : true,
})),
);
}
diff --git a/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx b/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx
index 10a94c3..f2f6c12 100644
--- a/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx
+++ b/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx
@@ -61,7 +61,7 @@ const StoragePicker = ({ onUpdate, storagePath = '', storageId, disabled = false
}
}, [selectedStorage, path]);
- console.log('Storage path :', path, !disabled && isLocalStorage && !path);
+ // console.log('Storage path :', path, !disabled && isLocalStorage && !path);
return (
<div className={classes.storagePicker}>
diff --git a/frontend/src/hooks/usePlanSingleActions.tsx b/frontend/src/hooks/usePlanSingleActions.tsx
index 2837114..e4010f1 100644
--- a/frontend/src/hooks/usePlanSingleActions.tsx
+++ b/frontend/src/hooks/usePlanSingleActions.tsx
@@ -113,6 +113,7 @@ export const usePlanSingleActions = (): {
type: 'error',
isLoading: false,
autoClose: false,
+ closeButton: true,
});
},
});