fix(web): use the "finish" in InstallationFinished component

agama-project · Jan 24, 2025 · 67eb108 · 67eb108
1 parent 881869e
commit 67eb108
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -55,11 +55,11 @@ function App() {
   const Content = () => {
     if (error) return <ServerError />;
 
-    if (phase === InstallationPhase.Install && isBusy) {
+    if (phase === InstallationPhase.Install) {
       return <Navigate to={ROOT.installationProgress} />;
     }
 
-    if (phase === InstallationPhase.Install && !isBusy) {
+    if (phase === InstallationPhase.Finish) {
       return <Navigate to={ROOT.installationFinished} />;
     }
 

diff --git a/web/src/components/core/InstallationFinished.test.tsx b/web/src/components/core/InstallationFinished.test.tsx
@@ -29,7 +29,7 @@ import { Encryption } from "~/api/storage/types/config";
 
 jest.mock("~/queries/status", () => ({
   ...jest.requireActual("~/queries/status"),
-  useInstallerStatus: () => ({ isBusy: false, useIguana: false, phase: 2, canInstall: false }),
+  useInstallerStatus: () => ({ isBusy: false, useIguana: false, phase: 3, canInstall: false }),
 }));
 
 type storageConfigType = "guided" | "raw";

diff --git a/web/src/components/core/InstallationFinished.tsx b/web/src/components/core/InstallationFinished.tsx
@@ -100,17 +100,13 @@ function usingTpm(config): boolean {
 }
 
 function InstallationFinished() {
-  const { phase, isBusy, useIguana } = useInstallerStatus({ suspense: true });
+  const { phase, useIguana } = useInstallerStatus({ suspense: true });
   const config = useConfig();
 
-  if (phase !== InstallationPhase.Install) {
+  if (phase !== InstallationPhase.Finish) {
     return <Navigate to={PATHS.root} />;
   }
 
-  if (isBusy) {
-    return <Navigate to={PATHS.installationProgress} />;
-  }
-
   return (
     <Center>
       <Grid hasGutter>

diff --git a/web/src/types/status.ts b/web/src/types/status.ts
@@ -27,6 +27,7 @@ enum InstallationPhase {
   Startup = 0,
   Config = 1,
   Install = 2,
+  Finish = 3,
 }
 
 /*