diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx index d1524669bbc..766089df8f8 100644 --- a/packages/grafana-ui/src/components/Table/Table.tsx +++ b/packages/grafana-ui/src/components/Table/Table.tsx @@ -14,7 +14,7 @@ import { useTable, } from 'react-table'; import { FixedSizeList } from 'react-window'; -import { getColumns } from './utils'; +import { getColumns, sortCaseInsensitive } from './utils'; import { useTheme } from '../../themes'; import { TableColumnResizeActionCallback, @@ -151,6 +151,9 @@ export const Table: FC = memo((props: Props) => { disableResizing: !resizable, stateReducer: stateReducer, initialState: getInitialState(initialSortBy, memoizedColumns), + sortTypes: { + 'alphanumeric-insensitive': sortCaseInsensitive, + }, }), [initialSortBy, memoizedColumns, memoizedData, resizable, stateReducer] ); diff --git a/packages/grafana-ui/src/components/Table/utils.ts b/packages/grafana-ui/src/components/Table/utils.ts index 7b4b9c89d88..16d825099df 100644 --- a/packages/grafana-ui/src/components/Table/utils.ts +++ b/packages/grafana-ui/src/components/Table/utils.ts @@ -63,7 +63,7 @@ export function getColumns(data: DataFrame, availableWidth: number, columnMinWid case FieldType.time: return 'basic'; default: - return 'alphanumeric'; + return 'alphanumeric-insensitive'; } }; @@ -204,3 +204,7 @@ export function getFilteredOptions(options: SelectableValue[], filterValues?: Se return options.filter((option) => filterValues.some((filtered) => filtered.value === option.value)); } + +export function sortCaseInsensitive(a: Row, b: Row, id: string) { + return String(a.values[id]).localeCompare(String(b.values[id]), undefined, { sensitivity: 'base' }); +}