Merge branch 'refs/heads/master' into feature/popp-gjennomsnitt-g

navikt · Jul 5, 2024 · 0b16ccf · 0b16ccf
2 parents aad97d5 + 58f5e7f
commit 0b16ccf
Show file tree

Hide file tree

Showing 18 changed files with 1,363 additions and 1,134 deletions.
diff --git a/.../src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx b/.../src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx
@@ -330,7 +330,9 @@ export const foreldreansvar = Yup.object({
 		.nullable(),
 	ansvarssubjekt: Yup.string()
 		.test('ansvarssubjekt-er-paakrevd', 'Ansvarssubjekt er påkrevd', (value, testcontext) => {
-			return !!value || testcontext.parent?.ansvarlig
+			return (
+				!!value || testcontext.parent?.ansvarlig || !testcontext.options?.context?.personFoerLeggTil
+			)
 		})
 		.nullable(),
 })

diff --git a/apps/dollystatus/src/main/js/package-lock.json b/apps/dollystatus/src/main/js/package-lock.json
diff --git a/apps/dollystatus/src/main/js/package.json b/apps/dollystatus/src/main/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "status-frontend",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "type": "module",
   "private": true,
   "dependencies": {

diff --git a/apps/endringsmelding-frontend/src/main/js/package-lock.json b/apps/endringsmelding-frontend/src/main/js/package-lock.json
diff --git a/apps/endringsmelding-frontend/src/main/js/package.json b/apps/endringsmelding-frontend/src/main/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "endringsmelding-frontend",
-  "version": "1.2.24",
+  "version": "1.2.25",
   "private": true,
   "type": "module",
   "homepage": "/",

diff --git a/apps/faste-data-frontend/src/main/js/package-lock.json b/apps/faste-data-frontend/src/main/js/package-lock.json
diff --git a/apps/faste-data-frontend/src/main/js/package.json b/apps/faste-data-frontend/src/main/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testnav-faste-data-frontend",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "private": true,
   "dependencies": {
     "@navikt/dolly-komponenter": "^1.3.2",

diff --git a/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json b/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json
diff --git a/apps/organisasjon-tilgang-frontend/src/main/js/package.json b/apps/organisasjon-tilgang-frontend/src/main/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "endringsmelding-frontend",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "type": "module",
   "private": true,
   "homepage": "/",

diff --git a/apps/oversikt-frontend/src/main/js/package-lock.json b/apps/oversikt-frontend/src/main/js/package-lock.json
diff --git a/apps/oversikt-frontend/src/main/js/package.json b/apps/oversikt-frontend/src/main/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oversikt-frontend",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "private": true,
   "dependencies": {
     "@navikt/dolly-komponenter": "^1.3.19",

diff --git a/navikt/dolly-assets/package-lock.json b/navikt/dolly-assets/package-lock.json
diff --git a/navikt/dolly-assets/package.json b/navikt/dolly-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/dolly-assets",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "description": "Dolly assets",
   "main": "lib/index.js",
   "scripts": {