Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit eb0b866

Browse files
committed
Paginate apps list page
- This change doesn't show up in the UI by default as the current page size is set to 60 - But this PR is required as the apps list REST controller returns paginated list now Resolves #240
1 parent c6b5f1b commit eb0b866

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

ui/app/scripts/app/controllers/apps.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*
2020
* @author Alex Boyko
2121
* @author Gunnar Hillert
22+
* @author Ilayaperumal Gopinathan
2223
*/
2324
define(['model/pageable'], function (Pageable) {
2425
'use strict';
@@ -122,6 +123,10 @@ define(['model/pageable'], function (Pageable) {
122123
current: 1
123124
};
124125

126+
$scope.pageable.sortOrder = 'ASC';
127+
$scope.pageable.filterQuery = '';
128+
$scope.pageable.pageSize = 60;
129+
125130
/**
126131
* Select all apps
127132
*/
@@ -175,13 +180,27 @@ define(['model/pageable'], function (Pageable) {
175180
}
176181
};
177182

183+
$scope.pageChanged = function(newPage) {
184+
$scope.pageable.pageNumber = newPage-1;
185+
loadAppDefinitions($scope.pageable);
186+
};
187+
188+
$scope.sortChanged = function(sortState) {
189+
console.log('sortState: ', sortState);
190+
loadAppDefinitions($scope.pageable);
191+
};
192+
193+
$scope.searchChanged = function() {
194+
loadAppDefinitions($scope.pageable);
195+
};
196+
178197
/**
179198
* Swicthes to specified page. (Applicable if paging is on)
180199
* @param newPage Page number
181200
*/
182201
$scope.pageChanged = function(newPage) {
183202
$scope.pageable.pageNumber = newPage-1;
184-
loadAppDefinitions(/*$scope.pageable*/);
203+
loadAppDefinitions($scope.pageable);
185204
};
186205

187206
/**
@@ -341,6 +360,6 @@ define(['model/pageable'], function (Pageable) {
341360
}
342361
});
343362

344-
loadAppDefinitions(null/*$scope.pageable*/, true);
363+
loadAppDefinitions($scope.pageable, true);
345364
}];
346365
});

ui/app/scripts/app/views/apps-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</table>
6363
<dir-pagination-controls template-url="scripts/directives/dirPagination.tpl.html"
6464
on-page-change="pageChanged(newPageNumber)"></dir-pagination-controls>
65-
<div class="text-center col-md-8 col-md-offset-2" ng-hide="pageable.items">
65+
<div class="text-center col-md-8 col-md-offset-2" ng-hide="pageable.items.length > 0">
6666
<p><strong>No registered apps.</strong></p>
6767
<p>You can register apps by clicking:</p>
6868
<button type="button" ng-click="registerApps()"

0 commit comments

Comments
 (0)