External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 21:46:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

cleanup workflows

Browse Source
This commit is contained in:
John Mitchell
2017-03-02 15:16:33 -05:00
parent e784dba612
commit 9bc217ec8d
11 changed files with 62 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/app.js
View File

@@ -151,12 +151,10 @@ var tower = angular.module('Tower', [
'PortalJobsListDefinition', 'PortalJobsListDefinition',
'features', 'features',
'pendolytics', 'pendolytics',
'WorkflowFormDefinition',
'InventorySourcesListDefinition', 'InventorySourcesListDefinition',
'WorkflowMakerFormDefinition'
]) ])
.constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/') .constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/')
.constant('AngularScheduler.useTimezone', true) .constant('AngularScheduler.useTimezone', true)
.constant('AngularScheduler.showUTCField', true) .constant('AngularScheduler.showUTCField', true)
.constant('$timezones.definitions.location', urlPrefix + 'lib/angular-tz-extensions/tz/data') .constant('$timezones.definitions.location', urlPrefix + 'lib/angular-tz-extensions/tz/data')

5
awx/ui/client/src/forms.js
View File

@@ -17,9 +17,6 @@ import JobVarsPrompt from "./forms/JobVarsPrompt";
import LogViewerOptions from "./forms/LogViewerOptions"; import LogViewerOptions from "./forms/LogViewerOptions";
import LogViewerStatus from "./forms/LogViewerStatus"; import LogViewerStatus from "./forms/LogViewerStatus";
import Organizations from "./forms/Organizations"; import Organizations from "./forms/Organizations";
import WorkflowMaker from "./forms/WorkflowMaker";
import Workflows from "./forms/Workflows";
export export
{ EventsViewer, { EventsViewer,
@@ -35,6 +32,4 @@ export
LogViewerOptions, LogViewerOptions,
LogViewerStatus, LogViewerStatus,
Organizations, Organizations,
WorkflowMaker,
Workflows
}; };

2
awx/ui/client/src/templates/main.js
View File

@@ -20,6 +20,7 @@ import workflowService from './workflows/workflow.service';
import templateCopyService from './copy-template/template-copy.service'; import templateCopyService from './copy-template/template-copy.service';
import CallbackHelpInit from './job_templates/factories/callback-help-init.factory'; import CallbackHelpInit from './job_templates/factories/callback-help-init.factory';
import md5Setup from './job_templates/factories/md-5-setup.factory'; import md5Setup from './job_templates/factories/md-5-setup.factory';
import WorkflowForm from './workflows.form';
export default export default
angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesAdd.name, angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesAdd.name,
@@ -31,6 +32,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
.service('TemplateCopyService', templateCopyService) .service('TemplateCopyService', templateCopyService)
.factory('CallbackHelpInit', CallbackHelpInit) .factory('CallbackHelpInit', CallbackHelpInit)
.factory('md5Setup', md5Setup) .factory('md5Setup', md5Setup)
.factory('WorkflowForm', WorkflowForm)
.config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider', .config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider',
function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) { function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) {
let stateTree, addJobTemplate, editJobTemplate, addWorkflow, editWorkflow, let stateTree, addJobTemplate, editJobTemplate, addWorkflow, editWorkflow,

35
awx/ui/client/src/forms/Workflows.js → awx/ui/client/src/templates/workflows.form.js
View File

@@ -10,11 +10,9 @@
* @description This form is for adding/editing a Workflow * @description This form is for adding/editing a Workflow
*/ */
export default export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
angular.module('WorkflowFormDefinition', []) return function() {
var WorkflowFormObject = {
.factory('WorkflowFormObject', ['i18n', function(i18n) {
return {
addTitle: i18n._('NEW WORKFLOW JOB TEMPLATE'), addTitle: i18n._('NEW WORKFLOW JOB TEMPLATE'),
editTitle: '{{ name }}', editTitle: '{{ name }}',
@@ -190,21 +188,18 @@ export default
class: 'Form-primaryButton' class: 'Form-primaryButton'
} }
} }
};}]) };
.factory('WorkflowForm', ['WorkflowFormObject', 'NotificationsList', var itm;
function(WorkflowFormObject, NotificationsList) {
return function() {
var itm;
for (itm in WorkflowFormObject.related) { for (itm in WorkflowFormObject.related) {
if (WorkflowFormObject.related[itm].include === "NotificationsList") { if (WorkflowFormObject.related[itm].include === "NotificationsList") {
WorkflowFormObject.related[itm] = _.clone(NotificationsList); WorkflowFormObject.related[itm] = _.clone(NotificationsList);
WorkflowFormObject.related[itm].ngClick = "$state.go('templates.editWorkflowJobTemplate.notifications')"; WorkflowFormObject.related[itm].ngClick = "$state.go('templates.editWorkflowJobTemplate.notifications')";
WorkflowFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list WorkflowFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list
} }
} }
return WorkflowFormObject; return WorkflowFormObject;
}; };
}]); }];

16
awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
View File

@@ -4,15 +4,13 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export default export default [
[ '$scope', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors', 'ClearScope', '$scope', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors',
'Wait', '$state', 'CreateSelect2', 'TemplatesService', 'ToJSON', 'ClearScope', 'Wait', '$state', 'CreateSelect2', 'TemplatesService',
'ParseTypeChange', 'OrganizationList', '$q', 'Rest', 'GetBasePath', 'ToJSON', 'ParseTypeChange', '$q', 'Rest', 'GetBasePath',
function( function($scope, WorkflowForm, GenerateForm, Alert, ProcessErrors,
$scope, WorkflowForm, GenerateForm, Alert, ProcessErrors, ClearScope, ClearScope, Wait, $state, CreateSelect2, TemplatesService, ToJSON,
Wait, $state, CreateSelect2, TemplatesService, ToJSON, ParseTypeChange, $q, Rest, GetBasePath) {
ParseTypeChange, OrganizationList, $q, Rest, GetBasePath
) {
Rest.setUrl(GetBasePath('workflow_job_templates')); Rest.setUrl(GetBasePath('workflow_job_templates'));
Rest.options() Rest.options()

21
awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
View File

@@ -4,18 +4,15 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export default export default [
[ '$scope', '$stateParams', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors', '$scope', '$stateParams', 'WorkflowForm', 'GenerateForm', 'Alert',
'ClearScope', 'GetBasePath', '$q', 'ParseTypeChange', 'Wait', 'Empty', 'ProcessErrors', 'ClearScope', 'GetBasePath', '$q', 'ParseTypeChange',
'ToJSON', 'initSurvey', '$state', 'CreateSelect2', 'ParseVariableString', 'Wait', 'Empty', 'ToJSON', 'initSurvey', '$state', 'CreateSelect2',
'TemplatesService', 'OrganizationList', 'Rest', 'WorkflowService', 'ToggleNotification', 'OrgAdminLookup', 'ParseVariableString', 'TemplatesService', 'Rest', 'ToggleNotification',
function( function($scope, $stateParams, WorkflowForm, GenerateForm, Alert,
$scope, $stateParams, WorkflowForm, GenerateForm, Alert, ProcessErrors, ProcessErrors, ClearScope, GetBasePath, $q, ParseTypeChange, Wait, Empty,
ClearScope, GetBasePath, $q, ParseTypeChange, Wait, Empty, ToJSON, SurveyControllerInit, $state, CreateSelect2, ParseVariableString,
ToJSON, SurveyControllerInit, $state, CreateSelect2, ParseVariableString, TemplatesService, Rest, ToggleNotification) {
TemplatesService, OrganizationList, Rest, WorkflowService, ToggleNotification, OrgAdminLookup
) {
ClearScope(); ClearScope();
$scope.$watch('workflow_job_template_obj.summary_fields.user_capabilities.edit', function(val) { $scope.$watch('workflow_job_template_obj.summary_fields.user_capabilities.edit', function(val) {

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

@@ -4,7 +4,7 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export default [ '$state','moment', '$timeout', '$window', export default ['$state','moment', '$timeout', '$window',
function($state, moment, $timeout, $window) { function($state, moment, $timeout, $window) {
return { return {

2
awx/ui/client/src/templates/workflows/workflow-maker/main.js
View File

@@ -1,9 +1,11 @@
import workflowMaker from './workflow-maker.directive'; import workflowMaker from './workflow-maker.directive';
import WorkflowMakerController from './workflow-maker.controller'; import WorkflowMakerController from './workflow-maker.controller';
import WorkflowMakerForm from './workflow-maker.form';
export default export default
angular.module('templates.workflowMaker', []) angular.module('templates.workflowMaker', [])
// In order to test this controller I had to expose it at the module level // In order to test this controller I had to expose it at the module level
// like so. Is this correct? Is there a better pattern for doing this? // like so. Is this correct? Is there a better pattern for doing this?
.controller('WorkflowMakerController', WorkflowMakerController) .controller('WorkflowMakerController', WorkflowMakerController)
.factory('WorkflowMakerForm', WorkflowMakerForm)
.directive('workflowMaker', workflowMaker); .directive('workflowMaker', workflowMaker);

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

@@ -4,14 +4,10 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'ProjectList', export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
'GetBasePath', 'Wait', 'TemplatesService', '$state', '$state', 'ProcessErrors', 'CreateSelect2', 'WorkflowMakerForm', '$q',
'ProcessErrors', 'InventorySourcesList', 'CreateSelect2', 'WorkflowMakerForm', function($scope, WorkflowService, GetBasePath, TemplatesService, $state,
'GenerateForm', 'InventoryList', 'CredentialList', '$q', ProcessErrors, CreateSelect2, WorkflowMakerForm, $q) {
function($scope, WorkflowService, GenerateList, TemplateList, ProjectList,
GetBasePath, Wait, TemplatesService, $state,
ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm,
GenerateForm, InventoryList, CredentialList, $q) {
let form = WorkflowMakerForm(); let form = WorkflowMakerForm();

38
awx/ui/client/src/forms/WorkflowMaker.js → awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.form.js
View File

@@ -10,16 +10,9 @@
* @description This form is for adding/editing a Job Template * @description This form is for adding/editing a Job Template
*/ */
// export default export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
// angular.module('WorkflowMakerFormDefinition', []) return function() {
// var WorkflowMakerFormObject = {
// .value ('WorkflowMakerFormObject', {
export default
angular.module('WorkflowMakerFormDefinition', [])
.factory('WorkflowMakerFormObject', ['i18n', function(i18n) {
return {
addTitle: '', addTitle: '',
editTitle: '', editTitle: '',
@@ -176,16 +169,15 @@ export default
ngShow: '(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)' ngShow: '(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)'
} }
} }
};}]) };
.factory('WorkflowMakerForm', ['WorkflowMakerFormObject', 'NotificationsList', function(WorkflowMakerFormObject, NotificationsList) {
return function() { var itm;
var itm; for (itm in WorkflowMakerFormObject.related) {
for (itm in WorkflowMakerFormObject.related) { if (WorkflowMakerFormObject.related[itm].include === "NotificationsList") {
if (WorkflowMakerFormObject.related[itm].include === "NotificationsList") { WorkflowMakerFormObject.related[itm] = NotificationsList;
WorkflowMakerFormObject.related[itm] = NotificationsList; WorkflowMakerFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list
WorkflowMakerFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list }
} }
} return WorkflowMakerFormObject;
return WorkflowMakerFormObject; };
}; }];
}]);

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

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