[web] Adapt changes from master

web/src/App.jsx

@@ -24,7 +24,7 @@ import { Outlet } from "react-router-dom";
 
 import { _ } from "~/i18n";
 import { useInstallerClient, useInstallerClientStatus } from "~/context/installer";
-import { useSoftware } from "./context/software";
+import { useProduct } from "./context/product";
 import { STARTUP, INSTALL } from "~/client/phase";
 import { BUSY } from "~/client/status";
 
@@ -57,7 +57,7 @@ const ATTEMPTS = 3;
 function App() {
  const client = useInstallerClient();
  const { attempt } = useInstallerClientStatus();
- const { products } = useSoftware();
+ const { products } = useProduct();
  const { language } = useL10n();
  const [status, setStatus] = useState(undefined);
  const [phase, setPhase] = useState(undefined);

web/src/App.test.jsx

@@ -31,9 +31,9 @@ jest.mock("~/client");
 
 // list of available products
 let mockProducts;
-jest.mock("~/context/software", () => ({
- ...jest.requireActual("~/context/software"),
- useSoftware: () => {
+jest.mock("~/context/product", () => ({
+ ...jest.requireActual("~/context/product"),
+ useProduct: () => {
  return {
  products: mockProducts,
  selectedProduct: null

web/src/context/product.jsx

@@ -72,7 +72,7 @@ function useProduct() {
  }
 
  const { products = [], selectedId } = context;
- const selectedProduct = products.find(p => p.id === selectedId);
+ const selectedProduct = products.find(p => p.id === selectedId) || null;
 
  return { ...context, selectedProduct };
 }