diff --git a/awx/ui_next/src/api/models/Organizations.js b/awx/ui_next/src/api/models/Organizations.js index ec4a14c549..fd980fece8 100644 --- a/awx/ui_next/src/api/models/Organizations.js +++ b/awx/ui_next/src/api/models/Organizations.js @@ -29,6 +29,7 @@ class Organizations extends InstanceGroupsMixin(NotificationsMixin(Base)) { params, }); } + readExecutionEnvironments(id, params) { return this.http.get(`${this.baseUrl}${id}/execution_environments/`, { params, diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx index 48caaff802..9f2c4ae817 100644 --- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx +++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx @@ -15,7 +15,7 @@ import OrganizationExecEnvListItem from './OrganizationExecEnvListItem'; const QS_CONFIG = getQSConfig('organizations', { page: 1, page_size: 20, - order_by: 'image', + order_by: 'name', }); function OrganizationExecEnvList({ i18n, organization }) { @@ -79,10 +79,15 @@ function OrganizationExecEnvList({ i18n, organization }) { toolbarSearchableKeys={searchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarSearchColumns={[ + { + name: i18n._(t`Name`), + key: 'name__icontains', + isDefault: true, + }, { name: i18n._(t`Image`), key: 'image__icontains', - isDefault: true, + isDefault: false, }, { name: i18n._(t`Created By (Username)`), @@ -94,6 +99,10 @@ function OrganizationExecEnvList({ i18n, organization }) { }, ]} toolbarSortColumns={[ + { + name: i18n._(t`Name`), + key: 'name', + }, { name: i18n._(t`Image`), key: 'image', diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx index 1998e8c783..0d2715d7a6 100644 --- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx +++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx @@ -28,13 +28,19 @@ function OrganizationExecEnvListItem({ + + {executionEnvironment.name} + + , - - {executionEnvironment.image} - + {executionEnvironment.image} , ]} /> diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx index 9e4a2492aa..29181f4ec3 100644 --- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx +++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx @@ -10,8 +10,10 @@ describe('', () => { const executionEnvironment = { id: 1, image: 'https://registry.com/r/image/manifest', + name: 'foo', organization: 1, credential: null, + pull: 'always', }; test('should mount successfully', async () => {