UPDATE: margin for readmore list and updated url logic

navikt · Feb 11, 2025 · 481af1c · 481af1c
1 parent a8468fc
commit 481af1c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/apps/frontend/src/components/PvkDokument/OppsummeringAvAlleRisikoscenarioerOgTiltak.tsx b/apps/frontend/src/components/PvkDokument/OppsummeringAvAlleRisikoscenarioerOgTiltak.tsx
@@ -68,6 +68,7 @@ export const OppsummeringAvAlleRisikoscenarioerOgTiltak = (props: IProps) => {
   const [navigateUrl, setNavigateUrl] = useState<string>('')
   const url = new URL(window.location.href)
   const tabQuery = url.searchParams.get('tab')
+  const risikoscenarioId = url.searchParams.get('risikoscenario')
   const filterQuery = url.searchParams.get('filter')
   const navigate = useNavigate()
 
@@ -143,11 +144,15 @@ export const OppsummeringAvAlleRisikoscenarioerOgTiltak = (props: IProps) => {
         break
     }
 
-    setNavigateUrl(`${window.location.pathname}?tab=${tab}&filter=${filter}`)
+    setNavigateUrl(
+      `${window.location.pathname}?tab=${tab}&filter=${filter}${risikoscenarioId ? '&risikoscenario=' + risikoscenarioId : ''}`
+    )
     if (formRef.current?.dirty) {
       setIsUnsaved(true)
     } else {
-      navigate(`${window.location.pathname}?tab=${tab}&filter=${filter}`)
+      navigate(
+        `${window.location.pathname}?tab=${tab}&filter=${filter}${risikoscenarioId ? '&risikoscenario=' + risikoscenarioId : ''}`
+      )
     }
   }
 

diff --git a/...ntend/src/components/risikoscenario/OppsummeringAccordian/OppsumeringAccordianContent.tsx b/...ntend/src/components/risikoscenario/OppsummeringAccordian/OppsumeringAccordianContent.tsx
@@ -45,6 +45,7 @@ export const OppsumeringAccordianContent = (props: IProps) => {
                 <ReadMore
                   key={risikoscenario.id + '_' + tiltak.id + '_' + index}
                   header={tiltak.navn}
+                  className="mb-3"
                 >
                   <TiltakView tiltak={tiltak} risikoscenarioList={allRisikoscenarioList} />
                 </ReadMore>

diff --git a/apps/frontend/src/components/tiltak/TiltakReadMoreList.tsx b/apps/frontend/src/components/tiltak/TiltakReadMoreList.tsx
@@ -133,6 +133,7 @@ const TiltakListContent = (props: ITiltakListContentProps) => {
         <ReadMore
           open={tiltakId === tiltak.id}
           id={risikoscenario.id + '_' + tiltak.id}
+          className="mb-3"
           onOpenChange={(open) => {
             if (open) {
               setActiveTiltak(tiltak.id)