fjern moment (#3755)

Author: sirimykland

packages/prosess-tilbakekreving/package.json

@@ -31,7 +31,6 @@
     "@navikt/ft-ui-komponenter": "workspace:^",
     "@navikt/ft-utils": "workspace:^",
     "dayjs": "1.11.13",
-    "moment": "2.30.1",
     "react": "19.1.1",
     "react-hook-form": "7.62.0",
     "react-intl": "7.1.11"
@@ -47,7 +46,6 @@
     "@navikt/ft-ui-komponenter": "2.x",
     "@navikt/ft-utils": "2.x",
     "dayjs": "1.11.x",
-    "moment": "2.30.1",
     "react": "19.1.0",
     "react-hook-form": "7.53.0",
     "react-intl": "6.x"

packages/prosess-tilbakekreving/src/components/TilbakekrevingForm.tsx

@@ -2,7 +2,8 @@ import { useEffect, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { Alert, Box, Heading, VStack } from '@navikt/ds-react';
-import moment from 'moment';
+import dayjs from 'dayjs';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 
 import { SubmitButton } from '@navikt/ft-form-hooks';
 import { ForeldelseVurderingType, RelasjonsRolleType } from '@navikt/ft-kodeverk';
@@ -36,8 +37,10 @@ import { AktsomhetFormPanel } from './tilbakekrevingPeriodePaneler/aktsomhet/Akt
 import { BelopetMottattIGodTroFormPanel } from './tilbakekrevingPeriodePaneler/godTro/BelopetMottattIGodTroFormPanel';
 import { TilbakekrevingTimeline } from './timeline/TilbakekrevingTimeline';
 
+dayjs.extend(isSameOrBefore);
+
 const sortPeriods = (periode1: CustomVilkarsVurdertePeriode, periode2: CustomVilkarsVurdertePeriode) =>
-  moment(periode1.fom).diff(moment(periode2.fom));
+  dayjs(periode1.fom).diff(dayjs(periode2.fom));
 
 const harApentAksjonspunkt = (periode: CustomVilkarsVurdertePeriode) =>
   !periode.erForeldet && (periode.begrunnelse === undefined || periode.erSplittet);
@@ -97,15 +100,14 @@ const finnOriginalPeriode = (
   perioder.find(
     // @ts-expect-error Fiks
     (periode: CustomPeriode) =>
-      !moment(lagretPeriode.fom).isBefore(moment(periode.fom)) &&
-      !moment(lagretPeriode.tom).isAfter(moment(periode.tom)),
+      !dayjs(lagretPeriode.fom).isBefore(dayjs(periode.fom)) && !dayjs(lagretPeriode.tom).isAfter(dayjs(periode.tom)),
   );
 
 const erIkkeLagret = (periode: DetaljertFeilutbetalingPeriode, lagredePerioder: { tom: string; fom: string }[]) =>
   lagredePerioder.every(lagretPeriode => {
     const isOverlapping =
-      moment(periode.fom).isSameOrBefore(moment(lagretPeriode.tom)) &&
-      moment(lagretPeriode.fom).isSameOrBefore(moment(periode.tom));
+      dayjs(periode.fom).isSameOrBefore(dayjs(lagretPeriode.tom)) &&
+      dayjs(lagretPeriode.fom).isSameOrBefore(dayjs(periode.tom));
     return !isOverlapping;
   });
 

yarn.lock

@@ -1883,7 +1883,6 @@ __metadata:
     "@testing-library/user-event": 14.6.1
     dayjs: 1.11.13
     eslint: 9.32.0
-    moment: 2.30.1
     react: 19.1.1
     react-hook-form: 7.62.0
     react-intl: 7.1.11
@@ -1902,7 +1901,6 @@ __metadata:
     "@navikt/ft-ui-komponenter": 2.x
     "@navikt/ft-utils": 2.x
     dayjs: 1.11.x
-    moment: 2.30.1
     react: 19.1.0
     react-hook-form: 7.53.0
     react-intl: 6.x
@@ -9183,13 +9181,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:2.30.1":
-  version: 2.30.1
-  resolution: "moment@npm:2.30.1"
-  checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6
-  languageName: node
-  linkType: hard
-
 "mrmime@npm:^2.0.0":
   version: 2.0.1
   resolution: "mrmime@npm:2.0.1"