From 57f72dcee714ab3cc0fe70437d4727201b1feeae Mon Sep 17 00:00:00 2001 From: Knut Magne Riise Date: Thu, 4 Jan 2024 10:07:30 +0100 Subject: [PATCH] =?UTF-8?q?Sett=20egne=20parametre=20p=C3=A5=20datovisning?= =?UTF-8?q?=20av=20tidsaksen=20til=20tidslinjen=20flyttet=20over=20til=20d?= =?UTF-8?q?s-react=20da=20ds-react-internal=20er=20deprecated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DagpengerTidslinje.tsx | 6 +- .../error-boundary/RootErrorBoundaryView.tsx | 9 +- .../header-meny/HeaderUtloggingMeny.tsx | 4 +- app/root.tsx | 3 - app/routes/saksbehandling.tsx | 10 +- package-lock.json | 176 +++--------------- package.json | 8 +- 7 files changed, 38 insertions(+), 178 deletions(-) diff --git a/app/components/dagpenger-tidslinje/DagpengerTidslinje.tsx b/app/components/dagpenger-tidslinje/DagpengerTidslinje.tsx index 3b91206c..58c7a5da 100644 --- a/app/components/dagpenger-tidslinje/DagpengerTidslinje.tsx +++ b/app/components/dagpenger-tidslinje/DagpengerTidslinje.tsx @@ -1,6 +1,5 @@ import { BriefcaseIcon } from "@navikt/aksel-icons"; -import { Alert } from "@navikt/ds-react"; -import { Timeline } from "@navikt/ds-react-internal"; +import { Alert, Timeline } from "@navikt/ds-react"; import type { IArbeidssokerStatus } from "~/models/arbeidssoker.server"; import styles from "./DagpengerTidslinje.module.css"; import type { INetworkResponse } from "~/utils/types"; @@ -15,6 +14,7 @@ interface IProps { export function DagpengerTidslinje(props: IProps) { const { arbeidssokerStatusResponse } = props; const [activePeriod, setActivePeriod] = useState(""); + const axisLabels = { day: "dd.MM", month: "MMM yyyy", year: "yyyy" }; if (arbeidssokerStatusResponse.status === "error") { if (arbeidssokerStatusResponse.error.statusCode === 401) { @@ -41,7 +41,7 @@ export function DagpengerTidslinje(props: IProps) { return ( <> - + }> {arbeidssokerStatusResponse.data?.arbeidssokerperioder.map((periode) => ( -
+ - NAV Dagpenger + NAV Dagpenger -
+
diff --git a/app/components/header-meny/HeaderUtloggingMeny.tsx b/app/components/header-meny/HeaderUtloggingMeny.tsx index 66fc3e5f..1c30f6bc 100644 --- a/app/components/header-meny/HeaderUtloggingMeny.tsx +++ b/app/components/header-meny/HeaderUtloggingMeny.tsx @@ -1,6 +1,6 @@ -import { Dropdown, Header } from "@navikt/ds-react-internal"; import type { ISaksbehandler } from "~/models/auth.server"; import styles from "./HeaderMeny.module.css"; +import { Dropdown, InternalHeader } from "@navikt/ds-react"; interface IProps { saksbehandler: ISaksbehandler; @@ -10,7 +10,7 @@ export function HeaderUtloggingMeny({ saksbehandler }: IProps) { return (
- false; @@ -40,15 +40,15 @@ export default function Saksbehandling() { return ( <> -
+ - + {hentAppTekstMedId("side-header")} - + -
+ ); diff --git a/package-lock.json b/package-lock.json index 13323447..932a5f1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,12 +7,10 @@ "dependencies": { "@grafana/faro-web-sdk": "^1.3.1", "@grafana/faro-web-tracing": "^1.3.1", - "@navikt/aksel-icons": "^5.11.4", + "@navikt/aksel-icons": "^5.12.2", "@navikt/dp-auth": "^0.3.15", - "@navikt/ds-css": "^5.11.4", - "@navikt/ds-css-internal": "^3.4.3", - "@navikt/ds-react": "^5.11.4", - "@navikt/ds-react-internal": "^3.4.3", + "@navikt/ds-css": "^5.12.2", + "@navikt/ds-react": "^5.12.2", "@portabletext/types": "^2.0.8", "@remix-run/css-bundle": "^2.3.1", "@remix-run/express": "^2.1.0", @@ -1779,9 +1777,9 @@ } }, "node_modules/@navikt/aksel-icons": { - "version": "5.11.4", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.11.4/9eab45d1624b61d38e54ea293d346d49da5d8502", - "integrity": "sha512-QhiM3Y2OQuaF3Dsq0pgESHSo9k2ffwN3S8wN9ik9P2eq9rZMe1jSDhkGeSeo1ungVqIdnUX4p62gO+cwQumPcA==", + "version": "5.12.2", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.12.2/3d4668974284a0ca9042503cf5917dfb22f05458", + "integrity": "sha512-dfjvEM0KoklKFmyeUUmzsoZZ+/6nvAfA8mrDFJkbUMgzRxZGyadxYOoIIdTQePDPFfl787S5M5fhvRzAHN8+bw==", "license": "MIT" }, "node_modules/@navikt/dp-auth": { @@ -1804,26 +1802,20 @@ } }, "node_modules/@navikt/ds-css": { - "version": "5.11.4", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.11.4/4c44cc238b7aca5ab1cb0e62d204a3d98f50623b", - "integrity": "sha512-7iRniSsoQAijBA9Bj3OzBDS8dX/ANI8kEImJlaIuR8hssxd3h1NXeZAG2+sbOkqJYq+xG7PCRFDHwTXf/PLL3A==", - "license": "MIT" - }, - "node_modules/@navikt/ds-css-internal": { - "version": "3.4.3", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css-internal/3.4.3/7c67c4b52264eb7833ca35788a83cc29af01d1ae", - "integrity": "sha512-VusM4uwHZoQWiX8N/1zD6ycgNFIzYQ40TXhlP7tqpdH6sVwwzFPWCWXaZtpyjUfHxU9WyNEDYoeRAECkC0qfzg==", + "version": "5.12.2", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.12.2/3b2016feb2cbf60747a6211014b2df0f9ec78784", + "integrity": "sha512-uV33mXDWEpXChu0bkrefdqiA47dpM0zZK735cMRmGjxmE73qT7MURHqJHtqeeua+nXSfVpZVhWwig1k60K/9JQ==", "license": "MIT" }, "node_modules/@navikt/ds-react": { - "version": "5.11.4", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.11.4/9b45f3797cd369133213e642d00152dee4652857", - "integrity": "sha512-Drhm3yzS5hpRcePR9ZW7rs97FTz7IXHQwaVTKAg5vZtIfYFkgQ+JbuW1h44guYoccV2XmGFOAVayb4dT/qJh/A==", + "version": "5.12.2", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.12.2/2ca39de894ac4ac2446012e21409f3f44dc46a3e", + "integrity": "sha512-+oFX9FlIosGxDq5w0BjMl6Pewacun6j37MGq5Or4KbAGGHfgAgUD5CyG9Wv9m5yxzrpANuffLbR8ODHoYLUqvQ==", "license": "MIT", "dependencies": { "@floating-ui/react": "0.25.4", - "@navikt/aksel-icons": "^5.11.4", - "@navikt/ds-tokens": "^5.11.4", + "@navikt/aksel-icons": "^5.12.2", + "@navikt/ds-tokens": "^5.12.2", "@radix-ui/react-tabs": "1.0.0", "@radix-ui/react-toggle-group": "1.0.0", "clsx": "^1.2.1", @@ -1835,79 +1827,10 @@ "react": "^17.0.0 || ^18.0.0" } }, - "node_modules/@navikt/ds-react-internal": { - "version": "3.4.3", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react-internal/3.4.3/b085cf08ed4b0f450c55ec394f08077739e4fccb", - "integrity": "sha512-sOEkt7AjIutd9i/kpiMoyJjLokCoJqU3Y/8hv9BGvnwA83kmgYbA/Sk+jiWBAs0kQraR7+CDBRFxM6KJwyUdqg==", - "license": "MIT", - "dependencies": { - "@floating-ui/react": "0.24.1", - "@navikt/aksel-icons": "^3.4.2", - "@navikt/ds-react": "^3.4.2", - "clsx": "^1.1.1", - "copy-to-clipboard": "^3.3.1" - }, - "peerDependencies": { - "@types/react": "^17.0.30 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0" - } - }, - "node_modules/@navikt/ds-react-internal/node_modules/@floating-ui/react": { - "version": "0.24.1", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.24.1.tgz", - "integrity": "sha512-qjCKUZDEz/4bnJmu4gn66TqsoX912/re8JGEi3pXazsphmyh327l0UpTgpBAT3WkNbnzAH7Adt3wKlLMNtfupw==", - "dependencies": { - "@floating-ui/react-dom": "^2.0.0", - "aria-hidden": "^1.1.3", - "tabbable": "^6.0.1" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@navikt/ds-react-internal/node_modules/@navikt/aksel-icons": { - "version": "3.4.2", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/3.4.2/fa858e1a5fb0557d61b62ad7cdf0d75e26fc89d7", - "integrity": "sha512-9fj+Jb4UrX3SDDzqJpKP3fvizdxtACIFNXgDiPaP/N/61pbeY4tZz/zrtWGtExLpDeg7dAyaiFH/hfo7nBg6nw==", - "license": "MIT" - }, - "node_modules/@navikt/ds-react-internal/node_modules/@navikt/ds-react": { - "version": "3.4.2", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/3.4.2/6b685ed5582ba4e7bd3e9e3a678046c76affe15e", - "integrity": "sha512-pjM01ePda/yJlCOUMmB6bGDVAY4Gy3dkDNgwEq9z8u9VXERDSynz1p3KtFF4XApDwJPH0GsnUGWF54XWvKRdKw==", - "license": "MIT", - "dependencies": { - "@floating-ui/react": "0.24.1", - "@navikt/aksel-icons": "^3.4.2", - "@radix-ui/react-tabs": "1.0.0", - "@radix-ui/react-toggle-group": "1.0.0", - "clsx": "^1.2.1", - "date-fns": "2.29.3", - "react-day-picker": "8.3.4", - "react-modal": "3.15.1" - }, - "peerDependencies": { - "@types/react": "^17.0.30 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0" - } - }, - "node_modules/@navikt/ds-react-internal/node_modules/date-fns": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", - "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", - "engines": { - "node": ">=0.11" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" - } - }, "node_modules/@navikt/ds-tokens": { - "version": "5.11.4", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/5.11.4/3394f559aa4ca0676b7e902aab971863d06cff73", - "integrity": "sha512-tPItY1DAhtPA35/geBAza2I8Nw9kAgVvT220K+dI0ejWSuMdGTkwBwmtRCfi7O9JJ2hHMnVtAWQJ/TyjtwBKJg==", + "version": "5.12.2", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/5.12.2/7dcf11f88302c13d03443eb05a153d9ff1fee9f0", + "integrity": "sha512-5ee7Bu+5rUsozE+7h8EcW1Q5voY1UKTEIPJ24MAlr+nYfj+AQDFTu8PVWiVlhPKI2b0lDfn3ReZTbRQ+kvPbvQ==", "license": "MIT" }, "node_modules/@next/env": { @@ -4831,17 +4754,6 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/aria-hidden": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz", - "integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/aria-query": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", @@ -5922,14 +5834,6 @@ "node": ">=6.6.0" } }, - "node_modules/copy-to-clipboard": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", - "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==", - "dependencies": { - "toggle-selection": "^1.0.6" - } - }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -7599,11 +7503,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/exenv": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", - "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" - }, "node_modules/exit-hook": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz", @@ -12091,6 +11990,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -13036,6 +12936,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -13045,7 +12946,8 @@ "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true }, "node_modules/property-information": { "version": "6.4.0", @@ -13217,29 +13119,6 @@ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true }, - "node_modules/react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" - }, - "node_modules/react-modal": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.15.1.tgz", - "integrity": "sha512-duB9bxOaYg7Zt6TMFldIFxQRtSP+Dg3F1ZX3FXxSUn+3tZZ/9JCgeAQKDg7rhZSAqopq8TFRw3yIbnx77gyFTw==", - "dependencies": { - "exenv": "^1.2.0", - "prop-types": "^15.7.2", - "react-lifecycles-compat": "^3.0.0", - "warning": "^4.0.3" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18", - "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18" - } - }, "node_modules/react-refresh": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", @@ -14900,11 +14779,6 @@ "node": ">=8.0" } }, - "node_modules/toggle-selection": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz", - "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==" - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -16680,14 +16554,6 @@ "node": ">=14" } }, - "node_modules/warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", diff --git a/package.json b/package.json index 92484456..52df8086 100644 --- a/package.json +++ b/package.json @@ -28,12 +28,10 @@ "dependencies": { "@grafana/faro-web-sdk": "^1.3.1", "@grafana/faro-web-tracing": "^1.3.1", - "@navikt/aksel-icons": "^5.11.4", + "@navikt/aksel-icons": "^5.12.2", "@navikt/dp-auth": "^0.3.15", - "@navikt/ds-css": "^5.11.4", - "@navikt/ds-css-internal": "^3.4.3", - "@navikt/ds-react": "^5.11.4", - "@navikt/ds-react-internal": "^3.4.3", + "@navikt/ds-css": "^5.12.2", + "@navikt/ds-react": "^5.12.2", "@portabletext/types": "^2.0.8", "@remix-run/css-bundle": "^2.3.1", "@remix-run/express": "^2.1.0",