Skip to content

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

fix: resolves forever loading issue when sync now button was clicked

towfiqi6d5d3f6feeff
diff --git a/backend/src/controllers/PlanController.ts b/backend/src/controllers/PlanController.ts
index b29fa92..17a3999 100644
--- a/backend/src/controllers/PlanController.ts
+++ b/backend/src/controllers/PlanController.ts
@@ -164,8 +164,8 @@ export class PlanController {
return;
}
- await this.planService.performBackup(req.params.id);
- res.status(200).json({ success: true, message: 'Backup initiated successfully' });
+ const result = await this.planService.performBackup(req.params.id);
+ res.status(200).json({ success: true, message: result || 'Backup initiated successfully' });
} catch (error: unknown) {
const appError = error as AppError;
res.status(appError.statusCode || 500).json({
diff --git a/backend/src/services/PlanService.ts b/backend/src/services/PlanService.ts
index ef0113b..87f60c6 100644
--- a/backend/src/services/PlanService.ts
+++ b/backend/src/services/PlanService.ts
@@ -268,7 +268,7 @@ export class PlanService {
/**
* Triggers a one-off manual backup for a plan.
*/
- public async performBackup(planId: string): Promise<void> {
+ public async performBackup(planId: string): Promise<string> {
const plan = await this.planStore.getById(planId);
if (!plan) throw new NotFoundError(`Plan with ID ${planId} not found.`);
@@ -281,6 +281,8 @@ export class PlanService {
if (!performResult.success) {
throw new AppError(500, performResult.result);
+ } else {
+ return performResult.result;
}
}
diff --git a/backend/src/utils/rclone/rclone.ts b/backend/src/utils/rclone/rclone.ts
index bd32353..b206548 100644
--- a/backend/src/utils/rclone/rclone.ts
+++ b/backend/src/utils/rclone/rclone.ts
@@ -21,7 +21,7 @@ export function runRcloneCommand(args: string[], env?: Record<string, string>):
...globalRcloneEnv,
...env, // Per-call overrides still take precedence
};
- // console.log('rcloneBinary :', rcloneBinary);
+ // console.log('rcloneBinary :', rcloneBinary, args);
const rcProcess = spawn(rcloneBinary, args, { env: envVars });
let output = '';
let errorOutput = '';
diff --git a/frontend/src/hooks/usePlanSingleActions.tsx b/frontend/src/hooks/usePlanSingleActions.tsx
index e4010f1..1158bad 100644
--- a/frontend/src/hooks/usePlanSingleActions.tsx
+++ b/frontend/src/hooks/usePlanSingleActions.tsx
@@ -98,14 +98,16 @@ export const usePlanSingleActions = (): {
const toastId = toast.loading(`Starting ${isSync ? 'Sync' : 'Backup'}...`);
performBackupMutation.mutate(plan.id, {
- onSuccess: () => {
+ onSuccess: (data) => {
toast.update(toastId, {
- render: `${isSync ? 'Sync' : 'Backup'} initiated successfully! πŸš€`,
+ render: isSync ? data?.message || 'Sync initiated successfully! πŸš€' : 'Backup initiated successfully! πŸš€',
type: 'success',
isLoading: false,
autoClose: 3000,
});
- navigate(`/plan/${plan.id}?pendingbackup=1`);
+ if (!isSync) {
+ navigate(`/plan/${plan.id}?pendingbackup=1`);
+ }
},
onError: (error: any) => {
toast.update(toastId, {