github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(app): passing an initial table state overrides the default global filter state (#180)

release/2.25
LP B 2024-11-29 21:06:11 +01:00 committed by GitHub
parent 219c9593e0
commit d393529026
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/react/components/datatables/Datatable.tsx
View File

@ -125,12 +125,13 @@ export function Datatable<D extends DefaultType>({
pageIndex: page || 0, pageIndex: page || 0,
}, },
sorting: settings.sortBy ? [settings.sortBy] : [], sorting: settings.sortBy ? [settings.sortBy] : [],
...initialTableState,
globalFilter: { globalFilter: {
search: settings.search, search: settings.search,
...initialTableState.globalFilter, ...initialTableState.globalFilter,
}, },
...initialTableState,
}, },
defaultColumn: { defaultColumn: {
enableColumnFilter: false, enableColumnFilter: false,