From 1e4990ac77b39d60021b6abddc63fa0f75fc944b Mon Sep 17 00:00:00 2001
From: Richa <richa.bisht@suse.com>
Date: Mon, 1 Jul 2024 10:12:28 +0200
Subject: [PATCH] Fixed hidden section issue in new theme

---
 .../src/com/suse/manager/webui/utils/ViewHelper.java  |  5 ++++-
 web/html/src/branding/css/base/fixes.scss             | 11 +++++++++++
 web/html/src/core/spa/view-helper.ts                  |  3 +++
 ...-web.changes.bisht-richa.fixed-broken-hidden-class |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 37430b4ba544..aada76a3a949 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -94,7 +94,10 @@ public enum ViewHelper {
         "/rhn/manager/schedule/maintenance/calendars",
         "/rhn/manager/multiorg/recurring-actions",
         "/rhn/manager/schedule/maintenance/schedules",
-        "/rhn/manager/admin/config/monitoring"
+        "/rhn/manager/admin/config/monitoring",
+        "/rhn/admin/config/GeneralConfig.do",
+        "/rhn/manager/admin/config/monitoring",
+        "/rhn/manager/admin/setup/products"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/base/fixes.scss b/web/html/src/branding/css/base/fixes.scss
index abd06ef29564..f2efcb6142e7 100644
--- a/web/html/src/branding/css/base/fixes.scss
+++ b/web/html/src/branding/css/base/fixes.scss
@@ -48,3 +48,14 @@ div.checkbox.icon-wrapper i.fa {
 .pull-left {
   float: left !important;
 }
+
+// TODO: Need to replace .hidden class with .d-none
+
+.hidden {
+  @extend .d-none;
+}
+
+.hidden-xs {
+  @extend .d-none;
+  @extend .d-md-block;
+}
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 9c181a446637..28bcb683c1f6 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -38,6 +38,9 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/multiorg/recurring-actions",
   "/rhn/manager/schedule/maintenance/schedules",
   "/rhn/manager/admin/config/monitoring",
+  "/rhn/admin/config/GeneralConfig.do",
+  "/rhn/manager/admin/config/monitoring",
+  "/rhn/manager/admin/setup/products",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class b/web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class
new file mode 100644
index 000000000000..156765f88c17
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class
@@ -0,0 +1 @@
+- Fixed hidden section issue in Monitoring and General Configuration pages