tilpasser Forbehold til å hente person selv i tilfelle brukeren navig…

…erer direkte til denne siden
navikt · Feb 12, 2025 · da27f53 · da27f53
1 parent 16d34d1
commit da27f53
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 66 deletions.
diff --git a/src/pages/Forbehold/Forbehold.tsx b/src/pages/Forbehold/Forbehold.tsx
@@ -7,9 +7,8 @@ import { PortableText } from '@portabletext/react'
 import { Card } from '@/components/common/Card'
 import { SanityContext } from '@/context/SanityContext'
 import { SanityForbeholdAvsnitt } from '@/context/SanityContext/SanityTypes'
+import { useGetPersonQuery } from '@/state/api/apiSlice'
 import { useGetSanityFeatureToggleQuery } from '@/state/api/apiSlice'
-import { useAppSelector } from '@/state/hooks'
-import { selectNormertPensjonsalder } from '@/state/userInput/selectors'
 import { transformAlderToString } from '@/utils/alder'
 import { getSanityPortableTextComponents } from '@/utils/sanity'
 import { getFormatMessageValues } from '@/utils/translations'
@@ -19,7 +18,7 @@ export function Forbehold() {
   const { data: sanityFeatureToggle } = useGetSanityFeatureToggleQuery()
   const { forbeholdAvsnittData } = React.useContext(SanityContext)
 
-  const normertPensjonsalder = useAppSelector(selectNormertPensjonsalder)
+  const { data: person } = useGetPersonQuery()
 
   React.useEffect(() => {
     document.title = intl.formatMessage({
@@ -130,23 +129,25 @@ export function Forbehold() {
               />
             </BodyLong>
           </section>
-          <section>
-            <Heading level="3" size="small" spacing>
-              <FormattedMessage id="forbehold.uforetrygd.title" />
-            </Heading>
-            <BodyLong spacing>
-              <FormattedMessage
-                id="forbehold.uforetrygd.ingress"
-                values={{
-                  ...getFormatMessageValues(intl),
-                  normertPensjonsalder: transformAlderToString(
-                    intl.formatMessage,
-                    normertPensjonsalder
-                  ),
-                }}
-              />
-            </BodyLong>
-          </section>
+          {person?.pensjoneringAldre.normertPensjoneringsalder && (
+            <section>
+              <Heading level="3" size="small" spacing>
+                <FormattedMessage id="forbehold.uforetrygd.title" />
+              </Heading>
+              <BodyLong spacing>
+                <FormattedMessage
+                  id="forbehold.uforetrygd.ingress"
+                  values={{
+                    ...getFormatMessageValues(intl),
+                    normertPensjonsalder: transformAlderToString(
+                      intl.formatMessage,
+                      person?.pensjoneringAldre.normertPensjoneringsalder
+                    ),
+                  }}
+                />
+              </BodyLong>
+            </section>
+          )}
           <section>
             <Heading level="3" size="small" spacing>
               <FormattedMessage id="forbehold.uforetrygd_afp.title" />

diff --git a/src/pages/Forbehold/__tests__/Forbehold.test.tsx b/src/pages/Forbehold/__tests__/Forbehold.test.tsx
@@ -1,75 +1,37 @@
 import { describe, it } from 'vitest'
 
 import { Forbehold } from '..'
-import {
-  fulfilledGetPersonMedOekteAldersgrenser,
-  fulfilledGetPerson,
-} from '@/mocks/mockedRTKQueryApiCalls'
 import { mockErrorResponse } from '@/mocks/server'
-import { userInputInitialState } from '@/state/userInput/userInputReducer'
 import { render, screen, waitFor } from '@/test-utils'
 
 describe('Forbehold', () => {
   it('har riktig sidetittel', () => {
-    render(<Forbehold />, {
-      preloadedState: {
-        api: {
-          //@ts-ignore
-          queries: {
-            ...fulfilledGetPersonMedOekteAldersgrenser,
-          },
-        },
-        userInput: {
-          ...userInputInitialState,
-        },
-      },
-    })
+    render(<Forbehold />)
     expect(document.title).toBe('application.title.forbehold')
   })
 
   it('rendrer seksjonene riktig med innhold fra Sanity', async () => {
-    render(<Forbehold />, {
-      preloadedState: {
-        api: {
-          //@ts-ignore
-          queries: {
-            ...fulfilledGetPersonMedOekteAldersgrenser,
-          },
-        },
-        userInput: {
-          ...userInputInitialState,
-        },
-      },
-    })
+    render(<Forbehold />)
     await waitFor(() => {
       expect(screen.getByText('forbehold.title')).toBeVisible()
       expect(screen.getAllByRole('paragraph').length).toBeGreaterThanOrEqual(3)
     })
   })
 
-  it('rendrer seksjonene riktig når tekstene fra Sanity ikke skal brukes', () => {
+  it('rendrer seksjonene riktig når tekstene fra Sanity ikke skal brukes', async () => {
     mockErrorResponse('/feature/pensjonskalkulator.hent-tekster-fra-sanity')
-    render(<Forbehold />, {
-      preloadedState: {
-        api: {
-          //@ts-ignore
-          queries: {
-            ...fulfilledGetPerson,
-          },
-        },
-        userInput: {
-          ...userInputInitialState,
-        },
-      },
-    })
+    render(<Forbehold />)
     expect(screen.getByText('forbehold.title')).toBeVisible()
     expect(screen.getByText('forbehold.inntekt.title')).toBeVisible()
     expect(screen.getByText('forbehold.utenlandsopphold.title')).toBeVisible()
     expect(screen.getByText('forbehold.sivilstand.title')).toBeVisible()
     expect(screen.getByText('forbehold.afp.title')).toBeVisible()
-    expect(screen.getByText('forbehold.uforetrygd.title')).toBeVisible()
     expect(screen.getByText('forbehold.uforetrygd_afp.title')).toBeVisible()
     expect(screen.getByText('forbehold.gjenlevende.title')).toBeVisible()
     expect(screen.getByText('forbehold.pensjonsavtaler.title')).toBeVisible()
+
+    await waitFor(() => {
+      expect(screen.getByText('forbehold.uforetrygd.title')).toBeVisible()
+    })
   })
 })