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

feat(ui): Improve UX when filtering applications (#4403) #4622

Merged
merged 2 commits into from
Oct 29, 2020
Merged

feat(ui): Improve UX when filtering applications (#4403) #4622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cddf22
feat: Improve UX when filtering applications
tetchel Oct 21, 2020
0df4365
Fix tags not clearing
tetchel Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 35 additions & 13 deletions ui/src/app/applications/components/applications-list/applications-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Checkbox, DataLoader} from 'argo-ui';
import {Checkbox, DataLoader, Tooltip} from 'argo-ui';
import * as classNames from 'classnames';
import * as React from 'react';

Expand Down Expand Up @@ -105,16 +105,38 @@ export class ApplicationsFilter extends React.Component<ApplicationsFilterProps,
values.add(app.metadata.labels[label]);
})
);

const filtersCount = AppsListPreferences.countEnabledFilters(pref);

return (
<div className={classNames('applications-list__filters-container', {'applications-list__filters-container--expanded': this.state.expanded})}>
<i
onClick={() => this.setState({expanded: !this.state.expanded})}
className={classNames('fa applications-list__filters-expander', {'fa-chevron-up': this.state.expanded, 'fa-chevron-down': !this.state.expanded})}
/>
<p className='applications-list__filters-container-title'>Filter By:</p>
<div className='row'>
<div className={classNames('applications-list__filters-title', {'applications-list__filters-title--expanded': this.state.expanded})}>
<Tooltip content='Filters'>
<i className='fa fa-filter' />
</Tooltip>
<div style={{marginLeft: 'auto'}} />
<div className='applications-list__filters-title__counter tags-input__tag' style={filtersCount === 0 ? {display: 'none'} : {}}>
{filtersCount} Filter{filtersCount === 1 ? '' : 's'}
<Tooltip content='Clear Filters'>
<i
className='fa fa-times'
onClick={() => {
AppsListPreferences.clearFilters(this.props.pref);
Copy link
Collaborator

Choose a reason for hiding this comment

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

I've reproduced a bug.

  1. Navigate to the applications list
  2. Add project filter
  3. Click "Clear filters"

Projects tags input control keep showing the selected project. I think this is an old bug in https://github.com/argoproj/argo-cd/blob/master/ui/src/app/shared/components/tags-input/tags-input.tsx

getDerivedStateFromProps() handler is missing and component does not support changing input

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe I've fixed it - I should have noticed that one when testing.

this.props.onChange(this.props.pref);
}}
/>
</Tooltip>
</div>
<Tooltip content={(this.state.expanded ? 'Collapse' : 'Expand') + ' Filters'}>
<i
className={classNames('fa applications-list__filters-title__expander', {'fa-chevron-up': this.state.expanded, 'fa-chevron-down': !this.state.expanded})}
onClick={() => this.setState({expanded: !this.state.expanded})}
/>
</Tooltip>
</div>
<div className='applications-list__filters-container-contents row'>
<div className='columns small-12 medium-3 xxlarge-12'>
<p>Sync</p>
<div className='applications-list__filter-title'>Sync</div>
<ItemsFilter
selected={pref.syncFilter}
onChange={selected => onChange({...pref, syncFilter: selected})}
Expand All @@ -123,7 +145,7 @@ export class ApplicationsFilter extends React.Component<ApplicationsFilterProps,
/>
</div>
<div className='columns small-12 medium-3 xxlarge-12'>
<p>Health</p>
<div className='applications-list__filter-title'>Health</div>
<ItemsFilter
selected={pref.healthFilter}
onChange={selected => onChange({...pref, healthFilter: selected})}
Expand All @@ -133,7 +155,7 @@ export class ApplicationsFilter extends React.Component<ApplicationsFilterProps,
</div>
<div className='columns small-12 medium-6 xxlarge-12'>
<div className='applications-list__filter'>
<p>Labels</p>
<div className='applications-list__filter-title'>Labels</div>
<ul>
<li>
<TagsInput
Expand All @@ -144,7 +166,7 @@ export class ApplicationsFilter extends React.Component<ApplicationsFilterProps,
/>
</li>
</ul>
<p>Projects</p>
<div className='applications-list__filter-title'>Projects</div>
<ul>
<li>
<DataLoader load={() => services.projects.list('items.metadata.name')}>
Expand All @@ -164,7 +186,7 @@ export class ApplicationsFilter extends React.Component<ApplicationsFilterProps,
</DataLoader>
</li>
</ul>
<p>Clusters</p>
<div className='applications-list__filter-title'>Clusters</div>
<ul>
<li>
<TagsInput
Expand All @@ -177,7 +199,7 @@ export class ApplicationsFilter extends React.Component<ApplicationsFilterProps,
/>
</li>
</ul>
<p>Namespaces</p>
<div className='applications-list__filter-title'>Namespaces</div>
<ul>
<li>
<TagsInput
Expand Down
100 changes: 44 additions & 56 deletions ui/src/app/applications/components/applications-list/applications-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,54 +66,66 @@
}
}

&__filters-expander {
position: absolute;
top: 0.75em;
right: 1em;
cursor: pointer;
}
$filters-container-collapsed-height: 3em;
$filters-container-box-shadow: 1px 1px 3px $argo-color-gray-5;

&__filters-container {
max-height: 2.5em;
max-height: $filters-container-collapsed-height;
overflow: hidden;
position: relative;
border-radius: $border-radius;
box-shadow: 1px 1px 3px $argo-color-gray-5;
box-shadow: $filters-container-box-shadow;
padding: 0 1em 0.75em 1em;
margin: 33px 0;
background-color: white;
transition: max-height 0.25s cubic-bezier(0, 1, 0, 1);

ul, a, p {
ul {
margin: 0;
}

p {
margin-top: 1em;
color: $argo-color-gray-6;
text-transform: uppercase;
&--expanded {
max-height: calc(1.55em * 17);
transition: max-height 1s ease-in-out;
}
}

&::before {
content: 'FILTERS';
display: block;
color: $argo-color-gray-6;
padding-bottom: 1em;
margin-top: 0.5em;
}
$filters-title-border-bottom: 1px solid $argo-color-gray-3;

&__filters-title {
height: $filters-container-collapsed-height;
padding: 0.25em 0;
display: flex;
align-items: center;

&--expanded {
max-height: calc(1.55em * 17);
transition: max-height 1s ease-in-out;
&::before {
display: none;
}
border-bottom: $filters-title-border-bottom;
}

&__counter {
margin-right: 0;
width: 10ch;
}

&__expander {
cursor: pointer;
margin-left: 1em;
}
}

&__filters-container-title {
border-bottom: 1px solid $argo-color-gray-3;
margin-bottom: 1em;
@include breakpoint(xxlarge up) {
&__filters-container {
max-height: 100%;
transition: max-height 0.5s ease-in-out;
}

&__filters-title {
border-bottom: $filters-title-border-bottom;
}

&__filters-title__expander {
display: none;
}
}

&__filter {
Expand All @@ -125,10 +137,6 @@
overflow-y: auto;
}

&__filter-expander {
display: none;
}

&__view-type {
white-space: nowrap;
i {
Expand All @@ -145,30 +153,10 @@
}
}

@include breakpoint(xxlarge up) {
&__summary {
margin-top: 5.3em;
}

&__filter-expander {
display: inline;
}

&__filter--expanded {
max-height: 1000px;
transition: max-height 0.5s ease-in-out;
}

&__filters-expander {
display: none;
}

&__filters-container {
max-height: 10000px;
&::before {
display: none;
}
}
&__filter-title {
margin: 0.5em 0 0 0;
color: $argo-color-gray-6;
text-transform: uppercase;
}

&__filter-label {
Expand Down
41 changes: 27 additions & 14 deletions ui/src/app/applications/components/applications-list/applications-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {RouteComponentProps} from 'react-router';
import {Observable} from 'rxjs';

import {ClusterCtx, DataLoader, EmptyState, ObservableQuery, Page, Paginate, Query, Spinner} from '../../../shared/components';
import {Consumer} from '../../../shared/context';
import {Consumer, ContextApis} from '../../../shared/context';
import * as models from '../../../shared/models';
import {AppsListPreferences, AppsListViewType, services} from '../../../shared/services';
import {ApplicationCreatePanel} from '../application-create-panel/application-create-panel';
Expand Down Expand Up @@ -179,6 +179,18 @@ export const ApplicationsList = (props: RouteComponentProps<{}>) => {
services.applications.get(appName, 'normal');
}

function onFilterPrefChanged(ctx: ContextApis, newPref: AppsListPreferences) {
services.viewPreferences.updatePreferences({appList: newPref});
ctx.navigation.goto('.', {
proj: newPref.projectsFilter.join(','),
sync: newPref.syncFilter.join(','),
health: newPref.healthFilter.join(','),
namespace: newPref.namespacesFilter.join(','),
cluster: newPref.clustersFilter.join(','),
labels: newPref.labelsFilter.map(encodeURIComponent).join(',')
});
}

return (
<ClusterCtx.Provider value={clusters}>
<Consumer>
Expand Down Expand Up @@ -274,6 +286,7 @@ export const ApplicationsList = (props: RouteComponentProps<{}>) => {
}
}}
className='argo-field'
placeholder='Search applications...'
/>
)}
renderItem={item => (
Expand All @@ -298,21 +311,12 @@ export const ApplicationsList = (props: RouteComponentProps<{}>) => {
clusters={clusterList}
applications={applications}
pref={pref}
onChange={newPref => {
services.viewPreferences.updatePreferences({appList: newPref});
ctx.navigation.goto('.', {
proj: newPref.projectsFilter.join(','),
sync: newPref.syncFilter.join(','),
health: newPref.healthFilter.join(','),
namespace: newPref.namespacesFilter.join(','),
cluster: newPref.clustersFilter.join(','),
labels: newPref.labelsFilter.map(encodeURIComponent).join(',')
});
}}
onChange={newPref => onFilterPrefChanged(ctx, newPref)}
/>
);
}}
</DataLoader>

{syncAppsInput && (
<ApplicationsSyncPanel
key='syncsPanel'
Expand All @@ -329,8 +333,17 @@ export const ApplicationsList = (props: RouteComponentProps<{}>) => {
page={pref.page}
emptyState={() => (
<EmptyState icon='fa fa-search'>
<h4>No applications found</h4>
<h5>Try to change filter criteria</h5>
<h4>No matching applications found</h4>
<h5>
Change filter criteria or&nbsp;
<a
onClick={() => {
AppsListPreferences.clearFilters(pref);
onFilterPrefChanged(ctx, pref);
}}>
clear filters
</a>
</h5>
</EmptyState>
)}
data={filterApps(applications, pref, pref.search)}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/shared/components/paginate/paginate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function Paginate<T>({page, onPageChange, children, data, emptyState, pre
<DropDownMenu
anchor={() => (
<a>
page size: {pageSize === -1 ? 'all' : pageSize} <i className='fa fa-caret-down' />
Items per page: {pageSize === -1 ? 'all' : pageSize} <i className='fa fa-caret-down' />
</a>
)}
items={[5, 10, 15, 20, -1].map(count => ({
Expand Down
3 changes: 1 addition & 2 deletions ui/src/app/shared/components/tags-input/tags-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
background: $argo-color-gray-3;
box-shadow: 1px 1px 3px $argo-color-gray-5;
border-radius: 5px;
padding: 4px;
padding: 4px 15px 4px 4px;
padding: 4px 18px 4px 4px;
margin: 0.2em 0.75em 0.2em 0;
cursor: default;
max-width: 100%;
Expand Down
48 changes: 39 additions & 9 deletions ui/src/app/shared/services/view-preferences-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,45 @@ export interface AppDetailsPreferences {

export type AppsListViewType = 'tiles' | 'list' | 'summary';

export interface AppsListPreferences {
labelsFilter: string[];
projectsFilter: string[];
reposFilter: string[];
syncFilter: string[];
healthFilter: string[];
namespacesFilter: string[];
clustersFilter: string[];
view: AppsListViewType;
export class AppsListPreferences {
public static countEnabledFilters(pref: AppsListPreferences) {
// tslint:disable-next-line: prettier
return [
pref.clustersFilter,
pref.healthFilter,
pref.labelsFilter,
pref.namespacesFilter,
pref.projectsFilter,
pref.reposFilter,
pref.syncFilter
].reduce((count, filter) => {
if (filter && filter.length > 0) {
return count + 1;
}
return count;
},
0
);
}

public static clearFilters(pref: AppsListPreferences) {
pref.clustersFilter = [];
pref.healthFilter = [];
pref.labelsFilter = [];
pref.namespacesFilter = [];
pref.projectsFilter = [];
pref.reposFilter = [];
pref.syncFilter = [];
}

public labelsFilter: string[];
public projectsFilter: string[];
public reposFilter: string[];
public syncFilter: string[];
public healthFilter: string[];
public namespacesFilter: string[];
public clustersFilter: string[];
public view: AppsListViewType;
}

export interface ViewPreferences {
Expand Down