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

chore. Bump siste versjon av avhengighet #1213

Merged
merged 1 commit into from
Apr 4, 2024
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
1,298 changes: 633 additions & 665 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"dependencies": {
"@navikt/arbeidsgiver-notifikasjon-widget": "^6.4.2",
"@navikt/bedriftsmeny": "^6.13.0",
"@navikt/ds-css": "^5.18.1",
"@navikt/ds-css": "^6.3.6",
"@navikt/ds-icons": "^3.4.3",
"@navikt/ds-react": "^5.18.1",
"@navikt/ds-react": "^6.3.6",
"@navikt/navspa": "^6.0.1",
"amplitude-js": "^8.21.9",
"axios": "^1.6.7",
Expand All @@ -42,7 +42,7 @@
"react-cookie": "^7.0.2",
"react-dom": "^18.2.0",
"react-loading-skeleton": "^3.4.0",
"react-responsive": "^9.0.2",
"react-responsive": "^10.0.0",
"react-router-dom": "^6.22.0",
"react-select": "^5.8.0",
"swr": "^2.2.4"
Expand Down
1 change: 1 addition & 0 deletions server/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@navikt:registry=https://npm.pkg.github.com/
433 changes: 205 additions & 228 deletions server/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"express-async-handler": "1.2.0",
"express-http-proxy": "^2.0.0",
"helmet": "^7.1.0",
"http-proxy-middleware": "^2.0.1",
"http-proxy-middleware": "^3.0.0",
"jsdom": "^24.0.0"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion server/src/proxy/api-proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const setup = (app: Express, audience: string) => {
'/tiltaksgjennomforing/stillingstitler',
createProxyMiddleware({
changeOrigin: true,
pathRewrite: { '^/tiltaksgjennomforing/stillingstitler': '/' },
target: process.env.STILLINGSTITLER_URL,
proxyTimeout: 10000,
}),
Expand Down
2 changes: 1 addition & 1 deletion server/src/proxy/decorator-ekstern-proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ const setup = (app: Express): void => {
),
);

app.use('/dekoratoren', createProxyMiddleware({ target: 'https://www.nav.no', changeOrigin: true }));
app.use('/dekoratoren', createProxyMiddleware({ target: 'https://www.nav.no/dekoratoren', changeOrigin: true }));
};
export default { setup };
1 change: 0 additions & 1 deletion server/src/proxy/labs-proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const setup = (app: Express) => {
'/tiltaksgjennomforing/stillingstitler',
createProxyMiddleware({
changeOrigin: true,
pathRewrite: { '^/tiltaksgjennomforing/stillingstitler': '/' },
target: 'http://tiltak-stillingstitler',
proxyTimeout: 10000,
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ import { AvtaleContext } from '@/AvtaleProvider';
import React, { FunctionComponent, useState, useContext } from 'react';
import './OppdaterOppfølgingsenhet.less';
import BEMHelper from '@/utils/bem';
import { AvtaleMetadata } from '@/types/avtale';
import { BodyShort, Heading, Link, Modal, Loader } from '@navikt/ds-react';
import { oppdaterOppfølgingsEnhet } from '@/services/rest-service';
import { Button } from '@navikt/ds-react';
import { Notes } from '@navikt/ds-icons/cjs';
import { Feilkode, Feilmeldinger } from '@/types/feilkode';

export type OppdaterOppfølgingEnhet = Pick<AvtaleMetadata, 'enhetOppfolging' | 'enhetsnavnOppfolging'>;

const OppdaterOppfølgingsenhet: FunctionComponent = () => {
const cls = BEMHelper('oppdaterOppfølgingsenhet');
const avtaleContext = useContext(AvtaleContext);
Expand Down Expand Up @@ -46,7 +43,7 @@ const OppdaterOppfølgingsenhet: FunctionComponent = () => {
</div>
) : (
<>
{enhetOppfolging === null && laster === false ? (
{enhetOppfolging === null && !laster ? (
<BodyShort size="small"> Finner ikke oppfølgningsenhet for denne avtalen.</BodyShort>
) : (
<div>
Expand Down Expand Up @@ -90,7 +87,6 @@ const OppdaterOppfølgingsenhet: FunctionComponent = () => {
aria-label="Oppdater Oppfølgingsenhet"
className={cls.element('modal')}
aria-modal={modalApen}
aria-labelledby="heading"
aria-describedby="varsellogg for endringsaktiviteter i applikasjonen"
>
<Modal.Body>{oppdatereOppfølgingsenhetInnhold}</Modal.Body>
Expand Down
7 changes: 6 additions & 1 deletion src/AvtaleSide/OvertaAvtalen/UfordeltModusModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ interface Props {

const UfordeltModusModal = (props: Props) => {
return (
<Modal className={cls.element('modal')} open={props.isOpen} onClose={props.lukkModal}>
<Modal
aria-label="Overta avtale -modal"
className={cls.element('modal')}
onClose={props.lukkModal}
open={props.isOpen}
>
<Modal.Body>
<FordelAvtaleVeileder />
</Modal.Body>
Expand Down
1 change: 0 additions & 1 deletion src/AvtaleSide/Varsellogg/Varsellogg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const Varsellogg: FunctionComponent = () => {
aria-label="Varselloggmodal"
className={cls.element('modal')}
aria-modal={varselLoggModalApen}
aria-labelledby="heading"
aria-describedby="varsellogg for endringsaktiviteter i applikasjonen"
>
<Modal.Header>
Expand Down
Loading