From c9ef8156ca463d6795db4337a1251224f7416316 Mon Sep 17 00:00:00 2001 From: Frode Hansen Date: Mon, 6 Nov 2023 14:29:22 +0100 Subject: [PATCH 1/3] Feilfiks DateRangePicker min/max --- .../dateRangePickerUtils.ts | 20 +++++++++---------- .../FormikDateRangePicker.stories.tsx | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/sif-common-formik-ds/src/components/formik-date-range-picker/dateRangePickerUtils.ts b/packages/sif-common-formik-ds/src/components/formik-date-range-picker/dateRangePickerUtils.ts index 2a9b0e330a..5010c88747 100644 --- a/packages/sif-common-formik-ds/src/components/formik-date-range-picker/dateRangePickerUtils.ts +++ b/packages/sif-common-formik-ds/src/components/formik-date-range-picker/dateRangePickerUtils.ts @@ -29,19 +29,19 @@ export const getRangesEndingBeforeDate = (date: Date, dateRanges: DateRange[] = }; export const findClosestDateAfterDate = (fromDate: Date, dates: Date[]): Date | undefined => { - const dayjss = dates.map((d) => dayjs(d)).filter((m) => m.isAfter(fromDate, 'day')); - return dayjss.length > 0 ? dayjs.min(dayjss)!.toDate() : undefined; + const days = dates.map((d) => dayjs(d)).filter((m) => m.isAfter(fromDate, 'day')); + return days.length > 0 ? dayjs.min(days)!.toDate() : undefined; }; export const findClosestDateBeforeDate = (fromDate: Date, dates: Date[]): Date | undefined => { - const dayjss = dates.map((d) => dayjs(d)).filter((m) => m.isBefore(fromDate, 'day')); - const maxDate = dayjss.length > 0 ? dayjs.max(dayjss)!.toDate() : undefined; + const days = dates.map((d) => dayjs(d)).filter((m) => m.isBefore(fromDate, 'day')); + const maxDate = days.length > 0 ? dayjs.max(days)!.toDate() : undefined; return maxDate; }; export const findClosestDateBeforeOrEqualDate = (fromDate: Date, dates: Date[]): Date | undefined => { - const dayjss = dates.map((d) => dayjs(d)).filter((m) => m.isSameOrBefore(fromDate, 'day')); - const maxDate = dayjss.length > 0 ? dayjs.max(dayjss)!.toDate() : undefined; + const days = dates.map((d) => dayjs(d)).filter((m) => m.isSameOrBefore(fromDate, 'day')); + const maxDate = days.length > 0 ? dayjs.max(days)!.toDate() : undefined; return maxDate; }; @@ -82,13 +82,13 @@ export const getMaxDateForRangeStart = ({ return toDate || maxDate; } const follwingDateRange = getClosestDateRangeAfterDate(fromDate, dateRanges); - const followingRangeeDate = getFollowingDate(follwingDateRange, allowRangesToStartAndStopOnSameDate); + const followingRangeDate = getFollowingDate(follwingDateRange, allowRangesToStartAndStopOnSameDate); const dates: Date[] = [ ...(toDate ? [toDate] : []), ...(maxDate ? [maxDate] : []), - ...(followingRangeeDate ? [followingRangeeDate] : []), + ...(followingRangeDate ? [followingRangeDate] : []), ]; - return findClosestDateAfterDate(fromDate, dates); + return findClosestDateAfterDate(fromDate, dates) || maxDate; }; export const getMaxDateForRangeEnd = ({ fromDate, @@ -141,7 +141,7 @@ export const getMinDateForRangeStart = ({ const preceedingDate = getPreceedingDate(preceedingDateRange, allowRangesToStartAndStopOnSameDate); const dates: Date[] = [...(minDate ? [minDate] : []), ...(preceedingDate ? [preceedingDate] : [])]; - return findClosestDateBeforeDate(toDate, dates); + return findClosestDateBeforeDate(toDate, dates) || minDate; }; export const getMinDateForRangeEnd = ({ diff --git a/packages/sif-common-formik-ds/storybook/stories/components/FormikDateRangePicker.stories.tsx b/packages/sif-common-formik-ds/storybook/stories/components/FormikDateRangePicker.stories.tsx index 07078d3e21..68f7dd9182 100644 --- a/packages/sif-common-formik-ds/storybook/stories/components/FormikDateRangePicker.stories.tsx +++ b/packages/sif-common-formik-ds/storybook/stories/components/FormikDateRangePicker.stories.tsx @@ -27,8 +27,9 @@ const defaultProps: FormikDateRangePickerProps = { label: 'To', name: 'to', }, - minDate: new Date('2023-08-03'), - maxDate: new Date('2023-10-12'), + dropdownCaption: true, + minDate: new Date('2023-11-06'), + maxDate: new Date('2023-11-06'), }; Default.args = { From 1d7c508fb36313719c355d4cc43392d7fcc8f87e Mon Sep 17 00:00:00 2001 From: Frode Hansen Date: Mon, 6 Nov 2023 14:34:06 +0100 Subject: [PATCH 2/3] Changeset --- .changeset/orange-crews-yell.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/orange-crews-yell.md diff --git a/.changeset/orange-crews-yell.md b/.changeset/orange-crews-yell.md new file mode 100644 index 0000000000..037eb6a73d --- /dev/null +++ b/.changeset/orange-crews-yell.md @@ -0,0 +1,5 @@ +--- +'@navikt/sif-common-formik-ds': patch +--- + +Feilfiks når maks og min dato er på samme dag. Da ble undefined returnert, noe som igjen førte til at dropdownCaption ikke virket som forventet. Nå returneres alltid en min eller maks dato dersom dette er satt. From d32374bd3a3fdeb7c2cecd4c6402800bc1b329ec Mon Sep 17 00:00:00 2001 From: Frode Hansen Date: Mon, 6 Nov 2023 14:37:57 +0100 Subject: [PATCH 3/3] Oppdatere versjonsnumre for prodsetting --- .changeset/orange-crews-yell.md | 5 ----- .../CHANGELOG.md | 9 +++++++++ .../package.json | 2 +- apps/endringsmelding-pleiepenger/CHANGELOG.md | 10 ++++++++++ apps/endringsmelding-pleiepenger/package.json | 2 +- apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md | 10 ++++++++++ apps/omsorgsdager-aleneomsorg-dialog/package.json | 2 +- apps/omsorgspengerutbetaling-soknad/CHANGELOG.md | 10 ++++++++++ apps/omsorgspengerutbetaling-soknad/package.json | 2 +- apps/omsorgspengesoknad/CHANGELOG.md | 10 ++++++++++ apps/omsorgspengesoknad/package.json | 2 +- .../CHANGELOG.md | 11 +++++++++++ .../package.json | 2 +- apps/pleiepenger-sykt-barn/CHANGELOG.md | 10 ++++++++++ apps/pleiepenger-sykt-barn/package.json | 2 +- apps/sif-ettersending/CHANGELOG.md | 9 +++++++++ apps/sif-ettersending/package.json | 2 +- packages/sif-common-formik-ds/CHANGELOG.md | 6 ++++++ packages/sif-common-formik-ds/package.json | 2 +- packages/sif-common-ui/CHANGELOG.md | 8 ++++++++ packages/sif-common-ui/package.json | 2 +- 21 files changed, 103 insertions(+), 15 deletions(-) delete mode 100644 .changeset/orange-crews-yell.md diff --git a/.changeset/orange-crews-yell.md b/.changeset/orange-crews-yell.md deleted file mode 100644 index 037eb6a73d..0000000000 --- a/.changeset/orange-crews-yell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@navikt/sif-common-formik-ds': patch ---- - -Feilfiks når maks og min dato er på samme dag. Da ble undefined returnert, noe som igjen førte til at dropdownCaption ikke virket som forventet. Nå returneres alltid en min eller maks dato dersom dette er satt. diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md index 24372735f1..a841d84a35 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md @@ -1,5 +1,14 @@ # @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn +## 1.17.13 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-soknad-ds@10.7.8 + ## 1.17.12 ### Patch Changes diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json index 3cf456e0d5..07051b95af 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json @@ -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.17.12", + "version": "1.17.13", "repository": "https://github.com/navikt/sif-brukerdialog", "private": true, "type": "module", diff --git a/apps/endringsmelding-pleiepenger/CHANGELOG.md b/apps/endringsmelding-pleiepenger/CHANGELOG.md index 117f389286..b70ee0ab26 100644 --- a/apps/endringsmelding-pleiepenger/CHANGELOG.md +++ b/apps/endringsmelding-pleiepenger/CHANGELOG.md @@ -4,6 +4,16 @@ ### Patch Changes +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-forms-ds@8.10.0 + - @navikt/sif-common-soknad-ds@10.7.8 + +## 2.20.13 + +### Patch Changes + - cb7e6653: Oppdatere ds pakker etter at versjon 5.9.1 hadde feil. Fikset i v. 5.9.2 - Updated dependencies [5c44f78b] - Updated dependencies [5c44f78b] diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json index 9164cb83ba..71e5a4e65c 100644 --- a/apps/endringsmelding-pleiepenger/package.json +++ b/apps/endringsmelding-pleiepenger/package.json @@ -5,7 +5,7 @@ "license": "MIT", "name": "@navikt/endringsmelding-pleiepenger", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.20.12", + "version": "2.20.13", "private": true, "dependencies": { "@formatjs/intl-pluralrules": "5.2.7", diff --git a/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md b/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md index 9a3bf3b478..a53b18fdfe 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md +++ b/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/omsorgsdager-aleneomsorg-dialog +## 2.10.13 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-forms-ds@8.10.0 + - @navikt/sif-common-soknad-ds@10.7.8 + ## 2.10.12 ### Patch Changes diff --git a/apps/omsorgsdager-aleneomsorg-dialog/package.json b/apps/omsorgsdager-aleneomsorg-dialog/package.json index 284451b967..7e16f35cb9 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/package.json +++ b/apps/omsorgsdager-aleneomsorg-dialog/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgsdager-aleneomsorg-dialog", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.10.12", + "version": "2.10.13", "private": true, "type": "module", "scripts": { diff --git a/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md b/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md index f55b44d9da..ce85c1e701 100644 --- a/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md +++ b/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/omsorgspengerutbetaling-soknad +## 1.3.14 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-forms-ds@8.10.0 + - @navikt/sif-common-soknad-ds@10.7.8 + ## 1.3.13 ### Patch Changes diff --git a/apps/omsorgspengerutbetaling-soknad/package.json b/apps/omsorgspengerutbetaling-soknad/package.json index 19b561b483..51fd04d5f4 100644 --- a/apps/omsorgspengerutbetaling-soknad/package.json +++ b/apps/omsorgspengerutbetaling-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengerutbetaling-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.3.13", + "version": "1.3.14", "private": true, "type": "module", "dependencies": { diff --git a/apps/omsorgspengesoknad/CHANGELOG.md b/apps/omsorgspengesoknad/CHANGELOG.md index 30f1e1cf27..1ab422e35f 100644 --- a/apps/omsorgspengesoknad/CHANGELOG.md +++ b/apps/omsorgspengesoknad/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/omsorgspengesoknad +## 1.19.13 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-forms-ds@8.10.0 + - @navikt/sif-common-soknad-ds@10.7.8 + ## 1.19.12 ### Patch Changes diff --git a/apps/omsorgspengesoknad/package.json b/apps/omsorgspengesoknad/package.json index 97faabca5c..ba8e2a9e46 100644 --- a/apps/omsorgspengesoknad/package.json +++ b/apps/omsorgspengesoknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengesoknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.19.12", + "version": "1.19.13", "private": true, "type": "module", "dependencies": { diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md b/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md index 3ac773f9bf..263dba53b9 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md @@ -1,5 +1,16 @@ # @navikt/pleiepenger-i-livets-sluttfase-soknad +## 1.0.13 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-forms-ds@8.10.0 + - @navikt/sif-common-soknad-ds@10.7.8 + - @navikt/sif-common-ui@0.0.13 + ## 1.0.12 ### Patch Changes diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json index 8f7ac1fe96..62212f2194 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/pleiepenger-i-livets-sluttfase-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.0.12", + "version": "1.0.13", "private": true, "type": "module", "dependencies": { diff --git a/apps/pleiepenger-sykt-barn/CHANGELOG.md b/apps/pleiepenger-sykt-barn/CHANGELOG.md index 34a01181d1..212e76c73a 100644 --- a/apps/pleiepenger-sykt-barn/CHANGELOG.md +++ b/apps/pleiepenger-sykt-barn/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/pleiepenger-sykt-barn +## 3.1.2 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-forms-ds@8.10.0 + - @navikt/sif-common-soknad-ds@10.7.8 + ## 3.1.1 ### Patch Changes diff --git a/apps/pleiepenger-sykt-barn/package.json b/apps/pleiepenger-sykt-barn/package.json index db0c2e1734..46af034c93 100644 --- a/apps/pleiepenger-sykt-barn/package.json +++ b/apps/pleiepenger-sykt-barn/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/pleiepenger-sykt-barn", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "3.1.1", + "version": "3.1.2", "private": true, "type": "module", "scripts": { diff --git a/apps/sif-ettersending/CHANGELOG.md b/apps/sif-ettersending/CHANGELOG.md index 9e7a70f7d6..54ca6f2dcb 100644 --- a/apps/sif-ettersending/CHANGELOG.md +++ b/apps/sif-ettersending/CHANGELOG.md @@ -1,5 +1,14 @@ # @navikt/sif-ettersending +## 3.23.11 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + - @navikt/sif-common-soknad-ds@10.7.8 + ## 3.23.10 ### Patch Changes diff --git a/apps/sif-ettersending/package.json b/apps/sif-ettersending/package.json index eb68cbd145..a812331e69 100644 --- a/apps/sif-ettersending/package.json +++ b/apps/sif-ettersending/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/sif-ettersending", "repository": "https://github.com/navikt/sif-ettersending", - "version": "3.23.10", + "version": "3.23.11", "private": true, "type": "module", "dependencies": { diff --git a/packages/sif-common-formik-ds/CHANGELOG.md b/packages/sif-common-formik-ds/CHANGELOG.md index 27f93c42bf..27959d8e81 100644 --- a/packages/sif-common-formik-ds/CHANGELOG.md +++ b/packages/sif-common-formik-ds/CHANGELOG.md @@ -1,5 +1,11 @@ # @navikt/sif-common-formik-ds +## 1.1.5 + +### Patch Changes + +- 1d7c508f: Feilfiks når maks og min dato er på samme dag. Da ble undefined returnert, noe som igjen førte til at dropdownCaption ikke virket som forventet. Nå returneres alltid en min eller maks dato dersom dette er satt. + ## 1.1.4 ### Patch Changes diff --git a/packages/sif-common-formik-ds/package.json b/packages/sif-common-formik-ds/package.json index 09683d6a87..62726870b0 100644 --- a/packages/sif-common-formik-ds/package.json +++ b/packages/sif-common-formik-ds/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "name": "@navikt/sif-common-formik-ds", "types": "lib/index.d.js", - "version": "1.1.4", + "version": "1.1.5", "bugs": { "url": "https://github.com/navikt/sif-common-formik-ds/issues" }, diff --git a/packages/sif-common-ui/CHANGELOG.md b/packages/sif-common-ui/CHANGELOG.md index c019ecdc1f..afbedbfb87 100644 --- a/packages/sif-common-ui/CHANGELOG.md +++ b/packages/sif-common-ui/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/sif-common-ui +## 0.0.13 + +### Patch Changes + +- Updated dependencies [1d7c508f] + - @navikt/sif-common-formik-ds@1.1.5 + - @navikt/sif-common-core-ds@9.8.8 + ## 0.0.12 ### Patch Changes diff --git a/packages/sif-common-ui/package.json b/packages/sif-common-ui/package.json index 6f78c5bef2..9803b0b368 100644 --- a/packages/sif-common-ui/package.json +++ b/packages/sif-common-ui/package.json @@ -2,7 +2,7 @@ "name": "@navikt/sif-common-ui", "main": "src/index.ts", "types": "src/index.ts", - "version": "0.0.12", + "version": "0.0.13", "private": true, "dependencies": { "@navikt/ds-css": "5.9.2",