[superset] branch master updated: fix: null exception from adhoc metric popover (#13955)

[yongjiezhao]

This is an automated email from the ASF dual-hosted git repository.

yongjiezhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b29789  fix: null exception from adhoc metric popover (#13955)
4b29789 is described below

commit 4b29789b643fcb9f1c7544be46ad7c6bca87b701
Author: Grace Guo <grace....@airbnb.com>
AuthorDate: Mon Apr 5 22:36:59 2021 -0700

    fix: null exception from adhoc metric popover (#13955)
---
 .../components/controls/MetricControl/AdhocMetricEditPopover.jsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx
 
b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx
index 4e314c4..0aa1c65 100644
--- 
a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx
+++ 
b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx
@@ -318,7 +318,7 @@ export default class AdhocMetricEditPopover extends 
React.PureComponent {
         option.filterBy.toLowerCase().indexOf(input.toLowerCase()) >= 0,
     };
 
-    if (this.props.datasourceType === 'druid') {
+    if (this.props.datasourceType === 'druid' && aggregateSelectProps.options) 
{
       aggregateSelectProps.options = aggregateSelectProps.options.filter(
         aggregate => aggregate !== 'AVG',
       );