From 80fcdae50bd60dea0f3bde538087dcb195e7a4c2 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 9 Nov 2018 10:35:56 -0500 Subject: [PATCH] update credential type usage to kind instead of name --- .../src/inventories-hosts/inventories/main.js | 2 +- .../check-passwords.factory.js | 2 +- .../src/job-submission/job-submission.directive.js | 2 +- .../credential/job-sub-cred-list.controller.js | 12 ++++++------ .../src/shared/credentialTypesLookup.factory.js | 2 +- .../multi-credential-modal.directive.js | 14 +++++++------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/main.js b/awx/ui/client/src/inventories-hosts/inventories/main.js index 20feecfe10..923d3ef1fe 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/main.js @@ -135,7 +135,7 @@ angular.module('inventory', [ if(_.has(resourceData, 'data.summary_fields.insights_credential')){ return credentialTypesLookup() .then(kinds => { - let insightsKind = kinds.Insights; + let insightsKind = kinds.insights; let path = `${GetBasePath('projects')}?credential__credential_type=${insightsKind}&role_level=use_role`; Rest.setUrl(path); return Rest.get().then(({data}) => { diff --git a/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js index 252fe1f647..db7745ebd6 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js @@ -12,7 +12,7 @@ export default .then(({data}) => { credentialTypesLookup() .then(kinds => { - if(data.credential_type === kinds.Machine && data.inputs){ + if(data.credential_type === kinds.ssh && data.inputs){ if(data.inputs.password === "ASK" ){ passwords.push("ssh_password"); } diff --git a/awx/ui/client/src/job-submission/job-submission.directive.js b/awx/ui/client/src/job-submission/job-submission.directive.js index d248e2cd05..ef05a48631 100644 --- a/awx/ui/client/src/job-submission/job-submission.directive.js +++ b/awx/ui/client/src/job-submission/job-submission.directive.js @@ -28,7 +28,7 @@ export default [ 'templateUrl', 'CreateDialog', 'Wait', 'CreateSelect2', 'ParseT credentialTypesLookup() .then(kinds => { if(scope.ask_credential_on_launch) { - scope.credentialKind = "" + kinds.Machine; + scope.credentialKind = "" + kinds.ssh; scope.includeCredentialList = true; } }); diff --git a/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js b/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js index ba4aa8ff32..009cf639a9 100644 --- a/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js +++ b/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js @@ -71,9 +71,9 @@ export default $scope.$watchCollection('selectedCredentials.extra', () => { if($scope.credentials && $scope.credentials.length > 0) { - if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.Machine) { + if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.ssh) { updateExtraCredentialsList(); - } else if (parseInt($scope.credentialKind) !== credentialKinds.Machine) { + } else if (parseInt($scope.credentialKind) !== credentialKinds.ssh) { uncheckAllCredentials(); } } @@ -81,7 +81,7 @@ export default $scope.$watch('selectedCredentials.machine', () => { if($scope.credentials && $scope.credentials.length > 0) { - if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.Machine) { + if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.ssh) { updateMachineCredentialList(); } else { @@ -92,10 +92,10 @@ export default $scope.$watchGroup(['credentials', 'selectedCredentials.machine'], () => { if($scope.credentials && $scope.credentials.length > 0) { - if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.Machine) { + if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.ssh) { updateMachineCredentialList(); } - else if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.Machine) { + else if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.ssh) { updateExtraCredentialsList(); } else { @@ -106,7 +106,7 @@ export default }; $scope.toggle_row = function(selectedRow) { - if(parseInt($scope.credentialKind) === credentialKinds.Machine) { + if(parseInt($scope.credentialKind) === credentialKinds.ssh) { $scope.selectedCredentials.machine = _.cloneDeep(selectedRow); } else { diff --git a/awx/ui/client/src/shared/credentialTypesLookup.factory.js b/awx/ui/client/src/shared/credentialTypesLookup.factory.js index c7da2c1d13..04cdc99cb7 100644 --- a/awx/ui/client/src/shared/credentialTypesLookup.factory.js +++ b/awx/ui/client/src/shared/credentialTypesLookup.factory.js @@ -6,7 +6,7 @@ function(Rest, GetBasePath, ProcessErrors) { .then(({data}) => { var val = {}; data.results.forEach(type => { - val[type.name] = type.id; + val[type.kind] = type.id; }); return val; }) diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js index 3252005661..e67a44a0b6 100644 --- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js +++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js @@ -96,7 +96,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService) scope = _scope_; scope.modalSelectedCredentials = _.cloneDeep(scope.selectedCredentials); - scope.credentialTypes.forEach(({ name, id }) => types[name] = id); + scope.credentialTypes.forEach(({ kind, id }) => types[kind] = id); scope.toggle_row = vm.toggle_row; scope.toggle_credential = vm.toggle_credential; @@ -152,13 +152,13 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService) function getInitialCredentialType () { const selectedMachineCredential = scope.modalSelectedCredentials - .find(c => c.id === types.Machine); + .find(c => c.id === types.ssh); if (selectedMachineCredential) { - return `${types.Vault}`; + return `${types.vault}`; } - return `${types.Machine}`; + return `${types.ssh}`; } function fetchCredentials (credentialType) { @@ -175,7 +175,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService) scope.destroyList(); - if (credentialType === types.Vault) { + if (credentialType === types.vault) { scope.createVaultList(); } else { scope.createList(); @@ -215,11 +215,11 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService) const credentialTypeId = credential.credential_type || credential.credential_type_id; - if (credentialTypeId === types.Vault) { + if (credentialTypeId === types.vault) { const vaultId = _.get(credential, 'inputs.vault_id'); scope.modalSelectedCredentials = scope.modalSelectedCredentials - .filter(c => (c.credential_type !== types.Vault) || (c.inputs.vault_id !== vaultId)) + .filter(c => (c.credential_type !== types.vault) || (c.inputs.vault_id !== vaultId)) .concat([credential]); } else { scope.modalSelectedCredentials = scope.modalSelectedCredentials