External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

update rest of lookups to use correct searchableKeys props

Browse Source
This commit is contained in:
John Mitchell
2020-08-05 13:40:41 -04:00
committed by John Mitchell
parent f8bd8abc82
commit cbea77a90c
8 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
View File

@@ -95,8 +95,8 @@ function InventoryStep({ i18n }) {
key: 'name', key: 'name',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
header={i18n._(t`Inventory`)} header={i18n._(t`Inventory`)}
name="inventory" name="inventory"
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}

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

@@ -101,8 +101,8 @@ function ApplicationLookup({ i18n, onChange, value, label }) {
key: 'description', key: 'description',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
readOnly={!canDelete} readOnly={!canDelete}
name="application" name="application"
selectItem={item => dispatch({ type: 'SELECT_ITEM', item })} selectItem={item => dispatch({ type: 'SELECT_ITEM', item })}

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

@@ -139,8 +139,8 @@ function CredentialLookup({
key: 'name', key: 'name',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
readOnly={!canDelete} readOnly={!canDelete}
name="credential" name="credential"
selectItem={item => dispatch({ type: 'SELECT_ITEM', item })} selectItem={item => dispatch({ type: 'SELECT_ITEM', item })}

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

@@ -100,8 +100,8 @@ function InstanceGroupsLookup(props) {
key: 'name', key: 'name',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
multiple={state.multiple} multiple={state.multiple}
header={i18n._(t`Instance Groups`)} header={i18n._(t`Instance Groups`)}
name="instanceGroups" name="instanceGroups"

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

@@ -88,8 +88,8 @@ function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
key: 'name', key: 'name',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
multiple={state.multiple} multiple={state.multiple}
header={i18n._(t`Inventory`)} header={i18n._(t`Inventory`)}
name="inventory" name="inventory"

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

@@ -125,8 +125,8 @@ function InventoryScriptLookup({
key: 'name', key: 'name',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
/> />
)} )}
/> />

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

@@ -181,8 +181,8 @@ function MultiCredentialsLookup(props) {
key: 'name', key: 'name',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} searchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
multiple={isVault} multiple={isVault}
header={i18n._(t`Credentials`)} header={i18n._(t`Credentials`)}
name="credentials" name="credentials"

13
awx/ui_next/src/components/Search/AdvancedSearch.jsx
View File

@@ -95,32 +95,25 @@ function AdvancedSearch({
> >
<SelectOption <SelectOption
key="and" key="and"
value={i18n._(t`and`)} value="and"
description={i18n._( description={i18n._(
t`Returns results that satisfy this one as well as other filters. This is the default set type if nothing is selected.` t`Returns results that satisfy this one as well as other filters. This is the default set type if nothing is selected.`
)} )}
/> />
<SelectOption <SelectOption
key="or" key="or"
value={i18n._(t`or`)} value="or"
description={i18n._( description={i18n._(
t`Returns results that satisfy this one or any other filters.` t`Returns results that satisfy this one or any other filters.`
)} )}
/> />
<SelectOption <SelectOption
key="not" key="not"
value={i18n._(t`not`)} value="not"
description={i18n._( description={i18n._(
t`Returns results that have values other than this one as well as other filters.` t`Returns results that have values other than this one as well as other filters.`
)} )}
/> />
<SelectOption
key="or_not"
value={i18n._(t`or/not`)}
description={i18n._(
t`Returns results that have values other than this one or any other filters.`
)}
/>
</Select> </Select>
<Select <Select
aria-label={i18n._(t`Key select`)} aria-label={i18n._(t`Key select`)}