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
Reproduce 23103 using Jest instead of e2e (#80237)
Nemanja Glumacee92e5d470b2
diff --git a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts b/e2e/test/scenarios/models/reproductions-1.cy.spec.tsindex 6138375e2f7..6d0c5aa094e 100644--- a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts+++ b/e2e/test/scenarios/models/reproductions-1.cy.spec.ts@@ -197,45 +197,6 @@ describe("issues 25884 and 34349", () => {});});-describe("issue 23103", () => {- beforeEach(() => {- H.restore();- cy.signInAsAdmin();- cy.intercept("PUT", "/api/card/*").as("updateModel");- });-- it("shows correct number of distinct values (metabase#23103)", () => {- H.createNativeQuestion(- {- type: "model",- native: {- query: "select * from products limit 5",- },- },- { visitQuestion: true },- );-- H.openQuestionActions();- H.popover().findByText("Edit metadata").click();- H.waitForLoaderToBeRemoved();-- cy.findAllByTestId("header-cell").contains("CATEGORY").click();- cy.findAllByTestId("select-button").contains("None").click();- H.popover().within(() => {- cy.findByText("Products").click();- cy.findByText("Category").click();- });-- cy.button("Save changes").click();- cy.wait("@updateModel");- cy.button("Saving…").should("not.exist");-- cy.findAllByTestId("header-cell").contains("Category").trigger("mouseover");-- H.hovercard().findByText("4 distinct values").should("exist");- });-});-describe("issue 41785, issue 46756", () => {beforeEach(() => {H.restore();diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsxindex 401ab8cf09d..5cbc3deb0d9 100644--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx@@ -1,23 +1,30 @@+import { createMockMetadata } from "__support__/metadata";import {setupFieldEndpoints,+ setupFieldValuesEndpoint,setupFieldsValuesEndpoints,} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";-import { renderWithProviders, screen } from "__support__/ui";+import { renderWithProviders, screen, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";import { columnFinder } from "metabase-lib/test-helpers";-import type { FieldFingerprint } from "metabase-types/api";+import type { FieldFingerprint, FieldReference } from "metabase-types/api";import {+ createMockCard,createMockDateTimeFieldFingerprint,+ createMockField,createMockFingerprint,createMockGlobalFieldFingerprint,+ createMockNativeDatasetQuery,createMockNumberFieldFingerprint,} from "metabase-types/api/mocks";import {+ PRODUCTS,PRODUCTS_ID,+ PRODUCT_CATEGORY_VALUES,SAMPLE_DB_ID,createSampleDatabase,} from "metabase-types/api/mocks/presets";@@ -107,6 +114,78 @@ const setup = ({ columnName, fingerprint, timezone }: SetupOpts) => {);};+const MODEL_ID = 1;++const UNMAPPED_FIELD_REF: FieldReference = [+ "field",+ "CATEGORY",+ { "base-type": "type/Text" },+];++interface SetupNativeModelOpts {+ mappedToField: boolean;+}++const setupNativeModel = ({ mappedToField }: SetupNativeModelOpts) => {+ const database = createSampleDatabase();+ database.tables?.forEach((table) =>+ table.fields?.forEach((field) => setupFieldEndpoints(field)),+ );+ setupFieldValuesEndpoint(PRODUCT_CATEGORY_VALUES);++ const card = createMockCard({+ id: MODEL_ID,+ type: "model",+ dataset_query: createMockNativeDatasetQuery({+ database: SAMPLE_DB_ID,+ native: { query: "select * from products limit 5" },+ }),+ result_metadata: [+ createMockField({+ name: "CATEGORY",+ display_name: "Category",+ base_type: "type/Text",+ effective_type: "type/Text",+ semantic_type: "type/Category",+ // the model returns 5 rows, so its own metadata only sees 3 categories+ fingerprint: createMockFingerprint({+ global: createMockGlobalFieldFingerprint({ "distinct-count": 3 }),+ }),+ ...(mappedToField+ ? { id: PRODUCTS.CATEGORY, table_id: PRODUCTS_ID }+ : { id: UNMAPPED_FIELD_REF }),+ field_ref: mappedToField+ ? ["field", PRODUCTS.CATEGORY, { "base-type": "type/Text" }]+ : UNMAPPED_FIELD_REF,+ }),+ ],+ });++ const metadata = createMockMetadata({+ databases: [database],+ questions: [card],+ });+ const provider = Lib.metadataProvider(SAMPLE_DB_ID, metadata);+ const cardMetadata = checkNotNull(+ Lib.tableOrCardMetadata(provider, `card__${MODEL_ID}`),+ );+ const query = Lib.queryFromTableOrCardMetadata(provider, cardMetadata);+ const findColumn = columnFinder(+ query,+ Lib.returnedColumns(query, STAGE_INDEX),+ );++ renderWithProviders(+ <div data-testid="container">+ <QueryColumnFingerprintInfo+ query={query}+ stageIndex={STAGE_INDEX}+ column={findColumn(null, "CATEGORY")}+ />+ </div>,+ );+};+describe("QueryColumnFingerprintInfo", () => {describe("numeric column", () => {it("should render avg, min and max for a non-ID numeric column", () => {@@ -221,4 +300,21 @@ describe("QueryColumnFingerprintInfo", () => {expect(screen.getByTestId("container")).toBeEmptyDOMElement();});});++ describe("native model column", () => {+ it("should use the mapped field's distinct count rather than the model's own (metabase#23103)", async () => {+ setupNativeModel({ mappedToField: true });++ expect(await screen.findByText("4 distinct values")).toBeInTheDocument();+ expect(screen.queryByText("3 distinct values")).not.toBeInTheDocument();+ });++ it("should render nothing when the column is not mapped to a field", async () => {+ setupNativeModel({ mappedToField: false });++ await waitFor(() =>+ expect(screen.getByTestId("container")).toBeEmptyDOMElement(),+ );+ });+ });});