Skip to content

Add multi-select filter in organizations page for Headcount #1433

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

Merged
joanagmaia merged 5 commits into from
Sep 7, 2023
Merged

Add multi-select filter in organizations page for Headcount #1433

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3550e33
Add multi-select filter in organizations page for Headcount
peoray Sep 5, 2023
912d2b6
Change value for 1000+ range in headcount option
peoray Sep 5, 2023
6726e7d
Merge branch 'main' into headcount-filter
peoray Sep 5, 2023
6f10d0f
Merge branch 'main' of github.com:peoray/crowd.dev into headcount-filter
peoray Sep 7, 2023
db358b1
Add more options to headcount filter list
peoray Sep 7, 2023
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
18 changes: 9 additions & 9 deletions frontend/src/modules/organization/config/filters/headcount/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
import {
SelectFilterConfig, SelectFilterOptions,
SelectFilterValue,
} from '@/shared/modules/filters/types/filterTypes/SelectFilterConfig';
MultiSelectFilterConfig, MultiSelectFilterOptions,
MultiSelectFilterValue,
} from '@/shared/modules/filters/types/filterTypes/MultiSelectFilterConfig';
import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
import options from './options';

const headcount: SelectFilterConfig = {
const headcount: MultiSelectFilterConfig = {
id: 'headcount',
label: 'Headcount',
iconClass: 'ri-group-2-line',
type: FilterConfigType.SELECT,
type: FilterConfigType.MULTISELECT,
options: {
options,
},
itemLabelRenderer(value: SelectFilterValue, options: SelectFilterOptions): string {
return itemLabelRendererByType[FilterConfigType.SELECT]('Headcount', value, options);
itemLabelRenderer(value: MultiSelectFilterValue, options: MultiSelectFilterOptions): string {
return itemLabelRendererByType[FilterConfigType.MULTISELECT]('Headcount', value, options);
},
apiFilterRenderer({ value, include }: SelectFilterValue): any[] {
apiFilterRenderer({ value, include }: MultiSelectFilterValue): any[] {
const filter = {
size: { eq: value },
or: value.map((count) => ({ size: count })),
Copy link
Copy Markdown
Contributor

@joanagmaia joanagmaia Sep 6, 2023

Choose a reason for hiding this comment

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

Here it needs to be:

or: value.map((count) => ({ size: { eq: count } })),

Otherwise API returns 500

Copy link
Copy Markdown
Contributor Author

@peoray peoray Sep 7, 2023

Choose a reason for hiding this comment

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

done

};
return [
(include ? filter : { not: filter }),
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/modules/organization/config/filters/headcount/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ const options: MultiSelectFilterOptionGroup[] = [
label: '501-1000',
value: '501-1000',
},
{
label: '> 1000',
value: '1000+',
},
Comment on lines +26 to +37
Copy link
Copy Markdown
Contributor

@joanagmaia joanagmaia Sep 6, 2023

Choose a reason for hiding this comment

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

The issue scoping was not completely ok.
This specific attribute is following the canonical values from https://docs.peopledatalabs.com/docs/company-sizes

Instead of this new selection item, can you add support for
1001-5000
5001-10000
10001+

instead?

Apologies for the confusion

Copy link
Copy Markdown
Contributor Author

@peoray peoray Sep 7, 2023

Choose a reason for hiding this comment

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

done

],
},
];
Expand Down