Skip to content

Commit

Permalink
fix: filter view state change initialized (onecx#592)
Browse files Browse the repository at this point in the history
* fix: dates are now using default comparator

* fix: fix lint

* fix: filter view state in interactive data view  initialized
  • Loading branch information
markuczy authored Nov 12, 2024
1 parent 137a2a1 commit d6df36a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ export class FilterViewComponent implements OnInit {
.sort((a, b) => columnIds.indexOf(a.valueColumnId) - columnIds.indexOf(b.valueColumnId))
})
)
this.componentStateChanged.emit({
filters: this.filters,
})
}

@ViewChild(OverlayPanel) panel!: OverlayPanel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,23 @@ export class InteractiveDataViewComponent implements OnInit, AfterContentInit {
)
}

let filterViewComponentState$: Observable<FilterViewComponentState | Record<string, never>> =
this.filterViewComponentState$
if (this.disableFilterView) {
filterViewComponentState$ = filterViewComponentState$.pipe(
startWith({
filters: this.filters,
})
)
}

combineLatest([
columnGroupSelectionComponentState$.pipe(timestamp()),
customGroupColumnSelectorComponentState$.pipe(timestamp()),
this.dataLayoutComponentState$.pipe(timestamp()),
dataListGridSortingComponentState$.pipe(timestamp()),
this.dataViewComponentState$.pipe(timestamp()),
this.filterViewComponentState$.pipe(timestamp()),
filterViewComponentState$.pipe(timestamp()),
])
.pipe(
map((componentStates) => {
Expand Down

0 comments on commit d6df36a

Please sign in to comment.