Merge pull request #3205 from navikt/refactor/frontend-common

flytt Lenke til frontend-common

frontend/mulighetsrommet-veileder-flate/src/components/lenke/Lenke.tsx → frontend/frontend-common/components/Lenke.tsx

@@ -10,7 +10,7 @@ interface LinkProps extends RouterLinkProps {
   children?: React.ReactNode;
 }
 
-function Lenke({ children, isExternal = false, to, className, ...others }: LinkProps) {
+export function Lenke({ children, isExternal = false, to, className, ...others }: LinkProps) {
   return isExternal ? (
     <Link
       target="_blank"
@@ -27,5 +27,3 @@ function Lenke({ children, isExternal = false, to, className, ...others }: LinkP
     </RouterLink>
   );
 }
-
-export default Lenke;

frontend/frontend-common/package.json

@@ -4,10 +4,8 @@
   "description": "Felleskode for frontend-applikasjoner for Team Valp",
   "module": "index.ts",
   "types": "index.tsx",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "dependencies": {
+    "react-router-dom": "6.21.3",
     "react-select": "^5.8.0",
     "@navikt/ds-react": "5.15.1"
   },

frontend/mr-admin-flate/src/components/lenkeknapp/Lenkeknapp.tsx

@@ -1,5 +1,5 @@
-import Lenke from "mulighetsrommet-veileder-flate/src/components/lenke/Lenke";
 import classNames from "classnames";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import style from "./Lenkeknapp.module.scss";
 
 interface Props {

frontend/mr-admin-flate/src/components/notater/Notat.tsx

@@ -2,7 +2,7 @@ import styles from "./Notater.module.scss";
 import { BodyLong, BodyShort, Button } from "@navikt/ds-react";
 import { formaterDatoTid } from "../../utils/Utils";
 import { TrashIcon } from "@navikt/aksel-icons";
-import Lenke from "mulighetsrommet-veileder-flate/src/components/lenke/Lenke";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import { AvtaleNotat, TiltaksgjennomforingNotat } from "mulighetsrommet-api-client";
 import { useHentAnsatt } from "../../api/ansatt/useHentAnsatt";
 import { NOM_ANSATT_SIDE } from "mulighetsrommet-frontend-common/constants";

frontend/mr-admin-flate/src/components/tabell/AvtaleTabell.tsx

@@ -2,7 +2,7 @@ import { Alert, Button, Checkbox, Pagination, Table } from "@navikt/ds-react";
 import classNames from "classnames";
 import { useAtom, WritableAtom } from "jotai";
 import { OpenAPI, SorteringAvtaler } from "mulighetsrommet-api-client";
-import Lenke from "mulighetsrommet-veileder-flate/src/components/lenke/Lenke";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import { createRef, useEffect, useState } from "react";
 import { AvtaleFilter } from "../../api/atoms";
 import { APPLICATION_NAME } from "../../constants";

frontend/mr-admin-flate/src/components/tabell/TiltaksgjennomforingsTabell.tsx

@@ -1,7 +1,7 @@
 import { Alert, Checkbox, Pagination, Table, Tag, VStack } from "@navikt/ds-react";
 import { useAtom, WritableAtom } from "jotai";
 import { SorteringTiltaksgjennomforinger } from "mulighetsrommet-api-client";
-import Lenke from "mulighetsrommet-veileder-flate/src/components/lenke/Lenke";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import React from "react";
 import { TiltaksgjennomforingFilter } from "../../api/atoms";
 import { useSort } from "../../hooks/useSort";

frontend/mr-admin-flate/src/components/tabell/TiltakstypeTabell.tsx

@@ -2,7 +2,7 @@ import { Alert, Table } from "@navikt/ds-react";
 import classNames from "classnames";
 import { useAtom } from "jotai";
 import { SorteringTiltakstyper } from "mulighetsrommet-api-client";
-import Lenke from "mulighetsrommet-veileder-flate/src/components/lenke/Lenke";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import { tiltakstypeFilterAtom } from "../../api/atoms";
 import { useTiltakstyper } from "../../api/tiltakstyper/useTiltakstyper";
 import { useSort } from "../../hooks/useSort";

frontend/mulighetsrommet-veileder-flate/src/apps/modia/views/ModiaArbeidsmarkedstiltakOversikt.tsx

@@ -3,6 +3,7 @@ import { Alert, Button } from "@navikt/ds-react";
 import { ApiError, Toggles } from "mulighetsrommet-api-client";
 import { useTitle } from "mulighetsrommet-frontend-common";
 import { PORTEN } from "mulighetsrommet-frontend-common/constants";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import { TiltakLoader } from "@/components/TiltakLoader";
 import { BrukersOppfolgingsenhetVarsel } from "@/apps/modia/varsler/BrukersOppfolgingsenhetVarsel";
 import { Feilmelding, ForsokPaNyttLink } from "@/components/feilmelding/Feilmelding";
@@ -21,7 +22,6 @@ import { useVeilederTiltaksgjennomforinger } from "@/core/api/queries/useTiltaks
 import { useResetArbeidsmarkedstiltakFilter } from "@/hooks/useArbeidsmarkedstiltakFilter";
 import { ManglerInnsatsOgServicegruppeVarsel } from "@/apps/modia/varsler/ManglerInnsatsOgServiceGruppeVarsel";
 import { FilterMenyMedSkeletonLoader } from "@/components/filtrering/FilterMenyMedSkeletonLoader";
-import Lenke from "@/components/lenke/Lenke";
 
 export const ModiaArbeidsmarkedstiltakOversikt = () => {
   useTitle("Arbeidsmarkedstiltak - Oversikt");

frontend/mulighetsrommet-veileder-flate/src/components/joyride/Steps.tsx

@@ -1,7 +1,7 @@
-import Lenke from "../lenke/Lenke";
 import { BodyShort } from "@navikt/ds-react";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import { PORTEN } from "mulighetsrommet-frontend-common/constants";
-import { APPLICATION_WEB_COMPONENT_NAME } from "../../constants";
+import { APPLICATION_WEB_COMPONENT_NAME } from "@/constants";
 import { useEffect, useState } from "react";
 import { Step } from "react-joyride";
 

frontend/mulighetsrommet-veileder-flate/src/components/oversikt/Gjennomforingsrad.tsx

@@ -6,10 +6,9 @@ import {
   TiltaksgjennomforingOppstartstype,
   VeilederflateTiltaksgjennomforing,
 } from "mulighetsrommet-api-client";
-import { paginationAtom } from "../../core/atoms/atoms";
-import { formaterDato, kebabCase } from "../../utils/Utils";
-import Lenke from "../lenke/Lenke";
-
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
+import { paginationAtom } from "@/core/atoms/atoms";
+import { formaterDato, kebabCase } from "@/utils/Utils";
 import styles from "./Gjennomforingsrad.module.scss";
 import { useAtomValue } from "jotai";
 

frontend/mulighetsrommet-veileder-flate/src/components/tilbakeknapp/Tilbakeknapp.tsx

@@ -1,4 +1,4 @@
-import Lenke from "../lenke/Lenke";
+import { Lenke } from "mulighetsrommet-frontend-common/components/Lenke";
 import styles from "./Tilbakeknapp.module.scss";
 import { BodyShort } from "@navikt/ds-react";
 import { ChevronLeftIcon } from "@navikt/aksel-icons";