Merge pull request #463 from dottorblaster/address-settings-modal-quirks

Address HANA cluster settings modal quirks

web/checks_api.go

@@ -3,6 +3,7 @@ package web
 import (
 	"fmt"
 	"net/http"
+	"sort"
 
 	"github.com/gin-gonic/gin"
 
@@ -60,6 +61,11 @@ func ApiChecksCatalogHandler(s services.ChecksService) gin.HandlerFunc {
 			g := JSONChecksGroup{Group: group.Group, Checks: group.Checks}
 			groupedCatalog = append(groupedCatalog, &g)
 		}
+
+		sort.SliceStable(groupedCatalog, func(i, j int) bool {
+			return groupedCatalog[i].Group < groupedCatalog[j].Group
+		})
+
 		c.JSON(http.StatusOK, groupedCatalog)
 	}
 }

web/frontend/components/Accordion/Toggle.js

@@ -8,7 +8,10 @@ const AccordionToggle = ({ className = '', eventKey, callback = () => {} }) => {
   );
 
   return (
-    <i className={`eos-icons eos-18 ${className}`} onClick={decoratedOnClick}>
+    <i
+      className={`eos-icons eos-18 trento-pointer ${className}`}
+      onClick={decoratedOnClick}
+    >
       keyboard_arrow_down
     </i>
   );

web/frontend/javascripts/cluster_check_settings.js

@@ -78,6 +78,7 @@ const SettingsButton = () => {
     post(`/api/checks/${clusterId}/settings`, payload)
       .then(() => {
         setLoading(false);
+        setModalOpen(false);
         showSuccessToast({
           content: 'Cluster settings successfully saved.',
         });
@@ -96,8 +97,8 @@ const SettingsButton = () => {
       <Button variant="secondary" size="sm" onClick={() => setModalOpen(true)}>
         <i className="eos-icons eos-18">settings</i>Settings
       </Button>
-      <Modal show={modalOpen}>
-        <Modal.Header>
+      <Modal show={modalOpen} onHide={() => setModalOpen(false)}>
+        <Modal.Header closeButton>
           <Modal.Title>Cluster settings</Modal.Title>
         </Modal.Header>
         <Modal.Body>

web/frontend/stylesheets/stylesheets.scss

@@ -195,3 +195,7 @@ td i.critical {
 .color-red {
   color: $eos-bc-red-500;
 }
+
+.trento-pointer {
+  cursor: pointer;
+}