Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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) => (
Expand Down Expand Up @@ -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,
});
Expand Down Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -36,7 +37,7 @@ const MAX_BUCKETS = 60 * 1000;

export interface FindingsByResourceQuery {
pageIndex: Pagination['pageIndex'];
sortDirection: Sort<unknown>['direction'];
sort: Sort<CspFinding>;
}

type FindingsAggRequest = IKibanaSearchRequest<SearchRequest>;
Expand Down