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

Update inventory/cred names in UI

Browse Source
This commit is contained in:
Bill Nottingham
2021-06-17 17:29:41 -04:00
committed by Shane McDonald
parent 32cc7e976a
commit 0c0028541d
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.test.jsx
View File

@@ -57,7 +57,7 @@ describe('<InventorySourceAdd />', () => {
['satellite6', 'Red Hat Satellite 6'], ['satellite6', 'Red Hat Satellite 6'],
['openstack', 'OpenStack'], ['openstack', 'OpenStack'],
['rhv', 'Red Hat Virtualization'], ['rhv', 'Red Hat Virtualization'],
['tower', 'Ansible Tower'], ['controller', 'Red Hat Ansible Automation Platform'],
], ],
}, },
}, },

2
awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.test.jsx
View File

@@ -43,7 +43,7 @@ describe('InventorySourceDetail', () => {
['satellite6', 'Red Hat Satellite 6'], ['satellite6', 'Red Hat Satellite 6'],
['openstack', 'OpenStack'], ['openstack', 'OpenStack'],
['rhv', 'Red Hat Virtualization'], ['rhv', 'Red Hat Virtualization'],
['tower', 'Ansible Tower'], ['controller', 'Red Hat Ansible Automation Platform'],
], ],
}, },
}, },

2
awx/ui_next/src/screens/Inventory/InventorySourceEdit/InventorySourceEdit.test.jsx
View File

@@ -57,7 +57,7 @@ describe('<InventorySourceEdit />', () => {
['satellite6', 'Red Hat Satellite 6'], ['satellite6', 'Red Hat Satellite 6'],
['openstack', 'OpenStack'], ['openstack', 'OpenStack'],
['rhv', 'Red Hat Virtualization'], ['rhv', 'Red Hat Virtualization'],
['tower', 'Ansible Tower'], ['controller', 'Red Hat Ansible Automation Platform'],
], ],
}, },
}, },

2
awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
View File

@@ -218,7 +218,7 @@ const InventorySourceFormFields = ({
tower: ( tower: (
<TowerSubForm <TowerSubForm
autoPopulateCredential={ autoPopulateCredential={
!source?.id || source?.source !== 'tower' !source?.id || source?.source !== 'controller'
} }
/> />
), ),

2
awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.test.jsx
View File

@@ -37,7 +37,7 @@ describe('<InventorySourceForm />', () => {
['satellite6', 'Red Hat Satellite 6'], ['satellite6', 'Red Hat Satellite 6'],
['openstack', 'OpenStack'], ['openstack', 'OpenStack'],
['rhv', 'Red Hat Virtualization'], ['rhv', 'Red Hat Virtualization'],
['tower', 'Ansible Tower'], ['controller', 'Red Hat Ansible Automation Platform'],
], ],
}, },
}, },

2
awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/TowerSubForm.jsx
View File

@@ -39,7 +39,7 @@ const TowerSubForm = ({ autoPopulateCredential }) => {
return ( return (
<> <>
<CredentialLookup <CredentialLookup
credentialTypeNamespace="tower" credentialTypeNamespace="controller"
label={t`Credential`} label={t`Credential`}
helperTextInvalid={credentialMeta.error} helperTextInvalid={credentialMeta.error}
isValid={!credentialMeta.touched || !credentialMeta.error} isValid={!credentialMeta.touched || !credentialMeta.error}

2
awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/TowerSubForm.test.jsx
View File

@@ -56,7 +56,7 @@ describe('<TowerSubForm />', () => {
test('should make expected api calls', () => { test('should make expected api calls', () => {
expect(CredentialsAPI.read).toHaveBeenCalledTimes(1); expect(CredentialsAPI.read).toHaveBeenCalledTimes(1);
expect(CredentialsAPI.read).toHaveBeenCalledWith({ expect(CredentialsAPI.read).toHaveBeenCalledWith({
credential_type__namespace: 'tower', credential_type__namespace: 'controller',
order_by: 'name', order_by: 'name',
page: 1, page: 1,
page_size: 5, page_size: 5,