Accepting request 1306662 from systemsmanagement:cockpit

- Update to 346
  * Changes since 344
    - 346
      * Support branding Cockpit pages
      * Storage: Support for Stratis "V2" pools
    - 345
      * Translation and dependency updates
      * Shorter IPv6 addresses
      * IPv6 addresses for WireGuard

- Rewrite hide-pcp.patch to apply to SLFO based versions of micro

OBS-URL: https://build.opensuse.org/request/show/1306662
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=65

_scmsync.obsinfo

@@ -1,5 +1,5 @@
-mtime: 1756288717
-commit: a6d18653bdd83a864aca2855ca69dfde628ca9c5934596c84701563774079066
+mtime: 1758530975
+commit: 648600968c4bbf35a88379def6cf01f187e050736cf7617d2233b01759c1699d
 url: https://src.opensuse.org/cockpit/cockpit.git
-revision: a6d18653bdd83a864aca2855ca69dfde628ca9c5934596c84701563774079066
+revision: 648600968c4bbf35a88379def6cf01f187e050736cf7617d2233b01759c1699d
 projectscmsync: https://src.opensuse.org/cockpit/_ObsPrj.git

build.specials.obscpio

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e371c646ec1a9f5a0073fb340d83037ffa3a24d5bec114e85fe8c37af57683af
+oid sha256:9a35301b4d3c0cb33714cce4f0eac2c57f3db0fa5e962abe536a9d2d3ab22c00
 size 280

cockpit.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Sep 18 07:40:59 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
+
+- Rewrite hide-pcp.patch to apply to SLFO based versions of micro
+
+-------------------------------------------------------------------
+Mon Sep  8 11:25:24 UTC 2025 - Miika Alikirri <miika.alikirri@suse.com>
+
+- Update to 346
+  * Changes since 344
+    - 346
+      * Support branding Cockpit pages
+      * Storage: Support for Stratis "V2" pools
+    - 345
+      * Translation and dependency updates
+      * Shorter IPv6 addresses
+      * IPv6 addresses for WireGuard
+
 -------------------------------------------------------------------
 Thu Aug 14 04:53:41 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
 

cockpit.spec

@@ -58,7 +58,7 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        344
+Version:        346
 Release:        0
 Source0:        cockpit-%{version}.tar.gz
 Source2:        cockpit-rpmlintrc
@@ -207,7 +207,7 @@ Recommends: (cockpit-ostree if rpm-ostree)
 Suggests: cockpit-selinux
 %endif
 %if 0%{?rhel} && 0%{?centos} == 0
-Requires: subscription-manager-cockpit
+Recommends: subscription-manager-cockpit
 %endif
 
 BuildRequires:  python3-devel
@@ -233,14 +233,13 @@ BuildRequires:  python3-pytest-timeout
 %patch -P 4 -p1
 %patch -P 5 -p1
 
+%patch -P 101 -p1
 %patch -P 106 -p1
 %patch -P 109 -p1
 %patch -P 114 -p1
 
 # SLE Micro specific patches
 %if 0%{?is_smo}
-%patch -P 101 -p1
-%patch -P 107 -p1
 # Patches for versions lower then SLE Micro 5.5
 %if 0%{?sle_version} < 150500
 %patch -P 102 -p1

css-overrides.patch

@@ -44,39 +44,39 @@ now, it fulfills the requirements of [3].
  create mode 100644 pkg/static/css-overrides.css
 
 diff --git a/pkg/apps/index.html b/pkg/apps/index.html
-index fd17d5131..9aac50800 100644
+index f8f8daa83..543cc5492 100644
 --- a/pkg/apps/index.html
 +++ b/pkg/apps/index.html
-@@ -23,6 +23,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
-     <title translate="yes">Applications</title>
+@@ -24,6 +24,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
      <meta charset="utf-8" />
      <link href="apps.css" type="text/css" rel="stylesheet" />
+     <link href="../../static/branding.css" rel="stylesheet" />
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet">
      <script type="text/javascript" src="../base1/cockpit.js"></script>
      <script type="text/javascript" src="../base1/po.js"></script>
      <script type="text/javascript" src="po.js"></script>
 diff --git a/pkg/kdump/index.html b/pkg/kdump/index.html
-index 8138f050f..619416dd4 100644
+index 77cf9ff38..af46a3d98 100644
 --- a/pkg/kdump/index.html
 +++ b/pkg/kdump/index.html
-@@ -25,6 +25,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
-     <meta name="viewport" content="width=device-width, initial-scale=1" />
- 
+@@ -26,6 +26,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
+
      <link rel="stylesheet" href="kdump.css" />
+     <link href="../../static/branding.css" rel="stylesheet" />
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
- 
+
      <script type="text/javascript" src="kdump.js"></script>
      <script type="text/javascript" src="../base1/po.js"></script>
 diff --git a/pkg/metrics/index.html b/pkg/metrics/index.html
-index cbb82dccc..b17bd1a76 100644
+index cbf10aab8..c42081e34 100644
 --- a/pkg/metrics/index.html
 +++ b/pkg/metrics/index.html
-@@ -23,6 +23,7 @@ along with this package; If not, see <https://www.gnu.org/licenses/>.
-     <meta name="viewport" content="width=device-width, initial-scale=1" />
- 
+@@ -24,6 +24,7 @@ along with this package; If not, see <https://www.gnu.org/licenses/>.
+
      <link rel="stylesheet" href="index.css" />
+     <link href="../../static/branding.css" rel="stylesheet" />
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
- 
+
      <script type="text/javascript" src="../base1/cockpit.js"></script>
      <script type="text/javascript" src="../manifests.js"></script>
 diff --git a/pkg/networkmanager/firewall.html b/pkg/networkmanager/firewall.html
@@ -85,44 +85,44 @@ index e5ea58276..6bc5327f5 100644
 +++ b/pkg/networkmanager/firewall.html
 @@ -23,6 +23,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
      <meta charset="utf-8" />
- 
+
      <link href="firewall.css" type="text/css" rel="stylesheet" />
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
- 
+
      <script src="../base1/cockpit.js"></script>
      <script src="../base1/po.js"></script>
 diff --git a/pkg/networkmanager/index.html b/pkg/networkmanager/index.html
-index fc9cb5aff..3aceef1b2 100644
+index e73b89502..0e2c6e09e 100644
 --- a/pkg/networkmanager/index.html
 +++ b/pkg/networkmanager/index.html
-@@ -24,6 +24,7 @@
-   <meta charset="utf-8" />
+@@ -25,6 +25,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <link href="networkmanager.css" type="text/css" rel="stylesheet" />
+   <link href="../../static/branding.css" rel="stylesheet" />
 +  <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
    <script src="../base1/cockpit.js"></script>
    <script src="../manifests.js"></script>
    <script src="../base1/po.js"></script>
 diff --git a/pkg/packagekit/index.html b/pkg/packagekit/index.html
-index c95dfd263..f4f3baab6 100644
+index e3ec580c9..a91cdebec 100644
 --- a/pkg/packagekit/index.html
 +++ b/pkg/packagekit/index.html
-@@ -24,6 +24,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
-   <meta charset="utf-8" />
- 
+@@ -25,6 +25,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
+
    <link href="updates.css" rel="stylesheet" />
+   <link href="../../static/branding.css" rel="stylesheet" />
 +  <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
- 
+
    <script src="../base1/cockpit.js"></script>
    <script src="../base1/po.js"></script>
 diff --git a/pkg/playground/index.html b/pkg/playground/index.html
-index 4f2bce82d..6f87bc642 100644
+index cb5eb670f..081972401 100644
 --- a/pkg/playground/index.html
 +++ b/pkg/playground/index.html
-@@ -5,6 +5,7 @@
-     <title>Cockpit Development Playground</title>
+@@ -6,6 +6,7 @@
      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
      <link href="index.css" type="text/css" rel="stylesheet" />
+     <link href="../../static/branding.css" rel="stylesheet" />
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
      <script src="../base1/cockpit.js"></script>
      <script src="../manifests.js"></script>
@@ -199,6 +199,18 @@ index 97a74791f..a2519cfd2 100644
      <script src="../base1/cockpit.js"></script>
      <script src="test.js"></script>
  </head>
+diff --git a/pkg/selinux/index.html b/pkg/selinux/index.html
+index f967e7b25..bc64e6d8c 100644
+--- a/pkg/selinux/index.html
++++ b/pkg/selinux/index.html
+@@ -26,6 +26,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
+
+     <link rel="stylesheet" href="selinux.css" />
+     <link href="../../static/branding.css" rel="stylesheet" />
++    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
+
+     <script type="text/javascript" src="../base1/cockpit.js"></script>
+     <script type="text/javascript" src="../base1/po.js"></script>
 diff --git a/pkg/shell/index.html b/pkg/shell/index.html
 index 6dd5ad1ac..1c6f3512c 100644
 --- a/pkg/shell/index.html
@@ -223,18 +235,6 @@ index c9adf7ae2..97f088f7c 100644
  </head>
  <body class="pf-v6-m-tabular-nums">
      <div class="curtains-ct">
-diff --git a/pkg/sosreport/index.html b/pkg/sosreport/index.html
-index e673383ad..224b42463 100644
---- a/pkg/sosreport/index.html
-+++ b/pkg/sosreport/index.html
-@@ -22,6 +22,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
-     <title translate="yes">Diagnostic reports</title>
-     <meta charset="utf-8" />
-     <link href="sosreport.css" rel="stylesheet" />
-+    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
-     <script type="text/javascript" src="../base1/cockpit.js"></script>
-     <script type="text/javascript" src="../base1/po.js"></script>
-     <script type="text/javascript" src="po.js"></script>
 diff --git a/pkg/static/css-overrides.css b/pkg/static/css-overrides.css
 new file mode 100644
 index 000000000..7481f7ecf
@@ -253,6 +253,42 @@ index 000000000..7481f7ecf
 + *   - https://github.com/cockpit-project/cockpit/pull/17437
 + *   - https://github.com/cockpit-project/cockpit/issues/16359
 + */
+diff --git a/pkg/sosreport/index.html b/pkg/sosreport/index.html
+index a37f816ee..37528f38b 100644
+--- a/pkg/sosreport/index.html
++++ b/pkg/sosreport/index.html
+@@ -23,6 +23,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
+     <meta charset="utf-8" />
+     <link href="sosreport.css" rel="stylesheet" />
+     <link href="../../static/branding.css" rel="stylesheet" />
++    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
+     <script type="text/javascript" src="../base1/cockpit.js"></script>
+     <script type="text/javascript" src="../base1/po.js"></script>
+     <script type="text/javascript" src="po.js"></script>
+diff --git a/pkg/static/login.html b/pkg/static/login.html
+index 4a3ade726..7ce60a214 100644
+--- a/pkg/static/login.html
++++ b/pkg/static/login.html
+@@ -11,6 +11,7 @@
+   <script type="text/javascript" src="cockpit/static/login.js"></script>
+   <link href="cockpit/static/login.css" type="text/css" rel="stylesheet" />
+   <link href="cockpit/static/branding.css" type="text/css" rel="stylesheet" />
++  <link href="cockpit/static/css-overrides.css" type="text/css" rel="stylesheet" />
+ </head>
+
+ <body class="login-pf">
+diff --git a/pkg/storaged/index.html b/pkg/storaged/index.html
+index 9453ee003..bb69595d5 100644
+--- a/pkg/storaged/index.html
++++ b/pkg/storaged/index.html
+@@ -25,6 +25,7 @@
+     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+     <link href="storaged.css" type="text/css" rel="stylesheet" />
+     <link href="../../static/branding.css" rel="stylesheet" />
++    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
+     <script src="../base1/cockpit.js"></script>
+     <script src="../base1/po.js"></script>
+     <script src="../manifests.js"></script>
 diff --git a/pkg/systemd/hwinfo.html b/pkg/systemd/hwinfo.html
 index a3413faca..549b80298 100644
 --- a/pkg/systemd/hwinfo.html
@@ -266,14 +302,14 @@ index a3413faca..549b80298 100644
      <script src="../base1/po.js"></script>
      <script src="po.js"></script>
 diff --git a/pkg/systemd/index.html b/pkg/systemd/index.html
-index 91a268a4a..ee125fe65 100644
+index 146b59304..28d660b67 100644
 --- a/pkg/systemd/index.html
 +++ b/pkg/systemd/index.html
-@@ -6,6 +6,7 @@
-   <meta name="description" content="" />
+@@ -7,6 +7,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <link rel="stylesheet" href="overview.css" />
-+  <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"/>
+   <link href="../../static/branding.css" rel="stylesheet" />
++  <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
    <script type="text/javascript" src="../base1/cockpit.js"></script>
    <script type="text/javascript" src="../base1/po.js"></script>
    <script type="text/javascript" src="overview.js"></script>
@@ -300,7 +336,7 @@ index a17e95e56..7eaa65efa 100644
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
      <script src="po.js"></script>
  </head>
- 
+
 diff --git a/pkg/systemd/terminal.html b/pkg/systemd/terminal.html
 index ce7216e4e..63547f9d3 100644
 --- a/pkg/systemd/terminal.html
@@ -314,53 +350,17 @@ index ce7216e4e..63547f9d3 100644
      <script src="../base1/po.js"></script>
      <script src="po.js"></script>
 diff --git a/pkg/users/index.html b/pkg/users/index.html
-index d26cf4781..b0c6ebf87 100644
+index 6c8c81be9..533a5975a 100644
 --- a/pkg/users/index.html
 +++ b/pkg/users/index.html
-@@ -24,6 +24,7 @@
-     <meta charset="utf-8" />
+@@ -25,6 +25,7 @@
      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
      <link href="users.css" type="text/css" rel="stylesheet" />
+     <link href="../../static/branding.css" rel="stylesheet" />
 +    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" />
      <script src="../base1/cockpit.js"></script>
      <script src="../base1/po.js"></script>
      <script src="po.js"></script>
-diff --git a/pkg/storaged/index.html b/pkg/storaged/index.html
-index 6893e4909..b6677bb56 100644
---- a/pkg/storaged/index.html
-+++ b/pkg/storaged/index.html
-@@ -24,6 +24,7 @@
-     <meta charset="utf-8" />
-     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-     <link href="storaged.css" type="text/css" rel="stylesheet" />
-+    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet">
-     <script src="../base1/cockpit.js"></script>
-     <script src="../base1/po.js"></script>
-     <script src="../manifests.js"></script>
-diff --git a/pkg/static/login.html b/pkg/static/login.html
-index 6a8fa4f44..9019499a5 100644
---- a/pkg/static/login.html
-+++ b/pkg/static/login.html
-@@ -11,6 +11,7 @@
-   <script type="text/javascript" src="cockpit/static/login.js"></script>
-   <link href="cockpit/static/login.css" type="text/css" rel="stylesheet" />
-   <link href="cockpit/static/branding.css" type="text/css" rel="stylesheet" />
-+  <link href="cockpit/static/css-overrides.css" type="text/css" rel="stylesheet" />
- </head>
-
- <body class="login-pf">
-diff --git a/pkg/selinux/index.html b/pkg/selinux/index.html
-index cc3825a25..e1c814c6d 100644
---- a/pkg/selinux/index.html
-+++ b/pkg/selinux/index.html
-@@ -25,6 +25,7 @@ along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
-     <meta name="viewport" content="width=device-width, initial-scale=1" />
- 
-     <link rel="stylesheet" href="selinux.css" />
-+    <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet">
- 
-     <script type="text/javascript" src="../base1/cockpit.js"></script>
-     <script type="text/javascript" src="../base1/po.js"></script>
 -- 
 2.49.0
 

hide-pcp.patch

@@ -1,34 +1,77 @@
-Index: cockpit/pkg/metrics/metrics.jsx
-===================================================================
---- cockpit.orig/pkg/metrics/metrics.jsx
-+++ cockpit/pkg/metrics/metrics.jsx
-@@ -1565,6 +1565,7 @@ const PCPConfig = ({ buttonVariant, firewalldRequest, needsLogout, setNeedsLogou
+diff --git a/pkg/metrics/metrics.jsx b/pkg/metrics/metrics.jsx
+index 80f1087..fda6049 100644
+--- a/pkg/metrics/metrics.jsx
++++ b/pkg/metrics/metrics.jsx
+@@ -17,7 +17,7 @@
+  * along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
+  */
  
+-import React, { useState, createRef } from 'react';
++import React, { useState, createRef, useEffect } from 'react';
+ 
+ import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js";
+ import { Breadcrumb, BreadcrumbItem } from "@patternfly/react-core/dist/esm/components/Breadcrumb/index.js";
+@@ -1510,6 +1510,7 @@ const PCPConfigDialog = ({
+ const PCPConfig = ({ buttonVariant, firewalldRequest }) => {
+     const Dialogs = useDialogs();
+     const [packageInstallStatus, setPackageInstallStatus] = useState(null);
++    const [isMicroOs, setIsMicroOs] = useState(false);
+ 
+     const s_pmlogger = useObject(() => service.proxy("pmlogger.service"), null, []);
+     const s_pmproxy = useObject(() => service.proxy("pmproxy.service"), null, []);
+@@ -1531,6 +1532,12 @@ const PCPConfig = ({ buttonVariant, firewalldRequest }) => {
+           "redis-server exists", s_redis_server.exists, "state", s_redis_server.state,
+           "valkey exists", s_valkey.exists, "state", s_valkey.state);
+ 
++    useEffect(() => {
++        read_os_release().then((os_release) => {
++            setIsMicroOs(os_release?.ID_LIKE.includes("sle-micro") || os_release?.ID_LIKE.includes("microos"))
++        });
++    }, []);
++
+     if (!superuser.allowed)
+         return null;
+ 
+@@ -1543,8 +1550,13 @@ const PCPConfig = ({ buttonVariant, firewalldRequest }) => {
+                                       packageInstallCallback={() => setPackageInstallStatus("done")} />);
+     }
+ 
++    function is_micro_os() {
++        return ;
++    }
++
      return (
          <Button variant={buttonVariant} icon={<CogIcon />}
-+                className="pf-u-display-none"
++                className={isMicroOs ? "pf-u-display-none" : ""}
                  isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) ||
                               invalidService(s_redis) || invalidService(s_redis_server) || invalidService(s_valkey) }
-                 onClick={show_dialog}>
-Index: cockpit-309/pkg/metrics/metrics.jsx
-===================================================================
---- cockpit-309.orig/pkg/metrics/metrics.jsx
-+++ cockpit-309/pkg/metrics/metrics.jsx
-@@ -1824,7 +1825,8 @@ class MetricsHistory extends React.Component {
+                 onClick={show_dialog}
+@@ -1578,6 +1590,7 @@ class MetricsHistory extends React.Component {
+             isBeibootBridge: false,
+             isPythonPCPInstalled: null,
+             selectedVisibility: this.columns.reduce((a, v) => ({ ...a, [v[0]]: true }), {}),
++            isMicroOs: false,
+             boots: [], // journalctl --list-boots as [{started: Date, ended: Date}]
+         };
+ 
+@@ -1609,6 +1622,10 @@ class MetricsHistory extends React.Component {
+ 
+     // load and render the last 24 hours (plus current one) initially; this needs numCpu initialized for correct scaling
+     initialLoadData() {
++        read_os_release().then((os_release) => {
++            this.setState({ isMicroOs: os_release?.ID_LIKE.includes("sle-micro") || os_release?.ID_LIKE.includes("microos") });
++        });
++
+         cockpit.spawn(["date", "+%s"])
+                 .then(out => {
+                     const now = parseInt(out.trim()) * 1000;
+@@ -1815,6 +1832,9 @@ class MetricsHistory extends React.Component {
+     }
+ 
+     render() {
++        if (this.state.isMicroOs)
++            return <></>;
++
          // on a single machine, cockpit-pcp depends on pcp; but this may not be the case in the beiboot scenario,
          // so additionally check if pcp is available on the logged in target machine
-         if ((cockpit.manifests && !cockpit.manifests.pcp) || this.pmlogger_service.exists === false)
--            return <EmptyStatePanel
-+            return <EmptyStatePanel />
-+/*            return <EmptyStatePanel
-                         icon={ExclamationCircleIcon}
-                         title={_("Package cockpit-pcp is missing for metrics history")}
-                         action={this.state.isBeibootBridge === true
-@@ -1834,6 +1834,7 @@ class MetricsHistory extends React.Component {
-                             ? <Text>{ _("Installation not supported without installed cockpit package") }</Text>
-                             : this.state.packagekitExists && <Button onClick={this.handleInstall}>{_("Install cockpit-pcp")}</Button>}
-             />;
-+*/
- 
-         if (!this.state.metricsAvailable) {
-             let action;
+         if (this.state.isPythonPCPInstalled === false || this.pmlogger_service.exists === false)

remove_rh_links.patch

@@ -1,7 +1,16 @@
 diff --git a/pkg/networkmanager/bond.jsx b/pkg/networkmanager/bond.jsx
-index b54b1db..062cd1d 100644
+index f56f02961..cae872b00 100644
 --- a/pkg/networkmanager/bond.jsx
 +++ b/pkg/networkmanager/bond.jsx
+@@ -24,7 +24,7 @@ import { FormGroup } from "@patternfly/react-core/dist/esm/components/Form/index
+ import { FormSelect, FormSelectOption } from "@patternfly/react-core/dist/esm/components/FormSelect/index.js";
+ import { Popover } from "@patternfly/react-core/dist/esm/components/Popover/index.js";
+ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js";
+-import { ExternalLinkSquareAltIcon, HelpIcon } from '@patternfly/react-icons';
++import { HelpIcon } from '@patternfly/react-icons';
+ 
+ import { MacMenu, MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialogs-common.jsx';
+ import { ModelContext } from './model-context.jsx';
 @@ -151,16 +151,6 @@ export const BondDialog = ({ connection, dev, settings }) => {
                                        {_("A network bond combines multiple network interfaces into one logical interface with higher throughput or redundancy.")}
                                    </div>
@@ -17,10 +26,10 @@ index b54b1db..062cd1d 100644
 -                                  </Button>
 -                              }
                            >
-                               <Button id="bond-help-popup-button" variant="plain" aria-label="Help">
-                                   <HelpIcon />
+                               <Button icon={<HelpIcon />} id="bond-help-popup-button" variant="plain" aria-label="Help" />
+                           </Popover>
 diff --git a/pkg/systemd/hwinfo.jsx b/pkg/systemd/hwinfo.jsx
-index d2d2d9b..af0bedc 100644
+index d301f60a6..886bc6b0e 100644
 --- a/pkg/systemd/hwinfo.jsx
 +++ b/pkg/systemd/hwinfo.jsx
 @@ -205,11 +205,6 @@ const CPUSecurityMitigationsDialog = () => {
@@ -36,7 +45,7 @@ index d2d2d9b..af0bedc 100644
                              </DataListCell>,
                          ]}
 diff --git a/pkg/systemd/overview-cards/cryptoPolicies.jsx b/pkg/systemd/overview-cards/cryptoPolicies.jsx
-index fa57de9..d4dd3be 100644
+index 6ee533993..aeb31ba16 100644
 --- a/pkg/systemd/overview-cards/cryptoPolicies.jsx
 +++ b/pkg/systemd/overview-cards/cryptoPolicies.jsx
 @@ -143,7 +143,7 @@ const CryptoPolicyDialog = ({
@@ -63,13 +72,13 @@ index fa57de9..d4dd3be 100644
 -                </Button>
 -            }
          >
-             <Button variant="plain" aria-label={_("Help")}>
-                 <HelpIcon />
+             <Button icon={<HelpIcon />} variant="plain" aria-label={_("Help")} />
+         </Popover>
 diff --git a/pkg/systemd/overview-cards/tuned-dialog.jsx b/pkg/systemd/overview-cards/tuned-dialog.jsx
-index 5f3c3ffc1..b36ad88e3 100644
+index b67631b7d..b36ad88e3 100644
 --- a/pkg/systemd/overview-cards/tuned-dialog.jsx
 +++ b/pkg/systemd/overview-cards/tuned-dialog.jsx
-@@ -278,40 +278,13 @@ const TunedDialog = ({
+@@ -278,38 +278,13 @@ const TunedDialog = ({
          };
      }, [tunedService]);
  
@@ -92,9 +101,7 @@ index 5f3c3ffc1..b36ad88e3 100644
 -                </Button>
 -            }
 -        >
--            <Button variant="plain" aria-label={_("Help")}>
--                <HelpIcon />
--            </Button>
+-            <Button icon={<HelpIcon />} variant="plain" aria-label={_("Help")} />
 -        </Popover>
 -    );
 -