A modern, self-hosted backup solution for secure, encrypted backups across local and cloud storage.
fix: Restore Wizard ui issues.
towfiqi791cb2d07837
diff --git a/backend/src/controllers/PlanController.ts b/backend/src/controllers/PlanController.tsindex ef3ab58..5eb978c 100644--- a/backend/src/controllers/PlanController.ts+++ b/backend/src/controllers/PlanController.ts@@ -42,13 +42,17 @@ export class PlanController {}}- async checkActiveBackups(req: Request, res: Response): Promise<void> {+ async checkActiveBackupsOrRestore(req: Request, res: Response): Promise<void> {if (!req.params.id) {res.status(400).json({ success: false, error: 'Plan ID is required' });return;}try {- const hasActiveBackup = await this.planService.checkActiveBackups(req.params.id);+ const type = req.query.type === 'restore' ? 'restore' : 'backup';+ const hasActiveBackup = await this.planService.checkActiveBackupsOrRestore(+ req.params.id,+ type+ );res.status(200).json({success: true,result: hasActiveBackup,diff --git a/backend/src/routes/plans.ts b/backend/src/routes/plans.tsindex f797427..cc5705f 100644--- a/backend/src/routes/plans.ts+++ b/backend/src/routes/plans.ts@@ -10,7 +10,7 @@ export function createPlanRouter(controller: PlanController, router: Router = Rorouter.delete('/:id', authM, controller.deletePlan.bind(controller));router.get('/:id/logs', authM, controller.getLogs.bind(controller));router.get('/:id/logs/download', authM, controller.downloadLogs.bind(controller));- router.get('/:id/checkactive', authM, controller.checkActiveBackups.bind(controller));+ router.get('/:id/checkactive', authM, controller.checkActiveBackupsOrRestore.bind(controller));router.post('/:id/action/backup', authM, controller.performBackup.bind(controller));router.post('/:id/action/resume', authM, controller.resumeBackup.bind(controller));router.post('/:id/action/pause', authM, controller.pauseBackup.bind(controller));diff --git a/backend/src/services/BackupServices.ts b/backend/src/services/BackupServices.tsindex a78da23..9737b80 100644--- a/backend/src/services/BackupServices.ts+++ b/backend/src/services/BackupServices.ts@@ -17,7 +17,7 @@ import {import { BaseBackupManager } from '../managers';import { jobQueue } from '../jobs/JobQueue';import { SnapShotFile } from '../types/restic';-import { Backup } from 'src/db/schema/backups';+import { Backup } from '../db/schema/backups';export class BackupService {protected broker: any;diff --git a/backend/src/services/PlanService.ts b/backend/src/services/PlanService.tsindex 60271b1..8cf8b40 100644--- a/backend/src/services/PlanService.ts+++ b/backend/src/services/PlanService.ts@@ -57,7 +57,13 @@ export class PlanService {return result;}- public async checkActiveBackups(planId: string): Promise<boolean> {+ public async checkActiveBackupsOrRestore(+ planId: string,+ type: 'backup' | 'restore'+ ): Promise<boolean> {+ if (type === 'restore') {+ return await this.planStore.hasActiveRestore(planId);+ }return await this.planStore.hasActiveBackups(planId);}diff --git a/backend/src/stores/PlanStore.ts b/backend/src/stores/PlanStore.tsindex 6a53d6b..1df8ae6 100644--- a/backend/src/stores/PlanStore.ts+++ b/backend/src/stores/PlanStore.ts@@ -6,6 +6,7 @@ import { backups } from '../db/schema/backups';import { PlanBackupSettings, PlanFull } from '../types/plans';import Cryptr from 'cryptr';import { configService } from '../services/ConfigService';+import { restores } from '../db/schema/restores';/*** PlanStore is a class for managing plan records in the database.@@ -254,6 +255,16 @@ export class PlanStore {return result.length > 0;}+ async hasActiveRestore(planId: string): Promise<boolean> {+ const result = await this.db+ .select()+ .from(restores)+ .where(and(eq(restores.planId, planId), eq(restores.inProgress, true)))+ .limit(1);++ return result.length > 0;+ }+async setActive(id: string, isActive: boolean): Promise<Plan | null> {return this.update(id, { isActive });}diff --git a/frontend/src/components/Plan/Backups/Backups.module.scss b/frontend/src/components/Plan/Backups/Backups.module.scssindex 6810142..48d4096 100644--- a/frontend/src/components/Plan/Backups/Backups.module.scss+++ b/frontend/src/components/Plan/Backups/Backups.module.scss@@ -47,7 +47,8 @@cursor: pointer;transition: all 0.12s linear;}- .backupTitle {+ .backupTitle,+ .restoreTitle {cursor: pointer;&:hover {diff --git a/frontend/src/components/Plan/PlanPendingBackup/PlanPendingBackup.tsx b/frontend/src/components/Plan/PlanPendingBackup/PlanPendingBackup.tsxindex 62be6c1..747960c 100644--- a/frontend/src/components/Plan/PlanPendingBackup/PlanPendingBackup.tsx+++ b/frontend/src/components/Plan/PlanPendingBackup/PlanPendingBackup.tsx@@ -1,37 +1,46 @@import { useEffect } from 'react';import { useSearchParams } from 'react-router';-import { useCheckActiveBackups } from '../../../services/plans';+import { useCheckActiveBackupsOrRestore } from '../../../services/plans';import classes from './PlanPendingBackup.module.scss';import Icon from '../../common/Icon/Icon';interface PlanPendingBackup {planId: string;- onPendingBackupDetect: () => void;+ type?: 'backup' | 'restore';+ onPendingDetect: () => void;}-const PlanPendingBackup = ({ planId, onPendingBackupDetect }: PlanPendingBackup) => {+const PlanPendingBackup = ({ planId, type = 'backup', onPendingDetect }: PlanPendingBackup) => {const [, setSearchParams] = useSearchParams();- const checkActiveBackupsMutation = useCheckActiveBackups();+ const checkActivesMutation = useCheckActiveBackupsOrRestore();useEffect(() => {const interval = window.setInterval(() => {- checkActiveBackupsMutation.mutate(planId, {- onSuccess: (data) => {- console.log('[isBackupPending] data :', data);- if (data.result) {- window.clearInterval(interval);- setSearchParams((params) => {- params.delete('pendingbackup');- return params;- });- onPendingBackupDetect();- }+ checkActivesMutation.mutate(+ { planId, type },+ {+ onSuccess: (data) => {+ console.log('[isBackupPending] data :', data);+ if (data.result) {+ window.clearInterval(interval);+ setSearchParams((params) => {+ if (type === 'restore') {+ params.delete('pendingrestore');+ } else {+ params.delete('pendingbackup');+ }++ return params;+ });+ onPendingDetect();+ }+ },},- });+ );}, 1000);return () => window.clearInterval(interval);- }, [planId]);+ }, [planId, type]);return (<div className={classes.backup}>@@ -39,7 +48,7 @@ const PlanPendingBackup = ({ planId, onPendingBackupDetect }: PlanPendingBackup)<Icon type="loading" size={24} /></div><div className={classes.backupLeft}>- <div className={classes.backupId}>Starting Backup...</div>+ <div className={classes.backupId}>Starting {type}...</div><div className={classes.backupStart}><div><Icon type="clock" size={12} /> Starting in a few secondsdiff --git a/frontend/src/components/Plan/PlanProgress/PlanProgress.tsx b/frontend/src/components/Plan/PlanProgress/PlanProgress.tsxindex 5b65c64..e68dc82 100644--- a/frontend/src/components/Plan/PlanProgress/PlanProgress.tsx+++ b/frontend/src/components/Plan/PlanProgress/PlanProgress.tsx@@ -8,12 +8,13 @@ import classes from './PlanProgress.module.scss';interface PlanProgressProps {plan: Plan;isBackupPending: boolean;+ isRestorePending?: boolean;activeBackups: Backup[];activeRestores: RestoreSlim[];refetchPlan: () => void;}-const PlanProgress = ({ plan, isBackupPending, activeBackups, activeRestores, refetchPlan }: PlanProgressProps) => {+const PlanProgress = ({ plan, isBackupPending, isRestorePending, activeBackups, activeRestores, refetchPlan }: PlanProgressProps) => {return (<div>{isBackupPending && (@@ -22,7 +23,7 @@ const PlanProgress = ({ plan, isBackupPending, activeBackups, activeRestores, re<h3>Backup in Progress</h3></div><div className={classes.activeBackupsTable}>- <PlanPendingBackup planId={plan.id} onPendingBackupDetect={() => refetchPlan()} />+ <PlanPendingBackup planId={plan.id} onPendingDetect={() => refetchPlan()} /></div></div>)}@@ -49,6 +50,16 @@ const PlanProgress = ({ plan, isBackupPending, activeBackups, activeRestores, re</div>)}+ {isRestorePending && (+ <div className={classes.activeBackups}>+ <div className={classes.backupsHeader}>+ <h3>Restore in Progress</h3>+ </div>+ <div className={classes.activeBackupsTable}>+ <PlanPendingBackup planId={plan.id} type="restore" onPendingDetect={() => refetchPlan()} />+ </div>+ </div>+ )}{activeRestores.length > 0 && (<div className={classes.activeBackups}><div className={classes.backupsHeader}>diff --git a/frontend/src/components/Plan/Restores/Restores.tsx b/frontend/src/components/Plan/Restores/Restores.tsxindex 011a154..67d92a8 100644--- a/frontend/src/components/Plan/Restores/Restores.tsx+++ b/frontend/src/components/Plan/Restores/Restores.tsx@@ -69,7 +69,7 @@ const Restores = ({key={id}className={`${classes.backupsTableRow} ${showSnapOptions && showSnapOptions === id ? classes.backupsTableRowActive : ''}`}>- <div className={classes.backupTitle} onClick={() => !isSync && setShowRestoreEvents(id)}>+ <div className={classes.restoreTitle} onClick={() => !isSync && setShowRestoreEvents(id)}><Icon type={isSync ? 'sync' : 'box'} size={14} /> {isSync ? 'sync' : 'backup'}-{backupId}</div><divdiff --git a/frontend/src/components/Restore/RestoreFileSelector/RestoreFileSelector.tsx b/frontend/src/components/Restore/RestoreFileSelector/RestoreFileSelector.tsxindex 0e576ca..58b2ab7 100644--- a/frontend/src/components/Restore/RestoreFileSelector/RestoreFileSelector.tsx+++ b/frontend/src/components/Restore/RestoreFileSelector/RestoreFileSelector.tsx@@ -165,12 +165,12 @@ const RestoreFileSelector = ({ selected, files, isLoading, errorFetching, showChconst restorableFiles = fileSelectCondition ? files.filter((file) => fileSelectCondition(file)) : files;- console.log('restorableFiles :', restorableFiles);-restorableFiles.forEach((file) => {if (isPathSelected(file.path)) {selectedFilesCount++;- selectedBytes += file.size;+ if (!file.isDirectory) {+ selectedBytes += file.size;+ }}});@@ -500,7 +500,7 @@ const RestoreFileSelector = ({ selected, files, isLoading, errorFetching, showCh</div></div>{selectedFolder ? (- <List height={window.innerHeight - 300} itemCount={directChildren.length} itemSize={ITEM_HEIGHT} width="100%">+ <List height={window.innerHeight - 370} itemCount={directChildren.length} itemSize={ITEM_HEIGHT} width="100%">{Row}</List>) : (diff --git a/frontend/src/components/Restore/RestoreWizard/RestoreConfirmStep.tsx b/frontend/src/components/Restore/RestoreWizard/RestoreConfirmStep.tsxindex ebd2588..35a272e 100644--- a/frontend/src/components/Restore/RestoreWizard/RestoreConfirmStep.tsx+++ b/frontend/src/components/Restore/RestoreWizard/RestoreConfirmStep.tsx@@ -1,3 +1,5 @@+import { toast } from 'react-toastify';+import { useNavigate } from 'react-router';import Icon from '../../common/Icon/Icon';import { useRestoreBackup } from '../../../services/restores';import classes from './RestoreWizard.module.scss';@@ -16,20 +18,34 @@ interface RestoreConfirmStepProps {const RestoreConfirmStep = ({ backupId, planId, settings, stats, snapshotsStats, method, goBack, close }: RestoreConfirmStepProps) => {const restoreMutation = useRestoreBackup();+ const navigate = useNavigate();const restoreStats = stats;const isSync = method === 'sync';const restoreBackup = () => {console.log('restore :', backupId);- restoreMutation.mutate({- backupId,- planId,- overwrite: settings.overwrite,- target: settings.type === 'custom' ? settings.path : '',- includes: settings.includes,- excludes: settings.excludes,- deleteOption: settings.delete,- });+ restoreMutation.mutate(+ {+ backupId,+ planId,+ overwrite: settings.overwrite,+ target: settings.type === 'custom' ? settings.path : '',+ includes: settings.includes,+ excludes: settings.excludes,+ deleteOption: settings.delete,+ },+ {+ onSuccess: (data: any, variables) => {+ console.log('Success :', data);+ toast.success(`Restore Started`, { autoClose: 5000 });+ const targetPlanId = variables?.planId;+ if (targetPlanId) {+ navigate(`/plan/${targetPlanId}?pendingrestore=1`);+ }+ close();+ },+ },+ );};return (@@ -69,15 +85,6 @@ const RestoreConfirmStep = ({ backupId, planId, settings, stats, snapshotsStats,</button></div>)}- {restoreMutation.isSuccess && (- <p className={classes.restoreSuccessMsg}>- <Icon type="check-circle-filled" size={14} color="lightseagreen" /> Restore Process Started.{' '}- <button onClick={() => location.reload()}>- <Icon type="reload" size={12} /> Reload- </button>{' '}- the page to view the restoration progress.- </p>- )}{restoreMutation.isError && (<div className={classes.restoreError}><Icon type="error" size={14} color="red" /> {restoreMutation.error?.message || 'Failed to Generate Preview'}@@ -94,7 +101,7 @@ const RestoreConfirmStep = ({ backupId, planId, settings, stats, snapshotsStats,</div><div className={classes.footerRight}><button onClick={() => close()} disabled={restoreMutation.isPending}>- {restoreMutation.isSuccess ? 'Close' : 'Cancel'}+ Cancel</button></div></div>diff --git a/frontend/src/components/Restore/RestoreWizard/RestorePreviewStep.tsx b/frontend/src/components/Restore/RestoreWizard/RestorePreviewStep.tsxindex df89145..c9db600 100644--- a/frontend/src/components/Restore/RestoreWizard/RestorePreviewStep.tsx+++ b/frontend/src/components/Restore/RestoreWizard/RestorePreviewStep.tsx@@ -96,7 +96,7 @@ const RestorePreviewStep = ({ backupId, planId, settings, preview, nextLabel, go</button></div>)}- {restoreStats && <RestoredFileBrowser files={restoredFiles} stats={restoreStats} />}+ {restoreStats && <RestoredFileBrowser files={restoredFiles} stats={restoreStats} isPreview={true} />}</div><div className={classes.footer}><div className={classes.footerLeft}>diff --git a/frontend/src/components/Restore/RestoreWizard/RestoreWizard.module.scss b/frontend/src/components/Restore/RestoreWizard/RestoreWizard.module.scssindex 8fb7429..e993af2 100644--- a/frontend/src/components/Restore/RestoreWizard/RestoreWizard.module.scss+++ b/frontend/src/components/Restore/RestoreWizard/RestoreWizard.module.scss@@ -136,8 +136,8 @@.fileManagerBtn {position: absolute;right: 0;- top: 22px;- padding: 10px;+ top: 0;+ padding: 8px;cursor: pointer;color: var(--icon-color);&:hover {diff --git a/frontend/src/components/Restore/RestoredFileBrowser/RestoredFileBrowser.tsx b/frontend/src/components/Restore/RestoredFileBrowser/RestoredFileBrowser.tsxindex c67d224..dfcf93e 100644--- a/frontend/src/components/Restore/RestoredFileBrowser/RestoredFileBrowser.tsx+++ b/frontend/src/components/Restore/RestoredFileBrowser/RestoredFileBrowser.tsx@@ -1,4 +1,4 @@-import { useState, useMemo } from 'react';+import { useState, useMemo, useEffect } from 'react';import { FixedSizeList as List } from 'react-window';import Icon from '../../common/Icon/Icon';import classes from './RestoredFileBrowser.module.scss';@@ -10,12 +10,13 @@ import FileIcon from '../../common/FileIcon/FileIcon';interface RestoredFileBrowserProps {files: RestoredFileItem[];stats?: RestoredItemsStats;+ isPreview?: boolean;}const isMobileDevice = isMobile();const ITEM_HEIGHT = isMobileDevice ? 65 : 45;-const RestoredFileBrowser = ({ files, stats }: RestoredFileBrowserProps) => {+const RestoredFileBrowser = ({ files, stats, isPreview = false }: RestoredFileBrowserProps) => {const [selectedFolder, setSelectedFolder] = useState<string>('');const [search, setSearch] = useState('');const [filters, setFilters] = useState({@@ -69,9 +70,11 @@ const RestoredFileBrowser = ({ files, stats }: RestoredFileBrowserProps) => {const directories = useMemo(() => {const dirs = new Set<string>();- Object.keys(fileSystem).forEach((path) => {- const separator = getPathSeparator(path);- const parts = splitPath(path);+ // Derive directories from all files, not filtered fileSystem, to keep tree stable during search+ files.forEach((file) => {+ const dirPath = getParentPath(file.path);+ const separator = getPathSeparator(dirPath);+ const parts = splitPath(dirPath);let currentPath = '';parts.forEach((part) => {@@ -81,14 +84,15 @@ const RestoredFileBrowser = ({ files, stats }: RestoredFileBrowserProps) => {}});});- const dirsArray = Array.from(dirs);-- // Set the first directory as selected by default- console.log('SelectedFolder :', dirsArray[0]);- setSelectedFolder(dirsArray[0] || '');+ return Array.from(dirs);+ }, [files]);- return dirsArray;- }, [fileSystem]);+ // Set initial selected folder when directories change+ useEffect(() => {+ if (directories.length > 0 && selectedFolder === '') {+ setSelectedFolder(directories[0]);+ }+ }, [directories, selectedFolder]);const hasSubdirectories = (dir: string) => {const separator = getPathSeparator(dir);@@ -308,7 +312,7 @@ const RestoredFileBrowser = ({ files, stats }: RestoredFileBrowserProps) => {</div>{selectedFolder && totalItems > 0 ? (<List- height={window.innerHeight - 250}+ height={window.innerHeight - (isPreview ? 370 : 250)}itemCount={totalItems}itemSize={ITEM_HEIGHT}width="100%"@@ -317,7 +321,7 @@ const RestoredFileBrowser = ({ files, stats }: RestoredFileBrowserProps) => {{FileRow}</List>) : (- <div className={classes.fileListEmpty}>Select a folder from the left to browse it's content</div>+ <div className={classes.fileListEmpty}>Select a folder from the left to browse its content</div>)}</div></div>diff --git a/frontend/src/routes/PlanSingle/PlanSingle.tsx b/frontend/src/routes/PlanSingle/PlanSingle.tsxindex a394531..2aacf19 100644--- a/frontend/src/routes/PlanSingle/PlanSingle.tsx+++ b/frontend/src/routes/PlanSingle/PlanSingle.tsx@@ -23,6 +23,7 @@ const PlanSingle = () => {const [searchParams] = useSearchParams();const isBackupPending = searchParams.get('pendingbackup') === '1';+ const isRestorePending = searchParams.get('pendingrestore') === '1';const {showDeleteModal,@@ -154,6 +155,7 @@ const PlanSingle = () => {<PlanProgressplan={plan}isBackupPending={isBackupPending}+ isRestorePending={isRestorePending}activeBackups={activeBackups}activeRestores={activeRestores}refetchPlan={refetchPlan}diff --git a/frontend/src/services/plans.ts b/frontend/src/services/plans.tsindex 57290bb..83d451b 100644--- a/frontend/src/services/plans.ts+++ b/frontend/src/services/plans.ts@@ -370,8 +370,9 @@ export function useUnlockPlan() {}// Get Backup Progress-export async function checkActiveBackups(planId: string) {+export async function checkActiveBackupsOrRestore(planId: string, type: 'backup' | 'restore' = 'backup') {const url = new URL(`${API_URL}/plans/${planId}/checkactive`);+ url.searchParams.append('type', type);const res = await fetch(url.toString(), {method: 'GET',@@ -384,10 +385,10 @@ export async function checkActiveBackups(planId: string) {return data;}-export function useCheckActiveBackups() {+export function useCheckActiveBackupsOrRestore() {return useMutation({// queryKey: ['planActiveBackups-' + planId],- mutationFn: checkActiveBackups,+ mutationFn: ({ planId, type }: { planId: string; type: 'backup' | 'restore' }) => checkActiveBackupsOrRestore(planId, type),// refetchOnMount: true,});}