Skip to content

Commit

Permalink
Fix loading problem når opner lager nytt aktivittetskort
Browse files Browse the repository at this point in the history
  • Loading branch information
henriktheboss committed Oct 16, 2024
1 parent 4125ca9 commit f4f891d
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions src/moduler/verktoylinje/Verktoylinje.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { PlusIcon } from '@navikt/aksel-icons';
import { Button, Dropdown, Link } from '@navikt/ds-react';
import { Button, Dropdown} from '@navikt/ds-react';
import React from 'react';
import { useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom';
import { Link, useNavigate } from 'react-router-dom';

import loggEvent, { APNE_NY_AKTIVITET } from '../../felles-komponenter/utils/logging';
import { useRoutes } from '../../routing/useRoutes';
Expand All @@ -22,6 +22,7 @@ const Verktoylinje = () => {
const navigate = useNavigate();
const { nyAktivitetRoute } = useRoutes();
const nyAktivitetBasePath = nyAktivitetRoute();

const erVeileder = useErVeileder();

return (
Expand Down Expand Up @@ -57,9 +58,9 @@ const Verktoylinje = () => {
For NAV-ansatt
</Dropdown.Menu.GroupedList.Heading>
<Dropdown.Menu.GroupedList>
<Dropdown.Menu.GroupedList.Item as={Link} href={`${nyAktivitetBasePath}/sokeavtale`}>Avtale om å søke jobber</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as={Link} href={`${nyAktivitetBasePath}/mote`}>Møte med NAV</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as={Link} href={`${nyAktivitetBasePath}/samtalereferat`}>Samtalereferat</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as={Link} to={`${nyAktivitetBasePath}/sokeavtale`}>Avtale om å søke jobber</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as={Link} to={`${nyAktivitetBasePath}/mote`}>Møte med NAV</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as={Link} to={`${nyAktivitetBasePath}/samtalereferat`}>Samtalereferat</Dropdown.Menu.GroupedList.Item>
</Dropdown.Menu.GroupedList>
<Dropdown.Menu.Divider />
</div>
Expand All @@ -73,21 +74,19 @@ const Verktoylinje = () => {
) :<Dropdown.Menu.GroupedList.Heading>
Velg type aktivitet
</Dropdown.Menu.GroupedList.Heading> }
<Dropdown.Menu.GroupedList.Item as={Link} href={`${nyAktivitetBasePath}/stilling`}>
<Dropdown.Menu.GroupedList.Item as={Link} to={`${nyAktivitetBasePath}/stilling`}>
En jobb jeg vil søke på
</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as="a" href={`${nyAktivitetBasePath}/ijobb`}>

<Dropdown.Menu.GroupedList.Item as={Link} to={`${nyAktivitetBasePath}/ijobb`}>
En jobb jeg har nå
</Dropdown.Menu.GroupedList.Item>
</Dropdown.Menu.GroupedList>
<Dropdown.Menu.List>
<Dropdown.Menu.List.Item as={Link} href={`${nyAktivitetBasePath}/egen`}>
<Dropdown.Menu.List.Item as={Link} to={`${nyAktivitetBasePath}/egen`}>
Jobbrettet egenaktivitet
</Dropdown.Menu.List.Item>
<Dropdown.Menu.List.Item
as={Link}
href="https://nav.no"
>
<Dropdown.Menu.List.Item as={Link} to={`${nyAktivitetBasePath}/behandling`}>
Medisinsk behandling
</Dropdown.Menu.List.Item>
</Dropdown.Menu.List>
Expand Down

0 comments on commit f4f891d

Please sign in to comment.