Skip to content

Commit b2b5f46

Browse files
authored
Merge branch 'main' into ayolab/fix-ensure-table-selection-respect-applied-filters
2 parents 6d5e3d1 + 5013324 commit b2b5f46

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/components/Grid/GridTable.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ export const GridTable: GridTableWithRef = forwardRef(function AgGridToolbar<TDa
105105
rowData={data}
106106
alwaysShowVerticalScroll={true}
107107
onGridReady={loadDataAndSave}
108+
accentedSort={true}
108109
context={useMemo(
109110
() =>
110111
({

src/pages/common/table-selection.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const TableSelection: FunctionComponent<TableSelectionProps> = (props) => {
3838
{
3939
field: 'id',
4040
filter: true,
41-
sortable: true,
41+
initialSort: 'asc',
4242
tooltipField: 'id',
4343
flex: 1,
4444
},
@@ -81,6 +81,7 @@ const TableSelection: FunctionComponent<TableSelectionProps> = (props) => {
8181
onSelectionChanged={handleSelection}
8282
onFilterChanged={onFilterChanged}
8383
onGridReady={onGridReady}
84+
accentedSort={true}
8485
/>
8586
</Grid>
8687
</Grid>

src/pages/profiles/profiles-table.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ const ProfilesTable: FunctionComponent<ProfilesTableProps> = (props) => {
7373
trimInput: true,
7474
} as TextFilterParams<UserProfile>,
7575
tooltipField: 'name',
76+
initialSort: 'asc',
7677
},
7778
{
7879
field: 'allLinksValid',
@@ -104,10 +105,7 @@ const ProfilesTable: FunctionComponent<ProfilesTableProps> = (props) => {
104105
headerTooltip: intl.formatMessage({
105106
id: 'profiles.table.validity.description',
106107
}),
107-
sortable: true,
108108
filter: true,
109-
initialSortIndex: 1,
110-
initialSort: 'asc',
111109
},
112110
],
113111
[intl]

0 commit comments

Comments
 (0)