diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx index f0542321b3..9327078808 100644 --- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx +++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx @@ -148,6 +148,14 @@ class AddResourceRole extends React.Component { key: 'username', isDefault: true }, + { + name: i18n._(t`First name`), + key: 'first_name', + }, + { + name: i18n._(t`Last name`), + key: 'last_name', + } ]; const userSortColumns = [ @@ -155,11 +163,19 @@ class AddResourceRole extends React.Component { name: i18n._(t`Username`), key: 'username', }, + { + name: i18n._(t`First name`), + key: 'first_name', + }, + { + name: i18n._(t`Last name`), + key: 'last_name', + } ]; const teamSearchColumns = [ { - name: i18n._(t`name`), + name: i18n._(t`Name`), key: 'name', isDefault: true }, @@ -167,7 +183,7 @@ class AddResourceRole extends React.Component { const teamSortColumns = [ { - name: i18n._(t`name`), + name: i18n._(t`Name`), key: 'name', }, ]; diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx index 9fd5c4bb88..87c7ec3275 100644 --- a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx +++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx @@ -70,6 +70,23 @@ function OrganizationLookup({ header={i18n._(t`Organization`)} name="organization" qsConfig={QS_CONFIG} + searchColumns={[ + { + name: i18n._(t`Name`), + key: 'name', + isDefault: true + }, + { + name: i18n._(t`Team name`), + key: 'teams__name', + } + ]} + sortColumns={[ + { + name: i18n._(t`Name`), + key: 'name', + }, + ]} readOnly={!canDelete} selectItem={item => dispatch({ type: 'SELECT_ITEM', item })} deselectItem={item => dispatch({ type: 'DESELECT_ITEM', item })} diff --git a/awx/ui_next/src/components/Lookup/shared/OptionsList.jsx b/awx/ui_next/src/components/Lookup/shared/OptionsList.jsx index fa9eb8f67c..9fd1dec6c1 100644 --- a/awx/ui_next/src/components/Lookup/shared/OptionsList.jsx +++ b/awx/ui_next/src/components/Lookup/shared/OptionsList.jsx @@ -8,6 +8,7 @@ import { string, oneOfType, } from 'prop-types'; +import styled from 'styled-components'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import SelectedList from '../../SelectedList'; @@ -16,11 +17,18 @@ import CheckboxListItem from '../../CheckboxListItem'; import DataListToolbar from '../../DataListToolbar'; import { QSConfig, SearchColumns, SortColumns } from '@types'; +const ModalList = styled.div` + .pf-c-data-toolbar__content { + padding: 0 !important; + } +`; + function OptionsList({ value, options, optionCount, - columns, + searchColumns, + sortColumns, multiple, header, name, @@ -33,7 +41,7 @@ function OptionsList({ i18n, }) { return ( -