diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php index 76b187991..9f2981e19 100644 --- a/application/controllers/HostController.php +++ b/application/controllers/HostController.php @@ -242,15 +242,19 @@ public function parentsAction(): Generator $limitControl = $this->createLimitControl(); $paginationControl = $this->createPaginationControl($nodesQuery); + + $defaultSort = ['severity DESC', 'last_state_change DESC']; $sortControl = $this->createSortControl( $nodesQuery, [ - 'name' => $this->translate('Name'), 'severity desc, last_state_change desc' => $this->translate('Severity'), + 'name' => $this->translate('Name'), 'state' => $this->translate('Current State'), 'last_state_change desc' => $this->translate('Last State Change') - ] + ], + $defaultSort ); + $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl); $searchBar = $this->createSearchBar( @@ -304,15 +308,19 @@ public function childrenAction(): Generator $limitControl = $this->createLimitControl(); $paginationControl = $this->createPaginationControl($nodesQuery); + + $defaultSort = ['severity DESC', 'last_state_change DESC']; $sortControl = $this->createSortControl( $nodesQuery, [ - 'name' => $this->translate('Name'), 'severity desc, last_state_change desc' => $this->translate('Severity'), + 'name' => $this->translate('Name'), 'state' => $this->translate('Current State'), 'last_state_change desc' => $this->translate('Last State Change') - ] + ], + $defaultSort ); + $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl); $searchBar = $this->createSearchBar( diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php index c086c3976..81af532a6 100644 --- a/application/controllers/ServiceController.php +++ b/application/controllers/ServiceController.php @@ -112,15 +112,19 @@ public function parentsAction(): Generator $limitControl = $this->createLimitControl(); $paginationControl = $this->createPaginationControl($nodesQuery); + + $defaultSort = ['severity DESC', 'last_state_change DESC']; $sortControl = $this->createSortControl( $nodesQuery, [ - 'name' => $this->translate('Name'), 'severity desc, last_state_change desc' => $this->translate('Severity'), + 'name' => $this->translate('Name'), 'state' => $this->translate('Current State'), 'last_state_change desc' => $this->translate('Last State Change') - ] + ], + $defaultSort ); + $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl); $searchBar = $this->createSearchBar( @@ -175,15 +179,19 @@ public function childrenAction(): Generator $limitControl = $this->createLimitControl(); $paginationControl = $this->createPaginationControl($nodesQuery); + + $defaultSort = ['severity DESC', 'last_state_change DESC']; $sortControl = $this->createSortControl( $nodesQuery, [ - 'name' => $this->translate('Name'), 'severity desc, last_state_change desc' => $this->translate('Severity'), + 'name' => $this->translate('Name'), 'state' => $this->translate('Current State'), 'last_state_change desc' => $this->translate('Last State Change') - ] + ], + $defaultSort ); + $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl); $searchBar = $this->createSearchBar(