Skip to content

optimize getTotalServerItems to call model count and list in parallel #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

optimize getTotalServerItems to call model count and list in parallel #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions client/app/dashboard/model/list/ModelList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ angular.module('dashboard.Dashboard.Model.List', [
;
})

.controller('ModelListCtrl', function ModelListCtrl($scope, $cookies, $timeout, $state, $location, $window, $modal, Config, GeneralModelService, CacheService) {
.controller('ModelListCtrl', function ModelListCtrl($scope, $cookies, $timeout, $state, $location, $window, $modal, Config, GeneralModelService, CacheService, $q) {
var isFirstLoad = true;
var modalInstance = null;

Expand Down Expand Up @@ -373,26 +373,27 @@ angular.module('dashboard.Dashboard.Model.List', [

$scope.getTotalServerItems = function() {
var params = setupPagination();
GeneralModelService.count($scope.apiPath, params)
.then(function(response) {
if (!response) return; //in case http request was cancelled
//Check if response is an array or object
if (typeof response === 'string') {
$scope.totalServerItems = response;
} else {
if (response instanceof Array && response.length > 0) response = response[0];
var keys = Object.keys(response);
if (!response.count && keys.length > 0) {
response.count = response[keys[0]]; //grab first key as the count if count property doesn't exist
var countPromise = GeneralModelService.count($scope.apiPath, params)
.then(function(response) {
if (!response) return; //in case http request was cancelled
//Check if response is an array or object
if (typeof response === 'string') {
$scope.totalServerItems = response;
} else {
if (response instanceof Array && response.length > 0) response = response[0];
var keys = Object.keys(response);
if (!response.count && keys.length > 0) {
response.count = response[keys[0]]; //grab first key as the count if count property doesn't exist
}
$scope.totalServerItems = response.count;
}
$scope.totalServerItems = response.count;
}
$scope.loadItems(params);
},
function(error) {
});

$q.all([countPromise, $scope.loadItems(params)])
Copy link
Contributor

@tma-isbx tma-isbx Aug 11, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

loadItems() doesn't currently return a promise, so while this does execute both API calls in parallel, it isn't quite correct.

.catch(function(err) {
$scope.errorMessage = 'There was an error while loading...';
console.error(error);
});
});
};

$scope.loadItems = function(params) {
Expand Down