host/service group

Icinga · Dec 4, 2024 · 179b48a · 179b48a
1 parent b0c0994
commit 179b48a
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 60 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,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 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,51 @@
+<?php
+
+/* Icinga DB Web | (c) 2024 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Icingadb\Widget\Detail;
+
+use Icinga\Module\Icingadb\Common\ListItemMinimalLayout;
+use Icinga\Module\Icingadb\Model\Hostgroupsummary;
+use ipl\Html\Attributes;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Html\Text;
+use ipl\Stdlib\Filter;
+
+/**
+ * @property Hostgroupsummary $object
+ */
+class HostgroupHeader extends BaseObjectHeader
+{
+    use ListItemMinimalLayout;
+
+    protected $defaultAttributes = ['class' => 'hostgroup-header'];
+
+    protected function assembleTitle(BaseHtmlElement $title): void
+    {
+        $title->addHtml(new HtmlElement(
+            'span',
+            Attributes::create(['class' => 'subject']),
+            Text::create($this->object->display_name)
+        ));
+
+        $title->addHtml(new HtmlElement('span', null, Text::create($this->object->name)));
+    }
+
+    protected function assembleCaption(BaseHtmlElement $caption): void
+    {
+        $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));
+
+        $caption->addHtml($hostStats, $serviceStats);
+    }
+
+    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 $defaultAttributes = ['class' => 'servicegroup-header'];
+
+    protected function assembleCaption(BaseHtmlElement $caption): void
+    {
+        $caption->addHtml(
+            (new ServiceStatistics($this->object))
+                ->setBaseFilter(Filter::equal('servicegroup.name', $this->object->name))
+        );
+    }
+}
diff --git a/library/Icingadb/Widget/ItemTable/BaseHostGroupItem.php b/library/Icingadb/Widget/ItemTable/BaseHostGroupItem.php
@@ -6,7 +6,6 @@
 
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Model\Hostgroupsummary;
-use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
@@ -27,37 +26,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
@@ -6,7 +6,6 @@
 
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Model\ServicegroupSummary;
-use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
@@ -27,37 +26,27 @@ abstract class BaseServiceGroupItem 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::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;
+        $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 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/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/library/Icingadb/Widget/ItemTable/ServicegroupTableRow.php b/library/Icingadb/Widget/ItemTable/ServicegroupTableRow.php
@@ -31,7 +31,7 @@ protected function createStatistics(): array
         $serviceStats = new ServiceStatistics($this->item);
 
         $serviceStats->setBaseFilter(Filter::equal('servicegroup.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;
@@ -62,6 +62,10 @@
         margin-right: 1em;
         width: 0;
 
+        > *:not(:last-child) {
+          margin-right: .5em;
+        }
+
         .line-clamp("reset");
 
         font-size: 11/12em;
@@ -108,3 +112,30 @@
     }
   }
 }
+
+.hostgroup-header,
+.servicegroup-header {
+  .main > header {
+    .caption {
+      height: unset; //TODO; fix this, this must be removed
+    }
+
+    .object-statistics {
+      display: inline-flex;
+
+      .vertical-key-value {
+        br {
+          display: none;
+        }
+
+        .key {
+          padding-left: .417em;
+        }
+
+        .value {
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+}