Host/Service/Hostgroup/Servicegroup: Use severity as default sort order

Author: sukhwinder33445

application/controllers/HostController.php

@@ -215,7 +215,8 @@ public function servicesAction(): Generator
                 'service.state.severity desc,service.state.last_state_change desc' => $this->translate('Severity'),
                 'service.state.soft_state' => $this->translate('Current State'),
                 'service.state.last_state_change desc' => $this->translate('Last State Change')
-            ]
+            ],
+            ['service.state.severity DESC', 'service.state.last_state_change DESC']
         );
 
         yield $this->export($services);

application/controllers/HostgroupsController.php

@@ -43,7 +43,6 @@ public function indexAction()
         $paginationControl = $this->createPaginationControl($hostgroups);
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
 
-        $defaultSort = null;
         if ($viewModeSwitcher->getViewMode() === 'grid') {
             $hostgroups->without([
                 'services_critical_handled',
@@ -56,8 +55,6 @@ public function indexAction()
                 'services_warning_handled',
                 'services_warning_unhandled',
             ]);
-
-            $defaultSort = ['hosts_severity DESC', 'display_name'];
         }
 
         $sortControl = $this->createSortControl(
@@ -67,7 +64,7 @@ public function indexAction()
                 'hosts_severity desc, display_name' => t('Severity'),
                 'hosts_total desc'                  => t('Total Hosts'),
             ],
-            $defaultSort
+            ['hosts_severity DESC', 'display_name']
         );
 
         $searchBar = $this->createSearchBar($hostgroups, [

application/controllers/HostsController.php

@@ -57,7 +57,8 @@ public function indexAction()
                 'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
                 'host.state.soft_state'                                      => t('Current State'),
                 'host.state.last_state_change desc'                          => t('Last State Change')
-            ]
+            ],
+            ['host.state.severity DESC', 'host.state.last_state_change DESC']
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
         $columns = $this->createColumnControl($hosts, $viewModeSwitcher);

application/controllers/ServicegroupsController.php

@@ -45,19 +45,14 @@ public function indexAction()
         $paginationControl = $this->createPaginationControl($servicegroups);
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
 
-        $defaultSort = null;
-        if ($viewModeSwitcher->getViewMode() === 'grid') {
-            $defaultSort = ['services_severity DESC', 'display_name'];
-        }
-
         $sortControl = $this->createSortControl(
             $servicegroups,
             [
                 'display_name'                         => t('Name'),
                 'services_severity desc, display_name' => t('Severity'),
                 'services_total desc'                  => t('Total Services')
             ],
-            $defaultSort
+            ['services_severity DESC', 'display_name']
         );
 
         $searchBar = $this->createSearchBar($servicegroups, [

application/controllers/ServicesController.php

@@ -68,7 +68,8 @@ public function indexAction()
                 'service.state.soft_state'                                         => t('Current State'),
                 'service.state.last_state_change desc'                             => t('Last State Change'),
                 'host.display_name'                                                => t('Host')
-            ]
+            ],
+            ['service.state.severity DESC', 'service.state.last_state_change DESC']
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
         $columns = $this->createColumnControl($services, $viewModeSwitcher);