yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-30 19:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/review-workflow-1-normalize-color' into feature/review-workflow-1-normalize-color

Browse Source
This commit is contained in:
Marc-Roig 2023-05-02 11:14:21 +02:00
commit 94524dcbd1
No known key found for this signature in database
GPG Key ID: FB4E2C43A0BEE249
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js
View File

@ -172,7 +172,9 @@ export function Stage({
), ),
color: hex, color: hex,
})); }));
const colorValue = colorOptions.find(({ value }) => value === colorField.value.toLowerCase()); // TODO: the .toUpperCase() conversion can be removed once the hex code is normalized in
// the admin API
const colorValue = colorOptions.find(({ value }) => value === colorField.value.toUpperCase());
return ( return (
<Box ref={composedRef}> <Box ref={composedRef}>

2
packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
View File

@ -27,7 +27,7 @@ export function getStageColorByHex(hex) {
export function getAvailableStageColors() { export function getAvailableStageColors() {
return Object.entries(STAGE_COLORS).map(([themeColorName, name]) => ({ return Object.entries(STAGE_COLORS).map(([themeColorName, name]) => ({
hex: lightTheme.colors[themeColorName].toLowerCase(), hex: lightTheme.colors[themeColorName].toUpperCase(),
name, name,
})); }));
} }

2
packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/tests/colors.test.js
View File

@ -12,7 +12,7 @@ describe('Settings | Review Workflows | colors', () => {
name: expect.any(String), name: expect.any(String),
}); });
expect(color.hex).toBe(color.hex.toLowerCase()); expect(color.hex).toBe(color.hex.toUpperCase());
}); });
}); });