From 59a9d9d6e4e56f52bb61d5e6bf9cf14e33526303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Fri, 17 Nov 2023 13:13:37 +0000
Subject: [PATCH 1/5] [web] Update test for checking storage menu items

We've detected few wrong storage menu items where the `href` attribute is
assigned to the `li` HTML component instead to a MISSING `a` element.
The root of the problem it's in the props passed to PF/MenuItem through
Agama/Storage/ProposalPageOptions --> Agama/PageOptions.Option ->
PF/DropdownItem. We are sending an `href` instead of `to` which makes
PF/MenuItem deliver a <li href='..'> holding a <button> instead of a <li>
holding a <a href='...'>

See https://github.com/patternfly/patternfly-react/blob/7d2fd2678f993459f67a04d173a8d16c16ef50a3/packages/react-core/src/components/Menu/MenuItem.tsx#L139

This was broken during the migration to PF5, specifically when moving to
the new PF/Dropdown where these `href` props were overlooked and not
renamed to `to`.

See https://github.com/openSUSE/agama/pull/759/commits/2edc4e2d4d3eb5fdce4664fd8bace95b96c696a9#diff-88232d7f99420122a9e8c24ae183bcf9a9b98451cbb5db44dea461a2d5ed6727

So, this change makes the test more robust by checking tha the
"menuitem" element has the expected "href". Subsequent commit will fix
the problem.
---
 web/src/components/storage/ProposalPageOptions.test.jsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/src/components/storage/ProposalPageOptions.test.jsx b/web/src/components/storage/ProposalPageOptions.test.jsx
index 70d299e5a4..928f5c7a2d 100644
--- a/web/src/components/storage/ProposalPageOptions.test.jsx
+++ b/web/src/components/storage/ProposalPageOptions.test.jsx
@@ -54,7 +54,8 @@ it("contains an entry for configuring iSCSI", async () => {
   const { user } = installerRender(<ProposalPageOptions />);
   const toggler = screen.getByRole("button");
   await user.click(toggler);
-  screen.getByRole("menuitem", { name: /iSCSI/ });
+  const link = screen.getByRole("menuitem", { name: /iSCSI/ });
+  expect(link).toHaveAttribute("href", "/storage/iscsi");
 });
 
 it("contains an entry for configuring DASD when is supported", async () => {
@@ -62,7 +63,8 @@ it("contains an entry for configuring DASD when is supported", async () => {
   const { user } = installerRender(<ProposalPageOptions />);
   const toggler = screen.getByRole("button");
   await user.click(toggler);
-  screen.getByRole("menuitem", { name: /DASD/ });
+  const link = screen.getByRole("menuitem", { name: /DASD/ });
+  expect(link).toHaveAttribute("href", "/storage/dasd");
 });
 
 it("does not contain an entry for configuring DASD when is NOT supported", async () => {
@@ -78,7 +80,8 @@ it("contains an entry for configuring zFCP when is supported", async () => {
   const { user } = installerRender(<ProposalPageOptions />);
   const toggler = screen.getByRole("button");
   await user.click(toggler);
-  screen.getByRole("menuitem", { name: /zFCP/ });
+  const link = screen.getByRole("menuitem", { name: /zFCP/ });
+  expect(link).toHaveAttribute("href", "/storage/zfcp");
 });
 
 it("does not contain an entry for configuring zFCP when is NOT supported", async () => {

From f0bf2c20a92ad423eb1cf07fb1eaf30f6c6cfb84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Fri, 17 Nov 2023 13:26:01 +0000
Subject: [PATCH 2/5] [web] Fix storage menu entries

By using the right prop for setting the link href attribute.
---
 web/src/components/storage/ProposalPageOptions.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/storage/ProposalPageOptions.jsx b/web/src/components/storage/ProposalPageOptions.jsx
index a801272cfe..c6df12abe3 100644
--- a/web/src/components/storage/ProposalPageOptions.jsx
+++ b/web/src/components/storage/ProposalPageOptions.jsx
@@ -36,7 +36,7 @@ const DASDLink = () => {
   return (
     <PageOptions.Option
       key="dasd-link"
-      href={href}
+      to={href}
       description={_("Manage and format")}
     >
       DASD
@@ -54,7 +54,7 @@ const ZFCPLink = () => {
   return (
     <PageOptions.Option
       key="zfcp-link"
-      href={href}
+      to={href}
       description={_("Activate disks")}
     >
       {_("zFCP")}

From bf007fbd7fec0258694fc3e98e6eec04d4a67416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Fri, 17 Nov 2023 13:28:20 +0000
Subject: [PATCH 3/5] [web] Update changes file

---
 web/package/cockpit-agama.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/package/cockpit-agama.changes b/web/package/cockpit-agama.changes
index d9bdc468d7..95cd5ee138 100644
--- a/web/package/cockpit-agama.changes
+++ b/web/package/cockpit-agama.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 17 13:27:22 UTC 2023 - David Diaz <dgonzalez@suse.com>
+
+- UI: Fix broken storage links (bsc#1217281)
+
 -------------------------------------------------------------------
 Wed Nov 15 12:32:25 UTC 2023 - José Iván López González <jlopez@suse.com>
 

From e31039e084c1bd79ca34270a98806d1d84bc08cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Fri, 17 Nov 2023 13:37:44 +0000
Subject: [PATCH 4/5] [web] Typo

---
 web/package/cockpit-agama.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package/cockpit-agama.changes b/web/package/cockpit-agama.changes
index 95cd5ee138..37e83816a0 100644
--- a/web/package/cockpit-agama.changes
+++ b/web/package/cockpit-agama.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Fri Nov 17 13:27:22 UTC 2023 - David Diaz <dgonzalez@suse.com>
 
-- UI: Fix broken storage links (bsc#1217281)
+- UI: Fix broken storage links (bsc#1217281).
 
 -------------------------------------------------------------------
 Wed Nov 15 12:32:25 UTC 2023 - José Iván López González <jlopez@suse.com>

From 3b418b0b81e14bb0e4533c28ed8b6f4baee76150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Fri, 17 Nov 2023 13:58:20 +0000
Subject: [PATCH 5/5] [web] Update PageOptions examples

---
 web/src/components/core/PageOptions.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/core/PageOptions.jsx b/web/src/components/core/PageOptions.jsx
index c829b0b8e9..9f2de813dd 100644
--- a/web/src/components/core/PageOptions.jsx
+++ b/web/src/components/core/PageOptions.jsx
@@ -117,14 +117,14 @@ const Options = ({ children, ...props }) => {
  *       <PageOptions.Options>
  *         <PageOptions.Option
  *           key="dasd-link"
- *           href={href}
+ *           to={href}
  *           description="Manage and format"
  *         >
  *           DASD
  *         </PageOptions.Option>
  *         <PageOptions.Option
  *           key="iscsi-link"
- *           href={href}
+ *           to={href}
  *           description="Connect to iSCSI targets"
  *          >
  *           iSCSI