mirror of
https://github.com/ansible/awx.git
synced 2026-09-05 19:38:36 -02:30
Polish split jobs API info & add fields to UI
*clarify help text and squash migrations *adds new internal_limit field to Job model for faster reference *if field is non-blank, populate shard params in summary_fields *add summary information to UI job/wfj details, JT selector
This commit is contained in:
@@ -126,6 +126,26 @@ function getSourceWorkflowJobDetails () {
|
||||
return { link, tooltip };
|
||||
}
|
||||
|
||||
function getShardDetails () {
|
||||
const internalLimitDetails = resource.model.get('summary_fields.internal_limit');
|
||||
|
||||
if (!internalLimitDetails) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const shardDetails = resource.model.get('summary_fields.internal_limit.shard');
|
||||
|
||||
if (!shardDetails) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const label = strings.get('labels.SHARD_DETAILS');
|
||||
const offset = `${shardDetails.offset} of ${shardDetails.step} shards`;
|
||||
const tooltip = strings.get('tooltips.SHARD_DETAILS');
|
||||
|
||||
return { label, offset, tooltip };
|
||||
}
|
||||
|
||||
function getJobTemplateDetails () {
|
||||
const jobTemplate = resource.model.get('summary_fields.job_template');
|
||||
|
||||
@@ -671,6 +691,7 @@ function JobDetailsController (
|
||||
vm.jobType = getJobTypeDetails();
|
||||
vm.jobTemplate = getJobTemplateDetails();
|
||||
vm.sourceWorkflowJob = getSourceWorkflowJobDetails();
|
||||
vm.shardDetails = getShardDetails();
|
||||
vm.inventory = getInventoryDetails();
|
||||
vm.project = getProjectDetails();
|
||||
vm.projectUpdate = getProjectUpdateDetails();
|
||||
|
||||
@@ -151,6 +151,12 @@
|
||||
<div class="JobResults-resultRowText">{{ vm.jobType.value }}</div>
|
||||
</div>
|
||||
|
||||
<!-- SHAAAAAARD -->
|
||||
<div class="JobResults-resultRow" ng-if="vm.shardDetails">
|
||||
<label class="JobResults-resultRowLabel">{{ vm.shardDetails.label }}</label>
|
||||
<div class="JobResults-resultRowText">{{ vm.shardDetails.offset }}</div>
|
||||
</div>
|
||||
|
||||
<!-- LAUNCHED BY DETAIL -->
|
||||
<div class="JobResults-resultRow" ng-if="vm.launchedBy">
|
||||
<label class="JobResults-resultRowLabel">{{ vm.launchedBy.label }}</label>
|
||||
|
||||
@@ -23,6 +23,7 @@ function OutputStrings (BaseString) {
|
||||
EXTRA_VARS: t.s('Read-only view of extra variables added to the job template'),
|
||||
INVENTORY: t.s('View the Inventory'),
|
||||
JOB_TEMPLATE: t.s('View the Job Template'),
|
||||
SHARD_DETAILS: t.s('Job is one of several shards from a JT that splits on inventory'),
|
||||
PROJECT: t.s('View the Project'),
|
||||
PROJECT_UPDATE: t.s('View Project checkout results'),
|
||||
SCHEDULE: t.s('View the Schedule'),
|
||||
@@ -55,6 +56,7 @@ function OutputStrings (BaseString) {
|
||||
JOB_EXPLANATION: t.s('Explanation'),
|
||||
JOB_TAGS: t.s('Job Tags'),
|
||||
JOB_TEMPLATE: t.s('Job Template'),
|
||||
SHARD_DETAILS: t.s('Shard Details'),
|
||||
JOB_TYPE: t.s('Job Type'),
|
||||
LABELS: t.s('Labels'),
|
||||
LAUNCHED_BY: t.s('Launched By'),
|
||||
|
||||
Reference in New Issue
Block a user