Endrer import av komponenter til alias-prefix

navikt · Jul 19, 2024 · 7e428aa · 7e428aa
1 parent e729546
commit 7e428aa
Show file tree

Hide file tree

Showing 39 changed files with 833 additions and 1,105 deletions.
diff --git a/example/src/components/SprakVelger.tsx b/example/src/components/SprakVelger.tsx
@@ -1,31 +1,27 @@
-import React from "react";
-import { Locale } from "../types/locale";
+import React from 'react';
+import { Locale } from '@/types/locale';
 
 interface Props {
-  locales: Locale[];
-  valgtLocale: Locale;
-  settValgtLocale: (locale: Locale) => void;
+    locales: Locale[];
+    valgtLocale: Locale;
+    settValgtLocale: (locale: Locale) => void;
 }
 
 export const SprakVelger = (props: Props) => {
-  const { locales, valgtLocale, settValgtLocale } = props;
-  return (
-    <div className="example__velger">
-      {locales.map((locale, i) =>
-        valgtLocale === locale ? (
-          <span key={i} className="example__sprak">
-            <b>{locale}</b>
-          </span>
-        ) : (
-          <span
-            key={i}
-            className="example__sprak"
-            onClick={() => settValgtLocale(locale)}
-          >
-            {locale}
-          </span>
-        )
-      )}
-    </div>
-  );
+    const { locales, valgtLocale, settValgtLocale } = props;
+    return (
+        <div className="example__velger">
+            {locales.map((locale, i) =>
+                valgtLocale === locale ? (
+                    <span key={i} className="example__sprak">
+                        <b>{locale}</b>
+                    </span>
+                ) : (
+                    <span key={i} className="example__sprak" onClick={() => settValgtLocale(locale)}>
+                        {locale}
+                    </span>
+                )
+            )}
+        </div>
+    );
 };
diff --git a/src/__tests__/detaljert.test.tsx b/src/__tests__/detaljert.test.tsx
@@ -1,11 +1,11 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import afDetaljert from '../clients/apiMock/af-detaljert.json';
 import '@testing-library/jest-dom';
-import { orgnr } from '../utils/orgnr';
+import { orgnr } from '@/utils/orgnr';
 import dayjs from 'dayjs';
-import { formatDate } from '../utils/date';
+import { formatDate } from '@/utils/date';
 import { Detaljert } from '../modules/af-detaljert/Detaljert';
-import { AFUtvidet } from '../types/arbeidsforhold';
+import { AFUtvidet } from '@/types/arbeidsforhold';
 
 vi.mock('@react-pdf/renderer', () => ({
     Text: () => <div>Text</div>,

diff --git a/src/__tests__/liste.test.tsx b/src/__tests__/liste.test.tsx
@@ -1,51 +1,32 @@
-import { fireEvent, render, screen } from "@testing-library/react";
-import afListe from "../clients/apiMock/af-liste.json";
-import "@testing-library/jest-dom";
-import { Liste } from "../modules/af-liste/Liste";
-import { AFSimpel } from "../types/arbeidsforhold";
-import { formatDate } from "../utils/date";
+import { fireEvent, render, screen } from '@testing-library/react';
+import afListe from '../clients/apiMock/af-liste.json';
+import '@testing-library/jest-dom';
+import { Liste } from '../modules/af-liste/Liste';
+import { AFSimpel } from '@/types/arbeidsforhold';
+import { formatDate } from '@/utils/date';
 
-vi.mock("@react-pdf/renderer", () => ({
-  Text: () => <div>Text</div>,
-  StyleSheet: {
-    create: () => {},
-  },
+vi.mock('@react-pdf/renderer', () => ({
+    Text: () => <div>Text</div>,
+    StyleSheet: {
+        create: () => {},
+    },
 }));
 
 beforeEach(() => {
-  render(
-    <Liste
-      locale={"nb"}
-      miljo={"LOCAL"}
-      onClick={{ type: "INGEN_ON_CLICK" }}
-      arbeidsforhold={afListe as unknown as AFSimpel[]}
-    />
-  );
+    render(<Liste locale={'nb'} miljo={'LOCAL'} onClick={{ type: 'INGEN_ON_CLICK' }} arbeidsforhold={afListe as unknown as AFSimpel[]} />);
 });
 
-describe("Liste over arbeidsforhold", () => {
-  test("inneholder all data", () => {
-    fireEvent.click(screen.getByText("Vis flere arbeidsforhold"));
+describe('Liste over arbeidsforhold', () => {
+    test('inneholder all data', () => {
+        fireEvent.click(screen.getByText('Vis flere arbeidsforhold'));
 
-    afListe.forEach((arbeidsforhold) => {
-      arbeidsforhold.arbeidsgiver.type === "Organisasjon" &&
-        expect(
-          screen.getByText(arbeidsforhold.arbeidsgiver.orgnavn as string)
-        ).toBeInTheDocument();
-      expect(screen.getAllByText(arbeidsforhold.yrke).length).toBeGreaterThan(
-        0
-      );
-      expect(
-        screen.getAllByText(
-          formatDate(arbeidsforhold.ansettelsesperiode.periode.periodeFra)
-        ).length
-      ).toBeGreaterThan(0);
-      arbeidsforhold.ansettelsesperiode.periode.periodeTil &&
-        expect(
-          screen.getAllByText(
-            formatDate(arbeidsforhold.ansettelsesperiode.periode.periodeTil)
-          ).length
-        ).toBeGreaterThan(0);
+        afListe.forEach((arbeidsforhold) => {
+            arbeidsforhold.arbeidsgiver.type === 'Organisasjon' &&
+                expect(screen.getByText(arbeidsforhold.arbeidsgiver.orgnavn as string)).toBeInTheDocument();
+            expect(screen.getAllByText(arbeidsforhold.yrke).length).toBeGreaterThan(0);
+            expect(screen.getAllByText(formatDate(arbeidsforhold.ansettelsesperiode.periode.periodeFra)).length).toBeGreaterThan(0);
+            arbeidsforhold.ansettelsesperiode.periode.periodeTil &&
+                expect(screen.getAllByText(formatDate(arbeidsforhold.ansettelsesperiode.periode.periodeTil)).length).toBeGreaterThan(0);
+        });
     });
-  });
 });
diff --git a/src/components/arbeidsgiver/ArbeidsgiverTittel.tsx b/src/components/arbeidsgiver/ArbeidsgiverTittel.tsx
@@ -1,21 +1,13 @@
-import React from "react";
-import { AFArbeidsgiver } from "../../types/arbeidsforhold";
-import { CheckAndPrint } from "../check-and-print/CheckAndPrint";
-import { fnr } from "../../utils/fnr";
+import React from 'react';
+import { AFArbeidsgiver } from '@/types/arbeidsforhold';
+import { CheckAndPrint } from '../check-and-print/CheckAndPrint';
+import { fnr } from '@/utils/fnr';
 
 interface Props {
-  arbeidsgiver: AFArbeidsgiver;
-  overskrift?: boolean;
+    arbeidsgiver: AFArbeidsgiver;
+    overskrift?: boolean;
 }
 
 export const ArbeidsgiverTittel = (props: Props) => {
-  return (
-    <CheckAndPrint
-      data={
-        props.arbeidsgiver.type === "Person"
-          ? fnr(props.arbeidsgiver.fnr)
-          : props.arbeidsgiver.orgnavn
-      }
-    />
-  );
+    return <CheckAndPrint data={props.arbeidsgiver.type === 'Person' ? fnr(props.arbeidsgiver.fnr) : props.arbeidsgiver.orgnavn} />;
 };
diff --git a/src/components/check-date-and-print/CheckDateAndPrint.tsx b/src/components/check-date-and-print/CheckDateAndPrint.tsx
@@ -3,7 +3,7 @@ import { NoData } from '../no-data/NoData';
 import dayjs from 'dayjs';
 import 'dayjs/locale/nb.js';
 import 'dayjs/locale/nn.js';
-import { parse } from '../../utils/text';
+import { parse } from '@/utils/text';
 import { useLocale } from '../../modules/common/useLocale';
 import { TextIfPdf } from '../text-if-pdf/TextIfPdf';
 import { HelpText } from '@navikt/ds-react';

diff --git a/src/components/check-period-and-print/CheckPeriodAndPrint.tsx b/src/components/check-period-and-print/CheckPeriodAndPrint.tsx
@@ -1,32 +1,25 @@
-import React from "react";
-import { AFPeriode } from "../../types/arbeidsforhold";
-import { NoData } from "../no-data/NoData";
-import { CheckDateAndPrint } from "../check-date-and-print/CheckDateAndPrint";
-import { TextIfPdf } from "../text-if-pdf/TextIfPdf";
+import React from 'react';
+import { AFPeriode } from '@/types/arbeidsforhold';
+import { NoData } from '../no-data/NoData';
+import { CheckDateAndPrint } from '../check-date-and-print/CheckDateAndPrint';
+import { TextIfPdf } from '../text-if-pdf/TextIfPdf';
 
 interface Props {
-  data?: AFPeriode;
-  twoLines?: boolean;
-  format?: string;
-  maskineltAvsluttet?: string | null;
+    data?: AFPeriode;
+    twoLines?: boolean;
+    format?: string;
+    maskineltAvsluttet?: string | null;
 }
 
 export const CheckPeriodAndPrint = (props: Props) => {
-  return props.data ? (
-    <span>
-      <CheckDateAndPrint
-        data={props.data.periodeFra}
-        dateFormat={props.format}
-      />
-      <TextIfPdf>{` - `}</TextIfPdf>
-      {props.twoLines && <br />}
-      <CheckDateAndPrint
-        data={props.data.periodeTil}
-        dateFormat={props.format}
-        maskineltAvsluttet={props.maskineltAvsluttet}
-      />
-    </span>
-  ) : (
-    <NoData />
-  );
+    return props.data ? (
+        <span>
+            <CheckDateAndPrint data={props.data.periodeFra} dateFormat={props.format} />
+            <TextIfPdf>{` - `}</TextIfPdf>
+            {props.twoLines && <br />}
+            <CheckDateAndPrint data={props.data.periodeTil} dateFormat={props.format} maskineltAvsluttet={props.maskineltAvsluttet} />
+        </span>
+    ) : (
+        <NoData />
+    );
 };
diff --git a/src/components/error/Error.tsx b/src/components/error/Error.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Alert } from '@navikt/ds-react';
-import { sprak } from '../../language/provider';
+import { sprak } from '@/language/provider';
 import { useLocale } from '../../modules/common/useLocale';
 
 export interface HTTPError {

diff --git a/src/components/pdf-check-and-print-box/PDFCheckAndPrintBox.tsx b/src/components/pdf-check-and-print-box/PDFCheckAndPrintBox.tsx
@@ -1,50 +1,44 @@
-import React from "react";
-import { CheckDateAndPrint } from "../check-date-and-print/CheckDateAndPrint";
-import { CheckAndPrint } from "../check-and-print/CheckAndPrint";
-import { CheckPeriodAndPrint } from "../check-period-and-print/CheckPeriodAndPrint";
-import { Text, View } from "@react-pdf/renderer";
-import { AFPeriode } from "../../types/arbeidsforhold";
-import { pdfStyles } from "../../modules/common/pdfStyles";
+import React from 'react';
+import { CheckDateAndPrint } from '../check-date-and-print/CheckDateAndPrint';
+import { CheckAndPrint } from '../check-and-print/CheckAndPrint';
+import { CheckPeriodAndPrint } from '../check-period-and-print/CheckPeriodAndPrint';
+import { Text, View } from '@react-pdf/renderer';
+import { AFPeriode } from '@/types/arbeidsforhold';
+import { pdfStyles } from '../../modules/common/pdfStyles';
 
 type Props = {
-  title: string;
-  children?: string | JSX.Element | JSX.Element[];
-  format?: string;
-  period?: boolean;
+    title: string;
+    children?: string | JSX.Element | JSX.Element[];
+    format?: string;
+    period?: boolean;
 } & (
-  | {
-      date?: undefined;
-      period?: undefined;
-      data?: string | number;
-    }
-  | {
-      date: true;
-      period?: undefined;
-      data?: string | number;
-    }
-  | {
-      date?: undefined;
-      period: true;
-      data?: AFPeriode;
-    }
+    | {
+          date?: undefined;
+          period?: undefined;
+          data?: string | number;
+      }
+    | {
+          date: true;
+          period?: undefined;
+          data?: string | number;
+      }
+    | {
+          date?: undefined;
+          period: true;
+          data?: AFPeriode;
+      }
 );
 
 export const PDFCheckAndPrintBox = (props: Props) => {
-  return props.data ? (
-    <View style={[pdfStyles.twoColumns, pdfStyles.section]}>
-      <Text style={pdfStyles.h3}>{props.title}</Text>
-      <Text style={pdfStyles.normaltekst}>
-        {props.date && (
-          <CheckDateAndPrint data={props.data} format={props.format} />
-        )}
-        {props.period && (
-          <CheckPeriodAndPrint data={props.data} format={props.format} />
-        )}
-        {!props.date && !props.period && (
-          <CheckAndPrint data={props.data} format={props.format} />
-        )}
-      </Text>
-      {props.children}
-    </View>
-  ) : null;
+    return props.data ? (
+        <View style={[pdfStyles.twoColumns, pdfStyles.section]}>
+            <Text style={pdfStyles.h3}>{props.title}</Text>
+            <Text style={pdfStyles.normaltekst}>
+                {props.date && <CheckDateAndPrint data={props.data} format={props.format} />}
+                {props.period && <CheckPeriodAndPrint data={props.data} format={props.format} />}
+                {!props.date && !props.period && <CheckAndPrint data={props.data} format={props.format} />}
+            </Text>
+            {props.children}
+        </View>
+    ) : null;
 };
diff --git a/src/language/provider.ts b/src/language/provider.ts
@@ -1,12 +1,12 @@
-import { nb } from "./nb";
-import { en } from "./en";
-import { nn } from "./nn";
-import { Locale } from "../types/locale";
+import { nb } from './nb';
+import { en } from './en';
+import { nn } from './nn';
+import { Locale } from '@/types/locale';
 
 export const sprak = {
-  nb: nb,
-  en: en,
-  nn: nn,
+    nb: nb,
+    en: en,
+    nn: nn,
 } as Sprak;
 
 type Sprak = { [key in Locale]: defaultSprak };

diff --git a/src/modules/af-detaljert/Detaljert.tsx b/src/modules/af-detaljert/Detaljert.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { AFDetaljertData, AFDetaljertProps } from './index';
-import { sprak } from '../../language/provider';
+import { sprak } from '@/language/provider';
 import { ArbeidsavtaleFelter } from './detaljer/ArbeidsavtaleFelter';
 import { DetaljertTabs } from './tabs/DetaljertTabs';
 import { useLocale } from '../common/useLocale';