Skip to content

Commit bbe6219

Browse files
author
Sven Anders Robbestad
committed
merged with master
2 parents e708d9c + e051ae2 commit bbe6219

File tree

13 files changed

+103
-102
lines changed

13 files changed

+103
-102
lines changed

‎src/App.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ const App = (props: any) => {
2525
dispatch({ type: 'TEMA_SET', value: tema });
2626
getTemaObject(tema)
2727
.then(res => {
28-
let ytelse = '';
29-
ytelse = query.ytelse ? String(query.ytelse) : res.value;
28+
const ytelse = query.ytelse ? String(query.ytelse) : res.value;
3029
dispatch(setValgtYtelse(ytelse));
3130
setLoading(false);
3231
})

‎src/components/begrunnelse/begrunnelse.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ const Begrunnelse = (props: any) => {
6464
dispatch(postNewKlage(klageskjema));
6565
}
6666
}, [activeKlage, dispatch, activeBegrunnelse, activeDatoISO, datoalternativ, props.chosenVedtak, klageId]);
67-
useEffect( () => {
68-
setActiveBegrunnelse(activeKlage.fritekst)
69-
setDatoalternativ(activeKlageSkjema.datoalternativ)
67+
useEffect(() => {
68+
setActiveBegrunnelse(activeKlage.fritekst);
69+
setDatoalternativ(activeKlageSkjema.datoalternativ);
7070
if (activeKlageSkjema.vedtaksdatoobjekt) {
71-
setActiveDatoISO(toISOString(activeKlageSkjema.vedtaksdatoobjekt))
71+
setActiveDatoISO(toISOString(activeKlageSkjema.vedtaksdatoobjekt));
7272
}
73-
}, [activeKlage, activeKlageSkjema])
73+
}, [activeKlage, activeKlageSkjema]);
7474

7575
const INPUTDESCRIPTION =
7676
'Skriv inn hvilke endringer du ønsker i vedtaket, og beskriv hva du begrunner klagen med. Legg ved dokumenter som du mener kan være til støtte for klagen.';
@@ -108,7 +108,7 @@ const Begrunnelse = (props: any) => {
108108
console.log(response);
109109
dispatch({
110110
type: 'VEDLEGG_ADD_SUCCESS',
111-
value: { status: VEDLEGG_STATUS.OK, vedlegg: toVedleggProps(response.data) }
111+
value: { status: VEDLEGG_STATUS.OK, vedlegg: toVedleggProps(response) }
112112
});
113113
setVedleggLoading(false);
114114
})

‎src/components/begrunnelse/vedlegg.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from 'react';
22
import { VedleggProps } from '../../types/vedlegg';
3-
import File from 'forhandsvisningsfil';
3+
import File, { IFile } from 'forhandsvisningsfil';
44
import {
55
FlexWithSpacingContainer,
66
PaddingContainer,
@@ -23,8 +23,8 @@ const VedleggVisning = (props: Props) => {
2323
setSmallMobileMode(width.matches);
2424
});
2525

26-
const deleteVedlegg = (ifile: any) => {
27-
let deletedItem = props.vedlegg.find(v => v.vedlegg.id === ifile.id);
26+
const deleteVedlegg = (ifile: IFile) => {
27+
const deletedItem = props.vedlegg.find(v => v.vedlegg.id === ifile.id);
2828
if (deletedItem) {
2929
props.deleteAction(deletedItem);
3030
} else {

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,29 @@ const Vedleggtekst = styled.span`
1717
`;
1818

1919
const VedleggSummary = (props: Props) => {
20-
return (
21-
<div>
22-
{Array.from(props.vedlegg).map((vedlegg: VedleggProps, index: number) => {
23-
return (
24-
props.klage.id &&
25-
vedlegg.vedlegg.id && (
20+
const klageId = props.klage.id;
21+
if (typeof klageId === 'number') {
22+
return (
23+
<div>
24+
{Array.from(props.vedlegg)
25+
.filter(({ vedlegg: { id } }) => !!id)
26+
.map(({ vedlegg }) => (
2627
<div>
2728
<Lenke
2829
className="no-background-style"
29-
href={getVedleggUrl(props.klage.id, vedlegg.vedlegg.id)}
30+
href={getVedleggUrl(klageId, vedlegg.id)}
3031
target="_blank"
3132
rel="noopener noreferrer"
32-
key={index}
33+
key={vedlegg.id}
3334
>
34-
<Vedleggtekst>{vedlegg.vedlegg?.name}</Vedleggtekst>
35+
<Vedleggtekst>{vedlegg.name}</Vedleggtekst>
3536
</Lenke>
3637
</div>
37-
)
38-
);
39-
})}
40-
</div>
41-
);
38+
))}
39+
</div>
40+
);
41+
}
42+
return null;
4243
};
4344

4445
export default VedleggSummary;

‎src/mock-api/get/vedlegg.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { VedleggResponse } from '../../types/vedlegg';
22

33
export const okVedlegg: VedleggResponse = {
4-
message: 'OK'
4+
content: '',
5+
contentType: 'application/pdf',
6+
id: 0,
7+
klageId: 0,
8+
ref: '',
9+
sizeInBytes: 0,
10+
tittel: 'mock tittel'
511
};

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ const OppsummeringSkjemaPage = (props: any) => {
2727
const { activeKlage, activeVedlegg, person } = useSelector((state: Store) => state);
2828
const [loading, setIsLoading] = useState<boolean>(false);
2929
const history = useHistory();
30-
let finalizedDate = '';
3130

3231
useEffect(() => {
3332
window.scrollTo(0, 0);
@@ -44,8 +43,8 @@ const OppsummeringSkjemaPage = (props: any) => {
4443
finalizeKlage(activeKlage.id)
4544
.then(response => {
4645
console.log(response);
47-
finalizedDate = response.data.finalizedDate;
48-
history.push({ pathname: `/kvittering`, state: { finalizedDate: finalizedDate } });
46+
const finalizedDate = response.finalizedDate;
47+
history.push({ pathname: `/kvittering`, state: { finalizedDate } });
4948
setIsLoading(false);
5049
// TODO: Set success message
5150
})

‎src/services/baseService.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ const vedleggPostOptions = {
2121
}
2222
};
2323

24-
export async function get(resource: string) {
24+
export async function get<T>(resource: string): Promise<T> {
2525
let response = await axios.get(resource, getOptions);
2626
try {
27-
return await response.data;
27+
return response.data;
2828
} catch (error) {
2929
logError(error, 'Error from get call', { resource: resource });
3030
throw error;
3131
}
3232
}
3333

34-
export async function post(resource: string) {
34+
export async function post<T>(resource: string): Promise<T> {
3535
let response = await axios.post(resource, null, postOptions);
3636
try {
37-
return await response;
37+
return response.data;
3838
} catch (error) {
3939
logError(error, 'Error from post call', { resource: resource });
4040
throw error;
@@ -46,8 +46,7 @@ export async function postKlage(resource: string, item: Klage): Promise<Klage> {
4646
logInfo('Posting new klage', { klage: item });
4747
let response = await axios.post(resource, JSON.stringify(item), postOptions);
4848
try {
49-
let res = await response;
50-
return res.data;
49+
return response.data;
5150
} catch (error) {
5251
logError(error, 'Error from post klage call', { resource: resource, klage: item });
5352
throw error;
@@ -57,8 +56,7 @@ export async function postKlage(resource: string, item: Klage): Promise<Klage> {
5756
export async function putKlage(resource: string, item: Klage): Promise<Klage> {
5857
let response = await axios.put(resource, JSON.stringify(item), postOptions);
5958
try {
60-
let res = await response;
61-
return res.data;
59+
return response.data;
6260
} catch (error) {
6361
logError(error, 'Error from put klage call', { resource: resource, klage: item });
6462
throw error;
@@ -68,7 +66,7 @@ export async function putKlage(resource: string, item: Klage): Promise<Klage> {
6866
export async function postVedlegg(resource: string, vedlegg: FormData) {
6967
let response = await axios.post(resource, vedlegg, vedleggPostOptions);
7068
try {
71-
return await response;
69+
return response.data;
7270
} catch (error) {
7371
logError(error, 'Error from post vedlegg call', { resource: resource });
7472
throw error;
@@ -78,7 +76,7 @@ export async function postVedlegg(resource: string, vedlegg: FormData) {
7876
export async function deleteVedlegg(resource: string) {
7977
let response = await axios.delete(resource, getOptions);
8078
try {
81-
return await response;
79+
return response;
8280
} catch (error) {
8381
logError(error, 'Error from delete vedlegg call', { resource: resource });
8482
throw error;

‎src/services/fileService.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import * as baseService from './baseService';
22
import { getAddVedleggUrl, getDeleteVedleggUrl } from '../clients/apiUrls';
33
import { Vedlegg } from '../types/vedlegg';
44

5-
export const addVedleggToKlage = (id: number, vedlegg: FormData) => {
6-
return baseService.postVedlegg(getAddVedleggUrl(id), vedlegg);
7-
};
5+
export const addVedleggToKlage = (id: number, vedlegg: FormData) =>
6+
baseService.postVedlegg(getAddVedleggUrl(id), vedlegg);
87

9-
export const deleteVedlegg = (vedlegg: Vedlegg) => {
10-
return baseService.deleteVedlegg(getDeleteVedleggUrl(vedlegg.klageId, vedlegg.id));
11-
};
8+
export const deleteVedlegg = (vedlegg: Vedlegg) =>
9+
baseService.deleteVedlegg(getDeleteVedleggUrl(vedlegg.klageId, vedlegg.id));

‎src/services/klageService.tsx

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,28 @@ import {
99
} from '../clients/apiUrls';
1010
import { Klage } from '../types/klage';
1111

12-
export const getKlager = () => {
13-
return baseService.get(getKlagerUrl());
14-
};
12+
export const getKlager = () => baseService.get(getKlagerUrl());
1513

16-
export const postKlage = (klage: Klage) => {
17-
return baseService.postKlage(getAddKlageUrl(), klage);
18-
};
14+
export const postKlage = (klage: Klage) => baseService.postKlage(getAddKlageUrl(), klage);
1915

20-
export const putKlage = (klage: Klage) => {
21-
return baseService.putKlage(getKlageByIdUrl(klage.id!!), klage);
22-
};
16+
export const putKlage = (klage: Klage) => baseService.putKlage(getKlageByIdUrl(klage.id!!), klage);
2317

24-
export const getKlage = (klageId: number) => {
25-
return baseService.get(getKlageByIdUrl(klageId))
26-
}
18+
export const getKlage = (klageId: number) => baseService.get<Klage>(getKlageByIdUrl(klageId));
19+
20+
export const finalizeKlage = (klageId: number) => baseService.post<FinalizedKlage>(getFinalizeKlageUrl(klageId));
2721

28-
export const finalizeKlage = (klageId: number) => {
29-
return baseService.post(getFinalizeKlageUrl(klageId));
30-
};
22+
export const getJournalpostId = (klageId: number) => baseService.get<string>(getKlageJournalpostIdUrl(klageId));
3123

32-
export const getJournalpostId = (klageId: number) => {
33-
return baseService.get(getKlageJournalpostIdUrl(klageId));
34-
};
24+
export const getTemaObject = (temaKode: string) => baseService.get<TemaObject>(getTemaObjectUrl(temaKode));
3525

36-
export const getTemaObject = (temaKode: string) => {
37-
return baseService.get(getTemaObjectUrl(temaKode));
38-
};
26+
export const setReferrer = (referrer: string) => sessionStorage.setItem('referrer', referrer);
3927

40-
export const setReferrer = (referrer: string) => {
41-
sessionStorage.setItem('referrer', referrer);
42-
};
28+
export const getReferrer = () => sessionStorage.getItem('referrer') ?? '';
4329

44-
export const getReferrer = (): string => {
45-
return sessionStorage.getItem('referrer') ?? '';
46-
};
30+
interface TemaObject {
31+
value: string;
32+
}
33+
34+
interface FinalizedKlage {
35+
finalizedDate: string;
36+
}

‎src/store/reducer.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,16 @@ const reducer = (state = initialState, action: ActionTypes): Store => {
8888
...state,
8989
activeKlage: action.payload,
9090
activeKlageSkjema: { ...state.activeKlageSkjema, ...action.klageskjema, ...action.payload },
91-
klageId: (action.payload.id as unknown) as string
91+
klageId: action.payload.id?.toString() ?? initialState.klageId
9292
};
9393
case 'KLAGE_GET_SUCCESS':
9494
const incomingVedlegg = action.payload.vedlegg?.map(function (e): VedleggProps {
95-
return { status: VEDLEGG_STATUS.OK, vedlegg: toVedleggProps(e) };
95+
return {
96+
id: e.id.toString(),
97+
klageId: e.klageId,
98+
status: VEDLEGG_STATUS.OK,
99+
vedlegg: toVedleggProps(e)
100+
};
96101
});
97102

98103
return {
@@ -101,7 +106,7 @@ const reducer = (state = initialState, action: ActionTypes): Store => {
101106
activeKlageSkjema: klageTilKlageSkjema(action.payload),
102107
chosenYtelse: action.payload.ytelse,
103108
activeVedlegg: incomingVedlegg!!,
104-
klageId: (action.payload.id as unknown) as string
109+
klageId: action.payload.id?.toString() ?? initialState.klageId
105110
};
106111
case 'KLAGE_GET_ERROR':
107112
return { ...state, getKlageError: true };
@@ -111,7 +116,7 @@ const reducer = (state = initialState, action: ActionTypes): Store => {
111116
const vIndex = state.activeVedlegg.indexOf(action.value);
112117
return {
113118
...state,
114-
activeVedlegg: state.activeVedlegg.filter((_: any, index: number) => index !== vIndex)
119+
activeVedlegg: state.activeVedlegg.filter((_, index) => index !== vIndex)
115120
};
116121
case 'YTELSE_SET':
117122
return {

‎src/types/klage.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ export const klageSkjemaTilKlage = (klageskjema: KlageSkjema): Klage => {
6464
return result;
6565
};
6666

67-
let klage: Klage;
68-
klage = {
67+
return {
6968
id: klageskjema.id,
7069
fritekst: klageskjema.fritekst,
7170
tema: klageskjema.tema,
@@ -75,7 +74,6 @@ export const klageSkjemaTilKlage = (klageskjema: KlageSkjema): Klage => {
7574
vedlegg: klageskjema.vedlegg,
7675
referrer: klageskjema.referrer
7776
};
78-
return klage;
7977
};
8078

8179
export const klageTilKlageSkjema = (klage: Klage): KlageSkjema => {
@@ -92,21 +90,21 @@ export const klageTilKlageSkjema = (klage: Klage): KlageSkjema => {
9290
referrer: klage.referrer
9391
};
9492

95-
return klageSkjema
96-
}
93+
return klageSkjema;
94+
};
9795

9896
const getVedtaksDatoObjekt = (vedtak: string) => {
99-
if (vedtak.startsWith('Tidligere vedtak') && (vedtak !== 'Tidligere vedtak - Ingen dato satt')) {
100-
return dateStringToDate(vedtak.substr(19))
97+
if (vedtak.startsWith('Tidligere vedtak') && vedtak !== 'Tidligere vedtak - Ingen dato satt') {
98+
return dateStringToDate(vedtak.substr(19));
10199
}
102-
}
100+
};
103101

104102
const getDatoAlternativ = (vedtak: string) => {
105103
if (vedtak.startsWith('Tidligere vedtak')) {
106-
return 'Tidligere vedtak'
104+
return 'Tidligere vedtak';
107105
} else if (vedtak.startsWith('Siste vedtak')) {
108-
return 'Siste vedtak'
106+
return 'Siste vedtak';
109107
} else {
110-
return ''
108+
return '';
111109
}
112-
}
110+
};

0 commit comments

Comments
 (0)