External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

remove single-event api queries and extra labels request

Browse Source
This commit is contained in:
Jake McDermott
2018-06-07 17:57:53 -04:00
parent 92ae09e163
commit 4c93c68a29
10 changed files with 61 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/output/api.events.service.js
View File

@@ -17,7 +17,7 @@ function JobEventsApiService ($http, $q) {
this.state = { current: 0, count: 0 };
};
this.fetch = () => this.getFirst().then(() => this);
this.fetch = () => this.getLast().then(() => this);
this.getFirst = () => {
const page = 1;

2
awx/ui/client/features/output/details.component.js
View File

@@ -516,7 +516,7 @@ function getExtraVarsDetails () {
}
function getLabelDetails () {
const jobLabels = _.get(resource.model.get('related.labels'), 'results', []);
const jobLabels = _.get(resource.model.get('summary_fields.labels'), 'results', []);
if (jobLabels.length < 1) {
return null;

19
awx/ui/client/features/output/index.js
View File

@@ -89,27 +89,18 @@ function resolveResource (
Object.assign(config.params, query);
}
let model;
Wait('start');
const resourcePromise = new Resource(['get', 'options'], [id, id])
.then(job => {
const endpoint = `${job.get('url')}${related}/`;
.then(model => {
const endpoint = `${model.get('url')}${related}/`;
eventsApi.init(endpoint, config.params);
const promises = [job.getStats(), eventsApi.fetch()];
if (job.has('related.labels')) {
promises.push(job.extend('get', 'labels'));
}
model = job;
return Promise.all(promises);
return eventsApi.fetch()
.then(events => ([model, events]));
})
.then(([stats, events]) => ({
.then(([model, events]) => ({
id,
type,
stats,
model,
events,
related,

12
awx/ui/client/features/output/stats.component.js
View File

@@ -26,13 +26,13 @@ function JobStatsController (strings, { subscribe }) {
strings.get('tooltips.COLLAPSE_OUTPUT') :
strings.get('tooltips.EXPAND_OUTPUT');
unsubscribe = subscribe(({ running, elapsed, counts, stats, hosts }) => {
unsubscribe = subscribe(({ running, elapsed, counts, hosts }) => {
vm.plays = counts.plays;
vm.tasks = counts.tasks;
vm.hosts = counts.hosts;
vm.elapsed = elapsed;
vm.running = running;
vm.setHostStatusCounts(stats, hosts);
vm.setHostStatusCounts(hosts);
});
};
@@ -40,7 +40,9 @@ function JobStatsController (strings, { subscribe }) {
unsubscribe();
};
vm.setHostStatusCounts = (stats, counts) => {
vm.setHostStatusCounts = counts => {
let statsAreAvailable;
Object.keys(counts).forEach(key => {
const count = counts[key];
const statusBarElement = $(`.HostStatusBar-${key}`);
@@ -48,9 +50,11 @@ function JobStatsController (strings, { subscribe }) {
statusBarElement.css('flex', `${count} 0 auto`);
vm.tooltips[key] = createStatsBarTooltip(key, count);
if (count) statsAreAvailable = true;
});
vm.statsAreAvailable = stats;
vm.statsAreAvailable = statsAreAvailable;
};
vm.toggleExpanded = () => {

51
awx/ui/client/features/output/status.service.js
View File

@@ -1,3 +1,4 @@
/* eslint camelcase: 0 */
const JOB_START = 'playbook_on_start';
const JOB_END = 'playbook_on_stats';
const PLAY_START = 'playbook_on_play_start';
@@ -12,7 +13,7 @@ function JobStatusService (moment, message) {
this.dispatch = () => message.dispatch('status', this.state);
this.subscribe = listener => message.subscribe('status', listener);
this.init = ({ model, stats }) => {
this.init = ({ model }) => {
this.created = model.get('created');
this.job = model.get('id');
this.jobType = model.get('type');
@@ -24,7 +25,6 @@ function JobStatusService (moment, message) {
this.state = {
running: false,
stats: false,
counts: {
plays: 0,
tasks: 0,
@@ -41,13 +41,37 @@ function JobStatusService (moment, message) {
},
};
this.setStatsEvent(stats);
this.updateStats();
this.updateRunningState();
if (model.get('type') === 'job' || model.get('type') === 'project_update') {
if (model.has('playbook_counts')) {
this.setPlaybookCounts(model.get('playbook_counts'));
}
if (model.has('host_status_counts')) {
this.setHostStatusCounts(model.get('host_status_counts'));
}
} else {
const hostStatusCounts = this.createHostStatusCounts(this.state.status);
this.setHostStatusCounts(hostStatusCounts);
this.setPlaybookCounts({ task_count: 1, play_count: 1 });
}
this.updateRunningState();
this.dispatch();
};
this.createHostStatusCounts = status => {
if (_.includes(COMPLETE, status)) {
return { ok: 1 };
}
if (_.includes(INCOMPLETE, status)) {
return { failures: 1 };
}
return null;
};
this.pushStatusEvent = data => {
const isJobStatusEvent = (this.job === data.unified_job_id);
const isProjectStatusEvent = (this.project && (this.project === data.project_id));
@@ -112,7 +136,6 @@ function JobStatusService (moment, message) {
this.updateHostCounts();
if (this.statsEvent) {
this.state.stats = true;
this.setFinished(this.statsEvent.created);
this.setJobStatus(this.statsEvent.failed ? 'failed' : 'successful');
}
@@ -199,9 +222,25 @@ function JobStatusService (moment, message) {
};
this.setHostStatusCounts = counts => {
counts = counts || {};
HOST_STATUS_KEYS.forEach(key => {
counts[key] = counts[key] || 0;
});
if (!this.state.counts.hosts) {
this.state.counts.hosts = Object.keys(counts)
.reduce((sum, key) => sum + counts[key], 0);
}
this.state.hosts = counts;
};
this.setPlaybookCounts = ({ play_count, task_count }) => {
this.state.counts.plays = play_count;
this.state.counts.tasks = task_count;
};
this.resetCounts = () => {
this.state.counts.plays = 0;
this.state.counts.tasks = 0;

5
awx/ui/client/lib/models/AdHocCommand.js
View File

@@ -19,17 +19,12 @@ function postRelaunch (params) {
return $http(req);
}
function getStats () {
return Promise.resolve(null);
}
function AdHocCommandModel (method, resource, config) {
BaseModel.call(this, 'ad_hoc_commands');
this.Constructor = AdHocCommandModel;
this.postRelaunch = postRelaunch.bind(this);
this.getRelaunch = getRelaunch.bind(this);
this.getStats = getStats.bind(this);
return this.create(method, resource, config);
}

6
awx/ui/client/lib/models/InventoryUpdate.js
View File

@@ -1,14 +1,8 @@
let BaseModel;
function getStats () {
return Promise.resolve(null);
}
function InventoryUpdateModel (method, resource, config) {
BaseModel.call(this, 'inventory_updates');
this.getStats = getStats.bind(this);
this.Constructor = InventoryUpdateModel;
return this.create(method, resource, config);

26
awx/ui/client/lib/models/Job.js
View File

@@ -23,31 +23,6 @@ function postRelaunch (params) {
return $http(req);
}
function getStats () {
if (!this.has('GET', 'id')) {
return Promise.reject(new Error('No property, id, exists'));
}
if (!this.has('GET', 'related.job_events')) {
return Promise.reject(new Error('No related property, job_events, exists'));
}
const req = {
method: 'GET',
url: `${this.path}${this.get('id')}/job_events/`,
params: { event: 'playbook_on_stats' },
};
return $http(req)
.then(({ data }) => {
if (data.results.length > 0) {
return data.results[0];
}
return null;
});
}
function getCredentials (id) {
const req = {
method: 'GET',
@@ -64,7 +39,6 @@ function JobModel (method, resource, config) {
this.postRelaunch = postRelaunch.bind(this);
this.getRelaunch = getRelaunch.bind(this);
this.getStats = getStats.bind(this);
this.getCredentials = getCredentials.bind(this);
return this.create(method, resource, config);

32
awx/ui/client/lib/models/ProjectUpdate.js
View File

@@ -1,50 +1,20 @@
let $http;
let BaseModel;
function getStats () {
if (!this.has('GET', 'id')) {
return Promise.reject(new Error('No property, id, exists'));
}
if (!this.has('GET', 'related.events')) {
return Promise.reject(new Error('No related property, events, exists'));
}
const req = {
method: 'GET',
url: `${this.path}${this.get('id')}/events/`,
params: { event: 'playbook_on_stats' },
};
return $http(req)
.then(({ data }) => {
if (data.results.length > 0) {
return data.results[0];
}
return null;
});
}
function ProjectUpdateModel (method, resource, config) {
BaseModel.call(this, 'project_updates');
this.getStats = getStats.bind(this);
this.Constructor = ProjectUpdateModel;
return this.create(method, resource, config);
}
function ProjectUpdateModelLoader (_$http_, _BaseModel_) {
$http = _$http_;
function ProjectUpdateModelLoader (_BaseModel_) {
BaseModel = _BaseModel_;
return ProjectUpdateModel;
}
ProjectUpdateModelLoader.$inject = [
'$http',
'BaseModel'
];

6
awx/ui/client/lib/models/SystemJob.js
View File

@@ -1,14 +1,8 @@
let BaseModel;
function getStats () {
return Promise.resolve(null);
}
function SystemJobModel (method, resource, config) {
BaseModel.call(this, 'system_jobs');
this.getStats = getStats.bind(this);
this.Constructor = SystemJobModel;
return this.create(method, resource, config);