Skip to content

Commit

Permalink
lagt til toggle drop down menu ved siden av gamle kanpp, ikke lagt ti…
Browse files Browse the repository at this point in the history
…l veileder sjekk
  • Loading branch information
henriktheboss committed Oct 15, 2024
1 parent 9a4f974 commit f67dcaa
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 1 deletion.
34 changes: 34 additions & 0 deletions src/moduler/aktivitet/ny-aktivitet/LeggTilForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,38 @@ const LeggTilForm = () => {
);
};

// return (
// <div className="min-h-32">
// <Dropdown>
// <Dropdown.Menu>
// <Dropdown.Menu.GroupedList>
// <Dropdown.Menu.GroupedList.Heading>
// Systemer og oppslagsverk
// </Dropdown.Menu.GroupedList.Heading>
// <Dropdown.Menu.GroupedList.Item onClick={() => {}}>
// Gosys
// </Dropdown.Menu.GroupedList.Item>
// <Dropdown.Menu.GroupedList.Item as="a" href="https://nav.no">
// Infotrygd
// </Dropdown.Menu.GroupedList.Item>
// </Dropdown.Menu.GroupedList>
// <Dropdown.Menu.Divider />
// <Dropdown.Menu.List>
// <Dropdown.Menu.List.Item as="a" href="https://nav.no">
// Kontakt
// </Dropdown.Menu.List.Item>
// <Dropdown.Menu.List.Item
// as="a"
// href="https://nav.no"
// target="_blank"
// >
// Hjelp (åpner i en ny fane)
// </Dropdown.Menu.List.Item>
// </Dropdown.Menu.List>
// </Dropdown.Menu>
// </Dropdown>
// </div>
// );
// };

export default LeggTilForm;
40 changes: 39 additions & 1 deletion src/moduler/verktoylinje/Verktoylinje.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PlusIcon } from '@navikt/aksel-icons';
import { Button } from '@navikt/ds-react';
import { Button, Dropdown, Link } from '@navikt/ds-react';
import React from 'react';
import { useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom';
Expand All @@ -20,6 +20,8 @@ const Verktoylinje = () => {
const aktivitetStatus = useSelector(selectAktivitetStatus);
const navigate = useNavigate();
const { nyAktivitetRoute } = useRoutes();
const nyAktivitetBasePath = nyAktivitetRoute();


return (
<div className="flex flex-col gap-y-6">
Expand All @@ -37,6 +39,42 @@ const Verktoylinje = () => {
>
Legg til aktivitet
</Button>
<div className="min-h-32">
<Dropdown>
<Button
as={Dropdown.Toggle}
loading={[Status.RELOADING, Status.PENDING].includes(aktivitetStatus)}
className="self-stretch sm:self-auto"
icon={<PlusIcon role="img" aria-hidden fontSize="1.5rem" />}
disabled={viserHistoriskPeriode || aktivitetStatus === Status.ERROR}>
Legg til aktivitet
</Button>
<Dropdown.Menu>
<Dropdown.Menu.GroupedList>
<Dropdown.Menu.GroupedList.Heading>
Velg type aktivitet
</Dropdown.Menu.GroupedList.Heading>
<Dropdown.Menu.GroupedList.Item as={Link} href={`${nyAktivitetBasePath}/stilling`}>
En jobb jeg vil søke på
</Dropdown.Menu.GroupedList.Item>
<Dropdown.Menu.GroupedList.Item as="a" href={`${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`}>
Jobbrettet egenaktivitet
</Dropdown.Menu.List.Item>
<Dropdown.Menu.List.Item
as={Link}
href="https://nav.no"
>
Medisinsk behandling
</Dropdown.Menu.List.Item>
</Dropdown.Menu.List>
</Dropdown.Menu>
</Dropdown>
</div>
<Filter />
</div>
<PeriodeFilter skjulInneverende={!underOppfolging} />
Expand Down

0 comments on commit f67dcaa

Please sign in to comment.