Fixed broken layout in monitoring page (#8977)

uyuni-project · Jul 23, 2024 · aa301bc · aa301bc
1 parent b001501
commit aa301bc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -93,7 +93,8 @@ public enum ViewHelper {
         "/rhn/manager/schedule/recurring-actions",
         "/rhn/manager/schedule/maintenance/calendars",
         "/rhn/manager/multiorg/recurring-actions",
-        "/rhn/manager/schedule/maintenance/schedules"
+        "/rhn/manager/schedule/maintenance/schedules",
+        "/rhn/manager/admin/config/monitoring"
     );
 
     ViewHelper() { }

diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
@@ -37,6 +37,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/schedule/maintenance/calendars",
   "/rhn/manager/multiorg/recurring-actions",
   "/rhn/manager/schedule/maintenance/schedules",
+  "/rhn/manager/admin/config/monitoring",
 ];
 
 export const onEndNavigate = () => {

diff --git a/web/html/src/manager/admin/config/monitoring-admin.tsx b/web/html/src/manager/admin/config/monitoring-admin.tsx
@@ -387,25 +387,27 @@ const MonitoringAdmin = (props: MonitoringAdminProps) => {
           </div>
         }
       >
-        <div className="row" style={{ display: "flex" }}>
-          <div className="col-sm-9">
-            <div className="col-md-4 text-left">
-              <label>{t("Monitoring")}</label>
-            </div>
-            <div className="col-md-8">
-              {exportersStatus ? (
-                <ExportersList exporters={exportersStatus} messages={exportersMessages} />
-              ) : (
-                <ListPlaceholder />
-              )}
-              {restartNeeded ? (
-                <div>
-                  <Icon type="system-reboot" className="text-warning fa-1-5x" />
-                  <a href="/rhn/admin/config/Restart.do?">{t("Restarting")}</a>
-                  {t(" Tomcat and Taskomatic is needed for the configuration changes to take effect.")}
-                </div>
-              ) : null}
-              <ExportersMessages messages={exportersMessages} />
+        <div className="row">
+          <div className="col-md-9">
+            <div className="row">
+              <div className="col-md-4 text-left">
+                <label>{t("Monitoring")}</label>
+              </div>
+              <div className="col-md-8">
+                {exportersStatus ? (
+                  <ExportersList exporters={exportersStatus} messages={exportersMessages} />
+                ) : (
+                  <ListPlaceholder />
+                )}
+                {restartNeeded ? (
+                  <div>
+                    <Icon type="system-reboot" className="text-warning fa-1-5x" />
+                    <a href="/rhn/admin/config/Restart.do?">{t("Restarting")}</a>
+                    {t(" Tomcat and Taskomatic is needed for the configuration changes to take effect.")}
+                  </div>
+                ) : null}
+                <ExportersMessages messages={exportersMessages} />
+              </div>
             </div>
           </div>
           <HelpPanel isUyuni={props.isUyuni} />

diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-broken-layout-monitoring-page b/web/spacewalk-web.changes.bisht-richa.fixed-broken-layout-monitoring-page
@@ -0,0 +1 @@
+- Fixed broken layout in monitoring page