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

Bumper pakker #6940

Merged
merged 6 commits into from
Dec 19, 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
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
"@navikt/ds-react": "7.6.0",
"@navikt/ds-tailwind": "^7.6.0",
"@navikt/familie-endringslogg": "13.1.4",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"@popperjs/core": "2.11.8",
"@sentry/browser": "8.43.0",
"@sentry/react": "^8.43.0",
"@sentry/browser": "8.46.0",
"@sentry/react": "^8.46.0",
"axios": "1.7.9",
"date-fns": "4.1.0",
"date-fns-tz": "3.2.0",
Expand Down Expand Up @@ -84,15 +84,15 @@
"@testing-library/user-event": "14.5.2",
"@types/history": "5.0.0",
"@types/object-hash": "^3.0.6",
"@types/prop-types": "15.7.13",
"@types/react": "18.3.12",
"@types/prop-types": "15.7.14",
"@types/react": "18.3.17",
"@types/react-collapse": "5.0.4",
"@types/redux-form": "8.3.11",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"axios-mock-adapter": "2.1.0",
"cross-env": "7.0.3",
"eslint": "9.16.0",
"eslint": "9.17.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.2",
Expand All @@ -101,19 +101,19 @@
"husky": "9.1.7",
"jsdom": "25.0.1",
"lint-staged": "15.2.11",
"msw": "2.6.8",
"msw": "2.7.0",
"msw-storybook-addon": "^2.0.4",
"postcss": "^8.4.49",
"prettier": "3.4.2",
"react-popper": "2.3.0",
"storybook": "^8.4.7",
"stylelint": "16.11.0",
"stylelint": "16.12.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-order": "6.0.4",
"tailwindcss": "^3.4.16",
"tailwindcss": "^3.4.17",
"typed-css-modules": "^0.9.1",
"typescript": "5.7.2",
"typescript-eslint": "^8.18.0",
"typescript-eslint": "^8.18.1",
"vite": "^6.0.3",
"vite-plugin-html": "^3.2.2",
"vitest": "2.1.8",
Expand Down
16 changes: 0 additions & 16 deletions packages/assets/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -234,22 +234,6 @@ som fra core/og muligen import fra alla andra komponenter
border-color: #c9c9c9;
}

.undefined {
background-color: rgb(255 145 0 / 80%);
border-color: rgb(255 145 0 / 80%);
border-radius: 8px;
}

.undefined:active {
background-color: var(--a-orange-200);
border-color: var(--a-orange-500);
}

.undefined.vis-item.vis-selected {
background-color: var(--a-orange-500);
border: 1px solid #4a4a4a;
}

.avslatt.vis-item.vis-selected {
background-color: #ba3a26;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/behandling-felles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"classnames": "2.5.1",
"react": "18.3.1",
"react-intl": "7.0.1",
Expand Down
10 changes: 7 additions & 3 deletions packages/behandling-felles/src/components/SideMenuWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { SideMenu, WarningIcon } from '@navikt/ft-plattform-komponenter';
import React, { ReactNode } from 'react';
import { SideMenu } from '@navikt/ft-plattform-komponenter';
import { ReactNode } from 'react';
import { WrappedComponentProps, injectIntl } from 'react-intl';

import { FlexColumn, FlexContainer, FlexRow } from '@fpsak-frontend/shared-components';

import FaktaPanelMenyRad from '../types/faktaPanelMenyRadTsType';

import { ExclamationmarkTriangleFillIcon } from '@navikt/aksel-icons';
import styles from './sideMenuWrapper.module.css';

interface OwnProps {
Expand All @@ -25,7 +26,10 @@ const SideMenuWrapper = ({ intl, paneler, onClick, children }: OwnProps & Wrappe
label: intl.formatMessage({ id: panel.tekstKode }),
active: panel.erAktiv,
icon: panel.harAksjonspunkt ? (
<WarningIcon alt={intl.formatMessage({ id: 'HelpText.Aksjonspunkt' })} />
<ExclamationmarkTriangleFillIcon
fontSize="1.25rem"
style={{ color: 'var(--ac-alert-icon-warning-color,var(--a-icon-warning))', fontSize: '1.25rem' }}
/>
) : undefined,
}))}
onClick={onClick}
Expand Down
4 changes: 2 additions & 2 deletions packages/behandling-frisinn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "7.1.9",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.9",
"@navikt/ft-fakta-beregning": "7.1.10",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.10",
"react": "18.3.1",
"react-intl": "7.0.1"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-omsorgspenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "7.1.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.9",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.9",
"@navikt/ft-fakta-beregning": "7.1.10",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.10",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.10",
"react": "18.3.1",
"react-intl": "7.0.1"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-opplaeringspenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "7.1.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.9",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.9",
"@navikt/ft-fakta-beregning": "7.1.10",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.10",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.10",
"axios": "1.7.9",
"react": "18.3.1",
"react-intl": "7.0.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-pleiepenger-sluttfase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "7.1.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.9",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.9",
"@navikt/ft-fakta-beregning": "7.1.10",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.10",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.10",
"axios": "1.7.9",
"react": "18.3.1",
"react-intl": "7.0.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-pleiepenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/diagnosekoder": "^1.2024.1",
"@navikt/ft-fakta-beregning": "7.1.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.9",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.9",
"@navikt/ft-fakta-beregning": "7.1.10",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.1.10",
"@navikt/ft-prosess-beregningsgrunnlag": "7.1.10",
"axios": "1.7.9",
"react": "18.3.1",
"react-intl": "7.0.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/behandling-tilbakekreving/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-kodeverk": "^2.5.9",
"@navikt/ft-prosess-tilbakekreving-foreldelse": "3.5.9",
"@navikt/ft-kodeverk": "^2.5.10",
"@navikt/ft-prosess-tilbakekreving-foreldelse": "3.5.10",
"react": "18.3.1",
"react-intl": "7.0.1"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import React from 'react';

import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import aksjonspunktStatus from '@fpsak-frontend/kodeverk/src/aksjonspunktStatus';
import behandlingStatus from '@fpsak-frontend/kodeverk/src/behandlingStatus';
Expand All @@ -9,10 +7,10 @@ import opplysningAdresseType from '@fpsak-frontend/kodeverk/src/opplysningAdress
import personstatusType from '@fpsak-frontend/kodeverk/src/personstatusType';
import sivilstandType from '@fpsak-frontend/kodeverk/src/sivilstandType';
import { renderWithIntlAndReduxForm } from '@fpsak-frontend/utils-test/test-utils';
import { fagsakYtelsesType } from '@k9-sak-web/backend/k9sak/kodeverk/FagsakYtelsesType.js';
import { Behandling, Fagsak } from '@k9-sak-web/types';
import { act, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { fagsakYtelsesType } from '@k9-sak-web/backend/k9sak/kodeverk/FagsakYtelsesType.js';
import { requestUnntakApi, UnntakBehandlingApiKeys } from '../data/unntakBehandlingApi';
import FetchedData from '../types/fetchedDataTsType';
import UnntakFakta from './UnntakFakta';
Expand Down Expand Up @@ -149,7 +147,7 @@ describe('<UnntakFakta>', () => {
/>,
);

expect(screen.getByRole('button', { name: 'Arbeidsforhold Aksjonspunkt' })).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Arbeidsforhold' })).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Inntekt og ytelser' })).toBeInTheDocument();
expect(screen.getByText('Avklar om arbeidsforholdene skal benyttes i behandlingen')).toBeInTheDocument();
});
Expand Down Expand Up @@ -181,7 +179,7 @@ describe('<UnntakFakta>', () => {
);

await act(async () => {
await userEvent.click(screen.getByRole('button', { name: 'Arbeidsforhold Aksjonspunkt' }));
await userEvent.click(screen.getByRole('button', { name: 'Arbeidsforhold' }));
});

const { calls } = oppdaterProsessStegOgFaktaPanelIUrl.mock;
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-direkte-overgang/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"formik": "2.4.6",
"react": "18.3.1",
"react-intl": "7.0.1",
"yup": "1.5.0"
"yup": "1.6.1"
},
"peerDependencies": {
"dayjs": "1.10.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-etablert-tilsyn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@navikt/ds-css": "7.6.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.6.0",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand Down
6 changes: 3 additions & 3 deletions packages/fakta-inntektsmelding/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"author": "NAV IT",
"license": "MIT",
"devDependencies": {
"msw": "2.6.8",
"msw": "2.7.0",
"vite": "^6.0.3",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
"@navikt/ds-css": "7.6.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.6.0",
"@navikt/ft-form-hooks": "5.2.8",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-form-hooks": "5.2.9",
"@navikt/ft-plattform-komponenter": "5.3.0",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-institusjon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@fpsak-frontend/form": "*",
"@k9-sak-web/types": "*",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"formik": "2.4.6"
}
}
6 changes: 3 additions & 3 deletions packages/fakta-medisinsk-vilkår/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"cors": "^2.8.5",
"msw": "2.6.8",
"msw": "2.7.0",
"vite": "^6.0.3",
"vite-plugin-node-polyfills": "^0.22.0"
},
Expand All @@ -21,9 +21,9 @@
"@navikt/ds-css": "7.6.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.6.0",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"@popperjs/core": "2.11.8",
"@tanstack/react-query": "^5.62.7",
"@tanstack/react-query": "^5.62.8",
"axios": "1.7.9",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Diagnosekodeoversikt = ({ onDiagnosekoderUpdated }: DiagnosekodeoversiktPr
const { diagnosekoder, links, behandlingUuid, versjon } = data;
const endreDiagnosekoderLink = findLinkByRel(LinkRel.ENDRE_DIAGNOSEKODER, links);

const {diagnosekodeObjekter, diagnosekodeObjekterLaster} = useQueries({
const { diagnosekodeObjekter, diagnosekodeObjekterLaster } = useQueries({
queries: diagnosekoder.map(diagnosekode => ({
queryKey: ['diagnosekode', diagnosekode],
queryFn: () => fetchDiagnosekoderByQuery(diagnosekode),
Expand All @@ -62,9 +62,9 @@ const Diagnosekodeoversikt = ({ onDiagnosekoderUpdated }: DiagnosekodeoversiktPr
combine: results => {
return {
diagnosekodeObjekter: results.map(r => r.data),
diagnosekodeObjekterLaster: results.some(r => r.isPending)
}
}
diagnosekodeObjekterLaster: results.some(r => r.isPending),
};
},
});

const focusAddButton = () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/fakta-medlemskap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@fpsak-frontend/prop-types": "1.0.0",
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@navikt/ft-form-hooks": "5.2.8",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-form-hooks": "5.2.9",
"@navikt/ft-plattform-komponenter": "5.3.0",
"i18n-iso-countries": "7.13.0",
"moment": "2.30.1",
"prop-types": "15.8.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/fakta-om-barnet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"dev": "vite serve"
},
"devDependencies": {
"msw": "2.6.8",
"msw": "2.7.0",
"vite": "^6.0.3",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
"@navikt/ds-react": "7.6.0",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand All @@ -25,7 +25,7 @@
"react-dom": "18.3.1",
"react-hook-form": "7.53.2",
"react-popper": "2.3.0",
"tailwindcss": "^3.4.16"
"tailwindcss": "^3.4.17"
},
"msw": {
"workerDirectory": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/fakta-omsorgen-for/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dev": "vite serve"
},
"devDependencies": {
"msw": "2.6.8",
"msw": "2.7.0",
"vite": "^6.0.3",
"vite-plugin-node-polyfills": "^0.22.0"
},
Expand All @@ -19,7 +19,7 @@
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.6.0",
"@navikt/fnrvalidator": "2.1.5",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand Down
4 changes: 2 additions & 2 deletions packages/fakta-opplaering/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"@k9-sak-web/types": "*",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.6.0",
"@navikt/ft-plattform-komponenter": "5.1.5",
"@navikt/ft-plattform-komponenter": "5.3.0",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"formik": "2.4.6",
"react-intl": "7.0.1",
"react-outside-click-handler": "1.3.0",
"uuid": "11.0.3",
"yup": "1.5.0"
"yup": "1.6.1"
}
}
Loading
Loading