diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js index 0fd88aaef5..87f82885da 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js @@ -174,7 +174,7 @@ export function Stage({ dragPreviewRef(getEmptyImage(), { captureDraggingState: false }); }, [dragPreviewRef, index]); - const { themeColorName } = colorField.value ? getStageColorByHex(colorField.value) : {}; + const { themeColorName } = getStageColorByHex(colorField.value) ?? {}; return ( diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js index b2f2e578fe..406812eb4a 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js @@ -19,18 +19,22 @@ const STAGES_FIXTURE = { index: 0, }; -const ComponentFixture = (props) => { +const ComponentFixture = ({ + // eslint-disable-next-line react/prop-types + stages = [ + { + color: STAGE_COLOR_DEFAULT, + name: 'something', + }, + ], + ...props +}) => { const store = configureStore([], [reducer]); const formik = useFormik({ enableReinitialize: true, initialValues: { - stages: [ - { - color: STAGE_COLOR_DEFAULT, - name: 'something', - }, - ], + stages, }, validateOnChange: false, }); @@ -96,4 +100,19 @@ describe('Admin | Settings | Review Workflow | Stage', () => { }) ).not.toBeInTheDocument(); }); + + it('should not crash on a custom color code', async () => { + const { getByRole } = setup({ + isOpen: true, + canDelete: false, + stages: [ + { + color: '#FF4945', + name: 'something', + }, + ], + }); + + expect(getByRole('textbox').value).toBe('something'); + }); }); diff --git a/packages/core/admin/ee/server/constants/default-stages.json b/packages/core/admin/ee/server/constants/default-stages.json index 2e52fbad56..57aec704eb 100644 --- a/packages/core/admin/ee/server/constants/default-stages.json +++ b/packages/core/admin/ee/server/constants/default-stages.json @@ -9,7 +9,7 @@ }, { "name": "In progress", - "color": "#FF4945" + "color": "#EE5E52" }, { "name": "Reviewed",