show the right filter text when clicking a fk link from object view (#15469)

frontend/src/metabase/query_builder/actions.js

@@ -29,6 +29,7 @@ import { isPK } from "metabase/lib/types";
 import Utils from "metabase/lib/utils";
 import { defer } from "metabase/lib/promise";
 import Question from "metabase-lib/lib/Question";
+import { FieldDimension } from "metabase-lib/lib/Dimension";
 import { cardIsEquivalent, cardQueryIsEquivalent } from "metabase/meta/Card";
 
 import {
@@ -1180,9 +1181,10 @@ export const followForeignKey = createThunkAction(FOLLOW_FOREIGN_KEY, fk => {
     const newCard = startNewCard("query", card.dataset_query.database);
 
     newCard.dataset_query.query["source-table"] = fk.origin.table.id;
+    const field = new FieldDimension(fk.origin.id);
     newCard.dataset_query.query.filter = [
       "and",
-      ["=", fk.origin.id, originValue],
+      ["=", field.mbql(), originValue],
     ];
 
     // run it

frontend/test/metabase/scenarios/visualizations/object_detail.cy.spec.js

@@ -20,6 +20,17 @@ describe("scenarios > visualizations > object detail", () => {
       .contains("8");
   });
 
+  it("should show the correct filter when clicking through on a fk", () => {
+    cy.visit("/browse/1");
+    cy.findByText("Products").click();
+    cy.findByText("1").click();
+    cy.findByText("Orders")
+      .parent()
+      .findByText("93")
+      .click();
+    cy.findByText("Product ID is 1");
+  });
+
   it("should allow clicking the next arrow", () => {
     cy.visit("/browse/1");
     cy.findByText("Products").click();