Merge remote-tracking branch 'origin/master'

navikt · Aug 27, 2024 · c27ad39 · c27ad39
2 parents 5de55ac + e5881a8
commit c27ad39
Show file tree

Hide file tree

Showing 116 changed files with 1,347 additions and 2,912 deletions.
diff --git a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Levendearbeidsforhold/EditParameter.tsx b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Levendearbeidsforhold/EditParameter.tsx
@@ -29,7 +29,7 @@ export const EditParameter = ({ name, label, initialValue, options, data, setDat
 	async function oppdaterParameterverdi(value: string) {
 		await fetch(`/testnav-levende-arbeidsforhold-ansettelse/api/v1/parameter/${name}`, {
 			method: 'PUT',
-			body: JSON.stringify(value),
+			body: value,
 		}).then((res) => (res.status === 200 ? onSubmit(value) : console.error('Feil feil feil')))
 	}
 

diff --git a/apps/levende-arbeidsforhold-ansettelse/build.gradle b/apps/levende-arbeidsforhold-ansettelse/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:servlet-insecure-security'
     implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:data-transfer-search-objects'
     implementation 'no.nav.testnav.libs:database'
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
@@ -52,18 +53,5 @@ dependencies {
 
     implementation 'com.zaxxer:HikariCP'
     implementation 'com.h2database:h2'
-
-    //Spesifiserer versjoner av dependencies' dependencies som er utdatert og har sikkerhets-risikoer, bruker derfor de nedenfor
-    implementation 'org.apache.commons:commons-compress:1.26.2'
-    implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25'
-    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:10.1.19'
-    implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25'
-    implementation 'org.springframework.security:spring-security-core:6.2.3'
-    implementation 'org.springframework:spring-core:6.1.3'
-    implementation 'org.springframework:spring-web:6.1.6'
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2'
-    implementation 'io.netty:netty-codec-http:4.1.108.Final'
-    implementation 'com.h2database:h2:2.3.230'
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.78'
 }
 
diff --git a/apps/levende-arbeidsforhold-ansettelse/settings.gradle b/apps/levende-arbeidsforhold-ansettelse/settings.gradle
@@ -9,6 +9,7 @@ includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/servlet-insecure-security'
 includeBuild '../../libs/data-transfer-objects'
+includeBuild '../../libs/data-transfer-search-objects'
 includeBuild '../../libs/database'
 includeBuild '../../.github/workflows'
 

diff --git a/...ava/no/nav/registre/testnorge/levendearbeidsforholdansettelse/consumers/TagsConsumer.java b/...ava/no/nav/registre/testnorge/levendearbeidsforholdansettelse/consumers/TagsConsumer.java
diff --git a/...va/no/nav/registre/testnorge/levendearbeidsforholdansettelse/consumers/TenorConsumer.java b/...va/no/nav/registre/testnorge/levendearbeidsforholdansettelse/consumers/TenorConsumer.java
diff --git a/...stre/testnorge/levendearbeidsforholdansettelse/consumers/command/pdl/HentTagsCommand.java b/...stre/testnorge/levendearbeidsforholdansettelse/consumers/command/pdl/HentTagsCommand.java
diff --git a/...estnorge/levendearbeidsforholdansettelse/consumers/command/pdl/SokPersonPagesCommand.java b/...estnorge/levendearbeidsforholdansettelse/consumers/command/pdl/SokPersonPagesCommand.java
diff --git a/...egistre/testnorge/levendearbeidsforholdansettelse/consumers/command/pdl/TemaGrunnlag.java b/...egistre/testnorge/levendearbeidsforholdansettelse/consumers/command/pdl/TemaGrunnlag.java
diff --git a/...dearbeidsforholdansettelse/consumers/command/tenor/HentOrganisasjonerOversiktCommand.java b/...dearbeidsforholdansettelse/consumers/command/tenor/HentOrganisasjonerOversiktCommand.java
diff --git a/.../java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/domain/DatoIntervall.java b/.../java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/domain/DatoIntervall.java
diff --git a/...c/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/domain/TagsDTO.java b/...c/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/domain/TagsDTO.java
diff --git a/...no/nav/registre/testnorge/levendearbeidsforholdansettelse/domain/dto/OrganisasjonDTO.java b/...no/nav/registre/testnorge/levendearbeidsforholdansettelse/domain/dto/OrganisasjonDTO.java