Skip to content

Commit

Permalink
Merge pull request #3639 from navikt/bugfix/mangler-relatert-person-v…
Browse files Browse the repository at this point in the history
…ed-legg-til

Vis relatert person-valg paa tenor-person
  • Loading branch information
betsytraran authored Sep 27, 2024
2 parents fd88402 + 6f85cc7 commit 1e446f7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ export const SivilstandForm = ({
!isEmpty(formMethods.watch(`${path}.nyRelatertPerson`), ['syntetisk']) ||
formMethods.watch(`${path}.relatertVedSivilstand`) !== null
}
toggleExpansion={identMaster != 'PDL'}
/>
)}
<AvansertForm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const PdlPersonForm = ({
(opts?.antall > 1 && 'Valg er kun tilgjengelig for individ, ikke for gruppe') || ''
}
>
{type === PersonType.EKSISTERENDE_PERSON && (
{(type === PersonType.EKSISTERENDE_PERSON || isTestnorgeIdent) && (
<PdlEksisterendePerson
nyPersonPath={nyPersonPath}
eksisterendePersonPath={eksisterendePersonPath}
Expand Down
3 changes: 1 addition & 2 deletions apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import './Gruppe.less'
import { GruppeFeil, GruppeFeilmelding } from '@/pages/gruppe/GruppeFeil/GruppeFeilmelding'
import { ToggleGroup } from '@navikt/ds-react'
import { TestComponentSelectors } from '#/mocks/Selectors'
import { isEmpty } from 'lodash'

export type GruppeProps = {
visning: string
Expand Down Expand Up @@ -113,7 +112,7 @@ export default ({
return (
<div className="gruppe-container">
<GruppeHeaderConnector gruppeId={gruppe.id} />
{ikkeFerdigBestillinger && !isEmpty(ikkeFerdigBestillinger) && (
{ikkeFerdigBestillinger && (
// @ts-ignore
<StatusListeConnector gruppeId={gruppe.id} bestillingListe={ikkeFerdigBestillinger} />
)}
Expand Down

0 comments on commit 1e446f7

Please sign in to comment.