The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Dashboard category filter not correctly populated when using multiple datasources in one graph (#69318)
Denis Berezinb57eb0d2c76c
diff --git a/e2e/test/scenarios/dashboard-filters/dashboard-filters-sql-text-category.cy.spec.js b/e2e/test/scenarios/dashboard-filters/dashboard-filters-sql-text-category.cy.spec.jsindex e50179f26c6..33219811a80 100644--- a/e2e/test/scenarios/dashboard-filters/dashboard-filters-sql-text-category.cy.spec.js+++ b/e2e/test/scenarios/dashboard-filters/dashboard-filters-sql-text-category.cy.spec.js@@ -1,4 +1,5 @@-const { H } = cy;+import { SAMPLE_DB_ID } from "e2e/support/cypress_data";+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import { applyFilterByType } from "../native-filters/helpers/e2e-field-filter-helpers";@@ -7,6 +8,9 @@ import {questionDetails,} from "./shared/dashboard-filters-sql-text-category";+const { H } = cy;+const { PRODUCTS } = SAMPLE_DATABASE;+describe("scenarios > dashboard > filters > SQL > text/category", () => {beforeEach(() => {cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(@@ -178,3 +182,121 @@ describe("scenarios > dashboard > filters > SQL > text and multiple values", ()setFilterAndVerify({ values: ["Gadget", "Widget"] });});});++describe("issue 68998", { tags: "@external" }, () => {+ const sqlQueryDetails = `SELECT+ PRODUCTS.CATEGORY,+ SUM(TOTAL) AS TOTAL+FROM ORDERS+LEFT JOIN PRODUCTS on ORDERS.PRODUCT_ID = PRODUCTS.ID+WHERE {{field}}+GROUP BY PRODUCTS.CATEGORY`;+ const PG_DB_ID = 2;++ beforeEach(() => {+ H.restore("postgres-12");+ cy.signInAsAdmin();++ // We update Postgres DB content to make sure dashcard with multiple datasets return values from both DBs+ // Otherwise we cannot tell the difference since sample data is identical+ H.queryQADB(+ "UPDATE PRODUCTS SET CATEGORY = 'New Category' where CATEGORY = 'Doohickey';",+ );++ cy.intercept("POST", "/api/card/*/query").as("cardQuery");+ });++ afterEach(() => {+ H.queryQADB(+ "UPDATE PRODUCTS SET CATEGORY = 'Doohickey' where CATEGORY = 'New Category';",+ );+ });++ it("should show all available category options for combined dataset (metabase#68998)", () => {+ H.createNativeQuestion({+ name: "SQL- Postgres",+ native: {+ query: sqlQueryDetails,+ "template-tags": {+ field: {+ "widget-type": "string/=",+ name: "field",+ "display-name": "Field",+ id: "3db026c4-5ec6-4568-9a40-eb704bac2bde",+ type: "dimension",+ dimension: ["field", 1552, null], // 1552 - Products.Category+ },+ },+ },+ database: PG_DB_ID,+ });++ H.createNativeQuestionAndDashboard({+ questionDetails: {+ name: "SQL",+ native: {+ query: sqlQueryDetails,+ "template-tags": {+ field: {+ "widget-type": "string/=",+ name: "field",+ "display-name": "Field",+ id: "c9c52a9c-ae2b-40d6-a8ee-581a529685ce",+ type: "dimension",+ dimension: ["field", PRODUCTS.CATEGORY, null],+ },+ },+ },+ database: SAMPLE_DB_ID,+ },+ dashboardDetails: {+ name: "Issue 68998",+ },+ }).then(({ dashboardId }) => {+ return cy.visit(`/dashboard/${dashboardId}`);+ });++ H.editDashboard();++ H.showDashcardVisualizerModal(0, { isVisualizerCard: false });++ H.modal().within(() => {+ H.switchToAddMoreData();+ H.selectDataset("SQL- Postgres");+ H.switchToColumnsList();++ cy.findByText("Add more data").should("exist");+ cy.findByText("New Category").should("exist");+ cy.findByTestId("visualization-canvas")+ .findByText("SQL- Postgres")+ .should("exist");+ });+ H.saveDashcardVisualizerModal();++ H.setFilter("Text or Category", "Is");++ H.getDashboardCard(0)+ .findByTestId("parameter-mapper-container")+ .within(() => {+ cy.findAllByRole("button").eq(0).click();+ });++ H.popover().findByText("Field").click();++ H.getDashboardCard(0)+ .findByTestId("parameter-mapper-container")+ .within(() => {+ cy.findAllByRole("button").eq(2).click();+ });++ H.popover().findByText("Field").click();++ H.dashboardParametersDoneButton().click();+ H.saveDashboard();++ H.filterWidget().click();+ H.dashboardParametersPopover().within(() => {+ cy.findByText("New Category").should("exist");+ });+ });+});diff --git a/src/metabase/parameters/params.clj b/src/metabase/parameters/params.cljindex 18fd0b7907b..5ab81a84788 100644--- a/src/metabase/parameters/params.clj+++ b/src/metabase/parameters/params.clj@@ -274,15 +274,29 @@(ensure-filterable-columns-for-card card stage-number)(field-id-from-dashcards-filterable-columns param-dashcard-info stage-number))))))+(defn- find-card-for-mapping+ "Find the card that a parameter mapping refers to. Looks up the card by `:card_id` from both+ the primary card and series cards on the dashcard, falling back to the primary card."+ [dashcard mapping]+ (let [card (if-let [card-id (:card_id mapping)]+ (or (m/find-first #(= (:id %) card-id)+ (cons (:card dashcard) (:series dashcard)))+ (:card dashcard))+ (:card dashcard))]+ (cond-> card+ (string? (:type card)) (update :type keyword)+ (seq (:dataset_query card)) (update :dataset_query lib-be/normalize-query))))+(mu/defn dashcards->param-id->field-ids* :- [:map-of ::lib.schema.parameter/id [:set ::lib.schema.id/field]]"Return map of parameter ids to mapped field ids."[dashcards](letfn [(dashcard->param-dashcard-info [dashcard](for [mapping (:parameter_mappings dashcard)]- {:dashcard dashcard- :param-mapping mapping- :param-target-field-id (when (:target mapping)- (param-target->field-id (:target mapping) (:card dashcard)))}))]+ (let [card (find-card-for-mapping dashcard mapping)]+ {:dashcard dashcard+ :param-mapping mapping+ :param-target-field-id (when (:target mapping)+ (param-target->field-id (:target mapping) card))})))](transduce (mapcat dashcard->param-dashcard-info)field-id-into-context-rfdashcards)))@@ -309,11 +323,12 @@"Return field ids mapped to the parameter. `dashcard` and `card` must be present for each mapping."[{:keys [mappings]} :- ::parameters.schema/parameter](let [param-id->field-ids (transduce (map (fn [mapping]- {:dashcard (:dashcard mapping)- :param-mapping mapping- :param-target-field-id (param-target->field-id- (:target mapping)- (get-in mapping [:dashcard :card]))}))+ (let [card (find-card-for-mapping (:dashcard mapping) mapping)]+ {:dashcard (:dashcard mapping)+ :param-mapping mapping+ :param-target-field-id (param-target->field-id+ (:target mapping)+ card)})))field-id-into-context-rfmappings)](into #{} cat (vals param-id->field-ids))))@@ -342,7 +357,7 @@dashcards->param-id->field-idsparam-field-ids->fields)](assoc dashboard k param-fields)))- (t2/hydrate dashboards [:dashcards :card])))+ (t2/hydrate dashboards [:dashcards :card :series])));;; +----------------------------------------------------------------------------------------------------------------+;;; | CARD-SPECIFIC |