diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreAlderspensjonCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreAlderspensjonCommand.java index 55e1adaf4a2..c050590d5e9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreAlderspensjonCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreAlderspensjonCommand.java @@ -27,7 +27,7 @@ public class LagreAlderspensjonCommand implements Callable> { private static final String PENSJON_AP_VEDTAK_URL = "/api/v4/vedtak/ap"; - private static final String PENSJON_AP_SOKNAD_URL = "/api/v3/vedtak/ap/soknad"; + private static final String PENSJON_AP_SOKNAD_URL = "/api/v4/vedtak/ap/soknad"; private final WebClient webClient; @@ -77,4 +77,4 @@ public Flux call() { .toList()) .build())); } -} \ No newline at end of file +} diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml index a49aedadd95..cd2db827ed4 100644 --- a/apps/dolly-backend/src/main/resources/logback-spring.xml +++ b/apps/dolly-backend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ -1 true - - + diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java index 5a062785582..bbaaf79f3cd 100644 --- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java +++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java @@ -43,13 +43,6 @@ public class DollyFrontendApplicationStarter { private final AccessService accessService; private final UserJwtExchange userJwtExchange; private final Consumers consumers; - - public static void main(String[] args) { - new SpringApplicationBuilder(DollyFrontendApplicationStarter.class) - .initializers(new NaisEnvironmentApplicationContextInitializer()) - .run(args); - } - private final GatewayFilter removeCookiesFilter = (exchange, chain) -> { ServerWebExchange modifiedExchange = exchange.mutate() .request(r -> r.headers(headers -> headers.remove(HttpHeaders.COOKIE))) @@ -108,6 +101,12 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .build(); } + public static void main(String[] args) { + new SpringApplicationBuilder(DollyFrontendApplicationStarter.class) + .initializers(new NaisEnvironmentApplicationContextInitializer()) + .run(args); + } + private GatewayFilter addAuthenticationHeaderFilterFrom(ServerProperties serverProperties) { return new AddAuthenticationHeaderToRequestGatewayFilterFactory() .apply(exchange -> { diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json index 9abf0feb5b4..93c10f85a62 100644 --- a/apps/dolly-frontend/src/main/js/package.json +++ b/apps/dolly-frontend/src/main/js/package.json @@ -79,11 +79,14 @@ "@typescript-eslint/parser": "^8.12.2", "@vitejs/plugin-react": "^4.3.4", "@vitest/ui": "^3.0.5", + "babel-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216", "babel-plugin-styled-components": "^2.1.4", "dot-prop": "^9.0.0", + "esbuild": ">=0.25.0", "eslint": "^9.13.0", "eslint-config-prettier": "^10.0.1", "eslint-plugin-react": "^7.37.2", + "eslint-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216", "fetch-retry": "^6.0.0", "isomorphic-fetch": "^3.0.0", "jsdom": "^26.0.0", @@ -100,8 +103,7 @@ "vite": "^6.1.0", "vite-plugin-environment": "^1.1.3", "vite-tsconfig-paths": "^5.1.3", - "vitest": "^3.0.5", - "esbuild": ">=0.25.0" + "vitest": "^3.0.5" }, "prettier": { "singleQuote": true, diff --git a/apps/dolly-frontend/src/main/js/playwright/mocks/Selectors.tsx b/apps/dolly-frontend/src/main/js/playwright/mocks/Selectors.tsx index dbf712a09a8..d47e1fa1b09 100644 --- a/apps/dolly-frontend/src/main/js/playwright/mocks/Selectors.tsx +++ b/apps/dolly-frontend/src/main/js/playwright/mocks/Selectors.tsx @@ -5,7 +5,7 @@ export enum TestComponentSelectors { INPUT_NY_GRUPPE_NAVN = 'input-ny-gruppe-navn', INPUT_NY_GRUPPE_HENSIKT = 'input-ny-gruppe-hensikt', INPUT_HENSIKT = 'input-hensikt', - INPUT_FORBEDRING_MODAL = 'input-forbedring-modal', + INPUT_KONTAKT_MODAL = 'input-kontakt-modal', INPUT_BESTILLING_MALNAVN = 'input-bestilling-malnavn', INPUT_MINSIDE_ENDRE_MALNAVN = 'input-minside-endre-malnavn', TOGGLE_FAVORITTER = 'toggle-favoritter', @@ -41,7 +41,8 @@ export enum TestComponentSelectors { BUTTON_OPEN_BESTILLING = 'button-open-bestilling', BUTTON_OPEN_IDENT = 'button-open-ident', BUTTON_OPEN_BESTILLINGSDETALJER = 'button-open-bestillingsdetaljer', - BUTTON_OPEN_FORBEDRING_MODAL = 'button-open-forbedring-modal', + BUTTON_OPEN_KONTAKTINFO = 'button-open-kontaktinfo', + BUTTON_OPEN_KONTAKTSKJEMA = 'button-open-kontaktskjema', BUTTON_VELG_ALLE = 'button-velg-alle', BUTTON_FJERN_ALLE = 'button-fjern-alle', BUTTON_VIDERE = 'button-videre', @@ -65,7 +66,7 @@ export enum TestComponentSelectors { BUTTON_HEADER_ENDRINGSMELDING = 'button-header-endringsmelding', BUTTON_PROFIL = 'button-minside', BUTTON_PROFIL_MINSIDE = 'button-profil-minside', - BUTTON_SEND_FORBEDRINGSOENSKE = 'button-send-forbedringsoenske', + BUTTON_SEND_MELDING = 'button-send-melding', BUTTON_FULLFOER_BESTILLING = 'button-fullfoer-bestilling', BUTTON_AVBRYT_BESTILLING = 'button-avbryt-bestilling', BUTTON_IMPORTER_PERSONER = 'button-importer-personer', @@ -98,7 +99,7 @@ export enum TestComponentSelectors { SELECT_PERSON_SEARCH = 'select-person-search', SELECT_MAL = 'select-mal', HOVER_MILJOE = 'hover-miljoe', - CHECKBOX_FORBEDRING_ANONYM = 'checkbox-forbedring-anonym', + CHECKBOX_KONTAKT_ANONYM = 'checkbox-kontakt-anonym', CHECKBOX_TENORSOEK = 'checkbox-tenorsoek', CHECKBOX_ORGANISASJONER_TENORSOEK = 'checkbox-organisasjoner-tenorsoek', ERROR_MESSAGE_NAVIGERING = 'error-message-navigering', diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/Minside.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/Minside.spec.ts index d3550e6307e..181b0a2f937 100644 --- a/apps/dolly-frontend/src/main/js/playwright/tests/Minside.spec.ts +++ b/apps/dolly-frontend/src/main/js/playwright/tests/Minside.spec.ts @@ -9,20 +9,19 @@ test.describe('Minside mal testing', () => { await page.goto('') await page.getByTestId(TestComponentSelectors.BUTTON_PROFIL).click() await page.getByTestId(TestComponentSelectors.BUTTON_PROFIL_MINSIDE).click() - await page.getByTestId(TestComponentSelectors.BUTTON_OPEN_FORBEDRING_MODAL).click() - await expect( - page.getByTestId(TestComponentSelectors.BUTTON_SEND_FORBEDRINGSOENSKE), - ).toBeDisabled() + await page.getByTestId(TestComponentSelectors.BUTTON_OPEN_KONTAKTINFO).click() + await page.getByTestId(TestComponentSelectors.BUTTON_OPEN_KONTAKTSKJEMA).click() + await expect(page.getByTestId(TestComponentSelectors.BUTTON_SEND_MELDING)).toBeDisabled() await page - .getByTestId(TestComponentSelectors.INPUT_FORBEDRING_MODAL) + .getByTestId(TestComponentSelectors.INPUT_KONTAKT_MODAL) .fill('When you wish upon a star') - await page.getByTestId(TestComponentSelectors.CHECKBOX_FORBEDRING_ANONYM).click() - await expect(page.getByTestId(TestComponentSelectors.CHECKBOX_FORBEDRING_ANONYM)).toBeEnabled() + await page.getByTestId(TestComponentSelectors.CHECKBOX_KONTAKT_ANONYM).click() + await expect(page.getByTestId(TestComponentSelectors.CHECKBOX_KONTAKT_ANONYM)).toBeEnabled() - await page.getByTestId(TestComponentSelectors.CHECKBOX_FORBEDRING_ANONYM).click() - await page.getByTestId(TestComponentSelectors.BUTTON_SEND_FORBEDRINGSOENSKE).click() + await page.getByTestId(TestComponentSelectors.CHECKBOX_KONTAKT_ANONYM).click() + await page.getByTestId(TestComponentSelectors.BUTTON_SEND_MELDING).click() await page.getByTestId(TestComponentSelectors.INPUT_MINSIDE_SOEK_MAL).fill('mal') await page.getByTestId(TestComponentSelectors.INPUT_MINSIDE_SOEK_MAL).clear() await page.getByTestId(TestComponentSelectors.TOGGLE_MIN_SIDE_ORGANISASJON_MALER).click() diff --git a/apps/dolly-frontend/src/main/js/src/app/App.tsx b/apps/dolly-frontend/src/main/js/src/app/App.tsx index bc7c124f7d8..b077311fa13 100644 --- a/apps/dolly-frontend/src/main/js/src/app/App.tsx +++ b/apps/dolly-frontend/src/main/js/src/app/App.tsx @@ -4,7 +4,7 @@ import Header from '@/components/layout/header/Header' import Loading from '@/components/ui/loading/Loading' import { VarslingerModal } from '@/components/varslinger/VarslingerModal' import './App.less' -import { Forbedring } from '@/components/feedback/Forbedring' +import { Kontaktinfo } from '@/components/feedback/Kontaktinfo' import ToastConnector from '@/components/ui/toast/ToastConnector' import { Breadcrumbs } from '@/components/layout/breadcrumb/Breadcrumb' import { useBrukerProfil, useCurrentBruker } from '@/utils/hooks/useBruker' @@ -66,7 +66,7 @@ export const App = () => { - + ) diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/SlackLogo.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/SlackLogo.svg new file mode 100644 index 00000000000..38fb6500dd5 --- /dev/null +++ b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/SlackLogo.svg @@ -0,0 +1,14 @@ + + + \ No newline at end of file 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 e96fc1288ac..00c4da8b4e8 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 @@ -334,7 +334,7 @@ PersoninformasjonPanel.initialValues = ({ set, opts, setMulti, del, has }) => { ) }, remove() { - del('skjerming') + del(['skjerming', paths.egenAnsattDatoFom.tpsM, paths.egenAnsattDatoFom.skjerming]) }, }, norskBankkonto: { diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx index 24929fe0442..cfcb1f537da 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx @@ -1,9 +1,5 @@ import React, { lazy, Suspense, useContext, useEffect } from 'react' -import { harAvhukedeAttributter } from '@/components/bestillingsveileder/utils' -import { - BestillingsveilederContext, - BestillingsveilederContextType, -} from '@/components/bestillingsveileder/BestillingsveilederContext' +import { useFormContext } from 'react-hook-form' import { SigrunstubForm } from '@/components/fagsystem/sigrunstub/form/Form' import { InntektstubForm } from '@/components/fagsystem/inntektstub/form/Form' import { InntektsmeldingForm } from '@/components/fagsystem/inntektsmelding/form/Form' @@ -17,13 +13,11 @@ import { MedlForm } from '@/components/fagsystem/medl/form/MedlForm' import { SykdomForm } from '@/components/fagsystem/sykdom/form/Form' import { OrganisasjonForm } from '@/components/fagsystem/organisasjoner/form/Form' import { TjenestepensjonForm } from '@/components/fagsystem/tjenestepensjon/form/Form' -import { Alert } from '@navikt/ds-react' import { AlderspensjonForm } from '@/components/fagsystem/alderspensjon/form/Form' import { ArbeidsplassenForm } from '@/components/fagsystem/arbeidsplassen/form/Form' import { UforetrygdForm } from '@/components/fagsystem/uforetrygd/form/Form' import { SigrunstubPensjonsgivendeForm } from '@/components/fagsystem/sigrunstubPensjonsgivende/form/Form' import { KrrstubForm } from '@/components/fagsystem/krrstub/form/KrrForm' -import { useFormContext } from 'react-hook-form' import { SkattekortForm } from '@/components/fagsystem/skattekort/form/Form' import { PensjonsavtaleForm } from '@/components/fagsystem/pensjonsavtale/form/Form' import { FullmaktForm } from '@/components/fagsystem/fullmakt/form/FullmaktForm' @@ -32,76 +26,79 @@ import { YrkesskaderForm } from '@/components/fagsystem/yrkesskader/form/Form' import Loading from '@/components/ui/loading/Loading' import { PdlfForm } from '@/components/fagsystem/pdlf/form/Form' import { ArbeidssoekerregisteretForm } from '@/components/fagsystem/arbeidssoekerregisteret/form/Form' +import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext' +import { harAvhukedeAttributter } from '@/components/bestillingsveileder/utils' +import { Alert } from '@navikt/ds-react' const HistarkForm = lazy(() => import('@/components/fagsystem/histark/form/HistarkForm')) const DokarkivForm = lazy(() => import('@/components/fagsystem/dokarkiv/form/DokarkivForm')) -const gruppeNavn = (gruppe) => {gruppe.navn} +const Steg2: React.FC = () => { + const { getValues, setValue } = useFormContext() + const opts: any = useContext(BestillingsveilederContext) -const getEmptyMessage = (leggTil, importTestnorge, gruppe = null) => { - if (leggTil) { - return 'Du har ikke lagt til flere egenskaper. Vennligst gå tilbake og velg nye egenskaper.' - } else if (importTestnorge) { - return ( - - Du har ikke lagt til egenskaper. Dolly vil importere valgt Test-Norge person(er) til - {gruppe === null && <> gruppe du velger i neste steg.} - {gruppe !== null && <> gruppen {gruppeNavn(gruppe)}.} - - ) + const getEmptyMessage = (leggTil, importTestnorge, gruppe = null) => { + if (leggTil) { + return 'Du har ikke lagt til flere egenskaper. Vennligst gå tilbake og velg nye egenskaper.' + } else if (importTestnorge) { + return ( + + Du har ikke lagt til egenskaper. Dolly vil importere valgt Test-Norge person(er) til + {gruppe === null && <> gruppe du velger i neste steg.} + {gruppe !== null && <> gruppen {gruppeNavn(gruppe)}.} + + ) + } + return 'Du har ikke valgt noen egenskaper. Dolly oppretter personer med tilfeldige verdier.' } - return 'Du har ikke valgt noen egenskaper. Dolly oppretter personer med tilfeldige verdier.' -} - -const Steg2 = () => { - const opts = useContext(BestillingsveilederContext) as BestillingsveilederContextType - const formMethods = useFormContext() - const gruppe = opts.gruppe useEffect(() => { - if (gruppe?.id) { - formMethods.setValue('gruppeId', gruppe?.id) + if (opts.gruppe?.id) { + setValue('gruppeId', opts.gruppe?.id) } }, []) const leggTil = opts.is.leggTil const importTestnorge = opts.is.importTestnorge + const gruppe = opts.gruppe - if (!harAvhukedeAttributter(formMethods.getValues())) { + if (!harAvhukedeAttributter(getValues())) { return {getEmptyMessage(leggTil, importTestnorge, gruppe)} } + const gruppeNavn = (gruppe: any) => {gruppe.navn} return (
- - - - - - - - - - - - - - - - - - - - - - - + {getValues('fullmakt') && } + {getValues('aareg') && } + {getValues('sigrunstub') && } + {getValues('sigrunstubPensjonsgivende') && } + {getValues('inntektstub') && } + {getValues('inntektsmelding') && } + {getValues('skattekort') && } + {getValues('arbeidssoekerregisteret') && } + {getValues('arbeidsplassenCV') && } + {getValues('pensjonforvalter') && } + {getValues('pensjonsavtale') && } + {getValues('tjenestepensjon') && } + {getValues('alderspensjon') && } + {getValues('uforetrygd') && } + {getValues('afpOffentlig') && } + {getValues('arenaforvalter') && } + {getValues('sykemelding') && } + {getValues('yrkesskader') && } + {getValues('brregstub') && } + {getValues('instdata') && } + {getValues('krrstub') && } + {getValues('medl') && } + {getValues('udistub') && } + {getValues('organisasjon') && } + }> - - + {getValues('dokarkiv') && } + {getValues('histark') && } -
) } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx index d0694d46f01..80ea64caf30 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx @@ -13,6 +13,11 @@ export const brregAttributt = 'brregstub' export const BrregstubForm = () => { const formMethods = useFormContext() + + if (!formMethods.watch(brregAttributt)) { + return null + } + const understatuser = SelectOptionsOppslag.hentUnderstatusFraBrregstub() const understatuserOptions = SelectOptionsFormat.formatOptions('understatuser', understatuser) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx index 72abdcf39ce..ddb5d801981 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx @@ -1,7 +1,11 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { arrayToString, formatDate } from '@/utils/DataFormatter' +import Button from '@/components/ui/button/Button' +import JoarkDokumentService from '@/service/services/JoarkDokumentService' type HistarkDokument = { + idx: number + dokumentInfoId: any dokument: { antallSider: number enhetsNr: string @@ -19,7 +23,7 @@ type HistarkDokument = { } } -export default ({ dokument }: HistarkDokument) => { +export default ({ dokument, dokumentInfoId, idx }: HistarkDokument) => { if (!dokument) { return null } @@ -39,7 +43,24 @@ export default ({ dokument }: HistarkDokument) => { /> - +
+

Vedlegg

+
+
+ + + +
) } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/Visning.tsx index 88a0364f30d..2c432140ea8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/Visning.tsx @@ -3,9 +3,11 @@ import HistarkVisning from './HistarkVisning' import Loading from '@/components/ui/loading/Loading' import { Journalpost } from '@/service/services/JoarkDokumentService' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' +import { useTransaksjonsid } from '@/utils/hooks/useTransaksjonsid' interface Form { data?: Array + ident: string loading: boolean } @@ -14,14 +16,26 @@ type MiljoDataListe = { data: Array } -const Histark = ({ data }) => { +const getHeader = (dokument: any) => { + return `Dokument (${dokument?.filnavn})` +} + +const Histark = ({ data, dokumentInfoId, idx }) => { if (!data) return null - return + return } -export default ({ data, loading }: Form) => { - if (loading) { +export default ({ data, loading, ident }: Form) => { + const { transaksjonsid, loading: loadingTransaksjon } = useTransaksjonsid('HISTARK', ident) + let dokumentInfoIder: number[] = [] + transaksjonsid?.forEach((transaksjon) => + transaksjon?.transaksjonId.forEach((indreTransaksjon) => + dokumentInfoIder.push(indreTransaksjon.dokumentInfoId), + ), + ) + + if (loading || loadingTransaksjon) { return } @@ -33,11 +47,16 @@ export default ({ data, loading }: Form) => { <> {data.length === 1 ? ( - + ) : ( - 2}> - {(dokument) => { - return + 2} + > + {(dokument, idx) => { + return }} )} diff --git a/apps/dolly-frontend/src/main/js/src/components/feedback/Forbedring.tsx b/apps/dolly-frontend/src/main/js/src/components/feedback/Forbedring.tsx deleted file mode 100644 index c3149085888..00000000000 --- a/apps/dolly-frontend/src/main/js/src/components/feedback/Forbedring.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import * as React from 'react' -// @ts-ignore -import './Forbedring.less' -import { ForbedringModal } from '@/components/feedback/ForbedringModal' -import useBoolean from '@/utils/hooks/useBoolean' -import Icon from '@/components/ui/icon/Icon' -import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' -import { TestComponentSelectors } from '#/mocks/Selectors' - -export const Forbedring = () => { - const [isForbedringModalOpen, openForbedringModal, closeForbedringModal] = useBoolean(false) - - return ( - - - {isForbedringModalOpen && } - - ) -} diff --git a/apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx b/apps/dolly-frontend/src/main/js/src/components/feedback/KontaktModal.tsx similarity index 61% rename from apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx rename to apps/dolly-frontend/src/main/js/src/components/feedback/KontaktModal.tsx index cf6c870df22..66bbc5e03a8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/feedback/KontaktModal.tsx @@ -12,19 +12,19 @@ import { Textarea } from '@navikt/ds-react' import { Logger } from '@/logger/Logger' import { TestComponentSelectors } from '#/mocks/Selectors' -export const ForbedringModal = ({ closeModal }) => { +export const KontaktModal = ({ closeModal }) => { const { brukerBilde } = useBrukerProfilBilde() const { currentBruker } = useCurrentBruker() const MAX_LENGTH = 2000 const [uuid] = useState(_uuid()) - const [forbedring, setForbedring] = useState('') + const [melding, setMelding] = useState('') const [isAnonym, toggleAnonym] = useToggle(false) - const sendForbedring = () => { + const sendMelding = () => { Logger.log({ - event: `Ønsket forbedring fra Dollybruker`, - message: forbedring, + event: `Melding fra Dollybruker`, + message: melding, uuid: uuid, isAnonym: isAnonym, brukerType: currentBruker.brukertype, @@ -35,31 +35,34 @@ export const ForbedringModal = ({ closeModal }) => { return ( -

Ønske om forbedring eller ny funksjonalitet

+

Kontakt team Dolly


+

+ Her kan du sende oss tilbakemeldinger, komme med ønsker eller forslag til ny + funksjonalitet, eller melde fra om feil og mangler. NB! Om du ønsker svar på meldingen kan + du ikke velge å være anonym. +

{isAnonym ? ( -
- -
+ ) : ( Profilbilde )}