refactor: move description out of identifiable

dhis2 · Feb 29, 2024 · cff43ba · cff43ba
1 parent 0991494
commit cff43ba
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/src/components/formFields/DefaultIdentifibleFIelds.tsx b/src/components/formFields/DefaultIdentifibleFIelds.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { useSchemaSectionHandleOrThrow } from '../../lib'
 import { StandardFormField } from '../standardForm'
 import { CodeField } from './CodeField'
-import { DescriptionField } from './DescriptionField'
 import { NameField } from './NameField'
 import { ShortNameField } from './ShortNameField'
 
@@ -22,10 +21,6 @@ export const DefaultIdentifiableFields = () => {
             <StandardFormField>
                 <CodeField schemaSection={schemaSection} />
             </StandardFormField>
-
-            <StandardFormField>
-                <DescriptionField schemaSection={schemaSection} />
-            </StandardFormField>
         </>
     )
 }
diff --git a/src/components/formFields/DescriptionField.tsx b/src/components/formFields/DescriptionField.tsx
@@ -14,10 +14,7 @@ export function DescriptionField({
     const validate = useCheckMaxLengthFromSchema(schemaSection.name, 'formName')
 
     const helpString =
-        helpText ||
-        i18n.t(
-            "Explain the purpose of this data element and how it's measured."
-        )
+        helpText || i18n.t("Explain the purpose of this and how it's measured.")
 
     return (
         <FieldRFF

diff --git a/src/pages/dataElementGroups/form/DataElementGroupFormFields.tsx b/src/pages/dataElementGroups/form/DataElementGroupFormFields.tsx
@@ -6,9 +6,15 @@ import {
     StandardFormSectionDescription,
     StandardFormField,
 } from '../../../components'
-import { DefaultIdentifiableFields } from '../../../components/formFields'
+import {
+    DefaultIdentifiableFields,
+    DescriptionField,
+} from '../../../components/formFields'
+import { SCHEMA_SECTIONS } from '../../../lib'
 import { DataElementsField } from '../fields'
 
+const schemaSection = SCHEMA_SECTIONS.dataElementGroup
+
 export function DataElementGroupFormFields() {
     return (
         <>
@@ -24,6 +30,15 @@ export function DataElementGroupFormFields() {
                 </StandardFormSectionDescription>
 
                 <DefaultIdentifiableFields />
+
+                <StandardFormField>
+                    <DescriptionField
+                        schemaSection={schemaSection}
+                        helpText={i18n.t(
+                            'Explain the purpose of this data element group.'
+                        )}
+                    />
+                </StandardFormField>
             </StandardFormSection>
 
             <StandardFormSection>

diff --git a/src/pages/dataElements/fields/FormNameField.tsx b/src/pages/dataElements/fields/FormNameField.tsx
@@ -3,11 +3,11 @@ import { InputFieldFF } from '@dhis2/ui'
 import React from 'react'
 import { Field as FieldRFF } from 'react-final-form'
 import { useCheckMaxLengthFromSchema } from '../../../lib'
-import type { SchemaName } from '../../../types'
+import { SchemaName } from '../../../types'
 
 export function FormNameField() {
     const validate = useCheckMaxLengthFromSchema(
-        'dataElement' as SchemaName,
+        SchemaName.dataElement,
         'formName'
     )
 
@@ -17,7 +17,7 @@ export function FormNameField() {
             dataTest="dataelementsformfields-formname"
             inputWidth="400px"
             name="formName"
-            label={i18n.t('StandardForm name')}
+            label={i18n.t('Form name')}
             helpText={i18n.t(
                 'An alternative name used in section or automatic data entry forms.'
             )}

diff --git a/src/pages/dataElements/form/DataElementFormFields.tsx b/src/pages/dataElements/form/DataElementFormFields.tsx
@@ -60,7 +60,12 @@ export function DataElementFormFields() {
                 </StandardFormField>
 
                 <StandardFormField>
-                    <DescriptionField schemaSection={schemaSection} />
+                    <DescriptionField
+                        helpText={i18n.t(
+                            'Explain the purpose of this data element.'
+                        )}
+                        schemaSection={schemaSection}
+                    />
                 </StandardFormField>
 
                 <StandardFormField>