Skip to content

Commit

Permalink
bruker ferdig felt oppgave.gjelder utledet i backend
Browse files Browse the repository at this point in the history
  • Loading branch information
di0nys1us committed Dec 11, 2024
1 parent 0935916 commit 80aa4d6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
28 changes: 12 additions & 16 deletions client/src/oppgavebenk/Oppgavebenk.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { Box, Link, Table } from '@navikt/ds-react'
import styled from 'styled-components'

import { DataCell, KolonneHeader } from '../felleskomponenter/table/KolonneHeader'
import { formaterFødselsnummer, formaterNavn, storForbokstavIAlleOrd, storForbokstavIOrd } from '../utils/formater'
import { isError } from '../utils/type'

import { IngentingFunnet } from '../felleskomponenter/IngenOppgaver'
import { Toast } from '../felleskomponenter/Toast'
import { EllipsisCell, TekstCell } from '../felleskomponenter/table/Celle'

import { DataCell, KolonneHeader } from '../felleskomponenter/table/KolonneHeader'
import { Toast } from '../felleskomponenter/Toast'
import { Skjermlesertittel } from '../felleskomponenter/typografi'
import { FilterDropdown, Filters } from '../oppgaveliste/filter'
import { OppgavelisteTabs } from '../oppgaveliste/OppgavelisteTabs'
import { useLocalStorageState } from '../oppgaveliste/useLocalStorageState'
import { OppgaveApiOppgave, OppgaveGjelderFilter, OppgavetemaLabel } from '../types/experimentalTypes'
import { Oppgavetype } from '../types/types.internal'
import { formaterDato, formaterTidsstempel } from '../utils/dato'
import { useOppgavelisteV2 } from './useOppgavelisteV2'
import { formaterFødselsnummer, formaterNavn, storForbokstavIAlleOrd, storForbokstavIOrd } from '../utils/formater'
import { isError } from '../utils/type'
import { Oppgavetildeling } from './Oppgavetildeling'
import { OppgavelisteTabs } from '../oppgaveliste/OppgavelisteTabs'
import { Oppgavetype } from '../types/types.internal'
import { useLocalStorageState } from '../oppgaveliste/useLocalStorageState'
import { FilterCombobox, FilterDropdown, Filters } from '../oppgaveliste/filter'
import { useOppgavelisteV2 } from './useOppgavelisteV2'

export function Oppgavebenk() {
//const [sakerFilter, setSakerFilter] = useLocalStorageState('sakerFilter', SakerFilter.UFORDELTE)
Expand Down Expand Up @@ -75,11 +75,7 @@ export function Oppgavebenk() {
name: 'Gjelder',
sortable: true,
width: 140,
render: (oppgave: OppgaveApiOppgave) => (
<TekstCell
value={`${storForbokstavIAlleOrd([oppgave.behandlingstema, oppgave.behandlingstype].filter(Boolean).join('| '))}`}
/>
),
render: (oppgave: OppgaveApiOppgave) => <TekstCell value={oppgave.gjelder ?? ''} />,
},
{
/* Workaround for at beskrivelsen fra gosys enn så lenge
Expand Down Expand Up @@ -203,7 +199,7 @@ export function Oppgavebenk() {
<OppgavelisteTabs />
<Filters onClear={clearFilters}>
<FilterDropdown
handleChange={(filterValue: OppgavetemaFilter) => {
handleChange={(filterValue: OppgaveGjelderFilter) => {
handleFilter(setGjelderFilter, filterValue)
}}
label="Gjelder"
Expand Down
1 change: 1 addition & 0 deletions client/src/types/experimentalTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface OppgaveApiOppgave {
tema: string
behandlingstema?: string | null
behandlingstype?: string | null
gjelder?: string | null
beskrivelse?: string
prioritet: OppgavePrioritet
tildeltEnhet: Enhet
Expand Down

0 comments on commit 80aa4d6

Please sign in to comment.