Icinga · nilmerg · Jan 22, 2025 · Nov 19, 2024 · Nov 21, 2024 · Nov 21, 2024
diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
diff --git a/library/Icingadb/Data/CsvResultSetUtils.php b/library/Icingadb/Data/CsvResultSetUtils.php
@@ -6,6 +6,7 @@
 
 use DateTime;
 use DateTimeZone;
+use Icinga\Module\Icingadb\Model\DependencyNode;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Module\Icingadb\Model\Service;
 use ipl\Orm\Model;
@@ -67,7 +68,8 @@ protected function extractKeysAndValues(Model $model, string $path = ''): array
 
     public static function stream(Query $query): void
     {
-        if ($query->getModel() instanceof Host || $query->getModel() instanceof Service) {
+        $model = $query->getModel();
+        if ($model instanceof Host || $model instanceof Service || $model instanceof DependencyNode) {
             $query->setResultSetClass(VolatileCsvResults::class);
         } else {
             $query->setResultSetClass(__CLASS__);

diff --git a/library/Icingadb/Data/JsonResultSetUtils.php b/library/Icingadb/Data/JsonResultSetUtils.php
@@ -6,6 +6,7 @@
 
 use DateTime;
 use DateTimeZone;
+use Icinga\Module\Icingadb\Model\DependencyNode;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Module\Icingadb\Model\Service;
 use Icinga\Util\Json;
@@ -61,7 +62,8 @@ protected function createObject(Model $model): array
 
     public static function stream(Query $query): void
     {
-        if ($query->getModel() instanceof Host || $query->getModel() instanceof Service) {
+        $model = $query->getModel();
+        if ($model instanceof Host || $model instanceof Service || $model instanceof DependencyNode) {
             $query->setResultSetClass(VolatileJsonResults::class);
         } else {
             $query->setResultSetClass(__CLASS__);

diff --git a/library/Icingadb/Model/DependencyNode.php b/library/Icingadb/Model/DependencyNode.php
@@ -83,6 +83,11 @@ public function getSearchColumns(): array
         ];
     }
 
+    public function getDefaultSort(): array
+    {
+        return ['severity DESC', 'last_state_change DESC'];
+    }
+
     public function createBehaviors(Behaviors $behaviors): void
     {
         $behaviors->add(new Binary([

diff --git a/library/Icingadb/Model/UnreachableParent.php b/library/Icingadb/Model/UnreachableParent.php
@@ -137,7 +137,8 @@ private static function selectNodes(Connection $db, Model $root): Select
                 'service_id' => new Expression("COALESCE(%s, $binaryCast)", ['service_id']),
                 'redundancy_group_id' => new Expression($binaryCast),
                 'is_group_member' => new Expression($booleanCast)
-            ]);
+            ])
+            ->disableDefaultSort();
         if ($root instanceof Host) {
             $rootQuery->filter(Filter::all(
                 Filter::equal('host_id', $root->id),

diff --git a/library/Icingadb/Widget/Detail/RedundancyGroupHeader.php b/library/Icingadb/Widget/Detail/RedundancyGroupHeader.php
@@ -8,6 +8,7 @@
 use Icinga\Module\Icingadb\Model\RedundancyGroupSummary;
 use Icinga\Module\Icingadb\Widget\DependencyNodeStatistics;
 use ipl\Html\BaseHtmlElement;
+use ipl\Html\Html;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
 use ipl\Web\Widget\StateBall;
@@ -37,14 +38,18 @@ protected function assembleVisual(BaseHtmlElement $visual): void
 
     protected function assembleTitle(BaseHtmlElement $title): void
     {
-        $title->addHtml($this->createSubject());
+        $subject = $this->createSubject();
         if ($this->object->state->failed) {
-            $text = $this->translate('has no working objects');
+            $title->addHtml(Html::sprintf(
+                $this->translate('%s has no working objects', '<groupname> has ...'),
+                $subject
+            ));
         } else {
-            $text = $this->translate('has working objects');
+            $title->addHtml(Html::sprintf(
+                $this->translate('%s has working objects', '<groupname> has ...'),
+                $subject
+            ));
         }
-
-        $title->addHtml(HtmlElement::create('span', null, Text::create($text)));
     }
 
     protected function createStatistics(): BaseHtmlElement

diff --git a/library/Icingadb/Widget/ItemList/DependencyNodeList.php b/library/Icingadb/Widget/ItemList/DependencyNodeList.php
@@ -28,14 +28,23 @@ protected function getItemClass(): string
 
     protected function createListItem(object $data): BaseListItem
     {
+        $viewMode = $this->getViewMode();
         /** @var UnreachableParent|DependencyNode $data */
         if ($data->redundancy_group_id !== null) {
+            if ($viewMode === 'minimal') {
+                return new RedundancyGroupListItemMinimal($data->redundancy_group, $this);
+            }
+
+            if ($viewMode === 'detailed') {
+                $this->removeAttribute('class', 'default-layout');
+            }
+
             return new RedundancyGroupListItem($data->redundancy_group, $this);
         }
 
         $object = $data->service_id !== null ? $data->service : $data->host;
 
-        switch ($this->getViewMode()) {
+        switch ($viewMode) {
             case 'minimal':
                 $class = $object instanceof Host ? HostListItemMinimal::class : ServiceListItemMinimal::class;
                 break;

diff --git a/library/Icingadb/Widget/ItemList/RedundancyGroupListItem.php b/library/Icingadb/Widget/ItemList/RedundancyGroupListItem.php
@@ -12,6 +12,7 @@
 use Icinga\Module\Icingadb\Model\RedundancyGroupState;
 use Icinga\Module\Icingadb\Widget\DependencyNodeStatistics;
 use ipl\Html\BaseHtmlElement;
+use ipl\Html\Html;
 use ipl\Stdlib\Filter;
 use ipl\Web\Url;
 use ipl\Web\Widget\Link;
@@ -80,14 +81,18 @@ protected function assembleCaption(BaseHtmlElement $caption): void
 
     protected function assembleTitle(BaseHtmlElement $title): void
     {
-        $title->addHtml($this->createSubject());
+        $subject = $this->createSubject();
         if ($this->state->failed) {
-            $text = $this->translate('has no working objects');
+            $title->addHtml(Html::sprintf(
+                $this->translate('%s has no working objects', '<groupname> has ...'),
+                $subject
+            ));
         } else {
-            $text = $this->translate('has working objects');
+            $title->addHtml(Html::sprintf(
+                $this->translate('%s has working objects', '<groupname> has ...'),
+                $subject
+            ));
         }
-
-        $title->addHtml(HtmlElement::create('span', null, Text::create($text)));
     }
 
     protected function assemble(): void

diff --git a/library/Icingadb/Widget/ItemList/RedundancyGroupListItemMinimal.php b/library/Icingadb/Widget/ItemList/RedundancyGroupListItemMinimal.php
@@ -0,0 +1,18 @@
+<?php
+
+/* Icinga DB Web | (c) 2024 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Icingadb\Widget\ItemList;
+
+use Icinga\Module\Icingadb\Common\ListItemMinimalLayout;
+use ipl\Web\Widget\StateBall;
+
+class RedundancyGroupListItemMinimal extends RedundancyGroupListItem
+{
+    use ListItemMinimalLayout;
+
+    protected function getStateBallSize(): string
+    {
+        return StateBall::SIZE_BIG;
+    }
+}
diff --git a/public/css/list/redundancy-group-list-item.less b/public/css/list/redundancy-group-list-item.less
@@ -1,6 +1,17 @@
 .redundancy-group-list-item {
-  .caption {
-    display: flex;
-    justify-content: end;
+  .caption .object-statistics {
+    justify-self: end;
+  }
+}
+
+.item-list.minimal > .redundancy-group-list-item {
+  .caption .object-statistics {
+    font-size: 0.75em;
+  }
+}
+
+.item-list.default-layout > .redundancy-group-list-item {
+  .title > .subject {
+    margin-right: .28125em;
   }
 }