Bump minor patch versjon (#78)

* Bumper pakker med minor og patch versjon
navikt · Aug 1, 2023 · 339fa02 · 339fa02
1 parent ffc4bb6
commit 339fa02
Show file tree

Hide file tree

Showing 9 changed files with 391 additions and 274 deletions.
diff --git a/.nais/dev.yaml b/.nais/dev.yaml
@@ -11,7 +11,8 @@ amplitude:
   apiKey: 9845ded64c69cd068651cd0d968e0796
 saf:
   cluster: dev-fss
-  ingress: https://safselvbetjening-q1.dev-fss-pub.nais.io
+  ingress: safselvbetjening-q1.dev-fss-pub.nais.io
+  url: https://safselvbetjening-q1.dev-fss-pub.nais.io
   scope: safselvbetjening-q1
 soknadsdialog:
   ingress: https://arbeid.dev.nav.no/dagpenger/dialog/
diff --git a/.nais/nais.yaml b/.nais/nais.yaml
@@ -45,7 +45,7 @@ spec:
     - name: AMPLITUDE_API_KEY
       value: {{amplitude.apiKey}}
     - name: SAF_SELVBETJENING_INGRESS
-      value: {{saf.ingress}}
+      value: {{saf.url}}
     - name: SAF_SELVBETJENING_CLUSTER
       value: {{saf.cluster}}
     - name: SAF_SELVBETJENING_SCOPE

diff --git a/.nais/prod.yaml b/.nais/prod.yaml
@@ -11,7 +11,8 @@ amplitude:
   apiKey: 913768927b84cde5eac0d0d18c737561
 saf:
   cluster: prod-fss
-  ingress: https://safselvbetjening.prod-fss-pub.nais.io
+  ingress: safselvbetjening.prod-fss-pub.nais.io
+  url: https://safselvbetjening.prod-fss-pub.nais.io
   scope: safselvbetjening
 soknadsdialog:
   ingress: https://www.nav.no/dagpenger/dialog/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,50 +17,50 @@
     "npm": ">=7.0.0"
   },
   "dependencies": {
-    "@navikt/dp-auth": "^0.3.0",
+    "@navikt/dp-auth": "^0.3.3",
     "@navikt/ds-css": "^2.0.11",
     "@navikt/ds-icons": "^2.0.11",
     "@navikt/ds-react": "^2.0.11",
     "@navikt/nav-dekoratoren-moduler": "^1.8.1",
-    "@navikt/next-logger": "^1.18.0",
+    "@navikt/next-logger": "^1.19.0",
     "@portabletext/react": "^1.0.6",
-    "@portabletext/types": "^2.0.0",
+    "@portabletext/types": "^2.0.5",
     "@sanity/block-content-to-react": "^3.0.0",
     "@sanity/client": "^2.8.0",
     "@sentry/nextjs": "^6.19.7",
-    "@types/amplitude-js": "^8.0.0",
-    "amplitude-js": "^8.3.1",
+    "@types/amplitude-js": "^8.16.2",
+    "amplitude-js": "^8.21.9",
     "classnames": "^2.3.2",
-    "date-fns": "^2.29.3",
+    "date-fns": "^2.30.0",
     "graphql": "^15.5.1",
     "graphql-request": "^3.4.0",
     "next": "^12.1.6",
     "next-compose-plugins": "^2.2.1",
     "next-intl": "^2.9.1",
     "next-transpile-modules": "^8.0.0",
-    "pdfobject": "^2.2.5",
-    "pino": "^8.11.0",
-    "prom-client": "^14.1.0",
-    "prop-types": "^15.7.2",
+    "pdfobject": "^2.2.12",
+    "pino": "^8.14.2",
+    "prom-client": "^14.2.0",
+    "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "swr": "^2.0.1",
+    "swr": "^2.2.0",
     "unleash-client": "^3.16.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@axe-core/react": "^4.2.2",
-    "@faker-js/faker": "^7.6.0",
+    "@axe-core/react": "^4.7.3",
+    "@faker-js/faker": "^8.0.2",
     "@graphql-codegen/cli": "^2.16.5",
     "@graphql-codegen/typescript": "^2.8.0",
     "@testing-library/dom": "^8.19.1",
-    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.20",
-    "@types/jest-axe": "^3.5.1",
+    "@types/jest-axe": "^3.5.5",
     "@types/node": "^16.4.10",
-    "@types/react": "^18.0.26",
+    "@types/react": "^18.2.18",
     "@typescript-eslint/eslint-plugin": "^4.28.1",
     "@typescript-eslint/parser": "^4.28.1",
     "eslint": "^7.29.0",
@@ -78,10 +78,10 @@
     "jsdom": "^16.6.0",
     "lint-staged": "^11.0.0",
     "msw": "^0.49.2",
-    "node-mocks-http": "^1.10.1",
-    "pino-pretty": "^10.0.0",
+    "node-mocks-http": "^1.12.2",
+    "pino-pretty": "^10.2.0",
     "prettier": "^2.3.2",
-    "pretty-quick": "^3.1.1",
+    "pretty-quick": "^3.1.3",
     "typescript": "^4.3.5"
   },
   "lint-staged": {

diff --git a/src/__mocks__/handlers/frontend/dokumenter.ts b/src/__mocks__/handlers/frontend/dokumenter.ts
@@ -5,22 +5,22 @@ import { AvsenderMottakerIdType, Journalposttype } from "../../../saf";
 
 export const dokumentListeResolver = (req, res, ctx) => {
   const journalposter: Journalpost[] = [...Array(12)].map((_, ji) => {
-    const journalpostId = faker.datatype.number().toString();
+    const journalpostId = faker.string.uuid();
     const antallDokumenter = ji === 4 ? 1 : 3;
     return {
-      journalpostId,
+      journalpostId: journalpostId,
       tittel: ji === 0 ? "" : faker.lorem.sentence(),
       journalposttype: Journalposttype.U,
       dato: faker.date.past().toISOString(),
       brukerErAvsenderMottaker: ji === 2 ? true : false,
       avsender: null,
       mottaker: {
-        id: ji === 2 ? syntheticUserFnr : faker.datatype.uuid(),
+        id: ji === 2 ? syntheticUserFnr : faker.string.uuid(),
         type: AvsenderMottakerIdType.Fnr,
       },
       tema: "DAG",
       dokumenter: [...Array(antallDokumenter)].map((_, i) => {
-        const id = faker.datatype.uuid();
+        const id = faker.string.uuid();
         const type = i == 0 ? "Hoved" : "Vedlegg";
         const skjulDokument = (ji === 3 && i === 0) || (ji === 2 && i === 1);
         return {

diff --git a/src/__mocks__/handlers/frontend/soknader.ts b/src/__mocks__/handlers/frontend/soknader.ts
@@ -10,6 +10,8 @@ export default function soknaderResolver(req, res, ctx) {
       kanal: "Digital",
       datoInnsendt: new Date().toISOString(),
       vedlegg: [],
+      erNySøknadsdialog: true,
+      endreLenke: "",
     },
     {
       tittel: "Søknad om dagpenger",
@@ -19,6 +21,8 @@ export default function soknaderResolver(req, res, ctx) {
       kanal: "Digital",
       datoInnsendt: new Date().toISOString(),
       vedlegg: [],
+      erNySøknadsdialog: true,
+      endreLenke: "",
     },
     {
       tittel: "Søknad om dagpenger",
@@ -28,6 +32,8 @@ export default function soknaderResolver(req, res, ctx) {
       kanal: "Digital",
       datoInnsendt: new Date().toISOString(),
       vedlegg: [],
+      erNySøknadsdialog: true,
+      endreLenke: "",
     },
   ];
   return res(ctx.delay(), ctx.json(mockSoknader));

diff --git a/src/lib/amplitude.ts b/src/lib/amplitude.ts
@@ -1,12 +1,10 @@
 import getConfig from "next/config";
-import { AmplitudeClient, Config, LogReturn } from "amplitude-js";
+import amplitude, { AmplitudeClient, Config, LogReturn } from "amplitude-js";
 import { logger } from "@navikt/next-logger";
 
 let loggInstance: AmplitudeClient;
 
 if (typeof window !== "undefined") {
-  const amplitude = require("amplitude-js");
-
   const getApiKey = () => {
     const { publicRuntimeConfig } = getConfig();
     return process.env.AMPLITUDE_API_KEY || publicRuntimeConfig.amplitudeKey;

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -93,7 +93,7 @@ export default function Status({
         <title>{getAppText("meta.tittel")}</title>
       </Head>
       <main className="mine-dagpenger-app">
-        <PageHero hasFullforteSoknader={fullforteSoknader.length > 0} />
+        <PageHero hasFullforteSoknader={fullforteSoknader?.length > 0} />
         <Soknader
           paabegynteSoknader={paabegynteSoknader}
           fullforteSoknader={fullforteSoknader}