feat: [DHIS2-14775][DHIS2-14729] Render data entry plugins #3222

eirikhaugstulen · 2023-03-30T21:16:55Z

No description provided.

…earch

…uildFormMetadataOnDemand

…uildFormMetadataOnDemand # Conflicts: # src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.js # src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js

…ataOnDemand' into eh/feat/DHIS2-14729_RenderDataEntryPlugins # Conflicts: # package.json # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/buildFunctions/buildEnrollmentForm.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/buildFunctions/buildTrackedEntityTypeCollection.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.js # yarn.lock

…_RenderDataEntryPlugins # Conflicts: # package.json

eirikhaugstulen · 2023-04-18T13:51:00Z

Lockfile seems to not respond to the resolutions we set because we're running an alpha version of the app-platform

simonadomnisoru

Great job on this feature @eirikhaugstulen! I added a few small comments that I hope you can have a look at. Thanks!

simonadomnisoru · 2023-05-03T08:43:05Z

.../common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js

+    const { data: enrollment, isLoading, error } = useIndexedDBQuery(
+        ['enrollmentForm', program?.id],
+        () => buildEnrollmentForm({
+            // $FlowFixMe - Flow does not understand that the values are not null here


Hey, there are quite a few // $FlowFixMe in this file. Can anything be done to improve this?

simonadomnisoru · 2023-05-03T08:43:24Z

...es/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/EnrollmentFactory.js

@@ -129,8 +134,24 @@ export class EnrollmentFactory {
    ) {
        // $FlowFixMe
        await cachedProgramTrackedEntityAttributes.asyncForEach(async (trackedEntityAttribute) => {
-            const element = await this.dataElementFactory.build(trackedEntityAttribute);
-            element && section.addElement(element);
+            if (trackedEntityAttribute?.id === 'plugin') {


The string 'plugin' is used a couple of times across the PR. Does it make sense to move to a const in DataEntryPlugin.const.js ?

simonadomnisoru · 2023-05-03T08:43:57Z

...taMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/TeiRegistrationFactory.js

+                    if (trackedEntityAttribute?.id === 'plugin') {
+                        const element = new DataEntryPluginConfig((o) => {
+                            o.id = trackedEntityAttribute.id;
+                            o.name = trackedEntityAttribute.name;
+                            o.pluginSource = trackedEntityAttribute.pluginSource;
+                            o.fields = new Map();
+                        });
+
+                        await trackedEntityAttribute.fieldMap.asyncForEach(async (field) => {
+                            const dataElement = await this.dataElementFactory.build(field);
+                            dataElement && element.addField(field.IdFromPlugin, dataElement);
+                        });
+
+                        element && section.addElement(element);
+                    } else {
+                        const element = await this.dataElementFactory.build(trackedEntityAttribute);
+                        element && section.addElement(element);
+                    }


This is the same logic as in EnrollmentFactory.js. Can it be extracted to a commonplace and reused?

JoakimSM

Looks really good @eirikhaugstulen 👍 Let's have a chat tomorrow.

package.json

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

src/core_modules/capture-ui/FormBuilder/FormBuilder.component.js

src/core_modules/capture-core/components/D2Form/DataEntryPlugin/DataEntryPlugin.container.js

src/core_modules/capture-core/components/D2Form/DataEntryPlugin/DataEntryPlugin.types.js

simonadomnisoru · 2023-05-15T09:30:49Z

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

@@ -500,6 +531,31 @@ export class FormBuilder extends React.Component<Props> {
        }, []);
    }

+    renderPlugin = (
+        field: Object,


I believe the type can be improved to field: FieldConfig if field.props is checked for null or undefined below. WDYT? Thanks!

simonadomnisoru · 2023-05-15T09:31:09Z

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

+        const { id: fieldId } = fieldMetadata;
+        const { querySingleResource } = this.props;
+        const validators = getValidators(fieldMetadata, querySingleResource);
+        console.log('options', options);


Forgotten console?

simonadomnisoru · 2023-05-15T09:41:57Z

src/core_modules/capture-core/components/D2Form/FormFieldPlugin/hooks/usePluginMessages.js

+        }
+
+        return Object.entries(metadataByPluginId)
+            .reduce((acc, metadata) => {


Hey,
This function has high complexity. Does it make sense to split it into smaller pieces of code?
Thank you!

superskip

Just added a small comment on a detail, did not make a proper review.

superskip · 2023-06-16T17:32:36Z

package.json

+        "@dhis2/app-runtime": "^3.10.0-alpha.2",
+        "@dhis2/ui": "8.4.5",
+        "@dhis2/d2-i18n": "^1.1.0",
+        "@dhis2/cli-app-scripts": "^10.4.0-alpha.1",
+        "@babel/preset-react": "7.16.7",
+        "react-error-overlay": "6.0.9",
+        "react-scripts": "4.0.3",
+        "core-js": "2.5.7"


Just noticed that these entries should be sorted by alphabet

…_RenderDataEntryPlugins # Conflicts: # i18n/en.pot # package.json

eirikhaugstulen · 2023-06-26T13:09:05Z

We're reverting back to displaying an error message for now until the linked issues are merged into app-platform. Thanks for the reviews @simonadomnisoru & @JoakimSM. Should be fixed now. Will change back to plugin component in https://dhis2.atlassian.net/browse/DHIS2-15475.

…_RenderDataEntryPlugins # Conflicts: # i18n/en.pot # packages/rules-engine/src/rulesEngine.types.js # src/core_modules/capture-core/components/DataEntries/TeiRegistrationEntry/TeiRegistrationEntry.component.js

github-actions · 2023-07-03T13:28:48Z

🚀 Deployed on https://deploy-preview-3222--dhis2-capture.netlify.app

geethaalwan

Tested successfully on 2.41 ,2.40.1,2.39.4,2.38.5 versions

…_RenderDataEntryPlugins # Conflicts: # package.json # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/buildFunctions/buildEnrollmentForm.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/buildFunctions/buildTrackedEntityTypeCollection.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/index.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/useMetadataForRegistrationForm.js

dhis2-bot · 2023-07-24T12:08:11Z

🎉 This PR is included in version 100.35.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

eirikhaugstulen added 22 commits February 28, 2023 17:28

feat: build form metadata for registration page on demand

b258e20

fix: include program search groups in enrollment to allow duplicate s…

f3e53e7

…earch

fix: fully replace the existing metadata-hook

0f9f8cc

fix: build metadata form based on config

20e9666

fix: code cleanup

275827d

Merge remote-tracking branch 'origin/master' into eh/TECH/TECH-1506_B…

3847e51

…uildFormMetadataOnDemand

fix: review comments

99be369

fix: temp

5d81c3c

fix: render data entry plugins

113779b

fix: temporarily comment out flow

cdb9c2d

fix: PR-comments

9f0d7a3

fix: change handling of saveButtonText

2030bd1

fix: add a plugin context for data entry

3d65553

fix: add setContextFieldValue

ef90ffa

fix: yarn.lock

f1c631e

fix: yarn.lock

96b2c69

fix: corejs dependency error

942f17f

fix: add context values to the plugin values

40626e1

Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-14729…

e5ec9a1

…_RenderDataEntryPlugins # Conflicts: # package.json

chore: flow

3acd9b9

eirikhaugstulen marked this pull request as ready for review April 18, 2023 13:49

eirikhaugstulen requested a review from a team as a code owner April 18, 2023 13:49

simonadomnisoru reviewed May 3, 2023

View reviewed changes

JoakimSM reviewed May 4, 2023

View reviewed changes

JoakimSM reviewed May 5, 2023

View reviewed changes

src/core_modules/capture-core/components/D2Form/DataEntryPlugin/DataEntryPlugin.container.js Outdated Show resolved Hide resolved

src/core_modules/capture-core/components/D2Form/DataEntryPlugin/DataEntryPlugin.types.js Outdated Show resolved Hide resolved

eirikhaugstulen added 2 commits May 9, 2023 15:06

fix: build field validator on demand from plugin

09b13cd

fix: remove id from metadata

d20cdde

eirikhaugstulen added 2 commits May 12, 2023 19:29

feat: add attributes to TEAs

f1a7497

chore: PR-reviews

a69f067

simonadomnisoru reviewed May 15, 2023

View reviewed changes

eirikhaugstulen added 2 commits May 20, 2023 16:58

chore: add attributes to plugin objects

010c847

chore: refactor for-loop

1d71102

eirikhaugstulen changed the title ~~feat: [DHIS2-14729] Render data entry plugins~~ feat: [DHIS2-14775][DHIS2-14729] Render data entry plugins Jun 1, 2023

superskip reviewed Jun 16, 2023

View reviewed changes

eirikhaugstulen added 3 commits June 26, 2023 14:43

Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-14729…

706a1b5

…_RenderDataEntryPlugins # Conflicts: # i18n/en.pot # package.json

chore: revert plugin component

418cb86

fix: pr-reviews

43c3ce7

JoakimSM approved these changes Jun 27, 2023

View reviewed changes

eirikhaugstulen added 6 commits June 27, 2023 14:23

Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-14729…

11d5fec

…_RenderDataEntryPlugins # Conflicts: # i18n/en.pot # packages/rules-engine/src/rulesEngine.types.js # src/core_modules/capture-core/components/DataEntries/TeiRegistrationEntry/TeiRegistrationEntry.component.js

fix: flow

aea5052

fix: alpha package

9bf5fd3

fix: lockfile

12c25e3

fix: lockfile

6c46edf

fix: core-js resolution

fa7e0ce

eirikhaugstulen added the testing label Jul 3, 2023

geethaalwan approved these changes Jul 5, 2023

View reviewed changes

eirikhaugstulen added testing and removed testing labels Jul 23, 2023

eirikhaugstulen added testing and removed testing labels Jul 24, 2023

eirikhaugstulen merged commit 80a218e into master Jul 24, 2023
34 of 36 checks passed

eirikhaugstulen deleted the eh/feat/DHIS2-14729_RenderDataEntryPlugins branch July 24, 2023 11:57

dhis2-bot added the released label Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: [DHIS2-14775][DHIS2-14729] Render data entry plugins #3222

feat: [DHIS2-14775][DHIS2-14729] Render data entry plugins #3222

eirikhaugstulen commented Mar 30, 2023

eirikhaugstulen commented Apr 18, 2023

simonadomnisoru left a comment

simonadomnisoru May 3, 2023

simonadomnisoru May 3, 2023

simonadomnisoru May 3, 2023

JoakimSM left a comment

simonadomnisoru May 15, 2023

simonadomnisoru May 15, 2023

simonadomnisoru May 15, 2023

superskip left a comment

superskip Jun 16, 2023

eirikhaugstulen commented Jun 26, 2023

github-actions bot commented Jul 3, 2023 •

edited

Loading

geethaalwan left a comment •

edited

Loading

dhis2-bot commented Jul 24, 2023

feat: [DHIS2-14775][DHIS2-14729] Render data entry plugins #3222

feat: [DHIS2-14775][DHIS2-14729] Render data entry plugins #3222

Conversation

eirikhaugstulen commented Mar 30, 2023

eirikhaugstulen commented Apr 18, 2023

simonadomnisoru left a comment

Choose a reason for hiding this comment

simonadomnisoru May 3, 2023

Choose a reason for hiding this comment

simonadomnisoru May 3, 2023

Choose a reason for hiding this comment

simonadomnisoru May 3, 2023

Choose a reason for hiding this comment

JoakimSM left a comment

Choose a reason for hiding this comment

simonadomnisoru May 15, 2023

Choose a reason for hiding this comment

simonadomnisoru May 15, 2023

Choose a reason for hiding this comment

simonadomnisoru May 15, 2023

Choose a reason for hiding this comment

superskip left a comment

Choose a reason for hiding this comment

superskip Jun 16, 2023

Choose a reason for hiding this comment

eirikhaugstulen commented Jun 26, 2023

github-actions bot commented Jul 3, 2023 • edited Loading

geethaalwan left a comment • edited Loading

Choose a reason for hiding this comment

dhis2-bot commented Jul 24, 2023

github-actions bot commented Jul 3, 2023 •

edited

Loading

geethaalwan left a comment •

edited

Loading