Bedre typesikring i frontend + flytte typer til egen fil (#4430)

apps/etterlatte-saksbehandling-ui/client/src/components/behandling/attestering/oppsummering/oversikt.tsx

@@ -13,7 +13,7 @@ import { tagColors, TagList } from '~shared/Tags'
 import { SidebarPanel } from '~shared/components/Sidebar'
 import React, { useEffect } from 'react'
 import { useApiCall } from '~shared/hooks/useApiCall'
-import { erOppgaveRedigerbar, hentOppgaveForReferanseUnderBehandling } from '~shared/api/oppgaver'
+import { hentOppgaveForReferanseUnderBehandling } from '~shared/api/oppgaver'
 import Spinner from '~shared/Spinner'
 import { ApiErrorAlert } from '~ErrorBoundary'
 import { KopierbarVerdi } from '~shared/statusbar/kopierbarVerdi'
@@ -23,6 +23,7 @@ import { EessiPensjonLenke } from '~components/behandling/soeknadsoversikt/bosat
 import { SettPaaVent } from '~components/behandling/sidemeny/SettPaaVent'
 import { behandlingErRedigerbar } from '~components/behandling/felles/utils'
 import { useAppSelector } from '~store/Store'
+import { erOppgaveRedigerbar } from '~shared/types/oppgave'
 
 export const Oversikt = ({ behandlingsInfo }: { behandlingsInfo: IBehandlingInfo }) => {
   const kommentarFraAttestant = behandlingsInfo.attestertLogg?.slice(-1)[0]?.kommentar

apps/etterlatte-saksbehandling-ui/client/src/components/behandling/attestering/oppsummering/underkjent.tsx

@@ -8,7 +8,8 @@ import { mapSuccess } from '~shared/api/apiUtils'
 import { SettPaaVent } from '~components/behandling/sidemeny/SettPaaVent'
 import React, { useEffect } from 'react'
 import { useApiCall } from '~shared/hooks/useApiCall'
-import { erOppgaveRedigerbar, hentOppgaveForReferanseUnderBehandling } from '~shared/api/oppgaver'
+import { hentOppgaveForReferanseUnderBehandling } from '~shared/api/oppgaver'
+import { erOppgaveRedigerbar } from '~shared/types/oppgave'
 
 export const Underkjent = ({ behandlingsInfo }: { behandlingsInfo: IBehandlingInfo }) => {
   const innloggetId = useAppSelector((state) => state.saksbehandlerReducer.innloggetSaksbehandler.ident)

apps/etterlatte-saksbehandling-ui/client/src/components/behandling/sidemeny/SettPaaVent.tsx

@@ -1,13 +1,14 @@
 import { Alert, Button, Heading, Label, Textarea } from '@navikt/ds-react'
 import { FlexRow } from '~shared/styled'
 import { FristHandlinger } from '~components/oppgavebenk/frist/FristHandlinger'
-import { erOppgaveRedigerbar, OppgaveDTO, settOppgavePaaVentApi } from '~shared/api/oppgaver'
+import { settOppgavePaaVentApi } from '~shared/api/oppgaver'
 import { ClockDashedIcon, ClockIcon } from '@navikt/aksel-icons'
 import { formaterStringDato } from '~utils/formattering'
 import React, { useState } from 'react'
 import { useApiCall } from '~shared/hooks/useApiCall'
 import { Info } from '~components/behandling/soeknadsoversikt/Info'
 import { isPending } from '~shared/api/apiUtils'
+import { erOppgaveRedigerbar, OppgaveDTO } from '~shared/types/oppgave'
 
 export const SettPaaVent = ({
   oppgave,

apps/etterlatte-saksbehandling-ui/client/src/components/manuelbehandling/GjenopprettingModal.tsx

@@ -4,8 +4,9 @@ import { FlexRow } from '~shared/styled'
 import { isPending } from '~shared/api/apiUtils'
 import { isFailureHandler } from '~shared/api/IsFailureHandler'
 import { useApiCall } from '~shared/hooks/useApiCall'
-import { erOppgaveRedigerbar, ferdigstillOppgaveMedMerknad, Oppgavestatus } from '~shared/api/oppgaver'
+import { ferdigstillOppgaveMedMerknad } from '~shared/api/oppgaver'
 import { useNavigate } from 'react-router-dom'
+import { Oppgavestatus, erOppgaveRedigerbar } from '~shared/types/oppgave'
 
 export default function GjenopprettingModal(props: { oppgaveId: string; oppgaveStatus: Oppgavestatus }) {
   const { oppgaveId, oppgaveStatus } = props

apps/etterlatte-saksbehandling-ui/client/src/components/manuelbehandling/ManuellBehandling.tsx

@@ -15,7 +15,7 @@ import { isPending, isSuccess, mapAllApiResult } from '~shared/api/apiUtils'
 import { ApiErrorAlert } from '~ErrorBoundary'
 import { isFailureHandler } from '~shared/api/IsFailureHandler'
 import { useParams } from 'react-router-dom'
-import { hentOppgave, Oppgavestatus } from '~shared/api/oppgaver'
+import { hentOppgave } from '~shared/api/oppgaver'
 import PersongalleriBarnepensjon from '~components/person/journalfoeringsoppgave/nybehandling/PersongalleriBarnepensjon'
 import { FormProvider, useForm } from 'react-hook-form'
 import { ControlledDatoVelger } from '~shared/components/datoVelger/ControlledDatoVelger'
@@ -24,6 +24,7 @@ import { ENHETER, EnhetFilterKeys, filtrerEnhet } from '~shared/types/Enhet'
 import { GRADERING, GraderingFilterKeys } from '~shared/types/Gradering'
 import GjenopprettingModal from '~components/manuelbehandling/GjenopprettingModal'
 import { useSidetittel } from '~shared/hooks/useSidetittel'
+import { Oppgavestatus } from '~shared/types/oppgave'
 
 interface ManuellBehandingSkjema extends NyBehandlingSkjema {
   kilde: string

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/GosysOppgaveliste.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { hentGosysOppgaver, OppgaveDTO, OppgaveSaksbehandler } from '~shared/api/oppgaver'
+import { hentGosysOppgaver } from '~shared/api/oppgaver'
 import { isPending, mapResult } from '~shared/api/apiUtils'
 import Spinner from '~shared/Spinner'
 import { ApiErrorAlert } from '~ErrorBoundary'
@@ -20,6 +20,7 @@ import {
 } from '~components/oppgavebenk/utils/oppgaveutils'
 import { useOppgaveBenkState, useOppgavebenkStateDispatcher } from '~components/oppgavebenk/state/OppgavebenkContext'
 import { useApiCall } from '~shared/hooks/useApiCall'
+import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 interface Props {
   saksbehandlereIEnhet: Array<Saksbehandler>

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/MinOppgaveliste.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { isPending, mapResult } from '~shared/api/apiUtils'
-import { hentOppgaverMedStatus, OppgaveDTO, OppgaveSaksbehandler } from '~shared/api/oppgaver'
+import { hentOppgaverMedStatus } from '~shared/api/oppgaver'
 import Spinner from '~shared/Spinner'
 import { ApiErrorAlert } from '~ErrorBoundary'
 import { Filter } from '~components/oppgavebenk/filtreringAvOppgaver/typer'
@@ -19,6 +19,7 @@ import { RevurderingsaarsakerBySakstype } from '~shared/types/Revurderingaarsak'
 import { useOppgaveBenkState, useOppgavebenkStateDispatcher } from '~components/oppgavebenk/state/OppgavebenkContext'
 import { useApiCall } from '~shared/hooks/useApiCall'
 import { useAppSelector } from '~store/Store'
+import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 interface Props {
   saksbehandlereIEnhet: Array<Saksbehandler>

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/Oppgavelista.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { isPending, mapResult } from '~shared/api/apiUtils'
-import { hentOppgaverMedStatus, OppgaveDTO, OppgaveSaksbehandler } from '~shared/api/oppgaver'
+import { hentOppgaverMedStatus } from '~shared/api/oppgaver'
 import {
   finnOgOppdaterSaksbehandlerTildeling,
   leggTilOppgavenIMinliste,
@@ -21,6 +21,7 @@ import { Oppgaver } from '~components/oppgavebenk/oppgaver/Oppgaver'
 import { useOppgaveBenkState, useOppgavebenkStateDispatcher } from '~components/oppgavebenk/state/OppgavebenkContext'
 import { useApiCall } from '~shared/hooks/useApiCall'
 import { useAppSelector } from '~store/Store'
+import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 interface Props {
   saksbehandlereIEnhet: Array<Saksbehandler>

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/components/HandlingerForOppgave.tsx

@@ -1,4 +1,3 @@
-import { OppgaveDTO } from '~shared/api/oppgaver'
 import { Button } from '@navikt/ds-react'
 import { EyeIcon } from '@navikt/aksel-icons'
 import { useAppSelector } from '~store/Store'
@@ -7,6 +6,7 @@ import { OmgjoerVedtakModal } from '~components/oppgavebenk/oppgaveModal/Omgjoer
 import React from 'react'
 import { RevurderingsaarsakerBySakstype } from '~shared/types/Revurderingaarsak'
 import { OpprettNyRevurdering } from '~components/person/OpprettNyRevurdering'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 export const HandlingerForOppgave = ({
   oppgave,

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/components/OppgaveFeilWrapper.tsx

@@ -1,8 +1,8 @@
 import { mapApiResult, Result } from '~shared/api/apiUtils'
-import { OppgaveDTO } from '~shared/api/oppgaver'
 import Spinner from '~shared/Spinner'
 import { ReactNode } from 'react'
 import { ApiErrorAlert } from '~ErrorBoundary'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 export const OppgaveFeilWrapper = (props: { oppgaver: Result<Array<OppgaveDTO>>; children: ReactNode }) => {
   const { oppgaver, children } = props

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/components/Tags.tsx

@@ -1,7 +1,7 @@
-import { Oppgavetype } from '~shared/api/oppgaver'
 import { Tag } from '@navikt/ds-react'
 import { Variants } from '~shared/Tags'
 import { SakType } from '~shared/types/sak'
+import { Oppgavetype } from '~shared/types/oppgave'
 
 const SAKTYPE_TIL_TAGDATA: Record<SakType, { variant: Variants; text: string }> = {
   BARNEPENSJON: { variant: Variants.INFO, text: 'Barnepensjon' },

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/filtreringAvOppgaver/filtrerOppgaver.ts

@@ -1,4 +1,3 @@
-import { OppgaveDTO } from '~shared/api/oppgaver'
 import { isBefore } from 'date-fns'
 import {
   EnhetFilterKeys,
@@ -11,6 +10,7 @@ import {
   SAKSBEHANDLERFILTER,
   YtelseFilterKeys,
 } from '~components/oppgavebenk/filtreringAvOppgaver/typer'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 function filtrerEnhet(enhetsFilter: EnhetFilterKeys, oppgaver: OppgaveDTO[]): OppgaveDTO[] {
   if (enhetsFilter === 'visAlle') {

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/filtreringAvOppgaver/typer.ts

@@ -1,4 +1,4 @@
-import { Oppgavestatus, Oppgavetype } from '~shared/api/oppgaver'
+import { Oppgavestatus, Oppgavetype } from '~shared/types/oppgave'
 
 type visAlle = 'visAlle'
 

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/frist/FristHandlinger.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useApiCall } from '~shared/hooks/useApiCall'
-import { Oppgavetype, redigerFristApi } from '~shared/api/oppgaver'
+import { redigerFristApi } from '~shared/api/oppgaver'
 import { Alert, Button, DatePicker, Heading, Label, Modal } from '@navikt/ds-react'
 import { formaterStringDato } from '~utils/formattering'
 import { PencilIcon } from '@navikt/aksel-icons'
@@ -10,6 +10,7 @@ import { FlexRow } from '~shared/styled'
 
 import { isPending, isSuccess } from '~shared/api/apiUtils'
 import { isFailureHandler } from '~shared/api/IsFailureHandler'
+import { Oppgavetype } from '~shared/types/oppgave'
 
 const FristWrapper = styled.span<{ fristHarPassert: boolean; utenKnapp?: boolean }>`
   color: ${(p) => p.fristHarPassert && 'var(--a-text-danger)'};

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/gosys/FerdigstillGosysOppgave.tsx

@@ -1,10 +1,11 @@
-import { ferdigstilleGosysOppgave, OppgaveDTO } from '~shared/api/oppgaver'
+import { ferdigstilleGosysOppgave } from '~shared/api/oppgaver'
 import { useApiCall } from '~shared/hooks/useApiCall'
 import { mapResult } from '~shared/api/apiUtils'
 import { Alert, Button, Loader } from '@navikt/ds-react'
 import { FlexRow } from '~shared/styled'
 import { GosysActionToggle } from '~components/oppgavebenk/oppgaveModal/GosysOppgaveModal'
 import Spinner from '~shared/Spinner'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 export const FerdigstillGosysOppgave = ({
   oppgave,

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/gosys/OverfoerOppgaveTilGjenny.tsx

@@ -1,4 +1,4 @@
-import { feilregistrerGosysOppgave, OppgaveDTO, opprettOppgave, tildelSaksbehandlerApi } from '~shared/api/oppgaver'
+import { feilregistrerGosysOppgave, opprettOppgave, tildelSaksbehandlerApi } from '~shared/api/oppgaver'
 import { useApiCall } from '~shared/hooks/useApiCall'
 import { hentSakForPerson } from '~shared/api/sak'
 import { isInitial, isPending, isSuccess, mapResult, mapSuccess } from '~shared/api/apiUtils'
@@ -9,6 +9,7 @@ import React, { useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { formaterSakstype } from '~utils/formattering'
 import { ResultAlert } from '~shared/alerts/ResultAlert'
+import { OppgaveDTO, OppgaveKilde, Oppgavetype } from '~shared/types/oppgave'
 
 export const OverfoerOppgaveTilGjenny = ({
   oppgave,
@@ -36,16 +37,16 @@ export const OverfoerOppgaveTilGjenny = ({
         {
           sakId: sak.id,
           request: {
-            oppgaveType: 'JOURNALFOERING',
+            oppgaveType: Oppgavetype.JOURNALFOERING,
             referanse: oppgave.journalpostId!!,
             merknad: oppgave.beskrivelse || 'Journalføringsoppgave konvertert fra Gosys',
-            oppgaveKilde: 'SAKSBEHANDLER',
+            oppgaveKilde: OppgaveKilde.SAKSBEHANDLER,
           },
         },
         (opprettetOppgave) => {
           tildelSaksbehandler({
             oppgaveId: opprettetOppgave.id,
-            type: 'JOURNALFOERING',
+            type: Oppgavetype.JOURNALFOERING,
             nysaksbehandler: {
               saksbehandler: oppgave.saksbehandler!!.ident,
               versjon: null,

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/oppgaveModal/GosysOppgaveModal.tsx

@@ -7,9 +7,9 @@ import { formaterFnr, formaterStringDato } from '~utils/formattering'
 import { ConfigContext } from '~clientConfig'
 import { FlexRow } from '~shared/styled'
 import { FristWrapper } from '~components/oppgavebenk/frist/FristWrapper'
-import { OppgaveDTO } from '~shared/api/oppgaver'
 import { FerdigstillGosysOppgave } from '../gosys/FerdigstillGosysOppgave'
 import { OverfoerOppgaveTilGjenny } from '../gosys/OverfoerOppgaveTilGjenny'
+import { OppgaveDTO, Oppgavetype } from '~shared/types/oppgave'
 
 const TagRow = styled.div`
   display: flex;
@@ -58,7 +58,7 @@ export const GosysOppgaveModal = ({
         <Modal.Body>
           <TagRow>
             <SaktypeTag sakType={sakType} />
-            <OppgavetypeTag oppgavetype="GOSYS" />
+            <OppgavetypeTag oppgavetype={Oppgavetype.GOSYS} />
           </TagRow>
           <InfoGrid>
             <div>

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/oppgaveModal/OmgjoerVedtakModal.tsx

@@ -1,4 +1,3 @@
-import { erOppgaveRedigerbar, OppgaveDTO } from '~shared/api/oppgaver'
 import { Alert, BodyShort, Button, Heading, Modal } from '@navikt/ds-react'
 import { useEffect, useState } from 'react'
 import { useApiCall } from '~shared/hooks/useApiCall'
@@ -10,6 +9,7 @@ import { ApiErrorAlert } from '~ErrorBoundary'
 import { Klage, Omgjoering, VedtaketKlagenGjelder } from '~shared/types/Klage'
 import { formaterKanskjeStringDato, formaterVedtakType } from '~utils/formattering'
 import { isFailureHandler } from '~shared/api/IsFailureHandler'
+import { OppgaveDTO, erOppgaveRedigerbar } from '~shared/types/oppgave'
 
 function hentOmgjoering(klage: Klage): Omgjoering | null {
   if (klage.utfall?.utfall === 'DELVIS_OMGJOERING' || klage.utfall?.utfall === 'OMGJOERING') {

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/oppgaver/Oppgaver.tsx

@@ -1,5 +1,4 @@
 import { Alert } from '@navikt/ds-react'
-import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/api/oppgaver'
 import React, { ReactNode, useEffect, useState } from 'react'
 import { OppgaverTable } from '~components/oppgavebenk/oppgaverTable/OppgaverTable'
 import { PagineringsKontroller } from '~components/oppgavebenk/oppgaver/PagineringsKontroller'
@@ -14,6 +13,7 @@ import { hentPagineringSizeFraLocalStorage } from '~components/oppgavebenk/utils
 import { filtrerOppgaver } from '~components/oppgavebenk/filtreringAvOppgaver/filtrerOppgaver'
 import { RevurderingsaarsakerBySakstype } from '~shared/types/Revurderingaarsak'
 import { Filter } from '~components/oppgavebenk/filtreringAvOppgaver/typer'
+import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 export interface Props {
   oppgaver: OppgaveDTO[]

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/oppgaverTable/OppgaverTable.tsx

@@ -1,7 +1,6 @@
 import React, { ReactNode, useEffect, useState } from 'react'
 import { SortState, Table } from '@navikt/ds-react'
 import { OppgaverTableHeader } from '~components/oppgavebenk/oppgaverTable/OppgaverTableHeader'
-import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/api/oppgaver'
 import { OppgaverTableRow } from '~components/oppgavebenk/oppgaverTable/OppgaverTableRow'
 import {
   initialSortering,
@@ -10,6 +9,7 @@ import {
 } from '~components/oppgavebenk/utils/oppgaveSortering'
 import { Saksbehandler } from '~shared/types/saksbehandler'
 import { RevurderingsaarsakerBySakstype } from '~shared/types/Revurderingaarsak'
+import { OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 export enum SortKey {
   REGISTRERINGSDATO = 'registreringsdato',

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/oppgaverTable/OppgaverTableRow.tsx

@@ -1,6 +1,5 @@
 import React, { ReactNode } from 'react'
 import { Table } from '@navikt/ds-react'
-import { erOppgaveRedigerbar, OppgaveDTO, OppgaveSaksbehandler } from '~shared/api/oppgaver'
 import { formaterStringDato } from '~utils/formattering'
 import { FristWrapper } from '~components/oppgavebenk/frist/FristWrapper'
 import SaksoversiktLenke from '~components/oppgavebenk/components/SaksoversiktLenke'
@@ -11,6 +10,7 @@ import { VelgSaksbehandler } from '~components/oppgavebenk/tildeling/VelgSaksbeh
 import { Saksbehandler } from '~shared/types/saksbehandler'
 import { RevurderingsaarsakerBySakstype } from '~shared/types/Revurderingaarsak'
 import { OPPGAVESTATUSFILTER } from '~components/oppgavebenk/filtreringAvOppgaver/typer'
+import { erOppgaveRedigerbar, OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 interface Props {
   oppgave: OppgaveDTO

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/state/OppgavebenkContext.tsx

@@ -4,8 +4,9 @@ import {
   OppgavebenkState,
   OppgavebenkStats,
 } from '~components/oppgavebenk/state/oppgavebenkState'
-import { hentOppgavebenkStats, OppgaveDTO } from '~shared/api/oppgaver'
+import { hentOppgavebenkStats } from '~shared/api/oppgaver'
 import { useApiCall } from '~shared/hooks/useApiCall'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 export interface OppgavebenkStateDispatcher {
   setOppgavelistaOppgaver: (oppgaver: OppgaveDTO[]) => void

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/state/oppgavebenkState.ts

@@ -1,4 +1,4 @@
-import { OppgaveDTO } from '~shared/api/oppgaver'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 export interface OppgavebenkState {
   oppgavelistaOppgaver: OppgaveDTO[]

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/tildeling/VelgSaksbehandler.tsx

@@ -3,17 +3,12 @@ import { Button, Dropdown, Label, UNSAFE_Combobox } from '@navikt/ds-react'
 import { PersonCrossIcon, PersonPencilIcon, PersonPlusIcon } from '@navikt/aksel-icons'
 import styled from 'styled-components'
 import { useAppSelector } from '~store/Store'
-import {
-  byttSaksbehandlerApi,
-  erOppgaveRedigerbar,
-  fjernSaksbehandlerApi,
-  OppgaveDTO,
-  OppgaveSaksbehandler,
-} from '~shared/api/oppgaver'
+import { byttSaksbehandlerApi, fjernSaksbehandlerApi } from '~shared/api/oppgaver'
 import { useApiCall } from '~shared/hooks/useApiCall'
 import { Saksbehandler } from '~shared/types/saksbehandler'
 import { enhetErSkrivbar } from '~components/behandling/felles/utils'
 import { isPending } from '~shared/api/apiUtils'
+import { erOppgaveRedigerbar, OppgaveDTO, OppgaveSaksbehandler } from '~shared/types/oppgave'
 
 interface Props {
   saksbehandlereIEnhet: Array<Saksbehandler>

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/utils/oppgaveSortering.ts

@@ -1,5 +1,5 @@
 import { logger } from '~utils/logger'
-import { OppgaveDTO } from '~shared/api/oppgaver'
+import { OppgaveDTO } from '~shared/types/oppgave'
 
 export interface OppgaveSortering {
   registreringsdatoSortering: Retning

apps/etterlatte-saksbehandling-ui/client/src/components/oppgavebenk/utils/oppgaveutils.ts

@@ -1,5 +1,5 @@
-import { OppgaveDTO, OppgaveSaksbehandler, Oppgavestatus } from '~shared/api/oppgaver'
 import { logger } from '~utils/logger'
+import { OppgaveDTO, OppgaveSaksbehandler, Oppgavestatus } from '~shared/types/oppgave'
 
 export const finnOgOppdaterSaksbehandlerTildeling = (
   oppgaver: OppgaveDTO[],

apps/etterlatte-saksbehandling-ui/client/src/components/person/dokumenter/OppgaveFraJournalpostModal.tsx

@@ -2,14 +2,15 @@ import { Journalpost } from '~shared/types/Journalpost'
 import { Alert, Button, Detail, Heading, Link, Modal } from '@navikt/ds-react'
 import React, { useEffect, useState } from 'react'
 import { useApiCall } from '~shared/hooks/useApiCall'
-import { hentOppgaverMedReferanse, Oppgavetype, opprettOppgave, tildelSaksbehandlerApi } from '~shared/api/oppgaver'
+import { hentOppgaverMedReferanse, opprettOppgave, tildelSaksbehandlerApi } from '~shared/api/oppgaver'
 import { isFailure, isPending, isSuccess, mapResult, Result } from '~shared/api/apiUtils'
 import Spinner from '~shared/Spinner'
 import { ExternalLinkIcon, PencilIcon } from '@navikt/aksel-icons'
 import { FlexRow } from '~shared/styled'
 import { SakMedBehandlinger } from '~components/person/typer'
 import { useNavigate } from 'react-router-dom'
 import { useAppSelector } from '~store/Store'
+import { OppgaveKilde, Oppgavetype } from '~shared/types/oppgave'
 
 // TODO: Må på sikt gjøre noe for å støtte tilfeller hvor sak mangler.
 export const OppgaveFraJournalpostModal = ({
@@ -46,7 +47,7 @@ export const OppgaveFraJournalpostModal = ({
 
   const opprettJournalfoeringsoppgave = () => {
     if (isSuccess(sakStatus)) {
-      const oppgaveType: Oppgavetype = 'JOURNALFOERING'
+      const oppgaveType = Oppgavetype.JOURNALFOERING
 
       apiOpprettOppgave(
         {
@@ -55,7 +56,7 @@ export const OppgaveFraJournalpostModal = ({
             oppgaveType,
             referanse: journalpost.journalpostId,
             merknad: 'Manuell redigering av journalpost',
-            oppgaveKilde: 'SAKSBEHANDLER',
+            oppgaveKilde: OppgaveKilde.SAKSBEHANDLER,
           },
         },
         (oppgave) => {