mirror of
https://github.com/ansible/awx.git
synced 2026-02-23 05:55:59 -03:30
Add source WF label to job details template
* Change label from "Parent WF" to "Source WF" * Fix WF job result Firefox responsive style bugs
This commit is contained in:
@@ -334,7 +334,7 @@
|
|||||||
.JobResults-container {
|
.JobResults-container {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-gap: 20px;
|
grid-gap: 20px;
|
||||||
grid-template-columns: minmax(300px, 1fr) minmax(500px, 2fr);
|
grid-template-columns: minmax(400px, 1fr) minmax(500px, 2fr);
|
||||||
grid-template-rows: minmax(500px, ~"calc(100vh - 130px)");
|
grid-template-rows: minmax(500px, ~"calc(100vh - 130px)");
|
||||||
|
|
||||||
.at-Panel {
|
.at-Panel {
|
||||||
@@ -457,5 +457,6 @@
|
|||||||
.JobResults-container {
|
.JobResults-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
min-width: 400px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,10 +120,12 @@ function getSourceWorkflowJobDetails () {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const label = strings.get('labels.SOURCE_WORKFLOW_JOB');
|
||||||
|
const value = sourceWorkflowJob.name;
|
||||||
const link = `/#/workflows/${sourceWorkflowJob.id}`;
|
const link = `/#/workflows/${sourceWorkflowJob.id}`;
|
||||||
const tooltip = strings.get('tooltips.SOURCE_WORKFLOW_JOB');
|
const tooltip = strings.get('tooltips.SOURCE_WORKFLOW_JOB');
|
||||||
|
|
||||||
return { link, tooltip };
|
return { label, value, link, tooltip };
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSliceJobDetails () {
|
function getSliceJobDetails () {
|
||||||
|
|||||||
@@ -281,6 +281,19 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- SOURCE WORKFLOW JOB DETAIL -->
|
||||||
|
<div class="JobResults-resultRow" ng-if="vm.sourceWorkflowJob">
|
||||||
|
<label class="JobResults-resultRowLabel">{{ vm.sourceWorkflowJob.label }}</label>
|
||||||
|
<div class="JobResults-resultRowText">
|
||||||
|
<a href="{{ vm.sourceWorkflowJob.link }}"
|
||||||
|
aw-tool-tip="{{ vm.sourceWorkflowJob.tooltip }}"
|
||||||
|
data-placement="top">
|
||||||
|
{{ vm.sourceWorkflowJob.value }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- EXTRA VARIABLES DETAIL -->
|
<!-- EXTRA VARIABLES DETAIL -->
|
||||||
<at-code-mirror
|
<at-code-mirror
|
||||||
class="JobResults-resultRow"
|
class="JobResults-resultRow"
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ function OutputStrings (BaseString) {
|
|||||||
SKIP_TAGS: t.s('Skip Tags'),
|
SKIP_TAGS: t.s('Skip Tags'),
|
||||||
SOURCE: t.s('Source'),
|
SOURCE: t.s('Source'),
|
||||||
SOURCE_CREDENTIAL: t.s('Source Credential'),
|
SOURCE_CREDENTIAL: t.s('Source Credential'),
|
||||||
|
SOURCE_WORKFLOW_JOB: t.s('Source Workflow'),
|
||||||
STARTED: t.s('Started'),
|
STARTED: t.s('Started'),
|
||||||
STATUS: t.s('Status'),
|
STATUS: t.s('Status'),
|
||||||
VERBOSITY: t.s('Verbosity'),
|
VERBOSITY: t.s('Verbosity'),
|
||||||
|
|||||||
@@ -99,7 +99,6 @@
|
|||||||
|
|
||||||
@media screen and (max-width: @breakpoint-sm) {
|
@media screen and (max-width: @breakpoint-sm) {
|
||||||
.BreadCrumb {
|
.BreadCrumb {
|
||||||
padding-left: 50px;
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ export default ['$state', 'moment', '$timeout', '$window', '$filter', 'Rest', 'G
|
|||||||
windowWidth = dimensions.width;
|
windowWidth = dimensions.width;
|
||||||
|
|
||||||
$('.WorkflowMaker-chart').css("height", windowHeight);
|
$('.WorkflowMaker-chart').css("height", windowHeight);
|
||||||
$('.WorkflowMaker-chart').css("width", windowWidth);
|
|
||||||
|
|
||||||
scope.dimensionsSet = true;
|
scope.dimensionsSet = true;
|
||||||
|
|
||||||
@@ -1137,7 +1136,6 @@ export default ['$state', 'moment', '$timeout', '$window', '$filter', 'Rest', 'G
|
|||||||
function onResize() {
|
function onResize() {
|
||||||
let dimensions = calcAvailableScreenSpace();
|
let dimensions = calcAvailableScreenSpace();
|
||||||
|
|
||||||
$('.WorkflowMaker-chart').css("width", dimensions.width);
|
|
||||||
$('.WorkflowMaker-chart').css("height", dimensions.height);
|
$('.WorkflowMaker-chart').css("height", dimensions.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1160,7 +1158,6 @@ export default ['$state', 'moment', '$timeout', '$window', '$filter', 'Rest', 'G
|
|||||||
scope.$on('workflowMakerModalResized', function () {
|
scope.$on('workflowMakerModalResized', function () {
|
||||||
let dimensions = calcAvailableScreenSpace();
|
let dimensions = calcAvailableScreenSpace();
|
||||||
|
|
||||||
$('.WorkflowMaker-chart').css("width", dimensions.width);
|
|
||||||
$('.WorkflowMaker-chart').css("height", dimensions.height);
|
$('.WorkflowMaker-chart').css("height", dimensions.height);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
.WorkflowMaker-contentLeft {
|
.WorkflowMaker-contentLeft {
|
||||||
flex: 1 0 auto;
|
flex: 1;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
@@ -152,6 +152,7 @@
|
|||||||
}
|
}
|
||||||
.WorkflowMaker-chart {
|
.WorkflowMaker-chart {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
.WorkflowMaker-totalJobs {
|
.WorkflowMaker-totalJobs {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
|
|||||||
@@ -9,6 +9,11 @@
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: @breakpoint-md) {
|
||||||
|
display: block;
|
||||||
|
min-width: 400px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.WorkflowResults-leftSide {
|
.WorkflowResults-leftSide {
|
||||||
@@ -26,6 +31,7 @@
|
|||||||
.OnePlusTwo-right--panel(100%, @breakpoint-md);
|
.OnePlusTwo-right--panel(100%, @breakpoint-md);
|
||||||
height: ~"calc(100vh - 177px)";
|
height: ~"calc(100vh - 177px)";
|
||||||
min-height: 350px;
|
min-height: 350px;
|
||||||
|
min-width: 0;
|
||||||
|
|
||||||
@media (max-width: @breakpoint-md - 1px) {
|
@media (max-width: @breakpoint-md - 1px) {
|
||||||
padding-right: 15px;
|
padding-right: 15px;
|
||||||
@@ -74,7 +80,7 @@
|
|||||||
.WorkflowResults-resultRowLabel {
|
.WorkflowResults-resultRowLabel {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
color: @default-interface-txt;
|
color: @default-interface-txt;
|
||||||
font-size: 14px;
|
font-size: 12px;
|
||||||
font-weight: normal!important;
|
font-weight: normal!important;
|
||||||
width: 30%;
|
width: 30%;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
|
|||||||
EDIT_WORKFLOW: i18n._('Edit the workflow job template'),
|
EDIT_WORKFLOW: i18n._('Edit the workflow job template'),
|
||||||
EDIT_SLICE_TEMPLATE: i18n._('Edit the slice job template'),
|
EDIT_SLICE_TEMPLATE: i18n._('Edit the slice job template'),
|
||||||
EDIT_SCHEDULE: i18n._('Edit the schedule'),
|
EDIT_SCHEDULE: i18n._('Edit the schedule'),
|
||||||
|
SOURCE_WORKFLOW_JOB: i18n._('View the source Workflow Job'),
|
||||||
TOGGLE_STDOUT_FULLSCREEN: i18n._('Expand Output'),
|
TOGGLE_STDOUT_FULLSCREEN: i18n._('Expand Output'),
|
||||||
STATUS: '' // re-assigned elsewhere
|
STATUS: '' // re-assigned elsewhere
|
||||||
},
|
},
|
||||||
@@ -53,7 +54,7 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
|
|||||||
STATUS: i18n._('Status'),
|
STATUS: i18n._('Status'),
|
||||||
SLICE_TEMPLATE: i18n._('Slice Job Template'),
|
SLICE_TEMPLATE: i18n._('Slice Job Template'),
|
||||||
JOB_EXPLANATION: i18n._('Explanation'),
|
JOB_EXPLANATION: i18n._('Explanation'),
|
||||||
SOURCE_WORKFLOW_JOB: i18n._('Parent Workflow')
|
SOURCE_WORKFLOW_JOB: i18n._('Source Workflow')
|
||||||
},
|
},
|
||||||
details: {
|
details: {
|
||||||
HEADER: i18n._('DETAILS'),
|
HEADER: i18n._('DETAILS'),
|
||||||
|
|||||||
@@ -187,14 +187,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- PARENT WORKFLOW DETAIL -->
|
<!-- SOURCE WORKFLOW JOB DETAIL -->
|
||||||
<div class="WorkflowResults-resultRow"
|
<div class="WorkflowResults-resultRow"
|
||||||
ng-if="workflow.summary_fields.source_workflow_job">
|
ng-if="workflow.summary_fields.source_workflow_job">
|
||||||
<label class="WorkflowResults-resultRowLabel">
|
<label class="WorkflowResults-resultRowLabel">
|
||||||
{{ strings.labels.SOURCE_WORKFLOW_JOB }}
|
{{ strings.labels.SOURCE_WORKFLOW_JOB }}
|
||||||
</label>
|
</label>
|
||||||
<div class="WorkflowResults-resultRowText">
|
<div class="WorkflowResults-resultRowText">
|
||||||
<a href="{{ source_workflow_job_link }}">
|
<a href="{{ source_workflow_job_link }}"
|
||||||
|
aw-tool-tip="{{ strings.tooltips.SOURCE_WORKFLOW_JOB }}"
|
||||||
|
data-placement="top">
|
||||||
{{ workflow.summary_fields.source_workflow_job.name }}
|
{{ workflow.summary_fields.source_workflow_job.name }}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user