External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2627 from jakemcdermott/fix-form-cred-lookups

Browse Source 
fix project and adhoc command form lookups when many credential types exist

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-07 20:43:36 +00:00 committed by GitHub
commit 9341480209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js
View File

@ -12,7 +12,7 @@
function adhocController($q, $scope, $stateParams,
$state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
GenerateForm, Rest, ProcessErrors, GetBasePath, GetChoices,
KindChange, Wait, ParseTypeChange, credentialTypes) {
KindChange, Wait, ParseTypeChange, machineCredentialType) {
// this is done so that we can access private functions for testing, but
// we don't want to populate the "public" scope with these internal
@ -302,12 +302,9 @@ function adhocController($q, $scope, $stateParams,
};
$scope.lookupCredential = function(){
let credType = _.filter(credentialTypes, function(credType){
return credType.kind === "ssh";
});
$state.go('.credential', {
credential_search: {
credential_type: credType[0].id,
credential_type: machineCredentialType,
page_size: '5',
page: '1'
}
@ -319,5 +316,5 @@ function adhocController($q, $scope, $stateParams,
export default ['$q', '$scope', '$stateParams',
'$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2',
'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'GetBasePath',
'GetChoices', 'KindChange', 'Wait', 'ParseTypeChange', 'credentialTypes',
'GetChoices', 'KindChange', 'Wait', 'ParseTypeChange', 'machineCredentialType',
adhocController];

25
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.route.js
View File

@ -7,6 +7,23 @@
import {templateUrl} from '../../../shared/template-url/template-url.factory';
import { N_ } from '../../../i18n';
function ResolveMachineCredentialType (GetBasePath, Rest, ProcessErrors) {
Rest.setUrl(GetBasePath('credential_types') + '?kind=ssh');
return Rest.get()
.then(({ data }) => {
return data.results[0].id;
})
.catch(({ data, status }) => {
ProcessErrors(null, data, status, null, {
hdr: 'Error!',
msg: 'Failed to get credential type data: ' + status
});
});
}
ResolveMachineCredentialType.$inject = ['GetBasePath', 'Rest', 'ProcessErrors'];
export default {
url: '/adhoc',
params:{
@ -28,12 +45,6 @@ export default {
label: N_("RUN COMMAND")
},
resolve: {
credentialTypes: ['CredentialTypeModel', (CredentialType) =>
new CredentialType('get')
.then((model) => {
const credentialTypeRes = model.get();
return credentialTypeRes.results;
})
]
machineCredentialType: ResolveMachineCredentialType,
}
};

10
awx/ui/client/src/projects/add/projects-add.controller.js
View File

@ -7,10 +7,10 @@
export default ['$scope', '$location', '$stateParams', 'GenerateForm',
'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath',
'GetProjectPath', 'GetChoices', 'Wait', '$state', 'CreateSelect2', 'i18n',
'CredentialTypes', 'ConfigData', 'resolvedModels',
'ConfigData', 'resolvedModels', 'scmCredentialType',
function($scope, $location, $stateParams, GenerateForm, ProjectsForm, Rest,
Alert, ProcessErrors, GetBasePath, GetProjectPath, GetChoices, Wait, $state,
CreateSelect2, i18n, CredentialTypes, ConfigData, resolvedModels) {
CreateSelect2, i18n, ConfigData, resolvedModels, scmCredentialType) {
let form = ProjectsForm(),
base = $location.path().replace(/^\//, '').split('/')[0],
@ -191,13 +191,9 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
$scope.lookupCredential = function(){
// Perform a lookup on the credential_type. Git, Mercurial, and Subversion
// all use SCM as their credential type.
let credType = _.filter(CredentialTypes, function(credType){
return ($scope.scm_type.value !== "insights" && credType.kind === "scm" ||
$scope.scm_type.value === "insights" && credType.kind === "insights");
});
$state.go('.credential', {
credential_search: {
credential_type: credType[0].id,
credential_type: scmCredentialType,
page_size: '5',
page: '1'
}

13
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@ -8,12 +8,12 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
'Alert', 'ProcessErrors', 'GenerateForm', 'Prompt',
'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification',
'i18n', 'CredentialTypes', 'OrgAdminLookup', 'ConfigData',
'i18n', 'OrgAdminLookup', 'ConfigData', 'scmCredentialType',
function($scope, $rootScope, $stateParams, ProjectsForm, Rest, Alert,
ProcessErrors, GenerateForm, Prompt, GetBasePath,
GetProjectPath, Authorization, GetChoices, Empty, Wait, ProjectUpdate,
$state, CreateSelect2, ToggleNotification, i18n, CredentialTypes,
OrgAdminLookup, ConfigData) {
$state, CreateSelect2, ToggleNotification, i18n, OrgAdminLookup,
ConfigData, scmCredentialType) {
let form = ProjectsForm(),
defaultUrl = GetBasePath('projects') + $stateParams.project_id + '/',
@ -321,13 +321,10 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
$scope.lookupCredential = function(){
// Perform a lookup on the credential_type. Git, Mercurial, and Subversion
// all use SCM as their credential type.
let credType = _.filter(CredentialTypes, function(credType){
return ($scope.scm_type.value !== "insights" && credType.kind === "scm" ||
$scope.scm_type.value === "insights" && credType.kind === "insights");
});
$state.go('.credential', {
credential_search: {
credential_type: credType[0].id,
credential_type: scmCredentialType,
page_size: '5',
page: '1'
}

40
awx/ui/client/src/projects/main.js
View File

@ -20,6 +20,25 @@ import {
import ProjectsTemplatesRoute from '~features/templates/routes/projectsTemplatesList.route';
import projectsListRoute from '~features/projects/routes/projectsList.route.js';
function ResolveScmCredentialType (GetBasePath, Rest, ProcessErrors) {
Rest.setUrl(GetBasePath('credential_types') + '?kind=scm');
return Rest.get()
.then(({ data }) => {
return data.results[0].id;
})
.catch(({ data, status }) => {
ProcessErrors(null, data, status, null, {
hdr: 'Error!',
msg: 'Failed to get credential type data: ' + status
});
});
}
ResolveScmCredentialType.$inject = ['GetBasePath', 'Rest', 'ProcessErrors'];
export default
angular.module('Projects', [])
.controller('ProjectsAdd', ProjectsAdd)
@ -34,19 +53,29 @@ angular.module('Projects', [])
let stateDefinitions = stateDefinitionsProvider.$get();
let stateExtender = $stateExtenderProvider.$get();
const projectsAddName = 'projects.add';
const projectsEditName = 'projects.edit';
function generateStateTree() {
let projectAdd = stateDefinitions.generateTree({
name: 'projects.add',
name: projectsAddName,
url: '/add',
modes: ['add'],
form: 'ProjectsForm',
controllers: {
add: 'ProjectsAdd',
},
})
.then(res => {
const stateIndex = res.states.findIndex(s => s.name === projectsAddName);
res.states[stateIndex].resolve.scmCredentialType = ResolveScmCredentialType;
return res;
});
let projectEdit = stateDefinitions.generateTree({
name: 'projects.edit',
name: projectsEditName,
url: '/:project_id',
modes: ['edit'],
form: 'ProjectsForm',
@ -61,6 +90,13 @@ angular.module('Projects', [])
breadcrumbs: {
edit: '{{breadcrumb.project_name}}'
},
})
.then(res => {
const stateIndex = res.states.findIndex(s => s.name === projectsEditName);
res.states[stateIndex].resolve.scmCredentialType = ResolveScmCredentialType;
return res;
});
return Promise.all([