Skip to content

Commit 78e6f31

Browse files
cskrovcskrov
committed
Ignore PUT klage response
1 parent 46df02f commit 78e6f31

File tree

6 files changed

+39
-34
lines changed

6 files changed

+39
-34
lines changed

‎src/components/begrunnelse/begrunnelse.tsx

+18-16
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { Datovelger } from 'nav-datovelger';
2323
import NavFrontendSpinner from 'nav-frontend-spinner';
2424
import { Vedtak } from '../../types/vedtak';
2525
import { logError } from '../../utils/logger/frontendLogger';
26+
import { KlageSkjema } from '../../types/klage';
2627

2728
interface Props {
2829
ytelse: string;
@@ -35,20 +36,18 @@ const Begrunnelse = (props: Props) => {
3536
const dispatch = useDispatch();
3637
const { activeKlage, activeKlageSkjema, activeVedlegg } = useSelector((state: Store) => state);
3738

38-
const [activeBegrunnelse, setActiveBegrunnelse] = useState<string>(activeKlageSkjema.fritekst ?? '');
39-
const [activeDatoISO, setActiveDatoISO] = useState<string>(activeKlageSkjema.vedtak ?? '');
39+
const [activeBegrunnelse, setActiveBegrunnelse] = useState<string>(activeKlageSkjema.fritekst);
40+
const [activeDatoISO, setActiveDatoISO] = useState<string | null>(activeKlageSkjema.vedtak);
4041
const [datoalternativ, setDatoalternativ] = useState<DatoValg>(activeKlageSkjema.datoalternativ);
4142
const [vedleggLoading, setVedleggLoading] = useState<boolean>(false);
4243
const [vedleggFeilmelding, setVedleggFeilmelding] = useState<string>('');
4344
const [submitted, setSubmitted] = useState<boolean>(false);
4445

4546
useEffect(() => {
4647
setDatoalternativ(activeKlageSkjema.datoalternativ);
47-
if (activeKlageSkjema.vedtak !== null) {
48-
setActiveDatoISO(activeKlageSkjema.vedtak);
49-
}
48+
setActiveDatoISO(activeKlageSkjema.vedtak);
49+
setActiveBegrunnelse(activeKlageSkjema.fritekst);
5050
if (typeof activeKlage !== 'undefined') {
51-
setActiveBegrunnelse(activeKlage.fritekst);
5251
const klageId = activeKlage.id.toString();
5352
dispatch(setKlageId(klageId, activeKlage.tema, activeKlage.ytelse, activeKlage.saksnummer));
5453
}
@@ -111,20 +110,23 @@ const Begrunnelse = (props: Props) => {
111110
}
112111
};
113112

114-
const submitBegrunnelseOgDato = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
113+
const submitBegrunnelseOgDato = async (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
115114
event.preventDefault();
116115
setSubmitted(true);
117116
if (!validForm()) {
118117
return;
119118
}
120-
dispatch(
121-
updateKlage({
122-
...activeKlageSkjema,
123-
fritekst: activeBegrunnelse,
124-
datoalternativ: datoalternativ,
125-
vedtak: activeDatoISO
126-
})
127-
);
119+
const klageSkjema: KlageSkjema = {
120+
...activeKlageSkjema,
121+
fritekst: activeBegrunnelse,
122+
datoalternativ: datoalternativ,
123+
vedtak: activeDatoISO
124+
};
125+
dispatch({
126+
type: 'KLAGE_FORM_SET',
127+
klageSkjema
128+
});
129+
updateKlage(klageSkjema);
128130
props.next();
129131
};
130132

@@ -177,7 +179,7 @@ const Begrunnelse = (props: Props) => {
177179
<Element>Vedtaksdato (valgfritt)</Element>
178180
<Datovelger
179181
onChange={dateISO => setActiveDatoISO(dateISO ?? '')}
180-
valgtDato={activeDatoISO}
182+
valgtDato={activeDatoISO ?? undefined}
181183
visÅrVelger={true}
182184
avgrensninger={{
183185
maksDato: new Date().toISOString().substring(0, 10)

‎src/components/summary/vedtak-summary.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import React from 'react';
22
import { Normaltekst } from 'nav-frontend-typografi';
33
import InformationPointBox from '../general/information-point-box';
44
import { PointsFlexListContainer } from '../../styled-components/main-styled-components';
5-
import { Klage } from '../../types/klage';
5+
import { dateToVedtakText, KlageSkjema } from '../../types/klage';
66

77
interface Props {
8-
klage: Klage;
8+
klage: KlageSkjema;
99
}
1010

1111
const VedtakSummary = ({ klage }: Props) => (
1212
<PointsFlexListContainer>
1313
{getSaksnummer(klage.saksnummer)}
14-
<InformationPointBox header={'Vedtak'} info={<Normaltekst>{klage.vedtak}</Normaltekst>} />
14+
<InformationPointBox header={'Vedtak'} info={<Normaltekst>{dateToVedtakText(klage)}</Normaltekst>} />
1515
</PointsFlexListContainer>
1616
);
1717

‎src/pages/oppsummering-skjema-page/oppsummering-skjema-page.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface Props {
3030
}
3131

3232
const OppsummeringSkjemaPage = (props: Props) => {
33-
const { activeKlage, activeVedlegg, person } = useSelector((state: Store) => state);
33+
const { activeKlage, activeKlageSkjema, activeVedlegg, person } = useSelector((state: Store) => state);
3434
const [loading, setIsLoading] = useState<boolean>(false);
3535
const history = useHistory();
3636

@@ -114,13 +114,13 @@ const OppsummeringSkjemaPage = (props: Props) => {
114114
className="form-expand"
115115
tittel={<Undertittel>Opplysninger fra saken</Undertittel>}
116116
>
117-
<VedtakSummary klage={activeKlage} />
117+
<VedtakSummary klage={activeKlageSkjema} />
118118
</Ekspanderbartpanel>
119119
<ColoredLine color="#a2a1a1" />
120120

121121
<div className="simulate-expandable-box">
122122
<Undertittel>Begrunnelse i din klage</Undertittel>
123-
<Normaltekst className="p_wrap">{activeKlage.fritekst ?? ''}</Normaltekst>
123+
<Normaltekst className="p_wrap">{activeKlageSkjema.fritekst}</Normaltekst>
124124
</div>
125125

126126
<div className="simulate-expandable-box">

‎src/services/baseService.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ export async function postKlage(resource: string, klage: KlageDraft) {
5454

5555
export async function putKlage(resource: string, klage: Klage) {
5656
try {
57-
const response = await axios.put<Klage>(resource, JSON.stringify(klage), postOptions);
58-
return response.data;
57+
await axios.put<never>(resource, JSON.stringify(klage), postOptions);
5958
} catch (error) {
6059
logError(error, 'Error from put klage call', { resource: resource, klage: klage });
6160
throw error;

‎src/store/actions.ts

+7-10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ export type ActionTypes =
1616
type: 'CHECK_AUTH_SUCCESS';
1717
payload: Bruker;
1818
}
19+
| {
20+
type: 'KLAGE_FORM_SET';
21+
klageSkjema: KlageSkjema;
22+
}
1923
| {
2024
type: 'KLAGE_POST_SUCCESS';
2125
payload: Klage;
@@ -84,16 +88,9 @@ export function postNewKlage(klageSkjema: KlageSkjema) {
8488
}
8589

8690
export function updateKlage(klageSkjema: KlageSkjema) {
87-
return function (dispatch: Dispatch<ActionTypes>) {
88-
return putKlage(klageSkjemaToKlage(klageSkjema))
89-
.then(klage => {
90-
dispatch({ type: 'KLAGE_POST_SUCCESS', payload: klage, klageskjema: klageSkjema });
91-
setStorageContent(klage.id.toString(), klage.tema, klage.ytelse, klage.saksnummer);
92-
})
93-
.catch((err: AxiosError) => {
94-
logError(err, 'Update klage failed', { klageid: klageSkjema.id });
95-
});
96-
};
91+
return putKlage(klageSkjemaToKlage(klageSkjema)).catch((err: AxiosError) => {
92+
logError(err, 'Update klage failed', { klageid: klageSkjema.id });
93+
});
9794
}
9895

9996
export function getExistingKlage(klageId: string) {

‎src/store/reducer.ts

+7
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ const reducer = (state = initialState, action: ActionTypes): Store => {
8282
...state,
8383
loading: false
8484
};
85+
case 'KLAGE_FORM_SET':
86+
return {
87+
...state,
88+
chosenTema: action.klageSkjema.tema,
89+
chosenYtelse: action.klageSkjema.ytelse,
90+
activeKlageSkjema: action.klageSkjema
91+
};
8592
case 'KLAGE_POST_SUCCESS':
8693
return {
8794
...state,

0 commit comments

Comments
 (0)