From 8554f99e17f9cfbd99749d25ab8c398402ce9dd8 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Sat, 31 Aug 2019 21:16:54 -0300
Subject: [PATCH 1/4] Fix typo

---
 client/app/components/EditParameterSettingsDialog.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/components/EditParameterSettingsDialog.jsx b/client/app/components/EditParameterSettingsDialog.jsx
index f86d998bc8..fbae2eb71d 100644
--- a/client/app/components/EditParameterSettingsDialog.jsx
+++ b/client/app/components/EditParameterSettingsDialog.jsx
@@ -177,7 +177,7 @@ function EditParameterSettingsDialog(props) {
           </Select>
         </Form.Item>
         {param.type === 'enum' && (
-          <Form.Item label="Values" help="Dropdown list values (newline delimeted)" {...formItemProps}>
+          <Form.Item label="Values" help="Dropdown list values (newline delimited)" {...formItemProps}>
             <Input.TextArea
               rows={3}
               value={param.enumOptions}

From 77993eb996d950845e9c3e6bf03c244e053f1f78 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Sat, 31 Aug 2019 21:17:25 -0300
Subject: [PATCH 2/4] Add getPopupContainer to Dropdown parameters

---
 client/app/components/ParameterValueInput.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/app/components/ParameterValueInput.jsx b/client/app/components/ParameterValueInput.jsx
index 9d75fbb622..f1275a0210 100644
--- a/client/app/components/ParameterValueInput.jsx
+++ b/client/app/components/ParameterValueInput.jsx
@@ -43,6 +43,7 @@ class ParameterValueInput extends React.Component {
 
   constructor(props) {
     super(props);
+    this.parameterInputRef = React.createRef();
     this.state = {
       value: props.parameter.hasPendingValue ? props.parameter.pendingValue : props.value,
       isDirty: props.parameter.hasPendingValue,
@@ -112,6 +113,7 @@ class ParameterValueInput extends React.Component {
         showArrow
         style={{ minWidth: 60 }}
         notFoundContent={null}
+        getPopupContainer={() => this.parameterInputRef.current}
         {...multipleValuesProps}
       >
         {enumOptionsArray.map(option => (<Option key={option} value={option}>{ option }</Option>))}
@@ -132,6 +134,7 @@ class ParameterValueInput extends React.Component {
         queryId={queryId}
         onSelect={this.onSelect}
         style={{ minWidth: 60 }}
+        getPopupContainer={() => this.parameterInputRef.current}
         {...multipleValuesProps}
       />
     );
@@ -186,7 +189,7 @@ class ParameterValueInput extends React.Component {
     const { isDirty } = this.state;
 
     return (
-      <div className="parameter-input" data-dirty={isDirty || null}>
+      <div ref={this.parameterInputRef} className="parameter-input" data-dirty={isDirty || null}>
         {this.renderInput()}
       </div>
     );

From 1a512360267a97be5d9b2ecc9c47aa900b11070a Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Sun, 1 Sep 2019 20:24:40 -0300
Subject: [PATCH 3/4] Revert "Add getPopupContainer to Dropdown parameters"

This reverts commit 77993eb996d950845e9c3e6bf03c244e053f1f78.
---
 client/app/components/ParameterValueInput.jsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/app/components/ParameterValueInput.jsx b/client/app/components/ParameterValueInput.jsx
index f1275a0210..9d75fbb622 100644
--- a/client/app/components/ParameterValueInput.jsx
+++ b/client/app/components/ParameterValueInput.jsx
@@ -43,7 +43,6 @@ class ParameterValueInput extends React.Component {
 
   constructor(props) {
     super(props);
-    this.parameterInputRef = React.createRef();
     this.state = {
       value: props.parameter.hasPendingValue ? props.parameter.pendingValue : props.value,
       isDirty: props.parameter.hasPendingValue,
@@ -113,7 +112,6 @@ class ParameterValueInput extends React.Component {
         showArrow
         style={{ minWidth: 60 }}
         notFoundContent={null}
-        getPopupContainer={() => this.parameterInputRef.current}
         {...multipleValuesProps}
       >
         {enumOptionsArray.map(option => (<Option key={option} value={option}>{ option }</Option>))}
@@ -134,7 +132,6 @@ class ParameterValueInput extends React.Component {
         queryId={queryId}
         onSelect={this.onSelect}
         style={{ minWidth: 60 }}
-        getPopupContainer={() => this.parameterInputRef.current}
         {...multipleValuesProps}
       />
     );
@@ -189,7 +186,7 @@ class ParameterValueInput extends React.Component {
     const { isDirty } = this.state;
 
     return (
-      <div ref={this.parameterInputRef} className="parameter-input" data-dirty={isDirty || null}>
+      <div className="parameter-input" data-dirty={isDirty || null}>
         {this.renderInput()}
       </div>
     );

From 755cf3a3676014d90e8853d8be0d1cc95804052b Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Sun, 1 Sep 2019 20:26:42 -0300
Subject: [PATCH 4/4] Remove .ant-dropdown-in-bootstrap-modal

---
 client/app/assets/less/ant.less                    | 6 ------
 client/app/components/ParameterValueInput.jsx      | 1 -
 client/app/components/QueryBasedParameterInput.jsx | 1 -
 3 files changed, 8 deletions(-)

diff --git a/client/app/assets/less/ant.less b/client/app/assets/less/ant.less
index 5c35144b6c..4e9e88f70e 100644
--- a/client/app/assets/less/ant.less
+++ b/client/app/assets/less/ant.less
@@ -77,12 +77,6 @@
   }
 }
 
-// Fix for Ant dropdowns when they are used in Boootstrap modals
-// ANGULAR_REMOVE_ME Remove when all dialogs will be migrated to React (also search and remove usages)
-.ant-dropdown-in-bootstrap-modal {
-  z-index: 1050;
-}
-
 // Button overrides
 .@{btn-prefix-cls} {
   transition-duration: 150ms;
diff --git a/client/app/components/ParameterValueInput.jsx b/client/app/components/ParameterValueInput.jsx
index 9d75fbb622..49e206c3d0 100644
--- a/client/app/components/ParameterValueInput.jsx
+++ b/client/app/components/ParameterValueInput.jsx
@@ -107,7 +107,6 @@ class ParameterValueInput extends React.Component {
         value={value}
         onChange={this.onSelect}
         dropdownMatchSelectWidth={false}
-        dropdownClassName="ant-dropdown-in-bootstrap-modal"
         showSearch
         showArrow
         style={{ minWidth: 60 }}
diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx
index 7160e12be8..d55f5aa2b6 100644
--- a/client/app/components/QueryBasedParameterInput.jsx
+++ b/client/app/components/QueryBasedParameterInput.jsx
@@ -81,7 +81,6 @@ export class QueryBasedParameterInput extends React.Component {
           value={isArray(value) ? value : toString(value)}
           onChange={onSelect}
           dropdownMatchSelectWidth={false}
-          dropdownClassName="ant-dropdown-in-bootstrap-modal"
           optionFilterProp="children"
           showSearch
           showArrow