zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 02:18:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

push initial events on partially complete job initialization

Browse Source
This commit is contained in:
Jake McDermott
2018-05-10 21:39:55 -04:00
parent 4b5c09c07c
commit 2f5eefe809
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/client/features/output/index.js
+18 -11
View File
@@ -70,13 +70,20 @@ function resolveResource (
return null;
}
const params = { page_size: PAGE_SIZE, order_by: 'start_line' };
const config = { pageCache: PAGE_CACHE, pageLimit: PAGE_LIMIT, params };
const params = {
page_size: PAGE_SIZE,
order_by: 'start_line',
};
const config = {
params,
pageCache: PAGE_CACHE,
pageLimit: PAGE_LIMIT,
};
if (job_event_search) { // eslint-disable-line camelcase
const queryParams = qs.encodeQuerysetObject(qs.decodeArr(job_event_search));
Object.assign(config.params, queryParams);
const query = qs.encodeQuerysetObject(qs.decodeArr(job_event_search));
Object.assign(config.params, query);
}
Wait('start');
@@ -89,7 +96,6 @@ function resolveResource (
}
promises.push(model.extend('get', related, config));
return Promise.all(promises);
})
.then(([stats, model]) => ({
@@ -107,18 +113,19 @@ function resolveResource (
size: PAGE_SIZE,
pageLimit: PAGE_LIMIT
}
}))
.finally(() => Wait('stop'));
}));
if (!handleErrors) {
return resourcePromise;
return resourcePromise
.finally(() => Wait('stop'));
}
return resourcePromise
.catch(({ data, status }) => {
$state.go($state.current, $state.params, { reload: true });
qs.error(data, status);
});
return $state.go($state.current, $state.params, { reload: true });
})
.finally(() => Wait('stop'));
}
function resolveWebSocketConnection ($stateParams, SocketService) {