Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump safe deps #1333

Merged
merged 4 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16,007 changes: 9,001 additions & 7,006 deletions package-lock.json

Large diffs are not rendered by default.

57 changes: 28 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,31 @@
"@navikt/ds-tailwind": "^6.9.0",
"@navikt/ds-tokens": "^6.9.0",
"@reduxjs/toolkit": "^2.5.0",
"@sentry/react": "^8.33.1",
"@vitejs/plugin-react-swc": "^3.7.1",
"@sentry/react": "^8.47.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"classnames": "^2.5.1",
"date-fns": "^3.0.0",
"date-fns": "^4.1.0",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-collapse": "^5.1.1",
"react-custom-scrollbars-2": "^4.5.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-modal": "^3.16.1",
"react-hook-form": "^7.54.2",
"react-modal": "^3.16.3",
"react-pdf": "^7.7.3",
"react-redux": "^9.2.0",
"react-router-dom": "^6.26.2",
"rebound": "^0.1.0",
"reselect": "^4.1.8",
"rollup-plugin-visualizer": "^5.12.0",
"rollup-plugin-visualizer": "^5.13.1",
"source-map-explorer": "^2.5.3",
"typescript": "^5.6.2",
"vite": "^5.4.8",
"typescript": "^5.7.2",
"vite": "^6.0.7",
"vite-plugin-html": "^3.2.2",
"vite-plugin-svgr": "^4.2.0",
"vite-plugin-svgr": "^4.3.0",
"vitest": "^2.1.8",
"zod": "^3.23.8"
"zod": "^3.24.1"
},
"husky": {
"hooks": {
Expand All @@ -83,37 +82,37 @@
]
},
"devDependencies": {
"@swc/cli": "^0.3.14",
"@swc/core": "^1.3.107",
"@testing-library/react": "^14.3.1",
"@swc/cli": "^0.5.2",
"@swc/core": "^1.10.4",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@testing-library/jest-dom": "^6.6.3",
"@types/moment-duration-format": "^2.2.6",
"@types/node": "^18.19.54",
"@types/node": "^22.10.5",
"@types/react": "^18.3.11",
"@types/react-collapse": "^5.0.4",
"@types/react-dom": "^18.3.0",
"@types/react-modal": "^3.16.3",
"@types/react-redux": "^7.1.34",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitest/coverage-v8": "^2.1.1",
"@typescript-eslint/eslint-plugin": "^8.19.0",
"@typescript-eslint/parser": "^8.19.0",
"@vitest/coverage-v8": "^2.1.8",
"autoprefixer": "^10.4.20",
"cross-env": "^7.0.3",
"eslint": "^8.57.1",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-vitest": "^0.2.8",
"husky": "^8.0.3",
"eslint": "^9.17.0",
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-vitest": "^0.5.4",
"husky": "^9.1.7",
"import-sort-style-module": "^6.0.0",
"jsdom": "^22.1.0",
"lint-staged": "^14.0.1",
"jsdom": "^25.0.1",
"lint-staged": "^15.3.0",
"msw": "^1.3.4",
"postcss": "^8.4.33",
"prettier": "^3.3.3",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
"prettier-plugin-import-sort": "0.0.7",
"tailwindcss": "^3.4.13",
"vite-plugin-static-copy": "^1.0.6"
"tailwindcss": "^3.4.17",
"vite-plugin-static-copy": "^2.2.0"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/moduler/aktivitet/aktivitet-selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
oppdaterAktivitetEtikett,
oppdaterStillingFraNavSoknadsstatus,
} from './aktivitet-actions';
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';
import { Historikk } from '../../datatypes/Historikk';
import { selectAktivitet, selectAktiviteterSlice } from './aktivitet-slice';

Expand Down
5 changes: 1 addition & 4 deletions src/moduler/aktivitet/aktivitet-slice.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createEntityAdapter, createSlice, EntityState, isAnyOf } from '@reduxjs/toolkit';
import { createEntityAdapter, createSlice, EntityState, isAnyOf, createSelector } from '@reduxjs/toolkit';

import { Status } from '../../createGenericSlice';
import { VeilarbAktivitet } from '../../datatypes/internAktivitetTypes';
Expand All @@ -17,10 +17,7 @@ import {
settAktivitetTilAvtalt,
} from './aktivitet-actions';
import { RootState } from '../../store';
import { createSelector } from 'reselect';
import { lastAltPaaNyttMedNyBruker } from '../../api/modiaContextHolder';
import { erEksternBruker } from '../../mocks/demo/localStorage';
import { useErVeileder } from '../../Provider';
import { loggDyplenkingTilAnnenBruker } from '../../amplitude/amplitude';

type PerioderMedAktiviteter = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RootState } from '../../../store';
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';

const selectVersjonerSlice = (state: RootState) => state.data.versjoner;

Expand Down
2 changes: 1 addition & 1 deletion src/moduler/aktivitet/aktivitetlisteSelector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';

import { aggregerStatus } from '../../api/utils';
import { BEHANDLING_AKTIVITET_TYPE, MOTE_TYPE, SAMTALEREFERAT_TYPE, STILLING_FRA_NAV_TYPE } from '../../constant';
Expand Down
2 changes: 1 addition & 1 deletion src/moduler/aktivitet/arena-aktivitet-selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Status } from '../../createGenericSlice';
import { RootState } from '../../store';
import { selectErrors, selectFeil } from '../feilmelding/feil-selector';
import { hentArenaAktiviteter } from './arena-aktiviteter-slice';
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';
import { SerializedError } from '../../api/utils';

export const selectArenaAktiviteterSlice = (state: RootState) => state.data.arenaAktiviteter;
Expand Down
12 changes: 8 additions & 4 deletions src/moduler/aktivitet/avslutt/AvbrytAktivitet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import { avbrytAktivitet } from '../aktivitet-actions';
import { trengerBegrunnelse } from '../aktivitet-util';
import { selectAktivitetListeStatus, selectAktivitetMedId } from '../aktivitetlisteSelector';
import BegrunnelseForm from './BegrunnelseForm';
import PubliserReferat from './PubliserReferat';
import ReferatIkkePubliserAdvarsel from './ReferatIkkePubliserAdvarsel';
import VisAdvarsel from './vis-advarsel';
import { RootState } from '../../../store';

const headerTekst = 'Avbrutt aktivitet';
const beskrivelseLabel =
Expand All @@ -22,7 +23,9 @@ const beskrivelseLabel =

const AvbrytAktivitet = () => {
const { id: aktivitetId } = useParams<{ id: string }>();
const valgtAktivitet = useSelector((state) => (aktivitetId ? selectAktivitetMedId(state, aktivitetId) : undefined));
const valgtAktivitet = useSelector((state: RootState) =>
aktivitetId ? selectAktivitetMedId(state, aktivitetId) : undefined,
);
const aktivitetListeStatus = useSelector(selectAktivitetListeStatus);

const navigate = useNavigate();
Expand All @@ -41,6 +44,7 @@ const AvbrytAktivitet = () => {
lagrer={lagrer}
onSubmit={async (beskrivelseForm) => {
lagreBegrunnelse(valgtAktivitet, beskrivelseForm.begrunnelse);
navigate(hovedsideRoute());
}}
/>
) : null;
Expand All @@ -60,9 +64,9 @@ const AvbrytAktivitet = () => {
return (
<Modal onClose={() => navigate(hovedsideRoute(), { replace: true })} heading={'Avbryt aktivitet'}>
{valgtAktivitet ? (
<PubliserReferat aktivitet={valgtAktivitet} nyStatus={AktivitetStatus.AVBRUTT}>
<ReferatIkkePubliserAdvarsel aktivitet={valgtAktivitet} nyStatus={AktivitetStatus.AVBRUTT}>
{maaBegrunnes ? begrunnelse : advarsel}
</PubliserReferat>
</ReferatIkkePubliserAdvarsel>
) : (
<Loader />
)}
Expand Down
6 changes: 3 additions & 3 deletions src/moduler/aktivitet/avslutt/FullforAktivitet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { RootState } from '../../../store';
import { fullforAktivitet } from '../aktivitet-actions';
import { selectAktivitetListeStatus, selectAktivitetMedId } from '../aktivitetlisteSelector';
import BegrunnelseForm from './BegrunnelseForm';
import PubliserReferat from './PubliserReferat';
import ReferatIkkePubliserAdvarsel from './ReferatIkkePubliserAdvarsel';
import VisAdvarsel from './vis-advarsel';

const headerTekst = 'Fullført aktivitet';
Expand Down Expand Up @@ -61,13 +61,13 @@ const FullforAktivitet = () => {

return (
<Modal onClose={() => navigate(hovedsideRoute(), { replace: true })} heading="Fullfør aktivitet">
<PubliserReferat aktivitet={valgtAktivitet} nyStatus={AktivitetStatus.FULLFOERT}>
<ReferatIkkePubliserAdvarsel aktivitet={valgtAktivitet} nyStatus={AktivitetStatus.FULLFOERT}>
{valgtAktivitet.avtalt &&
valgtAktivitet.type !== SAMTALEREFERAT_TYPE &&
valgtAktivitet.type !== MOTE_TYPE
? begrunnelse
: advarsel}
</PubliserReferat>
</ReferatIkkePubliserAdvarsel>
</Modal>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const getManglerPubliseringTekst = (aktivitet: SamtalereferatAktivitet | MoteAkt
}
};

const PubliserReferat = ({ aktivitet, nyStatus, children }: Props) => {
const ReferatIkkePubliserAdvarsel = ({ aktivitet, nyStatus, children }: Props) => {
if (manglerPubliseringAvSamtaleReferat(aktivitet, nyStatus)) {
return (
<Alert variant="error" inline>
Expand All @@ -31,4 +31,4 @@ const PubliserReferat = ({ aktivitet, nyStatus, children }: Props) => {
return children;
};

export default PubliserReferat;
export default ReferatIkkePubliserAdvarsel;
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { kanEndreAktivitetDetaljer, selectAktivitetMedId } from '../aktivitetlis
import { selectArenaAktivitetStatus } from '../arena-aktivitet-selector';
import Aktivitetvisning from './Aktivitetvisning';
import AktivitetvisningModal from './AktivitetvisningModal';
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';

const selectAvhengigheter = createSelector(
selectOppfolgingStatus,
Expand Down
2 changes: 1 addition & 1 deletion src/moduler/dialog/dialog-selector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';

import { Status } from '../../createGenericSlice';
import { Dialog } from '../../datatypes/dialogTypes';
Expand Down
2 changes: 1 addition & 1 deletion src/moduler/feilmelding/feil-selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { hentLest } from '../lest/lest-slice';
import { hentMal, oppdaterMal } from '../mal/aktivitetsmal-slice';
import { hentMalListe } from '../mal/malliste-slice';
import { hentOppfolging } from '../oppfolging-status/oppfolging-slice';
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';
import { RootState } from '../../store';

export const selectFeil = (errors: RootState['data']['errors'], ...types: string[]): SerializedError[] => {
Expand Down
3 changes: 1 addition & 2 deletions src/moduler/filtrering/filter/valgt-periode-slice.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import { createSlice, PayloadAction, createSelector } from '@reduxjs/toolkit';
import { RootState } from '../../../store';
import { createSelector } from 'reselect';

const valgtPeriodeSlice = createSlice({
name: 'valgtPeriodeSlice',
Expand Down
2 changes: 1 addition & 1 deletion src/moduler/oppfolging-status/oppfolging-selector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSelector } from 'reselect';
import { createSelector } from '@reduxjs/toolkit';
import { compareDesc } from 'date-fns';

import { RootState } from '../../store';
Expand Down
2 changes: 0 additions & 2 deletions src/utils.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
.clearfix {
*zoom: 1;

&:after {
content: '';
display: block;
Expand Down
Loading