Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

Commit ff5e93b

Browse files
committed
Domains: Fixed domains filter
Thanks @scorphus
1 parent 9991956 commit ff5e93b

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

app/scripts/controllers/domains.coffee

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
'use strict'
22

33
class DomainsCtrl
4-
constructor: (@scope, @window, @interval, @DomainsFcty, @MostCommonViolationsFcty, @WebSocketFcty, @NamedRouteService, @localStorage, @gettextCatalog) ->
4+
constructor: (@scope, @window, @interval, @filter, @DomainsFcty, @MostCommonViolationsFcty, @WebSocketFcty, @NamedRouteService, @localStorage, @gettextCatalog) ->
55
@domainsVisible = false
66
@groupsVisible = true
77
@mostFrequentVisible = false
88

99
@storage = @localStorage
1010
@prefsFilter = @storage.prefsFilter
11-
@order = 'is_active'
11+
@order = '-is_active'
1212
@order_options = [
13-
{text: @gettextCatalog.getString('sort by'), order:'is_active'},
14-
{text: @gettextCatalog.getString('pages'), order:'details.pageCount'},
15-
{text: @gettextCatalog.getString('violations'), order:'details.violationCount'},
16-
{text: @gettextCatalog.getString('error %'), order:'details.errorPercentage'},
17-
{text: @gettextCatalog.getString('avg resp time'), order:'details.averageResponseTime'}]
18-
@order_select = @order_options[0]
13+
{text: @gettextCatalog.getString('is active'), order:'-is_active'},
14+
{text: @gettextCatalog.getString('pages'), order:'-details.pageCount'},
15+
{text: @gettextCatalog.getString('violations'), order:'-details.violationCount'},
16+
{text: @gettextCatalog.getString('error %'), order:'-details.errorPercentage'},
17+
{text: @gettextCatalog.getString('avg resp time'), order:'-details.averageResponseTime'}]
18+
@order_select = {text: @gettextCatalog.getString('is active'), order:'-is_active'}
1919

2020
@getDomainData()
2121
@getMostCommonViolations()
@@ -56,12 +56,7 @@ class DomainsCtrl
5656
for domain in @domainList
5757
domain.details = _.find domainsDetails, {id: domain.id}
5858

59-
@domains = _.sortBy @domainList, (domain) =>
60-
order_splitted = @order.split '.'
61-
if order_splitted.length == 2
62-
domain[order_splitted[0]][order_splitted[1]]
63-
else
64-
domain[order_splitted[0]]
59+
@domains = @filter('orderBy')(@domainList, @order)
6560

6661
@loadedDomains = @domains.length
6762

@@ -116,6 +111,6 @@ class DomainsCtrl
116111

117112

118113
angular.module('holmesApp')
119-
.controller 'DomainsCtrl', ($scope, $window, $interval, DomainsFcty, MostCommonViolationsFcty, WebSocketFcty, $NamedRouteService, $localStorage, gettextCatalog) ->
114+
.controller 'DomainsCtrl', ($scope, $window, $interval, $filter, DomainsFcty, MostCommonViolationsFcty, WebSocketFcty, $NamedRouteService, $localStorage, gettextCatalog) ->
120115

121-
$scope.model = new DomainsCtrl($scope, $window, $interval, DomainsFcty, MostCommonViolationsFcty, WebSocketFcty, $NamedRouteService, $localStorage, gettextCatalog)
116+
$scope.model = new DomainsCtrl($scope, $window, $interval, $filter, DomainsFcty, MostCommonViolationsFcty, WebSocketFcty, $NamedRouteService, $localStorage, gettextCatalog)

0 commit comments

Comments
 (0)