feat: [DHIS2-15462] Use dhis2 UI calendarinput component in forms #3658

alaa-yahia · 2024-05-30T08:46:52Z

Description

@dhis2/ui CalendarInput is used when capturing dates in forms.

simonadomnisoru

Hey @alaa-yahia, great job on this PR 👏 !

From capture-app side, I only added a small comment about hiding the default label. Additionally, can you please take a look and fix the failed cypress tests related to the calendar data-test selectors?

From the UI library side, these are the pending features that need to be added before merging this PR:

minimum and maximum support data - feat: support editable input | min & max dates | dd-mm-yyyy format in CalendarInput ui#1504
support for typing/removing a date - feat(calendar input): make input editable ui#1445
support for DD-MM-YYYY format - I couldn't find a ticket/PR for this. Let's sync up for the next step on this.

Thank you!

src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js

alaa-yahia · 2024-06-03T09:14:02Z

Hey @alaa-yahia, great job on this PR 👏 !

From capture-app side, I only added a small comment about hiding the default label. Additionally, can you please take a look and fix the failed cypress tests related to the calendar data-test selectors?

From the UI library side, these are the pending features that need to be added before merging this PR:

minimum and maximum support data - feat: support min & max dates in CalendarInput ui#1504

support for typing/removing a date - feat(calendar input): make input editable ui#1445

support for DD-MM-YYYY format - I couldn't find a ticket/PR for this. Let's sync up for the next step on this.

Thank you!

Hey,
All the three has work between the ui and multi calendar date library.
The one for editable input you mentioned is an old one.
This is the new one, I will update the name of the pull request when finalising it. I will add a ticket for DD-MM-YYYY, the functionality is already implemented in the multi calendar library pr.

minimum and maximum support data - feat: support min & max dates in CalendarInput ui#1504
support for typing/removing a date - feat: support min & max dates in CalendarInput ui#1504
support for DD-MM-YYYY format - support min & max date, DD-MM-YYYY date format

src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js

simonadomnisoru

Solid work, well done @alaa-yahia ! 👏
Let's move it to QA and then discuss in one of our Tuesday syncs if we want to release with alpha or wait for the @dhis/ui stable release.

superskip · 2024-08-15T13:40:33Z

Just one question regarding validation: The new calendar component is doing validation internally, which makes sense since it's supposed to support exotic calendar types. But as far as I can see the Capture app is still doing its own validation - is it possible to make it use the validation result from the new calendar component instead? I can't see how this can be achieved with the current interface though (https://ui.dhis2.nu/components/calendar#props), but maybe that document is outdated.

alaa-yahia · 2024-08-15T13:52:17Z

Just one question regarding validation: The new calendar component is doing validation internally, which makes sense since it's supposed to support exotic calendar types. But as far as I can see the Capture app is still doing it's own validation - is it possible to make it use the validation result from the new calendar component instead? I can't see how this can be achieved with the current interface though (https://ui.dhis2.nu/components/calendar#props), but maybe that document is outdated.

Yeah @superskip the document is outdated as I haven't worked on docs yet.
I think changing how validation is returned from useDatePicker would make it possible for parent components to receive validation results. Specifically passing validation result to the object passed to onDateSelect which calls the parent onDateSelect.

github-actions · 2024-08-15T22:48:36Z

🚀 Deployed on https://deploy-preview-3658.capture.netlify.dhis2.org

geethaalwan

Tested successfully on 2.42,2.41.2,2.40.5,2.39.7 versions

…ponent-in-forms

…s2-ui-calendarinput-component-in-forms

JoakimSM

We are very close now @alaa-yahia.

JoakimSM · 2024-11-21T14:16:55Z

...re_modules/capture-core/components/DataEntry/dataEntryField/internal/dataEntryField.utils.js


        if (result === true || (result && result.valid)) {
            return false;
        }

-        message = (result && result.message) || validatorContainer.message;
+        message = (result && result.errorMessage) || validatorContainer.message;


I see. After your comment and digging into it a bit more, I changed my opinion a bit. Let's keep what you did here for now, but I made a ticket for later: https://dhis2.atlassian.net/browse/DHIS2-18464

src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.js

JoakimSM · 2024-11-21T15:28:00Z

Also, we should probably validate after rules engine execution and when opening the form. But let's discuss this at the end after fixing the other stuff.

Like we talked about, made a separate ticket for this: https://dhis2.atlassian.net/browse/DHIS2-18468

…s2-ui-calendarinput-component-in-forms

…ponent-in-forms

src/core_modules/capture-core/components/D2Form/field/validators/getValidators.js

src/core_modules/capture-core/utils/validators/form/ageValidator.js

src/core_modules/capture-core/utils/validators/form/dateValidator.js

simonadomnisoru

Good job! 🎉

JoakimSM

Nice 🎉 Looks good to me now. Let's have QA redo the testing before merging.

geethaalwan

Tested successfully on 2.42,2.41.3,2.40.7,2.39.8 versions

# [101.19.0](v101.18.1...v101.19.0) (2024-12-03) ### Features * [DHIS2-15462] Use dhis2 UI calendarinput component in forms ([#3658](#3658)) ([f39fd47](f39fd47))

dhis2-bot · 2024-12-03T10:09:38Z

🎉 This PR is included in version 101.19.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

alaa-yahia requested a review from a team as a code owner May 30, 2024 08:46

alaa-yahia changed the title ~~Use dhis2 UI calendarinput component in forms~~ feat: [DHIS2-15462] Use dhis2 UI calendarinput component in forms May 30, 2024

simonadomnisoru reviewed Jun 3, 2024

View reviewed changes

src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js Show resolved Hide resolved

alaa-yahia added 5 commits August 12, 2024 01:09

feat: use calendarInput component in forms

b391af7

fix: add disabled to calendar input

aabaf48

fix: remove ref

04a48ed

fix: flow errors

e56314c

chore: update tests

ec8c228

alaa-yahia force-pushed the DHIS2-15462-use-dhis2-ui-calendarinput-component-in-forms branch from 8cd2340 to ec8c228 Compare August 12, 2024 02:02

alaa-yahia added 4 commits August 12, 2024 15:11

fix: failing tests

fe90a58

fix: failing tests

68c208a

fix: failing tests

350121b

fix: failing tests

4edac97

simonadomnisoru reviewed Aug 13, 2024

View reviewed changes

src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js Outdated Show resolved Hide resolved

src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js Outdated Show resolved Hide resolved

alaa-yahia added 2 commits August 15, 2024 14:23

chore: remove unnecessary props

d6b2084

fix: linter errors

727af38

simonadomnisoru approved these changes Aug 15, 2024

View reviewed changes

alaa-yahia added testing e2e-tests labels Aug 15, 2024

geethaalwan approved these changes Aug 26, 2024

View reviewed changes

feat: add error messages

e729996

simonadomnisoru self-requested a review October 10, 2024 08:37

alaa-yahia added 4 commits October 14, 2024 10:29

fix: date and datetime errors

807d2aa

Revert "feat: add error messages"

927607f

feat: add errors

f327235

Merge branch 'master' into DHIS2-15462-use-dhis2-ui-calendarinput-com…

4fca846

…ponent-in-forms

Merge remote-tracking branch 'origin/master' into DHIS2-15462-use-dhi…

d039205

…s2-ui-calendarinput-component-in-forms

JoakimSM reviewed Nov 21, 2024

View reviewed changes

alaa-yahia added 3 commits November 21, 2024 22:48

fix: always pass current context

2d09a3e

chore: update calendarInput ui version

a06618f

Merge remote-tracking branch 'origin/master' into DHIS2-15462-use-dhi…

fb6f0cf

…s2-ui-calendarinput-component-in-forms

alaa-yahia added testing and removed testing labels Nov 25, 2024

alaa-yahia and others added 3 commits November 25, 2024 14:46

Merge branch 'master' into DHIS2-15462-use-dhis2-ui-calendarinput-com…

c5c9de7

…ponent-in-forms

fix: update rules engine version

f47f123

chore: update lock file

ecde8c9

alaa-yahia added testing and removed testing labels Nov 25, 2024

simonadomnisoru reviewed Nov 26, 2024

View reviewed changes

fix: error when date is null result in runtime error

2fe76aa

alaa-yahia requested a review from JoakimSM November 26, 2024 14:36

fix: flow types missing

e2eef67

simonadomnisoru approved these changes Nov 27, 2024

View reviewed changes

JoakimSM approved these changes Nov 28, 2024

View reviewed changes

alaa-yahia added testing and removed testing labels Nov 28, 2024

fix: failing tests

3f644f0

alaa-yahia added testing and removed testing labels Dec 1, 2024

geethaalwan approved these changes Dec 2, 2024

View reviewed changes

alaa-yahia merged commit f39fd47 into master Dec 3, 2024
35 of 40 checks passed

alaa-yahia deleted the DHIS2-15462-use-dhis2-ui-calendarinput-component-in-forms branch December 3, 2024 10:01

dhis2-bot added a commit that referenced this pull request Dec 3, 2024

chore(release): cut 101.19.0 [skip release]

b0635a8

# [101.19.0](v101.18.1...v101.19.0) (2024-12-03) ### Features * [DHIS2-15462] Use dhis2 UI calendarinput component in forms ([#3658](#3658)) ([f39fd47](f39fd47))

dhis2-bot added the released label Dec 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: [DHIS2-15462] Use dhis2 UI calendarinput component in forms #3658

feat: [DHIS2-15462] Use dhis2 UI calendarinput component in forms #3658

alaa-yahia commented May 30, 2024 •

edited

Loading

simonadomnisoru left a comment •

edited

Loading

alaa-yahia commented Jun 3, 2024 •

edited

Loading

simonadomnisoru left a comment

superskip commented Aug 15, 2024 •

edited

Loading

alaa-yahia commented Aug 15, 2024

github-actions bot commented Aug 15, 2024 •

edited

Loading

geethaalwan left a comment

JoakimSM left a comment

JoakimSM Nov 21, 2024

JoakimSM commented Nov 21, 2024

simonadomnisoru left a comment

JoakimSM left a comment •

edited

Loading

geethaalwan left a comment

dhis2-bot commented Dec 3, 2024

feat: [DHIS2-15462] Use dhis2 UI calendarinput component in forms #3658

feat: [DHIS2-15462] Use dhis2 UI calendarinput component in forms #3658

Conversation

alaa-yahia commented May 30, 2024 • edited Loading

Description

simonadomnisoru left a comment • edited Loading

Choose a reason for hiding this comment

alaa-yahia commented Jun 3, 2024 • edited Loading

simonadomnisoru left a comment

Choose a reason for hiding this comment

superskip commented Aug 15, 2024 • edited Loading

alaa-yahia commented Aug 15, 2024

github-actions bot commented Aug 15, 2024 • edited Loading

geethaalwan left a comment

Choose a reason for hiding this comment

JoakimSM left a comment

Choose a reason for hiding this comment

JoakimSM Nov 21, 2024

Choose a reason for hiding this comment

JoakimSM commented Nov 21, 2024

simonadomnisoru left a comment

Choose a reason for hiding this comment

JoakimSM left a comment • edited Loading

Choose a reason for hiding this comment

geethaalwan left a comment

Choose a reason for hiding this comment

dhis2-bot commented Dec 3, 2024

alaa-yahia commented May 30, 2024 •

edited

Loading

simonadomnisoru left a comment •

edited

Loading

alaa-yahia commented Jun 3, 2024 •

edited

Loading

superskip commented Aug 15, 2024 •

edited

Loading

github-actions bot commented Aug 15, 2024 •

edited

Loading

JoakimSM left a comment •

edited

Loading