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

Make filter a bit more consistent accross UI

Browse Source 
Add `description`, `created_by` and `modified_by` when those fields are
available.

See: https://github.com/ansible/awx/issues/7410
This commit is contained in:
nixocio 2020-09-24 11:40:26 -04:00
parent 820d4d292e
commit aa69b925ad
9 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
View File

@ -140,6 +140,18 @@ function ScheduleList({
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Created By (Username)`),
key: 'created_by__username__icontains',
},
{
name: i18n._(t`Modified By (Username)`),
key: 'modified_by__username__icontains',
},
]}
toolbarSortColumns={[
{

19
awx/ui_next/src/screens/Credential/CredentialList/CredentialList.jsx
View File

@ -102,6 +102,25 @@ function CredentialList({ i18n }) {
itemCount={credentialCount}
qsConfig={QS_CONFIG}
onRowClick={handleSelect}
toolbarSearchColumns={[
{
name: i18n._(t`Name`),
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Created By (Username)`),
key: 'created_by__username__icontains',
},
{
name: i18n._(t`Modified By (Username)`),
key: 'modified_by__username__icontains',
},
]}
renderItem={item => (
<CredentialListItem
key={item.id}

19
awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.jsx
View File

@ -114,6 +114,25 @@ function CredentialTypeList({ i18n }) {
pluralizedItemName={i18n._(t`Credential Types`)}
qsConfig={QS_CONFIG}
onRowClick={handleSelect}
toolbarSearchColumns={[
{
name: i18n._(t`Name`),
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Created By (Username)`),
key: 'created_by__username__icontains',
},
{
name: i18n._(t`Modified By (Username)`),
key: 'modified_by__username__icontains',
},
]}
toolbarSearchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys}
renderToolbar={props => (

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

@ -119,6 +119,10 @@ function HostList({ i18n }) {
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Created By (Username)`),
key: 'created_by__username__icontains',

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

@ -152,6 +152,10 @@ function InventoryList({ i18n }) {
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Created By (Username)`),
key: 'created_by__username__icontains',

4
awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
View File

@ -104,6 +104,10 @@ function NotificationTemplatesList({ i18n }) {
key: 'name',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Type`),
key: 'notification_type',

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

@ -131,6 +131,10 @@ function OrganizationsList({ i18n }) {
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Created By (Username)`),
key: 'created_by__username__icontains',

4
awx/ui_next/src/screens/Project/ProjectList/ProjectList.jsx
View File

@ -130,6 +130,10 @@ function ProjectList({ i18n }) {
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Type`),
key: 'or__scm_type',

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

@ -126,6 +126,10 @@ function TeamList({ i18n }) {
key: 'name__icontains',
isDefault: true,
},
{
name: i18n._(t`Description`),
key: 'description__icontains',
},
{
name: i18n._(t`Organization Name`),
key: 'organization__name__icontains',