Skip to content
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.

Sign up for GitHub

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

[One Discover] Update log.level indicators color #202985

Merged
merged 10 commits into from
Dec 12, 2024
Merged

[One Discover] Update log.level indicators color #202985

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5fa3892
refactor(discover): update log.level color scheme fo v8.x
Dec 4, 2024
d95ad08
refactor(discover): update test
Dec 4, 2024
f35052d
Merge branch 'main' into 202258-update-loglevel-color
tonyghiani Dec 5, 2024
4852142
test(discover): remove duplicated color test assertions
Dec 5, 2024
44c1401
Merge branch '202258-update-loglevel-color' of github.com:tonyghiani/…
Dec 5, 2024
b9dcd3e
refactor(discover): update color palette
Dec 5, 2024
4305109
Merge branch 'main' into 202258-update-loglevel-color
tonyghiani Dec 11, 2024
a3b2504
style(discover): update token from vis palette
Dec 12, 2024
e1b08b9
Merge branch '202258-update-loglevel-color' of github.com:tonyghiani/…
Dec 12, 2024
94bb880
Merge branch 'main' into 202258-update-loglevel-color
tonyghiani Dec 12, 2024
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
12 changes: 6 additions & 6 deletions packages/kbn-discover-utils/src/data_types/logs/utils/get_log_level_color.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { LogLevelCoalescedValue } from './get_log_level_coalesed_value';

const euiTheme = {
colors: {
lightShade: '#ffffff',
mediumShade: '#d3dae6',
},
};

Expand All @@ -32,20 +32,20 @@ describe('getLogLevelColor', () => {
'#d6bf57'
);
expect(getLogLevelColor(LogLevelCoalescedValue.error, euiTheme as EuiThemeComputed)).toBe(
'#df9352'
'#e18774'
);
expect(getLogLevelColor(LogLevelCoalescedValue.critical, euiTheme as EuiThemeComputed)).toBe(
'#e7664c'
'#dd7b67'
);
expect(getLogLevelColor(LogLevelCoalescedValue.alert, euiTheme as EuiThemeComputed)).toBe(
'#da5e47'
'#d76f5b'
);
expect(getLogLevelColor(LogLevelCoalescedValue.emergency, euiTheme as EuiThemeComputed)).toBe(
'#cc5642'
'#d2634e'
);
// other
expect(getLogLevelColor(LogLevelCoalescedValue.trace, euiTheme as EuiThemeComputed)).toBe(
'#ffffff'
'#d3dae6'
);
});
});
21 changes: 15 additions & 6 deletions packages/kbn-discover-utils/src/data_types/logs/utils/get_log_level_color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import { EuiThemeComputed, euiPaletteForTemperature, euiPaletteForStatus } from '@elastic/eui';
import {
EuiThemeComputed,
euiPaletteForTemperature,
euiPaletteForStatus,
euiPaletteRed,
} from '@elastic/eui';
import { LogLevelCoalescedValue } from './get_log_level_coalesed_value';

export const getLogLevelColor = (
Expand All @@ -16,8 +21,11 @@ export const getLogLevelColor = (
): string | undefined => {
const euiPaletteForTemperature6 = euiPaletteForTemperature(6);
const euiPaletteForStatus9 = euiPaletteForStatus(9);
const euiPaletteRed9 = euiPaletteRed(14);

switch (logLevelCoalescedValue) {
case LogLevelCoalescedValue.trace:
return euiTheme.colors.mediumShade;
tonyghiani marked this conversation as resolved.
Show resolved Hide resolved
case LogLevelCoalescedValue.debug:
return euiPaletteForTemperature6[2]; // lighter, closer to the default color for all other unknown log levels
case LogLevelCoalescedValue.info:
Expand All @@ -27,15 +35,16 @@ export const getLogLevelColor = (
case LogLevelCoalescedValue.warning:
return euiPaletteForStatus9[4];
case LogLevelCoalescedValue.error:
return euiPaletteForStatus9[5];
return euiPaletteRed9[9];
case LogLevelCoalescedValue.critical:
return euiPaletteForStatus9[6];
return euiPaletteRed9[10];
case LogLevelCoalescedValue.alert:
return euiPaletteForStatus9[7];
return euiPaletteRed9[11];
case LogLevelCoalescedValue.emergency:
return euiPaletteRed9[12];
case LogLevelCoalescedValue.fatal:
return euiPaletteForStatus9[8];
return euiPaletteRed9[13];
default:
return euiTheme.colors.lightShade;
return euiTheme.colors.mediumShade;
}
};
15 changes: 0 additions & 15 deletions ...ional/test_suites/observability/discover/context_awareness/_get_row_indicator_provider.ts
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davismcphee I removed these assertions against the color because it make the test much more difficult to maintain (manual converting colors to rgba) and it is already unit tested in get_log_level_color.test.ts module.

Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const firstColorIndicator = await firstCell.findByTestSubject(
'unifiedDataTableRowColorIndicatorCell'
);
expect(await firstColorIndicator.getComputedStyle('background-color')).to.be(
'rgba(190, 207, 227, 1)'
);
expect(await firstColorIndicator.getAttribute('title')).to.be('Debug');
});

Expand All @@ -105,18 +102,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'unifiedDataTableRowColorIndicatorCell'
);
expect(await anchorColorIndicator.getAttribute('title')).to.be('Debug');
expect(await anchorColorIndicator.getComputedStyle('background-color')).to.be(
'rgba(190, 207, 227, 1)'
);

let nextCell = await dataGrid.getCellElement(1, 0);
let nextColorIndicator = await nextCell.findByTestSubject(
'unifiedDataTableRowColorIndicatorCell'
);
expect(await nextColorIndicator.getAttribute('title')).to.be('Error');
expect(await nextColorIndicator.getComputedStyle('background-color')).to.be(
'rgba(223, 147, 82, 1)'
);

await browser.refresh();
await PageObjects.header.waitUntilLoadingHasFinished();
Expand All @@ -127,18 +118,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'unifiedDataTableRowColorIndicatorCell'
);
expect(await anchorColorIndicator.getAttribute('title')).to.be('Debug');
expect(await anchorColorIndicator.getComputedStyle('background-color')).to.be(
'rgba(190, 207, 227, 1)'
);

nextCell = await dataGrid.getCellElement(1, 0);
nextColorIndicator = await nextCell.findByTestSubject(
'unifiedDataTableRowColorIndicatorCell'
);
expect(await nextColorIndicator.getAttribute('title')).to.be('Error');
expect(await nextColorIndicator.getComputedStyle('background-color')).to.be(
'rgba(223, 147, 82, 1)'
);
});
});
}