From 0b6141d563b4a255a694bf7bbf2455ddfa68aed7 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Thu, 12 Sep 2024 14:39:09 +0200 Subject: [PATCH 01/12] cleanup/docker-compose-integration-tests (#3614) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mindre refaktorering for å fjerne forskjellige warnings. --- README.md | 18 +++--- docker-compose.yml | 1 - mocks/maskinporten-mock/Dockerfile | 2 +- mocks/maskinporten-mock/build.gradle | 12 ++-- .../MaskinportenMockApplicationStarter.java | 42 ++++++++++++ .../config/OpenApiConfig.java | 6 +- .../config/SecurityConfig.java | 7 +- .../controller/MockController.java | 31 +++++++++ .../OauthAuthorizationServiceController.java | 47 ++++++++++++++ .../domain/AccessToken.java | 2 +- .../domain/Arguments.java | 2 +- .../service/JwtService.java | 33 +++------- .../MaskinportenMockApplicationStarter.java | 19 ------ .../controller/MockController.java | 27 -------- .../OauthAuthorizationServiceController.java | 64 ------------------- .../src/main/resources/application.yml | 3 +- mocks/tokendings-mock/Dockerfile | 2 +- mocks/tokendings-mock/build.gradle | 14 ++-- .../TokendingsMockApplicationStarter.java | 42 ++++++++++++ .../config/OpenApiConfig.java | 4 +- .../config/SecurityConfig.java | 7 +- .../controller/MockController.java | 16 +++-- .../OauthAuthorizationServiceController.java | 44 +++++-------- .../mocks/tokendings/domain/Arguments.java | 16 +++++ .../service/JwtService.java | 43 ++++--------- .../TokendingsMockApplicationStarter.java | 19 ------ .../tokendingsmock/domain/Arguments.java | 12 ---- .../src/main/resources/application.yml | 3 +- .../src/main/groovy/dolly-versions.gradle | 1 + 29 files changed, 268 insertions(+), 271 deletions(-) create mode 100644 mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/MaskinportenMockApplicationStarter.java rename mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => maskinporten}/config/OpenApiConfig.java (96%) rename mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => maskinporten}/config/SecurityConfig.java (82%) create mode 100644 mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/MockController.java create mode 100644 mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/OauthAuthorizationServiceController.java rename mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => maskinporten}/domain/AccessToken.java (86%) rename mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => maskinporten}/domain/Arguments.java (69%) rename mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => maskinporten}/service/JwtService.java (53%) delete mode 100644 mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/MaskinportenMockApplicationStarter.java delete mode 100644 mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java delete mode 100644 mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java create mode 100644 mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/TokendingsMockApplicationStarter.java rename mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => tokendings}/config/OpenApiConfig.java (96%) rename mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => tokendings}/config/SecurityConfig.java (83%) rename mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => tokendings}/controller/MockController.java (57%) rename mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => tokendings}/controller/OauthAuthorizationServiceController.java (52%) create mode 100644 mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/domain/Arguments.java rename mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/{tokendingsmock => tokendings}/service/JwtService.java (53%) delete mode 100644 mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/TokendingsMockApplicationStarter.java delete mode 100644 mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java diff --git a/README.md b/README.md index 5ab74e250c9..d49bd31bdfb 100644 --- a/README.md +++ b/README.md @@ -81,19 +81,19 @@ Eller kjør: ``` ## Virtuelt miljø -Kjør kommandoen: - +Kjør kommandoen: +```aiexclude +> JWK=$(cat ./mocks/jwk.json) docker compose up --build ``` -JWK=$(cat ./mocks/jwk.json) docker compose up --build +Evt. i PowerShell: +```aiexclude +> $env:JWK=(Get-Content -Path ./mocks/jwk.json -Raw) ; docker compose up --build ``` - -Deretter kan itegrasjonstester kjøres med kommandoen: - +Deretter kan itegrasjonstester kjøres med kommandoen: ``` -./gradlew iTest +> ./gradlew iTest ``` - -NB: Dette vil kun fungere hvis appen støtter itegrasjonstester. +NB: Dette vil kun fungere hvis appen støtter integrasjonstester. ## Kode generert av GitHub Copilot diff --git a/docker-compose.yml b/docker-compose.yml index b75b62c86d9..f917991a0db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: testnav-person-organisasjon-tilgang-service: container_name: testnav-person-organisasjon-tilgang-service diff --git a/mocks/maskinporten-mock/Dockerfile b/mocks/maskinporten-mock/Dockerfile index 89a589699dd..8fcd643d0ff 100644 --- a/mocks/maskinporten-mock/Dockerfile +++ b/mocks/maskinporten-mock/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/navikt/baseimages/temurin:21 LABEL maintainer="Team Dolly" -ADD /build/libs/app.jar /app/app.jar +COPY /build/libs/app.jar /app/app.jar EXPOSE 8080 diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index 2ee420309f3..1bf74a704a9 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -5,13 +5,13 @@ plugins { dependencies { implementation "com.auth0:java-jwt:$versions.jwt" - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' + implementation "no.nav.testnav.libs:security-core" + implementation "no.nav.testnav.libs:reactive-core" - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" - compileOnly 'jakarta.servlet:jakarta.servlet-api' + compileOnly "jakarta.servlet:jakarta.servlet-api" } diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/MaskinportenMockApplicationStarter.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/MaskinportenMockApplicationStarter.java new file mode 100644 index 00000000000..3167ae4e8eb --- /dev/null +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/MaskinportenMockApplicationStarter.java @@ -0,0 +1,42 @@ +package no.nav.testnav.mocks.maskinporten; + +import lombok.SneakyThrows; +import lombok.experimental.UtilityClass; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; +import org.springframework.core.io.ClassPathResource; +import org.springframework.web.reactive.config.EnableWebFlux; + +import no.nav.testnav.libs.reactivecore.config.CoreConfig; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.stream.Collectors; + +@Import({ + CoreConfig.class, +}) +@EnableWebFlux +@SpringBootApplication +public class MaskinportenMockApplicationStarter { + public static void main(String[] args) { + SpringApplication.run(MaskinportenMockApplicationStarter.class, args); + } + + @UtilityClass + public static class Utils { + + @SneakyThrows + public static String loadJson(String path) { + try (final InputStreamReader stream = new InputStreamReader(new ClassPathResource(path).getInputStream(), StandardCharsets.UTF_8)) { + return new BufferedReader(stream) + .lines() + .collect(Collectors.joining("\n")); + } + } + + } + +} diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/OpenApiConfig.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/config/OpenApiConfig.java similarity index 96% rename from mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/OpenApiConfig.java rename to mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/config/OpenApiConfig.java index 89e4fb61beb..f92d13d47b1 100644 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/OpenApiConfig.java +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/config/OpenApiConfig.java @@ -1,15 +1,13 @@ -package no.nav.testnav.mocks.tokendingsmock.config; +package no.nav.testnav.mocks.maskinporten.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; +import no.nav.testnav.libs.reactivecore.config.ApplicationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import no.nav.testnav.libs.reactivecore.config.ApplicationProperties; - - @Configuration public class OpenApiConfig { diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/SecurityConfig.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/config/SecurityConfig.java similarity index 82% rename from mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/SecurityConfig.java rename to mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/config/SecurityConfig.java index d6d96ac346e..10095310de9 100644 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/SecurityConfig.java +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.config; +package no.nav.testnav.mocks.maskinporten.config; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,6 +18,9 @@ public class SecurityConfig { @Bean public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf(ServerHttpSecurity.CsrfSpec::disable).build(); + return http + .csrf(ServerHttpSecurity.CsrfSpec::disable) + .build(); } + } diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/MockController.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/MockController.java new file mode 100644 index 00000000000..e44b12e9dd7 --- /dev/null +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/MockController.java @@ -0,0 +1,31 @@ +package no.nav.testnav.mocks.maskinporten.controller; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.mocks.maskinporten.domain.AccessToken; +import no.nav.testnav.mocks.maskinporten.domain.Arguments; +import no.nav.testnav.mocks.maskinporten.service.JwtService; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping("/mock") +public class MockController { + + private final JwtService service; + + @PostMapping( + value = "/token", + consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE + ) + public Mono getToken(Arguments arguments) { + return Mono.just(service.createAccessToken(arguments.getAudience())); + } + +} \ No newline at end of file diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/OauthAuthorizationServiceController.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/OauthAuthorizationServiceController.java new file mode 100644 index 00000000000..b5dc0d0e8da --- /dev/null +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/controller/OauthAuthorizationServiceController.java @@ -0,0 +1,47 @@ +package no.nav.testnav.mocks.maskinporten.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.mocks.maskinporten.domain.AccessToken; +import no.nav.testnav.mocks.maskinporten.domain.Arguments; +import no.nav.testnav.mocks.maskinporten.service.JwtService; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; + +import static no.nav.testnav.mocks.maskinporten.MaskinportenMockApplicationStarter.Utils.loadJson; + +@Slf4j +@RestController +@RequiredArgsConstructor +public class OauthAuthorizationServiceController { + + private static final String JWKS; + private static final String WELL_KNOWN; + + static { + JWKS = loadJson("static/jwks.json"); + WELL_KNOWN = loadJson("static/well-known.json"); + } + + private final JwtService jwtService; + + @GetMapping(value = "/jwks", produces = MediaType.APPLICATION_JSON_VALUE) + public Mono getJWKS() { + return Mono.just(JWKS); + } + + @GetMapping(value = "/.well-known/oauth-authorization-server", produces = MediaType.APPLICATION_JSON_VALUE) + public Mono getWellKnown() { + return Mono.just(WELL_KNOWN); + } + + @PostMapping(value = "/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + public Mono createToken(Arguments arguments) { + return Mono.just(jwtService.createAccessToken(arguments.getAudience())); + } + +} diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/AccessToken.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/domain/AccessToken.java similarity index 86% rename from mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/AccessToken.java rename to mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/domain/AccessToken.java index 191fb10a917..fc2a7301ac4 100644 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/AccessToken.java +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/domain/AccessToken.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.domain; +package no.nav.testnav.mocks.maskinporten.domain; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/domain/Arguments.java similarity index 69% rename from mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java rename to mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/domain/Arguments.java index cdf1de74150..9f84dafddec 100644 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/domain/Arguments.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.domain; +package no.nav.testnav.mocks.maskinporten.domain; import lombok.Getter; import lombok.Setter; diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/service/JwtService.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/service/JwtService.java similarity index 53% rename from mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/service/JwtService.java rename to mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/service/JwtService.java index 64a886f0d58..19e99cb53df 100644 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/service/JwtService.java +++ b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/maskinporten/service/JwtService.java @@ -1,47 +1,32 @@ -package no.nav.testnav.mocks.tokendingsmock.service; +package no.nav.testnav.mocks.maskinporten.service; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.nimbusds.jose.jwk.RSAKey; import lombok.SneakyThrows; -import org.springframework.core.io.ClassPathResource; +import no.nav.testnav.mocks.maskinporten.domain.AccessToken; import org.springframework.stereotype.Service; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; import java.security.interfaces.RSAPrivateKey; import java.util.Calendar; import java.util.Date; import java.util.UUID; -import java.util.stream.Collectors; -import no.nav.testnav.mocks.tokendingsmock.domain.AccessToken; +import static no.nav.testnav.mocks.maskinporten.MaskinportenMockApplicationStarter.Utils.loadJson; @Service public class JwtService { - private static final String jwtSecret; + private static final String JWK; static { - jwtSecret = loadJson("static/jwk.json"); - } - - private static String loadJson(String path) { - var resource = new ClassPathResource(path); - try (final InputStreamReader stream = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)) { - return new BufferedReader(stream) - .lines().collect(Collectors.joining("\n")); - - } catch (IOException e) { - throw new RuntimeException("Feil med paring av " + path + ".", e); - } + JWK = loadJson("static/jwk.json"); } @SneakyThrows public AccessToken createAccessToken(String audience) { + var date = Calendar.getInstance(); var expiresAt = date.getTimeInMillis() + (60 * 60 * 1000); var builder = JWT @@ -52,16 +37,14 @@ public AccessToken createAccessToken(String audience) { .withAudience(audience) .withJWTId(UUID.randomUUID().toString()) .withExpiresAt(new Date(expiresAt)); - - var privateKey = RSAKey.parse(jwtSecret).toPrivateKey(); - + var privateKey = RSAKey.parse(JWK).toPrivateKey(); return new AccessToken( builder.sign(Algorithm.RSA256(null, (RSAPrivateKey) privateKey)), "Bearer", 60 * 60 * 1000, audience - ); + } } diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/MaskinportenMockApplicationStarter.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/MaskinportenMockApplicationStarter.java deleted file mode 100644 index be270acb6ca..00000000000 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/MaskinportenMockApplicationStarter.java +++ /dev/null @@ -1,19 +0,0 @@ -package no.nav.testnav.mocks.tokendingsmock; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; -import org.springframework.web.reactive.config.EnableWebFlux; - -import no.nav.testnav.libs.reactivecore.config.CoreConfig; - -@Import({ - CoreConfig.class, -}) -@EnableWebFlux -@SpringBootApplication -public class MaskinportenMockApplicationStarter { - public static void main(String[] args) { - SpringApplication.run(MaskinportenMockApplicationStarter.class, args); - } -} diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java deleted file mode 100644 index 4c761725f52..00000000000 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java +++ /dev/null @@ -1,27 +0,0 @@ -package no.nav.testnav.mocks.tokendingsmock.controller; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Mono; - -import no.nav.testnav.mocks.tokendingsmock.domain.AccessToken; -import no.nav.testnav.mocks.tokendingsmock.domain.Arguments; -import no.nav.testnav.mocks.tokendingsmock.service.JwtService; - -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("/mock") -public class MockController { - - private final JwtService jwtService; - - @PostMapping(value = "/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public Mono getToken(Arguments arguments) { - return Mono.just(jwtService.createAccessToken(arguments.getAudience())); - } -} \ No newline at end of file diff --git a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java b/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java deleted file mode 100644 index 3c3cdb5d91e..00000000000 --- a/mocks/maskinporten-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java +++ /dev/null @@ -1,64 +0,0 @@ -package no.nav.testnav.mocks.tokendingsmock.controller; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Mono; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.stream.Collectors; - -import no.nav.testnav.mocks.tokendingsmock.domain.AccessToken; -import no.nav.testnav.mocks.tokendingsmock.domain.Arguments; -import no.nav.testnav.mocks.tokendingsmock.service.JwtService; - -@Slf4j -@RestController -@RequiredArgsConstructor -public class OauthAuthorizationServiceController { - - private static final String jwks; - private static final String wellKnwon; - - static { - jwks = loadJson("static/jwks.json"); - wellKnwon = loadJson("static/well-known.json"); - } - - private final JwtService jwtService; - - private static String loadJson(String path) { - var resource = new ClassPathResource(path); - try (final InputStreamReader stream = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)) { - return new BufferedReader(stream) - .lines().collect(Collectors.joining("\n")); - - } catch (IOException e) { - throw new RuntimeException("Feil med paring av " + path + ".", e); - } - } - - @GetMapping(value = "/jwks", produces = MediaType.APPLICATION_JSON_VALUE) - public Mono getJwks() { - return Mono.just(jwks); - } - - @GetMapping(value = "/.well-known/oauth-authorization-server", produces = MediaType.APPLICATION_JSON_VALUE) - public Mono getWellKnown() { - return Mono.just(wellKnwon); - } - - @PostMapping(value = "/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public Mono createToken(Arguments arguments) { - return Mono.just(jwtService.createAccessToken(arguments.getAudience())); - } - -} diff --git a/mocks/maskinporten-mock/src/main/resources/application.yml b/mocks/maskinporten-mock/src/main/resources/application.yml index 7cf8242163f..7f543dd0fc3 100644 --- a/mocks/maskinporten-mock/src/main/resources/application.yml +++ b/mocks/maskinporten-mock/src/main/resources/application.yml @@ -1,4 +1,3 @@ spring: application: - name: maskinporten-mock - desciption: En mock for maskinporten \ No newline at end of file + name: maskinporten-mock \ No newline at end of file diff --git a/mocks/tokendings-mock/Dockerfile b/mocks/tokendings-mock/Dockerfile index 4a36f93546f..3ac8856fdc1 100644 --- a/mocks/tokendings-mock/Dockerfile +++ b/mocks/tokendings-mock/Dockerfile @@ -3,6 +3,6 @@ LABEL maintainer="Team Dolly" ENV JAVA_OPTS="-Dspring.profiles.active=prod" -ADD /build/libs/app.jar /app/app.jar +COPY /build/libs/app.jar /app/app.jar EXPOSE 8080 diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index f5f11a9570d..803b4506f2f 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -5,14 +5,14 @@ plugins { dependencies { implementation "com.auth0:java-jwt:$versions.jwt" - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' + implementation "no.nav.testnav.libs:security-core" + implementation "no.nav.testnav.libs:reactive-core" - implementation 'org.bouncycastle:bcprov-jdk15on:1.70' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation "org.bouncycastle:bcprov-jdk18on:$versions.bouncyCastle" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" - compileOnly 'jakarta.servlet:jakarta.servlet-api' + compileOnly "jakarta.servlet:jakarta.servlet-api" } diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/TokendingsMockApplicationStarter.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/TokendingsMockApplicationStarter.java new file mode 100644 index 00000000000..19115a1b00c --- /dev/null +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/TokendingsMockApplicationStarter.java @@ -0,0 +1,42 @@ +package no.nav.testnav.mocks.tokendings; + +import lombok.SneakyThrows; +import lombok.experimental.UtilityClass; +import no.nav.testnav.libs.reactivecore.config.CoreConfig; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; +import org.springframework.core.io.ClassPathResource; +import org.springframework.web.reactive.config.EnableWebFlux; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.stream.Collectors; + +@Import({ + CoreConfig.class, +}) +@EnableWebFlux +@SpringBootApplication +public class TokendingsMockApplicationStarter { + + public static void main(String[] args) { + SpringApplication.run(TokendingsMockApplicationStarter.class, args); + } + + @UtilityClass + public static class Utils { + + @SneakyThrows + public static String loadJson(String path) { + try (final InputStreamReader stream = new InputStreamReader(new ClassPathResource(path).getInputStream(), StandardCharsets.UTF_8)) { + return new BufferedReader(stream) + .lines() + .collect(Collectors.joining("\n")); + } + } + + } + +} diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/OpenApiConfig.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/config/OpenApiConfig.java similarity index 96% rename from mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/OpenApiConfig.java rename to mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/config/OpenApiConfig.java index 89e4fb61beb..cf907ab7847 100644 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/OpenApiConfig.java +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/config/OpenApiConfig.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.config; +package no.nav.testnav.mocks.tokendings.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; @@ -9,7 +9,6 @@ import no.nav.testnav.libs.reactivecore.config.ApplicationProperties; - @Configuration public class OpenApiConfig { @@ -32,4 +31,5 @@ public OpenAPI openApi(ApplicationProperties applicationProperties) { ) ); } + } \ No newline at end of file diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/SecurityConfig.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/config/SecurityConfig.java similarity index 83% rename from mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/SecurityConfig.java rename to mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/config/SecurityConfig.java index d6d96ac346e..056091cd371 100644 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/config/SecurityConfig.java +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.config; +package no.nav.testnav.mocks.tokendings.config; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,6 +18,9 @@ public class SecurityConfig { @Bean public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf(ServerHttpSecurity.CsrfSpec::disable).build(); + return http + .csrf(ServerHttpSecurity.CsrfSpec::disable) + .build(); } + } diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/controller/MockController.java similarity index 57% rename from mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java rename to mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/controller/MockController.java index a9729decf70..83ab0b77a1e 100644 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/MockController.java +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/controller/MockController.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.controller; +package no.nav.testnav.mocks.tokendings.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -11,8 +11,8 @@ import java.util.Map; import no.nav.testnav.libs.securitycore.domain.AccessToken; -import no.nav.testnav.mocks.tokendingsmock.domain.Arguments; -import no.nav.testnav.mocks.tokendingsmock.service.JwtService; +import no.nav.testnav.mocks.tokendings.domain.Arguments; +import no.nav.testnav.mocks.tokendings.service.JwtService; @Slf4j @RestController @@ -20,11 +20,15 @@ @RequestMapping("/mock") public class MockController { - private final JwtService jwtService; + private final JwtService service; - @PostMapping(value = "/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping( + value = "/token", + consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE + ) public Mono createToken(Arguments arguments) { - var jwt = jwtService.jwtWith(Map.of("pid", arguments.getPid()), arguments.getAudience()); + var jwt = service.jwtWith(Map.of("pid", arguments.getPid()), arguments.getAudience()); return Mono.just(new AccessToken(jwt)); } diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/controller/OauthAuthorizationServiceController.java similarity index 52% rename from mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java rename to mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/controller/OauthAuthorizationServiceController.java index a04c6136991..4ef98ea8f78 100644 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/controller/OauthAuthorizationServiceController.java +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/controller/OauthAuthorizationServiceController.java @@ -1,67 +1,53 @@ -package no.nav.testnav.mocks.tokendingsmock.controller; +package no.nav.testnav.mocks.tokendings.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.io.ClassPathResource; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import no.nav.testnav.libs.securitycore.domain.AccessToken; -import no.nav.testnav.mocks.tokendingsmock.domain.Arguments; -import no.nav.testnav.mocks.tokendingsmock.service.JwtService; +import no.nav.testnav.mocks.tokendings.domain.Arguments; +import no.nav.testnav.mocks.tokendings.service.JwtService; + +import static no.nav.testnav.mocks.tokendings.TokendingsMockApplicationStarter.Utils.loadJson; @Slf4j @RestController @RequiredArgsConstructor public class OauthAuthorizationServiceController { - private static final String jwks; - private static final String wellknown; + private static final String JWKS; + private static final String WELL_KNOWN; static { - jwks = loadJson("static/jwks.json"); - wellknown = loadJson("static/well-known.json"); + JWKS = loadJson("static/jwks.json"); + WELL_KNOWN = loadJson("static/well-known.json"); } - private final JwtService jwtService; - - private static String loadJson(String path) { - var resource = new ClassPathResource(path); - try (final InputStreamReader stream = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)) { - return new BufferedReader(stream) - .lines().collect(Collectors.joining("\n")); - - } catch (IOException e) { - throw new RuntimeException("Feil med paring av " + path + ".", e); - } - } + private final JwtService service; @GetMapping(value = "/jwks", produces = MediaType.APPLICATION_JSON_VALUE) - public Mono getJwks() { - return Mono.just(jwks); + public Mono getJWKS() { + return Mono.just(JWKS); } @GetMapping(value = "/.well-known/oauth-authorization-server", produces = MediaType.APPLICATION_JSON_VALUE) public Mono getWellKnown() { - return Mono.just(wellknown); + return Mono.just(WELL_KNOWN); } @PostMapping(value = "/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public Mono createToken(Arguments arguments) { var excludedClaims = Set.of("aud", "nbf", "iss", "exp", "iat", "jtl"); - var verify = jwtService.verify(arguments.getSubject_token()); + var verify = service.verify(arguments.getSubjectToken()); var claims = verify .getClaims() .entrySet() @@ -69,7 +55,7 @@ public Mono createToken(Arguments arguments) { .filter(set -> !excludedClaims.contains(set.getKey())) .map(entry -> Map.entry(entry.getKey(), entry.getValue().asString())) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return Mono.just(new AccessToken(jwtService.jwtWith(claims, arguments.getAudience()))); + return Mono.just(new AccessToken(service.jwtWith(claims, arguments.getAudience()))); } } diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/domain/Arguments.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/domain/Arguments.java new file mode 100644 index 00000000000..28d83550d46 --- /dev/null +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/domain/Arguments.java @@ -0,0 +1,16 @@ +package no.nav.testnav.mocks.tokendings.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class Arguments { + @JsonProperty("audience") + private String audience; + @JsonProperty("subject_token") + private String subjectToken; + @JsonProperty("pid") + private String pid; +} diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/service/JwtService.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/service/JwtService.java similarity index 53% rename from mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/service/JwtService.java rename to mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/service/JwtService.java index 2394e15b317..47229f569ad 100644 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/service/JwtService.java +++ b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendings/service/JwtService.java @@ -1,4 +1,4 @@ -package no.nav.testnav.mocks.tokendingsmock.service; +package no.nav.testnav.mocks.tokendings.service; import com.auth0.jwt.JWT; @@ -7,48 +7,33 @@ import com.nimbusds.jose.jwk.RSAKey; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; import java.security.interfaces.RSAPrivateKey; import java.util.Calendar; import java.util.Date; import java.util.Map; import java.util.UUID; -import java.util.stream.Collectors; + +import static no.nav.testnav.mocks.tokendings.TokendingsMockApplicationStarter.Utils.loadJson; @Service @RequiredArgsConstructor public class JwtService { - private static final String jwtSecret; - - static { - jwtSecret = loadJson("static/jwk.json"); - } - private static String loadJson(String path) { - var resource = new ClassPathResource(path); - try (final InputStreamReader stream = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)) { - return new BufferedReader(stream) - .lines().collect(Collectors.joining("\n")); + private static final String JWK; - } catch (IOException e) { - throw new RuntimeException("Feil med paring av " + path + ".", e); - } + static { + JWK = loadJson("static/jwk.json"); } - @SneakyThrows public DecodedJWT verify(String jwt) { - var key = RSAKey.parse(jwtSecret); - var verifier = JWT + var key = RSAKey.parse(JWK); + return JWT .require(Algorithm.RSA256(key.toRSAPublicKey(), (RSAPrivateKey) key.toPrivateKey())) - .build(); - return verifier.verify(jwt); + .build() + .verify(jwt); } @@ -64,11 +49,11 @@ public String jwtWith(Map claims, String audience) { .withJWTId(UUID.randomUUID().toString()) .withExpiresAt(new Date(date.getTimeInMillis() + (2 * 60 * 60 * 1000))); claims.forEach(builder::withClaim); - - var privateKey = RSAKey.parse(jwtSecret).toPrivateKey(); - + var privateKey = (RSAPrivateKey) RSAKey + .parse(JWK) + .toPrivateKey(); return builder - .sign(Algorithm.RSA256(null, (RSAPrivateKey) privateKey)); + .sign(Algorithm.RSA256(null, privateKey)); } } diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/TokendingsMockApplicationStarter.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/TokendingsMockApplicationStarter.java deleted file mode 100644 index 3d844aca42f..00000000000 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/TokendingsMockApplicationStarter.java +++ /dev/null @@ -1,19 +0,0 @@ -package no.nav.testnav.mocks.tokendingsmock; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; -import org.springframework.web.reactive.config.EnableWebFlux; - -import no.nav.testnav.libs.reactivecore.config.CoreConfig; - -@Import({ - CoreConfig.class, -}) -@EnableWebFlux -@SpringBootApplication -public class TokendingsMockApplicationStarter { - public static void main(String[] args) { - SpringApplication.run(TokendingsMockApplicationStarter.class, args); - } -} diff --git a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java b/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java deleted file mode 100644 index 36bfe3d6ab9..00000000000 --- a/mocks/tokendings-mock/src/main/java/no/nav/testnav/mocks/tokendingsmock/domain/Arguments.java +++ /dev/null @@ -1,12 +0,0 @@ -package no.nav.testnav.mocks.tokendingsmock.domain; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class Arguments { - private String audience; - private String subject_token; - private String pid; -} diff --git a/mocks/tokendings-mock/src/main/resources/application.yml b/mocks/tokendings-mock/src/main/resources/application.yml index 4477bc4a03a..d1ff1941b4a 100644 --- a/mocks/tokendings-mock/src/main/resources/application.yml +++ b/mocks/tokendings-mock/src/main/resources/application.yml @@ -1,4 +1,3 @@ spring: application: - name: tokendings-mock - desciption: En mock for tokendings \ No newline at end of file + name: tokendings-mock \ No newline at end of file diff --git a/plugins/java/src/main/groovy/dolly-versions.gradle b/plugins/java/src/main/groovy/dolly-versions.gradle index ac8c48bf5e4..a2656a3d4de 100644 --- a/plugins/java/src/main/groovy/dolly-versions.gradle +++ b/plugins/java/src/main/groovy/dolly-versions.gradle @@ -13,6 +13,7 @@ class DollyVersionCatalog { String apachePoi = "5.3.0" String assertj = "3.26.0" String avro = "7.6.1" + String bouncyCastle = "1.78.1" String guava = "33.2.0-jre" String jackson = "2.17.2" String jakartaActivation = "2.1.3" From cba90b6993754d01513831c7fb97657f1fa68f15 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 12 Sep 2024 16:03:55 +0200 Subject: [PATCH 02/12] Fjernet MaxDepthPerThrowable i logback --- apps/adresse-service/src/main/resources/logback-spring.xml | 2 +- apps/amelding-service/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/brreg-stub/src/main/resources/logback-spring.xml | 2 +- apps/bruker-service/src/main/resources/logback-spring.xml | 4 ++-- apps/budpro-service/src/main/resources/logback-spring.xml | 2 +- apps/dolly-backend/src/main/resources/logback-spring.xml | 2 +- apps/dolly-frontend/src/main/resources/logback-spring.xml | 1 - apps/dollystatus/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../faste-data-frontend/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/kodeverk-service/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/miljoer-service/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 4 ++-- .../src/main/resources/logback-spring.xml | 2 +- apps/orgnummer-service/src/main/resources/logback-spring.xml | 2 +- apps/oversikt-frontend/src/main/resources/logback-spring.xml | 2 +- apps/pdl-forvalter/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/person-service/src/main/resources/logback-spring.xml | 2 +- apps/profil-api/src/main/resources/logback-spring.xml | 2 +- apps/skattekort-service/src/main/resources/logback-spring.xml | 2 +- apps/sykemelding-api/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/testnav-ident-pool/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/tilbakemelding-api/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/udi-stub/src/main/resources/logback-spring.xml | 2 +- apps/varslinger-service/src/main/resources/logback-spring.xml | 4 ++-- .../src/main/resources/logback-spring.xml | 2 +- proxies/aareg-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../batch-adeo-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/brregstub-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/ereg-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/histark-proxy/src/main/resources/logback-spring.xml | 2 +- .../inntektstub-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/inst-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- proxies/krrstub-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/medl-proxy/src/main/resources/logback-spring.xml | 2 +- .../modapp-ereg-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/norg2-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/pdl-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- proxies/saf-proxy/src/main/resources/logback-spring.xml | 2 +- .../sigrunstub-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- proxies/udistub-proxy/src/main/resources/logback-spring.xml | 2 +- 80 files changed, 82 insertions(+), 83 deletions(-) diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml index 548416b37c9..82665807d91 100644 --- a/apps/adresse-service/src/main/resources/logback-spring.xml +++ b/apps/adresse-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/apps/amelding-service/src/main/resources/logback-spring.xml +++ b/apps/amelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml index 4832f349e0c..a7b6dd3a3e6 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml +++ b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml index 5c9a2412e45..6e928942d90 100644 --- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/brreg-stub/src/main/resources/logback-spring.xml +++ b/apps/brreg-stub/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml index a8f4e1102e4..bde386c86b7 100644 --- a/apps/bruker-service/src/main/resources/logback-spring.xml +++ b/apps/bruker-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke @@ -27,7 +27,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml index 45629711bde..8d108ba7157 100644 --- a/apps/budpro-service/src/main/resources/logback-spring.xml +++ b/apps/budpro-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml index fafc976c451..6c4bba7270e 100644 --- a/apps/dolly-backend/src/main/resources/logback-spring.xml +++ b/apps/dolly-backend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml index 328c3cbd84c..966dbc796b2 100644 --- a/apps/dolly-frontend/src/main/resources/logback-spring.xml +++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,6 @@ true - 256 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml index 9ebcb909c3d..bda6e2fe01e 100644 --- a/apps/dollystatus/src/main/resources/logback-spring.xml +++ b/apps/dollystatus/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml index 07f5248d65f..567d9f139e0 100644 --- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml index 8150ec6c2fb..0b85920eee1 100644 --- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml +++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/generer-navn-service/src/main/resources/logback-spring.xml +++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml +++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml index eeb685bda41..c2304354f25 100644 --- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml +++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml index a4ab0d66c2f..e7a32604657 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml +++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/kodeverk-service/src/main/resources/logback-spring.xml +++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml index be77e0e7a98..5f39b7c7b9b 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml index be77e0e7a98..5f39b7c7b9b 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml index be77e0e7a98..5f39b7c7b9b 100644 --- a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/miljoer-service/src/main/resources/logback-spring.xml +++ b/apps/miljoer-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml index c95235c42b4..2b9ec4cb86b 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml +++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml index a4ab0d66c2f..e7a32604657 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml index a4ab0d66c2f..e7a32604657 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml index 5c9a2412e45..6e928942d90 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/organisasjon-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml index d679d46ee18..77af0d8bc7d 100644 --- a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke @@ -27,7 +27,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml index 4b79380bec5..379a17ddc3e 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/orgnummer-service/src/main/resources/logback-spring.xml +++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml +++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/pdl-forvalter/src/main/resources/logback-spring.xml b/apps/pdl-forvalter/src/main/resources/logback-spring.xml index bc227892463..ecb23009d03 100644 --- a/apps/pdl-forvalter/src/main/resources/logback-spring.xml +++ b/apps/pdl-forvalter/src/main/resources/logback-spring.xml @@ -6,7 +6,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml index df515f6fe70..4e4897ae999 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml index 10912516977..bde1862f2bc 100644 --- a/apps/person-search-service/src/main/resources/logback-spring.xml +++ b/apps/person-search-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml index 479b8bdf7a7..80126b63465 100644 --- a/apps/person-service/src/main/resources/logback-spring.xml +++ b/apps/person-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/profil-api/src/main/resources/logback-spring.xml +++ b/apps/profil-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/skattekort-service/src/main/resources/logback-spring.xml b/apps/skattekort-service/src/main/resources/logback-spring.xml index ca13d7d7df4..0fe593266ce 100644 --- a/apps/skattekort-service/src/main/resources/logback-spring.xml +++ b/apps/skattekort-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/sykemelding-api/src/main/resources/logback-spring.xml b/apps/sykemelding-api/src/main/resources/logback-spring.xml index c5ffedd557b..87916258c05 100644 --- a/apps/sykemelding-api/src/main/resources/logback-spring.xml +++ b/apps/sykemelding-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml +++ b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml index e6189bbd745..cb801609c61 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml index 691fda0f20c..9aed9d5f0bc 100644 --- a/apps/tenor-search-service/src/main/resources/logback-spring.xml +++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml +++ b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml +++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/tps-messaging-service/src/main/resources/logback-spring.xml b/apps/tps-messaging-service/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/tps-messaging-service/src/main/resources/logback-spring.xml +++ b/apps/tps-messaging-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/udi-stub/src/main/resources/logback-spring.xml b/apps/udi-stub/src/main/resources/logback-spring.xml index 8dcb3d51248..f49b192e253 100644 --- a/apps/udi-stub/src/main/resources/logback-spring.xml +++ b/apps/udi-stub/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/varslinger-service/src/main/resources/logback-spring.xml b/apps/varslinger-service/src/main/resources/logback-spring.xml index 9f8bf6cf184..395508d0604 100644 --- a/apps/varslinger-service/src/main/resources/logback-spring.xml +++ b/apps/varslinger-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke @@ -27,7 +27,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/examples/reactive-rest-example/src/main/resources/logback-spring.xml b/examples/reactive-rest-example/src/main/resources/logback-spring.xml index 16f5e9c7567..a189fa69b53 100644 --- a/examples/reactive-rest-example/src/main/resources/logback-spring.xml +++ b/examples/reactive-rest-example/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/aareg-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-proxy/src/main/resources/logback-spring.xml index 86a43aa5b33..ae836bf1b11 100644 --- a/proxies/aareg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/aareg-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml +++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml index 670bb2e190d..3196c68e393 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml +++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/histark-proxy/src/main/resources/logback-spring.xml +++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/inst-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml index ca618d7da3b..ecf519e83b1 100644 --- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml +++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/medl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml +++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml index 37ffd7e0d09..fa34559da64 100644 --- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml index bf12737c752..67da608456f 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/saf-proxy/src/main/resources/logback-spring.xml +++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml index f48486bb3ab..2b55a41c62f 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml +++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml index 8150ec6c2fb..0b85920eee1 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml +++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke From 4874348e86a17c8ae026ff8c0ad8b25bf23ecefa Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 09:20:11 +0200 Subject: [PATCH 03/12] Omskrivning aldersvalidering popp --- .../fagsystem/aareg/form/initialValues.tsx | 4 +- .../fagsystem/pensjon/form/Form.tsx | 50 +++++++++---------- .../pensjon/form/FyllInnInntektForm.tsx | 14 ++++-- .../pensjon/form/GenerertInntektForm.tsx | 4 +- .../fagsystem/pensjon/form/validation.tsx | 35 ++++++++----- 5 files changed, 61 insertions(+), 46 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx index ef8c1e677be..e33c6fbd2a8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx @@ -90,7 +90,7 @@ export const initialPeriode = { } export const initialPensjonInntekt = { - fomAar: new Date().getFullYear() - 10, + fomAar: runningE2ETest() ? new Date().getFullYear() - 10 : null, tomAar: runningE2ETest() ? new Date().getFullYear() : null, belop: runningE2ETest() ? '12345' : '', redusertMedGrunnbelop: true, @@ -98,7 +98,7 @@ export const initialPensjonInntekt = { export const initialPensjonGenerertInntekt = { generer: { - fomAar: new Date().getFullYear() - 10, + fomAar: null, averageG: 1.5, tillatInntektUnder1G: false, }, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx index 0342088df59..e00dbfbcd68 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx @@ -1,7 +1,7 @@ import { Vis } from '@/components/bestillingsveileder/VisAttributt' import Panel from '@/components/ui/panel/Panel' import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils' -import { validation } from '@/components/fagsystem/pensjon/form/validation' +import { getAlder, validation } from '@/components/fagsystem/pensjon/form/validation' import React, { useContext, useState } from 'react' import StyledAlert from '@/components/ui/alert/StyledAlert' import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext' @@ -33,24 +33,22 @@ export const PensjonForm = () => { ) const { nyBestilling, nyBestillingFraMal } = opts?.is - function kalkulerIdentFyltSyttenAar() { - const curDate = new Date() - const alder = - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') && - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') !== null - ? curDate.getFullYear() - - // @ts-ignore - new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() - : formMethods.watch('pdldata.opprettNyPerson.alder') - return alder && curDate.getFullYear() - alder + 17 + const curDate = new Date() + + const alder = + formMethods.watch('pdldata.opprettNyPerson.foedtFoer') && + formMethods.watch('pdldata.opprettNyPerson.foedtFoer') !== null + ? curDate.getFullYear() - + // @ts-ignore + new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() + : getAlder(formMethods.watch(), opts?.personFoerLeggTil, opts?.importPersoner) + + function kalkulerIdentGyldigAlder() { + const minAlder = alder && (curDate.getFullYear() - alder < 1997 ? 17 : 13) + return alder && curDate.getFullYear() - alder + minAlder } - const syttenFraOgMedAar = kalkulerIdentFyltSyttenAar() - const minAar = new Date().getFullYear() - 17 - const valgtAar = - inputType === inputValg.fyllInnInntekt - ? formMethods.watch(`${pensjonPath}.fomAar`) - : formMethods.watch(`${pensjonGenererPath}.generer.fomAar`) + const gyldigFraOgMedAar = kalkulerIdentGyldigAlder() return ( @@ -61,14 +59,12 @@ export const PensjonForm = () => { startOpen={erForsteEllerTest(formMethods.getValues(), [pensjonPath, pensjonGenererPath])} informasjonstekst={hjelpetekst} > - {!formMethods.getValues('pdldata.opprettNyPerson.alder') && - valgtAar < minAar && - (nyBestilling || nyBestillingFraMal) && ( - - Pensjonsgivende inntekt kan settes fra året personen fyller 17 år. For å sikre at - personen får gyldig alder kan denne settes ved å huke av for "Alder" på forrige side. - - )} + {!alder && (nyBestilling || nyBestillingFraMal) && ( + + Pensjonsgivende inntekt kan settes tidligst fra året personen fyller 13 år. For å sikre + at personen får gyldig alder kan denne settes ved å huke av for "Alder" på forrige side. + + )} { {inputType === inputValg.fyllInnInntekt && ( - + )} {inputType === inputValg.generertInntekt && ( - + )} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx index 8ebd35c9202..12f59aad214 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx @@ -6,14 +6,22 @@ import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import React from 'react' import { pensjonPath } from '@/components/fagsystem/pensjon/form/Form' -export const FyllInnInntektForm = ({ syttenFraOgMedAar }) => { +export const FyllInnInntektForm = ({ gyldigFraOgMedAar, formMethods }) => { + const visFomAar = formMethods.watch(`${pensjonPath}.tomAar`) + const visTomAar = formMethods.watch(`${pensjonPath}.fomAar`) + return (
@@ -21,7 +29,7 @@ export const FyllInnInntektForm = ({ syttenFraOgMedAar }) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx index 4744ad91790..de7eae9011a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx @@ -27,7 +27,7 @@ const StyledPanel = styled.div` width: 790px; ` -export const GenerertInntektForm = ({ syttenFraOgMedAar, formMethods }) => { +export const GenerertInntektForm = ({ gyldigFraOgMedAar, formMethods }) => { const formInntekter = formMethods.watch(`${pensjonGenererPath}.inntekter`) const genererTOM = formMethods.watch(`${pensjonGenererPath}.generer.tomAar`) const genererFOM = formMethods.watch(`${pensjonGenererPath}.generer.fomAar`) @@ -78,7 +78,7 @@ export const GenerertInntektForm = ({ syttenFraOgMedAar, formMethods }) => { name={`${pensjonGenererPath}.generer.fomAar`} label="Fra og med år" options={getYearRangeOptions( - syttenFraOgMedAar || 1968, + gyldigFraOgMedAar || 1968, (genererTOM && genererTOM - 1) || new Date().getFullYear() - 1, )} size={'xsmall'} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx index 7eb2d94482a..4f193be772d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx @@ -5,6 +5,7 @@ import { TjenestepensjonForm } from '@/components/fagsystem/tjenestepensjon/form import { AlderspensjonForm } from '@/components/fagsystem/alderspensjon/form/Form' import { UforetrygdForm } from '@/components/fagsystem/uforetrygd/form/Form' import { PensjonsavtaleForm } from '@/components/fagsystem/pensjonsavtale/form/Form' +import { getYear } from 'date-fns' function calculate_age(dob) { const diff_ms = Date.now() - dob.getTime() @@ -13,7 +14,7 @@ function calculate_age(dob) { return Math.abs(age_dt.getUTCFullYear() - 1970) } -const getAlder = (values, personFoerLeggTil, importPersoner) => { +export const getAlder = (values, personFoerLeggTil, importPersoner) => { let alder = _.get(values, 'pdldata.opprettNyPerson.alder') if (_.isNil(alder)) { let foedselsdato = null @@ -21,6 +22,10 @@ const getAlder = (values, personFoerLeggTil, importPersoner) => { foedselsdato = values.pdldata.person.foedselsdato[0].foedselsdato } else if (values?.pdldata?.person?.foedsel?.[0]?.foedselsdato) { foedselsdato = values.pdldata.person.foedsel[0].foedselsdato + } else if (values?.pdldata?.person?.foedselsdato?.[0]?.foedselsaar) { + foedselsdato = new Date().setFullYear(values.pdldata.person.foedselsdato[0].foedselsaar) + } else if (values?.pdldata?.opprettNyPerson?.foedtFoer) { + foedselsdato = values.pdldata.opprettNyPerson.foedtFoer } else if (personFoerLeggTil?.pdlforvalter?.person?.foedselsdato) { const foedselsdatoer = personFoerLeggTil.pdlforvalter.person.foedselsdato .map((foedsel) => foedsel.foedselsdato) @@ -50,7 +55,7 @@ const getAlder = (values, personFoerLeggTil, importPersoner) => { return alder } -const invalidAlderFom = (inntektFom, values, personFoerLeggTil) => { +const invalidAlderFom = (inntektFom, values, personFoerLeggTil, minAlder) => { const importPersoner = values.importPersoner const alder = getAlder(values, personFoerLeggTil, importPersoner) @@ -58,7 +63,7 @@ const invalidAlderFom = (inntektFom, values, personFoerLeggTil) => { const foedtEtter = _.get(values, 'pdldata.opprettNyPerson.foedtEtter') if (!_.isNil(alder) && alder !== '') { - if (new Date().getFullYear() - alder + 17 > inntektFom) { + if (new Date().getFullYear() - alder + minAlder > inntektFom) { return true } } else if (!_.isNil(foedtFoer)) { @@ -68,12 +73,12 @@ const invalidAlderFom = (inntektFom, values, personFoerLeggTil) => { let year = foedtFoerDate.getFullYear() year = day === 1 && month === 0 ? year - 1 : year - if (year + 17 > inntektFom) { + if (year + minAlder || 13 > inntektFom) { return true } } else if (!_.isNil(foedtEtter) && _.isNil(foedtFoer)) { const foedtEtterDate = new Date(foedtEtter) - if (foedtEtterDate.getFullYear() + 17 > inntektFom) { + if (foedtEtterDate.getFullYear() + minAlder || 13 > inntektFom) { return true } } @@ -136,15 +141,21 @@ const validFomDateTest = (val: Yup.NumberSchema) => { return val.test('gyldig-fom-aar', 'Feil', (value, context) => { if (!value) return true const inntektFom = value - - const values = context.parent + const values = context.from?.[context.from.length - 1]?.value const personFoerLeggTil = context?.options?.context?.personFoerLeggTil - if (invalidAlderFom(inntektFom, values, personFoerLeggTil)) { - return context.createError({ message: 'F.o.m kan tidligst være året personen fyller 17 år' }) + const alder = getAlder(values, personFoerLeggTil, values.importPersoner) + const foedselsAar = alder && getYear(new Date()) - alder + + const minAlder = foedselsAar && foedselsAar < 1997 ? 17 : 13 + + if (invalidAlderFom(inntektFom, values, personFoerLeggTil, minAlder)) { + return context.createError({ + message: `F.o.m kan tidligst være året personen fyller ${minAlder.toString()} år`, + }) } - let inntektTom = values?.tomAar + let inntektTom = context.options.parent.tomAar if (!_.isNil(inntektTom) && inntektFom > inntektTom) { return context.createError({ message: 'F.o.m. dato må være før t.o.m. dato' }) } @@ -158,7 +169,7 @@ const validTomDateTest = (val: Yup.NumberSchema) => { if (!value) return true let inntektTom = value - const values = context.parent + const values = context.from?.[context.from.length - 1]?.value const personFoerLeggTil = context?.options?.context?.personFoerLeggTil if (invalidAlderTom(inntektTom, values, personFoerLeggTil)) { @@ -171,7 +182,7 @@ const validTomDateTest = (val: Yup.NumberSchema) => { return context.createError({ message: 'T.o.m kan ikke være etter at person har dødd' }) } - const inntektFom = values?.fomAar + const inntektFom = context.options.parent.fomAar if (!_.isNil(inntektFom) && inntektTom < inntektFom) { return context.createError({ message: 'T.o.m. dato må være etter f.o.m. dato' }) } From bcb114ec43569f240834bd83799fdbe204ee0626 Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 09:24:25 +0200 Subject: [PATCH 04/12] Deploy test #deploy-test-frontend --- .../main/js/src/components/fagsystem/pensjon/form/validation.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx index 4f193be772d..a91cc5abfe6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx @@ -57,7 +57,6 @@ export const getAlder = (values, personFoerLeggTil, importPersoner) => { const invalidAlderFom = (inntektFom, values, personFoerLeggTil, minAlder) => { const importPersoner = values.importPersoner - const alder = getAlder(values, personFoerLeggTil, importPersoner) const foedtFoer = _.get(values, 'pdldata.opprettNyPerson.foedtFoer') const foedtEtter = _.get(values, 'pdldata.opprettNyPerson.foedtEtter') From a97ceeec76aa72b6fde6775822aeba6dcf135885 Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 10:16:48 +0200 Subject: [PATCH 05/12] Fix --- .../src/components/fagsystem/pensjon/form/Form.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx index e00dbfbcd68..12312590936 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx @@ -35,13 +35,11 @@ export const PensjonForm = () => { const curDate = new Date() - const alder = - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') && - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') !== null - ? curDate.getFullYear() - - // @ts-ignore - new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() - : getAlder(formMethods.watch(), opts?.personFoerLeggTil, opts?.importPersoner) + const alder = formMethods.watch('pdldata.opprettNyPerson.foedtFoer') + ? curDate.getFullYear() - + // @ts-ignore + new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() + : getAlder(formMethods.watch(), opts?.personFoerLeggTil, opts?.importPersoner) function kalkulerIdentGyldigAlder() { const minAlder = alder && (curDate.getFullYear() - alder < 1997 ? 17 : 13) From 45b5696a0b15aeeb93cfa8c896ae1c2d78fdb13a Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 10:40:57 +0200 Subject: [PATCH 06/12] Bytt org-bestilling-icon --- .../js/src/pages/organisasjoner/OrganisasjonBestilling.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx index aee01185eef..2cf3e771375 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx @@ -1,7 +1,7 @@ import _ from 'lodash' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyTable } from '@/components/ui/dollyTable/DollyTable' -import { OrganisasjonItem } from '@/components/ui/icon/IconItem' +import { BestillingIconItem } from '@/components/ui/icon/IconItem' import Icon from '@/components/ui/icon/Icon' import BestillingDetaljer from '@/components/bestilling/detaljer/BestillingDetaljer' import { OrgStatus } from '@/components/fagsystem/organisasjoner/types' @@ -92,7 +92,7 @@ export default function OrganisasjonBestilling({ data={bestillingStatuser} columns={columns} pagination - iconItem={} + iconItem={} onExpand={(bestilling: OrgStatus) => { return ( Date: Mon, 16 Sep 2024 10:33:53 +0200 Subject: [PATCH 07/12] Fix visning av vedtaksstatus paa AP og UT --- .../visning/AlderspensjonVisning.tsx | 5 ++-- .../uforetrygd/visning/UforetrygdVisning.tsx | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx index 6573c74b218..4955c871789 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx @@ -21,6 +21,7 @@ const DataVisning = ({ data, miljo }) => { )?.label const { vedtakData } = usePensjonVedtak(data?.fnr, miljo) + const vedtakAP = vedtakData?.find((vedtak) => vedtak?.sakType === 'AP') return ( <> @@ -28,9 +29,9 @@ const DataVisning = ({ data, miljo }) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx index f4daca96ee2..d1c67bb357d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx @@ -57,21 +57,24 @@ const DataVisning = ({ data, miljo }) => { )?.label const { vedtakData } = usePensjonVedtak(data?.fnr, miljo) + const vedtakUT = vedtakData?.find((vedtak) => vedtak?.sakType === 'UT') + + const getSisteOppdatering = (sisteOppdatering: string) => { + if (sisteOppdatering?.includes('opprettet')) { + return 'Iverksatt' + } else if (sisteOppdatering?.indexOf('<') > 0) { + return sisteOppdatering?.substring(0, sisteOppdatering?.indexOf('<')) + } else if (sisteOppdatering?.indexOf('{') > 0) { + return sisteOppdatering?.substring(0, sisteOppdatering?.indexOf('{')) + } else { + return sisteOppdatering + } + } return ( <>
- + From 5e39264ddd9d86303e8030f43a565a1f405f381e Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 16 Sep 2024 11:00:46 +0200 Subject: [PATCH 08/12] =?UTF-8?q?Bruker=20n=C3=A5=20convention=20plugin=20?= =?UTF-8?q?dolly-apps.=20(#3616)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build.gradle | 87 ++++--------------- .../build.gradle | 85 ++++-------------- 2 files changed, 34 insertions(+), 138 deletions(-) diff --git a/apps/levende-arbeidsforhold-scheduler/build.gradle b/apps/levende-arbeidsforhold-scheduler/build.gradle index 816d6d2667a..f0cc5802adc 100644 --- a/apps/levende-arbeidsforhold-scheduler/build.gradle +++ b/apps/levende-arbeidsforhold-scheduler/build.gradle @@ -1,87 +1,34 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-levende-arbeidsforhold-scheduler" property "sonar.projectName", "testnav-levende-arbeidsforhold-scheduler" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'no.nav.testnav.libs:servlet-security' - implementation 'no.nav.testnav.libs:servlet-insecure-security' - - - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-quartz' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation "no.nav.testnav.libs:security-core" + implementation "no.nav.testnav.libs:servlet-core" + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:servlet-security" + implementation "no.nav.testnav.libs:servlet-insecure-security" - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-quartz" + implementation "org.springframework.boot:spring-boot-starter-oauth2-client" + implementation "org.springframework.boot:spring-boot-starter-security" - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' + testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock" //Dependencies av dependencies som må ha spesifisert versjon for å ikke forårsake sikkerthets-sårbarheter - implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25' - implementation 'org.bouncycastle:bcprov-jdk18on:1.78' - implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2' + implementation "org.apache.tomcat.embed:tomcat-embed-core:10.1.25" + implementation "org.bouncycastle:bcprov-jdk18on:$versions.bouncyCastle" + implementation "com.nimbusds:nimbus-jose-jwt:9.37.2" -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} +} \ No newline at end of file diff --git a/apps/levende-arbeidsforhold-service/build.gradle b/apps/levende-arbeidsforhold-service/build.gradle index 42454499acc..1ff86f414b6 100644 --- a/apps/levende-arbeidsforhold-service/build.gradle +++ b/apps/levende-arbeidsforhold-service/build.gradle @@ -1,85 +1,34 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-levende-arbeidsforhold-service" property "sonar.projectName", "testnav-levende-arbeidsforhold-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } dependencies { - implementation 'no.nav.testnav.libs:avro-schema' - implementation 'no.nav.testnav.libs:kafka-config' - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:servlet-insecure-security' - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-security' + implementation "io.confluent:kafka-avro-serializer:$versions.avro" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation "no.nav.testnav.libs:avro-schema" + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:kafka-config" + implementation "no.nav.testnav.libs:reactive-core" + implementation "no.nav.testnav.libs:security-core" + implementation "no.nav.testnav.libs:servlet-core" + implementation "no.nav.testnav.libs:servlet-insecure-security" - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' + implementation "org.springframework.boot:spring-boot-starter-oauth2-client" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-web" - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' + implementation "org.springframework.kafka:spring-kafka" - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - implementation 'org.apache.kafka:kafka-clients:3.7.0' - implementation 'io.confluent:kafka-avro-serializer:7.6.0' - implementation 'org.springframework.kafka:spring-kafka' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock" } From ae07098f81c3617f7f5ab8d632cc3ef1030cea14 Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Mon, 16 Sep 2024 11:14:14 +0200 Subject: [PATCH 09/12] Bugfix/endring direkte vergemaal (#3610) * Designendringer med Betsy og refaktorert en del utdatert kode * Oppdatering og mindre refaktor * Endret redigering av vergemaal i pdl-forvalter * Fikset innsending av vergemaal fra frontend --- .../src/main/js/package-lock.json | 315 +++++++++--------- apps/dolly-frontend/src/main/js/package.json | 2 +- .../stegVelger/StegVelger.tsx | 8 +- .../components/fagsystem/pdlf/PdlTypes.tsx | 2 +- .../fagsystem/pdlf/form/initialValues.tsx | 23 +- .../sivilstand/Sivilstand.tsx | 1 + .../pdlf/form/partials/fullmakt/Fullmakt.tsx | 3 +- .../pdlf/form/partials/nyIdent/nyIdent.tsx | 1 + .../form/partials/pdlPerson/PdlNyPerson.tsx | 1 + .../partials/pdlPerson/PdlPersonExpander.tsx | 3 + .../form/partials/pdlPerson/PdlPersonForm.tsx | 106 ++++-- .../form/partials/vergemaal/Vergemaal.tsx | 1 + .../pdlf/visning/partials/Vergemaal.tsx | 4 +- .../visningRedigerbar/VisningRedigerbar.tsx | 21 +- .../main/js/src/components/ui/icon/Icon.tsx | 6 +- .../PdlForvalterApplicationStarter.java | 2 +- .../service/ArtifactUpdateService.java | 93 +++--- .../src/main/resources/application-local.yaml | 5 +- 18 files changed, 340 insertions(+), 257 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json index 8856d18f57e..3d3610b3e88 100644 --- a/apps/dolly-frontend/src/main/js/package-lock.json +++ b/apps/dolly-frontend/src/main/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "dolly", - "version": "3.0.27", + "version": "3.0.29", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dolly", - "version": "3.0.27", + "version": "3.0.29", "license": "ISC", "dependencies": { "@grafana/faro-react": "^1.1.2", @@ -1170,9 +1170,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.9.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz", - "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==", + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", + "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", "dev": true, "license": "MIT", "engines": { @@ -1189,6 +1189,19 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/plugin-kit": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz", + "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@floating-ui/core": { "version": "1.6.7", "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz", @@ -1469,16 +1482,16 @@ } }, "node_modules/@navikt/aksel-icons": { - "version": "6.16.2", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.16.2/9ee0592457a1e1bc8c1990d1aa3a3cf6c9cc4522", - "integrity": "sha512-M2rJHEYbHeh9M8smGizRvV6QAj6CAfQMW4vF6zBiNUzV4LfcwgxmwTRM/F5A1lbZScPuFZqAHUey1N3htVl8Cw==", + "version": "6.16.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.16.3/e0a4e5abf2a0b9ae9b7be68d0f72080832fd8457", + "integrity": "sha512-EE5L1F/HGzX1XJ0hQBUJq/wpdoTIs2ii02MxrZ6Ubr50Au9k9gGAUEC+fE+qxTxB8e2aDWlEvOePj1PSP/nMww==", "dev": true, "license": "MIT" }, "node_modules/@navikt/ds-css": { - "version": "6.16.2", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.16.2/6504d11c7905723a585a2c9ba2555fb5a8a159e1", - "integrity": "sha512-fWJRierHeHKe718crx8+TmRsKfQ+BODm13oodvt3LIiQmINNNdF7rtAFSO6+yzF6ReVj2bAnqyr+6UqDH9RJyw==", + "version": "6.16.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.16.3/eabc958ee4d9ae6c3510608b5bf21b53ad479e4f", + "integrity": "sha512-wq4NHNceTmrXfl9B1GjPypKcpCDNcxhrX+ENfJ/6LJJlHyCKeWZRTtHSr7gprLFQ9hREglJR9Ie8m9xDr4nimA==", "dev": true, "license": "MIT" }, @@ -1500,16 +1513,16 @@ } }, "node_modules/@navikt/ds-react": { - "version": "6.16.2", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.16.2/b16cba0f95df6b9e4035099c0dc5b239dcbd5392", - "integrity": "sha512-snJnxUXiDN8wmjb3uoELhTfpdsdpftXuZBaZeLsST/skMPJHdym9D8pVjbti4pKrnG2/9zYI2rX/bE2e26D7CQ==", + "version": "6.16.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.16.3/55d1ee7cebf5c9db3e7300cfb81bd60f60347e81", + "integrity": "sha512-88dyVXXqNp8NgDjtoBEmuDANaOOt8DCMNqAUMT3/FPdTeFFH42yLqbkYUiSqRC37e3S3vKLbhphZiPQla1SloQ==", "dev": true, "license": "MIT", "dependencies": { "@floating-ui/react": "0.25.4", "@floating-ui/react-dom": "^2.0.9", - "@navikt/aksel-icons": "^6.16.2", - "@navikt/ds-tokens": "^6.16.2", + "@navikt/aksel-icons": "^6.16.3", + "@navikt/ds-tokens": "^6.16.3", "clsx": "^2.1.0", "date-fns": "^3.0.0", "react-day-picker": "8.10.0" @@ -1633,9 +1646,9 @@ } }, "node_modules/@navikt/ds-tokens": { - "version": "6.16.2", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.16.2/e2f8b1ee8b5125a4497d1baca3b19ac4bd6716e4", - "integrity": "sha512-2m1CNuP2Uz3mLBQt5Xb1fKziJTrrMw97E6HgICrUCkm2Vo5ZpzkD1tcS0KSlbz1XMg/q+CheERUIL6kPdj79eQ==", + "version": "6.16.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.16.3/1ce1e16ad2c2386a756e6e6d8a05dcd9564cae9b", + "integrity": "sha512-kVIYWf2gSdy4PB+sRbKn1HERep/c6WnCH31DUHLqrcgzGXHG+qcfnS5nEWl9wn10NE+dMlL4+A7B2rPc/3rIzQ==", "dev": true, "license": "MIT" }, @@ -2278,14 +2291,14 @@ } }, "node_modules/@playwright/experimental-ct-core": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-core/-/experimental-ct-core-1.46.1.tgz", - "integrity": "sha512-vmRVmrQZ8mEHCbyrSB/l4hPcz95DCgFY7lCr8jKaY+dresap5WzxgHs2l2c/mNjiS5rFR6BnxKvqhCt0BBIKeA==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-core/-/experimental-ct-core-1.47.0.tgz", + "integrity": "sha512-IgZBGLREGUqTEXwb8Kh0vEG+/CHHf7EtpivAVoaO8cPzEfZU0LMlyjBaQk0ry5LDD65BZ9DwhTfMYMekAqWXMg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.46.1", - "playwright-core": "1.46.1", + "playwright": "1.47.0", + "playwright-core": "1.47.0", "vite": "^5.2.8" }, "engines": { @@ -2293,13 +2306,13 @@ } }, "node_modules/@playwright/experimental-ct-react": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-react/-/experimental-ct-react-1.46.1.tgz", - "integrity": "sha512-MTOpiVrooq5gMwh0v6OazW4udTbUqVCDQVNX0d20u3+q8Frl9pO522eDHdEQ4bWTOknmyDyTQlXyK6GWlKHjqQ==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-react/-/experimental-ct-react-1.47.0.tgz", + "integrity": "sha512-GBGfc+NmgdJquyL3XkyhqSROMoyrP4h6Fd77uu/2l/X+xHkb96hmpZ8FyDKEP3Brlm6W0PnTTQUP0FcS5jggAw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@playwright/experimental-ct-core": "1.46.1", + "@playwright/experimental-ct-core": "1.47.0", "@vitejs/plugin-react": "^4.2.1" }, "bin": { @@ -2310,13 +2323,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz", - "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.0.tgz", + "integrity": "sha512-SgAdlSwYVpToI4e/IH19IHHWvoijAYH5hu2MWSXptRypLSnzj51PcGD+rsOXFayde4P9ZLi+loXVwArg6IUkCA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.46.1" + "playwright": "1.47.0" }, "bin": { "playwright": "cli.js" @@ -2651,9 +2664,9 @@ } }, "node_modules/@rc-component/trigger": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.1.tgz", - "integrity": "sha512-fuU11J8pOt6+U/tU6/CAv8wjCwGaNeRk9f5k8HQth7JBbJ6MMH62WhGycVW75VnXfBZgL/7kO+wbiO2Xc9U9sQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.3.tgz", + "integrity": "sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.2", @@ -2711,9 +2724,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.1.tgz", - "integrity": "sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg==", + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.2.tgz", + "integrity": "sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==", "license": "MIT", "engines": { "node": ">=14.0.0" @@ -3064,9 +3077,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.5.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.2.tgz", - "integrity": "sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==", + "version": "22.5.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", + "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -3257,17 +3270,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.3.0.tgz", - "integrity": "sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz", + "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.3.0", - "@typescript-eslint/type-utils": "8.3.0", - "@typescript-eslint/utils": "8.3.0", - "@typescript-eslint/visitor-keys": "8.3.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/type-utils": "8.5.0", + "@typescript-eslint/utils": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3291,16 +3304,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz", - "integrity": "sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz", + "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "8.3.0", - "@typescript-eslint/types": "8.3.0", - "@typescript-eslint/typescript-estree": "8.3.0", - "@typescript-eslint/visitor-keys": "8.3.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "debug": "^4.3.4" }, "engines": { @@ -3320,14 +3333,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz", - "integrity": "sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", + "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.3.0", - "@typescript-eslint/visitor-keys": "8.3.0" + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3338,14 +3351,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.3.0.tgz", - "integrity": "sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz", + "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.3.0", - "@typescript-eslint/utils": "8.3.0", + "@typescript-eslint/typescript-estree": "8.5.0", + "@typescript-eslint/utils": "8.5.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3363,9 +3376,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz", - "integrity": "sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", + "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", "dev": true, "license": "MIT", "engines": { @@ -3377,14 +3390,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz", - "integrity": "sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", + "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "8.3.0", - "@typescript-eslint/visitor-keys": "8.3.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -3406,16 +3419,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz", - "integrity": "sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", + "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.3.0", - "@typescript-eslint/types": "8.3.0", - "@typescript-eslint/typescript-estree": "8.3.0" + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3429,13 +3442,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz", - "integrity": "sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", + "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/types": "8.5.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -3512,9 +3525,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", - "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, "license": "MIT", "dependencies": { @@ -3985,9 +3998,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001655", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz", - "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "dev": true, "funding": [ { @@ -4116,9 +4129,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz", - "integrity": "sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", + "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==", "license": "MIT" }, "node_modules/classnames": { @@ -4422,12 +4435,12 @@ } }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -4583,9 +4596,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz", - "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==", + "version": "1.5.20", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.20.tgz", + "integrity": "sha512-74mdl6Fs1HHzK9SUX4CKFxAtAe3nUns48y79TskHNAG6fGOlLfyKA4j855x+0b5u8rWJIrlaG9tcTPstMlwjIw==", "dev": true, "license": "ISC" }, @@ -4854,9 +4867,9 @@ } }, "node_modules/eslint": { - "version": "9.9.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz", - "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==", + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz", + "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==", "dev": true, "license": "MIT", "dependencies": { @@ -4864,7 +4877,8 @@ "@eslint-community/regexpp": "^4.11.0", "@eslint/config-array": "^0.18.0", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.9.1", + "@eslint/js": "9.10.0", + "@eslint/plugin-kit": "^0.1.0", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", @@ -4887,7 +4901,6 @@ "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", @@ -4927,9 +4940,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.35.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz", - "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==", + "version": "7.35.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.2.tgz", + "integrity": "sha512-Rbj2R9zwP2GYNcIak4xoAMV57hrBh3hTaR0k7hVjwCQgryE/pw5px4b13EYjduOI0hfXyZhwBxaGpOTbWSGzKQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5407,9 +5420,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "funding": [ { "type": "individual", @@ -7195,9 +7208,9 @@ "license": "MIT" }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/nan": { @@ -7641,9 +7654,9 @@ } }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "license": "ISC" }, "node_modules/picomatch": { @@ -7671,13 +7684,13 @@ } }, "node_modules/playwright": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz", - "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz", + "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.46.1" + "playwright-core": "1.47.0" }, "bin": { "playwright": "cli.js" @@ -7690,9 +7703,9 @@ } }, "node_modules/playwright-core": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz", - "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz", + "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -8272,12 +8285,12 @@ } }, "node_modules/react-router": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.1.tgz", - "integrity": "sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ==", + "version": "6.26.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.2.tgz", + "integrity": "sha512-tvN1iuT03kHgOFnLPfLJ8V95eijteveqdOSk+srqfePtQvqCExB8eHOYnlilbOcyJyKnYkr1vJvf7YqotAJu1A==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.19.1" + "@remix-run/router": "1.19.2" }, "engines": { "node": ">=14.0.0" @@ -8287,13 +8300,13 @@ } }, "node_modules/react-router-dom": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.1.tgz", - "integrity": "sha512-veut7m41S1fLql4pLhxeSW3jlqs+4MtjRLj0xvuCEXsxusJCbs6I8yn9BxzzDX2XDgafrccY6hwjmd/bL54tFw==", + "version": "6.26.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.2.tgz", + "integrity": "sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.19.1", - "react-router": "6.26.1" + "@remix-run/router": "1.19.2", + "react-router": "6.26.2" }, "engines": { "node": ">=14.0.0" @@ -8813,9 +8826,9 @@ "optional": true }, "node_modules/sass": { - "version": "1.77.8", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", - "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", + "version": "1.78.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz", + "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9035,9 +9048,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -9586,9 +9599,9 @@ } }, "node_modules/type-fest": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz", - "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz", + "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -9676,9 +9689,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -9838,14 +9851,14 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz", - "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.4.tgz", + "integrity": "sha512-RHFCkULitycHVTtelJ6jQLd+KSAAzOgEYorV32R2q++M6COBjKJR6BxqClwp5sf0XaBDjVMuJ9wnNfyAJwjMkA==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.41", + "postcss": "^8.4.43", "rollup": "^4.20.0" }, "bin": { @@ -9943,9 +9956,9 @@ } }, "node_modules/vite/node_modules/postcss": { - "version": "8.4.43", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz", - "integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "funding": [ { diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json index 625d4fd102f..cdd84c95752 100644 --- a/apps/dolly-frontend/src/main/js/package.json +++ b/apps/dolly-frontend/src/main/js/package.json @@ -1,6 +1,6 @@ { "name": "dolly", - "version": "3.0.27", + "version": "3.0.29", "type": "module", "description": "", "main": "index.js", diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx index ce79b767d04..7042298f35d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx @@ -26,6 +26,10 @@ import { DollyValidation } from './steg/steg2/DollyValidation' const STEPS = [Steg1, Steg2, Steg3] +export const devEnabled = + window.location.hostname.includes('localhost') || + window.location.hostname.includes('dolly-frontend-dev') + export const StegVelger = ({ initialValues, onSubmit }) => { const context = useContext(BestillingsveilederContext) const errorContext: ShowErrorContextType = useContext(ShowErrorContext) @@ -81,10 +85,6 @@ export const StegVelger = ({ initialValues, onSubmit }) => { const labels = STEPS.map((v) => ({ label: v.label })) - const devEnabled = - window.location.hostname.includes('localhost') || - window.location.hostname.includes('dolly-frontend-dev') - return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx index d90181053df..3096e952a99 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx @@ -174,7 +174,7 @@ export type VergemaalValues = { sakType?: string gyldigFraOgMed: string gyldigTilOgMed: string - nyVergeIdent?: NyIdent + nyVergeIdent?: NyIdent | undefined vergeIdent?: string id: number } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx index b78ac7cc89b..d0bb443b547 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx @@ -29,7 +29,7 @@ export const getInitialKontaktadresse = (master = 'FREG') => ({ adressetype: null as unknown as string, gyldigFraOgMed: null as unknown as string, gyldigTilOgMed: null as unknown as string, - opprettCoAdresseNavn: null as object, + opprettCoAdresseNavn: null as unknown as object, kilde: 'Dolly', master: master, }) @@ -95,8 +95,6 @@ export const initialUkjentBosted = { bostedskommune: null as unknown as string, } -export const initialOppholdAnnetSted = null as unknown as string - export const initialKontaktinfoForDoedebo = { skifteform: null as unknown as string, attestutstedelsesdato: null as unknown as string, @@ -226,7 +224,7 @@ export const initialOrganisasjon = { export const initialPerson = { identifikasjonsnummer: null as unknown as string, foedselsdato: null as unknown as string, - navn: null as typeof navn, + navn: null as unknown as typeof navn, } export const initialNyPerson = { @@ -287,7 +285,7 @@ export const initialVergemaal = { sakType: null as unknown as string, gyldigFraOgMed: null as unknown as string, gyldigTilOgMed: null as unknown as string, - nyVergeIdent: initialPdlPerson, + nyVergeIdent: initialPdlPerson as unknown, vergeIdent: null as unknown as string, mandatType: null as unknown as string, kilde: 'Dolly', @@ -338,21 +336,6 @@ export const getInitialUtenlandskIdentifikasjonsnummer = (master = 'FREG') => ({ master: master, }) -export const initialNyIdent = { - eksisterendeIdent: null as unknown as string, - identtype: null as unknown as string, - kjoenn: null as unknown as string, - foedtEtter: null as unknown as string, - foedtFoer: null as unknown as string, - alder: '', - syntetisk: true, - nyttNavn: { - hasMellomnavn: false, - }, - kilde: 'Dolly', - master: 'FREG', -} - export const getInitialNyIdent = (master = 'FREG') => ({ eksisterendeIdent: null as unknown as string, identtype: null as unknown as string, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx index 9f2722838c3..10100fbaf9d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx @@ -101,6 +101,7 @@ export const SivilstandForm = ({ /> {kanHaRelatertPerson && ( { return (
)} person.ident) const opts: any = useContext(BestillingsveilederContext) + const [type, setType] = useState( + formMethods.watch(eksisterendePersonPath) + ? PersonType.EKSISTERENDE_PERSON + : PersonType.NY_PERSON, + ) + + const gruppeIdenter = gruppe?.value?.data?.identer?.map((person) => person.ident) const isTestnorgeIdent = opts?.identMaster === 'PDL' + useEffect(() => { + formMethods.setValue(nyPersonPath, type === PersonType.NY_PERSON ? initialPdlPerson : undefined) + formMethods.setValue( + eksisterendePersonPath, + type === PersonType.EKSISTERENDE_PERSON ? eksisterendeNyPerson?.value : undefined, + ) + formMethods.setValue(`${path}.eksisterendePerson`, type === PersonType.EKSISTERENDE_PERSON) + formMethods.trigger() + }, [type]) + return ( <> {!isTestnorgeIdent && ( <> -

Opprett ny person

- + + + + {'Opprett ny person'} + + + + {'Velg eksisterende person'} + + + {type === PersonType.NY_PERSON && ( + + )} )} <> @@ -58,16 +121,17 @@ export const PdlPersonForm = ({ (opts?.antall > 1 && 'Valg er kun tilgjengelig for individ, ikke for gruppe') || '' } > -

Velg eksisterende person

- 1} - /> + {type === PersonType.EKSISTERENDE_PERSON && ( + 1} + /> + )}
} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx index 277997c2b51..b8514305b59 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx @@ -45,6 +45,7 @@ export const VergemaalForm = ({ { const initVergemaal = Object.assign(_.cloneDeep(initialVergemaal), data[idx]) let initialValues = { vergemaal: initVergemaal } - initialValues.vergemaal.nyVergeIdent = initialPdlPerson const redigertVergemaalPdlf = _.get(tmpPersoner, `${ident}.person.vergemaal`)?.find( (a: VergemaalValues) => a.id === vergemaalData.id, @@ -136,6 +135,9 @@ const VergemaalVisning = ({ } const vergemaalValues = redigertVergemaalPdlf ? redigertVergemaalPdlf : vergemaalData + + initialValues.vergemaal.nyVergeIdent = initialPdlPerson + let redigertVergemaalValues = redigertVergemaalPdlf ? { vergemaal: Object.assign(_.cloneDeep(initialVergemaal), redigertVergemaalPdlf), diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx index b693ca97164..6bf00a11063 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx @@ -39,9 +39,11 @@ import { Form, FormProvider, useForm } from 'react-hook-form' import { visningRedigerbarValidation } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarValidation' import { yupResolver } from '@hookform/resolvers/yup' import './VisningRedigerbarForm.less' -import { boolean } from 'yup' import { FoedestedForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedested' import { FoedselsdatoForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedselsdato' +import DisplayFormState from '@/utils/DisplayFormState' +import DisplayFormErrors from '@/utils/DisplayFormErrors' +import { devEnabled } from '@/components/bestillingsveileder/stegVelger/StegVelger' type VisningTypes = { getPdlForvalter: Function @@ -51,6 +53,7 @@ type VisningTypes = { redigertAttributt?: any path: string ident: string + identMaster?: string identtype?: string disableSlett?: boolean personFoerLeggTil?: any @@ -121,7 +124,7 @@ export const VisningRedigerbar = ({ path, ident, identtype, - identMaster = boolean, + identMaster = '', disableSlett = false, personValues = null, relasjoner = null, @@ -151,7 +154,7 @@ export const VisningRedigerbar = ({ const sendData = (data) => { const id = _.get(data, `${path}.id`) - const itemData = _.get(data, path) + const itemData = formMethods.watch(path) return PdlforvalterApi.putAttributt(ident, path?.toLowerCase(), id, itemData) .catch((error: Error) => { pdlfError(error) @@ -400,8 +403,18 @@ export const VisningRedigerbar = ({ )} {visningModus === Modus.Skriv && ( -
handleSubmit(data?.data)}> + { + return handleSubmit(data?.data) + }} + > <> + {devEnabled && ( + <> + + + + )}
{getForm(formMethods)} diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx index f87447e9516..fbed5ad5a54 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx @@ -44,9 +44,11 @@ import { PadlockLockedIcon, PencilIcon, PersonCircleIcon, + PersonFillIcon, PersonGroupFillIcon, PersonGroupIcon, PersonIcon, + PersonPlusFillIcon, PersonPlusIcon, PersonTallShortIcon, PhoneIcon, @@ -113,12 +115,14 @@ export const icons = { 'thumbs-down': ThumbDownFillIcon, lock: PadlockLockedIcon, logout: LeaveIcon, - man: FigureInwardIcon, 'man-light': FigureInwardIcon, 'man-silhouette': SilhouetteIcon, woman: FigureOutwardIcon, person: PersonIcon, + 'person-fill': PersonFillIcon, + 'person-plus': PersonPlusIcon, + 'person-plus-fill': PersonPlusFillIcon, ukjent: SilhouetteIcon, group: PersonGroupIcon, 'group-light': PersonGroupIcon, diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java index 45f34416ff3..d4f60c563e8 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java @@ -10,4 +10,4 @@ public static void main(String[] args) { SpringApplication.run(PdlForvalterApplicationStarter.class, args); } -} +} \ No newline at end of file diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java index ebbe33e19c5..12655496b07 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java @@ -92,46 +92,6 @@ public class ArtifactUpdateService { private final UtflyttingService utflyttingService; private final VergemaalService vergemaalService; - private static void checkExists(List artifacter, Integer id, String navn) { - - if (artifacter.stream().noneMatch(artifact -> artifact.getId().equals(id))) { - throw new NotFoundException(String.format(INFO_NOT_FOUND, navn, id)); - } - } - - private static T initOpprett(List artifacter, T oppretting) { - - oppretting.setId(artifacter.stream() - .mapToInt(DbVersjonDTO::getId) - .max().orElse(0) + 1); - return oppretting; - } - - private List updateArtifact(List artifacter, T artifact, - Integer id, String navn) { - - artifact.setIsNew(true); - artifact.setKilde(isNotBlank(artifact.getKilde()) ? artifact.getKilde() : "Dolly"); - artifact.setMaster(nonNull(artifact.getMaster()) ? artifact.getMaster() : DbVersjonDTO.Master.FREG); - - if (id.equals(0)) { - artifacter.addFirst(initOpprett(artifacter, artifact)); - return artifacter; - - } else { - checkExists(artifacter, id, navn); - return new ArrayList<>(artifacter.stream() - .map(data -> { - if (data.getId().equals(id)) { - artifact.setId(id); - return artifact; - } - return data; - }) - .toList()); - } - } - public void updateFoedsel(String ident, Integer id, FoedselDTO oppdatertFoedsel) { var person = getPerson(ident); @@ -299,12 +259,6 @@ public void updateForelderBarnRelasjon(String ident, Integer id, ForelderBarnRel } } - private static boolean isEndretRolle(ForelderBarnRelasjonDTO relasjon, ForelderBarnRelasjonDTO oppdatertRelasjon) { - - return oppdatertRelasjon.getMinRolleForPerson() != relasjon.getMinRolleForPerson() && - oppdatertRelasjon.getRelatertPersonsRolle() != relasjon.getRelatertPersonsRolle(); - } - public void updateForeldreansvar(String ident, Integer id, ForeldreansvarDTO oppdatertAnsvar) { var person = getPerson(ident); @@ -625,7 +579,6 @@ public void updateVergemaal(String ident, Integer id, VergemaalDTO oppdatertVerg deletePerson(slettePerson, vergemaal.isEksisterendePerson()); oppdatertVergemaal.setId(id); - oppdatertVergemaal.setVergeIdent(null); person.getPerson().getVergemaal().add(oppdatertVergemaal); person.getPerson().getVergemaal().sort(Comparator.comparing(VergemaalDTO::getId).reversed()); } @@ -662,6 +615,31 @@ public void updateDoedfoedtBarn(String ident, Integer id, DoedfoedtBarnDTO oppda doedfoedtBarnService.convert(person.getPerson().getDoedfoedtBarn()); } + private List updateArtifact(List artifacter, T artifact, + Integer id, String navn) { + + artifact.setIsNew(true); + artifact.setKilde(isNotBlank(artifact.getKilde()) ? artifact.getKilde() : "Dolly"); + artifact.setMaster(nonNull(artifact.getMaster()) ? artifact.getMaster() : DbVersjonDTO.Master.FREG); + + if (id.equals(0)) { + artifacter.addFirst(initOpprett(artifacter, artifact)); + return artifacter; + + } else { + checkExists(artifacter, id, navn); + return new ArrayList<>(artifacter.stream() + .map(data -> { + if (data.getId().equals(id)) { + artifact.setId(id); + return artifact; + } + return data; + }) + .toList()); + } + } + private DbPerson getPerson(String ident) { return personRepository.findByIdent(ident) @@ -675,4 +653,25 @@ private void deletePerson(DbPerson person, boolean isEksisterendePerson) { personService.deletePerson(person.getIdent()); } } + + private static void checkExists(List artifacter, Integer id, String navn) { + + if (artifacter.stream().noneMatch(artifact -> artifact.getId().equals(id))) { + throw new NotFoundException(String.format(INFO_NOT_FOUND, navn, id)); + } + } + + private static T initOpprett(List artifacter, T oppretting) { + + oppretting.setId(artifacter.stream() + .mapToInt(DbVersjonDTO::getId) + .max().orElse(0) + 1); + return oppretting; + } + + private static boolean isEndretRolle(ForelderBarnRelasjonDTO relasjon, ForelderBarnRelasjonDTO oppdatertRelasjon) { + + return oppdatertRelasjon.getMinRolleForPerson() != relasjon.getMinRolleForPerson() && + oppdatertRelasjon.getRelatertPersonsRolle() != relasjon.getRelatertPersonsRolle(); + } } diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yaml index e84c628b8f3..4641b33a829 100644 --- a/apps/pdl-forvalter/src/main/resources/application-local.yaml +++ b/apps/pdl-forvalter/src/main/resources/application-local.yaml @@ -1,4 +1,3 @@ - spring: application: name: testnav-pdl-forvalter @@ -9,10 +8,8 @@ spring: fail-fast: true connection-timeout: 15000 read-timeout: 30000 - generic: - enabled: false datasource: - url: jdbc:postgresql://localhost:5432/pdl-forvalter-test + url: jdbc:postgresql://localhost:5432/postgres hikari: maximum-pool-size: 10 minimum-idle: 1 From 2c5d68b2523b5c2f623088b60b049a94f4808162 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:15:52 +0200 Subject: [PATCH 10/12] Bump send and express in /navikt/dolly-komponenter (#3619) Bumps [send](https://github.com/pillarjs/send) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `send` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/pillarjs/send/releases) - [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md) - [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: send dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- navikt/dolly-komponenter/package-lock.json | 146 +++++++++------------ 1 file changed, 61 insertions(+), 85 deletions(-) diff --git a/navikt/dolly-komponenter/package-lock.json b/navikt/dolly-komponenter/package-lock.json index ec9e102f457..c35c62a5830 100644 --- a/navikt/dolly-komponenter/package-lock.json +++ b/navikt/dolly-komponenter/package-lock.json @@ -1,12 +1,12 @@ { "name": "@navikt/dolly-komponenter", - "version": "1.4.5", + "version": "1.4.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@navikt/dolly-komponenter", - "version": "1.4.5", + "version": "1.4.6", "license": "MIT", "dependencies": { "@navikt/dolly-assets": "^1.2.9", @@ -5501,11 +5501,10 @@ } }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, - "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -5515,7 +5514,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -5530,7 +5529,6 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -5539,8 +5537,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/boolbase": { "version": "1.0.0", @@ -5661,7 +5658,6 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6015,7 +6011,6 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -6525,7 +6520,6 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6545,7 +6539,6 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -6671,8 +6664,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/electron-to-chromium": { "version": "1.5.5", @@ -6689,11 +6681,10 @@ "license": "MIT" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6876,8 +6867,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/escape-string-regexp": { "version": "1.0.5", @@ -6995,7 +6985,6 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -7050,38 +7039,37 @@ "license": "ISC" }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dev": true, - "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -7182,14 +7170,13 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, - "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -7205,7 +7192,6 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -7214,8 +7200,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/find-cache-dir": { "version": "3.3.2", @@ -7334,7 +7319,6 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -7783,7 +7767,6 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, - "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -7810,7 +7793,6 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -9073,7 +9055,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -9095,11 +9076,13 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true, - "license": "MIT" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -9743,7 +9726,6 @@ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, - "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -10004,7 +9986,6 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -10070,11 +10051,10 @@ "license": "ISC" }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true, - "license": "MIT" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "dev": true }, "node_modules/path-type": { "version": "4.0.0", @@ -10979,13 +10959,12 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -11030,7 +11009,6 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -11040,7 +11018,6 @@ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, - "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -11958,11 +11935,10 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, - "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -11987,7 +11963,6 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -11996,15 +11971,22 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "dev": true, - "license": "MIT" + "engines": { + "node": ">= 0.8" + } }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/serialize-javascript": { "version": "6.0.2", @@ -12017,16 +11999,15 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, - "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -12070,8 +12051,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/shallow-clone": { "version": "3.0.1", @@ -12228,7 +12208,6 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -12976,7 +12955,6 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.6" } @@ -13041,7 +13019,6 @@ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, - "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -13211,7 +13188,6 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } From 68a73efe88b3b869be6c383873230736ae8d89ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:16:01 +0200 Subject: [PATCH 11/12] Bump body-parser and express in /navikt/dolly-komponenter (#3620) Bumps [body-parser](https://github.com/expressjs/body-parser) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `body-parser` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/expressjs/body-parser/releases) - [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md) - [Commits](https://github.com/expressjs/body-parser/compare/1.20.2...1.20.3) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: body-parser dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 7db9e80607c1110872c72ce99d1cf7a16a147fde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:16:13 +0200 Subject: [PATCH 12/12] Bump serve-static and express in /navikt/dolly-komponenter (#3622) Bumps [serve-static](https://github.com/expressjs/serve-static) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `serve-static` from 1.15.0 to 1.16.2 - [Release notes](https://github.com/expressjs/serve-static/releases) - [Changelog](https://github.com/expressjs/serve-static/blob/v1.16.2/HISTORY.md) - [Commits](https://github.com/expressjs/serve-static/compare/v1.15.0...v1.16.2) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: serve-static dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>