[web] Stop mounting Sidebar from the Layout component

Mount it from App instead.
openSUSE · Apr 25, 2023 · 6c00c8c · 6c00c8c
1 parent 0801870
commit 6c00c8c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/web/src/App.jsx b/web/src/App.jsx
@@ -27,7 +27,7 @@ import { STARTUP, INSTALL } from "~/client/phase";
 import { BUSY } from "~/client/status";
 
 import { Layout, Title, DBusError } from "~/components/layout";
-import { Installation, LoadingEnvironment } from "~/components/core";
+import { Installation, LoadingEnvironment, Sidebar } from "~/components/core";
 
 function App() {
   const client = useInstallerClient();
@@ -71,10 +71,13 @@ function App() {
   };
 
   return (
-    <Layout>
-      <Title>Agama</Title>
-      <Content />
-    </Layout>
+    <>
+      <Sidebar />
+      <Layout>
+        <Title>Agama</Title>
+        <Content />
+      </Layout>
+    </>
   );
 }
 

diff --git a/web/src/App.test.jsx b/web/src/App.test.jsx
@@ -36,6 +36,7 @@ jest.mock("~/components/layout/DBusError", () => mockComponent("D-BusError Mock"
 jest.mock("~/components/core/LoadingEnvironment", () => mockComponent("LoadingEnvironment Mock"));
 jest.mock("~/components/questions/Questions", () => mockComponent("Questions Mock"));
 jest.mock("~/components/core/Installation", () => mockComponent("Installation Mock"));
+jest.mock("~/components/core/Sidebar", () => mockComponent("Sidebar Mock"));
 
 // this object holds the mocked callbacks
 const callbacks = {};

diff --git a/web/src/components/layout/Layout.jsx b/web/src/components/layout/Layout.jsx
@@ -23,7 +23,6 @@ import React from "react";
 
 import logoUrl from "~/assets/suse-horizontal-logo.svg";
 import { createTeleporter } from "react-teleporter";
-import { Sidebar } from "~/components/core";
 
 const PageTitle = createTeleporter();
 const PageActions = createTeleporter();
@@ -83,7 +82,6 @@ function Layout({ children }) {
 
       </header>
 
-      <Sidebar />
       <main className="stack">
         {children}
       </main>