Merge pull request #1858 from coreos-inc/repo-pagination

Add repository list pagination
This commit is contained in:
josephschorr 2016-09-22 16:56:42 -04:00 committed by GitHub
commit bfaa46c499
6 changed files with 55 additions and 20 deletions

View file

@ -1310,6 +1310,10 @@ a:focus {
padding-left: 4px;
}
.co-top-bar {
height: 50px;
}
.co-check-bar .co-checked-actions .btn {
margin-left: 6px;
}
@ -1318,21 +1322,25 @@ a:focus {
margin-right: 4px;
}
.co-check-bar .co-filter-box {
.co-check-bar .co-filter-box, .co-top-bar .co-filter-box {
float: right;
}
.co-check-bar .co-filter-box .page-controls {
.co-check-bar .co-filter-box .page-controls, .co-top-bar .co-filter-box .page-controls {
margin-right: 6px;
margin-bottom: 6px;
}
.co-check-bar .co-filter-box input {
.co-check-bar .co-filter-box input, .co-top-bar .co-filter-box input {
width: 300px;
display: inline-block;
vertical-align: middle;
}
.co-top-bar .co-filter-box input {
vertical-align: top;
}
.empty {
border-bottom: none !important;
}

View file

@ -1,11 +1,24 @@
<div class="repo-list-table-element">
<div class="cor-loader" ng-if="isLoading"></div>
<div ng-if="orderedRepositories.entries.length == 0 && !isLoading">
<div class="co-top-bar">
<span class="co-filter-box">
<span class="page-controls" total-count="orderedRepositories.entries.length" current-page="options.page" page-size="reposPerPage"></span>
<input class="form-control" type="text" ng-model="options.filter" placeholder="Filter Repositories..." style="margin-right: 10px;">
</span>
</div>
<div ng-if="orderedRepositories.entries.length == 0 && !isLoading && !options.filter">
<div class="empty-primary-msg" ng-if="namespaces.length != 1">You do not have any viewable repositories.</div>
<div class="empty-primary-msg" ng-if="namespaces.length == 1">This namespace doesn't have any viewable repositories.</div>
<div class="empty-secondary-msg">Either no repositories exist yet or you may not have permission to view any. If you have permission, try <a href="/new">creating a new repository</a>.</div>
</div>
<div ng-if="orderedRepositories.entries.length == 0 && !isLoading && options.filter">
<div class="empty-primary-msg">No matching repositories</div>
<div class="empty-secondary-msg">There are not matching repositories for the entered filter</div>
</div>
<table class="co-table" ng-if="orderedRepositories.entries.length && !isLoading">
<thead>
<td class="hidden-xs"
@ -31,26 +44,26 @@
</thead>
<tbody>
<tr ng-repeat="repository in orderedRepositories.entries">
<tr ng-repeat="repository in orderedRepositories.entries | slice:(reposPerPage * options.page):(reposPerPage * (options.page + 1))">
<td class="repo-name-icon">
<span class="avatar" size="24" data="getAvatarData(repository.namespace)"></span>
<a href="/repository/{{ repository.namespace }}/{{ repository.name }}">
<span class="namespace">{{ repository.namespace }}</span>
<span class="name">{{ repository.name }}</span>
<span class="avatar" size="24" data="::getAvatarData(repository.namespace)"></span>
<a href="/repository/{{ ::repository.namespace }}/{{ ::repository.name }}">
<span class="namespace">{{ ::repository.namespace }}</span>
<span class="name">{{ ::repository.name }}</span>
</a>
</td>
<td class="last-modified">
<span ng-if="repository.last_modified">
{{ repository.last_modified * 1000 | amCalendar }}
<span ng-if="::repository.last_modified">
{{ ::repository.last_modified * 1000 | amCalendar }}
</span>
<span class="empty" ng-if="!repository.last_modified">(Empty Repository)</span>
<span class="empty" ng-if="::!repository.last_modified">(Empty Repository)</span>
</td>
<td class="popularity hidden-xs">
<span class="strength-indicator" value="repository.popularity" maximum="maxPopularity"
<span class="strength-indicator" value="::repository.popularity" maximum="::maxPopularity"
log-base="10"></span>
</td>
<td ng-show="loggedIn">
<span class="repo-star" repository="repository"
<span class="repo-star" repository="::repository"
star-toggled="starToggled({'repository': repository})"></span>
</td>
</tr>

View file

@ -1,6 +1,6 @@
<div class="repo-list-view-element">
<!-- Toggle -->
<div class="repo-list-toggleb btn-group" ng-show="!loading">
<div class="repo-list-toggleb btn-group" ng-show="!loading && optionAllowed">
<i class="btn btn-default fa fa-th-large" ng-class="!showAsList ? 'active' : ''"
ng-click="setShowAsList(false)" title="Grid View" data-container="body" bs-tooltip></i>
<i class="btn btn-default fa fa-th-list" ng-class="showAsList ? 'active' : ''"

View file

@ -8,11 +8,15 @@ angular.module('quay').directive('ngImageWatch', function ($parse) {
var fn = $parse(attr['ngImageWatch']);
return function(scope, element) {
element.bind('error', function() {
fn(scope, {result: false});
scope.$apply(function() {
fn(scope, {result: false});
})
});
element.bind('load', function() {
fn(scope, {result: true});
scope.$apply(function() {
fn(scope, {result: true});
})
});
}
}

View file

@ -16,19 +16,22 @@ angular.module('quay').directive('repoListTable', function () {
controller: function($scope, $element, $filter, TableService, UserService) {
$scope.repositories = null;
$scope.orderedRepositories = [];
$scope.reposPerPage = 50;
$scope.maxPopularity = 0;
$scope.options = {
'predicate': 'popularity',
'reverse': false,
'filter': null
'filter': null,
'page': 0
};
var buildOrderedRepositories = function() {
if (!$scope.repositories) { return; }
$scope.orderedRepositories = TableService.buildOrderedItems($scope.repositories, $scope.options,
[], ['last_modified_datetime', 'popularity'])
$scope.orderedRepositories = TableService.buildOrderedItems($scope.repositories,
$scope.options,
['namespace', 'name'], ['last_modified_datetime', 'popularity'])
};
$scope.tablePredicateClass = function(name, predicate, reverse) {
@ -70,6 +73,7 @@ angular.module('quay').directive('repoListTable', function () {
$scope.$watch('options.predicate', buildOrderedRepositories);
$scope.$watch('options.reverse', buildOrderedRepositories);
$scope.$watch('options.filter', buildOrderedRepositories);
$scope.$watch('repositoriesResources', function(resources) {
$scope.repositories = [];

View file

@ -17,6 +17,7 @@ angular.module('quay').directive('repoListView', function () {
$scope.resources = [];
$scope.loading = true;
$scope.showAsList = CookieService.get('quay.repoview') == 'list';
$scope.optionAllowed = true;
$scope.$watch('namespaces', function(namespaces) {
if (!namespaces) { return; }
@ -31,6 +32,11 @@ angular.module('quay').directive('repoListView', function () {
}
}
});
$scope.optionAllowed = $scope.resources.length <= 250;
if (!$scope.optionAllowed) {
$scope.showAsList = true;
}
}, true);
$scope.setShowAsList = function(value) {