feat(custom attributes): add "No value" option to optionset attributes

dhis2 · Oct 25, 2023 · 3010601 · 3010601
1 parent f3c2b32
commit 3010601
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/pages/dataElements/form/CustomAttributes.tsx b/src/pages/dataElements/form/CustomAttributes.tsx
@@ -1,3 +1,4 @@
+import i18n from '@dhis2/d2-i18n'
 import { InputFieldFF, SingleSelectFieldFF, TextAreaFieldFF } from '@dhis2/ui'
 import * as React from 'react'
 import { Field as FieldRFF } from 'react-final-form'
@@ -15,13 +16,18 @@ function CustomAttribute({ attribute, index }: CustomAttributeProps) {
     const name = `attributeValues[${index}].value`
 
     if (attribute.optionSet?.options) {
-        const options = attribute.optionSet?.options.map(
+        const attributeOptions = attribute.optionSet?.options.map(
             ({ code, displayName }) => ({
                 value: code,
                 label: displayName,
             })
         )
 
+        const options = [
+            { value: '', label: i18n.t('<No value>') },
+            ...(attributeOptions || []),
+        ]
+
         return (
             <StandardFormSection key={attribute.id}>
                 <FieldRFF