Skip to content

Commit 544fab8

Browse files
committed
🏗️ Hovedsøknad ligger på rot under /aap/soknad. Fjerner samtidig kode relatert til debug og gammel versjon av utlandssøknad
1 parent fc490af commit 544fab8

File tree

13 files changed

+150
-366
lines changed

13 files changed

+150
-366
lines changed

components/error/ErrorPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ErrorPage = ({ error, componentStack }: Props) => {
1313
Beklager, her har det skjedd noe galt. Vi har spart på svarene dine slik at du kan fortsette
1414
der du slapp senere.
1515
</p>
16-
<Link href="/standard" shallow={false}>
16+
<Link href="/" shallow={false}>
1717
Gå tilbake til søknad
1818
</Link>
1919
</div>

components/pageComponents/standard/Oppsummering/Oppsummering.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
1212
import * as yup from 'yup';
1313
import SoknadFormWrapper from 'components/SoknadFormWrapper/SoknadFormWrapper';
1414
import { goToNamedStep, useStepWizard } from 'context/stepWizardContextV2';
15-
import { StepNames } from 'pages/standard';
15+
import { StepNames } from 'pages';
1616
import { LucaGuidePanel } from '@navikt/aap-felles-innbygger-react';
1717
import { useFeatureToggleIntl } from 'hooks/useFeatureToggleIntl';
1818
import { slettLagretSoknadState } from 'context/soknadContextCommon';

pages/standard/[step].tsx pages/[step].tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import Oppsummering from 'components/pageComponents/standard/Oppsummering/Oppsum
4242
import { beskyttetSide } from 'auth/beskyttetSide';
4343
import { GetServerSidePropsResult, NextPageContext } from 'next';
4444
import { getAccessToken } from 'auth/accessToken';
45-
import { getSøker } from '../api/oppslag/soeker';
46-
import { lesBucket } from '../api/buckets/les';
45+
import { getSøker } from './api/oppslag/soeker';
46+
import { lesBucket } from './api/buckets/les';
4747
import { logSkjemaFullførtEvent, logSkjemastegFullførtEvent } from 'utils/amplitude';
4848
import { Alert, Link } from '@navikt/ds-react';
4949
import metrics from 'utils/metrics';
@@ -139,7 +139,7 @@ const Steps = ({ søker, mellomlagretSøknad }: PageProps) => {
139139

140140
const onPreviousStep = async () => {
141141
if (currentStep?.name === StepNames.STARTDATO) {
142-
router.push('/standard');
142+
router.push('/');
143143
} else {
144144
goToPreviousStep(stepWizardDispatch);
145145
}
@@ -272,7 +272,7 @@ const StepsWithContextProvider = ({ søker, mellomlagretSøknad }: PageProps) =>
272272
export const getServerSideProps = beskyttetSide(
273273
async (ctx: NextPageContext): Promise<GetServerSidePropsResult<{}>> => {
274274
const stopTimer = metrics.getServersidePropsDurationHistogram.startTimer({
275-
path: '/standard/[steg]',
275+
path: '/[steg]',
276276
});
277277
const { step } = ctx.query;
278278
const bearerToken = getAccessToken(ctx);
@@ -283,7 +283,7 @@ export const getServerSideProps = beskyttetSide(
283283
if (!mellomlagretSøknad?.lagretStepList) {
284284
return {
285285
redirect: {
286-
destination: '/standard',
286+
destination: '/',
287287
permanent: false,
288288
},
289289
};

pages/api/buckets/les.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { isLabs, isMock } from 'utils/environments';
88
import { getStringFromPossiblyArrayQuery } from 'utils/string';
99
import { SØKNAD_CONTEXT_VERSION } from 'context/soknadContextCommon';
1010
import { logger } from '@navikt/aap-felles-innbygger-utils';
11-
import { defaultStepList } from 'pages/standard';
11+
import { defaultStepList } from 'pages';
1212

1313
const handler = beskyttetApi(async (req: NextApiRequest, res: NextApiResponse) => {
1414
const type = getStringFromPossiblyArrayQuery(req.query.type);

pages/api/log/logerror.ts

-7
This file was deleted.

pages/api/log/sendtsoknad.ts

-7
This file was deleted.

pages/index.tsx

+141-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,146 @@
1-
import { Heading } from '@navikt/ds-react';
1+
import { Veiledning } from 'components/pageComponents/standard/Veiledning/Veiledning';
2+
import { useEffect, useRef, useState } from 'react';
3+
import { Navn, SøkerView } from 'context/sokerOppslagContext';
4+
import React from 'react';
5+
import { useRouter } from 'next/router';
6+
import { GetServerSidePropsResult, NextPageContext } from 'next/types';
7+
import { beskyttetSide } from 'auth/beskyttetSide';
8+
import { getAccessToken } from 'auth/accessToken';
9+
import { fetchPOST } from 'api/fetch';
10+
import { lesBucket } from 'pages/api/buckets/les';
11+
import { StepType } from 'components/StepWizard/Step';
12+
import { SØKNAD_CONTEXT_VERSION } from 'context/soknadContextCommon';
13+
import { isLabs } from 'utils/environments';
14+
import { logSkjemaStartetEvent } from 'utils/amplitude';
15+
import metrics from 'utils/metrics';
16+
import { scrollRefIntoView } from 'utils/dom';
17+
import { getSøkerUtenBarn } from 'pages/api/oppslag/soekerUtenBarn';
18+
import { Alert, Link } from '@navikt/ds-react';
19+
import { useFeatureToggleIntl } from 'hooks/useFeatureToggleIntl';
20+
interface PageProps {
21+
søker: {
22+
navn: Navn;
23+
};
24+
}
25+
26+
export enum StepNames {
27+
STARTDATO = 'STARTDATO',
28+
FASTLEGE = 'FASTLEGE',
29+
MEDLEMSKAP = 'MEDLEMSKAP',
30+
YRKESSKADE = 'YRKESSKADE',
31+
TILLEGGSOPPLYSNINGER = 'TILLEGGSOPPLYSNINGER',
32+
STUDENT = 'STUDENT',
33+
ANDRE_UTBETALINGER = 'ANDRE_UTBETALINGER',
34+
BARNETILLEGG = 'BARNETILLEGG',
35+
VEDLEGG = 'VEDLEGG',
36+
OPPSUMMERING = 'OPPSUMMERING',
37+
}
38+
export const defaultStepList = [
39+
{ stepIndex: 1, name: StepNames.STARTDATO, active: true },
40+
{ stepIndex: 2, name: StepNames.MEDLEMSKAP },
41+
{ stepIndex: 3, name: StepNames.YRKESSKADE },
42+
{ stepIndex: 4, name: StepNames.FASTLEGE },
43+
{ stepIndex: 5, name: StepNames.BARNETILLEGG },
44+
{ stepIndex: 6, name: StepNames.STUDENT },
45+
{ stepIndex: 7, name: StepNames.ANDRE_UTBETALINGER },
46+
{ stepIndex: 8, name: StepNames.TILLEGGSOPPLYSNINGER },
47+
{ stepIndex: 9, name: StepNames.VEDLEGG },
48+
{ stepIndex: 10, name: StepNames.OPPSUMMERING },
49+
];
50+
51+
const Introduksjon = ({ søker }: PageProps) => {
52+
const router = useRouter();
53+
const { formatMessage } = useFeatureToggleIntl();
54+
55+
const [isLoading, setIsLoading] = useState(false);
56+
const [hasError, setHasError] = useState(false);
57+
58+
const errorMessageRef = useRef(null);
59+
60+
const [soker, setSoker] = useState({});
61+
62+
useEffect(() => {
63+
if (søker?.navn) {
64+
const _søker: SøkerView = {
65+
fulltNavn: `${søker.navn.fornavn ?? ''} ${søker.navn.mellomnavn ?? ''} ${
66+
søker.navn.etternavn ?? ''
67+
}`,
68+
};
69+
setSoker(_søker);
70+
}
71+
}, [søker, setSoker]);
72+
73+
const startSoknad = async () => {
74+
setIsLoading(true);
75+
setHasError(false);
76+
logSkjemaStartetEvent();
77+
const result = await fetchPOST('/aap/soknad/api/buckets/lagre/?type=STANDARD', {
78+
type: 'STANDARD',
79+
version: SØKNAD_CONTEXT_VERSION,
80+
søknad: {},
81+
lagretStepList: defaultStepList,
82+
});
83+
if (!result.ok) {
84+
setIsLoading(false);
85+
setHasError(true);
86+
} else {
87+
router.push('/1');
88+
}
89+
};
90+
91+
useEffect(() => {
92+
if (hasError) {
93+
if (errorMessageRef?.current != null) scrollRefIntoView(errorMessageRef);
94+
}
95+
}, [hasError]);
296

3-
const Home = () => {
497
return (
5-
<Heading level="1" size="xlarge">
6-
Next app
7-
</Heading>
98+
<>
99+
<Alert variant={'error'}>
100+
{formatMessage('midlertidigAlertMelding', {
101+
// @ts-ignore
102+
a: (chunks: string[]) => (
103+
<Link target="_blank" href="https://tjenester.nav.no/soknadaap/app/start">
104+
{chunks}
105+
</Link>
106+
),
107+
})}
108+
</Alert>
109+
<Veiledning
110+
søker={soker}
111+
isLoading={isLoading}
112+
hasError={hasError}
113+
errorMessageRef={errorMessageRef}
114+
onSubmit={async () => {
115+
await startSoknad();
116+
}}
117+
/>
118+
</>
8119
);
9120
};
10121

11-
export default Home;
122+
export const getServerSideProps = beskyttetSide(
123+
async (ctx: NextPageContext): Promise<GetServerSidePropsResult<{}>> => {
124+
const stopTimer = metrics.getServersidePropsDurationHistogram.startTimer({ path: '/standard' });
125+
const bearerToken = getAccessToken(ctx);
126+
const søker = await getSøkerUtenBarn(bearerToken);
127+
const mellomlagretSøknad = await lesBucket('STANDARD', bearerToken);
128+
const activeStep = mellomlagretSøknad?.lagretStepList?.find((e: StepType) => e.active);
129+
const activeIndex = activeStep?.stepIndex;
130+
131+
stopTimer();
132+
if (activeIndex && !isLabs()) {
133+
return {
134+
redirect: {
135+
destination: `/${activeIndex}`,
136+
permanent: false,
137+
},
138+
};
139+
}
140+
return {
141+
props: { søker },
142+
};
143+
}
144+
);
145+
146+
export default Introduksjon;

pages/standard/kvittering.tsx pages/kvittering.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const KvitteringPage = ({ søker, søknader }: PageProps) => {
6161
export const getServerSideProps = beskyttetSide(
6262
async (ctx: NextPageContext): Promise<GetServerSidePropsResult<{}>> => {
6363
const stopTimer = metrics.getServersidePropsDurationHistogram.startTimer({
64-
path: '/standard/kvittering',
64+
path: '/kvittering',
6565
});
6666
const bearerToken = getAccessToken(ctx);
6767
const søknader = await getSøknader(bearerToken);

pages/standard/index.tsx

-146
This file was deleted.

0 commit comments

Comments
 (0)