Skip to content

Commit af60f01

Browse files
stigusstigus
committed
- Fikset diverse feil fra PR og testing
- Diverse oppdateringer og refaktorering #deploy-test-frontend
1 parent cca5096 commit af60f01

15 files changed

+327
-279
lines changed

‎apps/dolly-frontend/src/main/js/package-lock.json

+137-145
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/Form.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ export const ArbeidsplassenForm = () => {
3131
startOpen={erForsteEllerTest(formMethods.getValues(), [arbeidsplassenAttributt])}
3232
>
3333
<div className="flexbox--flex-wrap cv-form">
34-
<JobboenskerForm formMethods={formMethods} />
35-
<UtdanningForm formMethods={formMethods} />
36-
<FagbrevForm formMethods={formMethods} />
37-
<ArbeidserfaringForm formMethods={formMethods} />
38-
<AnnenErfaringForm formMethods={formMethods} />
39-
<KompetanserForm formMethods={formMethods} />
40-
<OffentligeGodkjenningerForm formMethods={formMethods} />
41-
<AndreGodkjenningerForm formMethods={formMethods} />
42-
<SpraakForm formMethods={formMethods} />
43-
<FoererkortForm formMethods={formMethods} />
44-
<KursForm formMethods={formMethods} />
45-
<SammendragForm formMethods={formMethods} />
34+
<JobboenskerForm />
35+
<UtdanningForm />
36+
<FagbrevForm />
37+
<ArbeidserfaringForm />
38+
<AnnenErfaringForm />
39+
<KompetanserForm />
40+
<OffentligeGodkjenningerForm />
41+
<AndreGodkjenningerForm />
42+
<SpraakForm />
43+
<FoererkortForm />
44+
<KursForm />
45+
<SammendragForm />
4646
<HjemmelForm />
4747
</div>
4848
</Panel>

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AndreGodkjenningerForm.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import * as React from 'react'
1010
import { SelectOptionsManager as Options } from '@/service/SelectOptions'
1111
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1212
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
13+
import { useFormContext } from 'react-hook-form'
1314

14-
export const AndreGodkjenningerForm = ({ formMethods }) => {
15+
export const AndreGodkjenningerForm = () => {
16+
const formMethods = useFormContext()
1517
const andreGodkjenningerListePath = 'arbeidsplassenCV.andreGodkjenninger'
1618

1719
return (
@@ -37,6 +39,7 @@ export const AndreGodkjenningerForm = ({ formMethods }) => {
3739
name={`${annenGodkjenningPath}.issuer`}
3840
label="Utsteder"
3941
size="large"
42+
key={`issuer_${formMethods.getValues(`${annenGodkjenningPath}.issuer`)}`}
4043
/>
4144
<FormDatepicker name={`${annenGodkjenningPath}.fromDate`} label="Fullført" />
4245
<FormDatepicker name={`${annenGodkjenningPath}.toDate`} label="Utløper" />

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AnnenErfaringForm.tsx

+10-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
1111
import * as React from 'react'
1212
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1313
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
14+
import { useFormContext } from 'react-hook-form'
1415

15-
export const AnnenErfaringForm = ({ formMethods }) => {
16+
export const AnnenErfaringForm = () => {
17+
const formMethods = useFormContext()
1618
const annenErfaringListePath = 'arbeidsplassenCV.annenErfaring'
1719

1820
return (
@@ -27,7 +29,12 @@ export const AnnenErfaringForm = ({ formMethods }) => {
2729
{(annenErfaringPath, idx) => (
2830
<>
2931
<div key={idx} className="flexbox--flex-wrap">
30-
<DollyTextInput name={`${annenErfaringPath}.role`} label="Rolle" size="xlarge" />
32+
<DollyTextInput
33+
name={`${annenErfaringPath}.role`}
34+
label="Rolle"
35+
size="xlarge"
36+
key={`role_${formMethods.getValues(`${annenErfaringPath}.role`)}`}
37+
/>
3138
<Fritekstfelt
3239
label="Beskrivelse"
3340
placeholder="Beskrivelse av annen erfaring"
@@ -39,6 +46,7 @@ export const AnnenErfaringForm = ({ formMethods }) => {
3946
)
4047
}
4148
size="small"
49+
key={`description_${formMethods.getValues(`${annenErfaringPath}.description`)}`}
4250
resize
4351
/>
4452
<FormDatepicker name={`${annenErfaringPath}.fromDate`} label="Startdato" />

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/ArbeidserfaringForm.tsx

+20-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
88
import * as React from 'react'
99
import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
1010
import { FormSelect } from '@/components/ui/form/inputs/select/Select'
11-
import * as _ from 'lodash-es'
1211
import { Fritekstfelt } from '@/components/fagsystem/arbeidsplassen/form/styles'
1312
import { SelectOptionsManager as Options } from '@/service/SelectOptions'
1413
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1514
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
15+
import { useFormContext } from 'react-hook-form'
1616

17-
export const ArbeidserfaringForm = ({ formMethods }) => {
17+
export const ArbeidserfaringForm = () => {
18+
const formMethods = useFormContext()
1819
const setYrke = (valg, path) => {
1920
formMethods.setValue(`${path}.styrkkode`, valg.value)
2021
formMethods.setValue(`${path}.jobTitle`, valg.label)
@@ -46,34 +47,46 @@ export const ArbeidserfaringForm = ({ formMethods }) => {
4647
name={`${arbeidsforholdPath}.alternativeJobTitle`}
4748
label="Alternativ tittel"
4849
size="large"
50+
key={`alternativeJobTitle_${formMethods.getValues(`${arbeidsforholdPath}.alternativeJobTitle`)}`}
51+
/>
52+
<FormTextInput
53+
name={`${arbeidsforholdPath}.employer`}
54+
label="Bedrift"
55+
size="large"
56+
key={`employer_${formMethods.getValues(`${arbeidsforholdPath}.employer`)}`}
57+
/>
58+
<FormTextInput
59+
name={`${arbeidsforholdPath}.location`}
60+
label="Sted"
61+
size="large"
62+
key={`location_${formMethods.getValues(`${arbeidsforholdPath}.location`)}`}
4963
/>
50-
<FormTextInput name={`${arbeidsforholdPath}.employer`} label="Bedrift" size="large" />
51-
<FormTextInput name={`${arbeidsforholdPath}.location`} label="Sted" size="large" />
5264
<Fritekstfelt
5365
label="Arbeidsoppgaver"
5466
placeholder="Beskrivelse av arbeidsoppgaver"
55-
defaultValue={_.get(formMethods.getValues(), `${arbeidsforholdPath}.description`)}
67+
defaultValue={formMethods.getValues(`${arbeidsforholdPath}.description`)}
5668
onBlur={(beskrivelse) =>
5769
formMethods.setValue(
5870
`${arbeidsforholdPath}.description`,
5971
beskrivelse?.target?.value,
6072
)
6173
}
74+
key={`description_${formMethods.getValues(`${arbeidsforholdPath}.description`)}`}
6275
size="small"
6376
resize
6477
/>
6578
<FormDatepicker name={`${arbeidsforholdPath}.fromDate`} label="Ansatt fra" />
6679
<FormDatepicker
6780
name={`${arbeidsforholdPath}.toDate`}
6881
label="Ansatt til"
69-
disabled={_.get(formMethods.getValues(), `${arbeidsforholdPath}.ongoing`)}
82+
disabled={formMethods.getValues(`${arbeidsforholdPath}.ongoing`)}
7083
/>
7184
<FormCheckbox
7285
id={`${arbeidsforholdPath}.ongoing`}
7386
name={`${arbeidsforholdPath}.ongoing`}
7487
label="Nåværende jobb"
7588
wrapperSize="inherit"
76-
isDisabled={_.get(formMethods.getValues(), `${arbeidsforholdPath}.toDate`)}
89+
isDisabled={formMethods.getValues(`${arbeidsforholdPath}.toDate`)}
7790
checkboxMargin
7891
/>
7992
</div>

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/FagbrevForm.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import { FormSelect } from '@/components/ui/form/inputs/select/Select'
88
import { SelectOptionsManager as Options } from '@/service/SelectOptions'
99
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1010
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
11+
import { useFormContext } from 'react-hook-form'
1112

12-
export const FagbrevForm = ({ formMethods }) => {
13+
export const FagbrevForm = () => {
14+
const formMethods = useFormContext()
1315
const setFagbrev = (selected, path) => {
1416
const fagbrev = {
1517
title: selected.value,

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/FoererkortForm.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import * as React from 'react'
99
import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
1010
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1111
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
12+
import { useFormContext } from 'react-hook-form'
1213

13-
export const FoererkortForm = ({ formMethods }) => {
14+
export const FoererkortForm = () => {
15+
const formMethods = useFormContext()
1416
const foererkortTyperListePath = 'arbeidsplassenCV.foererkort'
1517

1618
return (

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/JobboenskerForm.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import {
77
initialJobboensker,
88
initialJobboenskerVerdier,
99
} from '@/components/fagsystem/arbeidsplassen/form/initialValues'
10+
import { useFormContext } from 'react-hook-form'
1011

11-
export const JobboenskerForm = ({ formMethods }) => {
12+
export const JobboenskerForm = () => {
13+
const formMethods = useFormContext()
1214
const jobboenskerPath = 'arbeidsplassenCV.jobboensker'
1315

1416
const setYrker = (options) => {

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/KompetanserForm.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import { FormSelect } from '@/components/ui/form/inputs/select/Select'
88
import { SelectOptionsManager as Options } from '@/service/SelectOptions'
99
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1010
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
11+
import { useFormContext } from 'react-hook-form'
1112

12-
export const KompetanserForm = ({ formMethods }) => {
13+
export const KompetanserForm = () => {
14+
const formMethods = useFormContext()
1315
const kompetanseListePath = 'arbeidsplassenCV.kompetanser'
1416

1517
return (

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/KursForm.tsx

+16-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import * as _ from 'lodash-es'
1212
import { showLabel } from '@/utils/DataFormatter'
1313
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1414
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
15+
import { useFormContext } from 'react-hook-form'
1516

16-
export const KursForm = ({ formMethods }) => {
17+
export const KursForm = () => {
18+
const formMethods = useFormContext()
1719
const kursListePath = 'arbeidsplassenCV.kurs'
1820

1921
return (
@@ -24,8 +26,18 @@ export const KursForm = ({ formMethods }) => {
2426
return (
2527
<>
2628
<div key={idx} className="flexbox--flex-wrap">
27-
<FormTextInput name={`${kursPath}.title`} label="Kursnavn" size="xlarge" />
28-
<FormTextInput name={`${kursPath}.issuer`} label="Kursholder" size="xlarge" />
29+
<FormTextInput
30+
name={`${kursPath}.title`}
31+
label="Kursnavn"
32+
size="xlarge"
33+
key={`title_${formMethods.getValues(`${kursPath}.title`)}`}
34+
/>
35+
<FormTextInput
36+
name={`${kursPath}.issuer`}
37+
label="Kursholder"
38+
size="xlarge"
39+
key={`issuer_${formMethods.getValues(`${kursPath}.issuer`)}`}
40+
/>
2941
<FormDatepicker name={`${kursPath}.date`} label="Fullført" />
3042
<FormSelect
3143
name={`${kursPath}.durationUnit`}
@@ -42,6 +54,7 @@ export const KursForm = ({ formMethods }) => {
4254
}`}
4355
size="small"
4456
type="number"
57+
key={`duration_${formMethods.getValues(`${kursPath}.duration`)}`}
4558
/>
4659
</div>
4760
<EraseFillButtons

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/OffentligeGodkjenningerForm.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicke
1010
import * as React from 'react'
1111
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1212
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
13+
import { useFormContext } from 'react-hook-form'
1314

14-
export const OffentligeGodkjenningerForm = ({ formMethods }) => {
15+
export const OffentligeGodkjenningerForm = () => {
16+
const formMethods = useFormContext()
1517
const offentligeGodkjenningerListePath = 'arbeidsplassenCV.offentligeGodkjenninger'
1618

1719
return (
@@ -37,6 +39,7 @@ export const OffentligeGodkjenningerForm = ({ formMethods }) => {
3739
name={`${offentligGodkjenningPath}.issuer`}
3840
label="Utsteder"
3941
size="large"
42+
key={`issuer_${formMethods.getValues(`${offentligGodkjenningPath}.issuer`)}`}
4043
/>
4144
<FormDatepicker name={`${offentligGodkjenningPath}.fromDate`} label="Fullført" />
4245
<FormDatepicker name={`${offentligGodkjenningPath}.toDate`} label="Utløper" />

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/SammendragForm.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import * as React from 'react'
44
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
55
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
66
import { initialSammendragVerdi } from '@/components/fagsystem/arbeidsplassen/form/initialValues'
7+
import { useFormContext } from 'react-hook-form'
78

8-
export const SammendragForm = ({ formMethods }: any) => {
9+
export const SammendragForm = () => {
10+
const formMethods = useFormContext()
911
const sammendragPath = 'arbeidsplassenCV.sammendrag'
1012

1113
return (
@@ -17,6 +19,7 @@ export const SammendragForm = ({ formMethods }: any) => {
1719
defaultValue={_.get(formMethods.getValues(), sammendragPath)}
1820
onBlur={(sammendrag) => formMethods.setValue(sammendragPath, sammendrag?.target?.value)}
1921
size="small"
22+
key={`sammendrag_${formMethods.getValues(sammendragPath)}`}
2023
error={_.get(formMethods.getValues(), sammendragPath) === '' ? 'Feltet er påkrevd' : null}
2124
resize
2225
/>

‎apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/SpraakForm.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import * as React from 'react'
88
import { SelectOptionsManager as Options } from '@/service/SelectOptions'
99
import { Vis } from '@/components/bestillingsveileder/VisAttributt'
1010
import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
11+
import { useFormContext } from 'react-hook-form'
1112

12-
export const SpraakForm = ({ formMethods }) => {
13+
export const SpraakForm = () => {
14+
const formMethods = useFormContext()
1315
const spraakListePath = 'arbeidsplassenCV.spraak'
1416

1517
return (

0 commit comments

Comments
 (0)