Skip to content

ui: Datagrid disabled sorting and filtering unnecessarily #4793

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

Open
aMayzner wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −10
Open

ui: Datagrid disabled sorting and filtering unnecessarily #4793

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
18 changes: 8 additions & 10 deletions ui/src/components/widgets/datagrid/datagrid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,8 @@ export class DataGrid implements m.ClassComponent<DataGridAttrs> {
const columnsAreMutable = !columns || !!attrs.onColumnsChanged;

// Filters are mutable if in uncontrolled mode, or controlled with callback
const filtersAreMutable = !filters || !!attrs.onFiltersChanged;
const filtersAreMutable =
!filters || !!attrs.onFiltersChanged || !!attrs.onFilterAdd;

// Determine if we're in pivot mode (has groupBy columns and not drilling down)
const isPivotMode =
Expand Down Expand Up @@ -1443,11 +1444,10 @@ export class DataGrid implements m.ClassComponent<DataGridAttrs> {
// Build menu items
const columnType = colInfo?.columnType;
const menuItems: m.Children[] = [
columnsAreMutable &&
renderSortMenuItems(sort, (direction) =>
this.updateSort(field, direction, attrs),
),
columnsAreMutable && m(MenuDivider),
renderSortMenuItems(sort, (direction) =>
this.updateSort(field, direction, attrs),
),
m(MenuDivider),
filtersAreMutable &&
m(FilterMenu, {
datasource,
Expand Down Expand Up @@ -1549,11 +1549,9 @@ export class DataGrid implements m.ClassComponent<DataGridAttrs> {
header: m(
GridHeaderCell,
{
sort: columnsAreMutable ? sort : undefined,
sort,
hintSortDirection: currentSortDirection,
onSort: columnsAreMutable
? (direction) => this.updateSort(colId, direction, attrs)
: undefined,
onSort: (direction) => this.updateSort(colId, direction, attrs),
menuItems,
subContent,
},
Expand Down
Loading