Ny fradrag

src/api/utbetalingApi.ts

@@ -0,0 +1,7 @@
+import { Utbetaling } from '~types/Utbetaling';
+
+import apiClient, { ApiClientResult } from './apiClient';
+
+export async function stansUtbetalinger(sakId: string): Promise<ApiClientResult<Utbetaling>> {
+    return apiClient({ url: `/saker/${sakId}/utbetalinger/stans`, method: 'POST' });
+}

src/assets/Icons.tsx

@@ -88,3 +88,11 @@ export const PencilIcon = (props: { width: string; height: string }) => (
         </g>
     </svg>
 );
+
+export const TrashBin = (props: { width: string; height: string }) => (
+    <svg xmlns="http://www.w3.org/2000/svg" width={props.width} height={props.height} viewBox="0 0 24 24">
+        <g stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeMiterlimit="10" fill="none">
+            <path d="M3.516 3.5h16v20h-16zM7.516.5h8v3h-8zM1.016 3.5h22M7.516 7v12M11.516 7v12M15.516 7v12" />
+        </g>
+    </svg>
+);

src/features/saksoversikt/sak.slice.ts

@@ -1,9 +1,10 @@
 import * as RemoteData from '@devexperts/remote-data-ts';
-import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 
-import { ErrorCode, ApiError } from '~api/apiClient';
+import { ApiError, ErrorCode } from '~api/apiClient';
 import * as behandlingApi from '~api/behandlingApi';
 import * as sakApi from '~api/sakApi';
+import * as utbetalingApi from '~api/utbetalingApi';
 import { pipe } from '~lib/fp';
 import { handleAsyncThunk, simpleRejectedActionToRemoteData } from '~redux/utils';
 import { Behandling } from '~types/Behandling';
@@ -12,6 +13,7 @@ import { UtledetSatsInfo } from '~types/Beregning';
 import { Fradrag } from '~types/Fradrag';
 import { Sak } from '~types/Sak';
 import { Sats } from '~types/Sats';
+import { Utbetaling } from '~types/Utbetaling';
 import { Vilkårtype, VilkårVurderingStatus } from '~types/Vilkårsvurdering';
 
 export const fetchSak = createAsyncThunk<Sak, { fnr: string } | { sakId: string }, { rejectValue: ApiError }>(
@@ -25,6 +27,17 @@ export const fetchSak = createAsyncThunk<Sak, { fnr: string } | { sakId: string
     }
 );
 
+export const stansUtbetalinger = createAsyncThunk<Utbetaling, { sakId: string }, { rejectValue: ApiError }>(
+    'utbetalinger/stans',
+    async ({ sakId }, thunkApi) => {
+        const res = await utbetalingApi.stansUtbetalinger(sakId);
+        if (res.status === 'ok') {
+            return res.data;
+        }
+        return thunkApi.rejectWithValue(res.error);
+    }
+);
+
 export const startBehandling = createAsyncThunk<
     Behandling,
     { sakId: string; søknadId: string },
@@ -164,6 +177,7 @@ interface SakState {
         },
         Sak
     >;
+    stansUtbetalingerStatus: RemoteData.RemoteData<{ code: ErrorCode; message: string }, null>;
     startBehandlingStatus: RemoteData.RemoteData<{ code: ErrorCode; message: string }, null>;
     lagreVilkårsvurderingStatus: RemoteData.RemoteData<{ code: ErrorCode; message: string }, null>;
     lagreBehandlingsinformasjonStatus: RemoteData.RemoteData<{ code: ErrorCode; message: string }, null>;
@@ -176,6 +190,7 @@ interface SakState {
 
 const initialState: SakState = {
     sak: RemoteData.initial,
+    stansUtbetalingerStatus: RemoteData.initial,
     startBehandlingStatus: RemoteData.initial,
     lagreVilkårsvurderingStatus: RemoteData.initial,
     lagreBehandlingsinformasjonStatus: RemoteData.initial,
@@ -203,6 +218,18 @@ export default createSlice({
             },
         });
 
+        handleAsyncThunk(builder, stansUtbetalinger, {
+            pending: (state) => {
+                state.stansUtbetalingerStatus = RemoteData.pending;
+            },
+            fulfilled: (state) => {
+                state.stansUtbetalingerStatus = RemoteData.success(null);
+            },
+            rejected: (state, action) => {
+                state.stansUtbetalingerStatus = simpleRejectedActionToRemoteData(action);
+            },
+        });
+
         handleAsyncThunk(builder, startBehandling, {
             pending: (state) => {
                 state.startBehandlingStatus = RemoteData.pending;

src/lib/types.ts

@@ -1 +1,2 @@
 export type Nullable<T> = T | null;
+export type KeyDict<T> = T extends number ? never : { [key in keyof T]: key };

src/lib/validering.ts

@@ -6,6 +6,12 @@ function label(data: Partial<yup.TestMessageParams>) {
     return data.label ?? 'Feltet';
 }
 
+export const validateStringAsNumber = (yup
+    .number()
+    .required('Feltet må fylles ut')
+    .moreThan(-1, 'Feltet må være et positivt tall høyere enn 0')
+    .typeError('Feltet må være et tall') as unknown) as yup.Schema<string>;
+
 const norskLocale: yup.LocaleObject = {
     mixed: {
         default: (data) => `${label(data)} er ugyldig`,

src/pages/attestering/Attestering.tsx

@@ -15,8 +15,8 @@ import { mapToVilkårsinformasjon, statusIcon, vilkårTittelFormatted } from '~f
 import { useI18n } from '~lib/hooks';
 import { Nullable } from '~lib/types';
 import yup, { formikErrorsTilFeiloppsummering, formikErrorsHarFeil } from '~lib/validering';
-import VisBeregning from '~pages/saksbehandling/beregning/VisBeregning';
 import { Simulering } from '~pages/saksbehandling/simulering/simulering';
+import VisBeregning from '~pages/saksbehandling/steg/beregning/VisBeregning';
 import { useAppSelector, useAppDispatch } from '~redux/Store';
 import { Behandling } from '~types/Behandling';
 import { Sak } from '~types/Sak';

src/pages/attestering/attestering.module.less

@@ -54,3 +54,27 @@
 .sendInnAttestering {
     margin-top: @spacing-s;
 }
+
+.container {
+    display: flex;
+    flex-direction: column;
+}
+
+.feiloppsummering {
+    margin-bottom: @spacing-l;
+}
+
+.beregningContainer {
+    display: flex;
+    flex-direction: row;
+
+    .startBeregningKnapp {
+        margin-right: @spacing-s;
+    }
+
+    margin-bottom: @spacing-xl;
+}
+
+.sats {
+    margin-bottom: @spacing;
+}

src/pages/saksbehandling/Saksoversikt.tsx

@@ -19,7 +19,6 @@ import { useI18n } from '~lib/hooks';
 import * as Routes from '~lib/routes';
 import { useAppSelector, useAppDispatch } from '~redux/Store';
 
-import Beregning from './beregning/Beregning';
 import Sakintro from './sakintro/Sakintro';
 import messages from './saksoversikt-nb';
 import styles from './saksoversikt.module.less';
@@ -45,7 +44,7 @@ const Saksoversikt = () => {
         if (RemoteData.isSuccess(sak)) {
             if (RemoteData.isInitial(søker)) {
                 dispatch(personSlice.fetchPerson({ fnr: sak.value.fnr }));
-            } else if (RemoteData.isSuccess(søker)) {
+            } else if (RemoteData.isSuccess(søker) && !urlParams.sakId) {
                 rerouteToSak(sak.value.id);
             }
         }
@@ -105,9 +104,6 @@ const Saksoversikt = () => {
                                             <Route path={Routes.saksoversiktValgtBehandling.path}>
                                                 <div className={styles.mainContent}>
                                                     <Switch>
-                                                        <Route path={Routes.saksbehandlingBeregning.path}>
-                                                            <Beregning sak={sak} />
-                                                        </Route>
                                                         <Route path={Routes.saksbehandlingVedtak.path}>
                                                             <Vedtak sak={sak} />
                                                         </Route>