Skip to content

Commit b2b745f

Browse files
sirimyklandsirimykland
authored
ta i bruk props fra aksels input komponenter i RHF komponentene (#3904)
ta i bruk Props til aksels input komponenter i RHF komponentene
1 parent 916297d commit b2b745f

File tree

35 files changed

+134
-185
lines changed

35 files changed

+134
-185
lines changed

‎packages/fakta-beregning/src/components/avklareAktiviteter/VurderAktiviteterRow.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const VurderAktiviteterTabellRad = ({
8383
name={`avklarAktiviteterForm.${fieldId}.aktiviteterValues.${lagAktivitetFieldId(aktivitet)}.tom`}
8484
control={control}
8585
validate={[required, hasValidDate, dateAfterOrEqual(aktivitet.fom)]}
86-
isReadOnly={readOnly}
86+
readOnly={readOnly}
8787
size="small"
8888
hideLabel
8989
/>
@@ -94,9 +94,9 @@ export const VurderAktiviteterTabellRad = ({
9494
<RhfRadioGroup
9595
name={`avklarAktiviteterForm.${fieldId}.aktiviteterValues.${lagAktivitetFieldId(aktivitet)}.skalBrukes`}
9696
control={control}
97-
label={intl.formatMessage({ id: 'VurderAktiviteterTabell.Header.Benytt' })}
97+
legend={intl.formatMessage({ id: 'VurderAktiviteterTabell.Header.Benytt' })}
9898
validate={[required]}
99-
isReadOnly={
99+
readOnly={
100100
readOnly ||
101101
!skalVurdereAktivitet(
102102
aktivitet,
@@ -117,9 +117,9 @@ export const VurderAktiviteterTabellRad = ({
117117
<RhfRadioGroup
118118
name={`avklarAktiviteterForm.${fieldId}.aktiviteterValues.${lagAktivitetFieldId(aktivitet)}.skalBrukes`}
119119
control={control}
120-
label={intl.formatMessage({ id: 'VurderAktiviteterTabell.Header.IkkeBenytt' })}
120+
legend={intl.formatMessage({ id: 'VurderAktiviteterTabell.Header.IkkeBenytt' })}
121121
validate={[required]}
122-
isReadOnly={
122+
readOnly={
123123
readOnly ||
124124
!skalVurdereAktivitet(
125125
aktivitet,

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/besteberegningFodendeKvinne/VurderBesteberegningForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const VurderBesteberegningForm = ({ readOnly, erOverstyrt }: Props) => {
4949
<RhfRadioGroup
5050
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.${besteberegningField}`}
5151
control={control}
52-
label={
52+
legend={
5353
<VStack gap="space-8" justify="space-between">
5454
<Label size="small">
5555
<FormattedMessage id="BeregningInfoPanel.VurderBestebergning.HarBesteberegning" />
@@ -61,7 +61,7 @@ export const VurderBesteberegningForm = ({ readOnly, erOverstyrt }: Props) => {
6161
</BodyShort>
6262
</VStack>
6363
}
64-
isReadOnly={isReadOnly}
64+
readOnly={isReadOnly}
6565
validate={isReadOnly ? [] : [required]}
6666
>
6767
<Radio value={true} size="small">

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/kunYtelse/KunYtelseBesteberegningPanel.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ export const KunYtelseBesteberegning = ({
5252
<RhfRadioGroup
5353
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.besteberegningField`}
5454
control={control}
55-
isReadOnly={readOnly}
56-
label={<FormattedMessage id="KunYtelsePanel.HarBesteberegning" />}
55+
readOnly={readOnly}
56+
legend={<FormattedMessage id="KunYtelsePanel.HarBesteberegning" />}
5757
validate={readOnly ? [] : [required]}
5858
>
5959
<HStack gap="space-16">

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/nyIArbeidslivet/NyIArbeidslivetSNForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const NyIArbeidslivetSNForm = ({ readOnly }: Props) => {
3434
<RhfRadioGroup
3535
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.${radioGroupFieldName}`}
3636
control={control}
37-
label={
37+
legend={
3838
<VStack gap="space-8">
3939
<FormattedMessage id="BeregningInfoPanel.NyIArbeidslivet.SelvstendigNaeringsdrivende" />
4040
<ReadMore
@@ -56,7 +56,7 @@ export const NyIArbeidslivetSNForm = ({ readOnly }: Props) => {
5656
</VStack>
5757
}
5858
validate={[required]}
59-
isReadOnly={readOnly}
59+
readOnly={readOnly}
6060
>
6161
<Radio value={true} size="small">
6262
<FormattedMessage id="BeregningInfoPanel.FormAlternativ.Ja" />

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/tidsbegrensetArbeidsforhold/TidsbegrensetArbeidsforholdForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export const TidsbegrensetArbeidsforholdForm = ({
8484
)}`}
8585
control={control}
8686
validate={[required]}
87-
label={
87+
legend={
8888
<VStack gap="space-8">
8989
<FormattedMessage
9090
id="BeregningInfoPanel.TidsbegrensetArbFor.Arbeidsforhold"
@@ -102,7 +102,7 @@ export const TidsbegrensetArbeidsforholdForm = ({
102102
</ReadMore>
103103
</VStack>
104104
}
105-
isReadOnly={readOnly}
105+
readOnly={readOnly}
106106
>
107107
<Radio value={true} size="small">
108108
<FormattedMessage id="BeregningInfoPanel.FormAlternativ.Ja" />

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/vurderMilitaer/VurderMilitaer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const VurderMilitaer = ({ readOnly }: Props) => {
3434
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.${vurderMilitaerField}`}
3535
control={control}
3636
validate={[required]}
37-
label={
37+
legend={
3838
<VStack gap="space-8">
3939
<FormattedMessage id="BeregningInfoPanel.VurderMilitaer.HarSøkerMilitærinntekt" />
4040
<ReadMore
@@ -52,7 +52,7 @@ export const VurderMilitaer = ({ readOnly }: Props) => {
5252
</ReadMore>
5353
</VStack>
5454
}
55-
isReadOnly={readOnly}
55+
readOnly={readOnly}
5656
>
5757
<Radio value={true} size="small">
5858
<FormattedMessage id="BeregningInfoPanel.FormAlternativ.Ja" />

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/vurderOgFastsettATFL/VurderOgFastsettATFL.spec.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const emptyValues = { erTilVurdering: true, periode: { fom: '2022-01-01', tom: '
2929
const lagBeregningsgrunnlag = (andeler: BeregningsgrunnlagAndel[]): Beregningsgrunnlag =>
3030
({
3131
vilkårsperiodeFom: '2022-01-01',
32+
3233
beregningsgrunnlagPeriode: [
3334
{
3435
beregningsgrunnlagPrStatusOgAndel: andeler.map(andel => ({

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/vurderOgFastsettATFL/forms/LonnsendringForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const LonnsendringForm = ({ readOnly }: Props) => {
3838
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.lonnsendringField`}
3939
control={control}
4040
validate={[required]}
41-
label={
41+
legend={
4242
<VStack gap="space-8">
4343
<FormattedMessage id="BeregningInfoPanel.LonnsendringForm.HarSokerEndring" />
4444
<ReadMore size="small" header={<FormattedMessage id="BeregningInfoPanel.LonnsendringForm.HvaBetyrDette" />}>
@@ -56,7 +56,7 @@ export const LonnsendringForm = ({ readOnly }: Props) => {
5656
</ReadMore>
5757
</VStack>
5858
}
59-
isReadOnly={readOnly}
59+
readOnly={readOnly}
6060
>
6161
<Radio value={true} size="small">
6262
<FormattedMessage id="BeregningInfoPanel.FormAlternativ.JaMaanedsinntektMaaFastsettes" />

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/vurderOgFastsettATFL/forms/NyoppstartetFLForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const NyoppstartetFLForm = ({ readOnly }: Props) => {
3939
<RhfRadioGroup
4040
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.${erNyoppstartetFLField}`}
4141
control={control}
42-
label={
42+
legend={
4343
<VStack gap="space-8">
4444
<FormattedMessage id="BeregningInfoPanel.NyoppstartetFLForm.ErSokerNyoppstartetFL" />
4545
<ReadMore
@@ -58,7 +58,7 @@ export const NyoppstartetFLForm = ({ readOnly }: Props) => {
5858
</VStack>
5959
}
6060
validate={[required]}
61-
isReadOnly={readOnly}
61+
readOnly={readOnly}
6262
>
6363
<Radio value={true} size="small">
6464
<FormattedMessage id="BeregningInfoPanel.FormAlternativ.JaMaanedsinntektMaaFastsettes" />

‎packages/fakta-beregning/src/components/fellesFaktaForATFLogSN/vurderOgFastsettATFL/forms/VurderEtterlonnSluttpakkeForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const VurderEtterlonnSluttpakkeForm = ({ readOnly }: Props) => {
4545
<RhfRadioGroup
4646
name={`vurderFaktaBeregningForm.${beregningsgrunnlagIndeks}.${harEtterlonnSluttpakkeField}`}
4747
control={control}
48-
label={
48+
legend={
4949
<VStack gap="space-8">
5050
<FormattedMessage id="BeregningInfoPanel.EtterlønnSluttpakke.HarSøkerInntekt" />
5151
<ReadMore
@@ -57,7 +57,7 @@ export const VurderEtterlonnSluttpakkeForm = ({ readOnly }: Props) => {
5757
</VStack>
5858
}
5959
validate={[required]}
60-
isReadOnly={readOnly}
60+
readOnly={readOnly}
6161
>
6262
<Radio value={true} size="small">
6363
<FormattedMessage id="BeregningInfoPanel.FormAlternativ.JaMaanedsinntektMaaFastsettes" />

0 commit comments

Comments
 (0)