refactor(events-incident-history-improvements): removed unused css, r…

…efactored IconBall class
Icinga · Apr 19, 2024 · 6a16054 · 6a16054
1 parent cbffbef
commit 6a16054
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 120 deletions.
diff --git a/library/Notifications/Widget/CustomIcon.php b/library/Notifications/Widget/CustomIcon.php
diff --git a/library/Notifications/Widget/IconBall.php b/library/Notifications/Widget/IconBall.php
@@ -0,0 +1,20 @@
+<?php
+
+/* Icinga Notifications Web | (c) 2024 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Notifications\Widget;
+
+use ipl\Html\BaseHtmlElement;
+use ipl\Web\Widget\Icon;
+
+class IconBall extends BaseHtmlElement
+{
+    protected $tag = 'span';
+
+    protected $defaultAttributes = ['class' => ['icon-ball']];
+
+    public function __construct(string $name, $family = 'fa-regular')
+    {
+        $this->addHtml(new Icon($name, ['class' => $family]));
+    }
+}
diff --git a/library/Notifications/Widget/ItemList/EventListItem.php b/library/Notifications/Widget/ItemList/EventListItem.php
@@ -9,7 +9,7 @@
 use Icinga\Module\Notifications\Model\Incident;
 use Icinga\Module\Notifications\Model\Objects;
 use Icinga\Module\Notifications\Model\Source;
-use Icinga\Module\Notifications\Widget\CustomIcon;
+use Icinga\Module\Notifications\Widget\IconBall;
 use Icinga\Module\Notifications\Widget\SourceIcon;
 use InvalidArgumentException;
 use ipl\Html\BaseHtmlElement;
@@ -62,7 +62,7 @@ protected function assembleVisual(BaseHtmlElement $visual): void
              * TODO(nc): Add proper handling of internal events once
              *  https://github.com/Icinga/icinga-notifications/issues/162 gets sorted out
              */
-            $content = new CustomIcon('square-up-right', 'fa-solid');
+            $content = new IconBall('square-up-right', 'fa-solid');
         } else {
             switch ($severity) {
                 case 'ok':

diff --git a/library/Notifications/Widget/ItemList/IncidentHistoryListItem.php b/library/Notifications/Widget/ItemList/IncidentHistoryListItem.php
@@ -7,6 +7,7 @@
 use Icinga\Module\Notifications\Common\Icons;
 use Icinga\Module\Notifications\Model\Event;
 use Icinga\Module\Notifications\Model\IncidentHistory;
+use Icinga\Module\Notifications\Widget\IconBall;
 use Icinga\Module\Notifications\Widget\SourceIcon;
 use ipl\Html\BaseHtmlElement;
 use ipl\Web\Common\BaseListItem;
@@ -34,30 +35,27 @@ protected function assembleVisual(BaseHtmlElement $visual): void
                 $content = new Icon($iconName, ['class' => 'severity-' . $this->item->new_severity]);
 
                 break;
+            case 'rule_matched':
             case 'closed':
-                $content = (new Icon($iconName, ['class' => 'type-' . $this->item->type]))->setStyle('fa-regular');
+                $content = new IconBall($iconName);
 
                 break;
             case 'notified':
             case 'recipient_role_changed':
-                $style = 'fa-regular';
+                $family = 'fa-regular';
                 if ($iconName === Icons::UNSUBSCRIBED || $iconName === Icons::UNMANAGE) {
-                    $style = 'fa-solid';
+                    $family = 'fa-solid';
                 }
 
-                $content = (new Icon($iconName))->setStyle($style);
-
-                break;
-            case 'rule_matched':
-                $content = new Icon($iconName, ['class' => 'type-' . $this->item->type]);
+                $content = new IconBall($iconName, $family);
 
                 break;
             case 'escalation_triggered':
-                $content = (new Icon($iconName))->setStyle('fa-solid');
+                $content = new IconBall($iconName, 'fa-solid');
 
                 break;
             default:
-                $content = new Icon('');
+                $content = new IconBall('ellipsis');
         }
 
         $visual->addHtml($content);
@@ -112,6 +110,28 @@ protected function assembleCaption(BaseHtmlElement $caption): void
         $caption->add($this->buildMessage());
     }
 
+    protected function assembleHeader(BaseHtmlElement $header): void
+    {
+        $title = $this->createTitle();
+        if (! $title->isEmpty()) {
+            $header->addHtml($title);
+        }
+
+        $header->addHtml($this->createCaption());
+        if ($this->item->type === 'opened' || $this->item->type === 'incident_severity_changed') {
+            $header->add(
+                (new SourceIcon(SourceIcon::SIZE_BIG))->addHtml($this->item->event->object->source->getIcon())
+            );
+        }
+
+        $header->add(new TimeAgo($this->item->time->getTimestamp()));
+    }
+
+    protected function assembleMain(BaseHtmlElement $main): void
+    {
+        $main->add($this->createHeader());
+    }
+
     protected function buildMessage(): string
     {
         switch ($this->item->type) {
@@ -231,26 +251,4 @@ protected function buildMessage(): string
 
         return $message;
     }
-
-    protected function assembleHeader(BaseHtmlElement $header): void
-    {
-        $title = $this->createTitle();
-        if (! $title->isEmpty()) {
-            $header->addHtml($title);
-        }
-
-        $header->addHtml($this->createCaption());
-        if ($this->item->type === 'opened' || $this->item->type === 'incident_severity_changed') {
-            $header->add(
-                (new SourceIcon(SourceIcon::SIZE_BIG))->addHtml($this->item->event->object->source->getIcon())
-            );
-        }
-
-        $header->add(new TimeAgo($this->item->time->getTimestamp()));
-    }
-
-    protected function assembleMain(BaseHtmlElement $main): void
-    {
-        $main->add($this->createHeader());
-    }
 }
diff --git a/public/css/common.less b/public/css/common.less
@@ -42,7 +42,7 @@
   }
 }
 
-.custom-icon {
+.icon-ball {
   .ball();
   .ball-size-l();
   .ball-solid(@gray-light);
@@ -92,13 +92,3 @@
 .full-width .add-new-component {
   margin: 0 0 1em 1em;
 }
-
-div.show-more {
-  float: right;
-
-  :after {
-    content: "";
-    clear: both;
-    display: table;
-  }
-}