-
Notifications
You must be signed in to change notification settings - Fork 33
fix: DH-21744: Fix Advanced Filters in Pivots #2624
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
Draft
vbabich
wants to merge
2
commits into
main
Choose a base branch
from
fix-pivot-advanced-filters
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+210
−109
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1141,6 +1141,136 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> { | |
| { max: 50 } | ||
| ); | ||
|
|
||
| /** | ||
| * Render an advanced filter menu element for a column | ||
| * @param columnIndex The visible column index (used as key and for handlers) | ||
| * @param modelColumn The model column index (used for filter/sort lookup) | ||
| * @param style CSS positioning for the menu container | ||
| * @param isShown Whether the menu is currently shown | ||
| * @returns The advanced filter menu element, or null if column not found | ||
| */ | ||
| renderAdvancedFilterMenu( | ||
| columnIndex: VisibleIndex, | ||
| modelColumn: ModelIndex, | ||
| style: CSSProperties, | ||
| isShown: boolean | ||
| ): ReactElement | null { | ||
| const { model } = this.props; | ||
| const { advancedFilters, formatter } = this.state; | ||
|
|
||
| const column = model.columns[modelColumn]; | ||
| if (column == null) { | ||
| log.warn( | ||
| `Column does not exist at index ${modelColumn} for column array of length ${model.columns.length}` | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| const advancedFilter = advancedFilters.get(modelColumn); | ||
| const { options: advancedFilterOptions } = advancedFilter || {}; | ||
| const sort = TableUtils.getSortForColumn(model.sort, column.name); | ||
| const sortDirection = sort ? sort.direction : TableUtils.sortDirection.none; | ||
|
|
||
| if (!isSortDirection(sortDirection)) { | ||
| throw new Error(`Invalid sort direction: ${sortDirection}`); | ||
| } | ||
|
|
||
| return ( | ||
| <div | ||
| key={columnIndex} | ||
| className="advanced-filter-menu-container" | ||
| style={style} | ||
| > | ||
| <Popper | ||
| className="advanced-filter-menu-popper" | ||
| onEntered={this.getAdvancedMenuOpenedHandler(columnIndex)} | ||
| onExited={() => { | ||
| this.handleAdvancedMenuClosed(columnIndex); | ||
| }} | ||
| isShown={isShown} | ||
| interactive | ||
| closeOnBlur | ||
| options={{ | ||
| positionFixed: true, | ||
| }} | ||
| > | ||
| {this.getCachedAdvancedFilterMenuActions( | ||
| model, | ||
| column, | ||
| advancedFilterOptions, | ||
| sortDirection, | ||
| formatter | ||
| )} | ||
| </Popper> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Renders the advanced filter button for a column in the filter bar. | ||
| * @param columnIndex The visible column index | ||
| * @param modelColumn The model column index | ||
| * @param buttonCoordinates The x,y coordinates for the button | ||
| * @returns The filter button element or null if not visible | ||
| */ | ||
| renderAdvancedFilterButton( | ||
| columnIndex: VisibleIndex, | ||
| modelColumn: ModelIndex, | ||
| buttonCoordinates: { x: number; y: number } | ||
| ): ReactElement | null { | ||
| const { advancedFilters, hoverAdvancedFilter, focusedFilterBarColumn } = | ||
| this.state; | ||
| const advancedFilter = advancedFilters.get(modelColumn); | ||
| const isFilterSet = advancedFilter != null; | ||
| const isFilterVisible = | ||
| columnIndex === hoverAdvancedFilter || | ||
| columnIndex === focusedFilterBarColumn || | ||
| isFilterSet; | ||
|
|
||
| if (!isFilterVisible) { | ||
| return null; | ||
| } | ||
|
|
||
| const { x, y } = buttonCoordinates; | ||
| const style: CSSProperties = { | ||
| position: 'absolute', | ||
| top: y, | ||
| left: x, | ||
| }; | ||
|
|
||
| return ( | ||
| <div | ||
| className="advanced-filter-button-container" | ||
| key={columnIndex} | ||
| style={style} | ||
| > | ||
| <Button | ||
| kind="ghost" | ||
| className={classNames('btn-link-icon advanced-filter-button', { | ||
| 'filter-set': isFilterSet, | ||
| })} | ||
| onClick={() => { | ||
| this.setState({ shownAdvancedFilter: columnIndex }); | ||
| }} | ||
| onContextMenu={event => { | ||
| this.grid?.handleContextMenu(event); | ||
| }} | ||
| onMouseEnter={() => { | ||
| this.setState({ hoverAdvancedFilter: columnIndex }); | ||
| }} | ||
| onMouseLeave={() => { | ||
| this.setState({ hoverAdvancedFilter: null }); | ||
| }} | ||
| > | ||
| <div className="fa-layers"> | ||
| <FontAwesomeIcon icon={dhFilterFilled} className="filter-solid" /> | ||
| <FontAwesomeIcon icon={vsFilter} className="filter-light" /> | ||
| </div> | ||
| </Button> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| getCachedOptionItems = memoize( | ||
| ( | ||
| isChartBuilderAvailable: boolean, | ||
|
|
@@ -2506,16 +2636,19 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> { | |
| } | ||
|
|
||
| focusFilterBar(column: VisibleIndex): void { | ||
| const { movedColumns } = this.state; | ||
| const { model } = this.props; | ||
| const { columnCount } = model; | ||
| const modelColumn = GridUtils.getModelIndex(column, movedColumns); | ||
| const modelColumn = this.getModelColumn(column); | ||
|
|
||
| if ( | ||
| // Negative indexes are valid as long as they have a model column | ||
| const isOutOfBounds = column >= 0 && columnCount <= column; | ||
| const isInvalid = | ||
| column == null || | ||
| columnCount <= column || | ||
| !model.isFilterable(modelColumn) | ||
| ) { | ||
| isOutOfBounds || | ||
| modelColumn == null || | ||
| !model.isFilterable(modelColumn); | ||
|
|
||
| if (isInvalid) { | ||
| this.setState({ focusedFilterBarColumn: null }); | ||
| return; | ||
| } | ||
|
|
@@ -4636,7 +4769,6 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> { | |
| loadingCancelShown, | ||
| loadingBlocksGrid, | ||
| shownColumnTooltip, | ||
| hoverAdvancedFilter, | ||
| shownAdvancedFilter, | ||
| hoverSelectColumn, | ||
| quickFilters, | ||
|
|
@@ -4793,7 +4925,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> { | |
| if (metrics && isFilterBarShown) { | ||
| const metricState = this.getMetricState(); | ||
|
|
||
| // Advanced Filter buttons | ||
| // Advanced Filter buttons for visible columns | ||
| const { visibleColumns } = metrics; | ||
|
|
||
| for (let i = 0; i < visibleColumns.length; i += 1) { | ||
|
|
@@ -4811,66 +4943,37 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> { | |
| ) | ||
| : null; | ||
| if (buttonCoordinates != null) { | ||
| const { x, y } = buttonCoordinates; | ||
| const style: CSSProperties = { | ||
| position: 'absolute', | ||
| top: y, | ||
| left: x, | ||
| }; | ||
| const advancedFilter = advancedFilters.get(modelColumn); | ||
| const isFilterSet = advancedFilter != null; | ||
| const isFilterVisible = | ||
| columnIndex === hoverAdvancedFilter || | ||
| columnIndex === focusedFilterBarColumn || | ||
| isFilterSet; | ||
| const element = ( | ||
| <div | ||
| className={classNames('advanced-filter-button-container', { | ||
| hidden: !isFilterVisible, | ||
| })} | ||
| key={columnIndex} | ||
| style={style} | ||
| > | ||
| {isFilterVisible && ( | ||
| <Button | ||
| kind="ghost" | ||
| className={classNames( | ||
| 'btn-link-icon advanced-filter-button', | ||
| { | ||
| 'filter-set': isFilterSet, | ||
| } | ||
| )} | ||
| onClick={() => { | ||
| this.setState({ shownAdvancedFilter: columnIndex }); | ||
| }} | ||
| onContextMenu={event => { | ||
| this.grid?.handleContextMenu(event); | ||
| }} | ||
| onMouseEnter={() => { | ||
| this.setState({ hoverAdvancedFilter: columnIndex }); | ||
| }} | ||
| onMouseLeave={() => { | ||
| this.setState({ hoverAdvancedFilter: null }); | ||
| }} | ||
| > | ||
| <div className="fa-layers"> | ||
| <FontAwesomeIcon | ||
| icon={dhFilterFilled} | ||
| className="filter-solid" | ||
| /> | ||
| <FontAwesomeIcon | ||
| icon={vsFilter} | ||
| className="filter-light" | ||
| /> | ||
| </div> | ||
| </Button> | ||
| )} | ||
| </div> | ||
| filterBar.push( | ||
| this.renderAdvancedFilterButton( | ||
| columnIndex, | ||
| modelColumn, | ||
| buttonCoordinates | ||
| ) | ||
| ); | ||
| filterBar.push(element); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Advanced filter buttons for columns at negative indexes | ||
| // Models can expose columns at negative indexes (e.g., model.columns[-1]) | ||
| for (let i = -1; model.columns[i] != null; i -= 1) { | ||
| if (!model.isFilterable(i)) { | ||
| // eslint-disable-next-line no-continue | ||
| continue; | ||
| } | ||
| const buttonCoordinates = metricState | ||
| ? metricCalculator.getAdvancedFilterButtonCoordinates( | ||
| i, | ||
| metricState, | ||
| metrics | ||
| ) | ||
| : null; | ||
| if (buttonCoordinates != null) { | ||
| filterBar.push( | ||
| this.renderAdvancedFilterButton(i, i, buttonCoordinates) | ||
| ); | ||
| } | ||
|
Comment on lines
+4957
to
+4975
|
||
| } | ||
| } | ||
| const advancedFilterMenus = []; | ||
| if (metrics) { | ||
|
|
@@ -4905,53 +5008,51 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> { | |
| }; | ||
| const modelColumn = this.getModelColumn(columnIndex); | ||
| if (modelColumn != null) { | ||
| const column = model.columns[modelColumn]; | ||
| if (column == null) { | ||
| // Grid metrics is likely out of sync with model | ||
| log.warn( | ||
| `Column does not exist at index ${modelColumn} for column array of length ${model.columns.length}` | ||
| ); | ||
| // eslint-disable-next-line no-continue | ||
| continue; | ||
| } | ||
| const advancedFilter = advancedFilters.get(modelColumn); | ||
| const { options: advancedFilterOptions } = advancedFilter || {}; | ||
| const sort = TableUtils.getSortForColumn(model.sort, column.name); | ||
|
|
||
| const sortDirection = sort ? sort.direction : null; | ||
| if (!isSortDirection(sortDirection)) { | ||
| throw new Error(`Invalid sort direction: ${sortDirection}`); | ||
| const element = this.renderAdvancedFilterMenu( | ||
| columnIndex, | ||
| modelColumn, | ||
| style, | ||
| shownAdvancedFilter === columnIndex | ||
| ); | ||
| if (element != null) { | ||
| advancedFilterMenus.push(element); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| const element = ( | ||
| <div | ||
| key={columnIndex} | ||
| className="advanced-filter-menu-container" | ||
| style={style} | ||
| > | ||
| <Popper | ||
| className="advanced-filter-menu-popper" | ||
| onEntered={this.getAdvancedMenuOpenedHandler(columnIndex)} | ||
| onExited={() => { | ||
| this.handleAdvancedMenuClosed(columnIndex); | ||
| }} | ||
| isShown={shownAdvancedFilter === columnIndex} | ||
| interactive | ||
| closeOnBlur | ||
| options={{ | ||
| positionFixed: true, | ||
| }} | ||
| > | ||
| {this.getCachedAdvancedFilterMenuActions( | ||
| model, | ||
| column, | ||
| advancedFilterOptions, | ||
| sortDirection, | ||
| formatter | ||
| )} | ||
| </Popper> | ||
| </div> | ||
| ); | ||
| // Handle advanced filter for column indexes not in visibleColumns | ||
| // Models can expose columns at negative indexes (e.g., model.columns[-1]) | ||
| // We always render Poppers so they can transition from isShown=false to isShown=true | ||
| const metricState = this.getMetricState(); | ||
| for (let i = -1; model.columns[i] != null; i -= 1) { | ||
| if (!model.isFilterable(i)) { | ||
| // eslint-disable-next-line no-continue | ||
| continue; | ||
| } | ||
| const filterCoords = | ||
| metricState != null | ||
| ? metricCalculator.getFilterInputCoordinates( | ||
| i, | ||
| metricState, | ||
| metrics | ||
| ) | ||
| : null; | ||
| if (filterCoords != null) { | ||
| const style: CSSProperties = { | ||
| position: 'absolute', | ||
| top: filterCoords.y, | ||
| left: filterCoords.x + filterCoords.width - 20, | ||
| width: 20, | ||
| height: filterCoords.height, | ||
| }; | ||
| const element = this.renderAdvancedFilterMenu( | ||
| i, | ||
| i, // modelColumn is same as columnIndex for negative indexes | ||
| style, | ||
| shownAdvancedFilter === i | ||
| ); | ||
| if (element != null) { | ||
| advancedFilterMenus.push(element); | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic for iterating over negative-index columns (
for (let i = -1; model.columns[i] != null; i -= 1)) is duplicated for both the filter-bar buttons and the popper menus. Consider extracting a small helper that yields the filterable negative indices (or caches them per-render) to keep the render method easier to maintain and reduce the chance of these paths diverging.