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

Add load on scroll and max results to base model

Browse Source
This commit is contained in:
gconsidine
2018-01-09 16:01:20 -05:00
committed by Jake McDermott
parent b88ad50a75
commit 5a75059c86
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
awx/ui/client/features/output/index.controller.js
View File

@@ -79,22 +79,31 @@ function JobsIndexController (_job_, JobEventModel, _$sce_, _$timeout_, _$scope_
meta.scroll.buffer = 100; meta.scroll.buffer = 100;
meta.next = job.get('related.job_events.next'); meta.next = job.get('related.job_events.next');
meta.prev = job.get('related.job_events.previous'); meta.prev = job.get('related.job_events.previous');
meta.cursor = job.get('related.job_events.results').length - 1; meta.cursor = job.get('related.job_events.results').length;
container.scroll(onScroll); container.scroll(onScroll);
}); });
} }
function next () { function next () {
job.next('job_events') job.next({ related: 'job_events', limit: 5 })
.then(() => { .then(() => {
meta.next = job.get('related.job_events.next'); meta.next = job.get('related.job_events.next');
meta.prev = job.get('related.job_events.previous'); meta.prev = job.get('related.job_events.previous');
console.log(job.get('related.job_events.results')); append();
}); });
} }
function append () {
const events = job.get('related.job_events.results').slice(meta.cursor);
const rows = $($sce.getTrustedHtml($sce.trustAsHtml(parseEvents(events))));
const table = $('#result-table');
table.append(rows);
$compile(rows.contents())($scope);
}
function expand () { function expand () {
vm.toggle(meta.parent, true); vm.toggle(meta.parent, true);
} }
@@ -141,13 +150,13 @@ function parseLine (event) {
ln++; ln++;
const isLastLine = i === lines.length - 1; const isLastLine = i === lines.length - 1;
let append = createRow(current, ln, line); let row = createRow(current, ln, line);
if (current && current.isTruncated && isLastLine) { if (current && current.isTruncated && isLastLine) {
append += createRow(current); row += createRow(current);
} }
return `${html}${append}`; return `${html}${row}`;
}, ''); }, '');
} }
@@ -350,12 +359,6 @@ function onScroll () {
}, 500); }, 500);
} }
/*
*function approximateLineNumber () {
*
*}
*/
JobsIndexController.$inject = ['job', 'JobEventModel', '$sce', '$timeout', '$scope', '$compile']; JobsIndexController.$inject = ['job', 'JobEventModel', '$sce', '$timeout', '$scope', '$compile'];
module.exports = JobsIndexController; module.exports = JobsIndexController;

34
awx/ui/client/lib/models/Base.js
View File

@@ -104,6 +104,10 @@ function httpGet (config = {}) {
if (config.params) { if (config.params) {
req.params = config.params; req.params = config.params;
if (config.params.page_size) {
this.pageSize = config.params.page_size;
}
} }
if (typeof config.resource === 'object') { if (typeof config.resource === 'object') {
@@ -330,6 +334,10 @@ function has (method, keys) {
function extend (related, config) { function extend (related, config) {
const req = this.parseRequestConfig('GET', config); const req = this.parseRequestConfig('GET', config);
if (config.params.page_size) {
this.pageSize = config.params.page_size;
}
if (this.has(req.method, `related.${related}`)) { if (this.has(req.method, `related.${related}`)) {
req.url = this.get(`related.${related}`); req.url = this.get(`related.${related}`);
@@ -346,8 +354,17 @@ function extend (related, config) {
return Promise.reject(new Error(`No related property, ${related}, exists`)); return Promise.reject(new Error(`No related property, ${related}, exists`));
} }
function next (related, config = {}) { function next (config = {}) {
const url = this.get(`related.${related}.next`); let url;
let results;
if (config.related) {
url = this.get(`related.${config.related}.next`);
results = this.get(`related.${config.related}.results`) || [];
} else {
url = this.get('next');
results = this.get('results');
}
if (!url) { if (!url) {
return Promise.resolve(null); return Promise.resolve(null);
@@ -360,13 +377,18 @@ function next (related, config = {}) {
return $http(req) return $http(req)
.then(({ data }) => { .then(({ data }) => {
const results = this.get(`related.${related}.results`) || []; results = results || [];
data.results = results.concat(data.results); data.results = results.concat(data.results);
this.set('get', `related.${related}`, data);
if (config.limit < results.length) { if ((config.limit * this.pageSize) < data.results.length) {
console.log(results); data.results.splice(-config.limit * this.pageSize);
}
if (config.related) {
this.set('get', `related.${config.related}`, data);
} else {
this.set('get', data);
} }
}); });
} }