Skip to content

Commit cf96758

Browse files
betsytraranbetsytraran
committed
Merge branch 'master' of https://github.com/navikt/testnorge into feature/lagre-siste-soek
2 parents 14b9536 + 76807b2 commit cf96758

File tree

29 files changed

+321
-86
lines changed

29 files changed

+321
-86
lines changed

‎apps/dolly-frontend/config.idporten.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ spec:
5252
- application: testnorge-profil-api
5353
- application: testnorge-tilbakemelding-api
5454
- application: testnav-yrkesskade-proxy
55+
- application: testnav-nom-proxy
5556
- application: testnav-altinn3-tilgang-proxy
5657
- application: testnav-arbeidssoekerregisteret-proxy
5758
- application: testnav-api-oversikt-service

‎apps/dolly-frontend/config.test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ spec:
5959
- application: testnav-levende-arbeidsforhold-scheduler
6060
- application: testnav-skattekort-service
6161
- application: testnav-yrkesskade-proxy
62+
- application: testnav-nom-proxy
6263
- application: testnav-altinn3-tilgang-service
6364
- application: testnav-arbeidssoekerregisteret-proxy
6465
- application: testnav-api-oversikt-service

‎apps/dolly-frontend/config.unstable.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ spec:
4949
- application: testnorge-tilbakemelding-api
5050
- application: testnav-skattekort-service
5151
- application: testnav-yrkesskade-proxy
52+
- application: testnav-nom-proxy
5253
- application: testnav-altinn3-tilgang-service
5354
- application: testnav-arbeidssoekerregisteret-proxy
5455
- application: testnav-api-oversikt-service

‎apps/dolly-frontend/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ spec:
6060
- application: testnav-levende-arbeidsforhold-ansettelse
6161
- application: testnav-levende-arbeidsforhold-scheduler
6262
- application: testnav-yrkesskade-proxy
63+
- application: testnav-nom-proxy
6364
- application: testnav-altinn3-tilgang-proxy
6465
- application: testnav-arbeidssoekerregisteret-proxy
6566
- application: testnav-api-oversikt-service

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
9696
.route(createRoute(consumers.getTestnavLevendeArbeidsforholdAnsettelse(), "testnav-levende-arbeidsforhold-ansettelse"))
9797
.route(createRoute(consumers.getTestnavLevendeArbeidsforholdScheduler(), "testnav-levende-arbeidsforhold-scheduler"))
9898
.route(createRoute(consumers.getTestnavYrkesskadeProxy()))
99+
.route(createRoute(consumers.getTestnavNomProxy()))
99100
.route(createRoute(consumers.getTestnavAltinn3TilgangService(), "testnav-altinn3-tilgang-service"))
100101
.route(createRoute(consumers.getTestnavArbeidssoekerregisteretProxy()))
101102
.route(createRoute(consumers.getTestnavApiOversiktService(), "testnav-oversikt-service"))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public class Consumers {
6666
private ServerProperties testnavLevendeArbeidsforholdAnsettelse;
6767
private ServerProperties testnavLevendeArbeidsforholdScheduler;
6868
private ServerProperties testnavYrkesskadeProxy;
69+
private ServerProperties testnavNomProxy;
6970
private ServerProperties testnavAltinn3TilgangService;
7071
private ServerProperties testnavArbeidssoekerregisteretProxy;
7172
private ServerProperties testnavApiOversiktService;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,8 @@
167167
},
168168
"/testnav-oversikt-service/api": {
169169
"changeOrigin": true
170+
},
171+
"/testnav-nom-proxy": {
172+
"changeOrigin": true
170173
}
171174
}

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import * as React from 'react'
2+
import type { SVGProps } from 'react'
3+
import { Ref, forwardRef } from 'react'
4+
interface SVGRProps {
5+
title?: string
6+
titleId?: string
7+
}
8+
const NavLogo = forwardRef(
9+
(
10+
{ title, titleId: _titleId, ...props }: SVGProps<SVGSVGElement> & SVGRProps,
11+
ref: Ref<SVGSVGElement>,
12+
) => {
13+
const titleId = 'title-nav-logo'
14+
return (
15+
<svg
16+
xmlns="http://www.w3.org/2000/svg"
17+
width="1em"
18+
height="1em"
19+
fill="none"
20+
viewBox="0 0 64 64"
21+
preserveAspectRatio="xMidYMid meet"
22+
focusable={false}
23+
role="img"
24+
ref={ref}
25+
aria-labelledby={titleId}
26+
{...props}
27+
>
28+
{title ? <title id={titleId}>{title}</title> : null}
29+
<g transform="translate(0, 22)">
30+
<path
31+
fill="currentColor"
32+
fillRule="evenodd"
33+
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"
34+
clipRule="evenodd"
35+
/>
36+
</g>
37+
</svg>
38+
)
39+
},
40+
)
41+
export default NavLogo

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

Lines changed: 7 additions & 7 deletions
Loading

‎apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -961,19 +961,32 @@ const mapKontaktinformasjonForDoedsbo = (kontaktinformasjonForDoedsbo, data) =>
961961
}
962962
}
963963

964-
const mapTpsMessaging = (bestillingData, data) => {
964+
const mapNomData = (bestillingData, data) => {
965+
if (bestillingData?.nomdata) {
966+
const { startDato, sluttDato } = bestillingData.nomdata
967+
const nomdata = {
968+
header: 'Nav-ansatt (NOM)',
969+
items:
970+
!startDato && !sluttDato
971+
? [obj('Nav-ansatt', 'Ingen verdier satt')]
972+
: [obj('Startdato', formatDate(startDato)), obj('Sluttdato', formatDate(sluttDato))],
973+
}
974+
data.push(nomdata)
975+
}
976+
}
977+
978+
const mapSkjermingData = (bestillingData, data) => {
965979
const tpsMessaging = _.get(bestillingData, 'tpsMessaging')
966980
const skjerming = _.get(bestillingData, 'skjerming')
967-
const bankkonto = _.get(bestillingData, 'bankkonto')
968981

969982
if (
970983
skjerming?.egenAnsattDatoFom ||
971984
tpsMessaging?.egenAnsattDatoFom ||
972985
skjerming?.egenAnsattDatoTom ||
973986
tpsMessaging?.egenAnsattDatoTom
974987
) {
975-
const tpsMessagingData = {
976-
header: 'Personinformasjon',
988+
const skjermingData = {
989+
header: 'Skjerming',
977990
items: [
978991
obj(
979992
'Skjerming fra',
@@ -985,8 +998,12 @@ const mapTpsMessaging = (bestillingData, data) => {
985998
),
986999
],
9871000
}
988-
data.push(tpsMessagingData)
1001+
data.push(skjermingData)
9891002
}
1003+
}
1004+
1005+
const mapBankkonto = (bestillingData, data) => {
1006+
const bankkonto = _.get(bestillingData, 'bankkonto')
9901007

9911008
if (bankkonto?.norskBankkonto || bankkonto?.utenlandskBankkonto) {
9921009
if (bankkonto.norskBankkonto) {
@@ -2468,7 +2485,9 @@ export function mapBestillingData(bestillingData, bestillingsinformasjon, firstI
24682485
}
24692486

24702487
mapFullmakt(bestillingData, data)
2471-
mapTpsMessaging(bestillingData, data)
2488+
mapNomData(bestillingData, data)
2489+
mapSkjermingData(bestillingData, data)
2490+
mapBankkonto(bestillingData, data)
24722491
mapAareg(bestillingData, data)
24732492
mapSigrunstubPensjonsgivende(bestillingData, data)
24742493
mapSigrunstubSummertSkattegrunnlag(bestillingData, data)

0 commit comments

Comments
 (0)