Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1835348: Replace hideNameFilter with hideToolbar #5481

Merged
merged 1 commit into from
May 20, 2020
Merged

Bug 1835348: Replace hideNameFilter with hideToolbar #5481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions frontend/packages/container-security/src/components/image-manifest-vuln.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,7 @@ export const ImageManifestVulnPage: React.FC<ImageManifestVulnPageProps> = (prop
title="Image Manifest Vulnerabilities"
canCreate={false}
showTitle
hideNameFilter
hideLabelFilter
hideToolbar
ListComponent={ImageManifestVulnList}
/>
);
Expand Down
1 change: 0 additions & 1 deletion frontend/packages/dev-console/src/components/custom-resource-list/CustomResourceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ const CustomResourceList: React.FC<CustomResourceListProps> = ({
rowFilters={rowFilters}
data={listItems}
textFilter={textFilter}
hideNameFilter={false}
hideLabelFilter
spadgett marked this conversation as resolved.
Show resolved Hide resolved
reduxIDs={[]}
/>
Expand Down
20 changes: 10 additions & 10 deletions frontend/public/components/factory/list-page.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const TextFilter = (props) => {
TextFilter.displayName = 'TextFilter';

// TODO (jon) make this into "withListPageFilters" HOC
/** @augments {React.PureComponent<{ListComponent: React.ComponentType<any>, kinds: string[], filters?:any, flatten?: function, data?: any[], rowFilters?: any[], hideNameFilter?: boolean, hideLabelFilter?: boolean }>} */
/** @augments {React.PureComponent<{ListComponent: React.ComponentType<any>, kinds: string[], filters?:any, flatten?: function, data?: any[], rowFilters?: any[], hideToolbar?: boolean, hideLabelFilter?: boolean }>} */
export class ListPageWrapper_ extends React.PureComponent {
render() {
const {
Expand All @@ -67,7 +67,7 @@ export class ListPageWrapper_ extends React.PureComponent {
reduxIDs,
rowFilters,
textFilter,
hideNameFilter,
hideToolbar,
hideLabelFilter,
} = this.props;
const data = flatten ? flatten(this.props.resources) : [];
Expand All @@ -77,7 +77,7 @@ export class ListPageWrapper_ extends React.PureComponent {
data={data}
reduxIDs={reduxIDs}
textFilter={textFilter}
hideNameFilter={hideNameFilter}
hideToolbar={hideToolbar}
hideLabelFilter={hideLabelFilter}
{...this.props}
/>
Expand All @@ -104,7 +104,7 @@ ListPageWrapper_.propTypes = {
rowFilters: PropTypes.array,
staticFilters: PropTypes.array,
customData: PropTypes.any,
hideNameFilter: PropTypes.bool,
hideToolbar: PropTypes.bool,
hideLabelFilter: PropTypes.bool,
};

Expand Down Expand Up @@ -307,7 +307,7 @@ FireMan_.propTypes = {
title: PropTypes.string,
};

/** @type {React.SFC<{ListComponent: React.ComponentType<any>, kind: string, helpText?: any, namespace?: string, filterLabel?: string, textFilter?: string, title?: string, showTitle?: boolean, rowFilters?: any[], selector?: any, fieldSelector?: string, canCreate?: boolean, createButtonText?: string, createProps?: any, mock?: boolean, badge?: React.ReactNode, createHandler?: any, hideNameFilter?: boolean, hideLabelFilter?: boolean, customData?: any} >} */
/** @type {React.SFC<{ListComponent: React.ComponentType<any>, kind: string, helpText?: any, namespace?: string, filterLabel?: string, textFilter?: string, title?: string, showTitle?: boolean, rowFilters?: any[], selector?: any, fieldSelector?: string, canCreate?: boolean, createButtonText?: string, createProps?: any, mock?: boolean, badge?: React.ReactNode, createHandler?: any, hideToolbar?: boolean, hideLabelFilter?: boolean, customData?: any} >} */
export const ListPage = withFallback((props) => {
const {
autoFocus,
Expand All @@ -332,7 +332,7 @@ export const ListPage = withFallback((props) => {
textFilter,
match,
badge,
hideNameFilter,
hideToolbar,
hideLabelFilter,
} = props;
let { createProps } = props;
Expand Down Expand Up @@ -398,15 +398,15 @@ export const ListPage = withFallback((props) => {
textFilter={textFilter}
title={title}
badge={badge}
hideNameFilter={hideNameFilter}
hideToolbar={hideToolbar}
hideLabelFilter={hideLabelFilter}
/>
);
}, ErrorBoundaryFallback);

ListPage.displayName = 'ListPage';

/** @type {React.SFC<{canCreate?: boolean, createButtonText?: string, createProps?: any, createAccessReview?: Object, flatten?: Function, title?: string, label?: string, hideTextFilter?: boolean, showTitle?: boolean, helpText?: any, filterLabel?: string, textFilter?: string, rowFilters?: any[], resources: any[], ListComponent: React.ComponentType<any>, namespace?: string, customData?: any, badge?: React.ReactNode, hideNameFilter?: boolean, hideLabelFilter?: boolean >} */
/** @type {React.SFC<{canCreate?: boolean, createButtonText?: string, createProps?: any, createAccessReview?: Object, flatten?: Function, title?: string, label?: string, hideTextFilter?: boolean, showTitle?: boolean, helpText?: any, filterLabel?: string, textFilter?: string, rowFilters?: any[], resources: any[], ListComponent: React.ComponentType<any>, namespace?: string, customData?: any, badge?: React.ReactNode, hideToolbar?: boolean, hideLabelFilter?: boolean >} */
export const MultiListPage = (props) => {
const {
autoFocus,
Expand All @@ -428,7 +428,7 @@ export const MultiListPage = (props) => {
title,
customData,
badge,
hideNameFilter,
hideToolbar,
hideLabelFilter,
} = props;

Expand Down Expand Up @@ -464,7 +464,7 @@ export const MultiListPage = (props) => {
rowFilters={rowFilters}
staticFilters={staticFilters}
customData={customData}
hideNameFilter={hideNameFilter}
hideToolbar={hideToolbar}
hideLabelFilter={hideLabelFilter}
/>
</Firehose>
Expand Down
144 changes: 70 additions & 74 deletions frontend/public/components/filter-toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const FilterToolbar_: React.FC<FilterToolbarProps & RouteComponentProps> = (prop
const {
rowFilters = [],
data,
hideNameFilter,
hideToolbar,
hideLabelFilter,
location,
textFilter = filterTypeMap[FilterType.NAME],
Expand Down Expand Up @@ -218,12 +218,8 @@ const FilterToolbar_: React.FC<FilterToolbarProps & RouteComponentProps> = (prop

const clearAll = () => {
updateRowFilterSelected(selectedRowFilters);
if (!hideNameFilter) {
updateNameFilter('');
}
if (!hideLabelFilter) {
spadgett marked this conversation as resolved.
Show resolved Hide resolved
updateLabelFilter([]);
}
updateNameFilter('');
updateLabelFilter([]);
};

// Initial URL parsing
Expand All @@ -242,69 +238,69 @@ const FilterToolbar_: React.FC<FilterToolbarProps & RouteComponentProps> = (prop
const dropdownItems = getDropdownItems(rowFilters, selectedRowFilters, data, props);

return (
<DataToolbar id="filter-toolbar" clearAllFilters={clearAll}>
<DataToolbarContent>
{rowFilters.length > 0 && (
<DataToolbarItem>
{_.reduce(
Object.keys(filters),
(acc, key) => (
<DataToolbarFilter
key={key}
chips={_.intersection(selectedRowFilters, filters[key]).map((item) => {
return { key: item, node: filtersNameMap[item] };
})}
deleteChip={(filter, chip: DataToolbarChip) =>
updateRowFilterSelected([chip.key])
}
categoryName={key}
deleteChipGroup={() => clearAllRowFilter(key)}
>
{acc}
</DataToolbarFilter>
),
<Dropdown
dropdownItems={dropdownItems}
onSelect={onRowFilterSelect}
isOpen={isOpen}
toggle={
<DropdownToggle
data-test-id="filter-dropdown-toggle"
onToggle={() => setOpen(!isOpen)}
iconComponent={CaretDownIcon}
!hideToolbar && (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this, nice and clean and simple to hide all the toolbar

<DataToolbar id="filter-toolbar" clearAllFilters={clearAll}>
<DataToolbarContent>
{rowFilters.length > 0 && (
<DataToolbarItem>
{_.reduce(
Object.keys(filters),
(acc, key) => (
<DataToolbarFilter
key={key}
chips={_.intersection(selectedRowFilters, filters[key]).map((item) => {
return { key: item, node: filtersNameMap[item] };
})}
deleteChip={(filter, chip: DataToolbarChip) =>
updateRowFilterSelected([chip.key])
}
categoryName={key}
deleteChipGroup={() => clearAllRowFilter(key)}
>
<FilterIcon className="span--icon__right-margin" />
Filter
</DropdownToggle>
}
/>,
)}
</DataToolbarItem>
)}
<DataToolbarItem className="co-filter-search--full-width">
<DataToolbarFilter
deleteChipGroup={() => updateLabelFilter([])}
chips={[...labelFilters]}
deleteChip={(filter, chip: string) =>
updateLabelFilter(_.difference(labelFilters, [chip]))
}
categoryName="Label"
>
{acc}
</DataToolbarFilter>
),
<Dropdown
dropdownItems={dropdownItems}
onSelect={onRowFilterSelect}
isOpen={isOpen}
toggle={
<DropdownToggle
data-test-id="filter-dropdown-toggle"
onToggle={() => setOpen(!isOpen)}
iconComponent={CaretDownIcon}
>
<FilterIcon className="span--icon__right-margin" />
Filter
</DropdownToggle>
}
/>,
)}
</DataToolbarItem>
)}
<DataToolbarItem className="co-filter-search--full-width">
<DataToolbarFilter
chips={nameFilter && nameFilter.length > 0 ? [nameFilter] : []}
deleteChip={() => updateNameFilter('')}
categoryName="Name"
deleteChipGroup={() => updateLabelFilter([])}
chips={!hideLabelFilter ? [...labelFilters] : []}
deleteChip={(filter, chip: string) =>
updateLabelFilter(_.difference(labelFilters, [chip]))
}
categoryName="Label"
>
<div className="pf-c-input-group">
{!hideLabelFilter && (
<DropdownInternal
items={FilterType}
onChange={switchFilter}
selectedKey={filterType}
title={filterType}
/>
)}
{!hideNameFilter && (
<DataToolbarFilter
chips={nameFilter?.length ? [nameFilter] : []}
deleteChip={() => updateNameFilter('')}
categoryName="Name"
>
<div className="pf-c-input-group">
{!hideLabelFilter && (
<DropdownInternal
items={FilterType}
onChange={switchFilter}
selectedKey={filterType}
title={filterType}
/>
)}
<AutocompleteInput
className="co-text-node"
onSuggestionSelect={(selected) => {
Expand All @@ -318,13 +314,13 @@ const FilterToolbar_: React.FC<FilterToolbarProps & RouteComponentProps> = (prop
}
data={data}
/>
)}
</div>
</div>
</DataToolbarFilter>
</DataToolbarFilter>
</DataToolbarFilter>
</DataToolbarItem>
</DataToolbarContent>
</DataToolbar>
</DataToolbarItem>
</DataToolbarContent>
</DataToolbar>
)
);
};

Expand All @@ -334,7 +330,7 @@ type FilterToolbarProps = {
reduxIDs?: string[];
filterList?: any;
textFilter?: string;
hideNameFilter?: boolean;
hideToolbar?: boolean;
hideLabelFilter?: boolean;
parseAutoComplete?: any;
kinds?: any;
Expand Down
3 changes: 1 addition & 2 deletions frontend/public/components/search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ const ResourceList = connectToModel(({ kindObj, mock, namespace, selector, nameF
autoFocus={false}
mock={mock}
badge={getBadgeFromType(kindObj.badge)}
hideNameFilter
hideLabelFilter
hideToolbar
/>
);
});
Expand Down