From c6dec430e958c08588168336081dadcd3b8fe61d Mon Sep 17 00:00:00 2001
From: Rafael Wendel <rafawendel2010@gmail.com>
Date: Tue, 24 Nov 2020 02:01:03 -0300
Subject: [PATCH 1/2] a bit of unhurting typecasting

---
 client/app/pages/queries/QuerySource.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/pages/queries/QuerySource.jsx b/client/app/pages/queries/QuerySource.jsx
index 1486c02784..014892a933 100644
--- a/client/app/pages/queries/QuerySource.jsx
+++ b/client/app/pages/queries/QuerySource.jsx
@@ -213,7 +213,7 @@ function QuerySource(props) {
                 <DynamicComponent
                   name={"QuerySourceDropdown"}
                   dataSources={dataSources}
-                  value={dataSource ? dataSource.id : undefined}
+                  value={dataSource ? String(dataSource.id) : undefined}
                   disabled={!queryFlags.canEdit || !dataSourcesLoaded || dataSources.length === 0}
                   loading={!dataSourcesLoaded}
                   onChange={handleDataSourceChange}

From ad7cbbbeb94e0eba990c89b252e99e8070e75771 Mon Sep 17 00:00:00 2001
From: Rafael Wendel <rafawendel2010@gmail.com>
Date: Tue, 24 Nov 2020 09:51:31 -0300
Subject: [PATCH 2/2] fixed approach

---
 client/app/pages/queries/QuerySource.jsx                        | 2 +-
 client/app/pages/queries/components/QuerySourceDropdown.jsx     | 2 +-
 client/app/pages/queries/components/QuerySourceDropdownItem.jsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/app/pages/queries/QuerySource.jsx b/client/app/pages/queries/QuerySource.jsx
index 014892a933..1486c02784 100644
--- a/client/app/pages/queries/QuerySource.jsx
+++ b/client/app/pages/queries/QuerySource.jsx
@@ -213,7 +213,7 @@ function QuerySource(props) {
                 <DynamicComponent
                   name={"QuerySourceDropdown"}
                   dataSources={dataSources}
-                  value={dataSource ? String(dataSource.id) : undefined}
+                  value={dataSource ? dataSource.id : undefined}
                   disabled={!queryFlags.canEdit || !dataSourcesLoaded || dataSources.length === 0}
                   loading={!dataSourcesLoaded}
                   onChange={handleDataSourceChange}
diff --git a/client/app/pages/queries/components/QuerySourceDropdown.jsx b/client/app/pages/queries/components/QuerySourceDropdown.jsx
index 2cdb54a016..aed1aa0220 100644
--- a/client/app/pages/queries/components/QuerySourceDropdown.jsx
+++ b/client/app/pages/queries/components/QuerySourceDropdown.jsx
@@ -29,7 +29,7 @@ export function QuerySourceDropdown(props) {
 
 QuerySourceDropdown.propTypes = {
   dataSources: PropTypes.any,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   disabled: PropTypes.bool,
   loading: PropTypes.bool,
   onChange: PropTypes.func,
diff --git a/client/app/pages/queries/components/QuerySourceDropdownItem.jsx b/client/app/pages/queries/components/QuerySourceDropdownItem.jsx
index e15186dc9f..38e976f5f9 100644
--- a/client/app/pages/queries/components/QuerySourceDropdownItem.jsx
+++ b/client/app/pages/queries/components/QuerySourceDropdownItem.jsx
@@ -15,7 +15,7 @@ export function QuerySourceDropdownItem({ dataSource, children }) {
 QuerySourceDropdownItem.propTypes = {
   dataSource: PropTypes.shape({
     name: PropTypes.string,
-    id: PropTypes.string,
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     type: PropTypes.string,
   }).isRequired,
   children: PropTypes.element,