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.

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

feat: Added filter for multiple columns in browse #440

Merged
merged 1 commit into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/AddCaseButtons/AddCaseButtons.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-lines-per-function */
import { Button, Icon } from '@equinor/eds-core-react';
import { add as ADD } from '@equinor/eds-icons';
import {
Expand Down
117 changes: 105 additions & 12 deletions src/features/ModelTable/ModelTable.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
/* eslint-disable max-lines */
/* eslint-disable no-empty-pattern */
/* eslint-disable max-lines-per-function */
import { ChangeEvent, CSSProperties } from 'react';
import { useMsal } from '@azure/msal-react';
import { Button, Checkbox } from '@equinor/eds-core-react';
import { EdsDataGrid } from '@equinor/eds-data-grid-react';
import {
Button,
Checkbox,
TextField,
Typography,
} from '@equinor/eds-core-react';
import {
EdsDataGrid,
FilterWrapper,
HeaderContext,
} from '@equinor/eds-data-grid-react';
import { useQuery } from '@tanstack/react-query';
import { useNavigate } from 'react-router-dom';
import {
AnalogueModelList,
AnalogueModelsService,
OpenAPI,
StratigraphicGroupDto,
Expand Down Expand Up @@ -94,6 +105,62 @@ export const ModelTable = () => {
/* Make sure the header row in EdsDataGrid is vertically middle-aligned when filter icons are shown */
const headerStyle = (): CSSProperties => ({ verticalAlign: 'middle' });

const filterComponent = ({
onChange,
value,
}: {
onChange: (value: unknown) => void;
value: unknown;
}) => (
<TextField
label={'Custom filter'}
id={'my-custom-filter'}
value={(value as string) ?? ''}
onChange={(e: ChangeEvent<HTMLInputElement>) =>
onChange(e.currentTarget.value)
}
/>
);

const headerComponent = (
title: HeaderContext<AnalogueModelList, any>,
header: string,
) => {
return (
<div
style={{
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}
>
<Typography variant={'cell_header'} group={'table'}>
{header}
</Typography>
<FilterWrapper
column={title.column}
CustomComponent={filterComponent}
/>
</div>
);
};

const filterFunction = (filterValue: string, data: string[]) => {
if (!filterValue) return true;
const value = filterValue.replaceAll(' ', '').split(',');

let arr: string[] = [];
value.forEach((item: string) => {
if (item === '') return;
arr = arr.concat(
data.filter((key: string) => key.toLowerCase().includes(item)),
);
});

if (arr && arr.length > 0) return true;
return false;
};

return (
<Styled.Table>
<EdsDataGrid
Expand Down Expand Up @@ -138,8 +205,12 @@ export const ModelTable = () => {
{ accessorKey: 'name', header: 'Model name', id: 'name', size: 200 },
{
id: 'outcrops',
header: 'Outcrop',
enableColumnFilter: false,
header: (header) => headerComponent(header, 'Outcrop'),
filterFn: (row, columnId, filterValue) =>
filterFunction(
filterValue,
row.original.outcrops.map((i) => i.name),
),
size: 100,
cell: ({ row }) => (
<Styled.List>
Expand All @@ -151,8 +222,14 @@ export const ModelTable = () => {
},
{
id: 'country',
header: 'Country',
enableColumnFilter: false,
header: (header) => headerComponent(header, 'Country'),
filterFn: (row, columnId, filterValue) =>
filterFunction(
filterValue,
row.original.stratigraphicGroups.map(
(i) => i.country.identifier,
),
),
size: 120,
cell: ({ row }) => (
<Styled.List>
Expand All @@ -166,8 +243,12 @@ export const ModelTable = () => {
},
{
id: 'field',
header: 'Field',
enableColumnFilter: false,
header: (header) => headerComponent(header, 'Field'),
filterFn: (row, columnId, filterValue) =>
filterFunction(
filterValue,
row.original.stratigraphicGroups.map((i) => i.field.identifier),
),
size: 120,
cell: ({ row }) => (
<Styled.List>
Expand All @@ -181,8 +262,14 @@ export const ModelTable = () => {
},
{
id: 'stratigraphicColumn',
header: 'Stratigraphic column',
enableColumnFilter: false,
header: (header) => headerComponent(header, 'Stratigraphic column'),
filterFn: (row, columnId, filterValue) =>
filterFunction(
filterValue,
row.original.stratigraphicGroups.map(
(i) => i.stratColumn.identifier,
),
),
size: 230,
cell: ({ row }) => (
<Styled.List>
Expand All @@ -196,8 +283,14 @@ export const ModelTable = () => {
},
{
id: 'group',
header: 'Level 1 (group)',
enableColumnFilter: false,
header: (header) => headerComponent(header, 'Level 1 (group)'),
filterFn: (row, columnId, filterValue) =>
filterFunction(
filterValue,
getRowGroup(row.original.stratigraphicGroups).map(
(i) => i.identifier,
),
),
size: 150,
cell: ({ row }) => (
<Styled.List>
Expand Down