Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7b594c8ca |
No files matched your search
@@ -30,8 +30,9 @@ needed to restore encrypted integration credentials.
|
|||||||
Select a Homarr backup ZIP. The browser previews entity counts, board names, and required database migrations before
|
Select a Homarr backup ZIP. The browser previews entity counts, board names, and required database migrations before
|
||||||
the archive is uploaded.
|
the archive is uploaded.
|
||||||
|
|
||||||
Restoring replaces the current SQLite database and cannot be undone. After a successful restore, the Next.js process
|
Restoring replaces the current SQLite database and cannot be undone. It also invalidates the current database session.
|
||||||
restarts and the page reloads when Homarr is ready.
|
After a successful management restore, Homarr waits for the restarted server and sends the administrator to sign in
|
||||||
|
again. The first-run onboarding restore keeps its existing board destination.
|
||||||
|
|
||||||
A backup can be restored on another Homarr instance. When its `SECRET_ENCRYPTION_KEY` differs, Homarr re-encrypts stored
|
A backup can be restored on another Homarr instance. When its `SECRET_ENCRYPTION_KEY` differs, Homarr re-encrypts stored
|
||||||
integration secrets for the target instance. Version metadata is used to apply compatible migrations.
|
integration secrets for the target instance. Version metadata is used to apply compatible migrations.
|
||||||
|
|||||||
@@ -204,8 +204,12 @@ export const DatabaseRestoreFlow = ({ variant = "card", onRestoreComplete }: Dat
|
|||||||
}
|
}
|
||||||
|
|
||||||
onRestoreComplete?.();
|
onRestoreComplete?.();
|
||||||
const destination =
|
let destination: string | null = null;
|
||||||
variant === "standalone" && homeBoardName ? `/boards/${encodeURIComponent(homeBoardName)}` : null;
|
if (variant === "standalone" && homeBoardName) {
|
||||||
|
destination = `/boards/${encodeURIComponent(homeBoardName)}`;
|
||||||
|
} else if (variant === "card") {
|
||||||
|
destination = "/auth/login";
|
||||||
|
}
|
||||||
startReadinessCheck(restartAfterMs, destination);
|
startReadinessCheck(restartAfterMs, destination);
|
||||||
}, [file, onRestoreComplete, startReadinessCheck, t, variant]);
|
}, [file, onRestoreComplete, startReadinessCheck, t, variant]);
|
||||||
|
|
||||||
@@ -317,6 +321,7 @@ export const DatabaseRestoreFlow = ({ variant = "card", onRestoreComplete }: Dat
|
|||||||
<RestoreProgressPanel
|
<RestoreProgressPanel
|
||||||
active
|
active
|
||||||
status={restoreStatus}
|
status={restoreStatus}
|
||||||
|
reloginRequired={variant === "card"}
|
||||||
onRetry={() => startReadinessCheck(0)}
|
onRetry={() => startReadinessCheck(0)}
|
||||||
onReload={() => window.location.reload()}
|
onReload={() => window.location.reload()}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -11,11 +11,18 @@ export type RestoreProgressStatus = "restoring" | "restarting" | "timedOut";
|
|||||||
interface RestoreProgressPanelProps {
|
interface RestoreProgressPanelProps {
|
||||||
active: boolean;
|
active: boolean;
|
||||||
status: RestoreProgressStatus;
|
status: RestoreProgressStatus;
|
||||||
|
reloginRequired?: boolean;
|
||||||
onRetry: () => void;
|
onRetry: () => void;
|
||||||
onReload: () => void;
|
onReload: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const RestoreProgressPanel = ({ active, status, onRetry, onReload }: RestoreProgressPanelProps) => {
|
export const RestoreProgressPanel = ({
|
||||||
|
active,
|
||||||
|
status,
|
||||||
|
reloginRequired = false,
|
||||||
|
onRetry,
|
||||||
|
onReload,
|
||||||
|
}: RestoreProgressPanelProps) => {
|
||||||
const t = useI18n("management.page.tool.backup.restore");
|
const t = useI18n("management.page.tool.backup.restore");
|
||||||
const tCommon = useI18n("common");
|
const tCommon = useI18n("common");
|
||||||
const reduceMotion = useReducedMotion();
|
const reduceMotion = useReducedMotion();
|
||||||
@@ -63,6 +70,12 @@ export const RestoreProgressPanel = ({ active, status, onRetry, onReload }: Rest
|
|||||||
</div>
|
</div>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
|
{reloginRequired && !isRestoring ? (
|
||||||
|
<Text size="sm" c="dimmed">
|
||||||
|
{t("progress.relogin")}
|
||||||
|
</Text>
|
||||||
|
) : null}
|
||||||
|
|
||||||
{isTimedOut ? (
|
{isTimedOut ? (
|
||||||
<Group>
|
<Group>
|
||||||
<Button variant="light" onClick={onRetry} leftSection={<IconRefresh size={16} />}>
|
<Button variant="light" onClick={onRetry} leftSection={<IconRefresh size={16} />}>
|
||||||
|
|||||||
@@ -6456,7 +6456,8 @@
|
|||||||
},
|
},
|
||||||
"progress": {
|
"progress": {
|
||||||
"title": "Restoring database...",
|
"title": "Restoring database...",
|
||||||
"restarting": "Restarting server"
|
"restarting": "Restarting server",
|
||||||
|
"relogin": "Restoring the database invalidated your current session. Homarr will send you to sign in when the server is ready."
|
||||||
},
|
},
|
||||||
"timeout": {
|
"timeout": {
|
||||||
"title": "Server did not come back online",
|
"title": "Server did not come back online",
|
||||||
|
|||||||
Generated
+23
-23
@@ -25,11 +25,11 @@ catalogs:
|
|||||||
specifier: 0.14.9
|
specifier: 0.14.9
|
||||||
version: 0.14.9
|
version: 0.14.9
|
||||||
'@auth/core':
|
'@auth/core':
|
||||||
specifier: ^0.41.3
|
specifier: ^0.41.2
|
||||||
version: 0.41.3
|
version: 0.41.2
|
||||||
'@auth/drizzle-adapter':
|
'@auth/drizzle-adapter':
|
||||||
specifier: ^1.11.3
|
specifier: ^1.11.2
|
||||||
version: 1.11.3
|
version: 1.11.2
|
||||||
'@babel/parser':
|
'@babel/parser':
|
||||||
specifier: ^7.29.7
|
specifier: ^7.29.7
|
||||||
version: 7.29.7
|
version: 7.29.7
|
||||||
@@ -520,8 +520,8 @@ catalogs:
|
|||||||
specifier: 16.3.1
|
specifier: 16.3.1
|
||||||
version: 16.3.1
|
version: 16.3.1
|
||||||
next-auth:
|
next-auth:
|
||||||
specifier: 5.0.0-beta.32
|
specifier: 5.0.0-beta.31
|
||||||
version: 5.0.0-beta.32
|
version: 5.0.0-beta.31
|
||||||
next-intl:
|
next-intl:
|
||||||
specifier: 4.13.1
|
specifier: 4.13.1
|
||||||
version: 4.13.1
|
version: 4.13.1
|
||||||
@@ -1587,10 +1587,10 @@ importers:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@auth/core':
|
'@auth/core':
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 0.41.3
|
version: 0.41.2
|
||||||
'@auth/drizzle-adapter':
|
'@auth/drizzle-adapter':
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 1.11.3
|
version: 1.11.2
|
||||||
'@homarr/common':
|
'@homarr/common':
|
||||||
specifier: workspace:^0.1.0
|
specifier: workspace:^0.1.0
|
||||||
version: link:../common
|
version: link:../common
|
||||||
@@ -1620,7 +1620,7 @@ importers:
|
|||||||
version: 16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0)
|
version: 16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0)
|
||||||
next-auth:
|
next-auth:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 5.0.0-beta.32(next@16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0))(react@19.2.7)
|
version: 5.0.0-beta.31(next@16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0))(react@19.2.7)
|
||||||
react:
|
react:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 19.2.7
|
version: 19.2.7
|
||||||
@@ -1989,7 +1989,7 @@ importers:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@auth/core':
|
'@auth/core':
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 0.41.3
|
version: 0.41.2
|
||||||
'@homarr/common':
|
'@homarr/common':
|
||||||
specifier: workspace:^0.1.0
|
specifier: workspace:^0.1.0
|
||||||
version: link:../common
|
version: link:../common
|
||||||
@@ -3346,12 +3346,12 @@ packages:
|
|||||||
react:
|
react:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@auth/core@0.41.3':
|
'@auth/core@0.41.2':
|
||||||
resolution: {integrity: sha512-sJ3JMHHkXMD3aOjopv7mOBTO1Ocw4b0fAEXJBz6k7YHLpYQI6C40jCUPc5fNvUKxXRXNE1/sRISA15UrwWJBTw==}
|
resolution: {integrity: sha512-Hx5MNBxN2fJTbJKGUKAA0wca43D0Akl3TvufY54Gn8lop7F+34vU1zA1pn0vQfIoVuLIrpfc2nkyjwIaPJMW7w==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@simplewebauthn/browser': ^9.0.1
|
'@simplewebauthn/browser': ^9.0.1
|
||||||
'@simplewebauthn/server': ^9.0.2
|
'@simplewebauthn/server': ^9.0.2
|
||||||
nodemailer: ^7.0.7 || ^8.0.5
|
nodemailer: ^7.0.7
|
||||||
peerDependenciesMeta:
|
peerDependenciesMeta:
|
||||||
'@simplewebauthn/browser':
|
'@simplewebauthn/browser':
|
||||||
optional: true
|
optional: true
|
||||||
@@ -3360,8 +3360,8 @@ packages:
|
|||||||
nodemailer:
|
nodemailer:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@auth/drizzle-adapter@1.11.3':
|
'@auth/drizzle-adapter@1.11.2':
|
||||||
resolution: {integrity: sha512-TxqVasPVuf7LDAT1Yuu6bftpuet8o0tjdXW+mXpnXWdSRPQsomdzMoz9RsXkFN/JfdK+/DwdgOEmOTv1gbiFNw==}
|
resolution: {integrity: sha512-VOuj7REI8jfJjpSbsYwDM/Zrn55T6lS9Yc+29V+EXMcel8eqG7x+7LodNfd1WHjakfkLYi+qsbYUHB3E6aDA4w==}
|
||||||
|
|
||||||
'@babel/code-frame@7.29.0':
|
'@babel/code-frame@7.29.0':
|
||||||
resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
|
resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
|
||||||
@@ -13685,13 +13685,13 @@ packages:
|
|||||||
neverpanic@0.0.8:
|
neverpanic@0.0.8:
|
||||||
resolution: {integrity: sha512-vVdkelrLxaow/fdWDumzNBO+jwm6X8bxeLJc34THtpj70u0C5QBkcV6CRCu2X726km7XD45N0A3QtYCla4RvKw==}
|
resolution: {integrity: sha512-vVdkelrLxaow/fdWDumzNBO+jwm6X8bxeLJc34THtpj70u0C5QBkcV6CRCu2X726km7XD45N0A3QtYCla4RvKw==}
|
||||||
|
|
||||||
next-auth@5.0.0-beta.32:
|
next-auth@5.0.0-beta.31:
|
||||||
resolution: {integrity: sha512-CGlChIEWZ6LltNVxrE5yiySMID+Idpmry47JYA5lLwgD8Sx02a8M65VL0TWVz9nbnOioS/tCW/rP/0+mE7Qp4Q==}
|
resolution: {integrity: sha512-1OBgCKPzo+S7UWWMp3xgvGvIJ0OpV7B3vR4ZDRqD9a4Ch+OT6dakLXG9ivhtmIWVa71nTSXattOHyCg8sNi8/Q==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@simplewebauthn/browser': ^9.0.1
|
'@simplewebauthn/browser': ^9.0.1
|
||||||
'@simplewebauthn/server': ^9.0.2
|
'@simplewebauthn/server': ^9.0.2
|
||||||
next: ^14.0.0-0 || ^15.0.0 || ^16.0.0
|
next: ^14.0.0-0 || ^15.0.0 || ^16.0.0
|
||||||
nodemailer: ^7.0.7 || ^8.0.5
|
nodemailer: ^7.0.7
|
||||||
react: ^18.2.0 || ^19.0.0
|
react: ^18.2.0 || ^19.0.0
|
||||||
peerDependenciesMeta:
|
peerDependenciesMeta:
|
||||||
'@simplewebauthn/browser':
|
'@simplewebauthn/browser':
|
||||||
@@ -17439,7 +17439,7 @@ snapshots:
|
|||||||
'@types/react': 19.2.17
|
'@types/react': 19.2.17
|
||||||
react: 19.2.7
|
react: 19.2.7
|
||||||
|
|
||||||
'@auth/core@0.41.3':
|
'@auth/core@0.41.2':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@panva/hkdf': 1.2.1
|
'@panva/hkdf': 1.2.1
|
||||||
jose: 6.2.3
|
jose: 6.2.3
|
||||||
@@ -17447,9 +17447,9 @@ snapshots:
|
|||||||
preact: 10.24.3
|
preact: 10.24.3
|
||||||
preact-render-to-string: 6.5.11(preact@10.24.3)
|
preact-render-to-string: 6.5.11(preact@10.24.3)
|
||||||
|
|
||||||
'@auth/drizzle-adapter@1.11.3':
|
'@auth/drizzle-adapter@1.11.2':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@auth/core': 0.41.3
|
'@auth/core': 0.41.2
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@simplewebauthn/browser'
|
- '@simplewebauthn/browser'
|
||||||
- '@simplewebauthn/server'
|
- '@simplewebauthn/server'
|
||||||
@@ -30001,9 +30001,9 @@ snapshots:
|
|||||||
|
|
||||||
neverpanic@0.0.8: {}
|
neverpanic@0.0.8: {}
|
||||||
|
|
||||||
next-auth@5.0.0-beta.32(next@16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0))(react@19.2.7):
|
next-auth@5.0.0-beta.31(next@16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0))(react@19.2.7):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@auth/core': 0.41.3
|
'@auth/core': 0.41.2
|
||||||
next: 16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0)
|
next: 16.3.1(@babel/core@7.29.0(supports-color@10.2.2))(@opentelemetry/api@1.9.0)(@playwright/test@1.61.1)(@types/node@24.13.3)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(sass@1.101.0)
|
||||||
react: 19.2.7
|
react: 19.2.7
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -14,8 +14,8 @@ catalog:
|
|||||||
"@codemirror/state": ^6.6.0
|
"@codemirror/state": ^6.6.0
|
||||||
"@codemirror/theme-one-dark": ^6.1.3
|
"@codemirror/theme-one-dark": ^6.1.3
|
||||||
"@codemirror/view": ^6.43.0
|
"@codemirror/view": ^6.43.0
|
||||||
"@auth/core": ^0.41.3
|
"@auth/core": ^0.41.2
|
||||||
"@auth/drizzle-adapter": ^1.11.3
|
"@auth/drizzle-adapter": ^1.11.2
|
||||||
"@ctrl/deluge": ^8.0.0
|
"@ctrl/deluge": ^8.0.0
|
||||||
"@ctrl/qbittorrent": ^9.14.0
|
"@ctrl/qbittorrent": ^9.14.0
|
||||||
"@ctrl/transmission": ^7.4.0
|
"@ctrl/transmission": ^7.4.0
|
||||||
@@ -174,7 +174,7 @@ catalog:
|
|||||||
maria2: ^0.4.1
|
maria2: ^0.4.1
|
||||||
mysql2: 3.22.6
|
mysql2: 3.22.6
|
||||||
next: 16.3.1
|
next: 16.3.1
|
||||||
next-auth: 5.0.0-beta.32
|
next-auth: 5.0.0-beta.31
|
||||||
next-intl: 4.13.1
|
next-intl: 4.13.1
|
||||||
next-themes: ^0.4.6
|
next-themes: ^0.4.6
|
||||||
node-loader: ^2.1.0
|
node-loader: ^2.1.0
|
||||||
|
|||||||
Reference in new issue
Block a user