Skip to content

Commit

Permalink
fix. vtaoToggle får fint navn
Browse files Browse the repository at this point in the history
Co-authored-by: Magnus Rom <[email protected]>
Co-authored-by: Odd Andreas Sørsæther <[email protected]>
  • Loading branch information
3 people committed Jun 26, 2024
1 parent 8b4b783 commit ab62f10
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/AvtaleOversikt/Filtrering/TiltakstypeFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export type FiltreringMedBeslutterProps = { erBeslutter: boolean };
const TiltakstypeFilter: FunctionComponent<FiltreringMedBeslutterProps> = (props) => {
const { endreFilter, filtre } = useFilter();
const contex = useContext(FeatureToggleContext);
const variant = contex[Feature.VtaoTiltakToggle];
const vtaoAktivert = contex[Feature.VtaoTiltakToggle];

const alleTiltakstyperBeslutter: OptionProps[] = [
{ value: '', label: 'Alle' },
Expand All @@ -27,7 +27,7 @@ const TiltakstypeFilter: FunctionComponent<FiltreringMedBeslutterProps> = (props
{ value: 'SOMMERJOBB', label: 'Sommerjobb' },
{ value: 'MENTOR', label: 'Mentor' },
{ value: 'INKLUDERINGSTILSKUDD', label: 'Inkluderingstilskudd' },
variant ? { value: 'VTAO', label: 'VTA-oppfølging' } : null,
vtaoAktivert ? { value: 'VTAO', label: 'VTA-oppfølging' } : null,
].filter((x) => x !== null) as OptionProps[];

const tiltakstyper = props.erBeslutter ? alleTiltakstyperBeslutter : alleTiltakstyper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const OpprettAvtaleArbeidsgiver: FunctionComponent = () => {
const innloggetBruker = useContext(InnloggetBrukerContext);
const navigate = useNavigate();
const contex = useContext(FeatureToggleContext);
const variant = contex[Feature.VtaoTiltakToggle];
const vtaoAktivert = contex[Feature.VtaoTiltakToggle];

const [deltakerFnrFeil, setDeltakerFnrFeil, validerDeltakerFnr] = useValidering(
deltakerFnr,
Expand Down Expand Up @@ -146,7 +146,7 @@ const OpprettAvtaleArbeidsgiver: FunctionComponent = () => {
<RadioGroup legend="" className={cls.element('tiltakstype-wrapper')}>
{innloggetBruker.tilganger[valgtBedriftNr].map((tiltakType: TiltaksType, index: number) => {
// Ikke vis VTAO dersom feature toggle er avslått
if (tiltakType === 'VTAO' && !variant) {
if (tiltakType === 'VTAO' && !vtaoAktivert) {
return null;
}
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const TiltaksTypeRadioPanel: FunctionComponent<Props> = ({
const cls = BEMHelper(className);

const contex = useContext(FeatureToggleContext);
const variant = contex[Feature.VtaoTiltakToggle];
const vtaoAktivert = contex[Feature.VtaoTiltakToggle];

const tiltakvalg: Tiltaksvalg[] = [
'ARBEIDSTRENING',
Expand All @@ -52,7 +52,7 @@ const TiltaksTypeRadioPanel: FunctionComponent<Props> = ({
'VTAO',
].filter((tiltak) => {
if (tiltak === 'VTAO') {
return variant;
return vtaoAktivert;
}
return true;
}) as Tiltaksvalg[];
Expand Down

0 comments on commit ab62f10

Please sign in to comment.