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

chore(weave): combine op filter into filter panel #3816

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

chore(weave): combine op filter into filter panel #3816

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 192 additions & 20 deletions weave-js/src/components/PagePanelComponents/Home/Browse3/filters/FilterBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,25 @@
* This bar above a grid displays currently set filters for quick editing.
*/

import {Popover} from '@mui/material';
import {Autocomplete, FormControl, Popover} from '@mui/material';
import {GridFilterItem, GridFilterModel} from '@mui/x-data-grid-pro';
import {MOON_200, TEAL_300} from '@wandb/weave/common/css/color.styles';
import _ from 'lodash';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';

import {Button} from '../../../../Button';
import {DraggableGrow, DraggableHandle} from '../../../../DraggablePopups';
import {IconFilterAlt} from '../../../../Icon';
import {Icon, IconFilterAlt} from '../../../../Icon';
import {Tailwind} from '../../../../Tailwind';
import {
convertFeedbackFieldToBackendFilter,
parseFeedbackType,
} from '../feedback/HumanFeedback/tsHumanFeedback';
import {ALL_TRACES_OR_CALLS_REF_KEY} from '../pages/CallsPage/callsTableFilter';
import {WFHighLevelCallFilter} from '../pages/CallsPage/callsTableFilter';
import {OpVersionSchema} from '../pages/wfReactInterface/wfDataModelHooksInterface';
import {StyledPaper} from '../StyledAutocomplete';
import {StyledTextField} from '../StyledTextField';
import {ColumnInfo} from '../types';
import {
FIELD_DESCRIPTIONS,
Expand All @@ -26,7 +32,7 @@ import {
} from './common';
import {FilterRow} from './FilterRow';
import {FilterTagItem} from './FilterTagItem';
import {GroupedOption, SelectFieldOption} from './SelectField';
import {GroupedOption, SelectField, SelectFieldOption} from './SelectField';
import {VariableChildrenDisplay} from './VariableChildrenDisplayer';

const DEBOUNCE_MS = 700;
Expand All @@ -38,6 +44,20 @@ type FilterBarProps = {
selectedCalls: string[];
clearSelectedCalls: () => void;

// op stuff
frozenFilter: WFHighLevelCallFilter | undefined;
filter: WFHighLevelCallFilter;
setFilter: (state: WFHighLevelCallFilter) => void;
selectedOpVersionOption: string;
opVersionOptions: Record<
string,
{
title: string;
ref: string;
group: string;
objectVersion?: OpVersionSchema;
}
>;
width: number;
height: number;
};
Expand All @@ -56,6 +76,11 @@ export const FilterBar = ({
selectedCalls,
clearSelectedCalls,
width,
frozenFilter,
filter,
setFilter,
selectedOpVersionOption,
opVersionOptions,
}: FilterBarProps) => {
const refBar = useRef<HTMLDivElement>(null);
const refLabel = useRef<HTMLDivElement>(null);
Expand All @@ -64,6 +89,7 @@ export const FilterBar = ({
// local filter model is used to avoid triggering a re-render of the trace
// table on every keystroke. debounced DEBOUNCE_MS ms
const [localFilterModel, setLocalFilterModel] = useState(filterModel);

useEffect(() => {
setLocalFilterModel(filterModel);
}, [filterModel]);
Expand Down Expand Up @@ -209,12 +235,20 @@ export const FilterBar = ({

const onRemoveFilter = useCallback(
(filterId: FilterId) => {
if (filterId === 'default-operation') {
// set the op to None
setFilter({
...filter,
opVersionRefs: [],
});
return;
}
const items = localFilterModel.items.filter(f => f.id !== filterId);
const newModel = {...localFilterModel, items};
setLocalFilterModel(newModel);
setFilterModel(newModel);
},
[localFilterModel, setFilterModel]
[localFilterModel, setFilterModel, setFilter, filter]
);

const onSetSelected = useCallback(() => {
Expand Down Expand Up @@ -242,6 +276,29 @@ export const FilterBar = ({
setAnchorEl(null);
}, [localFilterModel, setFilterModel, selectedCalls, clearSelectedCalls]);

// Handle operation change
const handleOperationChange = useCallback(
(event: any, newValue: string | null) => {
if (!newValue) {
return;
}

// Update the high-level filter directly
if (newValue === ALL_TRACES_OR_CALLS_REF_KEY) {
setFilter({
...filter,
opVersionRefs: [],
});
} else {
setFilter({
...filter,
opVersionRefs: [newValue],
});
}
},
[setFilter, filter]
);

const outlineW = 2 * 2;
const paddingW = 8 * 2;
const iconW = 20;
Expand All @@ -253,6 +310,106 @@ export const FilterBar = ({
f => !isFilterIncomplete(f)
);

// Custom renderer for operation filter
const renderOperationFilter = () => {
const frozenOpFilter = Object.keys(frozenFilter ?? {}).includes(
'opVersions'
);

return (
<>
{/* First column - Field */}
<div className="min-w-[190px]">
<SelectField
options={[
{
label: 'operation',
options: [{value: 'operation', label: 'operation'}],
},
]}
value="operation"
onSelectField={() => {}}
isDisabled={true}
/>
</div>

{/* Second column - Operator */}
<div className="w-[140px]">
<SelectField
options={[
{
label: 'equals',
options: [{value: 'equals', label: 'equals'}],
},
]}
value="equals"
onSelectField={() => {}}
isDisabled={true}
/>
</div>

{/* Third column - Value */}
<div className="w-full flex-grow">
<FormControl
fullWidth
sx={{borderColor: MOON_200, width: '100%', minWidth: 220}}>
<Autocomplete
PaperComponent={paperProps => <StyledPaper {...paperProps} />}
sx={{
width: '100%',
'& .MuiOutlinedInput-root': {
height: '32px',
width: '100%',
'& fieldset': {
borderColor: MOON_200,
},
'&:hover fieldset': {
borderColor: `rgba(${TEAL_300}, 0.48)`,
},
},
'& .MuiOutlinedInput-input': {
height: '32px',
padding: '0 14px',
boxSizing: 'border-box',
},
}}
size="small"
limitTags={1}
disabled={frozenOpFilter}
value={selectedOpVersionOption}
onChange={handleOperationChange}
renderInput={renderParams => (
<StyledTextField {...renderParams} fullWidth />
)}
getOptionLabel={option => opVersionOptions[option]?.title ?? ''}
disableClearable={
selectedOpVersionOption === ALL_TRACES_OR_CALLS_REF_KEY
}
groupBy={option => opVersionOptions[option]?.group}
options={Object.keys(opVersionOptions)}
popupIcon={<Icon name="chevron-down" />}
clearIcon={<Icon name="close" />}
/>
</FormControl>
</div>
</>
);
};

const operationItem = filter.opVersionRefs?.map(ref => ({
id: 'default-operation',
field: 'op',
operator: 'operation',
value: ref,
})) ?? [
{
id: 'default-operation',
field: 'op',
operator: 'operation',
value: ALL_TRACES_OR_CALLS_REF_KEY,
},
];

return (
<>
<div
Expand All @@ -266,7 +423,7 @@ export const FilterBar = ({
Filter
</div>
<VariableChildrenDisplay width={availableWidth} gap={8}>
{completeItems.map(f => (
{[...operationItem, ...completeItems].map(f => (
<FilterTagItem
key={f.id}
item={f}
Expand Down Expand Up @@ -309,6 +466,22 @@ export const FilterBar = ({
)}
</div>
</DraggableHandle>

{/* Default filters section */}
<div className="mb-8">
<div className="mb-2 text-sm text-moon-500">Default filters</div>
<div className="grid grid-cols-[190px_140px_1fr_30px] gap-4">
{renderOperationFilter()}
</div>
</div>

{/* Divider between default and custom filters */}
<div className="my-6 border-t border-moon-200"></div>

{/* AND text for custom filters */}
<div className="mb-2 text-sm text-moon-500">AND</div>

{/* Custom filters section */}
<div className="grid grid-cols-[auto_auto_auto_30px] gap-4">
{localFilterModel.items.map(item => (
<FilterRow
Expand All @@ -320,27 +493,26 @@ export const FilterBar = ({
onRemoveFilter={onRemoveFilter}
/>
))}
{localFilterModel.items.length === 0 && (
<FilterRow
item={{
id: undefined,
field: '',
operator: '',
value: undefined,
}}
options={options}
onAddFilter={onAddFilter}
onUpdateFilter={onUpdateFilter}
onRemoveFilter={onRemoveFilter}
/>
)}
</div>
{localFilterModel.items.length === 0 && (
<FilterRow
item={{
id: undefined,
field: '',
operator: '',
value: undefined,
}}
options={options}
onAddFilter={onAddFilter}
onUpdateFilter={onUpdateFilter}
onRemoveFilter={onRemoveFilter}
/>
)}
<div className="mt-8 flex items-center">
<Button
size="small"
variant="ghost"
icon="add-new"
disabled={localFilterModel.items.length === 0}
onClick={() => onAddFilter('')}>
Add filter
</Button>
Expand Down
17 changes: 17 additions & 0 deletions weave-js/src/components/PagePanelComponents/Home/Browse3/filters/FilterPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import {AdapterMoment} from '@mui/x-date-pickers/AdapterMoment';
import React from 'react';
import {AutoSizer} from 'react-virtualized';

import {WFHighLevelCallFilter} from '../pages/CallsPage/callsTableFilter';
import {OpVersionSchema} from '../pages/wfReactInterface/wfDataModelHooksInterface';
import {ColumnInfo} from '../types';
import {FilterBar} from './FilterBar';

Expand All @@ -17,6 +19,21 @@ type FilterPanelProps = {
columnInfo: ColumnInfo;
selectedCalls: string[];
clearSelectedCalls: () => void;

// op stuff
frozenFilter: WFHighLevelCallFilter | undefined;
filter: WFHighLevelCallFilter;
setFilter: (state: WFHighLevelCallFilter) => void;
selectedOpVersionOption: string;
opVersionOptions: Record<
string,
{
title: string;
ref: string;
group: string;
objectVersion?: OpVersionSchema;
}
>;
};

export const FilterPanel = (props: FilterPanelProps) => {
Expand Down
Loading