Remove superfluous trait NoSujectLink and its uses

Icinga · Dec 6, 2024 · b5c9062 · b5c9062
1 parent 2a6cf0e
commit b5c9062
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 69 deletions.
diff --git a/library/Icingadb/Common/NoSubjectLink.php b/library/Icingadb/Common/NoSubjectLink.php
diff --git a/library/Icingadb/Widget/ItemList/BaseCommentListItem.php b/library/Icingadb/Widget/ItemList/BaseCommentListItem.php
@@ -26,12 +26,12 @@ protected function getObject(): Comment
 
     protected function wantSubjectLink(): bool
     {
-        return ! $this->list->getNoSubjectLink();
+        return true;
     }
 
     protected function wantObjectLink(): bool
     {
-        return ! $this->list->getObjectLinkDisabled();
+        return true;
     }
 
     protected function init(): void

diff --git a/library/Icingadb/Widget/ItemList/BaseDowntimeListItem.php b/library/Icingadb/Widget/ItemList/BaseDowntimeListItem.php
@@ -29,12 +29,12 @@ protected function getObject(): Downtime
 
     protected function wantSubjectLink(): bool
     {
-        return ! $this->list->getNoSubjectLink();
+        return true;
     }
 
     protected function wantObjectLink(): bool
     {
-        return ! $this->list->getObjectLinkDisabled();
+        return true;
     }
 
     protected function init(): void

diff --git a/library/Icingadb/Widget/ItemList/BaseHistoryListItem.php b/library/Icingadb/Widget/ItemList/BaseHistoryListItem.php
@@ -32,6 +32,6 @@ protected function getObject(): History
 
     protected function wantSubjectLink(): bool
     {
-        return ! $this->list->getNoSubjectLink();
+        return true;
     }
 }
diff --git a/library/Icingadb/Widget/ItemList/BaseNotificationListItem.php b/library/Icingadb/Widget/ItemList/BaseNotificationListItem.php
@@ -8,35 +8,32 @@
 use Icinga\Module\Icingadb\Common\HostStates;
 use Icinga\Module\Icingadb\Common\Icons;
 use Icinga\Module\Icingadb\Common\Links;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
 use Icinga\Module\Icingadb\Common\ServiceLink;
 use Icinga\Module\Icingadb\Common\ServiceStates;
 use Icinga\Module\Icingadb\Util\PluginOutput;
 use Icinga\Module\Icingadb\Widget\PluginOutputContainer;
 use Icinga\Module\Icingadb\Widget\StateChange;
-use ipl\Stdlib\Filter;
-use ipl\Web\Common\BaseListItem;
-use ipl\Web\Widget\EmptyState;
-use ipl\Web\Widget\TimeAgo;
 use InvalidArgumentException;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
+use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseListItem;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
+use ipl\Web\Widget\TimeAgo;
 
 abstract class BaseNotificationListItem extends BaseListItem
 {
     use HostLink;
-    use NoSubjectLink;
     use ServiceLink;
 
     /** @var NotificationList */
     protected $list;
 
     protected function init(): void
     {
-        $this->setNoSubjectLink($this->list->getNoSubjectLink());
         $this->list->addDetailFilterAttribute($this, Filter::equal('id', bin2hex($this->item->history->id)));
     }
 
@@ -159,19 +156,11 @@ protected function assembleVisual(BaseHtmlElement $visual): void
 
     protected function assembleTitle(BaseHtmlElement $title): void
     {
-        if ($this->getNoSubjectLink()) {
-            $title->addHtml(HtmlElement::create(
-                'span',
-                ['class' => 'subject'],
-                sprintf(self::phraseForType($this->item->type), ucfirst($this->item->object_type))
-            ));
-        } else {
-            $title->addHtml(new Link(
-                sprintf(self::phraseForType($this->item->type), ucfirst($this->item->object_type)),
-                Links::event($this->item->history),
-                ['class' => 'subject']
-            ));
-        }
+        $title->addHtml(new Link(
+            sprintf(self::phraseForType($this->item->type), ucfirst($this->item->object_type)),
+            Links::event($this->item->history),
+            ['class' => 'subject']
+        ));
 
         if ($this->item->object_type === 'host') {
             $link = $this->createHostLink($this->item->host, true);

diff --git a/library/Icingadb/Widget/ItemList/CommentList.php b/library/Icingadb/Widget/ItemList/CommentList.php
@@ -6,7 +6,6 @@
 
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\Links;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
 use Icinga\Module\Icingadb\Common\ObjectLinkDisabled;
 use Icinga\Module\Icingadb\Common\TicketLinks;
 use Icinga\Module\Icingadb\Common\ViewMode;
@@ -15,7 +14,6 @@
 
 class CommentList extends BaseItemList
 {
-    use NoSubjectLink;
     use ObjectLinkDisabled;
     use ViewMode;
     use TicketLinks;

diff --git a/library/Icingadb/Widget/ItemList/DowntimeList.php b/library/Icingadb/Widget/ItemList/DowntimeList.php
@@ -6,7 +6,6 @@
 
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\Links;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
 use Icinga\Module\Icingadb\Common\ObjectLinkDisabled;
 use Icinga\Module\Icingadb\Common\TicketLinks;
 use Icinga\Module\Icingadb\Common\ViewMode;
@@ -15,7 +14,6 @@
 
 class DowntimeList extends BaseItemList
 {
-    use NoSubjectLink;
     use ObjectLinkDisabled;
     use ViewMode;
     use TicketLinks;

diff --git a/library/Icingadb/Widget/ItemList/HistoryList.php b/library/Icingadb/Widget/ItemList/HistoryList.php
@@ -6,7 +6,6 @@
 
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\LoadMore;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
 use Icinga\Module\Icingadb\Common\TicketLinks;
 use Icinga\Module\Icingadb\Common\ViewMode;
 use ipl\Orm\ResultSet;
@@ -15,7 +14,6 @@
 
 class HistoryList extends BaseItemList
 {
-    use NoSubjectLink;
     use ViewMode;
     use LoadMore;
     use TicketLinks;

diff --git a/library/Icingadb/Widget/ItemList/HostListItemDetailed.php b/library/Icingadb/Widget/ItemList/HostListItemDetailed.php
@@ -48,7 +48,6 @@ protected function assembleFooter(BaseHtmlElement $footer): void
             );
 
             $comment = (new CommentList([$COMMENTTOREMOVE]))  //TODO: remove it
-                ->setNoSubjectLink()
                 ->setObjectLinkDisabled()
                 ->setDetailActionsDisabled();
 

diff --git a/library/Icingadb/Widget/ItemList/NotificationList.php b/library/Icingadb/Widget/ItemList/NotificationList.php
@@ -6,15 +6,13 @@
 
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\LoadMore;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
 use Icinga\Module\Icingadb\Common\ViewMode;
 use ipl\Orm\ResultSet;
 use ipl\Web\Common\BaseItemList;
 use ipl\Web\Url;
 
 class NotificationList extends BaseItemList
 {
-    use NoSubjectLink;
     use ViewMode;
     use LoadMore;
     use DetailActions;