Skip to content

Commit

Permalink
fjern types filen som bare inneholdte steg & sett dem i sine tilhøren…
Browse files Browse the repository at this point in the history
…de type filer
  • Loading branch information
RamziAbuQassim committed Nov 14, 2023
1 parent fa3b7ad commit 6285338
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
4 changes: 3 additions & 1 deletion src/lib/routes.ts
Original file line number Diff line number Diff line change
@@ -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<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/klage/Klage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions src/pages/klage/avvistKlage/AvvistKlage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/klage/opprettKlage/OpprettKlage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
3 changes: 1 addition & 2 deletions src/pages/klage/vurderFormkrav/VurderFormkrav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/klage/vurderingAvKlage/VurderingAvKlage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 0 additions & 16 deletions src/pages/saksbehandling/types.ts

This file was deleted.

7 changes: 7 additions & 0 deletions src/types/Klage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,10 @@ export interface VedtattUtfall {
utfall: Utfall;
opprettet: string;
}

export enum KlageSteg {
Formkrav = 'formkrav',
Vurdering = 'vurdering',
Avvisning = 'avvisning',
Oppsummering = 'oppsummering',
}
10 changes: 10 additions & 0 deletions src/types/Søknadsbehandling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
2 changes: 1 addition & 1 deletion src/utils/klage/klageUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6285338

Please sign in to comment.