Host Service group

Icinga · Dec 3, 2024 · 0a1ecca · 0a1ecca
1 parent 892f40f
commit 0a1ecca
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 53 deletions.
diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php
@@ -12,6 +12,7 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\Detail\HostgroupHeader;
 use Icinga\Module\Icingadb\Widget\ItemList\HostList;
 use Icinga\Module\Icingadb\Widget\ItemTable\HostgroupTableRow;
 use ipl\Html\Html;
@@ -114,10 +115,10 @@ public function indexAction(): Generator
 
         // ICINGAWEB_EXPORT_FORMAT is not set yet and $this->format is inaccessible, yeah...
         if ($this->getRequest()->getParam('format') === 'pdf') {
-            $this->addContent(new HostgroupTableRow($hostgroup));
+            $this->addContent(new HostgroupHeader($hostgroup));
             $this->addContent(Html::tag('h2', null, t('Hosts')));
         } else {
-            $this->addControl(new HostgroupTableRow($hostgroup));
+            $this->addControl(new HostgroupHeader($hostgroup));
         }
 
         $this->addControl($paginationControl);

diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php
@@ -12,6 +12,7 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\Detail\ServicegroupHeader;
 use Icinga\Module\Icingadb\Widget\ItemList\ServiceList;
 use Icinga\Module\Icingadb\Widget\ItemTable\ServicegroupTableRow;
 use ipl\Html\Html;
@@ -122,10 +123,11 @@ public function indexAction(): Generator
 
         // ICINGAWEB_EXPORT_FORMAT is not set yet and $this->format is inaccessible, yeah...
         if ($this->getRequest()->getParam('format') === 'pdf') {
-            $this->addContent(new ServicegroupTableRow($servicegroup));
+            $this->addContent(new ServicegroupHeader($servicegroup));
             $this->addContent(Html::tag('h2', null, t('Services')));
         } else {
             $this->addControl(new ServicegroupTableRow($servicegroup));
+            $this->addControl(new ServicegroupHeader($servicegroup));
         }
 
         $this->addControl($paginationControl);

diff --git a/library/Icingadb/Widget/Detail/HostgroupHeader.php b/library/Icingadb/Widget/Detail/HostgroupHeader.php
@@ -0,0 +1,49 @@
+<?php
+
+/* Icinga DB Web | (c) 2024 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Icingadb\Widget\Detail;
+
+use Icinga\Module\Icingadb\Model\Hostgroupsummary;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Html\Text;
+use ipl\Stdlib\Filter;
+
+/**
+ * @property Hostgroupsummary $object
+ */
+class HostgroupHeader extends BaseObjectHeader
+{
+    protected $defaultAttributes = ['class' => 'hostgroup-header'];
+
+    protected function assembleTitle(BaseHtmlElement $title): void
+    {
+        $title->addHtml($this->createSubject());
+        $title->addHtml(new HtmlElement('span', null, Text::create($this->object->name)));
+    }
+
+    protected function assembleHeader(BaseHtmlElement $header): void
+    {
+        $header->addHtml($this->createTitle());
+
+        $hostStats = (new HostStatistics($this->object))
+            ->setBaseFilter(Filter::equal('hostgroup.name', $this->object->name));
+
+
+        $serviceStats = (new ServiceStatistics($this->object))
+            ->setBaseFilter(Filter::equal('hostgroup.name', $this->object->name));
+
+        $header->addHtml($hostStats, $serviceStats);
+    }
+
+    protected function assembleMain(BaseHtmlElement $main): void
+    {
+        $main->addHtml($this->createHeader());
+    }
+
+    protected function assemble(): void
+    {
+        $this->addHtml($this->createMain());
+    }
+}
diff --git a/library/Icingadb/Widget/Detail/ServicegroupHeader.php b/library/Icingadb/Widget/Detail/ServicegroupHeader.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Icinga\Module\Icingadb\Widget\Detail;
+
+use ipl\Html\BaseHtmlElement;
+use ipl\Stdlib\Filter;
+
+class ServicegroupHeader extends HostgroupHeader
+{
+    protected function assembleHeader(BaseHtmlElement $header): void
+    {
+        $header->addHtml($this->createTitle());
+
+        $serviceStats = (new ServiceStatistics($this->object))
+            ->setBaseFilter(Filter::equal('servicegroup.name', $this->object->name));
+
+        $header->addHtml($serviceStats);
+    }
+}
diff --git a/library/Icingadb/Widget/ItemTable/BaseHostGroupItem.php b/library/Icingadb/Widget/ItemTable/BaseHostGroupItem.php
@@ -27,37 +27,27 @@ abstract class BaseHostGroupItem extends BaseTableRowItem
 
     protected function init(): void
     {
-        if (isset($this->table)) {
-            $this->table->addDetailFilterAttribute($this, Filter::equal('name', $this->item->name));
-        }
+        $this->table->addDetailFilterAttribute($this, Filter::equal('name', $this->item->name));
     }
 
     protected function createSubject(): BaseHtmlElement
     {
-        if (isset($this->table)) {
-            $link = new Link(
-                $this->item->display_name,
-                Links::hostgroup($this->item),
-                [
-                    'class' => 'subject',
-                    'title' => sprintf(
-                        $this->translate('List all hosts in the group "%s"'),
-                        $this->item->display_name
-                    )
-                ]
-            );
-            if ($this->table->hasBaseFilter()) {
-                $link->getUrl()->setFilter($this->table->getBaseFilter());
-            }
-
-            return $link;
+        $link = new Link(
+            $this->item->display_name,
+            Links::hostgroup($this->item),
+            [
+                'class' => 'subject',
+                'title' => sprintf(
+                    $this->translate('List all hosts in the group "%s"'),
+                    $this->item->display_name
+                )
+            ]
+        );
+        if ($this->table->hasBaseFilter()) {
+            $link->getUrl()->setFilter($this->table->getBaseFilter());
         }
 
-        return new HtmlElement(
-            'span',
-            Attributes::create(['class' => 'subject']),
-            Text::create($this->item->display_name)
-        );
+        return $link;
     }
 
     protected function createCaption(): BaseHtmlElement

diff --git a/library/Icingadb/Widget/ItemTable/BaseServiceGroupItem.php b/library/Icingadb/Widget/ItemTable/BaseServiceGroupItem.php
@@ -34,30 +34,28 @@ protected function init(): void
 
     protected function createSubject(): BaseHtmlElement
     {
-        if (isset($this->table)) {
-            $link = new Link(
-                $this->item->display_name,
-                Links::servicegroup($this->item),
-                [
-                    'class' => 'subject',
-                    'title' => sprintf(
-                        $this->translate('List all services in the group "%s"'),
-                        $this->item->display_name
-                    )
-                ]
-            );
-            if ($this->table->hasBaseFilter()) {
-                $link->getUrl()->setFilter($this->table->getBaseFilter());
-            }
-
-            return $link;
-        }
-
         return new HtmlElement(
             'span',
             Attributes::create(['class' => 'subject']),
             Text::create($this->item->display_name)
         );
+
+        $link = new Link(
+            $this->item->display_name,
+            Links::servicegroup($this->item),
+            [
+                'class' => 'subject',
+                'title' => sprintf(
+                    $this->translate('List all services in the group "%s"'),
+                    $this->item->display_name
+                )
+            ]
+        );
+        if ($this->table->hasBaseFilter()) {
+            $link->getUrl()->setFilter($this->table->getBaseFilter());
+        }
+
+        return $link;
     }
 
     protected function createCaption(): BaseHtmlElement

diff --git a/library/Icingadb/Widget/ItemTable/HostgroupTableRow.php b/library/Icingadb/Widget/ItemTable/HostgroupTableRow.php
@@ -32,7 +32,7 @@ protected function createStatistics(): array
         $hostStats = new HostStatistics($this->item);
 
         $hostStats->setBaseFilter(Filter::equal('hostgroup.name', $this->item->name));
-        if (isset($this->table) && $this->table->hasBaseFilter()) {
+        if ($this->table->hasBaseFilter()) {
             $hostStats->setBaseFilter(
                 Filter::all($hostStats->getBaseFilter(), $this->table->getBaseFilter())
             );
@@ -41,7 +41,7 @@ protected function createStatistics(): array
         $serviceStats = new ServiceStatistics($this->item);
 
         $serviceStats->setBaseFilter(Filter::equal('hostgroup.name', $this->item->name));
-        if (isset($this->table) && $this->table->hasBaseFilter()) {
+        if ($this->table->hasBaseFilter()) {
             $serviceStats->setBaseFilter(
                 Filter::all($serviceStats->getBaseFilter(), $this->table->getBaseFilter())
             );

diff --git a/public/css/widget/object-header.less b/public/css/widget/object-header.less
@@ -6,6 +6,7 @@
     display: flex;
     padding: 0.25em 0;
     align-items: center;
+    margin-right: .5em;
   }
 
   .icon-image { //todo: center the image
@@ -21,7 +22,6 @@
     flex: 1 1 auto;
     padding: 0.25em 0;
     width: 0;
-    margin-left: .5em;
 
     header {
       display: flex;
@@ -81,6 +81,14 @@
         .text-ellipsis();
       }
 
+      .object-statistics {
+        margin-left: auto;
+
+        &:not(:last-child) {
+          margin-right: 1em;
+        }
+      }
+
       time {
         white-space: nowrap;
       }
@@ -96,9 +104,23 @@
       color: @default-text-color;
     }
   }
+}
 
-  .object-statistics {
-    margin-left: auto;
-    margin-right: 1em;
+.hostgroup-header,
+.servicegroup-header {
+  .main {
+    padding: 0;
+  }
+
+  .main > header {
+    justify-content: normal;
+
+    .title {
+      margin-right: auto;
+    }
+
+    .object-statistics {
+      margin-left: 0;
+    }
   }
 }