-
Notifications
You must be signed in to change notification settings - Fork 8.5k
[SecuritySolution] Update severity colors for Borealis theme #206276
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
56c6463
update severity colors
angorayc 0a4b202
update unit tests
angorayc 9fc992a
fix types and code review
angorayc b2e083a
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine 4c4655c
fix types
angorayc 724abfa
fix types
angorayc 3837fbd
Merge branch 'severity-colors' of github.com:angorayc/kibana into sev…
angorayc 782cb55
Merge branch 'main' into severity-colors
angorayc fef4abc
review
angorayc c3c6bf9
check theme with euiTheme.themeName
angorayc d0074e9
revert unnecessary changes
angorayc 230dd46
revert unnecessary changes
angorayc d5add99
type error
angorayc f290de8
Merge branch 'main' of github.com:elastic/kibana into severity-colors
angorayc 7678e74
tests
angorayc c2b39f1
use hard coded serverity colors
angorayc e6aed26
Merge branch 'main' of github.com:elastic/kibana into severity-colors
angorayc b275cf5
unit tests
angorayc 3ae15b1
unit tests
angorayc 8fa94c3
update severity colors
angorayc 0b6a645
update comments
angorayc 4341caf
unit tests
angorayc 500c7a5
lint
angorayc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...tions/security/plugins/security_solution/public/common/utils/__mocks__/severity_colors.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import type { EuiThemeComputed } from '@elastic/eui'; | ||
|
|
||
| export const getMockEuiAmsterdamTheme = () => | ||
| ({ | ||
| themeName: 'EUI_THEME_AMSTERDAM', | ||
| } as EuiThemeComputed); | ||
|
|
||
| export const getMockEuiBorealisTheme = () => | ||
| ({ | ||
| themeName: 'EUI_THEME_BOREALIS', | ||
| } as EuiThemeComputed); |
67 changes: 67 additions & 0 deletions
67
...utions/security/plugins/security_solution/public/common/utils/risk_color_palette.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
| import { renderHook } from '@testing-library/react'; | ||
| import { getRiskSeverityColors, useRiskSeverityColors } from './risk_color_palette'; | ||
| import { useEuiTheme } from '@elastic/eui'; | ||
| import { getMockEuiAmsterdamTheme, getMockEuiBorealisTheme } from './__mocks__/severity_colors'; | ||
|
|
||
| jest.mock('@elastic/eui', () => ({ | ||
| useEuiTheme: jest.fn(), | ||
| })); | ||
|
|
||
| const EXPECTED_SEVERITY_COLOR_AMSTERDAM = { | ||
| low: '#54b399', | ||
| medium: '#f1d86f', | ||
| high: '#ff7e62', | ||
| critical: '#bd271e', | ||
| }; | ||
|
|
||
| const EXPECTED_SEVERITY_COLOR_BOREALIS = { | ||
| low: '#54B399', | ||
| medium: '#D6BF57', | ||
| high: '#DA8B45', | ||
| critical: '#E7664C', | ||
| } as const; | ||
|
|
||
| describe('risk_color_palette', () => { | ||
| const scenarios = [ | ||
| { | ||
| mockEuiTheme: getMockEuiAmsterdamTheme(), | ||
| themeName: 'Amsterdam', | ||
| expected: EXPECTED_SEVERITY_COLOR_AMSTERDAM, | ||
| }, | ||
| { | ||
| mockEuiTheme: getMockEuiBorealisTheme(), | ||
| themeName: 'Borealis', | ||
| expected: EXPECTED_SEVERITY_COLOR_BOREALIS, | ||
| }, | ||
| ]; | ||
|
|
||
| describe.each(scenarios)( | ||
| '$themeName: getRiskSeverityColors', | ||
| ({ mockEuiTheme, themeName, expected }) => { | ||
| it(`returns the correct colors for ${themeName} theme`, () => { | ||
| expect(getRiskSeverityColors(mockEuiTheme)).toEqual(expected); | ||
| }); | ||
| } | ||
| ); | ||
|
|
||
| describe.each(scenarios)( | ||
| '$themeName: useRiskSeverityColors', | ||
| ({ mockEuiTheme, themeName, expected }) => { | ||
| const useEuiThemeMock = useEuiTheme as jest.Mock; | ||
|
|
||
| it(`returns the correct colors for ${themeName} theme`, () => { | ||
| useEuiThemeMock.mockReturnValue({ | ||
| euiTheme: mockEuiTheme, | ||
| }); | ||
| const { result } = renderHook(() => useRiskSeverityColors()); | ||
| expect(result.current).toEqual(expected); | ||
| }); | ||
| } | ||
| ); | ||
| }); |
47 changes: 47 additions & 0 deletions
47
...k/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import type { EuiThemeComputed } from '@elastic/eui'; | ||
| import { useEuiTheme } from '@elastic/eui'; | ||
| import type { Severity } from '@kbn/securitysolution-io-ts-alerting-types'; | ||
| import { useMemo } from 'react'; | ||
| import { | ||
| RISK_COLOR_CRITICAL, | ||
| RISK_COLOR_HIGH, | ||
| RISK_COLOR_LOW, | ||
| RISK_COLOR_MEDIUM, | ||
| } from '../constants'; | ||
|
|
||
| // Temporary solution until we have a decision for color palette https://github.com/elastic/kibana/issues/203387 | ||
| export const SEVERITY_COLOR = { | ||
| low: '#54B399', | ||
| medium: '#D6BF57', | ||
| high: '#DA8B45', | ||
| critical: '#E7664C', | ||
| } as const; | ||
|
|
||
| const isAmsterdam = (euiThemeName: string) => { | ||
| return euiThemeName?.toLowerCase().includes('amsterdam'); | ||
| }; | ||
|
|
||
| export const getRiskSeverityColors = (euiTheme: EuiThemeComputed) => { | ||
| if (euiTheme && isAmsterdam(euiTheme.themeName)) { | ||
| return { | ||
| low: RISK_COLOR_LOW, | ||
| medium: RISK_COLOR_MEDIUM, | ||
| high: RISK_COLOR_HIGH, | ||
| critical: RISK_COLOR_CRITICAL, | ||
| }; | ||
| } | ||
| return SEVERITY_COLOR; | ||
| }; | ||
|
|
||
| export const useRiskSeverityColors = (): Record<Severity, string> => { | ||
| const { euiTheme } = useEuiTheme(); | ||
|
|
||
| return useMemo(() => getRiskSeverityColors(euiTheme), [euiTheme]); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could be worth writing some uni tests, even though this is basic, it is used in a few places. As least if someone makes a change by mistake, they will be reminded...