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

Fix long name tooltip. Fixed bug adding new node before finishing adding new link.

Browse Source 
Fixed template list column layout.  Ensure that we're getting 200 workflow nodes per GET request
This commit is contained in:
mabashian
2018-11-12 08:48:32 -05:00
parent 3dadeb3037
commit 700860e040
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/templates/templates.service.js
View File

@@ -133,10 +133,10 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP
getWorkflowJobTemplateNodes: function(id, page) { getWorkflowJobTemplateNodes: function(id, page) {
var url = GetBasePath('workflow_job_templates'); var url = GetBasePath('workflow_job_templates');
url = url + id + '/workflow_nodes'; url = url + id + '/workflow_nodes?page_size=200';
if(page) { if(page) {
url += '/?page=' + page; url += '/&page=' + page;
} }
Rest.setUrl(url); Rest.setUrl(url);

2
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
View File

@@ -832,7 +832,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
.attr("height", tipHeight+20) .attr("height", tipHeight+20)
.attr("class", "WorkflowChart-tooltip") .attr("class", "WorkflowChart-tooltip")
.html(function(){ .html(function(){
return "<div class='WorkflowChart-tooltipContents'><span>" + $filter('sanitize')(resourceName) + "</span></div><div class='WorkflowChart-tooltipArrow'></div>"; return "<div class='WorkflowChart-tooltipContents'><span>" + $filter('sanitize')(resourceName) + "</span></div><div class='WorkflowChart-tooltipArrow--down'></div>";
}); });
} }

12
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
View File

@@ -7,23 +7,23 @@
</div> </div>
<div class="WorkflowMaker-formLists"> <div class="WorkflowMaker-formLists">
<div id="workflow-jobs-list" ng-show="activeTab === 'jobs'"> <div id="workflow-jobs-list" ng-show="activeTab === 'jobs'">
<div ng-hide="templates.length === 0 && (searchTags | isEmpty)"> <div ng-hide="wf_maker_templates.length === 0 && (searchTags | isEmpty)">
<smart-search django-model="templates" base-path="unified_job_templates" iterator="template" dataset="template_dataset" list="templateList" collection="templates" default-params="template_default_params" query-set="template_queryset" search-bar-full-width="true" search-tags="searchTags"> <smart-search django-model="unified_job_templates" base-path="unified_job_templates" iterator="wf_maker_template" dataset="wf_maker_template_dataset" list="templateList" collection="wf_maker_templates" default-params="wf_maker_template_default_params" query-set="wf_maker_template_queryset" search-bar-full-width="true" search-tags="searchTags">
</smart-search> </smart-search>
</div> </div>
<div class="row" ng-show="templates.length === 0 && !(searchTags | isEmpty)"> <div class="row" ng-show="wf_maker_templates.length === 0 && !(searchTags | isEmpty)">
<div class="col-lg-12 List-searchNoResults" translate>No records matched your search.</div> <div class="col-lg-12 List-searchNoResults" translate>No records matched your search.</div>
</div> </div>
<div class="List-noItems" ng-show="templates.length === 0 && (searchTags | isEmpty)">PLEASE ADD ITEMS TO THIS LIST</div> <div class="List-noItems" ng-show="wf_maker_templates.length === 0 && (searchTags | isEmpty)">PLEASE ADD ITEMS TO THIS LIST</div>
<div class="list-table-container" ng-show="wf_maker_templates.length > 0"> <div class="list-table-container" ng-show="wf_maker_templates.length > 0">
<table id="templates_table" class="List-table" is-extended="false"> <table id="templates_table" class="List-table" is-extended="false">
<thead> <thead>
<tr class="List-tableHeaderRow"> <tr class="List-tableHeaderRow">
<th class="List-tableHeader select-column List-staticColumn--smallStatus" translate=""></th> <th class="List-tableHeader select-column List-staticColumn--smallStatus" translate=""></th>
<th base-path="unified_job_templates" collection="templates" dataset="template_dataset" column-sort="" column-field="name" column-iterator="template" column-no-sort="undefined" column-label="Name" column-custom-class="" query-set="template_queryset"> <th class="col-md-8" base-path="unified_job_templates" collection="templates" dataset="template_dataset" column-sort="" column-field="name" column-iterator="template" column-no-sort="undefined" column-label="Name" column-custom-class="" query-set="template_queryset">
</th> </th>
<th class="List-tableHeader--info" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="info" column-iterator="wf_maker_template" column-no-sort="true" column-label="" column-custom-class="" query-set="wf_maker_template_queryset"> <th class="List-tableHeader--info col-md-3" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="info" column-iterator="wf_maker_template" column-no-sort="true" column-label="" column-custom-class="" query-set="wf_maker_template_queryset">
</th> </th>
</tr> </tr>
</thead> </thead>

8
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
View File

@@ -307,6 +307,10 @@ export default ['$scope', 'TemplatesService',
$scope.cancelNodeForm(); $scope.cancelNodeForm();
} }
if ($scope.linkConfig) {
$scope.cancelLinkForm();
}
$scope.graphState.arrayOfNodesForChart.push({ $scope.graphState.arrayOfNodesForChart.push({
index: $scope.graphState.arrayOfNodesForChart.length, index: $scope.graphState.arrayOfNodesForChart.length,
id: workflowMakerNodeIdCounter, id: workflowMakerNodeIdCounter,
@@ -343,6 +347,10 @@ export default ['$scope', 'TemplatesService',
$scope.cancelNodeForm(); $scope.cancelNodeForm();
} }
if ($scope.linkConfig) {
$scope.cancelLinkForm();
}
$scope.graphState.arrayOfNodesForChart.push({ $scope.graphState.arrayOfNodesForChart.push({
index: $scope.graphState.arrayOfNodesForChart.length, index: $scope.graphState.arrayOfNodesForChart.length,
id: workflowMakerNodeIdCounter, id: workflowMakerNodeIdCounter,

4
awx/ui/client/src/workflow-results/workflow-results.controller.js
View File

@@ -1,9 +1,9 @@
export default ['workflowData', 'workflowResultsService', 'workflowDataOptions', export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
'jobLabels', 'workflowNodes', '$scope', 'ParseTypeChange', 'jobLabels', 'workflowNodes', '$scope', 'ParseTypeChange',
'ParseVariableString', 'count', '$state', 'i18n', 'WorkflowChartService', 'ParseVariableString', 'count', '$state', 'i18n', 'WorkflowChartService', '$filter',
'moment', function(workflowData, workflowResultsService, 'moment', function(workflowData, workflowResultsService,
workflowDataOptions, jobLabels, workflowNodes, $scope, ParseTypeChange, workflowDataOptions, jobLabels, workflowNodes, $scope, ParseTypeChange,
ParseVariableString, count, $state, i18n, WorkflowChartService, ParseVariableString, count, $state, i18n, WorkflowChartService, $filter,
moment) { moment) {
var runTimeElapsedTimer = null; var runTimeElapsedTimer = null;
let nodeIdToChartNodeIdMapping = {}; let nodeIdToChartNodeIdMapping = {};

2
awx/ui/client/src/workflow-results/workflow-results.route.js
View File

@@ -49,7 +49,7 @@ export default {
// flashing as rest data comes in. Provides the list of workflow nodes // flashing as rest data comes in. Provides the list of workflow nodes
workflowNodes: ['workflowData', 'Rest', '$q', function(workflowData, Rest, $q) { workflowNodes: ['workflowData', 'Rest', '$q', function(workflowData, Rest, $q) {
var defer = $q.defer(); var defer = $q.defer();
Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id'); Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id&page_size=200');
Rest.get() Rest.get()
.then(({data}) => { .then(({data}) => {
if(data.next) { if(data.next) {