diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml index 8f0f7971e44..e77751fec2b 100644 --- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml +++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/common.workflow.backend.yml with: working-directory: "proxies/arbeidsplassencv-proxy" - deploy-tag: "#deploy-arbeidsplassencv-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index 9c0ef661478..39cbe07c379 100644 --- a/.github/workflows/proxy.inst-proxy.yml +++ b/.github/workflows/proxy.inst-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inst-proxy" - deploy-tag: "#deploy-inst-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml index 7315b501544..ab199264114 100644 --- a/apps/adresse-service/src/main/resources/logback-spring.xml +++ b/apps/adresse-service/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 @@ -35,5 +36,5 @@ - + \ No newline at end of file diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml index 52c15597b3c..be1aac763d9 100644 --- a/apps/amelding-service/src/main/resources/logback-spring.xml +++ b/apps/amelding-service/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 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 8fe635b4e57..c3609245170 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 @@ -2,7 +2,8 @@ - + + true 256 diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml index 2066327923b..66437503790 100644 --- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 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 1a9ce7a5e5c..edd6ddf127d 100644 --- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml index 7315b501544..6fbad19f583 100644 --- a/apps/brreg-stub/src/main/resources/logback-spring.xml +++ b/apps/brreg-stub/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml index 70ee88e5962..d91dcf28fda 100644 --- a/apps/bruker-service/src/main/resources/logback-spring.xml +++ b/apps/bruker-service/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 @@ -24,7 +25,8 @@ - + + true 256 diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml index 8404dbd99f3..fe32fb984fe 100644 --- a/apps/budpro-service/src/main/resources/logback-spring.xml +++ b/apps/budpro-service/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml index ab8d0dc02a3..adc12c5e3ba 100644 --- a/apps/dolly-backend/config.yml +++ b/apps/dolly-backend/config.yml @@ -23,8 +23,6 @@ spec: - application: testnav-oversikt-frontend - application: etterlatte-testdata namespace: etterlatte - - application: statuspoll - namespace: navdig outbound: rules: - application: generer-navn-service diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java index a06891bd259..c0d78e1c627 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java @@ -5,7 +5,7 @@ import no.nav.dolly.bestilling.ConsumerStatus; import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattDeleteCommand; import no.nav.dolly.bestilling.tpsmessagingservice.command.EgenansattPostCommand; -import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonGetCommand; +import no.nav.dolly.bestilling.tpsmessagingservice.command.PersonHentCommand; import no.nav.dolly.bestilling.tpsmessagingservice.command.TpsMessagingPostCommand; import no.nav.dolly.config.Consumers; import no.nav.dolly.metrics.Timed; @@ -52,7 +52,7 @@ public TpsMessagingConsumer( .build(); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createUtenlandskBankkonto"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createUtenlandskBankkonto" }) public Flux sendUtenlandskBankkontoRequest(String ident, List miljoer, BankkontonrUtlandDTO body) { @@ -61,7 +61,7 @@ public Flux sendUtenlandskBankkontoRequest(String ident, new TpsMessagingPostCommand(webClient, ident, miljoer, body, UTENLANDSK_BANKKONTO_URL, token.getTokenValue()).call()); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createNorskBankkonto"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createNorskBankkonto" }) public Flux sendNorskBankkontoRequest(String ident, List miljoer, BankkontonrNorskDTO body) { return tokenService.exchange(serverProperties) @@ -69,7 +69,7 @@ public Flux sendNorskBankkontoRequest(String ident, List< new TpsMessagingPostCommand(webClient, ident, miljoer, body, NORSK_BANKKONTO_URL, token.getTokenValue()).call()); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createSkjerming"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createSkjerming" }) public Flux sendEgenansattRequest(String ident, List miljoer, LocalDate fraOgMed) { return tokenService.exchange(serverProperties) @@ -77,14 +77,14 @@ public Flux sendEgenansattRequest(String ident, List deleteEgenansattRequest(String ident, List miljoer) { return tokenService.exchange(serverProperties) .flatMapMany(token -> new EgenansattDeleteCommand(webClient, ident, miljoer, token.getTokenValue()).call()); } - @Timed(name = "providers", tags = {"operation", "tps_messaging_createSpraakkode"}) + @Timed(name = "providers", tags = { "operation", "tps_messaging_createSpraakkode" }) public Flux sendSpraakkodeRequest(String ident, List miljoer, SpraakDTO body) { return tokenService.exchange(serverProperties) @@ -92,11 +92,11 @@ public Flux sendSpraakkodeRequest(String ident, List getPerson(String ident, List miljoer) { return tokenService.exchange(serverProperties) - .flatMapMany(token -> new PersonGetCommand(webClient, ident, miljoer, token.getTokenValue()).call()); + .flatMapMany(token -> new PersonHentCommand(webClient, ident, miljoer, token.getTokenValue()).call()); } @Override diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java similarity index 86% rename from apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java rename to apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java index 7d30c111fdd..66c17fa02a3 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonHentCommand.java @@ -14,10 +14,10 @@ @RequiredArgsConstructor @Slf4j -public class PersonGetCommand implements Callable> { +public class PersonHentCommand implements Callable> { private static final String MILJOER_PARAM = "miljoer"; - private static final String PERSONER_URL = "/api/v1/personer/{ident}"; + private static final String PERSONER_URL = "/api/v2/personer/ident"; private final WebClient webClient; private final String ident; @@ -27,11 +27,12 @@ public class PersonGetCommand implements Callable> { @Override public Flux call() { - return webClient.get() + return webClient.post() .uri(uriBuilder -> uriBuilder .path(PERSONER_URL) .queryParam(MILJOER_PARAM, miljoer) - .build(ident)) + .build()) + .bodyValue(ident) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToFlux(PersonMiljoeDTO.class) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java index 61c1e4f1c74..081c322ee18 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/PdlPersonBolk.java @@ -1,15 +1,13 @@ package no.nav.dolly.domain; +import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; import java.util.List; -import static java.util.Objects.isNull; - @Data @Builder @NoArgsConstructor @@ -17,7 +15,7 @@ public class PdlPersonBolk { private Data data; - private Extensions extensions; + private JsonNode extensions; @lombok.Data @Builder @@ -30,36 +28,6 @@ public static class Data { private List hentIdenterBolk; } - @lombok.Data - @Builder - @NoArgsConstructor - @AllArgsConstructor - public static class Extensions { - - private List warnings; - - public List getWarnings() { - - if (isNull(warnings)) { - warnings = new ArrayList<>(); - } - return warnings; - } - } - - @lombok.Data - @Builder - @NoArgsConstructor - @AllArgsConstructor - public static class Warning { - - private String code; - private String details; - private String id; - private String message; - private String query; - } - @lombok.Data @Builder @NoArgsConstructor diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java index 8cb32a303e1..44bba21abcd 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java @@ -17,6 +17,7 @@ import no.nav.testnav.libs.servletsecurity.action.GetUserInfo; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.cache.CacheManager; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +34,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; +import static no.nav.dolly.config.CachingConfig.CACHE_BESTILLING_MAL; import static no.nav.dolly.util.CurrentAuthentication.getUserId; @Service @@ -49,6 +51,7 @@ public class MalBestillingService { private final MapperFacade mapperFacade; private final GetUserInfo getUserInfo; private final ObjectMapper objectMapper; + private final CacheManager cacheManager; @Transactional(readOnly = true) public RsMalBestillingWrapper getMalBestillinger() { @@ -138,6 +141,8 @@ public void saveBestillingMal(Bestilling bestilling, String malNavn, Bruker bruk oppdateEksisterende.setBestKriterier(bestilling.getBestKriterier()); oppdateEksisterende.setMiljoer(bestilling.getMiljoer()); } + + cacheManager.getCache(CACHE_BESTILLING_MAL).clear(); } @Transactional diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml index c5446a2acc1..0ac9fd9264d 100644 --- a/apps/dolly-backend/src/main/resources/logback-spring.xml +++ b/apps/dolly-backend/src/main/resources/logback-spring.xml @@ -2,7 +2,8 @@ - + + true 256 @@ -37,10 +38,10 @@ - - - - - - + + + + + + diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx index c3ed2ec02ee..be62601dfc9 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/gjenopprett/GjenopprettPerson.tsx @@ -88,7 +88,7 @@ export const GjenopprettPerson = ({ ident }: GjenopprettProps) => { return ( <> {isGjenopprettModalOpen && ( diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/Bestillingsveileder.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/Bestillingsveileder.tsx index 9123fe97ced..c73b96cce67 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/Bestillingsveileder.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/Bestillingsveileder.tsx @@ -14,7 +14,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => { const navigate = useNavigate() const [showError, setShowError] = useState(false) const [navigateRoot, setNavigateRoot] = useState(false) - const { gruppeId, personId } = useParams() + const { gruppeId } = useParams() const erOrganisasjon = location?.state?.opprettOrganisasjon const importPersoner = location?.state?.importPersoner @@ -46,7 +46,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => { return null } - const options = BVOptions(location.state, gruppeId, personId) + const options = BVOptions(location.state, gruppeId) const handleSubmit = (values) => { sendBestilling(values, options, gruppeId, navigate) } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx index 16e978bc026..b5140d137c0 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx @@ -14,11 +14,9 @@ import { SivilstandData, VergemaalValues, } from '@/components/fagsystem/pdlf/PdlTypes' -import { useDollyEnvironments } from '@/utils/hooks/useEnvironments' import { addMonths, isAfter, setDate } from 'date-fns' -export const initialValuesBasedOnMal = (mal: any) => { - const { dollyEnvironments } = useDollyEnvironments() +export const initialValuesBasedOnMal = (mal: any, environments: any) => { const initialValuesMal = Object.assign({}, mal.bestilling) if (initialValuesMal.aareg) { @@ -85,7 +83,7 @@ export const initialValuesBasedOnMal = (mal: any) => { delete initialValuesMal.tpsMessaging.utenlandskBankkonto } - initialValuesMal.environments = filterMiljoe(dollyEnvironments, mal.bestilling?.environments) + initialValuesMal.environments = filterMiljoe(environments, mal.bestilling?.environments) return initialValuesMal } @@ -141,6 +139,11 @@ const getUpdatedInntektstubData = (inntektstubData: any) => { const getUpdatedAaregData = (aaregData: any) => { return aaregData.map((data: any) => { data = updateData(data, initialValues.aareg[0]) + if (data.amelding && data.amelding.length > 0) { + data.ansettelsesPeriode = undefined + data.arbeidsgiver = undefined + data.arbeidsavtale = undefined + } data.permisjon = data.permisjon?.map((permisjon: any) => updateData(permisjon, initialValues.permisjon), ) diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/options.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/options.tsx index 7f84f5973a1..bc6a04ed893 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/options.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/options.tsx @@ -1,6 +1,5 @@ import { initialValuesBasedOnMal } from '@/components/bestillingsveileder/options/malOptions' -import { useArenaData } from '@/utils/hooks/useFagsystemer' -import { harArenaBestilling } from '@/utils/SjekkBestillingFagsystem' +import { useDollyEnvironments } from '@/utils/hooks/useEnvironments' const TYPE = Object.freeze({ NY_BESTILLING: 'NY_BESTILLING', @@ -29,8 +28,9 @@ export const BVOptions = ( gruppe, } = {}, gruppeId, - personId, ) => { + const { dollyEnvironments } = useDollyEnvironments() + let initialValues = { antall: antall || 1, beskrivelse: null, @@ -101,7 +101,7 @@ export const BVOptions = ( if (mal) { bestType = TYPE.NY_BESTILLING_FRA_MAL - initialValues = Object.assign(initialValues, initialValuesBasedOnMal(mal)) + initialValues = Object.assign(initialValues, initialValuesBasedOnMal(mal, dollyEnvironments)) } if (opprettFraIdenter) { @@ -114,14 +114,6 @@ export const BVOptions = ( initialValues = initialValuesLeggTil } - if (personFoerLeggTil) { - const bestillinger = tidligereBestillinger?.map((best) => best?.data) - const { arenaData } = useArenaData(personId, harArenaBestilling(bestillinger)) - if (arenaData && arenaData.length > 0) { - personFoerLeggTil.arenaforvalteren = arenaData - } - } - if (leggTilPaaGruppe) { bestType = TYPE.LEGG_TIL_PAA_GRUPPE initialValues = initialValuesLeggTilPaaGruppe @@ -141,7 +133,10 @@ export const BVOptions = ( initialValues = initialValuesStandardOrganisasjon } else if (mal) { bestType = TYPE.NY_ORGANISASJON_FRA_MAL - initialValues = Object.assign(initialValuesOrganisasjon, initialValuesBasedOnMal(mal)) + initialValues = Object.assign( + initialValuesOrganisasjon, + initialValuesBasedOnMal(mal, dollyEnvironments), + ) } else { bestType = TYPE.NY_ORGANISASJON initialValues = initialValuesOrganisasjon diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx index 78c9b364776..05fb3d88bbe 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx @@ -11,6 +11,9 @@ export const useStateModifierFns = (formMethods: UseFormReturn) => { const has = (path) => { return formMethods.watch(path) !== undefined } + const values = (path) => { + return formMethods.watch(path) + } const del = (path) => { if (isArray(path)) { path.forEach((p) => { @@ -58,10 +61,11 @@ export const useStateModifierFns = (formMethods: UseFormReturn) => { opts: any del: (path: any) => void has: (path: any) => boolean + values: (path: any) => any methods: any }) => {}, ) => { - const attrs = fn({ set, setMulti, opts, del, has, methods: formMethods }) || {} + const attrs = fn({ set, setMulti, opts, del, has, values, methods: formMethods }) || {} const checked = allCheckedLabels(attrs) return { attrs, diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1Person.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1Person.tsx index 5c19ac21c4f..5df1f2958c3 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1Person.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1Person.tsx @@ -53,11 +53,10 @@ export const Steg1Person = ({ stateModifier }: any) => { ] .map((panel) => ({ label: panel.heading, - values: stateModifier(panel.initialValues).checked, - })) - .map((v) => ({ - ...v, - values: v?.values.filter((val) => !personFoerLeggTil && !leggTil && val !== 'Alder'), + values: stateModifier(panel.initialValues).checked?.filter( + (val: string) => + (!personFoerLeggTil && !leggTil) || ((personFoerLeggTil || leggTil) && val !== 'Alder'), + ), })) .filter((v) => v.values.length) diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx index bfd5e200ffb..89aef3229c2 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx @@ -18,7 +18,6 @@ import { initialSpraakVerdier, initialUtdanningVerdier, } from '@/components/fagsystem/arbeidsplassen/form/initialValues' -import _get from 'lodash/get' import _has from 'lodash/has' import { isBoolean } from 'lodash' @@ -53,25 +52,26 @@ export const ArbeidsplassenPanel = ({ stateModifier, formValues }) => { ArbeidsplassenPanel.heading = 'Arbeidsplassen (CV)' -ArbeidsplassenPanel.initialValues = ({ setMulti, opts, del, has, initial }) => { +ArbeidsplassenPanel.initialValues = ({ setMulti, opts, del, has, values }) => { const { personFoerLeggTil } = opts const personFoerLeggTilHarHjemmel = personFoerLeggTil?.arbeidsplassenCV?.harHjemmel const hjemmel = () => { - if (_has(initial, 'arbeidsplassenCV.harHjemmel')) { - return _get(initial, 'arbeidsplassenCV.harHjemmel') + if (has('arbeidsplassenCV.harHjemmel')) { + return values('arbeidsplassenCV.harHjemmel') } else if (isBoolean(personFoerLeggTilHarHjemmel)) { return personFoerLeggTilHarHjemmel } return true } - const fjernHjemmelPath = (fjernPath) => { + const fjernHjemmelPath = (fjernPath: string) => { + const selected = values() if ( - initial?.arbeidsplassenCV && - Object.keys(initial.arbeidsplassenCV)?.length === 2 && - _has(initial, fjernPath) && - _has(initial, 'arbeidsplassenCV.harHjemmel') + selected?.arbeidsplassenCV && + Object.keys(selected?.arbeidsplassenCV)?.length === 2 && + _has(selected, fjernPath) && + _has(selected, 'arbeidsplassenCV.harHjemmel') ) { return [fjernPath, 'arbeidsplassenCV.harHjemmel'] } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx index 0f2a326d61b..4e8409f8376 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx @@ -13,6 +13,8 @@ import { BestillingsveilederContext } from '@/components/bestillingsveileder/Bes import { initialUforetrygd } from '@/components/fagsystem/uforetrygd/initialValues' import { runningCypressE2E } from '@/service/services/Request' import _ from 'lodash' +import { alderspensjonPath } from '@/components/fagsystem/alderspensjon/form/Form' +import { uforetrygdPath } from '@/components/fagsystem/uforetrygd/form/Form' export const PensjonPanel = ({ stateModifier, formValues }: any) => { const sm = stateModifier(PensjonPanel.initialValues) @@ -80,7 +82,12 @@ export const PensjonPanel = ({ stateModifier, formValues }: any) => { }} uncheckAttributeArray={sm.batchRemove} iconType="pensjon" - startOpen={harValgtAttributt(formValues, [pensjonPath, tpPath])} + startOpen={harValgtAttributt(formValues, [ + pensjonPath, + tpPath, + alderspensjonPath, + uforetrygdPath, + ])} > diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx index 6ab6d2896db..c8668f85329 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx @@ -180,6 +180,8 @@ PersoninformasjonPanel.initialValues = ({ set, opts, setMulti, del, has }) => { skjerming: 'skjerming.egenAnsattDatoTom', }, skjermetFra: 'skjermingsregister.skjermetFra', + norskBankkonto: 'bankkonto.norskBankkonto', + utenlandskBankkonto: 'bankkonto.utenlandskBankkonto', telefonnummer: { pdl: 'pdldata.person.telefonnummer', tpsM: 'tpsMessaging.telefonnummer', @@ -188,8 +190,6 @@ PersoninformasjonPanel.initialValues = ({ set, opts, setMulti, del, has }) => { fullmakt: 'pdldata.person.fullmakt', sikkerhetstiltak: 'pdldata.person.sikkerhetstiltak', tilrettelagtKommunikasjon: 'pdldata.person.tilrettelagtKommunikasjon', - utenlandskBankkonto: 'bankkonto.utenlandskBankkonto', - norskBankkonto: 'bankkonto.norskBankkonto', } return { @@ -301,6 +301,34 @@ PersoninformasjonPanel.initialValues = ({ set, opts, setMulti, del, has }) => { del('skjerming') }, }, + norskBankkonto: { + label: 'Norsk bank', + checked: has(paths.norskBankkonto), + add: () => + set(paths.norskBankkonto, { + kontonummer: '', + tilfeldigKontonummer: opts.antall && opts.antall > 1, + }), + remove: () => del(paths.norskBankkonto), + }, + utenlandskBankkonto: { + label: 'Utenlandsk bank', + checked: has(paths.utenlandskBankkonto), + add: () => + set(paths.utenlandskBankkonto, { + kontonummer: '', + tilfeldigKontonummer: false, + swift: 'BANKXX11222', + landkode: null, + banknavn: '', + iban: '', + valuta: null, + bankAdresse1: '', + bankAdresse2: '', + bankAdresse3: '', + }), + remove: () => del(paths.utenlandskBankkonto), + }, telefonnummer: { label: 'Telefonnummer', checked: has(paths.telefonnummer.pdl), @@ -369,33 +397,5 @@ PersoninformasjonPanel.initialValues = ({ set, opts, setMulti, del, has }) => { del(paths.tilrettelagtKommunikasjon) }, }, - utenlandskBankkonto: { - label: 'Utenlandsk bank', - checked: has(paths.utenlandskBankkonto), - add: () => - set(paths.utenlandskBankkonto, { - kontonummer: '', - tilfeldigKontonummer: false, - swift: 'BANKXX11222', - landkode: null, - banknavn: '', - iban: '', - valuta: null, - bankAdresse1: '', - bankAdresse2: '', - bankAdresse3: '', - }), - remove: () => del(paths.utenlandskBankkonto), - }, - norskBankkonto: { - label: 'Norsk bank', - checked: has(paths.norskBankkonto), - add: () => - set(paths.norskBankkonto, { - kontonummer: '', - tilfeldigKontonummer: opts.antall && opts.antall > 1, - }), - remove: () => del(paths.norskBankkonto), - }, } } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx index 760e86fc6d2..1015f43bd26 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx @@ -81,6 +81,7 @@ export const Steg3 = () => { if (harRelatertPersonVedSivilstand || harEksisterendeNyIdent || harRelatertPersonBarn) { formMethods.setValue('malBestillingNavn', undefined) } + formMethods.trigger('environments') }, []) const visMiljoeVelger = formMethods.watch('environments') diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx index aa8ad5257dd..6b1daa1491f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx @@ -68,7 +68,7 @@ export const ArbeidsforholdForm = ({ const aaregBestillinger = bestillinger ?.filter((bestilling) => bestilling?.data?.aareg) - ?.flatMap((bestilling) => bestilling.data.aareg) + ?.flatMap((bestilling) => bestilling.data?.aareg) ?.filter((bestilling) => _.isEmpty(bestilling?.amelding)) return _.uniqWith( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx index 52764cecfe6..373a7c68df8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx @@ -33,7 +33,7 @@ const StyledAlert = styled(Alert)` } ` -const alderspensjonPath = 'pensjonforvalter.alderspensjon' +export const alderspensjonPath = 'pensjonforvalter.alderspensjon' export const AlderspensjonForm = () => { const formMethods = useFormContext() diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/styles.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/styles.tsx index e9a351e58df..788cf1b7aff 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/styles.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/styles.tsx @@ -25,7 +25,6 @@ export const Fritekstfelt = styled(Textarea)` font-size: 0.75em; text-transform: uppercase; font-weight: 400; - margin-bottom: -8px; } } ` diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx index 0357ec35917..7e55fc61c88 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx @@ -159,10 +159,10 @@ const ingenOverlappFraTildato = (tildato, values) => { if (values.tidligereBestillinger) { const arenaBestillinger = values.tidligereBestillinger.filter((bestilling) => - bestilling.data.hasOwnProperty('arenaforvalter'), + bestilling.data?.hasOwnProperty('arenaforvalter'), ) for (let bestilling of arenaBestillinger) { - let arenaInfo = bestilling.data.arenaforvalter + let arenaInfo = bestilling.data?.arenaforvalter for (let key of ikkeOverlappendeVedtak) { if (arenaInfo[key]?.length > 0) { const fraDatoBestilling = arenaInfo[key]?.[0]?.fraDato diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx index 2db03364728..48a48a48889 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx @@ -130,8 +130,8 @@ InntektsmeldingVisning.filterValues = (bestillinger: Array, ident: s return bestillinger.filter( (bestilling: any) => - bestilling.data.inntektsmelding && - !tomBestilling(bestilling.data.inntektsmelding.inntekter) && + bestilling.data?.inntektsmelding && + !tomBestilling(bestilling.data?.inntektsmelding.inntekter) && erGyldig(bestilling.id, 'INNTKMELD', ident), ) } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx index 438bdfcac9e..afbe274543c 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx @@ -114,6 +114,6 @@ SykemeldingVisning.filterValues = (bestillinger: Array, ident: stri return bestillinger.filter( (bestilling: any) => - bestilling.data.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident), + bestilling.data?.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident), ) } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/form/Form.tsx index 0e1225fba2f..af4576367ea 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/form/Form.tsx @@ -13,7 +13,7 @@ import { validation } from '@/components/fagsystem/uforetrygd/form/validation' import { Monthpicker } from '@/components/ui/form/inputs/monthpicker/Monthpicker' import { useFormContext } from 'react-hook-form' -const uforetrygdPath = 'pensjonforvalter.uforetrygd' +export const uforetrygdPath = 'pensjonforvalter.uforetrygd' export const UforetrygdForm = () => { const formMethods = useFormContext() diff --git a/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoVelger.tsx b/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoVelger.tsx index 49067d80154..63d721634ed 100644 --- a/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoVelger.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoVelger.tsx @@ -96,6 +96,7 @@ export const MiljoVelger = ({ isChecked(id) ? values.filter((value) => value !== id) : values.concat(id), ) } + formMethods.trigger('environments') } return ( @@ -110,7 +111,7 @@ export const MiljoVelger = ({ )}
- Miljøer + Miljøer
{filteredEnvironments.map((env) => ( { + const { dollyEnvironments } = useDollyEnvironments() + const erUnderRedigering = (id: number) => underRedigering.includes(id) const avsluttRedigering = (id: number) => { @@ -40,7 +43,7 @@ export const MalPanel = ({ const maler = malerFiltrert(malListe, searchText) const DataCells = ({ id, malNavn, bestilling }) => ( <> - + {erUnderRedigering(id) ? ( {malNavn} )} - + {erUnderRedigering(id) ? (