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

Fix filter to take only hostname__icontains and disable advance search

Browse Source
This commit is contained in:
Zita Nemeckova
2023-02-20 15:21:49 +01:00
committed by John Westcott IV
parent 9135ff2f77
commit d40fdd77ad
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/src/components/DataListToolbar/DataListToolbar.js
View File

@@ -57,6 +57,7 @@ function DataListToolbar({
enableRelatedFuzzyFiltering, enableRelatedFuzzyFiltering,
handleIsAnsibleFactsSelected, handleIsAnsibleFactsSelected,
isFilterCleared, isFilterCleared,
advancedSearchDisabled,
}) { }) {
const showExpandCollapse = onCompact && onExpand; const showExpandCollapse = onCompact && onExpand;
const [isKebabOpen, setIsKebabOpen] = useState(false); const [isKebabOpen, setIsKebabOpen] = useState(false);
@@ -86,6 +87,10 @@ function DataListToolbar({
}), }),
[setIsKebabModalOpen] [setIsKebabModalOpen]
); );
const columns = [...searchColumns];
if ( !advancedSearchDisabled ) {
columns.push({ name: t`Advanced`, key: 'advanced' });
}
return ( return (
<Toolbar <Toolbar
id={`${qsConfig.namespace}-list-toolbar`} id={`${qsConfig.namespace}-list-toolbar`}
@@ -134,10 +139,7 @@ function DataListToolbar({
<ToolbarItem> <ToolbarItem>
<Search <Search
qsConfig={qsConfig} qsConfig={qsConfig}
columns={[ columns={columns}
...searchColumns,
{ name: t`Advanced`, key: 'advanced' },
]}
searchableKeys={searchableKeys} searchableKeys={searchableKeys}
relatedSearchableKeys={relatedSearchableKeys} relatedSearchableKeys={relatedSearchableKeys}
onSearch={onSearch} onSearch={onSearch}
@@ -224,6 +226,7 @@ DataListToolbar.propTypes = {
additionalControls: PropTypes.arrayOf(PropTypes.node), additionalControls: PropTypes.arrayOf(PropTypes.node),
enableNegativeFiltering: PropTypes.bool, enableNegativeFiltering: PropTypes.bool,
enableRelatedFuzzyFiltering: PropTypes.bool, enableRelatedFuzzyFiltering: PropTypes.bool,
advancedSearchDisabled : PropTypes.bool,
}; };
DataListToolbar.defaultProps = { DataListToolbar.defaultProps = {
@@ -243,6 +246,7 @@ DataListToolbar.defaultProps = {
additionalControls: [], additionalControls: [],
enableNegativeFiltering: true, enableNegativeFiltering: true,
enableRelatedFuzzyFiltering: true, enableRelatedFuzzyFiltering: true,
advancedSearchDisabled: false,
}; };
export default DataListToolbar; export default DataListToolbar;

5
awx/ui/src/screens/HostMetrics/HostMetrics.js
View File

@@ -62,10 +62,10 @@ function HostMetrics() {
pluralizedItemName={t`Host Metrics`} pluralizedItemName={t`Host Metrics`}
renderRow={(item)=> (<HostMetricsListItem item={item} />)} renderRow={(item)=> (<HostMetricsListItem item={item} />)}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
toolbarSearchColumns={[{name: t`Hostname`, key: 'hostname', isDefault: true}]} toolbarSearchColumns={[{name: t`Hostname`, key: 'hostname__icontains', isDefault: true}]}
toolbarSearchableKeys={[]} toolbarSearchableKeys={[]}
toolbarRelatedSearchableKeys={[]} toolbarRelatedSearchableKeys={[]}
renderToolbar={(props) => <DataListToolbar {...props} fillWidth />} renderToolbar={(props) => <DataListToolbar {...props} advancedSearchDisabled={true} fillWidth}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="hostname">{t`Hostname`}</HeaderCell> <HeaderCell sortKey="hostname">{t`Hostname`}</HeaderCell>
@@ -83,4 +83,5 @@ function HostMetrics() {
); );
} }
export { HostMetrics as _HostMetrics };
export default HostMetrics; export default HostMetrics;