Merge branch 'main' into fjerne-avslagsårsak-kortvarig-avbrudd-jobb-f…

…ra-vedtak-og-beregninssiden
navikt · Jan 6, 2025 · 8da4fe2 · 8da4fe2
2 parents d6c9719 + 087a926
commit 8da4fe2
Show file tree

Hide file tree

Showing 12 changed files with 1,254 additions and 729 deletions.
diff --git a/package.json b/package.json
@@ -30,24 +30,24 @@
         "body-parser": "Overrider versjon som  kommer fra familie-frontend backend"
     },
     "dependencies": {
-        "@amplitude/analytics-browser": "2.11.9",
-        "@navikt/aksel-icons": "^7.7.0",
-        "@navikt/ds-css": "7.7.0",
-        "@navikt/ds-react": "7.7.0",
-        "@navikt/ds-tokens": "7.7.0",
+        "@amplitude/analytics-browser": "2.11.11",
+        "@navikt/aksel-icons": "^7.9.0",
+        "@navikt/ds-css": "7.9.0",
+        "@navikt/ds-react": "7.9.0",
+        "@navikt/ds-tokens": "7.9.0",
         "@navikt/familie-backend": "10.1.2",
         "@navikt/familie-endringslogg": "^13.1.4",
         "@navikt/familie-form-elements": "^21.0.2",
-        "@navikt/familie-header": "^14.1.2",
+        "@navikt/familie-header": "^14.2.0",
         "@navikt/familie-logging": "^7.0.2",
         "@navikt/familie-visittkort": "^15.1.2",
         "@navikt/fnrvalidator": "^2.1.5",
-        "@sentry/browser": "^8.42.0",
+        "@sentry/browser": "^8.47.0",
         "@sentry/core": "^8.40.0",
         "@types/express": "^5.0.0",
         "@types/file-saver": "^2.0.7",
-        "@types/react": "^18.3.12",
-        "@types/react-dom": "^18.3.1",
+        "@types/react": "^19.0.2",
+        "@types/react-dom": "^19.0.2",
         "@types/styled-components": "^5.1.34",
         "@types/uuid": "^10.0.0",
         "autoprefixer": "^10.4.20",
@@ -68,12 +68,12 @@
         "passport-azure-ad": "^4.3.5",
         "prom-client": "^15.1.3",
         "quill": "^2.0.3",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "react-pdf": "9.1.1",
-        "react-router-dom": "7.0.2",
-        "react-select": "^5.8.3",
-        "styled-components": "^6.1.13",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
+        "react-pdf": "9.2.1",
+        "react-router-dom": "7.1.1",
+        "react-select": "^5.9.0",
+        "styled-components": "^6.1.14",
         "svg-inline-loader": "^0.8.2",
         "ts-node": "^10.9.2",
         "use-debounce": "^10.0.4",
@@ -91,23 +91,23 @@
         "@types/webpack-dev-middleware": "^5.3.0",
         "@types/webpack-env": "^1.18.5",
         "@types/webpack-hot-middleware": "^2.25.9",
-        "typescript-eslint": "^8.17.0",
+        "typescript-eslint": "^8.19.0",
         "compression-webpack-plugin": "^11.1.0",
         "copy-webpack-plugin": "^12.0.2",
         "css-loader": "^7.1.2",
-        "eslint": "^9.16.0",
+        "eslint": "^9.17.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-jsx-a11y": "^6.10.2",
         "eslint-plugin-prettier": "^5.2.1",
-        "eslint-plugin-react": "^7.37.2",
+        "eslint-plugin-react": "^7.37.3",
         "eslint-plugin-react-hooks": "5.1.0",
         "eslint-webpack-plugin": "^4.2.0",
         "fork-ts-checker-webpack-plugin": "^9.0.2",
         "html-webpack-plugin": "^5.6.3",
         "husky": "^9.1.7",
         "less": "^4.2.1",
         "less-loader": "^12.2.0",
-        "lint-staged": "^15.2.10",
+        "lint-staged": "^15.3.0",
         "mini-css-extract-plugin": "^2.9.2",
         "postcss": "^8.4.49",
         "postcss-loader": "^8.1.1",
@@ -119,13 +119,13 @@
         "typescript": "^5.7.2",
         "vitest": "^2.1.8",
         "webpack": "^5.97.1",
-        "webpack-cli": "^5.1.4",
+        "webpack-cli": "^6.0.1",
         "webpack-dev-middleware": "^7.4.2",
         "webpack-hot-middleware": "^2.26.1",
         "webpack-merge": "^6.0.1"
     },
     "resolutions": {
-        "@types/react": "^18.x",
+        "@types/react": "^19.x",
         "@types/react-select": "^5.x"
     },
     "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"

diff --git a/src/frontend/App/hooks/felles/useEventListener.ts b/src/frontend/App/hooks/felles/useEventListener.ts
diff --git a/src/frontend/Felles/DataViewer/DataViewer.tsx b/src/frontend/Felles/DataViewer/DataViewer.tsx
@@ -60,7 +60,7 @@ const renderChildren = (children: any, response: any): ReactElement => {
 
 function DataViewer<T extends Record<string, unknown>>(
     props: DataViewerProps<T>
-): JSX.Element | null {
+): ReactNode | null {
     const { response, children, alertStripeVariant } = props;
     const responses = Object.values(response);
     if (harNoenRessursMedStatus(responses, RessursStatus.IKKE_TILGANG)) {

diff --git a/src/frontend/Felles/Visningskomponenter/ToKolonnerLayout.tsx b/src/frontend/Felles/Visningskomponenter/ToKolonnerLayout.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import styled from 'styled-components';
 
 const Container = styled.div<{ $skillelinje?: boolean }>`
@@ -30,8 +30,8 @@ const Container = styled.div<{ $skillelinje?: boolean }>`
 interface Props {
     skillelinje?: boolean;
     children: {
-        venstre: JSX.Element;
-        høyre: JSX.Element;
+        venstre: ReactNode;
+        høyre: ReactNode;
     };
 }
 

diff --git a/src/frontend/Komponenter/Behandling/BehandlingSide.tsx b/src/frontend/Komponenter/Behandling/BehandlingSide.tsx
@@ -119,7 +119,7 @@ const SideInnhold: FC<Props> = ({ behandling, personopplysninger, fagsak }) => {
                     <EkspanderbareVilkårpanelProvider>
                         <BehandlingRoutes behandling={behandling} />
                     </EkspanderbareVilkårpanelProvider>
-                    <HenleggModal behandling={behandling} />
+                    <HenleggModal behandling={behandling} personopplysninger={personopplysninger} />
                     <NyEierModal />
                 </InnholdWrapper>
                 <HøyreMenyWrapper $åpenHøyremeny={åpenHøyremeny}>

diff --git a/src/frontend/Komponenter/Behandling/Brev/UtregningstabellBarnetilsyn.tsx b/src/frontend/Komponenter/Behandling/Brev/UtregningstabellBarnetilsyn.tsx
@@ -21,22 +21,22 @@ const lagInntektsperioder = (beløpsperioder: IBeregningsperiodeBarnetilsyn[]):
     return `<table style="margin-left: 2px; margin-right: 2px; border-collapse: collapse; ${borderStylingCompact}">
                 <thead>
                     <tr>
-                        <th style="width: 100px; ${borderStylingCompact}">Periode</th>
-                        <th style="width: 40px; ${borderStylingCompact}">Ant. barn</th>
-                        <th style="width: 45px; word-wrap: break-word; ${borderStylingCompact}">Utgifter</th>
+                        <td style="width: 100px; ${borderStylingCompact}"><strong>Periode</strong></td>
+                        <td style="width: 40px; ${borderStylingCompact}"><strong>Ant. barn</strong></td>
+                        <td style="width: 45px; word-wrap: break-word; ${borderStylingCompact}"><strong>Utgifter</strong></td>
                         ${
                             harKontantStøtte
-                                ? `<th style="width: 60px; word-wrap: break-word; ${borderStylingCompact}">
-                                    Kontantstøtte
-                                </th>`
+                                ? `<td style="width: 60px; word-wrap: break-word; ${borderStylingCompact}">
+                                    <strong>Kontantstøtte</strong>
+                                </td>`
                                 : ''
                         }
                         ${
                             harTilleggsstønad
-                                ? `<th style="width: 60px; word-wrap: break-word; ${borderStylingCompact}">Tilleggsstønad</th>`
+                                ? `<td style="width: 60px; word-wrap: break-word; ${borderStylingCompact}"><strong>Tilleggsstønad</strong></td>`
                                 : ''
                         }
-                        <th style="width: 65px; word-wrap: break-word; ${borderStylingCompact}">Dette får du utbetalt pr. måned</th>
+                        <td style="width: 65px; word-wrap: break-word; ${borderStylingCompact}"><strong>Dette får du utbetalt pr. måned</strong></td>
                     </tr>
                 </thead>
                 <tbody>

diff --git a/src/frontend/Komponenter/Behandling/Brev/UtregningstabellOvergangsstønad.tsx b/src/frontend/Komponenter/Behandling/Brev/UtregningstabellOvergangsstønad.tsx
@@ -25,13 +25,13 @@ const lagInntektsperioder = (beløpsperioder?: IBeløpsperiode[]): string => {
     return `<table style="margin-left: 2px; margin-right: 2px; border-collapse: collapse; ${borderStylingCompact}">
                 <thead>
                     <tr>
-                        <th style="width: 110px; ${borderStylingCompact}">Periode</th>
-                        <th style="width: 55px; word-wrap: break-word; ${borderStylingCompact}">Beregnet inntekt</th>
+                        <td style="width: 110px; ${borderStylingCompact}"><strong>Periode</strong></td>
+                        <td style="width: 55px; word-wrap: break-word; ${borderStylingCompact}"><strong>Beregnet inntekt</strong></td>
                         ${
                             samordningskolonneTittel &&
-                            `<th style="width: 90px; word-wrap: break-word; ${borderStylingCompact}">${samordningskolonneTittel}</th>`
+                            `<td style="width: 90px; word-wrap: break-word; ${borderStylingCompact}"><strong>${samordningskolonneTittel}</strong></td>`
                         }
-                        <th style="width: 55px; word-wrap: break-word; ${borderStylingCompact}">Dette får du utbetalt pr. måned</th>
+                        <td style="width: 55px; word-wrap: break-word; ${borderStylingCompact}"><strong>Dette får du utbetalt pr. måned</strong></td>
                     </tr>
                 </thead>
                 <tbody>