Skip to content

Commit 84c4d77

Browse files
fredrikpefredrikpe
committed
Merge branch 'main' into chore/arr-flate-api-client
2 parents 798572f + 22f3911 commit 84c4d77

File tree

80 files changed

+1634
-1568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1634
-1568
lines changed

‎frontend/arena-adapter-manager/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"@chakra-ui/react": "2.10.6",
1616
"@emotion/react": "11.14.0",
1717
"@emotion/styled": "11.14.0",
18-
"@rjsf/chakra-ui": "5.24.7",
19-
"@rjsf/core": "5.24.7",
20-
"@rjsf/utils": "5.24.7",
21-
"@rjsf/validator-ajv8": "5.24.7",
18+
"@rjsf/chakra-ui": "5.24.8",
19+
"@rjsf/core": "5.24.8",
20+
"@rjsf/utils": "5.24.8",
21+
"@rjsf/validator-ajv8": "5.24.8",
2222
"framer-motion": "12.4.10",
2323
"react": "19.0.0",
2424
"react-dom": "19.0.0",

‎frontend/arrangor-flate/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
"@axe-core/playwright": "4.10.1",
2525
"@mr/frontend-common": "workspace:*",
2626
"@hey-api/client-fetch": "0.8.3",
27-
"@navikt/aksel-icons": "7.17.1",
28-
"@navikt/ds-css": "7.17.1",
29-
"@navikt/ds-react": "7.17.1",
30-
"@navikt/ds-tailwind": "7.17.1",
27+
"@navikt/aksel-icons": "7.17.3",
28+
"@navikt/ds-css": "7.17.3",
29+
"@navikt/ds-react": "7.17.3",
30+
"@navikt/ds-tailwind": "7.17.3",
3131
"@navikt/nav-dekoratoren-moduler": "3.2.2",
3232
"@navikt/oasis": "3.7.0",
3333
"@react-router/express": "7.3.0",

‎frontend/frontend-common/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"dependencies": {
1010
"@hookform/resolvers": "4.1.3",
1111
"@mr/api-client-v2": "workspace:*",
12-
"@navikt/aksel-icons": "7.17.1",
13-
"@navikt/ds-css": "7.17.1",
14-
"@navikt/ds-react": "7.17.1",
12+
"@navikt/aksel-icons": "7.17.3",
13+
"@navikt/ds-css": "7.17.3",
14+
"@navikt/ds-react": "7.17.3",
1515
"@tanstack/react-query": "5.67.2",
1616
"classnames": "2.5.1",
1717
"debounce": "2.2.0",

‎frontend/mr-admin-flate/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"@hookform/resolvers": "4.1.3",
2626
"@mr/api-client-v2": "workspace:*",
2727
"@mr/frontend-common": "workspace:*",
28-
"@navikt/aksel-icons": "7.17.1",
29-
"@navikt/ds-css": "7.17.1",
30-
"@navikt/ds-react": "7.17.1",
31-
"@navikt/ds-tailwind": "7.17.1",
28+
"@navikt/aksel-icons": "7.17.3",
29+
"@navikt/ds-css": "7.17.3",
30+
"@navikt/ds-react": "7.17.3",
31+
"@navikt/ds-tailwind": "7.17.3",
3232
"@portabletext/react": "3.2.1",
3333
"@portabletext/types": "2.0.13",
3434
"@tailwindcss/vite": "4.0.13",

‎frontend/mr-admin-flate/src/api/tilsagn/useTilsagnTilAnnullering.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function useTilsagnTilAnnullering() {
1111
}: {
1212
id: string;
1313
aarsaker: TilsagnTilAnnulleringAarsak[];
14-
forklaring: string | undefined;
14+
forklaring: string | null;
1515
}) =>
1616
TilsagnService.tilAnnullering({
1717
path: { id },

‎frontend/mr-admin-flate/src/api/tilsagn/useTilsagnTilFrigjoring.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function useTilsagnTilFrigjoring() {
1111
}: {
1212
id: string;
1313
aarsaker: TilsagnTilAnnulleringAarsak[];
14-
forklaring: string | undefined;
14+
forklaring: string | null;
1515
}) =>
1616
TilsagnService.tilFrigjoring({
1717
path: { id },

‎frontend/mr-admin-flate/src/components/modal/AarsakerOgForklaringModal.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface Props<T> {
77
buttonLabel: string;
88
aarsaker: { label: string; value: T }[];
99
onClose: () => void;
10-
onConfirm: (data: { aarsaker: T[]; forklaring?: string }) => void;
10+
onConfirm: (data: { aarsaker: T[]; forklaring: string | null }) => void;
1111
}
1212

1313
interface ValidationErrors {
@@ -43,7 +43,7 @@ export function AarsakerOgForklaringModal<T>(props: Props<T>) {
4343
} else {
4444
onConfirm({
4545
aarsaker: valgteAarsaker,
46-
forklaring: forklaring || undefined,
46+
forklaring: forklaring || null,
4747
});
4848
}
4949
}

‎frontend/mr-admin-flate/src/components/utbetaling/DelutbetalingRow.tsx

+20-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { useBesluttDelutbetaling } from "@/api/utbetaling/useBesluttDelutbetaling";
22
import { formaterPeriodeSlutt, formaterPeriodeStart, tilsagnTypeToString } from "@/utils/Utils";
33
import {
4+
DelutbetalingStatus,
5+
Totrinnskontroll,
46
BesluttDelutbetalingRequest,
57
Besluttelse,
68
DelutbetalingDto,
@@ -18,30 +20,31 @@ import { AarsakerOgForklaringModal } from "../modal/AarsakerOgForklaringModal";
1820
import { DelutbetalingTag } from "./DelutbetalingTag";
1921

2022
interface Props {
23+
ansatt: NavAnsatt;
2124
tilsagn: TilsagnDto;
2225
delutbetaling: DelutbetalingDto;
23-
ansatt: NavAnsatt;
26+
opprettelse: Totrinnskontroll;
2427
}
2528

26-
export function DelutbetalingRow({ tilsagn, delutbetaling, ansatt }: Props) {
29+
export function DelutbetalingRow({ ansatt, tilsagn, delutbetaling, opprettelse }: Props) {
2730
const [avvisModalOpen, setAvvisModalOpen] = useState(false);
2831
const queryClient = useQueryClient();
2932

3033
const besluttMutation = useBesluttDelutbetaling(delutbetaling.id);
3134

3235
const kanBeslutte =
33-
delutbetaling.opprettelse.behandletAv !== ansatt.navIdent &&
34-
ansatt?.roller.includes(NavAnsattRolle.OKONOMI_BESLUTTER) &&
35-
delutbetaling.type === "DELUTBETALING_TIL_GODKJENNING";
36+
delutbetaling.status === DelutbetalingStatus.TIL_GODKJENNING &&
37+
ansatt.roller.includes(NavAnsattRolle.OKONOMI_BESLUTTER) &&
38+
opprettelse.behandletAv !== ansatt.navIdent;
3639

37-
const godkjentUtbetaling =
38-
delutbetaling.type === "DELUTBETALING_OVERFORT_TIL_UTBETALING" ||
39-
delutbetaling.type === "DELUTBETALING_UTBETALT";
40+
const godkjentUtbetaling = [DelutbetalingStatus.GODKJENT, DelutbetalingStatus.UTBETALT].includes(
41+
delutbetaling.status,
42+
);
4043

4144
function beslutt(body: BesluttDelutbetalingRequest) {
4245
besluttMutation.mutate(body, {
4346
onSuccess: () => {
44-
queryClient.invalidateQueries({ queryKey: ["utbetaling"] });
47+
return queryClient.invalidateQueries({ queryKey: ["utbetaling"] });
4548
},
4649
onError: (error: ProblemDetail) => {
4750
throw error;
@@ -50,29 +53,23 @@ export function DelutbetalingRow({ tilsagn, delutbetaling, ansatt }: Props) {
5053
}
5154

5255
function content() {
53-
if (delutbetaling.frigjorTilsagn && !godkjentUtbetaling)
56+
if (delutbetaling.frigjorTilsagn && !godkjentUtbetaling) {
5457
return (
5558
<Alert variant="warning">
5659
Når denne utbetalingen godkjennes av beslutter vil det ikke lenger være mulig å gjøre
5760
flere utbetalinger fra tilsagnet
5861
</Alert>
5962
);
60-
else if (godkjentUtbetaling)
63+
} else if (godkjentUtbetaling) {
6164
return (
6265
<HStack gap="4">
63-
<Metadata
64-
horizontal
65-
header="Behandlet av"
66-
verdi={delutbetaling.opprettelse.behandletAv}
67-
/>
68-
<Metadata
69-
horizontal
70-
header="Besluttet av"
71-
verdi={delutbetaling.opprettelse.besluttetAv}
72-
/>
66+
<Metadata horizontal header="Behandlet av" verdi={opprettelse.behandletAv} />
67+
<Metadata horizontal header="Besluttet av" verdi={opprettelse.besluttetAv} />
7368
</HStack>
7469
);
75-
else return null;
70+
} else {
71+
return null;
72+
}
7673
}
7774

7875
return (
@@ -93,7 +90,7 @@ export function DelutbetalingRow({ tilsagn, delutbetaling, ansatt }: Props) {
9390
</Table.DataCell>
9491
<Table.DataCell>{formaterNOK(delutbetaling.belop)}</Table.DataCell>
9592
<Table.DataCell>
96-
<DelutbetalingTag type={delutbetaling.type} />
93+
<DelutbetalingTag status={delutbetaling.status} />
9794
</Table.DataCell>
9895
<Table.DataCell>
9996
{kanBeslutte && (

‎frontend/mr-admin-flate/src/components/utbetaling/DelutbetalingTag.tsx

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
11
import { Tag } from "@navikt/ds-react";
2+
import { DelutbetalingStatus } from "@mr/api-client-v2";
23

34
interface Props {
4-
type:
5-
| "DELUTBETALING_UTBETALT"
6-
| "DELUTBETALING_OVERFORT_TIL_UTBETALING"
7-
| "DELUTBETALING_TIL_GODKJENNING"
8-
| "DELUTBETALING_AVVIST";
5+
status: DelutbetalingStatus;
96
}
107

11-
export function DelutbetalingTag({ type }: Props) {
8+
export function DelutbetalingTag({ status }: Props) {
129
const baseTagClasses = "min-w-[140px] text-center whitespace-nowrap";
1310

14-
switch (type) {
15-
case "DELUTBETALING_UTBETALT":
11+
switch (status) {
12+
case DelutbetalingStatus.UTBETALT:
1613
return (
1714
<Tag size="small" variant="success" className={baseTagClasses}>
1815
Utbetalt
1916
</Tag>
2017
);
21-
case "DELUTBETALING_OVERFORT_TIL_UTBETALING":
18+
case DelutbetalingStatus.GODKJENT:
2219
return (
2320
<Tag size="small" variant="warning" className={baseTagClasses}>
2421
Overført til utbetaling
2522
</Tag>
2623
);
27-
case "DELUTBETALING_TIL_GODKJENNING":
24+
case DelutbetalingStatus.TIL_GODKJENNING:
2825
return (
2926
<Tag size="small" variant="alt1" className={baseTagClasses}>
3027
Til godkjenning
3128
</Tag>
3229
);
33-
case "DELUTBETALING_AVVIST":
30+
case DelutbetalingStatus.RETURNERT:
3431
return (
3532
<Tag size="small" variant="error" className={baseTagClasses}>
3633
Returnert

‎frontend/mr-admin-flate/src/components/utbetaling/OpprettDelutbetalingRow.tsx

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
import { formaterPeriodeSlutt, formaterPeriodeStart, tilsagnTypeToString } from "@/utils/Utils";
2-
import { TilsagnDto, TilsagnStatus, Totrinnskontroll } from "@mr/api-client-v2";
2+
import {
3+
TilsagnDto,
4+
TilsagnStatus,
5+
Totrinnskontroll,
6+
DelutbetalingStatus,
7+
} from "@mr/api-client-v2";
38
import { Alert, Checkbox, Table, TextField } from "@navikt/ds-react";
49
import { useState } from "react";
510
import { AvvistAlert } from "@/pages/gjennomforing/tilsagn/AarsakerAlert";
611
import { DelutbetalingTag } from "./DelutbetalingTag";
712
import { formaterNOK } from "@mr/frontend-common/utils/utils";
813
import { TilsagnStatusTag } from "./TilsagnTag";
14+
import { NyDelutbetaling } from "@/pages/gjennomforing/utbetaling/UtbetalingPage";
915

1016
interface Props {
1117
id?: string;
1218
tilsagn: TilsagnDto;
1319
belop: number;
1420
frigjorTilsagn: boolean;
1521
opprettelse?: Totrinnskontroll;
16-
type?: string;
22+
status?: DelutbetalingStatus;
1723
kanRedigere: boolean;
18-
onDelutbetalingChange: (d: {
19-
id?: string;
20-
tilsagnId: string;
21-
belop: number;
22-
frigjorTilsagn: boolean;
23-
type?: string;
24-
}) => void;
24+
onDelutbetalingChange: (d: NyDelutbetaling) => void;
2525
}
2626

2727
export function OpprettDelutbetalingRow({
2828
id,
2929
tilsagn,
3030
belop,
3131
frigjorTilsagn,
32-
type,
32+
status,
3333
opprettelse,
3434
kanRedigere,
3535
onDelutbetalingChange,
@@ -47,9 +47,10 @@ export function OpprettDelutbetalingRow({
4747
tilsagnId: tilsagn.id,
4848
belop: belop,
4949
frigjorTilsagn: frigjorTilsagn,
50-
type: type,
50+
status: status,
5151
});
5252
}
53+
5354
const cellClass = error && "align-top";
5455
return (
5556
<Table.ExpandableRow
@@ -124,7 +125,7 @@ export function OpprettDelutbetalingRow({
124125
<Table.DataCell className={error && "align-top pt-2"} colSpan={2}>
125126
<>
126127
{opprettelse ? (
127-
<DelutbetalingTag type={"DELUTBETALING_AVVIST"} />
128+
<DelutbetalingTag status={DelutbetalingStatus.RETURNERT} />
128129
) : (
129130
<TilsagnStatusTag status={tilsagn.status} />
130131
)}

‎frontend/mr-admin-flate/src/components/utbetaling/UtbetalingerTable.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { compareByKey, formaterPeriodeSlutt, formaterPeriodeStart } from "@/utils/Utils";
2-
import { AdminUtbetalingStatus, UtbetalingKompakt } from "@mr/api-client-v2";
2+
import { UtbetalingDto, AdminUtbetalingStatus } from "@mr/api-client-v2";
33
import { formaterNOK } from "@mr/frontend-common/utils/utils";
44
import { SortState, Table } from "@navikt/ds-react";
55
import { TableColumnHeader } from "@navikt/ds-react/Table";
@@ -9,14 +9,14 @@ import { UtbetalingStatusTag } from "./UtbetalingStatusTag";
99
import { utbetalingTekster } from "@/components/utbetaling/UtbetalingTekster";
1010

1111
interface Props {
12-
utbetalinger: UtbetalingKompakt[];
12+
utbetalinger: UtbetalingDto[];
1313
}
1414

1515
interface ScopedSortState extends SortState {
16-
orderBy: keyof UtbetalingKompakt;
16+
orderBy: keyof UtbetalingDto;
1717
}
1818

19-
interface UtbetalingTabellData extends UtbetalingKompakt {
19+
interface UtbetalingTabellData extends UtbetalingDto {
2020
periodeStart: string;
2121
periodeSlutt: string;
2222
belop: number;

0 commit comments

Comments
 (0)