Fix some unit tests

web/src/components/overview/StorageSection.test.tsx

@@ -24,24 +24,25 @@ import React from "react";
 import { screen } from "@testing-library/react";
 import { plainRender } from "~/test-utils";
 import { StorageSection } from "~/components/overview";
-import * as ConfigModel from "~/storage/model/config";
+import * as ConfigModel from "~/api/storage/types/config-model";
 
 const mockDevices = [
-  { name: "/dev/sda", size: 536870912000 },
-  { name: "/dev/sdb", size: 697932185600 },
+  { name: "/dev/sda", size: 536870912000, volumeGroups: [] },
+  { name: "/dev/sdb", size: 697932185600, volumeGroups: [] },
 ];
 
-const mockConfig = { devices: [] as ConfigModel.Device[] };
+const mockConfig = { drives: [] as ConfigModel.Drive[] };
 
 jest.mock("~/queries/storage", () => ({
   ...jest.requireActual("~/queries/storage"),
+  useConfigModel: () => mockConfig,
   useDevices: () => mockDevices,
-  useConfigDevices: () => mockConfig.devices,
+  useConfigDevices: () => mockConfig.drives,
 }));
 
 describe("when the configuration does not include any device", () => {
   beforeEach(() => {
-    mockConfig.devices = [];
+    mockConfig.drives = [];
   });
 
   it("indicates that a device is not selected", async () => {
@@ -53,7 +54,7 @@ describe("when the configuration does not include any device", () => {
 
 describe("when the configuration contains one drive", () => {
   beforeEach(() => {
-    mockConfig.devices = [{ name: "/dev/sda", spacePolicy: "delete" }];
+    mockConfig.drives = [{ name: "/dev/sda", spacePolicy: "delete", volumeGroups: [] }];
   });
 
   it("renders the proposal summary", async () => {
@@ -66,7 +67,7 @@ describe("when the configuration contains one drive", () => {
 
   describe("and the space policy is set to 'resize'", () => {
     beforeEach(() => {
-      mockConfig.devices[0].spacePolicy = "resize";
+      mockConfig.drives[0].spacePolicy = "resize";
     });
 
     it("indicates that partitions may be shrunk", async () => {
@@ -78,7 +79,7 @@ describe("when the configuration contains one drive", () => {
 
   describe("and the space policy is set to 'keep'", () => {
     beforeEach(() => {
-      mockConfig.devices[0].spacePolicy = "keep";
+      mockConfig.drives[0].spacePolicy = "keep";
     });
 
     it("indicates that partitions will be kept", async () => {
@@ -90,7 +91,7 @@ describe("when the configuration contains one drive", () => {
 
   describe("and the drive matches no disk", () => {
     beforeEach(() => {
-      mockConfig.devices[0].name = null;
+      mockConfig.drives[0].name = null;
     });
 
     it("indicates that a device is not selected", async () => {
@@ -103,9 +104,9 @@ describe("when the configuration contains one drive", () => {
 
 describe("when the configuration contains several drives", () => {
   beforeEach(() => {
-    mockConfig.devices = [
-      { name: "/dev/sda", spacePolicy: "delete" },
-      { name: "/dev/sdb", spacePolicy: "delete" },
+    mockConfig.drives = [
+      { name: "/dev/sda", spacePolicy: "delete", volumeGroups: [] },
+      { name: "/dev/sdb", spacePolicy: "delete", volumeGroups: [] },
     ];
   });
 

web/src/components/overview/StorageSection.tsx

@@ -90,7 +90,8 @@ export default function StorageSection() {
   };
 
   if (drives.length === 0) return <Text>{_("No device selected yet")}</Text>;
-
+  if (!drives.find((dr) => devices.map((d) => d.name).includes(dr.name)))
+    return <Text>{_("No device selected yet")}</Text>;
   if (drives.length > 1) {
     return (
       <Content>

web/src/components/storage/ProposalTransactionalInfo.test.tsx

@@ -26,6 +26,7 @@ import { plainRender } from "~/test-utils";
 import { ProposalTransactionalInfo } from "~/components/storage";
 import { ProposalSettings, ProposalTarget, Volume, VolumeTarget } from "~/types/storage";
 
+let mockVolumes: Volume[] = [];
 jest.mock("~/queries/software", () => ({
   ...jest.requireActual("~/queries/software"),
   useProduct: () => ({
@@ -34,20 +35,10 @@ jest.mock("~/queries/software", () => ({
   useProductChanges: () => jest.fn(),
 }));
 
-const settings: ProposalSettings = {
-  target: ProposalTarget.DISK,
-  targetDevice: "/dev/sda",
-  targetPVDevices: [],
-  configureBoot: false,
-  bootDevice: "",
-  defaultBootDevice: "",
-  encryptionPassword: "",
-  encryptionMethod: "",
-  spacePolicy: "delete",
-  spaceActions: [],
-  volumes: [],
-  installationDevices: [],
-};
+jest.mock("~/queries/storage", () => ({
+  ...jest.requireActual("~/queries/storage"),
+  useVolumeTemplates: () => mockVolumes,
+}));
 
 const rootVolume: Volume = {
   mountPath: "/",
@@ -70,30 +61,24 @@ const rootVolume: Volume = {
   },
 };
 
-const props = { settings };
-
-beforeEach(() => {
-  settings.volumes = [];
-});
-
 describe("if the system is not transactional", () => {
   beforeEach(() => {
-    settings.volumes = [rootVolume];
+    mockVolumes = [rootVolume];
   });
 
   it("renders nothing", () => {
-    const { container } = plainRender(<ProposalTransactionalInfo {...props} />);
+    const { container } = plainRender(<ProposalTransactionalInfo />);
     expect(container).toBeEmptyDOMElement();
   });
 });
 
 describe("if the system is transactional", () => {
   beforeEach(() => {
-    settings.volumes = [{ ...rootVolume, transactional: true }];
+    mockVolumes = [{ ...rootVolume, transactional: true }];
   });
 
   it("renders an explanation about the transactional system", () => {
-    plainRender(<ProposalTransactionalInfo {...props} />);
+    plainRender(<ProposalTransactionalInfo />);
 
     screen.getByText("Transactional root file system");
   });

web/src/components/storage/ProposalTransactionalInfo.tsx

@@ -33,7 +33,6 @@ import { isTransactionalSystem } from "~/components/storage/utils";
  * @component
  *
  * @param props
- * @param props.settings - Settings used for calculating a proposal.
  */
 export default function ProposalTransactionalInfo() {
   const { selectedProduct } = useProduct({ suspense: true });