refactoring to allow for array of objects, removing useless css styles

This commit is contained in:
Shelby Sturgis 2016-03-17 14:22:42 -07:00
parent ec68aa0f4a
commit 1ff22b1f77
3 changed files with 15 additions and 22 deletions

View file

@ -52,19 +52,6 @@
.list-group {
margin-bottom: 0;
.list-group-item .list-group-item-menu:hover {
background-color: transparent;
}
.list-group-item .list-group-item-menu.active {
background-color: transparent;
}
.list-group-item .list-group-item-menu {
border-radius: 0;
border: none;
}
}
.striped {

View file

@ -11,21 +11,20 @@ module.directive('paginatedSelectableList', function (kbnUrl) {
scope: {
perPage: '=',
list: '=',
listProperty: '=',
userMakeUrl: '=',
userOnSelect: '='
},
template: paginatedSelectableListTemplate,
controller: function ($scope, $element, $filter) {
$scope.perPage = $scope.perPage || 10;
$scope.hits = $scope.list.sort() || [];
$scope.hitCount = $scope.hits.length;
$scope.hits = $scope.list = _.sortBy($scope.list, accessor) || [];
$scope.filterCount = $scope.hitCount = $scope.hits.length;
/**
* Boolean that keeps track of whether hits are sorted ascending (true)
* or descending (false) by title
* @type {Boolean}
* or descending (false)
* * @type {Boolean}
*/
$scope.isAscending = true;
@ -35,8 +34,10 @@ module.directive('paginatedSelectableList', function (kbnUrl) {
* @return {Array} Array sorted either ascending or descending
*/
$scope.sortHits = function (hits) {
const sortedList = _.sortBy(hits, accessor);
$scope.isAscending = !$scope.isAscending;
$scope.hits = $scope.isAscending ? hits.sort() : hits.reverse();
$scope.hits = $scope.isAscending ? sortedList : sortedList.reverse();
};
$scope.makeUrl = function (hit) {
@ -49,8 +50,13 @@ module.directive('paginatedSelectableList', function (kbnUrl) {
$scope.$watch('query', function (val) {
$scope.hits = $filter('filter')($scope.list, val);
$scope.hitCount = $scope.hits.length;
$scope.filterCount = $scope.hits.length;
});
function accessor(val) {
const prop = $scope.listProperty;
return prop ? val[prop] : val;
}
}
};
});

View file

@ -15,7 +15,7 @@
autocomplete="off" />
</div>
<div class="finder-hit-count col-md-3">
<span>{{hitCount}} of {{hitCount}}</span>
<span>{{filterCount}} of {{hitCount}}</span>
</div>
</div>
</div>