Merge pull request #282 from Icinga/fix/handled-node-rendering

Fix rendering of state-balls for critical-handled nodes
Icinga · May 27, 2020 · 346ace7 · 346ace7
2 parents 5037d8f + 49bc0dd
commit 346ace7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php
@@ -88,10 +88,14 @@ public function render()
         if (! $node instanceof ImportedNode || $node->getBpConfig()->hasNode($node->getName())) {
             $link = $this->getMainNodeLink();
             if ($renderer->isBreadcrumb()) {
-                $link->prepend((new StateBall(strtolower($node->getStateName())))->addAttributes([
+                $state = strtolower($node->getStateName());
+                if ($node->isHandled()) {
+                    $state = $state . '-handled';
+                }
+                $link->prepend((new StateBall($state))->addAttributes([
                     'title' => sprintf(
                         '%s %s',
-                        $node->getStateName(),
+                        $state,
                         DateFormatter::timeSince($node->getLastStateChange())
                     )
                 ]));

diff --git a/library/Businessprocess/Renderer/TreeRenderer.php b/library/Businessprocess/Renderer/TreeRenderer.php
@@ -116,10 +116,14 @@ public function getNodeIcons(Node $node, array $path = null)
         } else {
             $icons[] = $node->getIcon();
         }
-        $icons[] = (new StateBall(strtolower($node->getStateName())))->addAttributes([
+        $state = strtolower($node->getStateName());
+        if ($node->isHandled()) {
+            $state = $state . '-handled';
+        }
+        $icons[] = (new StateBall($state))->addAttributes([
             'title' => sprintf(
                 '%s %s',
-                $node->getStateName(),
+                $state,
                 DateFormatter::timeSince($node->getLastStateChange())
             )
         ]);

diff --git a/public/css/state-ball.less b/public/css/state-ball.less
@@ -30,6 +30,14 @@
     background-color: @gray-light;
   }
 
+  &.state-critical-handled {
+    background-color: @color-critical-handled;
+  }
+
+  &.state-down-handled {
+    background-color: @color-critical-handled;
+  }
+
   &.size-xs {
     line-height: 0.75em;
     height: 0.75em;