små ting

navikt · Oct 9, 2024 · 0bc24b4 · 0bc24b4
1 parent f1a0f30
commit 0bc24b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/moduler/mal/mal-container.tsx b/src/moduler/mal/mal-container.tsx
@@ -8,22 +8,23 @@ import { selectErUnderOppfolging, selectHarSkriveTilgang } from '../oppfolging-s
 import { selectGjeldendeMal } from './aktivitetsmal-selector';
 //import Malvisning from './mal-visning';
 import MalForm from './MalForm';
+import { selectViserHistoriskPeriode } from '../filtrering/filter/filter-selector';
 
 interface Props {
     dirtyRef: MutableRefObject<boolean>;
     onLagre: () => void;
 }
 
 const MalContainer = (props: Props) => {
-    //const viserHistoriskPeriode = useSelector(selectViserHistoriskPeriode, shallowEqual);
+    const viserHistoriskPeriode = useSelector(selectViserHistoriskPeriode, shallowEqual);
     const malData = useSelector(selectGjeldendeMal, shallowEqual);
     const underOppfolging = useSelector(selectErUnderOppfolging, shallowEqual);
     const erVeileder = useErVeileder();
     const harSkriveTilgang = useSelector(selectHarSkriveTilgang, shallowEqual);
 
     const mal = malData && malData.mal;
 
-    const [edit, setEdit] = useState(underOppfolging && harSkriveTilgang);
+    const [edit, setEdit] = useState( !viserHistoriskPeriode && underOppfolging && harSkriveTilgang);
 
     if (edit) {
         return (

diff --git a/src/moduler/mal/mal-modal.tsx b/src/moduler/mal/mal-modal.tsx
@@ -3,6 +3,8 @@ import { useSelector } from 'react-redux';
 
 import Modal from '../../felles-komponenter/modal/Modal';
 import { selectHentMalListeFeil } from '../feilmelding/feil-selector';
+// import { useNavigate } from 'react-router-dom';
+// import { useRoutes } from '../../routing/useRoutes';
 
 interface Props {
     children: React.ReactNode;
@@ -15,7 +17,7 @@ export function MalModal(props: Props) {
     const feil = useSelector(selectHentMalListeFeil);
 
     return (
-        <Modal feilmeldinger={feil} heading={heading}>
+        <Modal lukkPåKlikkUtenfor={true} onRequestClose={props.onRequestClosed} feilmeldinger={feil} heading={heading}>
             {children}
         </Modal>
     );

diff --git a/src/moduler/mal/mal.tsx b/src/moduler/mal/mal.tsx
@@ -30,10 +30,13 @@ const Mal = () => {
     const avhengigheter = [malStatus, malListeStatus];
 
     const onModalRequestClosed = () => {
+        console.log('onModalRequestClosed');
         if (!isDirty.current || window.confirm(CONFIRM)) {
+            console.log("onModalRequestClosed er true")
             navigate(hovedsideRoute());
             return true;
         }
+        console.log("onModalRequestClosed er false")
         return false;
     };