Skip to content

Commit eae3c1e

Browse files
authored
Fjerner gammel feature toggle for FRITEKST_REDIGERING (#7230)
1 parent 3685a3c commit eae3c1e

File tree

6 files changed

+22
-31
lines changed

6 files changed

+22
-31
lines changed

_mocks/featureToggles.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ export const featureTogglesFactory = () => [
55
{
66
key: 'FEATURE_TOGGLES_ENV',
77
value: process.env.VITE_FEATURE_TOGGLES_ENV,
8-
}
8+
},
99
];

packages/prosess-vedtak/src/components/FritekstBrevPanel.tsx

+21-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Alert, Heading } from '@navikt/ds-react';
22
import React, { useCallback } from 'react';
33
import { FormattedMessage, IntlShape, injectIntl } from 'react-intl';
4-
54
import { TextAreaFormik, TextFieldFormik } from '@fpsak-frontend/form';
65
import { VerticalSpacer } from '@fpsak-frontend/shared-components';
76
import { hasValidText, maxLength, minLength, required } from '@fpsak-frontend/utils';
@@ -11,17 +10,13 @@ import {
1110
kanHaManueltFritekstbrev,
1211
} from '@fpsak-frontend/utils/src/formidlingUtils';
1312
import { DokumentDataType } from '@k9-sak-web/types/src/dokumentdata';
14-
import { useContext } from 'react';
15-
1613
import InkluderKalenderCheckbox from './InkluderKalenderCheckbox';
17-
1814
import FritekstRedigering from './FritekstRedigering/FritekstRedigering';
19-
import styles from './vedtakForm.module.css';
20-
21-
import FeatureTogglesContext from '@k9-sak-web/gui/featuretoggles/FeatureTogglesContext.js';
2215
import { fieldnames } from '../konstanter';
2316
import { CustomFormikProps } from './brev/CustomFormikProps';
2417

18+
import styles from './vedtakForm.module.css';
19+
2520
const maxLength200 = maxLength(200);
2621
const maxLength100000 = maxLength(100000);
2722
const minLength3 = minLength(3);
@@ -58,7 +53,6 @@ const FritekstBrevPanel = ({
5853
setForhaandsvisningKlart,
5954
}: OwnProps) => {
6055
const { formatMessage } = intl;
61-
const featureToggles = useContext(FeatureTogglesContext);
6256
const kanRedigereFritekstbrev = kanHaManueltFritekstbrev(tilgjengeligeVedtaksbrev);
6357

6458
// useCallback to avoid re-initializing FritekstRedigering editorjs on every re-render of this component
@@ -76,13 +70,15 @@ const FritekstBrevPanel = ({
7670
<Heading className={styles.brevHeading} size="small" level="2">
7771
<FormattedMessage id="VedtakForm.Brev" />
7872
</Heading>
73+
7974
{!readOnly && harAutomatiskVedtaksbrev && (
8075
<div className={styles.brevAlertContainer} data-testid="harAutomatiskVedtaksbrev">
8176
<Alert variant="info" size="small">
8277
<FormattedMessage id="VedtakForm.AutomatiskBrev" />
8378
</Alert>
8479
</div>
8580
)}
81+
8682
{!readOnly && !harAutomatiskVedtaksbrev && (
8783
<div className={styles.brevAlertContainer} data-testid="harIkkeAutomatiskVedtaksbrev">
8884
<Alert variant="info" size="small">
@@ -91,27 +87,26 @@ const FritekstBrevPanel = ({
9187
</div>
9288
)}
9389

94-
{!featureToggles.FRITEKST_REDIGERING ||
95-
(!kanRedigereFritekstbrev && (
96-
<div className={readOnly ? '' : styles.brevFormContainer}>
97-
<TextFieldFormik
98-
name="overskrift"
99-
label={formatMessage({ id: 'VedtakForm.Overskrift' })}
100-
validate={[required, minLength3, maxLength200, hasValidText]}
101-
maxLength={200}
90+
{!kanRedigereFritekstbrev && (
91+
<div className={readOnly ? '' : styles.brevFormContainer}>
92+
<TextFieldFormik
93+
name="overskrift"
94+
label={formatMessage({ id: 'VedtakForm.Overskrift' })}
95+
validate={[required, minLength3, maxLength200, hasValidText]}
96+
maxLength={200}
97+
readOnly={readOnly}
98+
/>
99+
<div className={readOnly ? styles['textAreaContainer--readOnly'] : styles.textAreaContainer}>
100+
<TextAreaFormik
101+
name="brødtekst"
102+
label={formatMessage({ id: 'VedtakForm.Innhold' })}
103+
validate={[required, minLength3, maxLength100000, hasValidText]}
104+
maxLength={100000}
102105
readOnly={readOnly}
103106
/>
104-
<div className={readOnly ? styles['textAreaContainer--readOnly'] : styles.textAreaContainer}>
105-
<TextAreaFormik
106-
name="brødtekst"
107-
label={formatMessage({ id: 'VedtakForm.Innhold' })}
108-
validate={[required, minLength3, maxLength100000, hasValidText]}
109-
maxLength={100000}
110-
readOnly={readOnly}
111-
/>
112-
</div>
113107
</div>
114-
))}
108+
</div>
109+
)}
115110

116111
{kanRedigereFritekstbrev && formikProps.values.skalBrukeOverstyrendeFritekstBrev && (
117112
<div className={readOnly ? 'readOnly' : styles.manueltBrevFormContainer}>

packages/v2/gui/src/featuretoggles/FeatureToggles.ts

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export interface FeatureToggles {
77
TYPE_MEDISINSKE_OPPLYSNINGER_BREV: boolean; // Fjernast?
88
LOS_MARKER_BEHANDLING: boolean;
99
LOS_MARKER_BEHANDLING_SUBMIT: boolean;
10-
FRITEKST_REDIGERING: boolean;
1110
FIX_SOKNADSFRIST_KALENDER_OG_READONLY: boolean; // Fjernast?
1211
OPPLAERINGSPENGER: boolean; // Fjernast?
1312
SKJUL_AVSLUTTET_ARBEIDSGIVER: boolean; // Fjernast?

packages/v2/gui/src/featuretoggles/devFeatureToggles.ts

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export const devFeatureToggles = {
99
TYPE_MEDISINSKE_OPPLYSNINGER_BREV: true,
1010
LOS_MARKER_BEHANDLING: true,
1111
LOS_MARKER_BEHANDLING_SUBMIT: true,
12-
FRITEKST_REDIGERING: true,
1312
FIX_SOKNADSFRIST_KALENDER_OG_READONLY: true,
1413
NYE_NOKKELTALL: true,
1514
SKILL_UT_PRIVATPERSON: true,

packages/v2/gui/src/featuretoggles/prodFeatureToggles.ts

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export const prodFeatureToggles = {
88
TYPE_MEDISINSKE_OPPLYSNINGER_BREV: true,
99
LOS_MARKER_BEHANDLING: true,
1010
LOS_MARKER_BEHANDLING_SUBMIT: false,
11-
FRITEKST_REDIGERING: true,
1211
SKJUL_AVSLUTTET_ARBEIDSGIVER: false,
1312
OVERSTYR_BEREGNING: false,
1413
BRUK_V2_MELDINGER: true,

packages/v2/gui/src/featuretoggles/qFeatureToggles.ts

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export const qFeatureToggles = {
88
TYPE_MEDISINSKE_OPPLYSNINGER_BREV: true,
99
LOS_MARKER_BEHANDLING: true,
1010
LOS_MARKER_BEHANDLING_SUBMIT: true,
11-
FRITEKST_REDIGERING: true,
1211
SKJUL_AVSLUTTET_ARBEIDSGIVER: true,
1312
OVERSTYR_BEREGNING: true,
1413
BRUK_V2_MELDINGER: true,

0 commit comments

Comments
 (0)