Use new item list implementation

application/controllers/ChannelsController.php

@@ -5,23 +5,23 @@
 namespace Icinga\Module\Notifications\Controllers;
 
 use Icinga\Module\Notifications\Common\Database;
+use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Forms\ChannelForm;
 use Icinga\Module\Notifications\Model\Channel;
+use Icinga\Module\Notifications\View\ChannelRenderer;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
-use Icinga\Module\Notifications\Widget\ItemList\ChannelList;
+use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
 use Icinga\Web\Notification;
 use Icinga\Web\Widget\Tab;
 use Icinga\Web\Widget\Tabs;
-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;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
-use ipl\Web\Url;
+use ipl\Web\Layout\MinimalItemLayout;
 use ipl\Web\Widget\ButtonLink;
 
 class ChannelsController extends CompatController
@@ -85,15 +85,15 @@
         $this->addControl($limitControl);
         $this->addControl($searchBar);
         $this->addContent(
-            (new ButtonLink(
-                t('Add Channel'),
-                Url::fromPath('notifications/channels/add'),
-                'plus'
-            ))->setBaseTarget('_next')
-            ->addAttributes(['class' => 'add-new-component'])
+            (new ButtonLink(t('Add Channel'), Links::channelAdd(), 'plus'))
+                ->setBaseTarget('_next')
+                ->addAttributes(['class' => 'add-new-component'])
         );
 
-        $this->addContent(new ChannelList($channels));
+        $this->addContent(
+            (new ObjectList($channels, new ChannelRenderer()))
+                ->setItemLayoutClass(MinimalItemLayout::class)
+        );
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
             $this->sendMultipartUpdate();
@@ -112,29 +112,13 @@
                         $form->getValue('name')
                     )
                 );
-                $this->redirectNow(Url::fromPath('notifications/channels'));
+                $this->redirectNow(Links::channels());
             })
             ->handleRequest($this->getServerRequest());
 
         $this->addContent($form);
     }
 
-    /**
-     * Add attribute 'class' => 'full-width' if the content is an instance of BaseItemList
-     *
-     * @param ValidHtml $content
-     *
-     * @return ChannelsController
-     */
-    protected function addContent(ValidHtml $content)
-    {
-        if ($content instanceof BaseItemList) {
-            $this->content->getAttributes()->add('class', 'full-width');
-        }
-
-        return parent::addContent($content);
-    }
-
     public function completeAction(): void
     {
         $suggestions = new ObjectSuggestions();
@@ -182,7 +166,7 @@
     {
         /** @var Tab $tab */
         foreach ($tabs->getTabs() as $tab) {
             $this->tabs->add($tab->getName(), $tab);
         }
     }
 }

application/controllers/ConfigController.php

@@ -6,11 +6,9 @@
 
 use Icinga\Application\Config;
 use Icinga\Module\Notifications\Forms\DatabaseConfigForm;
-use Icinga\Web\Form;
 use Icinga\Web\Notification;
 use Icinga\Web\Widget\Tab;
 use Icinga\Web\Widget\Tabs;
-use ipl\Html\HtmlString;
 use ipl\Web\Compat\CompatController;
 
 class ConfigController extends CompatController
@@ -28,7 +26,7 @@
         $form = (new DatabaseConfigForm())
             ->populate($moduleConfig->getSection('database'))
             ->on(DatabaseConfigForm::ON_SUCCESS, function ($form) use ($moduleConfig) {
                 $moduleConfig->setSection('database', $form->getValues());
                 $moduleConfig->saveIni();
 
                 Notification::success(t('New configuration has successfully been stored'));
@@ -50,7 +48,7 @@
     {
         /** @var Tab $tab */
         foreach ($tabs->getTabs() as $tab) {
             $this->tabs->add($tab->getName(), $tab);
         }
     }
 }

application/controllers/ContactController.php

@@ -5,12 +5,8 @@
 namespace Icinga\Module\Notifications\Controllers;
 
 use Icinga\Module\Notifications\Common\Database;
-use Icinga\Module\Notifications\Model\Contact;
 use Icinga\Module\Notifications\Web\Form\ContactForm;
 use Icinga\Web\Notification;
-use ipl\Html\FormElement\FieldsetElement;
-use ipl\Sql\Connection;
-use ipl\Stdlib\Filter;
 use ipl\Web\Compat\CompatController;
 
 class ContactController extends CompatController
@@ -25,7 +21,7 @@
         $contactId = $this->params->getRequired('id');
 
         $form = (new ContactForm(Database::get()))
             ->loadContact($contactId)
             ->on(ContactForm::ON_SUCCESS, function (ContactForm $form) {
                 $form->editContact();
                 Notification::success(sprintf(

application/controllers/ContactGroupController.php

@@ -9,17 +9,16 @@
 use Icinga\Module\Notifications\Forms\ContactGroupForm;
 use Icinga\Module\Notifications\Model\Contact;
 use Icinga\Module\Notifications\Model\Contactgroup;
-use Icinga\Module\Notifications\Model\ContactgroupMember;
-use Icinga\Module\Notifications\Widget\ItemList\ContactList;
+use Icinga\Module\Notifications\View\ContactRenderer;
+use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
 use Icinga\Web\Notification;
 use ipl\Html\Attributes;
 use ipl\Html\Form;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
-use ipl\Html\ValidHtml;
 use ipl\Stdlib\Filter;
-use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
+use ipl\Web\Layout\MinimalItemLayout;
 use ipl\Web\Widget\ButtonLink;
 
 class ContactGroupController extends CompatController
@@ -35,7 +34,7 @@
 
         $query = Contactgroup::on(Database::get())
             ->columns(['id', 'name'])
             ->filter(Filter::equal('id', $groupId));
 
         $group = $query->first();
         if ($group === null) {
@@ -44,11 +43,11 @@
 
         $this->controls->addAttributes(['class' => 'contactgroup-detail']);
 
         $this->addControl(new HtmlElement('div', new Attributes(['class' => 'header']), Text::create($group->name)));
 
         $contacts = Contact::on(Database::get())
             ->filter(Filter::all(
                 Filter::equal('contactgroup_member.contactgroup_id', $groupId),
                 Filter::equal('contactgroup_member.deleted', 'n')
             ));
 
@@ -58,16 +57,19 @@
         $this->addContent(
             (new ButtonLink(
                 Text::create(t('Edit Contact Group')),
                 Links::contactGroupEdit($groupId)->with(['showCompact' => true, '_disableLayout' => 1]),
                 'edit',
                 ['class' => 'add-new-component']
             ))->openInModal()
         );
 
-        $this->addContent(new ContactList($contacts));
+        $this->addContent(
+            (new ObjectList($contacts, new ContactRenderer()))
+                ->setItemLayoutClass(MinimalItemLayout::class)
+        );
 
         $this->addTitleTab(t('Contact Group'));
         $this->setTitle(sprintf(t('Contact Group: %s'), $group->name));
     }
 
     public function editAction(): void
@@ -75,7 +77,7 @@
         $groupId = $this->params->getRequired('id');
 
         $form = (new ContactGroupForm(Database::get()))
             ->loadContactgroup($groupId)
             ->setAction(
                 (string) Links::contactGroupEdit($groupId)->with(['showCompact' => true, '_disableLayout' => 1])
             )
@@ -111,13 +113,4 @@
         $this->addContent($form);
         $this->setTitle(t('Edit Contact Group'));
     }
-
-    protected function addContent(ValidHtml $content): self
-    {
-        if ($content instanceof BaseItemList) {
-            $this->content->getAttributes()->add('class', 'full-width');
-        }
-
-        return parent::addContent($content);
-    }
 }

application/controllers/ContactGroupsController.php

@@ -8,20 +8,20 @@
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Forms\ContactGroupForm;
 use Icinga\Module\Notifications\Model\Contactgroup;
+use Icinga\Module\Notifications\View\ContactgroupRenderer;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
-use Icinga\Module\Notifications\Widget\ItemList\ContactGroupList;
+use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
 use Icinga\Module\Notifications\Widget\MemberSuggestions;
 use Icinga\Web\Notification;
 use ipl\Html\Form;
 use ipl\Html\Text;
-use ipl\Html\ValidHtml;
 use ipl\Stdlib\Filter;
-use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
+use ipl\Web\Layout\MinimalItemLayout;
 use ipl\Web\Widget\ButtonLink;
 use ipl\Web\Widget\Tabs;
 
@@ -87,7 +87,10 @@ public function indexAction(): void
             ))->openInModal()
         );
 
-        $this->addContent(new ContactGroupList($groups));
+        $this->addContent(
+            (new ObjectList($groups, new ContactgroupRenderer()))
+                ->setItemLayoutClass(MinimalItemLayout::class)
+        );
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
             $this->sendMultipartUpdate();
@@ -178,15 +181,6 @@ public function getTabs(): Tabs
             ]);
     }
 
-    protected function addContent(ValidHtml $content): self
-    {
-        if ($content instanceof BaseItemList) {
-            $this->content->getAttributes()->add('class', 'full-width');
-        }
-
-        return parent::addContent($content);
-    }
-
     /**
      * Get the filter created from query string parameters
      *

application/controllers/ContactsController.php

@@ -5,22 +5,22 @@
 namespace Icinga\Module\Notifications\Controllers;
 
 use Icinga\Module\Notifications\Common\Links;
+use Icinga\Module\Notifications\View\ContactRenderer;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
 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\Module\Notifications\Widget\ItemList\ObjectList;
 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;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
+use ipl\Web\Layout\MinimalItemLayout;
 use ipl\Web\Widget\ButtonLink;
-use ipl\Html\ValidHtml;
 
 class ContactsController extends CompatController
 {
@@ -80,15 +80,15 @@ public function indexAction()
         $this->addControl($limitControl);
         $this->addControl($searchBar);
         $this->addContent(
-            (new ButtonLink(
-                t('Add Contact'),
-                'notifications/contacts/add',
-                'plus'
-            ))->setBaseTarget('_next')
-            ->addAttributes(['class' => 'add-new-component'])
+            (new ButtonLink(t('Add Contact'), Links::contactAdd(), 'plus'))
+                ->setBaseTarget('_next')
+                ->addAttributes(['class' => 'add-new-component'])
         );
 
-        $this->addContent(new ContactList($contacts));
+        $this->addContent(
+            (new ObjectList($contacts, new ContactRenderer()))
+                ->setItemLayoutClass(MinimalItemLayout::class)
+        );
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
             $this->sendMultipartUpdate();
@@ -114,22 +114,6 @@ public function addAction(): void
         $this->addContent($form);
     }
 
-    /**
-     * Add attribute 'class' => 'full-width' if the content is an instance of BaseItemList
-     *
-     * @param ValidHtml $content
-     *
-     * @return ContactsController
-     */
-    protected function addContent(ValidHtml $content)
-    {
-        if ($content instanceof BaseItemList) {
-            $this->content->getAttributes()->add('class', 'full-width');
-        }
-
-        return parent::addContent($content);
-    }
-
     public function completeAction(): void
     {
         $suggestions = new ObjectSuggestions();

application/controllers/EventController.php

@@ -4,13 +4,11 @@
 
 namespace Icinga\Module\Notifications\Controllers;
 
-use ArrayObject;
 use Icinga\Module\Notifications\Common\Auth;
 use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Model\Event;
 use Icinga\Module\Notifications\Widget\Detail\EventDetail;
-use Icinga\Module\Notifications\Widget\ItemList\EventList;
-use ipl\Orm\ResultSet;
+use Icinga\Module\Notifications\Widget\Detail\ObjectHeader;
 use ipl\Stdlib\Filter;
 use ipl\Web\Compat\CompatController;
 
@@ -40,11 +38,7 @@ public function indexAction(): void
             $this->httpNotFound(t('Event not found'));
         }
 
-        $this->addControl(
-            (new EventList(new ResultSet(new ArrayObject([$event]))))
-                ->setPageSize(1)
-                ->setNoSubjectLink()
-        );
+        $this->addControl(new ObjectHeader($event));
 
         $this->controls->addAttributes(['class' => 'event-detail']);
 

application/controllers/EventRuleController.php

@@ -9,7 +9,6 @@
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Forms\EventRuleForm;
 use Icinga\Module\Notifications\Forms\SaveEventRuleForm;
-use Icinga\Module\Notifications\Model\Incident;
 use Icinga\Module\Notifications\Model\Rule;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ExtraTagSuggestions;
 use Icinga\Module\Notifications\Widget\EventRuleConfig;

application/controllers/EventRulesController.php

@@ -8,9 +8,10 @@
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Forms\SaveEventRuleForm;
 use Icinga\Module\Notifications\Model\Rule;
+use Icinga\Module\Notifications\View\EventRuleRenderer;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Notifications\Widget\EventRuleConfig;
-use Icinga\Module\Notifications\Widget\ItemList\EventRuleList;
+use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
 use Icinga\Web\Notification;
 use Icinga\Web\Session;
 use ipl\Html\Html;
@@ -21,6 +22,7 @@
 use ipl\Web\Control\SearchEditor;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
+use ipl\Web\Layout\DetailedItemLayout;
 use ipl\Web\Url;
 use ipl\Web\Widget\ButtonLink;
 use ipl\Web\Widget\Icon;
@@ -88,10 +90,13 @@ public function indexAction(): void
                 Url::fromPath('notifications/event-rule/edit', ['id' => -1, 'clearCache' => true]),
                 'plus'
             ))->openInModal()
-            ->addAttributes(['class' => 'new-event-rule'])
+            ->addAttributes(['class' => 'add-new-component'])
         );
 
-        $this->addContent(new EventRuleList($eventRules));
+        $this->addContent(
+            (new ObjectList($eventRules, new EventRuleRenderer()))
+            ->setItemLayoutClass(DetailedItemLayout::class)
+        );
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
             $this->sendMultipartUpdate();

application/controllers/EventsController.php

@@ -6,16 +6,19 @@
 
 use Icinga\Module\Notifications\Common\Auth;
 use Icinga\Module\Notifications\Common\Database;
+use Icinga\Module\Notifications\Hook\ObjectsRendererHook;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
-use Icinga\Module\Notifications\Widget\ItemList\EventList;
 use Icinga\Module\Notifications\Model\Event;
+use Icinga\Module\Notifications\Widget\ItemList\LoadMoreObjectList;
 use ipl\Stdlib\Filter;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
 use ipl\Web\Url;
+use ipl\Web\Widget\ItemList;
+use ipl\Web\Widget\ListItem;
 
 class EventsController extends CompatController
 {
@@ -83,9 +86,15 @@ public function indexAction(): void
         $url = Url::fromRequest()->onlyWith($preserveParams);
         $url->setQueryString(QueryString::render($filter) . '&' . $url->getParams()->toString());
 
-        $eventList = (new EventList($events->execute()))
+        $eventList = (new LoadMoreObjectList($events->execute()))
             ->setPageSize($limitControl->getLimit())
-            ->setLoadMoreUrl($url->setParam('before', $before));
+            ->setLoadMoreUrl($url->setParam('before', $before))
+            ->on(ItemList::ON_ITEM_ADD, function (ListItem $item, Event $data) {
+                ObjectsRendererHook::register($data->object);
+            })
+            ->on(ItemList::ON_ASSEMBLED, function () {
+                ObjectsRendererHook::load();
+            });
 
         if ($compact) {
             $eventList->setPageNumber($page);