Merge branch 'master' into feature/magic-token-trivia

Author: krharum

.github/workflows/app.team-dolly-lokal-app.yml

@@ -5,6 +5,7 @@ on:
     paths:
       - plugins/**
       - .nais/team-dolly-lokal-app.yml
+      - .nais/dolly-lokal-auth.yaml
       - .github/workflows/app.team-dolly-lokal-app.yml
 
 jobs:

.nais/dolly-local-auth.yml

@@ -0,0 +1,30 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: "dolly-local-auth"
+  namespace: "dolly"
+spec:
+  image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
+  port: 8080
+  replicas:
+    min: 1
+    max: 1
+  liveness:
+    path: "/internal/healthz"
+  readiness:
+    path: "/internal/healthz"
+  resources:
+    limits:
+      memory: "256Mi"
+    requests:
+      cpu: "10m"
+      memory: "32Mi"
+  ingresses:
+    - https://dolly-local-auth.intern.dev.nav.no
+  azure:
+    application:
+      enabled: true
+      allowAllUsers: true
+  env:
+    - name: LOCALAUTH_PUBLIC_URL
+      value: "https://dolly-local-auth.intern.dev.nav.no"

.nais/localauth.yml

@@ -0,0 +1,30 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: "localauth"
+  namespace: "dolly"
+spec:
+  image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
+  port: 8080
+  replicas:
+    min: 1
+    max: 1
+  liveness:
+    path: "/internal/healthz"
+  readiness:
+    path: "/internal/healthz"
+  resources:
+    limits:
+      memory: "256Mi"
+    requests:
+      cpu: "10m"
+      memory: "32Mi"
+  ingresses:
+    - https://localauth-dolly.intern.dev.nav.no
+  azure:
+    application:
+      enabled: true
+      allowAllUsers: true
+  env:
+    - name: LOCALAUTH_PUBLIC_URL
+      value: "https://localauth-dolly.intern.dev.nav.no"

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kelvinaap/domain/AapOpprettRequest.java

@@ -5,6 +5,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -19,6 +20,8 @@ public class AapOpprettRequest {
     private Boolean harMedlemskap;
     private Boolean harYrkesskade;
     private String ident;
+    private LocalDate soeknadsdato;
+    private Boolean automatiskMeldekort;
 
     @Data
     @Builder

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/kelvinaap/RsKelvinAapRequestDTO.java

@@ -5,6 +5,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -18,6 +19,8 @@ public class RsKelvinAapRequestDTO {
     private Boolean erStudent;
     private Boolean harMedlemskap;
     private Boolean harYrkesskade;
+    private LocalDate soeknadsdato;
+    private Boolean automatiskMeldekort;
 
     @Data
     @Builder

apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/ForwardAndRedirectController.java

@@ -32,6 +32,7 @@ public RouterFunction<ServerResponse> htmlRouter(@Value("classpath:/static/index
                 .andRoute(RequestPredicates.GET("/bruker/**"), indexHandler)
                 .andRoute(RequestPredicates.GET("/team/**"), indexHandler)
                 .andRoute(RequestPredicates.GET("/dollysoek/**"), indexHandler)
+                .andRoute(RequestPredicates.GET("/dashboard/**"), indexHandler)
                 .andRoute(RequestPredicates.GET("/tenorpersoner/**"), indexHandler)
                 .andRoute(RequestPredicates.GET("/orgtilgang/**"), indexHandler)
                 .andRoute(RequestPredicates.GET("/levendearbeidsforhold/**"), indexHandler)

apps/dolly-frontend/src/main/js/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dolly",
-	"version": "3.5.3",
+	"version": "3.5.4",
 	"type": "module",
 	"description": "",
 	"main": "index.js",
@@ -25,18 +25,20 @@
 		"@hookform/resolvers": "^5.4.0",
 		"@navikt/aksel-icons": "^8.11.1",
 		"@popperjs/core": "^2.11.8",
-		"axios": "^1.16.1",
+		"axios": "^1.17.0",
 		"classnames": "^2.5.1",
 		"country-data-list": "^1.6.3",
 		"date-fns": "^4.4.0",
 		"dayjs": "^1.11.21",
+		"highcharts": "^12.6.0",
+		"highcharts-react-official": "^3.2.3",
 		"history": "^5.3.0",
 		"immer": "^11.1.8",
 		"lodash-es": "^4.18.1",
 		"rc-tooltip": "^6.4.0",
-		"react": "^19.2.6",
+		"react": "^19.2.7",
 		"react-confetti-explosion": "^3.0.3",
-		"react-dom": "^19.2.6",
+		"react-dom": "^19.2.7",
 		"react-highlight-words": "^0.21.0",
 		"react-hook-form": "8.0.0-beta.1",
 		"react-inlinesvg": "^4.4.1",
@@ -68,19 +70,19 @@
 		"@testing-library/react": "^16.3.2",
 		"@testing-library/user-event": "^14.6.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^25.9.1",
-		"@types/react": "^19.2.15",
+		"@types/node": "^25.9.2",
+		"@types/react": "^19.2.17",
 		"@types/react-dom": "^19.2.3",
 		"@types/react-highlight-words": "^0.20.1",
 		"@types/react-modal": "^3.16.3",
 		"@types/react-redux": "^7.1.34",
 		"@types/redux-actions": "^2.6.5",
-		"@typescript-eslint/eslint-plugin": "^8.60.0",
-		"@typescript-eslint/parser": "^8.60.0",
+		"@typescript-eslint/eslint-plugin": "^8.60.1",
+		"@typescript-eslint/parser": "^8.60.1",
 		"@vitejs/plugin-react": "^6.0.2",
-		"@vitest/browser": "^4.1.7",
-		"@vitest/browser-playwright": "^4.1.7",
-		"@vitest/ui": "^4.1.7",
+		"@vitest/browser": "^4.1.8",
+		"@vitest/browser-playwright": "^4.1.8",
+		"@vitest/ui": "^4.1.8",
 		"babel-plugin-react-compiler": "^1.0.0",
 		"babel-plugin-styled-components": "^2.3.0",
 		"dot-prop": "^10.1.0",
@@ -98,12 +100,12 @@
 		"react-dropzone": "^15.0.0",
 		"react-pdf": "^10.4.1",
 		"react-redux": "^9.3.0",
-		"react-router": "^7.16.0",
+		"react-router": "^7.17.0",
 		"sass": "^1.100.0",
 		"swr": "^2.4.1",
 		"typescript": "^6.0.3",
-		"vite": "^8.0.14",
-		"vitest": "^4.1.7",
+		"vite": "^8.0.16",
+		"vitest": "^4.1.8",
 		"vitest-browser-react": "^2.2.0"
 	},
 	"prettier": {