Merge pull request #3960 from navikt/feature/nom-frontend

Feature/nom frontend

Author: betsytraran

apps/dolly-frontend/config.idporten.yml

@@ -52,6 +52,7 @@ spec:
         - application: testnorge-profil-api
         - application: testnorge-tilbakemelding-api
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/config.test.yml

@@ -59,6 +59,7 @@ spec:
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-skattekort-service
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-service
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/config.unstable.yml

@@ -49,6 +49,7 @@ spec:
         - application: testnorge-tilbakemelding-api
         - application: testnav-skattekort-service
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-service
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/config.yml

@@ -60,6 +60,7 @@ spec:
         - application: testnav-levende-arbeidsforhold-ansettelse
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

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

@@ -96,6 +96,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getTestnavLevendeArbeidsforholdAnsettelse(), "testnav-levende-arbeidsforhold-ansettelse"))
                 .route(createRoute(consumers.getTestnavLevendeArbeidsforholdScheduler(), "testnav-levende-arbeidsforhold-scheduler"))
                 .route(createRoute(consumers.getTestnavYrkesskadeProxy()))
+                .route(createRoute(consumers.getTestnavNomProxy()))
                 .route(createRoute(consumers.getTestnavAltinn3TilgangService(), "testnav-altinn3-tilgang-service"))
                 .route(createRoute(consumers.getTestnavArbeidssoekerregisteretProxy()))
                 .route(createRoute(consumers.getTestnavApiOversiktService(), "testnav-oversikt-service"))

apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java

@@ -66,6 +66,7 @@ public class Consumers {
     private ServerProperties testnavLevendeArbeidsforholdAnsettelse;
     private ServerProperties testnavLevendeArbeidsforholdScheduler;
     private ServerProperties testnavYrkesskadeProxy;
+    private ServerProperties testnavNomProxy;
     private ServerProperties testnavAltinn3TilgangService;
     private ServerProperties testnavArbeidssoekerregisteretProxy;
     private ServerProperties testnavApiOversiktService;

apps/dolly-frontend/src/main/js/proxy-routes.json

@@ -167,5 +167,8 @@
   },
   "/testnav-oversikt-service/api": {
     "changeOrigin": true
+  },
+  "/testnav-nom-proxy": {
+    "changeOrigin": true
   }
 }

apps/dolly-frontend/src/main/js/src/assets/icons/custom/NavLogo.tsx

@@ -0,0 +1,41 @@
+import * as React from 'react'
+import type { SVGProps } from 'react'
+import { Ref, forwardRef } from 'react'
+interface SVGRProps {
+	title?: string
+	titleId?: string
+}
+const NavLogo = forwardRef(
+	(
+		{ title, titleId: _titleId, ...props }: SVGProps<SVGSVGElement> & SVGRProps,
+		ref: Ref<SVGSVGElement>,
+	) => {
+		const titleId = 'title-nav-logo'
+		return (
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				width="1em"
+				height="1em"
+				fill="none"
+				viewBox="0 0 64 64"
+				preserveAspectRatio="xMidYMid meet"
+				focusable={false}
+				role="img"
+				ref={ref}
+				aria-labelledby={titleId}
+				{...props}
+			>
+				{title ? <title id={titleId}>{title}</title> : null}
+				<g transform="translate(0, 22)">
+					<path
+						fill="currentColor"
+						fillRule="evenodd"
+						d="M63.4793 0.520905H56.8203C56.8203 0.520905 56.3613 0.520905 56.199 0.926432L52.5139 12.2133L48.8318 0.926432C48.6695 0.520905 48.2079 0.520905 48.2079 0.520905H35.4043C35.1271 0.520905 34.8948 0.752508 34.8948 1.02804V4.86102C34.8948 1.82046 31.6611 0.520905 29.7675 0.520905C25.5271 0.520905 22.6886 3.31523 21.8047 7.5635C21.7568 4.74522 21.5227 3.7354 20.7639 2.70117C20.4154 2.19448 19.9116 1.76854 19.3631 1.41626C18.2336 0.754282 17.2194 0.520905 15.0398 0.520905H12.4806C12.4806 0.520905 12.018 0.520905 11.8548 0.926432L9.52624 6.70009V1.02804C9.52624 0.752508 9.29564 0.520905 9.01892 0.520905H3.09697C3.09697 0.520905 2.63976 0.520905 2.47346 0.926432L0.0526208 6.92992C0.0526208 6.92992 -0.189065 7.53023 0.363486 7.53023H2.63976V18.9702C2.63976 19.2541 2.86327 19.4791 3.14841 19.4791H9.01892C9.29564 19.4791 9.52624 19.2541 9.52624 18.9702V7.53023H11.8145C13.1276 7.53023 13.4056 7.56616 13.9165 7.80442C14.2242 7.92067 14.5014 8.15582 14.6526 8.42691C14.9622 9.00991 15.0398 9.71005 15.0398 11.7745V18.9702C15.0398 19.2541 15.2677 19.4791 15.5493 19.4791H21.1759C21.1759 19.4791 21.8118 19.4791 22.0633 18.8508L23.3103 15.7672C24.9684 18.0908 27.6974 19.4791 31.089 19.4791H31.83C31.83 19.4791 32.4699 19.4791 32.7231 18.8508L34.8948 13.4698V18.9702C34.8948 19.2541 35.1271 19.4791 35.4043 19.4791H41.148C41.148 19.4791 41.7817 19.4791 42.0362 18.8508C42.0362 18.8508 44.3334 13.1446 44.3422 13.1016H44.3458C44.434 12.6268 43.8345 12.6268 43.8345 12.6268H41.7844V2.8356L48.2345 18.8508C48.4864 19.4791 49.1214 19.4791 49.1214 19.4791H55.9068C55.9068 19.4791 56.5453 19.4791 56.7972 18.8508L63.948 1.13496C64.1955 0.520905 63.4793 0.520905 63.4793 0.520905ZM34.8941 12.6268H31.036C29.5003 12.6268 28.251 11.3827 28.251 9.84442C28.251 8.30883 29.5003 7.05675 31.036 7.05675H32.1149C33.6466 7.05675 34.8941 8.30883 34.8941 9.84442V12.6268Z"
+						clipRule="evenodd"
+					/>
+				</g>
+			</svg>
+		)
+	},
+)
+export default NavLogo

apps/dolly-frontend/src/main/js/src/assets/icons/custom/TenorLogo.svg

@@ -961,19 +961,32 @@ const mapKontaktinformasjonForDoedsbo = (kontaktinformasjonForDoedsbo, data) =>
 	}
 }
 
-const mapTpsMessaging = (bestillingData, data) => {
+const mapNomData = (bestillingData, data) => {
+	if (bestillingData?.nomdata) {
+		const { startDato, sluttDato } = bestillingData.nomdata
+		const nomdata = {
+			header: 'Nav-ansatt (NOM)',
+			items:
+				!startDato && !sluttDato
+					? [obj('Nav-ansatt', 'Ingen verdier satt')]
+					: [obj('Startdato', formatDate(startDato)), obj('Sluttdato', formatDate(sluttDato))],
+		}
+		data.push(nomdata)
+	}
+}
+
+const mapSkjermingData = (bestillingData, data) => {
 	const tpsMessaging = _.get(bestillingData, 'tpsMessaging')
 	const skjerming = _.get(bestillingData, 'skjerming')
-	const bankkonto = _.get(bestillingData, 'bankkonto')
 
 	if (
 		skjerming?.egenAnsattDatoFom ||
 		tpsMessaging?.egenAnsattDatoFom ||
 		skjerming?.egenAnsattDatoTom ||
 		tpsMessaging?.egenAnsattDatoTom
 	) {
-		const tpsMessagingData = {
-			header: 'Personinformasjon',
+		const skjermingData = {
+			header: 'Skjerming',
 			items: [
 				obj(
 					'Skjerming fra',
@@ -985,8 +998,12 @@ const mapTpsMessaging = (bestillingData, data) => {
 				),
 			],
 		}
-		data.push(tpsMessagingData)
+		data.push(skjermingData)
 	}
+}
+
+const mapBankkonto = (bestillingData, data) => {
+	const bankkonto = _.get(bestillingData, 'bankkonto')
 
 	if (bankkonto?.norskBankkonto || bankkonto?.utenlandskBankkonto) {
 		if (bankkonto.norskBankkonto) {
@@ -2468,7 +2485,9 @@ export function mapBestillingData(bestillingData, bestillingsinformasjon, firstI
 	}
 
 	mapFullmakt(bestillingData, data)
-	mapTpsMessaging(bestillingData, data)
+	mapNomData(bestillingData, data)
+	mapSkjermingData(bestillingData, data)
+	mapBankkonto(bestillingData, data)
 	mapAareg(bestillingData, data)
 	mapSigrunstubPensjonsgivende(bestillingData, data)
 	mapSigrunstubSummertSkattegrunnlag(bestillingData, data)