Ensure that the software context is ready

.github/workflows/ci-integration-tests.yml

@@ -146,7 +146,7 @@ jobs:
       run:  podman exec agama bash -c "cd /checkout/playwright && SKIP_LOGIN=true playwright test --trace on --project chromium"
 
     - name: Again show the D-Bus services log
-      run:  podman exec agama bash -c "journalctl | grep agama"
+      run:  podman exec agama bash -c "journalctl -u agama"
 
     - name: Show the complete journal
       # maybe not necessary if the above filtered journalctl calls are enough

web/package/cockpit-agama.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 25 15:46:37 UTC 2023 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Fix the client initialization and make sure that the software
+  context is ready (gh#openSUSE/agama#818).
+
 -------------------------------------------------------------------
 Mon Oct 23 11:33:53 UTC 2023 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

web/src/App.jsx

@@ -24,6 +24,7 @@ import { Outlet } from "react-router-dom";
 
 import { _ } from "~/i18n";
 import { useInstallerClient, useInstallerClientStatus } from "~/context/installer";
+import { useSoftware } from "./context/software";
 import { STARTUP, INSTALL } from "~/client/phase";
 import { BUSY } from "~/client/status";
 
@@ -57,6 +58,7 @@ const ATTEMPTS = 3;
 function App() {
   const client = useInstallerClient();
   const { attempt } = useInstallerClientStatus();
+  const { products } = useSoftware();
   const { language } = useL10n();
   const [status, setStatus] = useState(undefined);
   const [phase, setPhase] = useState(undefined);
@@ -79,7 +81,7 @@ function App() {
   }, [client, setPhase]);
 
   const Content = () => {
-    if (!client) {
+    if (!client || !products) {
       return (attempt > ATTEMPTS) ? <DBusError /> : <Loading />;
     }
 

web/src/App.test.jsx

@@ -29,6 +29,18 @@ import { IDLE, BUSY } from "~/client/status";
 
 jest.mock("~/client");
 
+// list of available products
+let mockProducts;
+jest.mock("~/context/software", () => ({
+  ...jest.requireActual("~/context/software"),
+  useSoftware: () => {
+    return {
+      products: mockProducts,
+      selectedProduct: null
+    };
+  }
+}));
+
 // Mock some components,
 // See https://www.chakshunyu.com/blog/how-to-mock-a-react-component-in-jest/#default-export
 jest.mock("~/components/core/DBusError", () => <div>D-BusError Mock</div>);
@@ -63,13 +75,29 @@ describe("App", () => {
         }
       };
     });
+
+    mockProducts = [
+      { id: "openSUSE", name: "openSUSE Tumbleweed" },
+      { id: "Leap Micro", name: "openSUSE Micro" }
+    ];
   });
 
   afterEach(() => {
     // setting a cookie with already expired date removes it
     document.cookie = "CockpitLang=; path=/; expires=" + new Date(0).toUTCString();
   });
 
+  describe("when the software context is not initialized", () => {
+    beforeEach(() => {
+      mockProducts = undefined;
+    });
+
+    it("renders the LoadingEnvironment theme", async () => {
+      installerRender(<App />, { withL10n: true });
+      await screen.findByText(/Loading installation environment/);
+    });
+  });
+
   describe("on the startup phase", () => {
     beforeEach(() => {
       getPhaseFn.mockResolvedValue(STARTUP);

web/src/components/software/ProductSelectionPage.jsx

@@ -34,7 +34,7 @@ import {
   Radio
 } from "@patternfly/react-core";
 
-import { Icon, Loading } from "~/components/layout";
+import { Icon } from "~/components/layout";
 import { Title, PageIcon, MainActions } from "~/components/layout/Layout";
 
 function ProductSelectionPage() {
@@ -65,10 +65,6 @@ function ProductSelectionPage() {
     navigate("/");
   };
 
-  if (!products) return (
-    <Loading text={_("Loading available products, please wait...")} />
-  );
-
   const buildOptions = () => {
     const options = products.map((p) => (
       <Card key={p.id} className={isSelected(p) && "selected-product"}>

web/src/context/installer.jsx

@@ -84,6 +84,7 @@ function InstallerClientProvider({
       if (await client.isConnected()) {
         setValue(client);
         setAttempt(0);
+        return;
       }
 
       console.warn(`Failed to connect to D-Bus (attempt ${attempt + 1})`);

web/src/context/installer.test.jsx

@@ -63,7 +63,7 @@ describe("installer context", () => {
         <InstallerClientProvider interval={0.1}>
           <ClientStatus />
         </InstallerClientProvider>);
-      await screen.findByText("attempt: 2");
+      await screen.findByText("attempt: 1");
     });
   });