Merge branch 'master' into feature/dashboard-trivia-II

Author: krharum

.nais/dolly-auth-local.yml

@@ -28,4 +28,4 @@ spec:
       tenant: nav.no
   env:
     - name: LOCALAUTH_PUBLIC_URL
-      value: "https://dolly-auth-local.intern.dev.nav.no"
+      value: "https://dolly-auth-local.intern.dev.nav.no"

apps/dolly-backend/config.test.yml

@@ -20,6 +20,7 @@ spec:
         - application: dolly-frontend-dev
         - application: dolly-idporten
         - application: team-dolly-lokal-app
+        - application: dolly-auth-local
         - application: testnav-batch-bestilling-service
         - application: testnav-dollystatus
         - application: testnav-oversikt-frontend

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntektsinformasjon.java

@@ -8,7 +8,7 @@
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
 import reactor.core.publisher.Flux;
 
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,7 +34,7 @@ public class Inntektsinformasjon {
     @EqualsAndHashCode.Exclude
     private List<Forskuddstrekk> forskuddstrekksliste;
 
-    private LocalDateTime rapporteringsdato;
+    private OffsetDateTime rapporteringsdato;
 
     private Integer versjon;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/mapper/InntektsinformasjonMappingStrategy.java

@@ -13,11 +13,13 @@
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
 
 @Component
 public class InntektsinformasjonMappingStrategy implements MappingStrategy {
@@ -50,6 +52,10 @@ public void mapAtoB(InntektMultiplierWrapper inntektMultiplierWrapper, Inntektsi
 
                                         inntektsinformasjon1.setAarMaaned(yearMonth.get().format(YEAR_MONTH_FORMAT));
                                         inntektsinformasjon1.setNorskIdent((String) context.getProperty("ident"));
+                                        if (nonNull(inntektsinformasjon.getRapporteringsdato())) {
+                                            inntektsinformasjon1.setRapporteringsdato(
+                                                    inntektsinformasjon.getRapporteringsdato().atOffset(ZoneOffset.UTC));
+                                        }
 
                                         inntektsinformasjonWrapper.getInntektsinformasjon().add(inntektsinformasjon1);
 
@@ -65,7 +71,8 @@ public void mapAtoB(InntektMultiplierWrapper inntektMultiplierWrapper, Inntektsi
                                                         .fradragsliste(mapperFacade.mapAsList(historikk.getFradragsliste(), Fradrag.class))
                                                         .forskuddstrekksliste(mapperFacade.mapAsList(historikk.getForskuddstrekksliste(), Forskuddstrekk.class))
                                                         .versjon(versjon.addAndGet(1))
-                                                        .rapporteringsdato(historikk.getRapporteringsdato())
+                                                        .rapporteringsdato(nonNull(historikk.getRapporteringsdato()) ?
+                                                                historikk.getRapporteringsdato().atOffset(ZoneOffset.UTC) : null)
                                                         .build())
                                         );
 

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

@@ -1,6 +1,6 @@
 {
 	"name": "dolly",
-	"version": "3.5.4",
+	"version": "3.5.5",
 	"type": "module",
 	"description": "",
 	"main": "index.js",
@@ -23,7 +23,7 @@
 	"license": "ISC",
 	"dependencies": {
 		"@hookform/resolvers": "^5.4.0",
-		"@navikt/aksel-icons": "^8.11.1",
+		"@navikt/aksel-icons": "^8.12.1",
 		"@popperjs/core": "^2.11.8",
 		"axios": "^1.17.0",
 		"classnames": "^2.5.1",
@@ -58,9 +58,9 @@
 	"devDependencies": {
 		"@babel/core": "^7.29.7",
 		"@hookform/error-message": "^2.0.1",
-		"@navikt/aksel": "^8.11.1",
-		"@navikt/ds-css": "^8.11.1",
-		"@navikt/ds-react": "^8.11.1",
+		"@navikt/aksel": "^8.12.1",
+		"@navikt/ds-css": "^8.12.1",
+		"@navikt/ds-react": "^8.12.1",
 		"@playwright/experimental-ct-react": "^1.60.0",
 		"@playwright/test": "^1.60.0",
 		"@reduxjs/toolkit": "^2.12.0",
@@ -77,8 +77,8 @@
 		"@types/react-modal": "^3.16.3",
 		"@types/react-redux": "^7.1.34",
 		"@types/redux-actions": "^2.6.5",
-		"@typescript-eslint/eslint-plugin": "^8.60.1",
-		"@typescript-eslint/parser": "^8.60.1",
+		"@typescript-eslint/eslint-plugin": "^8.61.0",
+		"@typescript-eslint/parser": "^8.61.0",
 		"@vitejs/plugin-react": "^6.0.2",
 		"@vitest/browser": "^4.1.8",
 		"@vitest/browser-playwright": "^4.1.8",
@@ -96,7 +96,7 @@
 		"less": "^4.6.4",
 		"msw": "^2.14.6",
 		"playwright": "^1.60.0",
-		"prettier": "^3.8.3",
+		"prettier": "^3.8.4",
 		"react-dropzone": "^15.0.0",
 		"react-pdf": "^10.4.1",
 		"react-redux": "^9.3.0",

apps/dolly-frontend/src/main/js/playwright-ct.config.js

@@ -37,6 +37,7 @@ export default defineConfig({
 			resolve: {
 				alias: {
 					'@': path.resolve(__dirname, './src'),
+					'#': path.resolve(__dirname, './playwright'),
 				},
 			},
 			css: {