bugfix: enum options coming from the layout field were not rendering …

…due to being a string array instead of a label/value pair
nasa · Mar 7, 2024 · c515b32 · c515b32
1 parent f383f18
commit c515b32
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/packages/app/components/jsonschemaform/widgets/MultiSelectWidget.tsx b/packages/app/components/jsonschemaform/widgets/MultiSelectWidget.tsx
@@ -14,6 +14,18 @@ function optionHasValue(option) {
     return option != ''
 }
 
+function getEnumOptionsAsLabelValue(
+    enumOptions: string[] | { label: string; value: string }[]
+) {
+    return (
+        enumOptions
+            ?.filter(optionHasValue)
+            .map(option =>
+                typeof option === 'string' ? { label: option, value: option } : option
+            ) ?? []
+    )
+}
+
 function MultiSelectWidget(props: WidgetProps) {
     const {
         id,
@@ -35,7 +47,7 @@ function MultiSelectWidget(props: WidgetProps) {
 
         let tagifyOptions = {
             mode: !props.multiple ? 'select' : null,
-            whitelist: options.enumOptions?.filter(optionHasValue) ?? [],
+            whitelist: getEnumOptionsAsLabelValue(options.enumOptions),
             enforceWhitelist:
                 'enforceEnumOptions' in options ? options.enforceEnumOptions : true,
             keepInvalidTags:
@@ -66,7 +78,7 @@ function MultiSelectWidget(props: WidgetProps) {
     useEffect(() => {
         if (!tagify) return
 
-        tagify.settings.whitelist = options.enumOptions?.filter(optionHasValue) ?? []
+        tagify.settings.whitelist = getEnumOptionsAsLabelValue(options.enumOptions)
     }, [tagify, options.enum, options.enumOptions])
 
     let filteredValue = value && typeof value === 'string' ? [value] : value