mirror of
https://github.com/ansible/awx.git
synced 2026-02-25 23:16:01 -03:30
Add name field
This commit is contained in:
committed by
Shane McDonald
parent
a39e1a528b
commit
cf513b33ee
@@ -29,6 +29,7 @@ class Organizations extends InstanceGroupsMixin(NotificationsMixin(Base)) {
|
|||||||
params,
|
params,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
readExecutionEnvironments(id, params) {
|
readExecutionEnvironments(id, params) {
|
||||||
return this.http.get(`${this.baseUrl}${id}/execution_environments/`, {
|
return this.http.get(`${this.baseUrl}${id}/execution_environments/`, {
|
||||||
params,
|
params,
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import OrganizationExecEnvListItem from './OrganizationExecEnvListItem';
|
|||||||
const QS_CONFIG = getQSConfig('organizations', {
|
const QS_CONFIG = getQSConfig('organizations', {
|
||||||
page: 1,
|
page: 1,
|
||||||
page_size: 20,
|
page_size: 20,
|
||||||
order_by: 'image',
|
order_by: 'name',
|
||||||
});
|
});
|
||||||
|
|
||||||
function OrganizationExecEnvList({ i18n, organization }) {
|
function OrganizationExecEnvList({ i18n, organization }) {
|
||||||
@@ -79,10 +79,15 @@ function OrganizationExecEnvList({ i18n, organization }) {
|
|||||||
toolbarSearchableKeys={searchableKeys}
|
toolbarSearchableKeys={searchableKeys}
|
||||||
toolbarRelatedSearchableKeys={relatedSearchableKeys}
|
toolbarRelatedSearchableKeys={relatedSearchableKeys}
|
||||||
toolbarSearchColumns={[
|
toolbarSearchColumns={[
|
||||||
|
{
|
||||||
|
name: i18n._(t`Name`),
|
||||||
|
key: 'name__icontains',
|
||||||
|
isDefault: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: i18n._(t`Image`),
|
name: i18n._(t`Image`),
|
||||||
key: 'image__icontains',
|
key: 'image__icontains',
|
||||||
isDefault: true,
|
isDefault: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: i18n._(t`Created By (Username)`),
|
name: i18n._(t`Created By (Username)`),
|
||||||
@@ -94,6 +99,10 @@ function OrganizationExecEnvList({ i18n, organization }) {
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
toolbarSortColumns={[
|
toolbarSortColumns={[
|
||||||
|
{
|
||||||
|
name: i18n._(t`Name`),
|
||||||
|
key: 'name',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: i18n._(t`Image`),
|
name: i18n._(t`Image`),
|
||||||
key: 'image',
|
key: 'image',
|
||||||
|
|||||||
@@ -28,13 +28,19 @@ function OrganizationExecEnvListItem({
|
|||||||
<DataListItemRow>
|
<DataListItemRow>
|
||||||
<DataListItemCells
|
<DataListItemCells
|
||||||
dataListCells={[
|
dataListCells={[
|
||||||
|
<DataListCell
|
||||||
|
key="name"
|
||||||
|
aria-label={i18n._(t`Execution environment name`)}
|
||||||
|
>
|
||||||
|
<Link to={`${detailUrl}`}>
|
||||||
|
<b>{executionEnvironment.name}</b>
|
||||||
|
</Link>
|
||||||
|
</DataListCell>,
|
||||||
<DataListCell
|
<DataListCell
|
||||||
key="image"
|
key="image"
|
||||||
aria-label={i18n._(t`Execution environment image`)}
|
aria-label={i18n._(t`Execution environment image`)}
|
||||||
>
|
>
|
||||||
<Link to={`${detailUrl}`}>
|
{executionEnvironment.image}
|
||||||
<b>{executionEnvironment.image}</b>
|
|
||||||
</Link>
|
|
||||||
</DataListCell>,
|
</DataListCell>,
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ describe('<OrganizationExecEnvListItem/>', () => {
|
|||||||
const executionEnvironment = {
|
const executionEnvironment = {
|
||||||
id: 1,
|
id: 1,
|
||||||
image: 'https://registry.com/r/image/manifest',
|
image: 'https://registry.com/r/image/manifest',
|
||||||
|
name: 'foo',
|
||||||
organization: 1,
|
organization: 1,
|
||||||
credential: null,
|
credential: null,
|
||||||
|
pull: 'always',
|
||||||
};
|
};
|
||||||
|
|
||||||
test('should mount successfully', async () => {
|
test('should mount successfully', async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user