Fix: Multi-value Dropdown not available in Static Value edit dialog (#…

…4213)
getredash · Oct 5, 2019 · 648847d · 648847d
1 parent 3f31bf3
commit 648847d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/client/app/components/ParameterValueInput.jsx b/client/app/components/ParameterValueInput.jsx
@@ -25,7 +25,6 @@ class ParameterValueInput extends React.Component {
     enumOptions: PropTypes.string,
     queryId: PropTypes.number,
     parameter: PropTypes.any, // eslint-disable-line react/forbid-prop-types
-    allowMultipleValues: PropTypes.bool,
     onSelect: PropTypes.func,
     className: PropTypes.string,
   };
@@ -36,7 +35,6 @@ class ParameterValueInput extends React.Component {
     enumOptions: '',
     queryId: null,
     parameter: null,
-    allowMultipleValues: false,
     onSelect: () => {},
     className: '',
   };
@@ -95,13 +93,13 @@ class ParameterValueInput extends React.Component {
   }
 
   renderEnumInput() {
-    const { enumOptions, allowMultipleValues } = this.props;
+    const { enumOptions, parameter } = this.props;
     const { value } = this.state;
     const enumOptionsArray = enumOptions.split('\n').filter(v => v !== '');
     return (
       <Select
         className={this.props.className}
-        mode={allowMultipleValues ? 'multiple' : 'default'}
+        mode={parameter.multiValuesOptions ? 'multiple' : 'default'}
         optionFilterProp="children"
         disabled={enumOptionsArray.length === 0}
         value={value}
@@ -119,12 +117,12 @@ class ParameterValueInput extends React.Component {
   }
 
   renderQueryBasedInput() {
-    const { queryId, parameter, allowMultipleValues } = this.props;
+    const { queryId, parameter } = this.props;
     const { value } = this.state;
     return (
       <QueryBasedParameterInput
         className={this.props.className}
-        mode={allowMultipleValues ? 'multiple' : 'default'}
+        mode={parameter.multiValuesOptions ? 'multiple' : 'default'}
         optionFilterProp="children"
         parameter={parameter}
         value={value}

diff --git a/client/app/components/Parameters.jsx b/client/app/components/Parameters.jsx
@@ -145,7 +145,6 @@ export class Parameters extends React.Component {
           parameter={param}
           enumOptions={param.enumOptions}
           queryId={param.queryId}
-          allowMultipleValues={!!param.multiValuesOptions}
           onSelect={(value, isDirty) => this.setPendingValue(param, value, isDirty)}
         />
       </div>