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

Post-smart search cleanup/implementation based on new patterns. This is just the beginning of the fixes.

Browse Source
This commit is contained in:
Michael Abashian
2016-11-04 15:16:56 -04:00
parent c091590d67
commit 1656ab45f1
8 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,8 @@ import uiRouter from 'angular-ui-router';
// backwards compatibility for $stateChange* events // backwards compatibility for $stateChange* events
import 'angular-ui-router/release/stateEvents'; import 'angular-ui-router/release/stateEvents';
// ui-router debugging // ui-router debugging
import { trace } from 'angular-ui-router'; //import { trace } from 'angular-ui-router';
trace.enable(); //trace.enable();
// Configuration dependencies // Configuration dependencies
global.$AnsibleConfig = null; global.$AnsibleConfig = null;

8
awx/ui/client/src/forms/WorkflowMaker.js
View File

@@ -58,10 +58,10 @@ export default
dataTitle: 'Inventory', dataTitle: 'Inventory',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
//ngShow: "selectedTemplate.ask_inventory_on_launch", ngShow: "selectedTemplate.ask_inventory_on_launch",
// awRequiredWhen: { awRequiredWhen: {
// reqExpression: 'selectedTemplate.ask_inventory_on_launch' reqExpression: 'selectedTemplate.ask_inventory_on_launch'
// } }
}, },
job_type: { job_type: {
label: 'Job Type', label: 'Job Type',

13
awx/ui/client/src/job-templates/main.js
View File

@@ -110,10 +110,12 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
delete list.fields.description; delete list.fields.description;
delete list.fields.smart_status; delete list.fields.smart_status;
delete list.fields.labels; delete list.fields.labels;
delete list.fieldActions;
list.fields.name.columnClass = "col-md-11"; list.fields.name.columnClass = "col-md-11";
let html = generateList.build({ let html = generateList.build({
list: list, list: list,
mode: 'edit' input_type: 'radio',
mode: 'lookup'
}); });
return html; return html;
}, },
@@ -133,7 +135,8 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
// mutate list definition here! // mutate list definition here!
let html = generateList.build({ let html = generateList.build({
list: list, list: list,
mode: 'edit' input_type: 'radio',
mode: 'lookup'
}); });
return html; return html;
}, },
@@ -147,7 +150,7 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
} }
] ]
}, },
'projectList@templates.editWorkflowJobTemplate.workflowMaker': { 'projectSyncList@templates.editWorkflowJobTemplate.workflowMaker': {
templateProvider: function(ProjectList, generateList) { templateProvider: function(ProjectList, generateList) {
let list = _.cloneDeep(ProjectList); let list = _.cloneDeep(ProjectList);
delete list.fields.status; delete list.fields.status;
@@ -156,7 +159,8 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
list.fields.name.columnClass = "col-md-11"; list.fields.name.columnClass = "col-md-11";
let html = generateList.build({ let html = generateList.build({
list: list, list: list,
mode: 'edit' input_type: 'radio',
mode: 'lookup'
}); });
return html; return html;
}, },
@@ -175,6 +179,7 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
let html = GenerateForm.buildHTML(form, { let html = GenerateForm.buildHTML(form, {
mode: 'add', mode: 'add',
related: false, related: false,
noPanel: true
}); });
return html; return html;
} }

5
awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js
View File

@@ -13,8 +13,7 @@ export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateLis
ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm, ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm,
GenerateForm, InventoryList, CredentialList, $q, $timeout) { GenerateForm, InventoryList, CredentialList, $q, $timeout) {
let form = WorkflowMakerForm(), let form = WorkflowMakerForm();
generator = GenerateForm;
$scope.workflowMakerFormConfig = { $scope.workflowMakerFormConfig = {
nodeMode: "idle", nodeMode: "idle",
@@ -143,9 +142,7 @@ export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateLis
} }
$scope.lookUpInventory = function(){ $scope.lookUpInventory = function(){
console.log($state)
$state.go('.inventory') $state.go('.inventory')
}; };

2
awx/ui/client/src/job-templates/workflow-maker/workflow-maker.directive.js
View File

@@ -45,6 +45,8 @@ export default ['templateUrl', 'CreateDialog', 'Wait',
} }
scope.removeWorkflowDialogReady = scope.$on('WorkflowDialogReady', function() { scope.removeWorkflowDialogReady = scope.$on('WorkflowDialogReady', function() {
$('#workflow-modal-dialog').dialog('open'); $('#workflow-modal-dialog').dialog('open');
scope.$broadcast("refreshWorkflowChart");
}); });
} }
}; };

6
awx/ui/client/src/job-templates/workflow-maker/workflow-maker.partial.html
View File

@@ -60,21 +60,19 @@
<span class="badge List-titleBadge" ng-bind="treeData.data.totalNodes"></span> <span class="badge List-titleBadge" ng-bind="treeData.data.totalNodes"></span>
</div> </div>
</div> </div>
<!--
<workflow-chart tree-data="treeData.data" add-node="startAddNode(parent, betweenTwoNodes)" edit-node="startEditNode(nodeToEdit)" delete-node="startDeleteNode(nodeToDelete)" class="WorkflowMaker-chart"></workflow-chart> <workflow-chart tree-data="treeData.data" add-node="startAddNode(parent, betweenTwoNodes)" edit-node="startEditNode(nodeToEdit)" delete-node="startDeleteNode(nodeToDelete)" class="WorkflowMaker-chart"></workflow-chart>
-->
</div> </div>
<div class="WorkflowMaker-contentRight"> <div class="WorkflowMaker-contentRight">
<div class="WorkflowMaker-formTitle">{{(workflowMakerFormConfig.nodeMode === 'edit' && nodeBeingEdited && nodeBeingEdited.unifiedJobTemplate && nodeBeingEdited.unifiedJobTemplate.name) ? nodeBeingEdited.unifiedJobTemplate.name : "ADD A TEMPLATE"}}</div> <div class="WorkflowMaker-formTitle">{{(workflowMakerFormConfig.nodeMode === 'edit' && nodeBeingEdited && nodeBeingEdited.unifiedJobTemplate && nodeBeingEdited.unifiedJobTemplate.name) ? nodeBeingEdited.unifiedJobTemplate.name : "ADD A TEMPLATE"}}</div>
<div class="WorkflowMaker-formHelp" ng-show="workflowMakerFormConfig.nodeMode === 'idle'">Please hover over a template and click the Add button.</div> <div class="WorkflowMaker-formHelp" ng-show="workflowMakerFormConfig.nodeMode === 'idle'">Please hover over a template and click the Add button.</div>
<div class="WorkflowMaker-form" > <!-- ng-show="workflowMakerFormConfig.nodeMode === 'add' || workflowMakerFormConfig.nodeMode === 'edit'" --> <div class="WorkflowMaker-form" ng-show="workflowMakerFormConfig.nodeMode === 'add' || workflowMakerFormConfig.nodeMode === 'edit'">
<div class="Form-tabHolder"> <div class="Form-tabHolder">
<div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'jobs'}" ng-click="toggleFormTab('jobs')">JOBS</div> <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'jobs'}" ng-click="toggleFormTab('jobs')">JOBS</div>
<div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'project_sync'}" ng-click="toggleFormTab('project_sync')">PROJECT SYNC</div> <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'project_sync'}" ng-click="toggleFormTab('project_sync')">PROJECT SYNC</div>
<div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'inventory_sync'}" ng-click="toggleFormTab('inventory_sync')">INVENTORY SYNC</div> <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'inventory_sync'}" ng-click="toggleFormTab('inventory_sync')">INVENTORY SYNC</div>
</div> </div>
<div class="WorkflowMaker-formLists"> <div class="WorkflowMaker-formLists">
<div id="workflow-jobs-list" ui-view="jobTemplateList"></div> <!-- ng-show="workflowMakerFormConfig.activeTab === 'jobs'" --> <div id="workflow-jobs-list" ui-view="jobTemplateList" ng-show="workflowMakerFormConfig.activeTab === 'jobs'"></div>
<div id="workflow-project-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'project_sync'" ui-view="projectSyncList"></div> <div id="workflow-project-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'project_sync'" ui-view="projectSyncList"></div>
<div id="workflow-inventory-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'" ui-view="inventorySyncList"></div> <div id="workflow-inventory-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'" ui-view="inventorySyncList"></div>
</div> </div>

12
awx/ui/client/src/lists/JobTemplates.js
View File

@@ -82,7 +82,7 @@ export default
submit: { submit: {
label: i18n._('Launch'), label: i18n._('Launch'),
mode: 'all', mode: 'all',
ngClick: 'submitJob(unified_job_templates)', ngClick: 'submitJob(template)',
awToolTip: i18n._('Start a job using this template'), awToolTip: i18n._('Start a job using this template'),
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'template.summary_fields.user_capabilities.start' ngShow: 'template.summary_fields.user_capabilities.start'
@@ -90,14 +90,14 @@ export default
schedule: { schedule: {
label: i18n._('Schedule'), label: i18n._('Schedule'),
mode: 'all', mode: 'all',
ngClick: 'scheduleJob(unified_job_templates)', ngClick: 'scheduleJob(template)',
awToolTip: i18n._('Schedule future job template runs'), awToolTip: i18n._('Schedule future job template runs'),
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'template.summary_fields.user_capabilities.schedule' ngShow: 'template.summary_fields.user_capabilities.schedule'
}, },
copy: { copy: {
label: i18n._('Copy'), label: i18n._('Copy'),
'ui-sref': 'templates.copy({id: unified_job_templates.id})', 'ui-sref': 'templates.copy({id: template.id})',
"class": 'btn-danger btn-xs', "class": 'btn-danger btn-xs',
awToolTip: i18n._('Copy template'), awToolTip: i18n._('Copy template'),
dataPlacement: 'top', dataPlacement: 'top',
@@ -105,7 +105,7 @@ export default
}, },
edit: { edit: {
label: i18n._('Edit'), label: i18n._('Edit'),
ngClick: "editJobTemplate(unified_job_templates)", ngClick: "editJobTemplate(template)",
awToolTip: i18n._('Edit template'), awToolTip: i18n._('Edit template'),
"class": 'btn-default btn-xs', "class": 'btn-default btn-xs',
dataPlacement: 'top', dataPlacement: 'top',
@@ -113,7 +113,7 @@ export default
}, },
view: { view: {
label: i18n._('View'), label: i18n._('View'),
ngClick: "editJobTemplate(unified_job_templates.id)", ngClick: "editJobTemplate(template.id)",
awToolTip: i18n._('View template'), awToolTip: i18n._('View template'),
"class": 'btn-default btn-xs', "class": 'btn-default btn-xs',
dataPlacement: 'top', dataPlacement: 'top',
@@ -121,7 +121,7 @@ export default
}, },
"delete": { "delete": {
label: i18n._('Delete'), label: i18n._('Delete'),
ngClick: "deleteJobTemplate(unified_job_templates)", ngClick: "deleteJobTemplate(template)",
"class": 'btn-danger btn-xs', "class": 'btn-danger btn-xs',
awToolTip: i18n._('Delete template'), awToolTip: i18n._('Delete template'),
dataPlacement: 'top', dataPlacement: 'top',

23
awx/ui/client/src/shared/form-generator.js
View File

@@ -164,12 +164,21 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
// Not a very good way to do this // Not a very good way to do this
// Form sub-states expect to target ui-views related@stateName & modal@stateName // Form sub-states expect to target ui-views related@stateName & modal@stateName
// Also wraps mess of generated HTML in a .Panel // Also wraps mess of generated HTML in a .Panel
wrapPanel(html){ wrapPanel(html, ignorePanel){
return `<div class="Panel"> if(ignorePanel) {
${html} return `<div>
<div ui-view="related"></div> ${html}
<div ui-view="modal"></div> <div ui-view="related"></div>
</div>`; <div ui-view="modal"></div>
</div>`;
}
else {
return `<div class="Panel">
${html}
<div ui-view="related"></div>
<div ui-view="modal"></div>
</div>`;
}
}, },
buildHTML: function(form, options) { buildHTML: function(form, options) {
@@ -1548,7 +1557,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
}); });
} }
// console.log(html) // console.log(html)
return this.wrapPanel(html); return this.wrapPanel(html, options.noPanel);
}, },
buildCollection: function (params) { buildCollection: function (params) {