External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 16:47:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Move data request into controller to speed up page load

Browse Source
This commit is contained in:
Joe Fiorini
2015-06-05 15:42:36 -04:00
parent 65d20e646d
commit 63b7ec8b67
3 changed files with 102 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/static/js/system-tracking/data-services/get-data-for-comparison.factory.js
View File

@@ -9,7 +9,7 @@ export default
'getModuleOptions',
'resolveVersions',
'lodashAsPromised',
function(factScanDataService, getModuleOptions, resolveVersions) {
function(factScanDataService, getModuleOptions, resolveVersions, _) {
return function(hostIds, moduleName, leftDate, rightDate) {
var moduleOptions;
@@ -29,11 +29,8 @@ export default
}
];
return getModuleOptions(hostIds[0])
.then(function(modules) {
moduleOptions = modules;
return hostVersionParams;
}).thenMap(function(versionParam) {
return _(hostVersionParams)
.map(function(versionParam) {
var versionWithRequest =
[ versionParam,
factScanDataService.

37
awx/ui/static/js/system-tracking/system-tracking.controller.js
View File

@@ -12,14 +12,16 @@ function controller($rootScope,
$routeParams,
$location,
$q,
initialFactData,
moduleOptions,
getDataForComparison,
waitIndicator,
moment,
_) {
// var inventoryId = $routeParams.id;
var hostIds = $routeParams.hosts.split(',');
var hosts = $routeParams.model.hosts;
var moduleParam = $routeParams.module || 'packages';
$scope.hostIds = $routeParams.hosts;
$scope.inventory = $routeParams.model.inventory;
@@ -27,18 +29,18 @@ function controller($rootScope,
$scope.factModulePickersLabelLeft = "Compare facts collected on or before";
$scope.factModulePickersLabelRight = "To facts collected on or before";
$scope.modules = initialFactData.moduleOptions;
$scope.modules = moduleOptions;
var leftSearchRange = searchDateRange('yesterday');
var rightSearchRange = searchDateRange();
var searchConfig =
{ leftRange: initialFactData.leftSearchRange,
rightRange: initialFactData.rightSearchRange
{ leftRange: leftSearchRange,
rightRange: rightSearchRange
};
$scope.leftDate = initialFactData.leftSearchRange.from;
$scope.rightDate = initialFactData.rightSearchRange.from;
$scope.leftScanDate = initialFactData.leftScanDate;
$scope.rightScanDate = initialFactData.rightScanDate;
$scope.leftDate = leftSearchRange.from;
$scope.rightDate = rightSearchRange.from;
$scope.leftHostname = hosts[0].name;
$scope.rightHostname = hosts.length > 1 ? hosts[1].name : hosts[0].name;
@@ -53,9 +55,9 @@ function controller($rootScope,
var activeModule = searchConfig.module;
if (!factData) {
factData =
getDataForComparison(
waitIndicator('start');
return getDataForComparison(
hostIds,
activeModule.name,
leftRange,
@@ -68,13 +70,8 @@ function controller($rootScope,
$scope.rightScanDate = moment(responses[1].timestamp);
return data;
}, true);
}
})
waitIndicator('start');
return _(factData)
.promise()
.then(function(facts) {
// Make sure we always start comparison against
// a non-empty array
@@ -183,7 +180,7 @@ function controller($rootScope,
$scope.$watch('rightDate', dateWatcher('rightRange'), true);
$scope.setActiveModule(initialFactData.moduleName, initialFactData);
$scope.setActiveModule(moduleParam);
}
export default
@@ -192,7 +189,7 @@ export default
'$routeParams',
'$location',
'$q',
'factScanData',
'moduleOptions',
'getDataForComparison',
'Wait',
'moment',

35
awx/ui/static/js/system-tracking/system-tracking.route.js
View File

@@ -4,8 +4,6 @@
* All Rights Reserved
*************************************************/
import {searchDateRange} from './search-date-range';
import moment from 'tower/shared/moment/moment';
export default {
name: 'systemTracking',
@@ -14,40 +12,15 @@ export default {
templateUrl: '/static/js/system-tracking/system-tracking.partial.html',
reloadOnSearch: false,
resolve: {
factScanData:
[ 'getDataForComparison',
moduleOptions:
[ 'getModuleOptions',
'lodashAsPromised',
'$route',
'$location',
function(getDataForComparison, _, $route, $location) {
function(getModuleOptions, _, $route) {
var hostIds = $route.current.params.hosts.split(',');
var moduleParam = $location.search().module || 'packages';
var leftDate = searchDateRange('yesterday');
var rightDate = searchDateRange();
if (hostIds.length === 1) {
hostIds = hostIds.concat(hostIds[0]);
}
var data =
getDataForComparison(hostIds, moduleParam, leftDate, rightDate).
then(function(factDataAndModules) {
var moduleOptions = factDataAndModules[0];
var factResponses = factDataAndModules[1];
var factData = _.pluck(factResponses, 'fact');
factData.leftSearchRange = leftDate;
factData.rightSearchRange = rightDate;
factData.leftScanDate = moment(factResponses[0].timestamp);
factData.rightScanDate = moment(factResponses[1].timestamp);
factData.moduleName = moduleParam;
factData.moduleOptions = moduleOptions;
return factData;
}, true)
getModuleOptions(hostIds[0])
.value();
return data;