UPDATE: content to have more space and correct link to step 5

navikt · Jan 30, 2025 · ef9f268 · ef9f268
1 parent 97e33a1
commit ef9f268
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 19 deletions.
diff --git a/apps/frontend/src/components/PvkDokument/OversiktView.tsx b/apps/frontend/src/components/PvkDokument/OversiktView.tsx
@@ -155,7 +155,10 @@ export const OversiktView = (props: IProps) => {
             </FormSummary.Answer>
 
             {StepTitle.slice(1).map((title, index) => {
-              const panelHref = window.location.pathname.slice(0, -1) + (index + 2)
+              let panelHref = window.location.pathname.slice(0, -1) + (index + 2)
+              if (index + 2 === 5) {
+                panelHref += '?tab=risikoscenarioer&filter=alle'
+              }
               return (
                 <FormSummaryPanel
                   key={title}

diff --git a/apps/frontend/src/components/risikoscenario/RisikoscenarioAccordianContent.tsx b/apps/frontend/src/components/risikoscenario/RisikoscenarioAccordianContent.tsx
@@ -1,5 +1,5 @@
 import { PencilIcon } from '@navikt/aksel-icons'
-import { Button, Label } from '@navikt/ds-react'
+import { Alert, Button, Label } from '@navikt/ds-react'
 import { RefObject, useState } from 'react'
 import { getRisikoscenario, updateRisikoscenario } from '../../api/RisikoscenarioApi'
 import { createTiltakAndRelasjonWithRisikoscenario } from '../../api/TiltakApi'
@@ -80,7 +80,7 @@ export const RisikoscenarioAccordionContent = (props: IProps) => {
     <div>
       <RisikoscenarioView risikoscenario={activeRisikoscenario} noCopyButton={false} />
 
-      <div className="mt-5 flex gap-2 items-center">
+      <div className="mt-12 flex gap-2 items-center">
         <Button
           variant="tertiary"
           type="button"
@@ -101,6 +101,12 @@ export const RisikoscenarioAccordionContent = (props: IProps) => {
         <Label>Følgende tiltak gjelder for dette risikoscenarioet</Label>
         {!risikoscenario.ingenTiltak && (
           <div>
+            {risikoscenario.tiltakIds.length === 0 && (
+              <Alert className="mt-5 mb-9" variant="warning">
+                Dere har ikke lagt inn tiltak
+              </Alert>
+            )}
+
             {risikoscenario.tiltakIds.length !== 0 && (
               <TiltakReadMoreList
                 risikoscenario={risikoscenario}

diff --git a/apps/frontend/src/components/risikoscenario/RisikoscenarioAccordionHeader.tsx b/apps/frontend/src/components/risikoscenario/RisikoscenarioAccordionHeader.tsx
@@ -25,7 +25,7 @@ export const RisikoscenarioAccordianHeader = (props: IProps) => {
   return (
     <Accordion.Header>
       {risikoscenario.navn}
-      <div className="flex gap-2">
+      <div className="flex gap-2 mt-1">
         {mangelfulScenario && <Tag variant="alt2">Scenario er mangelfullt </Tag>}
         {risikoscenario.ingenTiltak && <Tag variant="neutral">Tiltak ikke aktuelt</Tag>}
         {!risikoscenario.ingenTiltak && ikkeFerdigVurdert && (
@@ -48,7 +48,7 @@ export const IdentifiseringAvRisikoscenarioAccordianHeader = (props: IProps) =>
   return (
     <Accordion.Header className="z-0">
       {risikoscenario.navn}
-      <div className="flex gap-2">
+      <div className="flex gap-2 mt-1">
         {ikkeFerdigBeskrevet && <Tag variant="alt2">Det er felter som ikke er ferdig utfylt</Tag>}
         {risikoscenario.ingenTiltak && <Tag variant="neutral">Tiltak ikke aktuelt</Tag>}
         {!risikoscenario.ingenTiltak && risikoscenario.tiltakIds.length === 0 && (

diff --git a/apps/frontend/src/components/risikoscenario/RisikoscenarioView.tsx b/apps/frontend/src/components/risikoscenario/RisikoscenarioView.tsx
@@ -28,8 +28,9 @@ export const RisikoscenarioView = (props: IProps) => {
         />
       )}
       <BodyLong className="mt-5">{risikoscenario.beskrivelse}</BodyLong>
+
       {risikoscenario.generelScenario && (
-        <BodyLong className="mt-5">
+        <BodyLong className="mt-8">
           Dette risikoscenarioet er ikke tilknyttet spesifikke etterlevelseskrav.
         </BodyLong>
       )}
@@ -51,7 +52,7 @@ export const RisikoscenarioView = (props: IProps) => {
         </ReadMore>
       )}
 
-      <div className="mt-5">
+      <div className="mt-12">
         <RisikoscenarioTag
           level={risikoscenario.sannsynlighetsNivaa}
           text={getSannsynlighetsnivaaText(risikoscenario.sannsynlighetsNivaa)}
@@ -65,7 +66,7 @@ export const RisikoscenarioView = (props: IProps) => {
         <BodyLong className="mt-5">{risikoscenario.sannsynlighetsNivaaBegrunnelse}</BodyLong>
       )}
 
-      <div className="mt-5">
+      <div className="mt-12">
         <RisikoscenarioTag
           level={risikoscenario.konsekvensNivaa}
           text={getKonsekvenssnivaaText(risikoscenario.konsekvensNivaa)}

diff --git a/apps/frontend/src/components/risikoscenario/edit/IngenTiltakField.tsx b/apps/frontend/src/components/risikoscenario/edit/IngenTiltakField.tsx
@@ -20,7 +20,7 @@ export const IngenTiltakField = (props: IProps) => {
         onSubmit={submit}
         innerRef={formRef}
       >
-        {({ submitForm, values, resetForm }) => (
+        {({ submitForm, values, resetForm, dirty }) => (
           <Form>
             <Field name="ingenTiltak">
               {(fieldProps: FieldProps) => (
@@ -38,15 +38,17 @@ export const IngenTiltakField = (props: IProps) => {
               )}
             </Field>
 
-            <Button
-              type="button"
-              onClick={() => {
-                submitForm()
-                resetForm({ values })
-              }}
-            >
-              Lagre
-            </Button>
+            {dirty && (
+              <Button
+                type="button"
+                onClick={() => {
+                  submitForm()
+                  resetForm({ values })
+                }}
+              >
+                Lagre
+              </Button>
+            )}
           </Form>
         )}
       </Formik>

diff --git a/apps/frontend/src/pages/PvkDokumentPage.tsx b/apps/frontend/src/pages/PvkDokumentPage.tsx
@@ -158,7 +158,10 @@ export const PvkDokumentPage = () => {
                       orientation="horizontal"
                     >
                       {StepTitle.map((title, index) => {
-                        const stepHref = window.location.pathname.slice(0, -1) + (index + 1)
+                        let stepHref = window.location.pathname.slice(0, -1) + (index + 1)
+                        if (index + 1 === 5) {
+                          stepHref += '?tab=risikoscenarioer&filter=alle'
+                        }
                         return (
                           <Stepper.Step key={title} href={stepHref}>
                             {title}