chore: update strings

dhis2 · Jan 11, 2024 · 3601b8f · 3601b8f
1 parent e1e6b1f
commit 3601b8f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/core_modules/capture-core/components/D2Form/FormFieldPlugin/hooks/usePluginValues.js b/src/core_modules/capture-core/components/D2Form/FormFieldPlugin/hooks/usePluginValues.js
@@ -6,7 +6,7 @@ import type { MetadataByPluginId, PluginContext } from '../FormFieldPlugin.types
 export const usePluginValues = (
     formId: string,
     metadataByPluginId: MetadataByPluginId,
-    pluginContext: PluginContext,
+    pluginContext: PluginContext = {},
 ) => {
     const formValuesRedux = useSelector(({ formsValues }) => formsValues[formId]);
 

diff --git a/...capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/EnrollmentFactory.js b/...capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/EnrollmentFactory.js
@@ -20,6 +20,9 @@ import { transformTrackerNode } from '../transformNodeFuntions/transformNodeFunc
 import { FormFieldPluginConfig } from '../../../../metaData/FormFieldPluginConfig';
 import type { DataEntryFormConfig } from '../../../../components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/types';
 import { FormFieldTypes } from '../../../../components/D2Form/FormFieldPlugin/FormFieldPlugin.const';
+import {
+    FieldElementObjectTypes,
+} from '../../../../components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm';
 
 export class EnrollmentFactory {
     static errorMessages = {
@@ -139,7 +142,7 @@ export class EnrollmentFactory {
         await cachedProgramTrackedEntityAttributes.asyncForEach(async (trackedEntityAttribute) => {
             if (trackedEntityAttribute?.type === FormFieldTypes.PLUGIN) {
                 const attributes = trackedEntityAttribute.fieldMap
-                    .filter(attributeField => attributeField.objectType === 'Attribute')
+                    .filter(attributeField => attributeField.objectType === FieldElementObjectTypes.ATTRIBUTE)
                     .reduce((acc, attribute) => {
                         acc[attribute.IdFromApp] = attribute;
                         return acc;
@@ -154,7 +157,7 @@ export class EnrollmentFactory {
                 });
 
                 await trackedEntityAttribute.fieldMap.asyncForEach(async (field) => {
-                    if (field.objectType && field.objectType === 'dataElement') {
+                    if (field.objectType && field.objectType === FieldElementObjectTypes.TRACKED_ENTITY_ATTRIBUTE) {
                         const fieldElement = await this.dataElementFactory.build(field, section);
                         if (!fieldElement) return;
 

diff --git a/...emoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/TeiRegistrationFactory.js b/...emoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/TeiRegistrationFactory.js
@@ -20,7 +20,6 @@ import type { ConstructorInput } from './teiRegistrationFactory.types';
 import { FormFieldPluginConfig } from '../../../../metaData/FormFieldPluginConfig';
 import type { DataEntryFormConfig } from '../../../../components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/types';
 import { FormFieldTypes } from '../../../../components/D2Form/FormFieldPlugin/FormFieldPlugin.const';
-import { formatPluginConfig } from '../../../../components/D2Form/FormFieldPlugin/formatPluginConfig';
 import {
     FieldElementObjectTypes,
 } from '../../../../components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm';
@@ -123,27 +122,27 @@ export class TeiRegistrationFactory {
 
                 await fieldElements.asyncForEach(async (trackedEntityAttribute) => {
                     if (trackedEntityAttribute?.type === FormFieldTypes.PLUGIN) {
+                        const attributes = trackedEntityAttribute.fieldMap
+                            .filter(attributeField => attributeField.objectType === 'Attribute')
+                            .reduce((acc, attribute) => {
+                                acc[attribute.IdFromApp] = attribute;
+                                return acc;
+                            }, {});
                         const element = new FormFieldPluginConfig((o) => {
                             o.id = trackedEntityAttribute.id;
                             o.name = trackedEntityAttribute.name;
                             o.pluginSource = trackedEntityAttribute.pluginSource;
                             o.fields = new Map();
+                            o.customAttributes = attributes;
                         });
 
-                        const attributes = trackedEntityAttribute.fieldMap
-                            .filter(attributeField => attributeField.objectType === 'Attribute')
-                            .reduce((acc, attribute) => {
-                                acc[attribute.IdFromApp] = attribute;
-                                return acc;
-                            }, {});
 
                         await trackedEntityAttribute.fieldMap.asyncForEach(async (field) => {
                             if (field.objectType === FieldElementObjectTypes.TRACKED_ENTITY_ATTRIBUTE) {
                                 const dataElement = await this.dataElementFactory.build(field);
                                 if (!dataElement) return;
 
-                                const fieldMetadata = formatPluginConfig(dataElement, { attributes });
-                                element.addField(field.IdFromPlugin, fieldMetadata);
+                                element.addField(field.IdFromPlugin, dataElement);
                             }
                         });