From 36f8d88f189f4795b9461da1da332f828d2ef5a4 Mon Sep 17 00:00:00 2001
From: sigurdgroneng <sigurd.groneng@nav.no>
Date: Tue, 15 Aug 2023 10:53:40 +0200
Subject: [PATCH] =?UTF-8?q?Always=20=C3=B8ink=20to=20dialog=20with=20fnr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Provider.tsx                                   |  2 +-
 .../hjelpekomponenter/SendEnMeldingKnapp.tsx       |  7 ++++---
 src/moduler/dialog/DialogFlateUtils.ts             | 14 +++++++-------
 src/moduler/dialog/DialogLink.tsx                  | 11 ++++++++---
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Provider.tsx b/src/Provider.tsx
index e72523cd3..6f00f6a11 100644
--- a/src/Provider.tsx
+++ b/src/Provider.tsx
@@ -3,9 +3,9 @@ import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { Provider as ReduxProvider } from 'react-redux';
 
+import { ER_INTERN_FLATE } from './constant';
 import FeatureToggle from './moduler/feature/FeatureToggle';
 import createStore from './store';
-import { ER_INTERN_FLATE } from './constant';
 
 interface Props {
     children: React.ReactNode;
diff --git a/src/moduler/aktivitet/visning/hjelpekomponenter/SendEnMeldingKnapp.tsx b/src/moduler/aktivitet/visning/hjelpekomponenter/SendEnMeldingKnapp.tsx
index c558dc1ce..26f8b34c7 100644
--- a/src/moduler/aktivitet/visning/hjelpekomponenter/SendEnMeldingKnapp.tsx
+++ b/src/moduler/aktivitet/visning/hjelpekomponenter/SendEnMeldingKnapp.tsx
@@ -5,9 +5,9 @@ import { useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 
 import { AlleAktiviteter } from '../../../../datatypes/aktivitetTypes';
-import { useErVeileder } from '../../../../Provider';
-import { selectDialogForAktivitetId } from '../../../dialog/dialog-selector';
+import { useErVeileder, useFnr } from '../../../../Provider';
 import { useRoutes } from '../../../../routes';
+import { selectDialogForAktivitetId } from '../../../dialog/dialog-selector';
 import { byttTilDialogFlate, getDialogLenke } from '../../../dialog/DialogFlateUtils';
 
 interface Props {
@@ -16,6 +16,7 @@ interface Props {
 
 const SendEnMeldingKnapp = (props: Props) => {
     const { aktivitet } = props;
+    const fnr = useFnr();
     const erVeileder = useErVeileder();
     const dialog = useSelector(selectDialogForAktivitetId(aktivitet.id));
 
@@ -38,7 +39,7 @@ const SendEnMeldingKnapp = (props: Props) => {
             <Button
                 variant="secondary"
                 as="a"
-                href={getDialogLenke(erVeileder, aktivitet.id, dialog?.id)}
+                href={getDialogLenke(erVeileder, fnr, aktivitet.id, dialog?.id)}
                 icon={<ChatElipsisIcon aria-hidden fontSize="1.5rem" />}
                 onClick={veilederOnClick}
             >
diff --git a/src/moduler/dialog/DialogFlateUtils.ts b/src/moduler/dialog/DialogFlateUtils.ts
index e4ade30c9..168af20ec 100644
--- a/src/moduler/dialog/DialogFlateUtils.ts
+++ b/src/moduler/dialog/DialogFlateUtils.ts
@@ -7,9 +7,9 @@ interface DialogEventDetails {
     aktivitetId?: string;
 }
 
-export const byttTilDialogFlate = (event: MouseEvent, aktiviteId?: string, dialogId?: string) => {
+export const byttTilDialogFlate = (event: MouseEvent, fnr?: string, aktiviteId?: string, dialogId?: string) => {
     event.preventDefault();
-    window.history.pushState('', 'Dialog', getDialogLenke(true, aktiviteId, dialogId));
+    window.history.pushState('', 'Dialog', getDialogLenke(true, fnr, aktiviteId, dialogId));
     window.dispatchEvent(
         new CustomEvent<DialogEventDetails>('visDialog', {
             detail: {
@@ -20,15 +20,15 @@ export const byttTilDialogFlate = (event: MouseEvent, aktiviteId?: string, dialo
     );
 };
 
-export const getDialogLenke = (erVeileder: boolean, aktiviteId?: string, dialogId?: string) => {
-    if (erVeileder) {
+export const getDialogLenke = (erVeileder: boolean, fnr?: string, aktiviteId?: string, dialogId?: string) => {
+    if (erVeileder && fnr) {
         if (dialogId) {
-            return `/${dialogId}`;
+            return `/${fnr}/${dialogId}`;
         }
         if (aktiviteId) {
-            return `/ny?aktivitetId=${aktiviteId}`;
+            return `/${fnr}/ny?aktivitetId=${aktiviteId}`;
         }
-        return `/`;
+        return `/${fnr}`;
     } else {
         if (dialogId) {
             return `${ARBEIDSRETTET_DIALOG_URL}/${dialogId}`;
diff --git a/src/moduler/dialog/DialogLink.tsx b/src/moduler/dialog/DialogLink.tsx
index 128038ea3..0251ddace 100644
--- a/src/moduler/dialog/DialogLink.tsx
+++ b/src/moduler/dialog/DialogLink.tsx
@@ -1,7 +1,7 @@
 import React, { MouseEvent } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { useErVeileder } from '../../Provider';
+import { useErVeileder, useFnr } from '../../Provider';
 import { useRoutes } from '../../routes';
 import { byttTilDialogFlate, getDialogLenke } from './DialogFlateUtils';
 
@@ -16,6 +16,7 @@ interface Props {
 const LenkeTilDialog = (props: Props) => {
     const { className, dialogId, aktivitetId, hidden, children } = props;
 
+    const fnr = useFnr();
     const navigate = useNavigate();
     const erVeileder = useErVeileder();
     const { hovedsideRoute } = useRoutes();
@@ -23,7 +24,7 @@ const LenkeTilDialog = (props: Props) => {
     const internalOnClick = (event: MouseEvent) => {
         if (erVeileder) {
             navigate(hovedsideRoute(), { replace: true });
-            byttTilDialogFlate(event, aktivitetId, dialogId);
+            byttTilDialogFlate(event, fnr, aktivitetId, dialogId);
         }
     };
 
@@ -32,7 +33,11 @@ const LenkeTilDialog = (props: Props) => {
     }
 
     return (
-        <a href={getDialogLenke(erVeileder, aktivitetId, dialogId)} onClick={internalOnClick} className={className}>
+        <a
+            href={getDialogLenke(erVeileder, fnr, aktivitetId, dialogId)}
+            onClick={internalOnClick}
+            className={className}
+        >
             {children}
         </a>
     );