Skip to content

Commit 8d46662

Browse files
authored
Merge pull request #1878 from jpuzz0/MTV-3523-isDarkTheme-error
[MTV-3523] [UI] Plan creation with Pre and Post hook fails with 'IsDarkTheme'
2 parents c1fd882 + e599676 commit 8d46662

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/components/VersionedCodeEditor/VersionedCodeEditor.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ type VersionedCodeEditorProps = {
1313
value: string | undefined;
1414
onChange: (encodedValue: string) => void;
1515
minHeight?: string;
16+
isDarkTheme?: boolean;
1617
};
1718

1819
// VersionedCodeEditor component that uses the appropriate CodeEditor based on OCP version
1920
// https://issues.redhat.com/browse/MTV-2918
2021
const VersionedCodeEditor: FC<VersionedCodeEditorProps> = ({
22+
isDarkTheme,
2123
minHeight = '20rem',
2224
onChange,
2325
value,
@@ -36,6 +38,7 @@ const VersionedCodeEditor: FC<VersionedCodeEditorProps> = ({
3638
if (isVersionGte(ocpVersion, OCP_VERSION_4_18)) {
3739
return (
3840
<PFCodeEditor
41+
isDarkTheme={isDarkTheme}
3942
language={PFLanguage.yaml}
4043
code={decodedValue}
4144
onChange={(val) => {

src/plans/create/steps/migration-hooks/AnsiblePlaybookField.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Controller } from 'react-hook-form';
33

44
import VersionedCodeEditor from '@components/VersionedCodeEditor/VersionedCodeEditor';
55
import { FormGroup, FormHelperText } from '@patternfly/react-core';
6+
import { useIsDarkTheme } from '@utils/hooks/useIsDarkTheme';
67
import { useForkliftTranslation } from '@utils/i18n';
78

89
import { useCreatePlanFormContext } from '../../hooks/useCreatePlanFormContext';
@@ -17,6 +18,7 @@ type AnsiblePlaybookFieldProps = {
1718
const AnsiblePlaybookField: FC<AnsiblePlaybookFieldProps> = ({ fieldId }) => {
1819
const { t } = useForkliftTranslation();
1920
const { control } = useCreatePlanFormContext();
21+
const isDarkTheme = useIsDarkTheme();
2022
const subFieldId = getHooksSubFieldId(fieldId, MigrationHookFieldId.AnsiblePlaybook);
2123

2224
return (

src/plans/details/tabs/Hooks/components/HooksCodeEditor.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { FormGroupWithHelpText } from '@components/common/FormGroupWithHelpText/
55
import SectionHeading from '@components/headers/SectionHeading';
66
import VersionedCodeEditor from '@components/VersionedCodeEditor/VersionedCodeEditor';
77
import { Form, HelperText, HelperTextItem, Switch, TextInput } from '@patternfly/react-core';
8+
import { useIsDarkTheme } from '@utils/hooks/useIsDarkTheme';
89
import { useForkliftTranslation } from '@utils/i18n';
910

1011
import { HOOK_FORM_FIELD_NAMES } from '../state/constants';
@@ -24,6 +25,7 @@ type HooksCodeEditorProps = {
2425
const HooksCodeEditor: FC<HooksCodeEditorProps> = ({ planEditable, type }) => {
2526
const { t } = useForkliftTranslation();
2627
const { control, register } = useFormContext<HookFormValues>();
28+
const isDarkTheme = useIsDarkTheme();
2729
const hookTypeLowercase = HookTypeLabelLowercase[type];
2830
const fieldIdPrefix = `${hookTypeLowercase}-hook`;
2931
const isPreHook = type === hookTypes.PreHook;
@@ -96,7 +98,6 @@ const HooksCodeEditor: FC<HooksCodeEditorProps> = ({ planEditable, type }) => {
9698
isDarkTheme={isDarkTheme}
9799
value={value ?? ''}
98100
onChange={onChange}
99-
isReadOnly={!planEditable}
100101
/>
101102
)}
102103
/>

0 commit comments

Comments
 (0)