From 3601b8f13d25786b4aacd03090116148b8d7f1de Mon Sep 17 00:00:00 2001 From: eirikhaugstulen Date: Tue, 9 Jan 2024 15:25:02 +0100 Subject: [PATCH] chore: update strings --- .../FormFieldPlugin/hooks/usePluginValues.js | 2 +- .../factory/enrollment/EnrollmentFactory.js | 7 +++++-- .../TrackedEntityType/TeiRegistrationFactory.js | 17 ++++++++--------- 3 files changed, 14 insertions(+), 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 index 3f07877c49..60b4074243 100644 --- 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/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/EnrollmentFactory.js b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/EnrollmentFactory.js index 0925106ab1..cc0e8831bd 100644 --- a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/EnrollmentFactory.js +++ b/src/core_modules/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/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/TeiRegistrationFactory.js b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/TeiRegistrationFactory.js index 0417371d9d..47cd14cfae 100644 --- a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/TeiRegistrationFactory.js +++ b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/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); } });