Skip to content
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

Jump to bottom

Overview and Agents refactor #564

Merged
merged 13 commits into from
Jun 12, 2018
Merged

Overview and Agents refactor #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ad95eac
Moved common data out of controllers
Jun 12, 2018
740acc4
Reducing code lines (in progress)
Jun 12, 2018
13013b3
Added new service
Jun 12, 2018
75f3e3a
Modularized common function used by metrics
Jun 12, 2018
5e76f30
Modularized syscheck and rootcheck validations
Jun 12, 2018
90f108d
Moved filter-handler to the right place
Jun 12, 2018
a2f9f9b
Reporting now has its own service
Jun 12, 2018
03cc83c
Assign method now accepts a string or object
Jun 12, 2018
1f7f8e8
Refactoring in order to work with new services
Jun 12, 2018
0a8c180
Refactoring Overview and Agents (in progress)
Jun 12, 2018
4a3aa3c
Modularized location inspections
Jun 12, 2018
f5e64e0
Pagination to fetch agents raw array
Jun 12, 2018
4b92a40
Removed unused variables, optimized loop
Jun 12, 2018
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
19 changes: 15 additions & 4 deletions public/controllers/agents-preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ app.controller('agentsPreviewController', function ($scope, $rootScope, $routePa
const data = await Promise.all([
$scope.agents.nextPage(),
apiReq.request('GET', '/agents/summary', { }),
genericReq.request('GET', tmpUrl),
apiReq.request('GET', '/agents', { sort:'-dateAdd', limit:9999999 })
genericReq.request('GET', tmpUrl)
]);

// Agents summary
Expand Down Expand Up @@ -151,10 +150,22 @@ app.controller('agentsPreviewController', function ($scope, $rootScope, $routePa
}
}

// Fetch agents sorting by -dateAdd and using pagination
const agents = [];
const total_items = data[1].data.data.Total;
let offset = 0;
const limit = 1000;
while(agents.length < total_items){
const page = await apiReq.request('GET', '/agents', { sort:'-dateAdd', limit, offset });
agents.push(...page.data.data.items)
offset += limit;
}


// Last agent
$scope.lastAgent = data[3].data.data.items[0];
$scope.lastAgent = agents[0];

retrieveList(data[3].data.data.items);
retrieveList(agents);

$scope.loading = false;
if(!$scope.$$phase) $scope.$digest();
Expand Down
Loading