Merge pull request #1233 from navikt/fix-linker

fix linker
navikt · Dec 5, 2023 · 4b2cc1f · 4b2cc1f
2 parents d1a1dd2 + 4d78489
commit 4b2cc1f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/src/felles-komponenter/modal/Modal.tsx b/src/felles-komponenter/modal/Modal.tsx
@@ -1,7 +1,6 @@
-import { Heading, Link, Modal as AkselModal } from '@navikt/ds-react';
+import { Heading, Modal as AkselModal } from '@navikt/ds-react';
 import React, { MouseEventHandler, ReactNode } from 'react';
-import { useNavigate } from 'react-router-dom';
-
+import { useNavigate, Link as ReactRouterLink } from 'react-router-dom';
 import { SerializedError } from '../../api/utils';
 import Feilmelding from '../../moduler/feilmelding/Feilmelding';
 import { useRoutes } from '../../routes';
@@ -33,7 +32,7 @@ const Modal = (props: Props) => {
     } = props;
 
     const navigate = useNavigate();
-    const { hovedsideRoute } = useRoutes();
+    const { hovedsideRoute, nyAktivitetRoute } = useRoutes();
 
     const closeFuncOrDefault = () => {
         if (onRequestClose) {
@@ -58,18 +57,24 @@ const Modal = (props: Props) => {
                     </Heading>
                     {tilbakeLenke ? (
                         <>
-                            <Link className="hover:cursor-pointer" onClick={tilbakeLenke.onTilbakeKlikk} tabIndex={0}>
+                            <ReactRouterLink
+                                className="hover:cursor-pointer text-text-action underline"
+                                to={nyAktivitetRoute()}
+                                tabIndex={0}
+                            >
                                 {tilbakeLenke.tekst}
-                            </Link>
+                            </ReactRouterLink>
                         </>
                     ) : null}
                 </div>
             </AkselModal.Header>
             <AkselModal.Body>
                 <div className="flex flex-col max-w-2xl mx-auto">
-                    <Heading className="" level="2" size="xsmall">
-                        {subHeading}
-                    </Heading>
+                    {subHeading ? (
+                        <Heading className="" level="2" size="xsmall">
+                            {subHeading}
+                        </Heading>
+                    ) : null}
                     {feilmeldinger && <Feilmelding feilmeldinger={feilmeldinger} />}
                     <Innholdslaster
                         className="flex m-auto my-8"

diff --git a/src/moduler/utskrift/AktivitetsplanPrint.tsx b/src/moduler/utskrift/AktivitetsplanPrint.tsx
@@ -19,10 +19,11 @@ import {
     selectKvpPeriodeForValgteOppfolging,
     selectOppfolgingStatus,
 } from '../oppfolging-status/oppfolging-selector';
-import ModalHeader from './modalHeader';
+import PrintVerktoylinje from './printVerktoylinje';
 import Print from './print/print';
 import PrintMeldingForm, { PrintFormValues } from './PrintMeldingForm';
 import VelgPlanUtskriftForm, { VelgPlanUtskriftFormValues } from './velgPlan/VelgPlanUtskriftForm';
+import { useRoutes } from '../../routes';
 
 const STEP_VELG_PLAN = 'VELG_PLAN';
 const STEP_MELDING_FORM = 'MELDING_FORM';
@@ -49,6 +50,7 @@ const AktivitetsplanPrint = () => {
     const dialoger = useSelector(selectDialoger);
     const mittMal = useSelector(selectGjeldendeMal);
     const erManuell = useSelector(selectErBrukerManuell);
+    const { hovedsideRoute } = useRoutes();
 
     const avhengigheter = [
         useSelector(selectMalStatus),
@@ -107,6 +109,7 @@ const AktivitetsplanPrint = () => {
 
     const steps = getSteps(kanHaPrintValg, kanHaPrintMelding);
     const navigate = useNavigate();
+
     const goBack = () => navigate(-1);
     if (fnr && (isLoadingAdresse || isLoadingBruker)) {
         return <Loader />;
@@ -145,9 +148,9 @@ const AktivitetsplanPrint = () => {
         <section className="flex flex-col justify-center items-center p-8">
             <div className="aktivitetsplanprint flex justify-center items-center">
                 {prompt}
-                <ModalHeader
+                <PrintVerktoylinje
                     avhengigheter={avhengigheter}
-                    tilbake={goBack}
+                    tilbakeRoute={hovedsideRoute()}
                     kanSkriveUt={steps[stepIndex] === STEP_UTSKRIFT}
                 />
                 <Innholdslaster avhengigheter={avhengigheter}>

diff --git a/src/moduler/utskrift/modalHeader.tsx → src/moduler/utskrift/printVerktoylinje.tsx b/src/moduler/utskrift/modalHeader.tsx → src/moduler/utskrift/printVerktoylinje.tsx
@@ -1,6 +1,7 @@
 import { PrinterSmallIcon } from '@navikt/aksel-icons';
-import { Button, Heading, Link } from '@navikt/ds-react';
+import { Button, Heading } from '@navikt/ds-react';
 import React from 'react';
+import { Link as ReactRouterLink } from 'react-router-dom';
 
 import Innholdslaster, { InnholdslasterProps } from '../../felles-komponenter/utils/Innholdslaster';
 import loggEvent, { TRYK_PRINT } from '../../felles-komponenter/utils/logging';
@@ -9,22 +10,26 @@ import VisValgtFilter from '../filtrering/VisValgtFilter';
 
 interface Props {
     avhengigheter: InnholdslasterProps['avhengigheter'];
-    tilbake?: () => void;
+    tilbakeRoute?: string;
     kanSkriveUt: boolean;
 }
 
-function ModalHeader(props: Props) {
-    const { avhengigheter, tilbake, kanSkriveUt } = props;
+function PrintVerktoylinje(props: Props) {
+    const { avhengigheter, tilbakeRoute, kanSkriveUt } = props;
     return (
         <Innholdslaster avhengigheter={avhengigheter}>
             <Heading className="print:hidden" spacing size={'large'}>
                 Skriv ut aktivitetsplanen
             </Heading>
-            <div className="print:hidden self-start flex flex-row gap-x-10 mb-8">
-                {tilbake ? (
-                    <Link className="hover:cursor-pointer" onClick={tilbake} tabIndex={0}>
+            <div className="print:hidden self-start flex flex-row gap-x-10 mb-8 items-center">
+                {tilbakeRoute ? (
+                    <ReactRouterLink
+                        className="text-text-action underline hover:no-underline"
+                        to={tilbakeRoute}
+                        tabIndex={0}
+                    >
                         Tilbake
-                    </Link>
+                    </ReactRouterLink>
                 ) : null}
                 {kanSkriveUt ? (
                     <Button
@@ -46,4 +51,4 @@ function ModalHeader(props: Props) {
     );
 }
 
-export default ModalHeader;
+export default PrintVerktoylinje;