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

Minor updates #1455

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
104 changes: 52 additions & 52 deletions package.json
Expand Up @@ -33,20 +33,20 @@
"@navikt/ds-tokens": "2.0.x",
"@navikt/familie-backend": "^10.0.1",
"@navikt/familie-form-elements": "^9.0.0",
"@navikt/familie-http": "^6.0.0",
"@navikt/familie-http": "^6.0.2",
"@navikt/familie-logging": "^6.0.0",
"@navikt/familie-skjema": "^7.0.0",
"@navikt/familie-tidslinje": "^5.0.0",
"@navikt/familie-skjema": "^7.0.6",
"@navikt/familie-tidslinje": "^5.1.1",
"@navikt/familie-typer": "^8.0.0",
"@navikt/familie-visittkort": "^7.0.0",
"@navikt/flagg-ikoner": "^3.2.7",
"@navikt/hoykontrast": "^3.1.3",
"@navikt/land-verktoy": "^3.2.10",
"@navikt/landvelger": "^3.1.5",
"@sentry/browser": "^7.21.1",
"@sentry/core": "^7.21.1",
"@sentry/tracing": "^7.21.1",
"@sentry/webpack-plugin": "^1.20.0",
"@sentry/browser": "^7.57.0",
"@sentry/core": "^7.57.0",
"@sentry/tracing": "^7.57.0",
"@sentry/webpack-plugin": "^1.20.1",
"@types/classnames": "^2.3.1",
"@types/deep-equal": "^1.0.1",
"@types/express": "^4.17.14",
Expand All @@ -57,12 +57,12 @@
"@types/styled-components": "^5.1.26",
"@types/uuid": "^8.3.4",
"axios": "^0.27.2",
"babel-loader": "^9.1.0",
"babel-loader": "^9.1.2",
"classnames": "^2.3.2",
"constate": "^3.3.2",
"date-fns": "^2.29.3",
"deep-equal": "^2.1.0",
"dotenv": "^16.0.3",
"date-fns": "^2.30.0",
"deep-equal": "^2.2.1",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"http-proxy-middleware": "^2.0.6",
"nav-datovelger": "^12.6.0",
Expand All @@ -82,77 +82,77 @@
"react-collapse": "^5.1.1",
"react-day-picker": "^7.4.10",
"react-dom": "^18.2.0",
"react-modal": "3.15.x",
"react-router-dom": "^6.4.3",
"react-modal": "3.16.x",
"react-router-dom": "^6.14.1",
"request": "^2.88.2",
"request-promise": "^4.2.6",
"snyk": "^1.1061.0",
"styled-components": "^5.3.6",
"snyk": "^1.1187.0",
"styled-components": "^5.3.11",
"uuid": "^9.0.0"
},
"devDependencies": {
"@axe-core/react": "^4.5.2",
"@babel/core": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@jest/types": "^29.3.1",
"@peculiar/webcrypto": "^1.4.1",
"@axe-core/react": "^4.7.3",
"@babel/core": "^7.22.6",
"@babel/preset-react": "^7.22.5",
"@jest/types": "^29.6.0",
"@peculiar/webcrypto": "^1.4.3",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/case-sensitive-paths-webpack-plugin": "^2.1.6",
"@types/jest": "^29.2.3",
"@types/webpack-env": "^1.18.0",
"@types/jest": "^29.5.2",
"@types/webpack-env": "^1.18.1",
"@types/webpack-hot-middleware": "^2.25.6",
"@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.44.0",
"babel-jest": "^29.3.1",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"babel-jest": "^29.6.0",
"babel-polyfill": "^6.26.0",
"babel-preset-react-app": "^10.0.1",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"compression-webpack-plugin": "^10.0.0",
"css-loader": "^6.7.2",
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^4.2.2",
"eslint": "^8.28.0",
"eslint": "^8.44.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^27.1.6",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.2",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^5.9.1",
"eslint-plugin-testing-library": "^5.11.0",
"eslint-webpack-plugin": "^3.2.0",
"express-static-gzip": "^2.1.7",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.0",
"husky": "^8.0.2",
"html-webpack-plugin": "^5.5.3",
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"jest-mock-extended": "^3.0.1",
"jest": "^29.6.0",
"jest-environment-jsdom": "^29.6.0",
"jest-mock-extended": "^3.0.4",
"less": "^4.1.3",
"less-loader": "^11.1.0",
"lint-staged": "^13.0.4",
"prettier": "^2.8.0",
"less-loader": "^11.1.3",
"lint-staged": "^13.2.3",
"prettier": "^2.8.8",
"react-refresh": "^0.14.0",
"style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.3.6",
"ts-jest": "^29.0.3",
"ts-loader": "^9.4.1",
"style-loader": "^3.3.3",
"terser-webpack-plugin": "^5.3.9",
"ts-jest": "^29.1.1",
"ts-loader": "^9.4.4",
"ts-node": "^10.9.1",
"tsconfig-paths-webpack-plugin": "^4.0.0",
"typescript": "^4.9.3",
"tsconfig-paths-webpack-plugin": "^4.0.1",
"typescript": "^4.9.5",
"typescript-eslint": "^0.0.1-alpha.0",
"webpack": "^5.76.1",
"webpack-cli": "^5.0.0",
"webpack-dev-middleware": "^6.0.0",
"webpack-hot-middleware": "^2.25.3",
"webpack-merge": "^5.8.0"
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4",
"webpack-dev-middleware": "^6.1.1",
"webpack-hot-middleware": "^2.25.4",
"webpack-merge": "^5.9.0"
},
"snyk": true
}
2 changes: 1 addition & 1 deletion src/backend/server.ts
Expand Up @@ -13,7 +13,6 @@ import webpackHotMiddleware from 'webpack-hot-middleware';
import backend, { IApp, ensureAuthenticated, envVar } from '@navikt/familie-backend';
import { logInfo } from '@navikt/familie-logging';

import config from '../../src/webpack/webpack.dev';
import { oboHistorikkConfig, oboTilbakeConfig, sessionConfig } from './config';
import { prometheusTellere } from './metrikker';
import {
Expand All @@ -25,6 +24,7 @@ import {
doRedirectProxy,
} from './proxy';
import setupRouter from './router';
import config from '../../src/webpack/webpack.dev';

const port = 8000;

Expand Down
36 changes: 18 additions & 18 deletions src/dev-server/mock-routes.ts
Expand Up @@ -4,24 +4,6 @@ import { Request, Response, Router } from 'express';

import { byggFeiletRessurs, byggSuksessRessurs, RessursStatus } from '@navikt/familie-typer';

import {
Aktsomhet,
Foreldelsevurdering,
HendelseType,
HendelseUndertype,
SærligeGrunner,
Vilkårsresultat,
} from '../frontend/kodeverk';
import {
FaktaPeriode,
ForeldelsePeriode,
IFeilutbetalingFakta,
IFeilutbetalingForeldelse,
IFeilutbetalingVilkårsvurdering,
Periode,
VilkårsresultatInfo,
VilkårsvurderingPeriode,
} from '../frontend/typer/feilutbetalingtyper';
import { fagsak_ba2, ba_behandling_4, ba_behandling_5 } from './mock/ba2/BA_fagsak_2';
import {
fagsak_ba3,
Expand Down Expand Up @@ -70,6 +52,24 @@ import {
feilutbetalingVilkårsvurdering_ubehandlet_3,
feilutbetalingVilkårsvurdering_ubehandlet_4,
} from './mock/vilkårsvurdering/feilutbetalingVilkårsvurdering_ubehandlet';
import {
Aktsomhet,
Foreldelsevurdering,
HendelseType,
HendelseUndertype,
SærligeGrunner,
Vilkårsresultat,
} from '../frontend/kodeverk';
import {
FaktaPeriode,
ForeldelsePeriode,
IFeilutbetalingFakta,
IFeilutbetalingForeldelse,
IFeilutbetalingVilkårsvurdering,
Periode,
VilkårsresultatInfo,
VilkårsvurderingPeriode,
} from '../frontend/typer/feilutbetalingtyper';

const behandleFaktaPerioder = (
perioder: FaktaPeriode[],
Expand Down
2 changes: 1 addition & 1 deletion src/dev-server/mock-server.ts
Expand Up @@ -4,8 +4,8 @@ import webpack from 'webpack';
import webpackDevMiddleware from 'webpack-dev-middleware';
import webpackHotMiddleware from 'webpack-hot-middleware';

import config from '../../src/webpack/webpack.dev';
import { setupRouter } from './mock-routes';
import config from '../../src/webpack/webpack.dev';

const port = 8008;

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/context/BehandlingContext.tsx
Expand Up @@ -12,6 +12,7 @@ import {
RessursStatus,
} from '@navikt/familie-typer';

import { useFagsak } from './FagsakContext';
import {
Behandlingssteg,
Behandlingsstegstatus,
Expand All @@ -20,7 +21,6 @@ import {
IBehandlingsstegstilstand,
} from '../typer/behandling';
import { IFagsak } from '../typer/fagsak';
import { useFagsak } from './FagsakContext';

const erStegUtført = (status: Behandlingsstegstatus) => {
return status === Behandlingsstegstatus.UTFØRT || status === Behandlingsstegstatus.AUTOUTFØRT;
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/komponenter/App.tsx
Expand Up @@ -5,10 +5,10 @@ import '@navikt/ds-css-internal';
import { Modal } from '@navikt/ds-react';
import { type ISaksbehandler } from '@navikt/familie-typer';

import { hentInnloggetBruker } from '../api/saksbehandler';
import { AppProvider } from '../context/AppContext';
import Container from './Container';
import ErrorBoundary from './Felleskomponenter/ErrorBoundary/ErrorBoundary';
import { hentInnloggetBruker } from '../api/saksbehandler';
import { AppProvider } from '../context/AppContext';

Modal?.setAppElement?.(document.getElementById('modal-a11y-wrapper'));

Expand Down
6 changes: 3 additions & 3 deletions src/frontend/komponenter/Container.tsx
Expand Up @@ -2,14 +2,14 @@ import * as React from 'react';

import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';

import { useApp } from '../context/AppContext';
import { BehandlingProvider } from '../context/BehandlingContext';
import { FagsakProvider } from '../context/FagsakContext';
import FagsakContainer from './Fagsak/FagsakContainer';
import Dashboard from './Felleskomponenter/Dashboard';
import Feilmelding from './Felleskomponenter/Feilmelding';
import FTHeader from './Felleskomponenter/FTHeader/FTHeader';
import UgyldigSesjon from './Felleskomponenter/Modal/SesjonUtløpt';
import { useApp } from '../context/AppContext';
import { BehandlingProvider } from '../context/BehandlingContext';
import { FagsakProvider } from '../context/FagsakContext';

const Container: React.FC = () => {
const { autentisert, innloggetSaksbehandler } = useApp();
Expand Down
16 changes: 8 additions & 8 deletions src/frontend/komponenter/Fagsak/BehandlingContainer.tsx
Expand Up @@ -6,14 +6,6 @@ import styled from 'styled-components';
import { BodyShort } from '@navikt/ds-react';
import { ABorderDefault, ASpacing3 } from '@navikt/ds-tokens/dist/tokens';

import { useBehandling } from '../../context/BehandlingContext';
import { Behandlingstatus, IBehandling } from '../../typer/behandling';
import { IFagsak } from '../../typer/fagsak';
import {
erØnsketSideTilgjengelig,
finnSideAktivtSteg,
} from '../Felleskomponenter/Venstremeny/sider';
import Venstremeny from '../Felleskomponenter/Venstremeny/Venstremeny';
import BrevmottakerContainer from './Brevmottaker/BrevmottakerContainer';
import { BrevmottakerProvider } from './Brevmottaker/BrevmottakerContext';
import FaktaContainer from './Fakta/FaktaContainer';
Expand All @@ -27,6 +19,14 @@ import VergeContainer from './Verge/VergeContainer';
import { VergeProvider } from './Verge/VergeContext';
import { FeilutbetalingVilkårsvurderingProvider } from './Vilkårsvurdering/FeilutbetalingVilkårsvurderingContext';
import VilkårsvurderingContainer from './Vilkårsvurdering/VilkårsvurderingContainer';
import { useBehandling } from '../../context/BehandlingContext';
import { Behandlingstatus, IBehandling } from '../../typer/behandling';
import { IFagsak } from '../../typer/fagsak';
import {
erØnsketSideTilgjengelig,
finnSideAktivtSteg,
} from '../Felleskomponenter/Venstremeny/sider';
import Venstremeny from '../Felleskomponenter/Venstremeny/Venstremeny';

const BEHANDLING_KONTEKST_PATH = '/behandling/:behandlingId';

Expand Down
Expand Up @@ -7,9 +7,9 @@ import { Button, Heading } from '@navikt/ds-react';
import { AFontWeightBold } from '@navikt/ds-tokens/dist/tokens';
import CountryData from '@navikt/land-verktoy';

import { useBrevmottaker } from './BrevmottakerContext';
import { useBehandling } from '../../../context/BehandlingContext';
import { IBrevmottaker, MottakerType, mottakerTypeVisningsnavn } from '../../../typer/Brevmottaker';
import { useBrevmottaker } from './BrevmottakerContext';

const FlexDiv = styled.div`
display: flex;
Expand Down
Expand Up @@ -5,10 +5,10 @@ import styled from 'styled-components';
import { AddCircle } from '@navikt/ds-icons';
import { Button, Heading } from '@navikt/ds-react';

import { useBehandling } from '../../../context/BehandlingContext';
import Brevmottaker from './Brevmottaker';
import { useBrevmottaker } from './BrevmottakerContext';
import { LeggTilEndreBrevmottakerModal } from './LeggTilEndreBrevmottakerModal';
import { useBehandling } from '../../../context/BehandlingContext';

const StyledBrevmottaker = styled.div`
padding: 2.5rem;
Expand Down
Expand Up @@ -8,8 +8,8 @@ import { FamilieInput } from '@navikt/familie-form-elements';
import { Valideringsstatus } from '@navikt/familie-skjema';
import CountrySelect from '@navikt/landvelger';

import { MottakerType } from '../../../typer/Brevmottaker';
import { useBrevmottaker } from './BrevmottakerContext';
import { MottakerType } from '../../../typer/Brevmottaker';

const PostnummerOgStedContainer = styled.div`
display: grid;
Expand Down
Expand Up @@ -7,15 +7,15 @@ import { ASpacing2, ASpacing6 } from '@navikt/ds-tokens/dist/tokens';
import { FamilieInput, FamilieSelect } from '@navikt/familie-form-elements';
import { RessursStatus } from '@navikt/familie-typer';

import { useBrevmottaker } from './BrevmottakerContext';
import BrevmottakerSkjema from './BrevmottakerSkjema';
import { useBehandling } from '../../../context/BehandlingContext';
import {
AdresseKilde,
adresseKilder,
MottakerType,
mottakerTypeVisningsnavn,
} from '../../../typer/Brevmottaker';
import { useBrevmottaker } from './BrevmottakerContext';
import BrevmottakerSkjema from './BrevmottakerSkjema';

const StyledModal = styled(Modal)`
padding: 1rem;
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/komponenter/Fagsak/FagsakContainer.tsx
Expand Up @@ -6,6 +6,8 @@ import styled from 'styled-components';
import { Alert } from '@navikt/ds-react';
import { RessursStatus } from '@navikt/familie-typer';

import BehandlingContainer from './BehandlingContainer';
import Personlinje from './Personlinje/Personlinje';
import { useBehandling } from '../../context/BehandlingContext';
import { useFagsak } from '../../context/FagsakContext';
import { Fagsystem } from '../../kodeverk';
Expand All @@ -14,8 +16,6 @@ import { formatterDatostring } from '../../utils';
import { FTAlertStripe } from '../Felleskomponenter/Flytelementer';
import HenterBehandling from '../Felleskomponenter/Modal/HenterBehandling';
import PåVentModal from '../Felleskomponenter/Modal/PåVent/PåVentModal';
import BehandlingContainer from './BehandlingContainer';
import Personlinje from './Personlinje/Personlinje';

const FagsakContainerContent = styled.div`
display: flex;
Expand Down