Merge pull request #7485 from metabase/fix_drillthrough_xrays

fix drill-through to automatic dashboards

frontend/src/metabase/lib/query.js

@@ -676,7 +676,7 @@ const Query = {
   },
 
   getFilterClauseDescription(tableMetadata, filter, options) {
-    if (filter[0] === "AND" || filter[0] === "OR") {
+    if (mbqlEq(filter[0], "AND") || mbqlEq(filter[0], "OR")) {
       let clauses = filter
         .slice(1)
         .map(f => Query.getFilterClauseDescription(tableMetadata, f, options));

frontend/src/metabase/qb/components/actions/GenerateDashboardAction.jsx

@@ -4,6 +4,7 @@ import type {
   ClickAction,
   ClickActionProps,
 } from "metabase/meta/types/Visualization";
+import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
 import { utf8_to_b64url } from "metabase/lib/card";
 import { t } from "c-3po";
 
@@ -11,6 +12,16 @@ export default ({ question, settings }: ClickActionProps): ClickAction[] => {
   // currently time series xrays require the maximum fidelity
   console.log(JSON.stringify(question.query().datasetQuery()));
   let dashboard_url = "adhoc";
+
+  const query = question.query();
+  if (!(query instanceof StructuredQuery)) {
+    return [];
+  }
+
+  // aggregations
+  if (query.aggregations().length) {
+    return [];
+  }
   if (question.card().id) {
     dashboard_url = `/auto/dashboard/question/${question.card().id}`;
   } else {

frontend/src/metabase/qb/components/drill/AutomaticDashboardDrill.jsx

@@ -15,11 +15,6 @@ export default ({ question, clicked }: ClickActionProps): ClickAction[] => {
     return [];
   }
 
-  // aggregations
-  if (query.aggregations().length) {
-    return [];
-  }
-
   // questions with a breakout
   const dimensions = (clicked && clicked.dimensions) || [];
   if (!clicked || dimensions.length === 0) {
@@ -39,7 +34,9 @@ export default ({ question, clicked }: ClickActionProps): ClickAction[] => {
         count,
       )}`,
       url: () => {
-        const filters = question
+        const filters = query
+          .clearFilters() // clear existing filters so we don't duplicate them
+          .question()
           .drillUnderlyingRecords(dimensions)
           .query()
           .filters();