diff --git a/changes/15253-sort-results-case-insensitively b/changes/15253-sort-results-case-insensitively new file mode 100644 index 0000000000..3862ebbbf0 --- /dev/null +++ b/changes/15253-sort-results-case-insensitively @@ -0,0 +1,2 @@ +* Sort query results and reports case insensitively, and default to sorting by the host display name +column diff --git a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTableConfig.tsx b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTableConfig.tsx index 1245f15ba1..78e65e38bf 100644 --- a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTableConfig.tsx +++ b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTableConfig.tsx @@ -59,6 +59,7 @@ const generateColumnConfigs = (rows: Record[]) => Filter: DefaultColumnFilter, // Component hides filter for last_fetched filterType: "text", disableSortBy: false, + sortType: "caseInsensitive", }; }); diff --git a/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx b/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx index a1fb6dd63d..e7e7c1807e 100644 --- a/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx +++ b/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx @@ -154,6 +154,7 @@ const QueryReport = ({ /> ); }} + defaultSortHeader="last_fetched" isLoading={false} isClientSidePagination isClientSideFilter diff --git a/frontend/pages/queries/details/components/QueryReport/QueryReportTableConfig.tsx b/frontend/pages/queries/details/components/QueryReport/QueryReportTableConfig.tsx index 4c9af9723b..ed526a261a 100644 --- a/frontend/pages/queries/details/components/QueryReport/QueryReportTableConfig.tsx +++ b/frontend/pages/queries/details/components/QueryReport/QueryReportTableConfig.tsx @@ -88,6 +88,7 @@ const generateReportColumnConfigsFromResults = (results: any[]): Column[] => { Filter: DefaultColumnFilter, // Component hides filter for last_fetched filterType: "text", disableSortBy: false, + sortType: "caseInsensitive", }; }); return _unshiftHostname(columnConfigs); diff --git a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx index d871253183..3056c3200f 100644 --- a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx +++ b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx @@ -198,6 +198,7 @@ const QueryResults = ({ return (