Skip to content

Fix unstable object order #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix unstable object order #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1349f07
servicegroup: Don't rely on a database's implicit sort order
nilmerg Jul 31, 2024
47d359e
services: Don't rely on a database's implicit sort order
nilmerg Jul 31, 2024
3598335
hostgroup: Don't rely on a database's implicit sort order
nilmerg Apr 1, 2025
5f63502
hosts: Don't rely on a database's implicit sort order
nilmerg Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application/controllers/HostgroupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
[
'host.display_name' => t('Name'),
'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
'host.state.soft_state' => t('Current State'),
'host.state.soft_state,host.display_name' => t('Current State'),
'host.state.last_state_change desc' => t('Last State Change')
]
);
Expand Down Expand Up @@ -103,7 +103,7 @@
yield $this->export($hosts);

$hostList = (new ObjectList($hosts))
->setViewMode($viewModeSwitcher->getViewMode());

Check failure on line 106 in application/controllers/HostgroupController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.3 on ubuntu-latest 

Parameter #1 $mode of method Icinga\Module\Icingadb\Widget\ItemList\ObjectList<Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup,Result of Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup>::setViewMode() expects 'common'|'detailed'|'minimal', string given.

Check failure on line 106 in application/controllers/HostgroupController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.2 on ubuntu-latest 

Parameter #1 $mode of method Icinga\Module\Icingadb\Widget\ItemList\ObjectList<Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup,Result of Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup>::setViewMode() expects 'common'|'detailed'|'minimal', string given.

// ICINGAWEB_EXPORT_FORMAT is not set yet and $this->format is inaccessible, yeah...
if ($this->getRequest()->getParam('format') === 'pdf') {
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/HostsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
[
'host.display_name' => t('Name'),
'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
'host.state.soft_state' => t('Current State'),
'host.state.soft_state,host.display_name' => t('Current State'),
'host.state.last_state_change desc' => t('Last State Change')
]
);
Expand Down Expand Up @@ -105,7 +105,7 @@
->setSort($sortControl->getSort());
} else {
$hostList = (new ObjectList($results))
->setViewMode($viewModeSwitcher->getViewMode());

Check failure on line 108 in application/controllers/HostsController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.3 on ubuntu-latest 

Parameter #1 $mode of method Icinga\Module\Icingadb\Widget\ItemList\ObjectList<Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup,Result of Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup>::setViewMode() expects 'common'|'detailed'|'minimal', string given.

Check failure on line 108 in application/controllers/HostsController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.2 on ubuntu-latest 

Parameter #1 $mode of method Icinga\Module\Icingadb\Widget\ItemList\ObjectList<Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup,Result of Icinga\Module\Icingadb\Model\Comment|Icinga\Module\Icingadb\Model\DependencyNode|Icinga\Module\Icingadb\Model\Downtime|Icinga\Module\Icingadb\Model\Host|Icinga\Module\Icingadb\Model\Service|Icinga\Module\Icingadb\Model\User|Icinga\Module\Icingadb\Model\Usergroup>::setViewMode() expects 'common'|'detailed'|'minimal', string given.
}

$this->addContent($hostList);
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/ServicegroupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ public function indexAction(): Generator
$sortControl = $this->createSortControl(
$services,
[
'service.display_name' => t('Name'),
'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
'service.state.soft_state' => t('Current State'),
'service.state.last_state_change desc' => t('Last State Change'),
'host.display_name' => t('Host')
'service.display_name, host.display_name' => t('Name'),
'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
'service.state.soft_state, service.display_name, host.display_name' => t('Current State'),
'service.state.last_state_change desc' => t('Last State Change'),
'host.display_name, service.display_name' => t('Host')
]
);
$viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/ServicesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public function indexAction()
$sortControl = $this->createSortControl(
$services,
[
'service.display_name' => t('Name'),
'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
'service.state.soft_state' => t('Current State'),
'service.state.last_state_change desc' => t('Last State Change'),
'host.display_name' => t('Host')
'service.display_name, host.display_name' => t('Name'),
'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
'service.state.soft_state, service.display_name, host.display_name' => t('Current State'),
'service.state.last_state_change desc' => t('Last State Change'),
'host.display_name, service.display_name' => t('Host')
]
);
$viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
Expand Down
Loading