Fix active list item handling

raviks789 · raviks789 · commit 2653a53fc0d1 · 2024-06-21T10:35:13.000+02:00
diff --git a/library/Notifications/Common/Links.php b/library/Notifications/Common/Links.php
@@ -11,8 +11,12 @@
  */
 abstract class Links
 {
-    public static function event(int $id): Url
+    public static function event(?int $id = null): Url
     {
+        if ($id === null) {
+            return Url::fromPath('notifications/event');
+        }
+
         return Url::fromPath('notifications/event', ['id' => $id]);
     }
 
@@ -26,8 +30,12 @@ public static function incidents(): Url
         return Url::fromPath('notifications/incidents');
     }
 
-    public static function incident(int $id): Url
+    public static function incident(?int $id = null): Url
     {
+        if ($id === null) {
+            return Url::fromPath('notifications/incident');
+        }
+
         return Url::fromPath('notifications/incident', ['id' => $id]);
     }
 
@@ -36,8 +44,12 @@ public static function contacts(): Url
         return Url::fromPath('notifications/contacts');
     }
 
-    public static function contact(int $id): Url
+    public static function contact(?int $id = null): Url
     {
+        if ($id === null) {
+            return Url::fromPath('notifications/contact');
+        }
+
         return Url::fromPath('notifications/contact', ['id' => $id]);
     }
 
@@ -46,8 +58,12 @@ public static function eventRules(): Url
         return Url::fromPath('notifications/event-rules');
     }
 
-    public static function eventRule(int $id): Url
+    public static function eventRule(?int $id = null): Url
     {
+        if ($id === null) {
+            return Url::fromPath('notifications/event-rule');
+        }
+
         return Url::fromPath('notifications/event-rule', ['id' => $id]);
     }
 
@@ -56,8 +72,12 @@ public static function schedules(): Url
         return Url::fromPath('notifications/schedules');
     }
 
-    public static function schedule(int $id): Url
+    public static function schedule(?int $id = null): Url
     {
+        if ($id === null) {
+            return Url::fromPath('notifications/schedule');
+        }
+
         return Url::fromPath('notifications/schedule', ['id' => $id]);
     }
 
@@ -86,8 +106,12 @@ public static function contactGroupsSuggestMember(): Url
         return Url::fromPath('notifications/contact-groups/suggest-member');
     }
 
-    public static function contactGroup(int $id): Url
+    public static function contactGroup(?int $id = null): Url
     {
+        if ($id === null) {
+            return Url::fromPath('notifications/contact-group');
+        }
+
         return Url::fromPath('notifications/contact-group', ['id' => $id]);
     }
 
diff --git a/library/Notifications/Widget/ItemList/ContactGroupList.php b/library/Notifications/Widget/ItemList/ContactGroupList.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
+use Icinga\Module\Notifications\Common\Links;
 use ipl\Web\Common\BaseItemList;
 
 class ContactGroupList extends BaseItemList
@@ -14,4 +15,10 @@ protected function getItemClass(): string
     {
         return ContactGroupListItem::class;
     }
+
+    protected function init(): void
+    {
+        $this->getAttributes()
+            ->set('data-icinga-detail-url', (string) Links::contactGroup());
+    }
 }
diff --git a/library/Notifications/Widget/ItemList/ContactGroupListItem.php b/library/Notifications/Widget/ItemList/ContactGroupListItem.php
@@ -10,7 +10,9 @@
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
+use ipl\Stdlib\Filter;
 use ipl\Web\Common\BaseListItem;
+use ipl\Web\Filter\QueryString;
 use ipl\Web\Widget\Link;
 
 class ContactGroupListItem extends BaseListItem
@@ -23,7 +25,9 @@ class ContactGroupListItem extends BaseListItem
 
     protected function init(): void
     {
-        $this->getAttributes()->set('data-action-item', true);
+        $this->getAttributes()
+            ->set('data-action-item', true)
+            ->set('data-icinga-detail-filter', QueryString::render(Filter::equal('id', $this->item->id)));
     }
 
     protected function assembleVisual(BaseHtmlElement $visual): void
diff --git a/library/Notifications/Widget/ItemList/ContactList.php b/library/Notifications/Widget/ItemList/ContactList.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
+use Icinga\Module\Notifications\Common\Links;
 use ipl\Web\Common\BaseItemList;
 
 class ContactList extends BaseItemList
@@ -14,4 +15,10 @@ protected function getItemClass(): string
     {
         return ContactListItem::class;
     }
+
+    protected function init(): void
+    {
+        $this->getAttributes()
+            ->set('data-icinga-detail-url', (string) Links::contact());
+    }
 }
diff --git a/library/Notifications/Widget/ItemList/ContactListItem.php b/library/Notifications/Widget/ItemList/ContactListItem.php
@@ -9,7 +9,9 @@
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
+use ipl\Stdlib\Filter;
 use ipl\Web\Common\BaseListItem;
+use ipl\Web\Filter\QueryString;
 use ipl\Web\Url;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
@@ -28,7 +30,8 @@ class ContactListItem extends BaseListItem
     protected function init(): void
     {
         $this->getAttributes()
-            ->set('data-action-item', true);
+            ->set('data-action-item', true)
+            ->set('data-icinga-detail-filter', QueryString::render(Filter::equal('id', $this->item->id)));
     }
 
     protected function assembleVisual(BaseHtmlElement $visual): void
diff --git a/library/Notifications/Widget/ItemList/EventList.php b/library/Notifications/Widget/ItemList/EventList.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
+use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Common\LoadMore;
 use Icinga\Module\Notifications\Common\NoSubjectLink;
 use Icinga\Module\Notifications\Hook\ObjectsRendererHook;
@@ -37,6 +38,9 @@ protected function init(): void
         $this->on(self::ON_ASSEMBLED, function () {
             ObjectsRendererHook::load();
         });
+
+        $this->getAttributes()
+            ->set('data-icinga-detail-url', (string) Links::event());
     }
 
     protected function getItemClass(): string
diff --git a/library/Notifications/Widget/ItemList/EventListItem.php b/library/Notifications/Widget/ItemList/EventListItem.php
@@ -15,8 +15,10 @@
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\HtmlElement;
+use ipl\Stdlib\Filter;
 use ipl\Stdlib\Str;
 use ipl\Web\Common\BaseListItem;
+use ipl\Web\Filter\QueryString;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
 use ipl\Web\Widget\TimeAgo;
@@ -47,6 +49,9 @@ protected function init(): void
             $this->getAttributes()
                 ->set('data-action-item', true);
         }
+
+        $this->getAttributes()
+            ->set('data-icinga-detail-filter', QueryString::render(Filter::equal('id', $this->item->id)));
     }
 
     protected function assembleVisual(BaseHtmlElement $visual): void
diff --git a/library/Notifications/Widget/ItemList/EventRuleList.php b/library/Notifications/Widget/ItemList/EventRuleList.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
+use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Common\LoadMore;
 use ipl\Web\Common\BaseItemList;
 
@@ -17,4 +18,10 @@ protected function getItemClass(): string
     {
         return EventRuleListItem::class;
     }
+
+    protected function init(): void
+    {
+        $this->getAttributes()
+            ->set('data-icinga-detail-url', (string) Links::eventRule());
+    }
 }
diff --git a/library/Notifications/Widget/ItemList/EventRuleListItem.php b/library/Notifications/Widget/ItemList/EventRuleListItem.php
@@ -10,7 +10,9 @@
 use Icinga\Module\Notifications\Widget\RuleEscalationRecipientBadge;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
+use ipl\Stdlib\Filter;
 use ipl\Web\Common\BaseListItem;
+use ipl\Web\Filter\QueryString;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
 
@@ -28,7 +30,8 @@ class EventRuleListItem extends BaseListItem
     protected function init(): void
     {
         $this->getAttributes()
-            ->set('data-action-item', true);
+            ->set('data-action-item', true)
+            ->set('data-icinga-detail-filter', QueryString::render(Filter::equal('id', $this->item->id)));
     }
 
     protected function assembleVisual(BaseHtmlElement $visual): void
diff --git a/library/Notifications/Widget/ItemList/IncidentList.php b/library/Notifications/Widget/ItemList/IncidentList.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
+use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Hook\ObjectsRendererHook;
 use Icinga\Module\Notifications\Model\Incident;
 use ipl\Web\Common\BaseItemList;
@@ -24,6 +25,9 @@ protected function init(): void
         $this->on(self::ON_ASSEMBLED, function () {
             ObjectsRendererHook::load();
         });
+
+        $this->getAttributes()
+            ->set('data-icinga-detail-url', (string) Links::incident());
     }
 
     protected function getItemClass(): string
diff --git a/library/Notifications/Widget/ItemList/IncidentListItem.php b/library/Notifications/Widget/ItemList/IncidentListItem.php
@@ -16,7 +16,9 @@
 use ipl\Html\Html;
 use ipl\Html\HtmlElement;
 use ipl\I18n\Translation;
+use ipl\Stdlib\Filter;
 use ipl\Web\Common\BaseListItem;
+use ipl\Web\Filter\QueryString;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
 use ipl\Web\Widget\TimeAgo;
@@ -41,6 +43,9 @@ protected function init(): void
             $this->getAttributes()
                 ->set('data-action-item', true);
         }
+
+        $this->getAttributes()
+            ->set('data-icinga-detail-filter', QueryString::render(Filter::equal('id', $this->item->id)));
     }
 
     protected function assembleVisual(BaseHtmlElement $visual): void
diff --git a/library/Notifications/Widget/ItemList/ScheduleList.php b/library/Notifications/Widget/ItemList/ScheduleList.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
+use Icinga\Module\Notifications\Common\Links;
 use ipl\Web\Common\BaseItemList;
 
 class ScheduleList extends BaseItemList
@@ -14,4 +15,10 @@ protected function getItemClass(): string
     {
         return ScheduleListItem::class;
     }
+
+    protected function init(): void
+    {
+        $this->getAttributes()
+            ->set('data-icinga-detail-url', (string) Links::schedule());
+    }
 }
diff --git a/library/Notifications/Widget/ItemList/ScheduleListItem.php b/library/Notifications/Widget/ItemList/ScheduleListItem.php
@@ -7,7 +7,9 @@
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Model\Schedule;
 use ipl\Html\BaseHtmlElement;
+use ipl\Stdlib\Filter;
 use ipl\Web\Common\BaseListItem;
+use ipl\Web\Filter\QueryString;
 use ipl\Web\Widget\Link;
 
 /**
@@ -24,7 +26,8 @@ class ScheduleListItem extends BaseListItem
     protected function init(): void
     {
         $this->getAttributes()
-            ->set('data-action-item', true);
+            ->set('data-action-item', true)
+            ->set('data-icinga-detail-filter', QueryString::render(Filter::equal('id', $this->item->id)));
     }
 
     protected function assembleTitle(BaseHtmlElement $title): void

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,12 @@`
`11`	`11`	`*/`
`12`	`12`	`abstract class Links`
`13`	`13`	`{`
`14`		`- public static function event(int $id): Url`
	`14`	`+ public static function event(?int $id = null): Url`
`15`	`15`	`{`
	`16`	`+ if ($id === null) {`
	`17`	`+ return Url::fromPath('notifications/event');`
	`18`	`+ }`
	`19`	`+`
`16`	`20`	`return Url::fromPath('notifications/event', ['id' => $id]);`
`17`	`21`	`}`
`18`	`22`
`@@ -26,8 +30,12 @@ public static function incidents(): Url`
`26`	`30`	`return Url::fromPath('notifications/incidents');`
`27`	`31`	`}`
`28`	`32`
`29`		`- public static function incident(int $id): Url`
	`33`	`+ public static function incident(?int $id = null): Url`
`30`	`34`	`{`
	`35`	`+ if ($id === null) {`
	`36`	`+ return Url::fromPath('notifications/incident');`
	`37`	`+ }`
	`38`	`+`
`31`	`39`	`return Url::fromPath('notifications/incident', ['id' => $id]);`
`32`	`40`	`}`
`33`	`41`
`@@ -36,8 +44,12 @@ public static function contacts(): Url`
`36`	`44`	`return Url::fromPath('notifications/contacts');`
`37`	`45`	`}`
`38`	`46`
`39`		`- public static function contact(int $id): Url`
	`47`	`+ public static function contact(?int $id = null): Url`
`40`	`48`	`{`
	`49`	`+ if ($id === null) {`
	`50`	`+ return Url::fromPath('notifications/contact');`
	`51`	`+ }`
	`52`	`+`
`41`	`53`	`return Url::fromPath('notifications/contact', ['id' => $id]);`
`42`	`54`	`}`
`43`	`55`
`@@ -46,8 +58,12 @@ public static function eventRules(): Url`
`46`	`58`	`return Url::fromPath('notifications/event-rules');`
`47`	`59`	`}`
`48`	`60`
`49`		`- public static function eventRule(int $id): Url`
	`61`	`+ public static function eventRule(?int $id = null): Url`
`50`	`62`	`{`
	`63`	`+ if ($id === null) {`
	`64`	`+ return Url::fromPath('notifications/event-rule');`
	`65`	`+ }`
	`66`	`+`
`51`	`67`	`return Url::fromPath('notifications/event-rule', ['id' => $id]);`
`52`	`68`	`}`
`53`	`69`
`@@ -56,8 +72,12 @@ public static function schedules(): Url`
`56`	`72`	`return Url::fromPath('notifications/schedules');`
`57`	`73`	`}`
`58`	`74`
`59`		`- public static function schedule(int $id): Url`
	`75`	`+ public static function schedule(?int $id = null): Url`
`60`	`76`	`{`
	`77`	`+ if ($id === null) {`
	`78`	`+ return Url::fromPath('notifications/schedule');`
	`79`	`+ }`
	`80`	`+`
`61`	`81`	`return Url::fromPath('notifications/schedule', ['id' => $id]);`
`62`	`82`	`}`
`63`	`83`
`@@ -86,8 +106,12 @@ public static function contactGroupsSuggestMember(): Url`
`86`	`106`	`return Url::fromPath('notifications/contact-groups/suggest-member');`
`87`	`107`	`}`
`88`	`108`
`89`		`- public static function contactGroup(int $id): Url`
	`109`	`+ public static function contactGroup(?int $id = null): Url`
`90`	`110`	`{`
	`111`	`+ if ($id === null) {`
	`112`	`+ return Url::fromPath('notifications/contact-group');`
	`113`	`+ }`
	`114`	`+`
`91`	`115`	`return Url::fromPath('notifications/contact-group', ['id' => $id]);`
`92`	`116`	`}`
`93`	`117`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Icinga\Module\Notifications\Widget\ItemList;`
`6`	`6`
	`7`	`+use Icinga\Module\Notifications\Common\Links;`
`7`	`8`	`use ipl\Web\Common\BaseItemList;`
`8`	`9`
`9`	`10`	`class ContactGroupList extends BaseItemList`
`@@ -14,4 +15,10 @@ protected function getItemClass(): string`
`14`	`15`	`{`
`15`	`16`	`return ContactGroupListItem::class;`
`16`	`17`	`}`
	`18`	`+`
	`19`	`+ protected function init(): void`
	`20`	`+ {`
	`21`	`+ $this->getAttributes()`
	`22`	`+ ->set('data-icinga-detail-url', (string) Links::contactGroup());`
	`23`	`+ }`
`17`	`24`	`}`