diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx index 43f075fe68de6..219f7e88f26e3 100644 --- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx +++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx @@ -10,6 +10,7 @@ import { Route } from '@kbn/shared-ux-router'; import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { TrackApplicationView } from '@kbn/usage-collection-plugin/public'; +import { CspFinding } from '../../../../common/schemas/csp_finding'; import type { Evaluation } from '../../../../common/types'; import { FindingsSearchBar } from '../layout/findings_search_bar'; import * as TEST_SUBJECTS from '../test_subjects'; @@ -36,7 +37,7 @@ const getDefaultQuery = ({ query, filters, pageIndex: 0, - sortDirection: 'asc', + sort: { field: 'compliance_score' as keyof CspFinding, direction: 'asc' }, }); export const FindingsByResourceContainer = ({ dataView }: FindingsBaseProps) => ( @@ -73,7 +74,7 @@ const LatestFindingsByResource = ({ dataView }: FindingsBaseProps) => { * Page ES query result */ const findingsGroupByResource = useFindingsByResource({ - sortDirection: urlQuery.sortDirection, + sortDirection: urlQuery.sort.direction, query, enabled: !queryError, }); @@ -149,7 +150,7 @@ const LatestFindingsByResource = ({ dataView }: FindingsBaseProps) => { })} setTableOptions={setTableOptions} sorting={{ - sort: { field: 'compliance_score', direction: urlQuery.sortDirection }, + sort: { field: 'compliance_score', direction: urlQuery.sort.direction }, }} onAddFilter={(field, value, negate) => setUrlQuery({ diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts index 8589d40f5e069..d0253966bc87c 100644 --- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts +++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts @@ -18,6 +18,7 @@ import { SearchRequest, SearchResponse, } from '@elastic/elasticsearch/lib/api/types'; +import { CspFinding } from '../../../../common/schemas/csp_finding'; import { getBelongsToRuntimeMapping } from '../../../../common/runtime_mappings/get_belongs_to_runtime_mapping'; import { MAX_FINDINGS_TO_LOAD } from '../../../common/constants'; import { useKibana } from '../../../common/hooks/use_kibana'; @@ -36,7 +37,7 @@ const MAX_BUCKETS = 60 * 1000; export interface FindingsByResourceQuery { pageIndex: Pagination['pageIndex']; - sortDirection: Sort['direction']; + sort: Sort; } type FindingsAggRequest = IKibanaSearchRequest;