Icinga · nilmerg · Mar 27, 2024 · Sep 5, 2023 · Sep 5, 2023 · Mar 27, 2024
diff --git a/application/controllers/ChannelsController.php b/application/controllers/ChannelsController.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Notifications\Controllers;
 
-use Icinga\Module\Notifications\Common\BaseItemList;
 use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Forms\ChannelForm;
 use Icinga\Module\Notifications\Model\Channel;
@@ -16,6 +15,7 @@
 use ipl\Html\ValidHtml;
 use ipl\Sql\Connection;
 use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
 use ipl\Web\Control\LimitControl;

diff --git a/application/controllers/ContactsController.php b/application/controllers/ContactsController.php
@@ -5,14 +5,14 @@
 namespace Icinga\Module\Notifications\Controllers;
 
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
-use Icinga\Module\Notifications\Common\BaseItemList;
 use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Model\Contact;
 use Icinga\Module\Notifications\Web\Form\ContactForm;
 use Icinga\Module\Notifications\Widget\ItemList\ContactList;
 use Icinga\Web\Notification;
 use ipl\Sql\Connection;
 use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
 use ipl\Web\Control\LimitControl;

diff --git a/library/Notifications/Common/BaseItemList.php b/library/Notifications/Common/BaseItemList.php
diff --git a/library/Notifications/Common/BaseListItem.php b/library/Notifications/Common/BaseListItem.php
diff --git a/library/Notifications/Model/Event.php b/library/Notifications/Model/Event.php
@@ -8,8 +8,14 @@
 use ipl\Orm\Behavior\MillisecondTimestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
+use ipl\Orm\Query;
 use ipl\Orm\Relations;
 
+/**
+ * Event model
+ *
+ * @property Query|Incident $incident
+ */
 class Event extends Model
 {
     public function getTableName()

diff --git a/library/Notifications/Model/Incident.php b/library/Notifications/Model/Incident.php
@@ -10,6 +10,11 @@
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
+/**
+ * Incident Model
+ *
+ * @property int $id
+ */
 class Incident extends Model
 {
     public function getTableName()

diff --git a/library/Notifications/Widget/Detail/EventDetail.php b/library/Notifications/Widget/Detail/EventDetail.php
@@ -6,9 +6,11 @@
 
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Notifications\Model\Event;
+use Icinga\Module\Notifications\Model\Incident;
 use Icinga\Module\Notifications\Model\Objects;
 use Icinga\Module\Notifications\Widget\EventSourceBadge;
 use Icinga\Module\Notifications\Widget\ItemList\IncidentList;
+use InvalidArgumentException;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\ValidHtml;
@@ -21,6 +23,9 @@ class EventDetail extends BaseHtmlElement
     /** @var Event */
     protected $event;
 
+    /** @var Incident */
+    protected $incident;
+
     protected $defaultAttributes = [
         'class'                         => 'event-detail',
         'data-pdfexport-page-breaks-at' => 'h2'
@@ -30,7 +35,12 @@ class EventDetail extends BaseHtmlElement
 
     public function __construct(Event $event)
     {
+        if (! $event->incident instanceof Incident) {
+            throw new InvalidArgumentException('Incidents must be loaded with the event');
+        }
+
         $this->event = $event;
+        $this->incident = $event->incident;
     }
 
     /** @return ValidHtml[] */
@@ -107,13 +117,13 @@ protected function createRelatedObject(): array
     /** @return ValidHtml[]|null */
     protected function createIncident(): ?array
     {
-        if ($this->event->incident->id === null) {
+        if ($this->incident->id === null) {
             return null;
         }
 
         return [
             Html::tag('h2', t('Incident')),
-            new IncidentList([$this->event->incident])
+            new IncidentList([$this->incident])
         ];
     }
 

diff --git a/library/Notifications/Widget/EmptyState.php b/library/Notifications/Widget/EmptyState.php
diff --git a/library/Notifications/Widget/ItemList/ChannelList.php b/library/Notifications/Widget/ItemList/ChannelList.php
@@ -4,14 +4,14 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
-use Icinga\Module\Notifications\Common\BaseItemList;
+use ipl\Web\Common\BaseItemList;
 
 /**
  * A channel list
  */
 class ChannelList extends BaseItemList
 {
-    protected $defaultAttributes = ['class' => 'channel-list'];
+    protected $defaultAttributes = ['class' => ['action-list', 'channel-list']];
 
     protected function getItemClass(): string
     {

diff --git a/library/Notifications/Widget/ItemList/ChannelListItem.php b/library/Notifications/Widget/ItemList/ChannelListItem.php
@@ -4,9 +4,9 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
-use Icinga\Module\Notifications\Common\BaseListItem;
 use Icinga\Module\Notifications\Model\Channel;
 use ipl\Html\BaseHtmlElement;
+use ipl\Web\Common\BaseListItem;
 use ipl\Web\Url;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;

diff --git a/library/Notifications/Widget/ItemList/ContactList.php b/library/Notifications/Widget/ItemList/ContactList.php
@@ -4,11 +4,11 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
-use Icinga\Module\Notifications\Common\BaseItemList;
+use ipl\Web\Common\BaseItemList;
 
 class ContactList extends BaseItemList
 {
-    protected $defaultAttributes = ['class' => 'contact-list'];
+    protected $defaultAttributes = ['class' => ['action-list', 'contact-list']];
 
     protected function getItemClass(): string
     {