Skip to content
This repository has been archived by the owner on Sep 12, 2023. It is now read-only.

Redirect til Min side ved fortsett senere #1435

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions envSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const envSettings = () => {
const FRONTEND_API_PATH = process.env.FRONTEND_API_PATH;
const FRONTEND_VEDLEGG_URL = process.env.FRONTEND_VEDLEGG_URL;
const LOGIN_URL = process.env.LOGIN_URL;
const MINSIDE_URL = process.env.MINSIDE_URL;
const PUBLIC_PATH = process.env.PUBLIC_PATH;
const UTILGJENGELIG = process.env.UTILGJENGELIG;
const NYNORSK = process.env.NYNORSK;
Expand All @@ -30,6 +31,7 @@ const envSettings = () => {
FRONTEND_API_PATH: '${FRONTEND_API_PATH}',
FRONTEND_VEDLEGG_URL:'${FRONTEND_VEDLEGG_URL}',
LOGIN_URL: '${LOGIN_URL}',
MINSIDE_URL: '${MINSIDE_URL}',
PUBLIC_PATH: '${PUBLIC_PATH}',
UTILGJENGELIG: '${UTILGJENGELIG}',
NYNORSK: '${NYNORSK}',
Expand Down
1 change: 1 addition & 0 deletions nais/dev-gcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"PUBLIC_PATH": "/familie/sykdom-i-familien/soknad/pleiepenger",
"LOGIN_URL": "https://pleiepengesoknad.intern.dev.nav.no/oauth2/login?redirect=/familie/sykdom-i-familien/soknad/pleiepenger/soknad",
"INNSYN_URL": "https://sif-innsyn.intern.dev.nav.no/familie/sykdom-i-familien/soknad/innsyn/",
"MINSIDE_URL": "https://www.intern.dev.nav.no/minside",
"NYNORSK": "on",
"INNSYN": "on",
"UTILGJENGELIG": "off",
Expand Down
1 change: 1 addition & 0 deletions nais/prod-gcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"PUBLIC_PATH": "/familie/sykdom-i-familien/soknad/pleiepenger",
"LOGIN_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/pleiepenger/oauth2/login?redirect=/familie/sykdom-i-familien/soknad/pleiepenger/soknad",
"INNSYN_URL": "https://www.nav.no/familie/sykdom-i-familien/soknad/innsyn/",
"MINSIDE_URL": "https://www.nav.no/minside",
"NYNORSK": "off",
"INNSYN": "on",
"TOGGLE_BEKREFT_OMSORG": "off",
Expand Down
2 changes: 1 addition & 1 deletion src/app/i18n/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"avbrytSøknadDialog.tittel": "Avbryt og slett søknad",
"fortsettSøknadSenereDialog.avbrytSøknadLabel": "Ja, fortsett senere",
"fortsettSøknadSenereDialog.fortsettSøknadLabel": "Nei",
"fortsettSøknadSenereDialog.intro": "Når du vil fortsette, finner du igjen søknaden på «Min side» under «Dine pleiepenger».",
"fortsettSøknadSenereDialog.intro": "Når du vil fortsette, finner du igjen utkast til denne søknaden på «Min side».",
"fortsettSøknadSenereDialog.spørsmål": "Vil du avslutte nå og fortsette senere?",
"fortsettSøknadSenereDialog.tittel": "Avslutt og fortsett senere",

Expand Down
4 changes: 2 additions & 2 deletions src/app/søknad/SøknadFormStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Knapp } from 'nav-frontend-knapper';
import { purge } from '../api/api';
import { getSøknadStepConfig } from './søknadStepsConfig';
import { SøknadFormValues } from '../types/SøknadFormValues';
import { relocateToDinePleiepenger, relocateToSoknad } from '../utils/navigationUtils';
import { relocateToMinSide, relocateToSoknad } from '../utils/navigationUtils';
import { getStepTexts } from '../utils/stepUtils';
import SøknadFormComponents from './SøknadFormComponents';
import InvalidStepPage from '../pages/invalid-step-page/InvalidStepPage';
Expand Down Expand Up @@ -56,7 +56,7 @@ const SøknadFormStep = (props: Props) => {
const prevStep = stepConfig[id].prevStep;
await persistSoknad({ stepID: prevStep });
await logHendelse(ApplikasjonHendelse.fortsettSenere);
relocateToDinePleiepenger();
relocateToMinSide();
};

if (stepConfig === undefined || stepConfig[id] === undefined || stepConfig[id].included === false) {
Expand Down
2 changes: 1 addition & 1 deletion src/app/utils/navigationUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const navigateToSoknadStep = (step: StepID, history: History): void => hi
export const relocateToLoginPage = (): void => relocateTo(getEnvironmentVariable('LOGIN_URL'));
export const relocateToNavFrontpage = (): void => relocateTo('https://www.nav.no/');
export const relocateToSoknad = (): void => relocateTo(getRouteUrl(RouteConfig.SØKNAD_ROUTE_PREFIX));
export const relocateToDinePleiepenger = (): void => relocateTo(getEnvironmentVariable('INNSYN_URL'));
export const relocateToMinSide = (): void => relocateTo(getEnvironmentVariable('MINSIDE_URL'));

export const navigateToErrorPage = (history: History): void => {
navigateTo(RouteConfig.ERROR_PAGE_ROUTE, history);
Expand Down