External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

second pass double checking all keys show up in the lists they should

Browse Source
This commit is contained in:
John Mitchell
2019-12-19 17:00:29 -05:00
parent 30b6e318cc
commit 068de221c1
9 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui_next/src/components/AddRole/AddResourceRole.jsx
View File

@@ -179,6 +179,14 @@ class AddResourceRole extends React.Component {
key: 'name', key: 'name',
isDefault: true isDefault: true
}, },
{
name: i18n._(t`Created by (username)`),
key: 'created_by__username',
},
{
name: i18n._(t`Modified by (username)`),
key: 'modified_by__username',
},
]; ];
const teamSortColumns = [ const teamSortColumns = [

4
awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
View File

@@ -70,6 +70,10 @@ function InstanceGroupsLookup(props) {
key: 'name', key: 'name',
isDefault: true isDefault: true
}, },
{
name: i18n._(t`Credential name`),
key: 'credential__name'
},
{ {
name: i18n._(t`Created by (username)`), name: i18n._(t`Created by (username)`),
key: 'created_by__username', key: 'created_by__username',

10
awx/ui_next/src/components/Lookup/InventoryLookup.jsx
View File

@@ -83,10 +83,12 @@ function InventoryLookup({
key: 'modified_by__username', key: 'modified_by__username',
}, },
]} ]}
sortColumns={[{ sortColumns={[
name: i18n._(t`Name`), {
key: 'name' name: i18n._(t`Name`),
}]} key: 'name',
},
]}
multiple={state.multiple} multiple={state.multiple}
header={i18n._(t`Inventory`)} header={i18n._(t`Inventory`)}
name="inventory" name="inventory"

33
awx/ui_next/src/components/NotificationList/NotificationList.jsx
View File

@@ -11,6 +11,7 @@ import PaginatedDataList from '@components/PaginatedDataList';
import { getQSConfig, parseQueryString } from '@util/qs'; import { getQSConfig, parseQueryString } from '@util/qs';
import { NotificationTemplatesAPI } from '@api'; import { NotificationTemplatesAPI } from '@api';
import { type } from 'os';
const QS_CONFIG = getQSConfig('notification', { const QS_CONFIG = getQSConfig('notification', {
page: 1, page: 1,
@@ -205,12 +206,28 @@ class NotificationList extends Component {
isDefault: true isDefault: true
}, },
{ {
name: i18n._(t`Modified`), name: i18n._(t`Type`),
key: 'modified', key: 'type',
options: [
['email', i18n._(t`Email`)],
['grafana', i18n._(t`Grafana`)],
['hipchat', i18n._(t`Hipchat`)],
['irc', i18n._(t`IRC`)],
['mattermost', i18n._(t`Mattermost`)],
['pagerduty', i18n._(t`Pagerduty`)],
['rocketchat', i18n._(t`Rocket.Chat`)],
['slack', i18n._(t`Slack`)],
['twilio', i18n._(t`Twilio`)],
['webhook', i18n._(t`Webhook`)],
]
}, },
{ {
name: i18n._(t`Created`), name: i18n._(t`Created by (username)`),
key: 'created', key: 'created_by__username',
},
{
name: i18n._(t`Modified by (username)`),
key: 'modified_by__username',
}, },
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
@@ -218,14 +235,6 @@ class NotificationList extends Component {
name: i18n._(t`Name`), name: i18n._(t`Name`),
key: 'name', key: 'name',
}, },
{
name: i18n._(t`Modified`),
key: 'modified',
},
{
name: i18n._(t`Created`),
key: 'created',
},
]} ]}
renderItem={notification => ( renderItem={notification => (
<NotificationListItem <NotificationListItem

16
awx/ui_next/src/screens/Host/HostList/HostList.jsx
View File

@@ -197,12 +197,12 @@ class HostsList extends Component {
isDefault: true isDefault: true
}, },
{ {
name: i18n._(t`Modified`), name: i18n._(t`Created by (username)`),
key: 'modified', key: 'created_by__username',
}, },
{ {
name: i18n._(t`Created`), name: i18n._(t`Modified by (username)`),
key: 'created', key: 'modified_by__username',
}, },
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
@@ -210,14 +210,6 @@ class HostsList extends Component {
name: i18n._(t`Name`), name: i18n._(t`Name`),
key: 'name', key: 'name',
}, },
{
name: i18n._(t`Modified`),
key: 'modified',
},
{
name: i18n._(t`Created`),
key: 'created',
},
]} ]}
renderToolbar={props => ( renderToolbar={props => (
<DataListToolbar <DataListToolbar

16
awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
View File

@@ -181,12 +181,12 @@ class InventoriesList extends Component {
isDefault: true isDefault: true
}, },
{ {
name: i18n._(t`Modified`), name: i18n._(t`Created by (username)`),
key: 'modified', key: 'created_by__username',
}, },
{ {
name: i18n._(t`Created`), name: i18n._(t`Modified by (username)`),
key: 'created', key: 'modified_by__username',
}, },
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
@@ -194,14 +194,6 @@ class InventoriesList extends Component {
name: i18n._(t`Name`), name: i18n._(t`Name`),
key: 'name', key: 'name',
}, },
{
name: i18n._(t`Modified`),
key: 'modified',
},
{
name: i18n._(t`Created`),
key: 'created',
},
]} ]}
renderToolbar={props => ( renderToolbar={props => (
<DatalistToolbar <DatalistToolbar

8
awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
View File

@@ -125,6 +125,14 @@ function OrganizationsList({ i18n }) {
key: 'name', key: 'name',
isDefault: true isDefault: true
}, },
{
name: i18n._(t`Created by (username)`),
key: 'created_by__username',
},
{
name: i18n._(t`Modified by (username)`),
key: 'modified_by__username',
},
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
{ {

28
awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeams.jsx
View File

@@ -1,7 +1,8 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro';
import { OrganizationsAPI } from '@api'; import { OrganizationsAPI } from '@api';
import PaginatedDataList from '@components/PaginatedDataList'; import PaginatedDataList from '@components/PaginatedDataList';
import { getQSConfig, parseQueryString } from '@util/qs'; import { getQSConfig, parseQueryString } from '@util/qs';
@@ -12,7 +13,7 @@ const QS_CONFIG = getQSConfig('team', {
order_by: 'name', order_by: 'name',
}); });
function OrganizationTeams({ id }) { function OrganizationTeams({ id, i18n }) {
const location = useLocation(); const location = useLocation();
const [contentError, setContentError] = useState(null); const [contentError, setContentError] = useState(null);
const [hasContentLoading, setHasContentLoading] = useState(false); const [hasContentLoading, setHasContentLoading] = useState(false);
@@ -46,6 +47,27 @@ function OrganizationTeams({ id }) {
itemCount={itemCount} itemCount={itemCount}
pluralizedItemName="Teams" pluralizedItemName="Teams"
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
toolbarSearchColumns={[
{
name: i18n._(t`Name`),
key: 'name',
isDefault: true
},
{
name: i18n._(t`Created by (username)`),
key: 'created_by__username',
},
{
name: i18n._(t`Modified by (username)`),
key: 'modified_by__username',
},
]}
toolbarSortColumns={[
{
name: i18n._(t`Name`),
key: 'name',
},
]}
/> />
); );
} }
@@ -55,4 +77,4 @@ OrganizationTeams.propTypes = {
}; };
export { OrganizationTeams as _OrganizationTeams }; export { OrganizationTeams as _OrganizationTeams };
export default OrganizationTeams; export default withI18n()(OrganizationTeams);

8
awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
View File

@@ -164,6 +164,14 @@ class TeamsList extends Component {
name: i18n._(t`Organization name`), name: i18n._(t`Organization name`),
key: 'organization__name', key: 'organization__name',
}, },
{
name: i18n._(t`Created by (username)`),
key: 'created_by__username',
},
{
name: i18n._(t`Modified by (username)`),
key: 'modified_by__username',
},
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
{ {