From 6285338fc5d4bffa78acb00fad78935a3f2eca67 Mon Sep 17 00:00:00 2001 From: ramziabuqassim Date: Tue, 14 Nov 2023 11:07:19 +0100 Subject: [PATCH] =?UTF-8?q?fjern=20types=20filen=20som=20bare=20inneholdte?= =?UTF-8?q?=20steg=20&=20sett=20dem=20i=20sine=20tilh=C3=B8rende=20type=20?= =?UTF-8?q?filer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/routes.ts | 4 +++- src/pages/klage/Klage.tsx | 2 +- src/pages/klage/avvistKlage/AvvistKlage.tsx | 3 +-- src/pages/klage/opprettKlage/OpprettKlage.tsx | 2 +- .../SendKlageTilAttestering.tsx | 3 +-- .../klage/vurderFormkrav/VurderFormkrav.tsx | 3 +-- .../klage/vurderingAvKlage/VurderingAvKlage.tsx | 2 +- src/pages/saksbehandling/types.ts | 16 ---------------- src/types/Klage.ts | 7 +++++++ "src/types/S\303\270knadsbehandling.ts" | 10 ++++++++++ src/utils/klage/klageUtils.ts | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 src/pages/saksbehandling/types.ts diff --git a/src/lib/routes.ts b/src/lib/routes.ts index dde631d59..469695987 100644 --- a/src/lib/routes.ts +++ b/src/lib/routes.ts @@ -1,10 +1,12 @@ import { NavigateFunction, useParams } from 'react-router-dom'; import * as Routes from '~src/lib/routes'; -import { KlageSteg, SaksbehandlingMenyvalg, TilbakekrevingSteg } from '~src/pages/saksbehandling/types'; import { Søknadssteg } from '~src/pages/søknad/types'; +import { KlageSteg } from '~src/types/Klage'; +import { TilbakekrevingSteg } from '~src/types/ManuellTilbakekrevingsbehandling'; import { RevurderingSeksjoner, RevurderingSteg } from '~src/types/Revurdering'; import { Sakstype } from '~src/types/Sak'; +import { SaksbehandlingMenyvalg } from '~src/types/Søknadsbehandling'; import { Vilkårtype } from '~src/types/Vilkårsvurdering'; interface Route { diff --git a/src/pages/klage/Klage.tsx b/src/pages/klage/Klage.tsx index c64575494..168169f76 100644 --- a/src/pages/klage/Klage.tsx +++ b/src/pages/klage/Klage.tsx @@ -6,7 +6,7 @@ import Framdriftsindikator from '~src/components/framdriftsindikator/Framdriftsi import { SaksoversiktContext } from '~src/context/SaksoversiktContext'; import { useI18n } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; +import { KlageSteg } from '~src/types/Klage'; import { erKlageVilkårsvurdertUtfyltEllerSenere, getDefaultFramdriftsindikatorLinjer, diff --git a/src/pages/klage/avvistKlage/AvvistKlage.tsx b/src/pages/klage/avvistKlage/AvvistKlage.tsx index a335e0a42..3139fbf46 100644 --- a/src/pages/klage/avvistKlage/AvvistKlage.tsx +++ b/src/pages/klage/avvistKlage/AvvistKlage.tsx @@ -14,8 +14,7 @@ import { useAsyncActionCreator, useBrevForhåndsvisning } from '~src/lib/hooks'; import { useI18n } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; import yup from '~src/lib/validering'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; -import { Klage, KlageStatus } from '~src/types/Klage'; +import { Klage, KlageStatus, KlageSteg } from '~src/types/Klage'; import { erKlageAvvist } from '~src/utils/klage/klageUtils'; import * as sharedStyles from '../klage.module.less'; diff --git a/src/pages/klage/opprettKlage/OpprettKlage.tsx b/src/pages/klage/opprettKlage/OpprettKlage.tsx index 382612614..2a07000b9 100644 --- a/src/pages/klage/opprettKlage/OpprettKlage.tsx +++ b/src/pages/klage/opprettKlage/OpprettKlage.tsx @@ -19,7 +19,7 @@ import * as klageActions from '~src/features/klage/klageActions'; import { useAsyncActionCreator } from '~src/lib/hooks'; import { useI18n } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; +import { KlageSteg } from '~src/types/Klage'; import messages from '../klage-nb'; diff --git a/src/pages/klage/sendKlageTilAttestering/SendKlageTilAttestering.tsx b/src/pages/klage/sendKlageTilAttestering/SendKlageTilAttestering.tsx index 5e479a4e6..18a117082 100644 --- a/src/pages/klage/sendKlageTilAttestering/SendKlageTilAttestering.tsx +++ b/src/pages/klage/sendKlageTilAttestering/SendKlageTilAttestering.tsx @@ -9,8 +9,7 @@ import * as klageActions from '~src/features/klage/klageActions'; import { useAsyncActionCreator } from '~src/lib/hooks'; import { useI18n } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; -import { Klage } from '~src/types/Klage'; +import { KlageSteg, Klage } from '~src/types/Klage'; import { Vedtak } from '~src/types/Vedtak'; import { erKlageVurdertBekreftet } from '~src/utils/klage/klageUtils'; diff --git a/src/pages/klage/vurderFormkrav/VurderFormkrav.tsx b/src/pages/klage/vurderFormkrav/VurderFormkrav.tsx index de1d118eb..6662bdce7 100644 --- a/src/pages/klage/vurderFormkrav/VurderFormkrav.tsx +++ b/src/pages/klage/vurderFormkrav/VurderFormkrav.tsx @@ -18,8 +18,7 @@ import { useI18n } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; import { eqNullable, Nullable } from '~src/lib/types'; import yup from '~src/lib/validering'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; -import { Svarord, Klage, KlageInnenforFristen, KlageErUnderskrevet } from '~src/types/Klage'; +import { KlageSteg, Svarord, Klage, KlageInnenforFristen, KlageErUnderskrevet } from '~src/types/Klage'; import { Vedtak } from '~src/types/Vedtak'; import { formatDateTime } from '~src/utils/date/dateUtils'; import { diff --git a/src/pages/klage/vurderingAvKlage/VurderingAvKlage.tsx b/src/pages/klage/vurderingAvKlage/VurderingAvKlage.tsx index fbe76c058..5b3191f3b 100644 --- a/src/pages/klage/vurderingAvKlage/VurderingAvKlage.tsx +++ b/src/pages/klage/vurderingAvKlage/VurderingAvKlage.tsx @@ -31,8 +31,8 @@ import { useI18n } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; import { eqNullable, Nullable } from '~src/lib/types'; import yup from '~src/lib/validering'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; import { + KlageSteg, Klage, OmgjørVedtakUtfall, OmgjørVedtakÅrsak, diff --git a/src/pages/saksbehandling/types.ts b/src/pages/saksbehandling/types.ts deleted file mode 100644 index 9c28bdc4f..000000000 --- a/src/pages/saksbehandling/types.ts +++ /dev/null @@ -1,16 +0,0 @@ -export enum SaksbehandlingMenyvalg { - Sak = 'sak', - Søknad = 'soknad', - Vilkår = 'vilkar', - Beregning = 'beregning', - Vedtak = 'vedtak', - Vedtaksbrev = 'vedtaksbrev', - Oppsummering = 'oppsummering', -} - -export enum KlageSteg { - Formkrav = 'formkrav', - Vurdering = 'vurdering', - Avvisning = 'avvisning', - Oppsummering = 'oppsummering', -} diff --git a/src/types/Klage.ts b/src/types/Klage.ts index 38042b7be..f84491a67 100644 --- a/src/types/Klage.ts +++ b/src/types/Klage.ts @@ -130,3 +130,10 @@ export interface VedtattUtfall { utfall: Utfall; opprettet: string; } + +export enum KlageSteg { + Formkrav = 'formkrav', + Vurdering = 'vurdering', + Avvisning = 'avvisning', + Oppsummering = 'oppsummering', +} diff --git "a/src/types/S\303\270knadsbehandling.ts" "b/src/types/S\303\270knadsbehandling.ts" index 0dfec539a..a1fb68f20 100644 --- "a/src/types/S\303\270knadsbehandling.ts" +++ "b/src/types/S\303\270knadsbehandling.ts" @@ -39,3 +39,13 @@ export enum SøknadsbehandlingStatus { IVERKSATT_INNVILGET = 'IVERKSATT_INNVILGET', IVERKSATT_AVSLAG = 'IVERKSATT_AVSLAG', } + +export enum SaksbehandlingMenyvalg { + Sak = 'sak', + Søknad = 'soknad', + Vilkår = 'vilkar', + Beregning = 'beregning', + Vedtak = 'vedtak', + Vedtaksbrev = 'vedtaksbrev', + Oppsummering = 'oppsummering', +} diff --git a/src/utils/klage/klageUtils.ts b/src/utils/klage/klageUtils.ts index a6596b15a..1a64973de 100644 --- a/src/utils/klage/klageUtils.ts +++ b/src/utils/klage/klageUtils.ts @@ -8,8 +8,8 @@ import { MessageFormatter } from '~src/lib/i18n'; import * as Routes from '~src/lib/routes'; import { Nullable } from '~src/lib/types'; import klageNb from '~src/pages/klage/klage-nb'; -import { KlageSteg } from '~src/pages/saksbehandling/types'; import { + KlageSteg, Klage, KlageStatus, KlageVurderingType,