Skip to content

Commit

Permalink
Merge branch 'main' into ung
Browse files Browse the repository at this point in the history
  • Loading branch information
frodehansen2 committed Dec 13, 2024
2 parents d27a9b7 + 66d9ac0 commit 582ba0c
Show file tree
Hide file tree
Showing 41 changed files with 147 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn

## 1.31.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 1.31.0

### Minor Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn",
"license": "MIT",
"name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn",
"version": "1.31.0",
"version": "1.31.1",
"repository": "https://github.com/navikt/sif-brukerdialog",
"private": true,
"type": "module",
Expand Down
8 changes: 8 additions & 0 deletions apps/endringsmelding-pleiepenger/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/endringsmelding-pleiepenger

## 2.35.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 2.35.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/endringsmelding-pleiepenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"name": "@navikt/endringsmelding-pleiepenger",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.35.0",
"version": "2.35.1",
"private": true,
"dependencies": {
"@navikt/ds-css": "7.8.0",
Expand Down
8 changes: 8 additions & 0 deletions apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/omsorgsdager-aleneomsorg-dialog

## 2.24.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 2.24.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/omsorgsdager-aleneomsorg-dialog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/omsorgsdager-aleneomsorg-dialog",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.24.0",
"version": "2.24.1",
"private": true,
"type": "module",
"scripts": {
Expand Down
6 changes: 6 additions & 0 deletions apps/omsorgsdager-kalkulator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @navikt/omsorgsdager-kalkulator

## 3.11.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel

## 3.11.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/omsorgsdager-kalkulator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "En kalkulator for beregning av omsorgsdager.",
"license": "MIT",
"name": "@navikt/omsorgsdager-kalkulator",
"version": "3.11.0",
"version": "3.11.1",
"private": true,
"scripts": {
"dev": "next dev -p 8080",
Expand Down
8 changes: 8 additions & 0 deletions apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/omsorgspengerutbetaling-arbeidstaker-soknad

## 1.12.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 1.12.0

### Minor Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/omsorgspengerutbetaling-arbeidstaker-soknad",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "1.12.0",
"version": "1.12.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/omsorgspengerutbetaling-soknad/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/omsorgspengerutbetaling-soknad

## 1.22.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 1.22.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/omsorgspengerutbetaling-soknad/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/omsorgspengerutbetaling-soknad",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "1.22.0",
"version": "1.22.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/omsorgspengesoknad/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/omsorgspengesoknad

## 1.36.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 1.36.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/omsorgspengesoknad/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"name": "@navikt/omsorgspengesoknad",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "1.36.0",
"version": "1.36.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/opplaringspenger-soknad/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/opplaringspenger-soknad

## 1.16.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 1.16.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/opplaringspenger-soknad/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/opplaringspenger-soknad",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "1.16.0",
"version": "1.16.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/pleiepenger-i-livets-sluttfase-soknad

## 2.18.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 2.18.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/pleiepenger-i-livets-sluttfase-soknad/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/pleiepenger-i-livets-sluttfase-soknad",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.18.0",
"version": "2.18.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/pleiepenger-sykt-barn/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/pleiepenger-sykt-barn

## 4.7.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 4.7.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/pleiepenger-sykt-barn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/pleiepenger-sykt-barn",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "4.7.0",
"version": "4.7.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/sif-ettersending/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @navikt/sif-ettersending

## 3.44.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel
- Updated dependencies
- @navikt/sif-common-formik-ds@2.3.1

## 3.44.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/sif-ettersending/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/sif-ettersending",
"repository": "https://github.com/navikt/sif-ettersending",
"version": "3.44.0",
"version": "3.44.1",
"private": true,
"type": "module",
"dependencies": {
Expand Down
6 changes: 6 additions & 0 deletions packages/sif-common-formik-ds/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @navikt/sif-common-formik-ds

## 2.3.1

### Patch Changes

- Fjerne required-props på inputs etter anbefaling fra Aksel

## 2.3.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/sif-common-formik-ds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"main": "src/index.ts",
"name": "@navikt/sif-common-formik-ds",
"version": "2.3.0",
"version": "2.3.1",
"type": "module",
"bugs": {
"url": "https://github.com/navikt/sif-common-formik-ds/issues"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { FastField, Field, FieldProps } from 'formik';
import { TestProps, TypedFormInputValidationProps, UseFastFieldProps } from '../../types';
import { getErrorPropForFormikInput } from '../../utils/typedFormErrorUtils';
import { TypedFormikFormContext } from '../typed-formik-form/TypedFormikForm';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

export type FormikCheckboxGroupCheckboxProp = Omit<CheckboxProps, 'children' | 'name' | 'checked'> & {
label: React.ReactNode;
Expand Down Expand Up @@ -48,6 +49,7 @@ function FormikCheckboxGroup<FieldName, ErrorType>({
return (
<CheckboxGroup
{...restProps}
{...inputPropsToRemove}
value={getFieldValueArray(field.value)}
legend={legend}
className="focusableFieldset"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { FastField, Field, FieldProps } from 'formik';
import { FormError, TestProps, TypedFormInputValidationProps, UseFastFieldProps } from '../../types';
import { getErrorPropForFormikInput } from '../../utils/typedFormErrorUtils';
import { TypedFormikFormContext } from '../typed-formik-form/TypedFormikForm';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

interface OwnProps<FieldName> extends Omit<CheckboxProps, 'name' | 'error' | 'children'> {
name: FieldName;
Expand Down Expand Up @@ -36,6 +37,7 @@ function FormikCheckbox<FieldName, ErrorType>({
<Checkbox
{...restProps}
{...field}
{...inputPropsToRemove}
error={hasError !== undefined}
checked={field.value === true}
autoComplete="off"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Field, FieldProps } from 'formik';
import { TestProps, TypedFormInputValidationProps } from '../../types';
import { getErrorPropForFormikInput } from '../../utils/typedFormErrorUtils';
import { TypedFormikFormContext } from '../typed-formik-form/TypedFormikForm';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

interface OwnProps<FieldName> extends Omit<ConfirmationPanelProps, 'name' | 'onChange' | 'checked'> {
name: FieldName;
Expand All @@ -28,6 +29,7 @@ function FormikConfirmationCheckbox<FieldName, ErrorType>({
<ConfirmationPanel
{...restProps}
{...field}
{...inputPropsToRemove}
checked={field.value === true}
error={getErrorPropForFormikInput({ field, form, context, error })}
onChange={(evt) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import { getCountries } from '../../utils/countryUtils';
import { TestProps } from '../../types';
import { Select, SelectProps } from '@navikt/ds-react';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

interface Props extends TestProps, Omit<SelectProps, 'onChange' | 'children'> {
label: React.ReactNode;
Expand Down Expand Up @@ -56,7 +57,12 @@ class CountrySelect extends React.Component<Props> {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { onChange, name, showOnlyEuAndEftaCountries, locale, ...restProps } = this.props;
return (
<Select name={name} {...restProps} onChange={(e) => onChange(e.target.value)} autoComplete="off">
<Select
name={name}
{...restProps}
{...inputPropsToRemove}
onChange={(e) => onChange(e.target.value)}
autoComplete="off">
<option value="" />
{this.getCountryOptions(locale || 'nb')}
</Select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { TestProps, TypedFormInputValidationProps } from '../../types';
import { getErrorPropForFormikInput } from '../../utils/typedFormErrorUtils';
import { TypedFormikFormContext } from '../typed-formik-form/TypedFormikForm';
import CountrySelect from './CountrySelect';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

interface OwnProps<FieldName> extends Omit<SelectProps, 'name' | 'children'> {
name: FieldName;
Expand All @@ -31,6 +32,7 @@ function FormikCountrySelect<FieldName, ErrorType>({
<CountrySelect
{...restProps}
{...field}
{...inputPropsToRemove}
data-testid={testKey}
error={getErrorPropForFormikInput({ field, form, context, error })}
onChange={(value) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { getErrorPropForFormikInput } from '../../utils/typedFormErrorUtils';
import { TypedFormikFormContext } from '../typed-formik-form/TypedFormikForm';
import DateInputAndPicker from './date-input-and-picker/DateInputAndPicker';
import { ISODateString } from './dateFormatUtils';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

export type DatepickerLimitations = {
minDate?: Date;
Expand Down Expand Up @@ -72,6 +73,7 @@ function FormikDatepicker<FieldName, ErrorType>({
value={field.value}
error={getErrorPropForFormikInput({ field, form, context, error })}
{...restProps}
{...inputPropsToRemove}
/>
);
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { FastField, Field, FieldProps } from 'formik';
import { TypedFormInputValidationProps, UseFastFieldProps } from '../../types';
import { getErrorPropForFormikInput } from '../../utils/typedFormErrorUtils';
import { TypedFormikFormContext } from '../typed-formik-form/TypedFormikForm';
import { inputPropsToRemove } from '../../utils/inputPropsToRemove';

interface OwnProps<FieldName> extends Omit<FieldsetProps, 'name'> {
name: FieldName;
Expand All @@ -29,6 +30,7 @@ function FormikInputGroup<ErrorType, FieldName>({
return (
<Fieldset
{...restProps}
{...inputPropsToRemove}
error={getErrorPropForFormikInput({ field, form, context, error })}
id={id}
tabIndex={id ? -1 : undefined}
Expand Down
Loading

0 comments on commit 582ba0c

Please sign in to comment.