Skip to content

Commit

Permalink
[8.x] [SecuritySolution] Fix EntitiesList 'name' column sor…
Browse files Browse the repository at this point in the history
…ting (#197225) (#197375)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[SecuritySolution] Fix EntitiesList 'name' column sorting
(#197225)](#197225)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Pablo
Machado","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-23T08:05:28Z","message":"[SecuritySolution]
Fix EntitiesList 'name' column sorting (#197225)\n\n##
Summary\r\n\r\nFix EntitiesList 'name' column
sorting.\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/04a745d8-bae0-4c33-8ff2-f37e8caf4108","sha":"72db703cd2bcedb8c93a442bb42fda5f8cdcc338","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","v9.0.0","Team:
SecuritySolution","Theme: entity_analytics","Feature:Entity
Analytics","Team:Entity
Analytics","v8.16.0","backport:version","v8.17.0"],"title":"[SecuritySolution]
Fix EntitiesList 'name' column
sorting","number":197225,"url":"https://github.com/elastic/kibana/pull/197225","mergeCommit":{"message":"[SecuritySolution]
Fix EntitiesList 'name' column sorting (#197225)\n\n##
Summary\r\n\r\nFix EntitiesList 'name' column
sorting.\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/04a745d8-bae0-4c33-8ff2-f37e8caf4108","sha":"72db703cd2bcedb8c93a442bb42fda5f8cdcc338"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197225","number":197225,"mergeCommit":{"message":"[SecuritySolution]
Fix EntitiesList 'name' column sorting (#197225)\n\n##
Summary\r\n\r\nFix EntitiesList 'name' column
sorting.\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/04a745d8-bae0-4c33-8ff2-f37e8caf4108","sha":"72db703cd2bcedb8c93a442bb42fda5f8cdcc338"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Pablo Machado <[email protected]>
  • Loading branch information
kibanamachine and machadoum authored Oct 23, 2024
1 parent dc1eb11 commit cb5cd2d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('EntitiesList', () => {
fireEvent.click(columnHeader);
expect(mockUseEntitiesListQuery).toHaveBeenCalledWith(
expect.objectContaining({
sortField: 'entity.displayName.keyword',
sortField: 'entity.name.text',
sortOrder: 'asc',
})
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const useEntitiesListColumns = (): EntitiesListColumns => {
width: '5%',
},
{
field: 'entity.displayName.keyword',
field: 'entity.name.text',
name: (
<FormattedMessage
id="xpack.securitySolution.entityAnalytics.entityStore.entitiesList.nameColumn.title"
Expand Down

0 comments on commit cb5cd2d

Please sign in to comment.