Make it work for "extendedEnum" prop

getredash · Sep 24, 2019 · d40af5b · d40af5b
1 parent d807a85
commit d40af5b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/client/app/components/dynamic-form/dynamicFormHelper.js b/client/app/components/dynamic-form/dynamicFormHelper.js
@@ -72,7 +72,8 @@ function setDefaultValueToFields(configurationSchema, options = {}) {
     }
     // set default or first value when value has predefined options
     if (property.type === 'select') {
-      options[key] = includes(property.enum, property.default) ? property.default : property.enum[0];
+      const optionValues = map(property.options, option => option.value);
+      options[key] = includes(optionValues, property.default) ? property.default : optionValues[0];
     }
   });
 }

diff --git a/redash/query_runner/impala_ds.py b/redash/query_runner/impala_ds.py
@@ -48,7 +48,10 @@ def configuration_schema(cls):
                 },
                 "protocol": {
                     "type": "string",
-                    "enum": ["beeswax", "hiveserver2"],
+                    "extendedEnum": [
+                        {"value": "beeswax", "name": "Beeswax"},
+                        {"value": "hiveserver2", "name": "Hive Server 2"}
+                    ],
                     "title": "Protocol"
                 },
                 "database": {

diff --git a/redash/utils/configuration.py b/redash/utils/configuration.py
@@ -24,6 +24,11 @@ def __init__(self, config, schema=None):
         self.set_schema(schema)
 
     def set_schema(self, schema):
+        if isinstance(schema, dict):
+            for prop in schema.get('properties', {}).values():
+                if 'extendedEnum' in prop:
+                    prop['enum'] = map(lambda v : v['value'], prop['extendedEnum'])
+                    del prop['extendedEnum']
         self._schema = schema
 
     @property