Add name field

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,

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',

awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx

@@ -28,13 +28,19 @@ function OrganizationExecEnvListItem({
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
+            <DataListCell
+              key="name"
+              aria-label={i18n._(t`Execution environment name`)}
+            >
+              <Link to={`${detailUrl}`}>
+                <b>{executionEnvironment.name}</b>
+              </Link>
+            </DataListCell>,
             <DataListCell
               key="image"
               aria-label={i18n._(t`Execution environment image`)}
             >
-              <Link to={`${detailUrl}`}>
-                <b>{executionEnvironment.image}</b>
-              </Link>
+              {executionEnvironment.image}
             </DataListCell>,
           ]}
         />

awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx

@@ -10,8 +10,10 @@ describe('<OrganizationExecEnvListItem/>', () => {
   const executionEnvironment = {
     id: 1,
     image: 'https://registry.com/r/image/manifest',
+    name: 'foo',
     organization: 1,
     credential: null,
+    pull: 'always',
   };
 
   test('should mount successfully', async () => {