Utilize widgets moved to ipl-web

Icinga · Sep 8, 2023 · 705a470 · 705a470
1 parent cacc770
commit 705a470
Show file tree

Hide file tree

Showing 77 changed files with 298 additions and 1,952 deletions.
diff --git a/application/controllers/CommentsController.php b/application/controllers/CommentsController.php
@@ -11,8 +11,8 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
+use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;

diff --git a/application/controllers/DowntimesController.php b/application/controllers/DowntimesController.php
@@ -11,8 +11,8 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemList\DowntimeList;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
+use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;

diff --git a/application/controllers/HostgroupsController.php b/application/controllers/HostgroupsController.php
@@ -10,9 +10,8 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemTable\HostgroupTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
-use ipl\Orm\Query;
+use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Url;

diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -18,8 +18,8 @@
 use Icinga\Module\Icingadb\Widget\ItemList\HostList;
 use Icinga\Module\Icingadb\Widget\HostStatusBar;
 use Icinga\Module\Icingadb\Widget\ItemTable\HostItemTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
+use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Orm\Query;
 use ipl\Stdlib\Filter;
 use ipl\Web\Control\LimitControl;
@@ -121,7 +121,9 @@ public function indexAction()
                     ))
             );
         } else {
-            $this->addFooter((new HostStatusBar($summary->first()))->setBaseFilter($filter));
+            /** @var HoststateSummary $hostsSummary */
+            $hostsSummary = $summary->first();
+            $this->addFooter((new HostStatusBar($hostsSummary))->setBaseFilter($filter));
         }
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {

diff --git a/application/controllers/ServicegroupsController.php b/application/controllers/ServicegroupsController.php
@@ -10,8 +10,8 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemTable\ServicegroupTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
+use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Url;

diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
@@ -20,8 +20,8 @@
 use Icinga\Module\Icingadb\Widget\ItemList\ServiceList;
 use Icinga\Module\Icingadb\Widget\ItemTable\ServiceItemTable;
 use Icinga\Module\Icingadb\Widget\ServiceStatusBar;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
+use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Util\Environment;
 use ipl\Html\HtmlString;
 use ipl\Orm\Query;
@@ -132,7 +132,9 @@ public function indexAction()
                     ))
             );
         } else {
-            $this->addFooter((new ServiceStatusBar($summary->first()))->setBaseFilter($filter));
+            /** @var ServicestateSummary $servicesSummary */
+            $servicesSummary = $summary->first();
+            $this->addFooter((new ServiceStatusBar($servicesSummary))->setBaseFilter($filter));
         }
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {

diff --git a/library/Icingadb/Common/BaseItemList.php b/library/Icingadb/Common/BaseItemList.php
diff --git a/library/Icingadb/Common/BaseItemTable.php b/library/Icingadb/Common/BaseItemTable.php