use passed field prop if getObject select returns null (#11562)

frontend/src/metabase/components/FieldValuesWidget.jsx

@@ -32,9 +32,10 @@ const mapDispatchToProps = {
 };
 
 function mapStateToProps(state, { field }) {
-  return {
-    field: field && Fields.selectors.getObject(state, { entityId: field.id }),
-  };
+  const selectedField =
+    field && Fields.selectors.getObject(state, { entityId: field.id });
+  // try and use the selected field, but fall back to the one passed
+  return { field: selectedField || field };
 }
 
 type Props = {

frontend/test/metabase/scenarios/custom_question.cy.spec.js

+import { signInAsAdmin } from "__support__/cypress";
+
+describe("custom question", () => {
+  beforeEach(signInAsAdmin);
+  it("should allow post-aggregation filters", () => {
+    // count orders by user id, filter to the one user with 46 orders
+    cy.visit("/question/new");
+    cy.contains("Custom question").click();
+    cy.contains("Sample Dataset").click();
+    cy.contains("Orders").click();
+    cy.contains("Pick the metric").click();
+    cy.contains("Count of rows").click();
+    cy.contains("Pick a column to group by").click();
+    cy.contains("User ID").click();
+    cy.get(".Icon-filter").click();
+    cy.get(".Icon-int").click();
+    cy.get(".PopoverBody input").type("46");
+    cy.get(".PopoverBody")
+      .contains("Add filter")
+      .click();
+    cy.contains("Visualize").click();
+    cy.contains("2372"); // user's id in the table
+    cy.contains("Showing 1 row"); // ensure only one user was returned
+  });
+});