fix(searchable single selects): use old-app default labels

dhis2 · Oct 25, 2023 · 7e5c907 · 7e5c907
1 parent 32f7e20
commit 7e5c907
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/components/metadataFormControls/CategoryComboSelect/useOptionsQuery.ts b/src/components/metadataFormControls/CategoryComboSelect/useOptionsQuery.ts
@@ -64,9 +64,7 @@ export function useOptionsQuery() {
                         value: id,
                         // This should be distinguishable from other selects
                         // where "none" means no selection
-                        label: isDefault
-                            ? i18n.t('Default (none)')
-                            : displayName,
+                        label: isDefault ? i18n.t('None') : displayName,
                     }
                 }) || []),
             ])

diff --git a/src/components/metadataFormControls/ModelSingleSelect/ModelSingleSelect.tsx b/src/components/metadataFormControls/ModelSingleSelect/ModelSingleSelect.tsx
@@ -38,7 +38,11 @@ function computeDisplayOptions({
             : options
 
     if (!required) {
-        return [{ value: '', label: i18n.t('None') }, ...withSelectedOption]
+        // This default value has been copied from the old app
+        return [
+            { value: '', label: i18n.t('<No value>') },
+            ...withSelectedOption,
+        ]
     }
 
     return withSelectedOption