github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.8] [Cloud Security][Bug Fix] Fix for sorting issue on Posture score column on Group by resources findings table (#156938) (#157001)

Browse source 
# Backport

This will backport the following commits from `main` to `8.8`:
- [[Cloud Security][Bug Fix] Fix for sorting issue on Posture score
column on Group by resources findings table
(#156938)](https://github.com/elastic/kibana/pull/156938)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Rickyanto
Ang","email":"rickyangwyn@gmail.com"},"sourceCommit":{"committedDate":"2023-05-08T14:15:44Z","message":"[Cloud
Security][Bug Fix] Fix for sorting issue on Posture score column on
Group by resources findings table (#156938)\n\n## Summary\r\n\r\nThis PR
is for fixing the issue we have with sorting on posture score\r\ncolumn
on Group by resources findings table where clicking on the
column\r\ndoesn't do anything\r\n\r\n##
Before\r\n\r\n\r\nhttps://user-images.githubusercontent.com/8703149/236698942-04799955-1d2d-4bb8-931c-0ef1589b92f3.mov\r\n\r\n##
After\r\n\r\n\r\n\r\nhttps://user-images.githubusercontent.com/8703149/236698949-381d4264-54f9-4639-b541-2fb6fec2dbfa.mov","sha":"a92782cb18a33822616d0f95a32bd1b2c5bf7bbb","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Cloud
Security","v8.8.0","v8.9.0"],"number":156938,"url":"https://github.com/elastic/kibana/pull/156938","mergeCommit":{"message":"[Cloud
Security][Bug Fix] Fix for sorting issue on Posture score column on
Group by resources findings table (#156938)\n\n## Summary\r\n\r\nThis PR
is for fixing the issue we have with sorting on posture score\r\ncolumn
on Group by resources findings table where clicking on the
column\r\ndoesn't do anything\r\n\r\n##
Before\r\n\r\n\r\nhttps://user-images.githubusercontent.com/8703149/236698942-04799955-1d2d-4bb8-931c-0ef1589b92f3.mov\r\n\r\n##
After\r\n\r\n\r\n\r\nhttps://user-images.githubusercontent.com/8703149/236698949-381d4264-54f9-4639-b541-2fb6fec2dbfa.mov","sha":"a92782cb18a33822616d0f95a32bd1b2c5bf7bbb"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/156938","number":156938,"mergeCommit":{"message":"[Cloud
Security][Bug Fix] Fix for sorting issue on Posture score column on
Group by resources findings table (#156938)\n\n## Summary\r\n\r\nThis PR
is for fixing the issue we have with sorting on posture score\r\ncolumn
on Group by resources findings table where clicking on the
column\r\ndoesn't do anything\r\n\r\n##
Before\r\n\r\n\r\nhttps://user-images.githubusercontent.com/8703149/236698942-04799955-1d2d-4bb8-931c-0ef1589b92f3.mov\r\n\r\n##
After\r\n\r\n\r\n\r\nhttps://user-images.githubusercontent.com/8703149/236698949-381d4264-54f9-4639-b541-2fb6fec2dbfa.mov","sha":"a92782cb18a33822616d0f95a32bd1b2c5bf7bbb"}}]}]
BACKPORT-->

Co-authored-by: Rickyanto Ang <rickyangwyn@gmail.com>
This commit is contained in:
Kibana Machine 2023-05-08 11:26:25 -04:00 • committed by GitHub
parent ff9fcc09c3
commit d99df38574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
View file

@ -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({

3
x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts
View file

@ -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<unknown>['direction'];
sort: Sort<CspFinding>;
}
type FindingsAggRequest = IKibanaSearchRequest<SearchRequest>;