Web: Adapt storage unit tests to api-v2

web/src/App.tsx

@@ -29,7 +29,6 @@ import { useIssuesChanges } from "~/hooks/model/issue";
 import { useProduct } from "~/hooks/model/config";
 import { ROOT } from "~/routes/paths";
 import { useQueryClient } from "@tanstack/react-query";
-import AlertOutOfSync from "~/components/core/AlertOutOfSync";
 
 /**
  * Content guard and flow control component.
@@ -59,13 +58,7 @@ const Content = () => {
     return <Navigate to={ROOT.installationFinished} />;
   }
 
-  return (
-    <>
-      {/* So far, only the storage backend is able to detect external changes.*/}
-      <AlertOutOfSync scope={"Storage"} />
-      <Outlet />
-    </>
-  );
+  return <Outlet />;
 };
 
 /**

web/src/components/core/ChangeProductOption.test.tsx

@@ -23,7 +23,7 @@
 import React from "react";
 import { screen } from "@testing-library/react";
 import { installerRender } from "~/test-utils";
-import { useSystem } from "~/hooks/api";
+import { useSystem } from "~/hooks/model/system";
 import { PRODUCT as PATHS } from "~/routes/paths";
 import { Product } from "~/types/software";
 import ChangeProductOption from "./ChangeProductOption";

web/src/components/core/InstallButton.test.tsx

@@ -25,19 +25,20 @@ import { screen, waitFor, within } from "@testing-library/react";
 import { installerRender, mockRoutes } from "~/test-utils";
 import { InstallButton } from "~/components/core";
 import { PRODUCT, ROOT } from "~/routes/paths";
-import { Issue, IssueSeverity, IssueSource } from "~/model/issue";
+import type { Issue } from "~/model/issue";
 
 const mockStartInstallationFn = jest.fn();
-let mockIssuesList: Issue[];
 
-jest.mock("~/api/manager", () => ({
-  ...jest.requireActual("~/api/manager"),
+jest.mock("~/model/manager", () => ({
+  ...jest.requireActual("~/model/manager"),
   startInstallation: () => mockStartInstallationFn(),
 }));
 
-jest.mock("~/queries/issues", () => ({
-  ...jest.requireActual("~/queries/issues"),
-  useAllIssues: () => mockIssuesList,
+const mockIssues = jest.fn();
+
+jest.mock("~/hooks/model/issue", () => ({
+  ...jest.requireActual("~/hooks/model/issue"),
+  useIssues: () => mockIssues(),
 }));
 
 const clickInstallButton = async () => {
@@ -52,16 +53,14 @@ const clickInstallButton = async () => {
 describe("InstallButton", () => {
   describe("when there are installation issues", () => {
     beforeEach(() => {
-      mockIssuesList = [
+      mockIssues.mockReturnValue([
         {
           description: "Fake Issue",
-          kind: "generic",
-          source: IssueSource.Unknown,
-          severity: IssueSeverity.Error,
+          class: "generic",
           details: "Fake Issue details",
           scope: "product",
         },
-      ];
+      ] as Issue[]);
     });
 
     it("renders additional information to warn users about found problems", async () => {
@@ -86,7 +85,7 @@ describe("InstallButton", () => {
 
   describe("when there are not installation issues", () => {
     beforeEach(() => {
-      mockIssuesList = [];
+      mockIssues.mockReturnValue([]);
     });
 
     it("renders the button without any additional information", async () => {
@@ -130,16 +129,14 @@ describe("InstallButton", () => {
 
   describe("when there are only non-critical issues", () => {
     beforeEach(() => {
-      mockIssuesList = [
+      mockIssues.mockReturnValue([
         {
           description: "Fake warning",
-          kind: "generic",
-          source: IssueSource.Unknown,
-          severity: IssueSeverity.Warn,
+          class: "generic",
           details: "Fake Issue details",
           scope: "product",
         },
-      ];
+      ] as Issue[]);
     });
 
     it("renders the button without any additional information", async () => {

web/src/components/core/InstallerOptions.test.tsx

@@ -27,7 +27,7 @@ import { useSystem } from "~/hooks/model/system";
 import { useProduct } from "~/hooks/model/config";
 import { Product } from "~/types/software";
 import { Keymap, Locale } from "~/model/system/l10n";
-import { Progress, State } from "~/model/status";
+import { Progress, Stage } from "~/model/status";
 import { System } from "~/model/system/network";
 import * as utils from "~/utils";
 import { PRODUCT, ROOT } from "~/routes/paths";
@@ -68,7 +68,7 @@ const mockChangeUIKeymap = jest.fn();
 const mockChangeUILanguage = jest.fn();
 const mockPatchConfigFn = jest.fn();
 const mockConfigureL10nActionFn = jest.fn();
-const mockStateFn: jest.Mock<State> = jest.fn();
+const mockStateFn: jest.Mock<Stage> = jest.fn();
 const mockProgressesFn: jest.Mock<Progress[]> = jest.fn();
 const mockSelectedProductFn: jest.Mock<Product> = jest.fn();
 
@@ -85,7 +85,7 @@ jest.mock("~/hooks/api", () => ({
     network,
   }),
   useStatus: (): ReturnType<typeof useStatus> => ({
-    state: mockStateFn(),
+    stage: mockStateFn(),
     progresses: mockProgressesFn(),
   }),
   useProduct: (): ReturnType<typeof useProduct> => mockSelectedProductFn(),