Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-2768 GDGT-2769 remove deprecated TableColumnFingerprintInfo and TableColumnInfo (#78519)

Egor Grushin0374e1244c83
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/ColumnFingerprintInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/ColumnFingerprintInfo.unit.spec.tsx
deleted file mode 100644
index bf49fad88eb..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/ColumnFingerprintInfo.unit.spec.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
-import { getMetadata } from "metabase/selectors/metadata";
-import type Field from "metabase-lib/v1/metadata/Field";
-import {
- PRODUCTS,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { TableColumnFingerprintInfo } from "./ColumnFingerprintInfo";
-
-const state = createMockState({
- entities: createMockEntitiesState({
- databases: [createSampleDatabase()],
- }),
-});
-const metadata = getMetadata(state);
-
-function setup(field: Field, timezone?: string) {
- return renderWithProviders(
- <div data-testid="container">
- <TableColumnFingerprintInfo field={field} timezone={timezone} />
- </div>,
- { storeInitialState: state },
- );
-}
-
-describe("FieldFingerprintInfo", () => {
- const dateField = metadata.field(PRODUCTS.CREATED_AT)!;
-
- describe("without fingerprint", () => {
- const field = dateField.clone();
-
- delete field.fingerprint;
-
- it("should render nothing", () => {
- setup(field);
- expect(screen.getByTestId("container")).toBeEmptyDOMElement();
- });
- });
-
- describe("Date field", () => {
- describe("without type/DateTime fingerprint", () => {
- const field = dateField.clone();
- field.fingerprint = { type: {} };
-
- it("should render nothing", () => {
- setup(field);
- expect(screen.getByTestId("container")).toBeEmptyDOMElement();
- });
- });
-
- describe("with type/DateTime fingerprint", () => {
- const field = dateField.clone();
- field.fingerprint = {
- type: {
- "type/DateTime": {
- earliest: "2021-11-09T04:43:33.667Z",
- latest: "2021-12-09T04:43:33.667Z",
- },
- },
- };
- const timezone = "America/Los_Angeles";
-
- it("should show the timezone of the field", () => {
- setup(field, timezone);
- expect(screen.getByText("America/Los_Angeles")).toBeVisible();
- });
-
- it("should render formatted earliest time", () => {
- setup(field, timezone);
- expect(screen.getByText("November 9, 2021, 4:43 AM")).toBeVisible();
- });
-
- it("should render formatted latest time", () => {
- setup(field, timezone);
- expect(screen.getByText("December 9, 2021, 4:43 AM")).toBeVisible();
- });
- });
- });
-
- describe("Number field", () => {
- const numberField = metadata.field(PRODUCTS.RATING)!.clone();
-
- numberField.semantic_type = null;
-
- describe("without type/Number fingerprint", () => {
- const field = numberField.clone();
- field.fingerprint = { type: {} };
-
- it("should render nothing", () => {
- setup(field);
- expect(screen.getByTestId("container")).toBeEmptyDOMElement();
- });
- });
-
- describe("with type/Number fingerprint", () => {
- const field = numberField.clone();
- field.fingerprint = {
- type: {
- "type/Number": {
- avg: 3.33333,
- min: 1,
- max: 5,
- },
- },
- };
-
- it("should render avg", () => {
- setup(field);
- expect(screen.getByText("3.33")).toBeVisible();
- });
-
- it("should render min", () => {
- setup(field);
- expect(screen.getByText("1")).toBeVisible();
- });
-
- it("should render max", () => {
- setup(field);
- expect(screen.getByText("5")).toBeVisible();
- });
- });
-
- describe("with empty type/Number fingerprint", () => {
- const field = numberField.clone();
- field.fingerprint = {
- type: {
- "type/Number": {},
- },
- };
-
- it("should render nothing", () => {
- setup(field);
- expect(screen.getByTestId("container")).toBeEmptyDOMElement();
- });
- });
-
- describe("with missing type/Number property", () => {
- const field = numberField.clone();
- field.fingerprint = {
- type: {
- "type/Number": {
- min: 1,
- max: 5,
- },
- },
- };
-
- it("should not render anything for the avg", () => {
- setup(field);
- expect(screen.queryByText("Average")).not.toBeInTheDocument();
- });
-
- it("should still render min and max", () => {
- setup(field);
- expect(screen.getByText("1")).toBeVisible();
- expect(screen.getByText("5")).toBeVisible();
- });
- });
- });
-
- describe("Other field types", () => {
- const idField = metadata.field(PRODUCTS.ID)!;
- const field = idField.clone();
- field.fingerprint = {
- global: {
- "distinct-count": 123,
- },
- type: {},
- };
-
- it("should render nothing", () => {
- setup(field);
- expect(screen.getByTestId("container")).toBeEmptyDOMElement();
- });
- });
-});
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/index.ts b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/index.ts
deleted file mode 100644
index 5e51ea46c98..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ColumnFingerprintInfo";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.unit.spec.tsx
deleted file mode 100644
index 2e10ecb503e..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.unit.spec.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { setupFieldsValuesEndpoints } from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
-import { getMetadata } from "metabase/selectors/metadata";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- SAMPLE_PROVIDER,
- columnFinder,
-} from "metabase-lib/test-helpers";
-import type Field from "metabase-lib/v1/metadata/Field";
-import {
- PRODUCTS,
- PRODUCT_CATEGORY_VALUES,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { QueryColumnInfo, TableColumnInfo } from "./ColumnInfo";
-
-const state = createMockState({
- entities: createMockEntitiesState({
- databases: [createSampleDatabase()],
- }),
-});
-
-const metadata = getMetadata(state);
-
-function setup(field: Field) {
- setupFieldsValuesEndpoints([PRODUCT_CATEGORY_VALUES]);
- return renderWithProviders(<TableColumnInfo field={field} />, {
- storeInitialState: state,
- });
-}
-
-function setupLib(table: string, column: string) {
- const query = Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);
- const columns = Lib.visibleColumns(query, 0);
- const findColumn = columnFinder(query, columns);
- const col = findColumn(table, column);
-
- return renderWithProviders(
- <QueryColumnInfo query={query} stageIndex={-1} column={col} />,
- );
-}
-
-describe("FieldInfo", () => {
- const categoryField = metadata.field(PRODUCTS.CATEGORY)!;
- const createdAtField = metadata.field(PRODUCTS.CREATED_AT)!;
-
- it("should show the given dimension's semantic type name", async () => {
- setup(categoryField);
-
- expect(await screen.findByText("Category")).toBeInTheDocument();
- });
-
- it("should display the given dimension's description", async () => {
- setup(categoryField);
-
- expect(
- await screen.findByText(categoryField.description!),
- ).toBeInTheDocument();
- });
-
- it("should show a placeholder for a dimension with no description", () => {
- setup(createdAtField);
-
- expect(screen.getByText("No description")).toBeInTheDocument();
- });
-});
-
-describe("FieldInfo (Lib)", () => {
- it("should show the given dimension's semantic type name", async () => {
- setupLib("PRODUCTS", "CATEGORY");
-
- expect(await screen.findByText("Category")).toBeInTheDocument();
- });
-
- it("should display the given dimension's description", async () => {
- setupLib("PRODUCTS", "CATEGORY");
-
- expect(await screen.findByText("The type of product.")).toBeInTheDocument();
- });
-
- it("should show a placeholder for a dimension with no description", () => {
- setupLib("PRODUCTS", "CREATED_AT");
-
- expect(screen.getByText("No description")).toBeInTheDocument();
- });
-});
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/index.ts b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/index.ts
deleted file mode 100644
index d9c93bc3303..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { QueryColumnInfo, TableColumnInfo } from "./ColumnInfo";
-export type { QueryColumnInfoProps, TableColumnInfoProps } from "./ColumnInfo";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx
deleted file mode 100644
index 4b0488c87b4..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { t } from "ttag";
-
-import { getColumnIcon } from "metabase/common/utils/columns";
-import type { ColorName } from "metabase/ui/colors/types";
-import type { IconName } from "metabase-types/api";
-
-import type {
- QueryColumnInfoPopoverProps,
- TableColumnInfoPopoverProps,
-} from "../ColumnInfoPopover";
-import {
- QueryColumnInfoPopover,
- TableColumnInfoPopover,
-} from "../ColumnInfoPopover";
-import {
- HoverParent,
- PopoverDefaultIcon,
- PopoverHoverTarget,
-} from "../InfoIcon";
-
-export { HoverParent };
-
-type QueryColumnInfoIconProps = QueryColumnInfoPopoverProps & {
- size?: number;
- icon?: IconName;
- color?: ColorName;
-};
-
-export function QueryColumnInfoIcon({
- className,
- size,
- icon,
- color,
- ...props
-}: QueryColumnInfoIconProps) {
- const { column } = props;
-
- return (
- <>
- <QueryColumnInfoPopover {...props}>
- <span aria-label={t`More info`}>
- <PopoverDefaultIcon
- className={className}
- name={icon ?? getColumnIcon(column)}
- size={size}
- c={color}
- />
- <PopoverHoverTarget className={className} name="info" size={size} />
- </span>
- </QueryColumnInfoPopover>
- </>
- );
-}
-
-QueryColumnInfoIcon.HoverParent = HoverParent;
-
-type TableColumnInfoIconProps = TableColumnInfoPopoverProps & {
- icon: IconName;
- size?: number;
- color?: ColorName;
-};
-
-export function TableColumnInfoIcon({
- className,
- field,
- icon,
- size,
- color,
- ...props
-}: TableColumnInfoIconProps) {
- return (
- <TableColumnInfoPopover {...props} field={field}>
- <span aria-label={t`More info`}>
- <PopoverDefaultIcon
- className={className}
- name={icon}
- size={size}
- c={color}
- />
- <PopoverHoverTarget className={className} name="info" size={size} />
- </span>
- </TableColumnInfoPopover>
- );
-}
-
-TableColumnInfoIcon.HoverParent = HoverParent;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/index.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/index.tsx
deleted file mode 100644
index 5a1d346ece9..00000000000
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ColumnInfoIcon";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoPopover/ColumnInfoPopover.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoPopover/ColumnInfoPopover.tsx
index 560ed4690a3..b731d92ffa5 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoPopover/ColumnInfoPopover.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoPopover/ColumnInfoPopover.tsx
@@ -1,7 +1,7 @@
-import type { QueryColumnInfoProps, TableColumnInfoProps } from "../ColumnInfo";
-import { QueryColumnInfo, TableColumnInfo } from "../ColumnInfo";
import type { PopoverProps } from "../Popover";
import { Popover } from "../Popover";
+import type { QueryColumnInfoProps } from "../QueryColumnInfo";
+import { QueryColumnInfo } from "../QueryColumnInfo";
export type QueryColumnInfoPopoverProps = QueryColumnInfoProps &
Omit<PopoverProps, "content">;
@@ -24,25 +24,3 @@ export function QueryColumnInfoPopover({
</Popover>
);
}
-
-export type TableColumnInfoPopoverProps = TableColumnInfoProps &
- Omit<PopoverProps, "content">;
-
-export function TableColumnInfoPopover({
- position,
- disabled,
- openDelay,
- children,
- ...rest
-}: TableColumnInfoPopoverProps) {
- return (
- <Popover
- position={position}
- disabled={disabled}
- openDelay={openDelay}
- content={<TableColumnInfo {...rest} />}
- >
- {children}
- </Popover>
- );
-}
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/DateTimeFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/DateTimeFingerprint.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.styled.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.styled.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/NumberFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/NumberFingerprint.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/NumberFingerprint.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/NumberFingerprint.unit.spec.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/NumberFingerprint.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/ColumnFingerprintInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.tsx
similarity index 52%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/ColumnFingerprintInfo.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.tsx
index 883cea1d5e6..ba301a4cf63 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/ColumnFingerprintInfo.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.tsx
@@ -1,7 +1,4 @@
import * as Lib from "metabase-lib";
-import type Field from "metabase-lib/v1/metadata/Field";
-import { isDate, isID, isNumber } from "metabase-lib/v1/types/utils/isa";
-import type { Field as ApiField, DatasetColumn } from "metabase-types/api";
import { DateTimeFingerprint } from "./DateTimeFingerprint";
import { GlobalFingerprint } from "./GlobalFingerprint";
@@ -13,47 +10,6 @@ type BaseProps = {
showAllFieldValues?: boolean;
};
-type TableColumnFingerprintInfoProps = BaseProps & {
- field: Field | DatasetColumn | ApiField;
-};
-
-/**
- * @deprecated - Use QueryColumnFingerprintInfo instead.
- */
-export function TableColumnFingerprintInfo({
- className,
- timezone,
- field,
- showAllFieldValues,
-}: TableColumnFingerprintInfoProps) {
- if (isDate(field)) {
- return (
- <DateTimeFingerprint
- className={className}
- fingerprintTypeInfo={field.fingerprint?.type?.["type/DateTime"]}
- timezone={timezone}
- />
- );
- } else if (isNumber(field) && !isID(field)) {
- return (
- <NumberFingerprint
- className={className}
- fingerprintTypeInfo={field.fingerprint?.type?.["type/Number"]}
- />
- );
- } else if (typeof field.id === "number") {
- return (
- <GlobalFingerprint
- className={className}
- fieldId={field.id}
- showAllFieldValues={showAllFieldValues}
- />
- );
- }
-
- return null;
-}
-
type QueryColumnFingerprintInfoProps = BaseProps & {
query: Lib.Query;
stageIndex: number;
@@ -79,7 +35,7 @@ export function QueryColumnFingerprintInfo({
timezone={timezone}
/>
);
- } else if (Lib.isNumeric(column)) {
+ } else if (Lib.isNumeric(column) && !Lib.isID(column)) {
return (
<NumberFingerprint
className={className}
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.tsx
new file mode 100644
index 00000000000..104ca12488e
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
@@ -0,0 +1,217 @@
+import { setupFieldsValuesEndpoints } from "__support__/server-mocks";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, screen } 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 {
+ createMockDateTimeFieldFingerprint,
+ createMockFingerprint,
+ createMockGlobalFieldFingerprint,
+ createMockNumberFieldFingerprint,
+} from "metabase-types/api/mocks";
+import {
+ PRODUCTS_ID,
+ SAMPLE_DB_ID,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
+
+import { QueryColumnFingerprintInfo } from "./QueryColumnFingerprintInfo";
+
+const STAGE_INDEX = -1;
+
+const NUMBER_FINGERPRINT = createMockFingerprint({
+ type: {
+ "type/Number": createMockNumberFieldFingerprint({
+ avg: 3.33333,
+ min: 1,
+ max: 5,
+ }),
+ },
+});
+
+const DATE_TIME_FINGERPRINT = createMockFingerprint({
+ type: {
+ "type/DateTime": createMockDateTimeFieldFingerprint({
+ earliest: "2021-11-09T04:43:33.667Z",
+ latest: "2021-12-09T04:43:33.667Z",
+ }),
+ },
+});
+
+const EMPTY_FINGERPRINT = createMockFingerprint({ type: {} });
+
+const TIMEZONE = "America/Los_Angeles";
+
+interface SetupOpts {
+ columnName: string;
+ fingerprint?: FieldFingerprint | null;
+ timezone?: string;
+}
+
+const setup = ({ columnName, fingerprint, timezone }: SetupOpts) => {
+ setupFieldsValuesEndpoints([]);
+
+ const sampleDatabase = createSampleDatabase();
+ const state = createMockState({
+ entities: createMockEntitiesState({
+ databases: [
+ {
+ ...sampleDatabase,
+ tables: sampleDatabase.tables?.map((table) =>
+ table.id === PRODUCTS_ID
+ ? {
+ ...table,
+ fields: table.fields?.map((field) =>
+ field.name === columnName && fingerprint !== undefined
+ ? { ...field, fingerprint }
+ : field,
+ ),
+ }
+ : table,
+ ),
+ },
+ ],
+ }),
+ });
+
+ const provider = Lib.metadataProvider(SAMPLE_DB_ID, getMetadata(state));
+ const tableMetadata = Lib.tableOrCardMetadata(provider, PRODUCTS_ID);
+ const query = Lib.queryFromTableOrCardMetadata(
+ provider,
+ checkNotNull(tableMetadata),
+ );
+ const findColumn = columnFinder(
+ query,
+ Lib.returnedColumns(query, STAGE_INDEX),
+ );
+
+ renderWithProviders(
+ <div data-testid="container">
+ <QueryColumnFingerprintInfo
+ query={query}
+ stageIndex={STAGE_INDEX}
+ column={findColumn("PRODUCTS", columnName)}
+ timezone={timezone}
+ />
+ </div>,
+ { storeInitialState: state },
+ );
+};
+
+describe("QueryColumnFingerprintInfo", () => {
+ describe("numeric column", () => {
+ it("should render avg, min and max for a non-ID numeric column", () => {
+ setup({ columnName: "RATING", fingerprint: NUMBER_FINGERPRINT });
+
+ expect(screen.getByText("Average")).toBeInTheDocument();
+ expect(screen.getByText("Min")).toBeInTheDocument();
+ expect(screen.getByText("Max")).toBeInTheDocument();
+ expect(screen.getByText("3.33")).toBeInTheDocument();
+ expect(screen.getByText("1")).toBeInTheDocument();
+ expect(screen.getByText("5")).toBeInTheDocument();
+ });
+
+ it("should render min and max when avg is missing", () => {
+ setup({
+ columnName: "RATING",
+ fingerprint: createMockFingerprint({
+ type: { "type/Number": { min: 1, max: 5 } },
+ }),
+ });
+
+ expect(screen.queryByText("Average")).not.toBeInTheDocument();
+ expect(screen.getByText("1")).toBeInTheDocument();
+ expect(screen.getByText("5")).toBeInTheDocument();
+ });
+
+ it("should render nothing without a type/Number fingerprint", () => {
+ setup({ columnName: "RATING", fingerprint: EMPTY_FINGERPRINT });
+
+ expect(screen.getByTestId("container")).toBeEmptyDOMElement();
+ });
+
+ it("should render nothing for an empty type/Number fingerprint", () => {
+ setup({
+ columnName: "RATING",
+ fingerprint: createMockFingerprint({ type: { "type/Number": {} } }),
+ });
+
+ expect(screen.getByTestId("container")).toBeEmptyDOMElement();
+ });
+
+ it("should render nothing without a fingerprint", () => {
+ setup({ columnName: "RATING", fingerprint: null });
+
+ expect(screen.getByTestId("container")).toBeEmptyDOMElement();
+ });
+ });
+
+ describe("temporal column", () => {
+ it("should show the timezone of the column", () => {
+ setup({
+ columnName: "CREATED_AT",
+ fingerprint: DATE_TIME_FINGERPRINT,
+ timezone: TIMEZONE,
+ });
+
+ expect(screen.getByText(TIMEZONE)).toBeVisible();
+ });
+
+ it("should render formatted earliest time", () => {
+ setup({
+ columnName: "CREATED_AT",
+ fingerprint: DATE_TIME_FINGERPRINT,
+ timezone: TIMEZONE,
+ });
+
+ expect(screen.getByText("November 9, 2021, 4:43 AM")).toBeVisible();
+ });
+
+ it("should render formatted latest time", () => {
+ setup({
+ columnName: "CREATED_AT",
+ fingerprint: DATE_TIME_FINGERPRINT,
+ timezone: TIMEZONE,
+ });
+
+ expect(screen.getByText("December 9, 2021, 4:43 AM")).toBeVisible();
+ });
+
+ it("should render nothing without a type/DateTime fingerprint", () => {
+ setup({ columnName: "CREATED_AT", fingerprint: EMPTY_FINGERPRINT });
+
+ expect(screen.getByTestId("container")).toBeEmptyDOMElement();
+ });
+
+ it("should render nothing without a fingerprint", () => {
+ setup({ columnName: "CREATED_AT", fingerprint: null });
+
+ expect(screen.getByTestId("container")).toBeEmptyDOMElement();
+ });
+ });
+
+ describe("ID column", () => {
+ it("should render the distinct count instead of the number fingerprint", () => {
+ setup({
+ columnName: "ID",
+ fingerprint: createMockFingerprint({
+ ...NUMBER_FINGERPRINT,
+ global: createMockGlobalFieldFingerprint({ "distinct-count": 123 }),
+ }),
+ });
+
+ expect(screen.getByText("123 distinct values")).toBeInTheDocument();
+ expect(screen.queryByText("Average")).not.toBeInTheDocument();
+ });
+
+ it("should render nothing without a fingerprint", () => {
+ setup({ columnName: "ID", fingerprint: null });
+
+ expect(screen.getByTestId("container")).toBeEmptyDOMElement();
+ });
+ });
+});
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/index.ts b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/index.ts
new file mode 100644
index 00000000000..7ee3a9ba0c6
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/index.ts
@@ -0,0 +1 @@
+export * from "./QueryColumnFingerprintInfo";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.styled.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.styled.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.styled.tsx
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsx
similarity index 57%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsx
index 05cf5156000..0df5e2abeda 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfo/ColumnInfo.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.tsx
@@ -1,52 +1,12 @@
import { t } from "ttag";
import * as Lib from "metabase-lib";
-import type Field from "metabase-lib/v1/metadata/Field";
-import type { Field as ApiField, DatasetColumn } from "metabase-types/api";
-import {
- QueryColumnFingerprintInfo,
- TableColumnFingerprintInfo,
-} from "../ColumnFingerprintInfo";
import { Description, EmptyDescription } from "../MetadataInfo";
+import { QueryColumnFingerprintInfo } from "../QueryColumnFingerprintInfo";
import { SemanticTypeLabel } from "../SemanticTypeLabel";
-import { InfoContainer, Small } from "./ColumnInfo.styled";
-
-export type TableColumnInfoProps = {
- className?: string;
- field: Field | DatasetColumn | ApiField;
- timezone?: string;
- showAllFieldValues?: boolean;
- showFingerprintInfo?: boolean;
-};
-
-/**
- * @deprecated prefer to use the Lib/MBQL 5 query props
- */
-export function TableColumnInfo({
- className,
- field,
- timezone,
- showAllFieldValues,
- showFingerprintInfo,
-}: TableColumnInfoProps) {
- return (
- <InfoContainer className={className}>
- <ColumnDescription description={field.description} />
- <Small>
- <SemanticTypeLabel semanticType={field.semantic_type} />
- {showFingerprintInfo && (
- <TableColumnFingerprintInfo
- field={field}
- timezone={timezone}
- showAllFieldValues={showAllFieldValues}
- />
- )}
- </Small>
- </InfoContainer>
- );
-}
+import { InfoContainer, Small } from "./QueryColumnInfo.styled";
export type QueryColumnInfoProps = {
className?: string;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.unit.spec.tsx
new file mode 100644
index 00000000000..48913d38e95
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/QueryColumnInfo.unit.spec.tsx
@@ -0,0 +1,49 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import * as Lib from "metabase-lib";
+import {
+ DEFAULT_TEST_QUERY,
+ SAMPLE_PROVIDER,
+ columnFinder,
+} from "metabase-lib/test-helpers";
+
+import { QueryColumnInfo } from "./QueryColumnInfo";
+
+const STAGE_INDEX = -1;
+
+interface SetupOpts {
+ tableName: string;
+ columnName: string;
+}
+
+const setup = ({ tableName, columnName }: SetupOpts) => {
+ const query = Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);
+ const findColumn = columnFinder(query, Lib.visibleColumns(query, 0));
+
+ renderWithProviders(
+ <QueryColumnInfo
+ query={query}
+ stageIndex={STAGE_INDEX}
+ column={findColumn(tableName, columnName)}
+ />,
+ );
+};
+
+describe("QueryColumnInfo", () => {
+ it("should show the given dimension's semantic type name", () => {
+ setup({ tableName: "PRODUCTS", columnName: "CATEGORY" });
+
+ expect(screen.getByText("Category")).toBeInTheDocument();
+ });
+
+ it("should display the given dimension's description", () => {
+ setup({ tableName: "PRODUCTS", columnName: "CATEGORY" });
+
+ expect(screen.getByText("The type of product.")).toBeInTheDocument();
+ });
+
+ it("should show a placeholder for a dimension with no description", () => {
+ setup({ tableName: "PRODUCTS", columnName: "CREATED_AT" });
+
+ expect(screen.getByText("No description")).toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/index.ts b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/index.ts
new file mode 100644
index 00000000000..406eb4d311c
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfo/index.ts
@@ -0,0 +1,2 @@
+export { QueryColumnInfo } from "./QueryColumnInfo";
+export type { QueryColumnInfoProps } from "./QueryColumnInfo";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/QueryColumnInfoIcon.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/QueryColumnInfoIcon.tsx
new file mode 100644
index 00000000000..68f837d8f10
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/QueryColumnInfoIcon.tsx
@@ -0,0 +1,47 @@
+import { t } from "ttag";
+
+import { getColumnIcon } from "metabase/common/utils/columns";
+import type { ColorName } from "metabase/ui/colors/types";
+import type { IconName } from "metabase-types/api";
+
+import type { QueryColumnInfoPopoverProps } from "../ColumnInfoPopover";
+import { QueryColumnInfoPopover } from "../ColumnInfoPopover";
+import {
+ HoverParent,
+ PopoverDefaultIcon,
+ PopoverHoverTarget,
+} from "../InfoIcon";
+
+export { HoverParent };
+
+type QueryColumnInfoIconProps = QueryColumnInfoPopoverProps & {
+ size?: number;
+ icon?: IconName;
+ color?: ColorName;
+};
+
+export function QueryColumnInfoIcon({
+ className,
+ size,
+ icon,
+ color,
+ ...props
+}: QueryColumnInfoIconProps) {
+ const { column } = props;
+
+ return (
+ <QueryColumnInfoPopover {...props}>
+ <span aria-label={t`More info`}>
+ <PopoverDefaultIcon
+ className={className}
+ name={icon ?? getColumnIcon(column)}
+ size={size}
+ c={color}
+ />
+ <PopoverHoverTarget className={className} name="info" size={size} />
+ </span>
+ </QueryColumnInfoPopover>
+ );
+}
+
+QueryColumnInfoIcon.HoverParent = HoverParent;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/QueryColumnInfoIcon.unit.spec.tsx
similarity index 60%
rename from frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.unit.spec.tsx
rename to frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/QueryColumnInfoIcon.unit.spec.tsx
index df919a8f21c..e1d40f72565 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/QueryColumnInfoIcon.unit.spec.tsx
@@ -6,22 +6,31 @@ import {
columnFinder,
} from "metabase-lib/test-helpers";
-import { QueryColumnInfoIcon } from "./ColumnInfoIcon";
+import { QueryColumnInfoIcon } from "./QueryColumnInfoIcon";
-function setup(table: string, column: string) {
- const query = Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);
- const columns = Lib.visibleColumns(query, 0);
- const findColumn = columnFinder(query, columns);
- const col = findColumn(table, column);
+const STAGE_INDEX = -1;
- return render(
- <QueryColumnInfoIcon query={query} stageIndex={-1} column={col} />,
- );
+interface SetupOpts {
+ tableName: string;
+ columnName: string;
}
+const setup = ({ tableName, columnName }: SetupOpts) => {
+ const query = Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);
+ const findColumn = columnFinder(query, Lib.visibleColumns(query, 0));
+
+ render(
+ <QueryColumnInfoIcon
+ query={query}
+ stageIndex={STAGE_INDEX}
+ column={findColumn(tableName, columnName)}
+ />,
+ );
+};
+
describe("QueryColumnInfoIcon", () => {
it("should show the hovercard only on hover", async () => {
- setup("PRODUCTS", "CATEGORY");
+ setup({ tableName: "PRODUCTS", columnName: "CATEGORY" });
const icon = screen.getByLabelText("More info");
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/index.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/index.tsx
new file mode 100644
index 00000000000..753305b5b27
--- /dev/null
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnInfoIcon/index.tsx
@@ -0,0 +1 @@
+export * from "./QueryColumnInfoIcon";
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
index 89f8c56551e..9a076557e25 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
@@ -9,7 +9,7 @@ import {
import {
HoverParent,
QueryColumnInfoIcon,
-} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { useLocale } from "metabase/common/hooks";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
import { useTranslateContent } from "metabase/content-translation/hooks";
diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts
index 11218ffa37f..b12de58246e 100644
--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts
+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts
@@ -88,7 +88,7 @@ export function getFieldRemappedValues(
}
/**
- * Adds 3 extra attributes to every Field, so that DataSelector does not break.
+ * Adds 4 extra attributes to every Field, so that DataSelector does not break.
* DataSelector component expects metabase-lib/v1/metadata/Field objects (entity framework),
* but this modern module uses Field from metabase-types/api/field.ts instead.
*/
@@ -105,6 +105,7 @@ export function hydrateTableFields(
...field,
displayName: () => field.display_name,
icon: () => getColumnIcon(Lib.legacyColumnTypeInfo(field)),
+ getPlainObject: () => field,
table,
})),
};
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
index be716f3f62e..09879e30214 100644
--- a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
@@ -9,7 +9,7 @@ import {
type DimensionOption,
groupIntoSections,
} from "metabase/common/components/DimensionPill";
-import { HoverParent } from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+import { HoverParent } from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { Flex, Icon } from "metabase/ui";
import type { MetricDefinition, ProjectionClause } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/SidesheetCardWithFields.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/SidesheetCardWithFields.tsx
index f29ed7bb2ca..89628588bfb 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/SidesheetCardWithFields.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/SidesheetCardWithFields.tsx
@@ -1,6 +1,6 @@
import { c, msgid } from "ttag";
-import { QueryColumnInfoIcon } from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+import { QueryColumnInfoIcon } from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { SidesheetCard } from "metabase/common/components/Sidesheet";
import { Box, Group, Stack } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index 106241c75ac..7f483f7ccdb 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -7,7 +7,7 @@ import { t } from "ttag";
import {
HoverParent,
QueryColumnInfoIcon,
-} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { ColumnBucketPickerPopover } from "metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { Box, type BoxProps, Button, Flex, Icon, Tooltip } from "metabase/ui";
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
index 3c5354a893a..36fa68341d3 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
@@ -1,12 +1,15 @@
-import type { ReactNode } from "react";
+import { type ReactNode, useMemo } from "react";
import { t } from "ttag";
import { AccordionList } from "metabase/common/components/AccordionList";
import {
HoverParent,
- TableColumnInfoIcon,
-} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+ QueryColumnInfoIcon,
+} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import CS from "metabase/css/core/index.css";
+import { getQueryAndColumns } from "metabase/querying/common/utils";
+import { useSelector } from "metabase/redux";
+import { getMetadata } from "metabase/selectors/metadata";
import { Box, DelayGroup, Icon } from "metabase/ui";
import type Field from "metabase-lib/v1/metadata/Field";
import type Table from "metabase-lib/v1/metadata/Table";
@@ -17,6 +20,8 @@ import { CONTAINER_WIDTH } from "../constants";
import DataSelectorFieldPickerS from "./DataSelectorFieldPicker.module.css";
+const STAGE_INDEX = -1;
+
type DataSelectorFieldPickerProps = {
fields: Field[];
hasFiltering?: boolean;
@@ -48,6 +53,17 @@ export const DataSelectorFieldPicker = ({
hasFiltering,
hasInitialFocus,
}: DataSelectorFieldPickerProps) => {
+ const metadata = useSelector(getMetadata);
+ const queryAndColumns = useMemo(
+ () =>
+ getQueryAndColumns(
+ metadata,
+ selectedTable,
+ fields.map((field) => field.getPlainObject()),
+ ),
+ [metadata, selectedTable, fields],
+ );
+
const header = <Header onBack={onBack} selectedTable={selectedTable} />;
if (isLoading) {
@@ -67,16 +83,22 @@ export const DataSelectorFieldPicker = ({
const checkIfItemIsSelected = (item: FieldWithName) =>
item.field && selectedField && item.field.id === selectedField.id;
- const renderItemIcon = (item: FieldWithName) =>
- item.field && (
- <TableColumnInfoIcon
- field={item.field}
- position="top-end"
- size={18}
- // Unjustified type cast. FIXME
- icon={item.field.icon() as unknown as IconName}
- />
+ const renderItemIcon = (item: FieldWithName) => {
+ const queryAndColumn = queryAndColumns.get(item.field.getPlainObject());
+ return (
+ queryAndColumn && (
+ <QueryColumnInfoIcon
+ query={queryAndColumn.query}
+ stageIndex={STAGE_INDEX}
+ column={queryAndColumn.column}
+ position="top-end"
+ size={18}
+ // Unjustified type cast. FIXME
+ icon={item.field.icon() as unknown as IconName}
+ />
+ )
);
+ };
return (
<Box w={CONTAINER_WIDTH} className={DataSelectorFieldPickerS.Container}>
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
index 3f914e5bcdc..f5d950bb919 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
@@ -1,52 +1,71 @@
-import { createMockMetadata } from "__support__/metadata";
-import { fireEvent, render, screen } from "__support__/ui";
+import { createMockEntitiesState } from "__support__/store";
+import { fireEvent, renderWithProviders, screen } from "__support__/ui";
+import { createMockState } from "metabase/redux/store/mocks";
+import { getMetadata } from "metabase/selectors/metadata";
import { checkNotNull } from "metabase/utils/types";
+import type Field from "metabase-lib/v1/metadata/Field";
import type Table from "metabase-lib/v1/metadata/Table";
-import { ORDERS, createSampleDatabase } from "metabase-types/api/mocks/presets";
+import {
+ ORDERS,
+ ORDERS_ID,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
import { DataSelectorFieldPicker } from "./DataSelectorFieldPicker";
-const metadata = createMockMetadata({
- databases: [createSampleDatabase()],
+const state = createMockState({
+ entities: createMockEntitiesState({
+ databases: [createSampleDatabase()],
+ }),
});
-const props = {
- hasFiltering: true,
- hasInitialFocus: false,
- fields: [],
- onBack: jest.fn(),
- onChangeField: jest.fn(),
+const metadata = getMetadata(state);
+
+interface SetupOpts {
+ fields?: Field[];
+ isLoading?: boolean;
+ selectedTable?: Table;
+}
+
+const setup = ({ fields = [], isLoading, selectedTable }: SetupOpts = {}) => {
+ const onBack = jest.fn();
+
+ renderWithProviders(
+ <DataSelectorFieldPicker
+ hasFiltering
+ hasInitialFocus={false}
+ fields={fields}
+ isLoading={isLoading}
+ selectedTable={selectedTable}
+ onBack={onBack}
+ onChangeField={jest.fn()}
+ />,
+ { storeInitialState: state },
+ );
+
+ return { onBack };
};
describe("DataSelectorFieldPicker", () => {
describe("when loading", () => {
it("uses 'Fields' as title if selectedTable not passed", () => {
- render(<DataSelectorFieldPicker {...props} isLoading={true} />);
+ setup({ isLoading: true });
expect(screen.getByText("Fields")).toBeInTheDocument();
});
it("uses table display name as title if passed", () => {
- const displayName = "Display name";
-
- render(
- <DataSelectorFieldPicker
- {...props}
- isLoading={true}
- // Unjustified type cast. FIXME
- selectedTable={{ display_name: displayName } as Table}
- />,
- );
-
- expect(screen.getByText(displayName)).toBeInTheDocument();
+ const selectedTable = checkNotNull(metadata.table(ORDERS_ID));
+
+ setup({ isLoading: true, selectedTable });
+
+ expect(
+ screen.getByText(checkNotNull(selectedTable.display_name)),
+ ).toBeInTheDocument();
});
it("goes back if clicked", () => {
- const onBack = jest.fn();
-
- render(
- <DataSelectorFieldPicker {...props} isLoading={true} onBack={onBack} />,
- );
+ const { onBack } = setup({ isLoading: true });
fireEvent.click(screen.getByText("Fields"));
@@ -56,38 +75,28 @@ describe("DataSelectorFieldPicker", () => {
describe("loaded", () => {
it("displays table name and fields", () => {
- const tableDisplayName = "Table display name";
-
- const selectedTable = {
- display_name: tableDisplayName,
- };
-
- render(
- <DataSelectorFieldPicker
- {...props}
- // Unjustified type cast. FIXME
- selectedTable={selectedTable as Table}
- fields={[checkNotNull(metadata.field(ORDERS.PRODUCT_ID))]}
- />,
- );
-
- expect(screen.getByText(tableDisplayName)).toBeInTheDocument();
+ const selectedTable = checkNotNull(metadata.table(ORDERS_ID));
+
+ setup({
+ selectedTable,
+ fields: [checkNotNull(metadata.field(ORDERS.PRODUCT_ID))],
+ });
+
+ expect(
+ screen.getByText(checkNotNull(selectedTable.display_name)),
+ ).toBeInTheDocument();
expect(screen.getByText("Product ID")).toBeInTheDocument();
expect(screen.getByLabelText("More info")).toBeInTheDocument();
});
it("keeps the search box visible and shows an empty state when no field matches the search (metabase#74670)", () => {
- render(
- <DataSelectorFieldPicker
- {...props}
- // Unjustified type cast. FIXME
- selectedTable={{ display_name: "Orders" } as Table}
- fields={[
- checkNotNull(metadata.field(ORDERS.ID)),
- checkNotNull(metadata.field(ORDERS.TOTAL)),
- ]}
- />,
- );
+ setup({
+ selectedTable: checkNotNull(metadata.table(ORDERS_ID)),
+ fields: [
+ checkNotNull(metadata.field(ORDERS.ID)),
+ checkNotNull(metadata.field(ORDERS.TOTAL)),
+ ],
+ });
fireEvent.change(screen.getByPlaceholderText("Find..."), {
target: { value: "xyznonexistent" },
diff --git a/frontend/src/metabase/querying/common/utils.ts b/frontend/src/metabase/querying/common/utils.ts
index c8fcde725f3..a84569c8310 100644
--- a/frontend/src/metabase/querying/common/utils.ts
+++ b/frontend/src/metabase/querying/common/utils.ts
@@ -1,5 +1,15 @@
import type { ComboboxItem } from "metabase/ui";
-import type { FieldValue } from "metabase-types/api";
+import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type {
+ DatasetColumn,
+ Field,
+ FieldValue,
+ NormalizedField,
+ Table,
+} from "metabase-types/api";
+
+const STAGE_INDEX = -1;
export function getFieldOption([value, label]: FieldValue): ComboboxItem {
return {
@@ -11,3 +21,36 @@ export function getFieldOption([value, label]: FieldValue): ComboboxItem {
export function getFieldOptions(fieldValues: FieldValue[]): ComboboxItem[] {
return fieldValues.filter(([value]) => value != null).map(getFieldOption);
}
+
+type LegacyColumn = DatasetColumn | NormalizedField | Field;
+
+type QueryAndColumn = { query: Lib.Query; column: Lib.ColumnMetadata };
+
+export const getQueryAndColumns = (
+ metadata: Metadata,
+ table: Pick<Table, "id" | "db_id"> | undefined,
+ fields: LegacyColumn[],
+): Map<LegacyColumn, QueryAndColumn> => {
+ if (table === undefined) {
+ return new Map();
+ }
+
+ const metadataProvider = Lib.metadataProvider(table.db_id, metadata);
+ const tableMetadata = Lib.tableOrCardMetadata(metadataProvider, table.id);
+
+ if (tableMetadata === null) {
+ return new Map();
+ }
+
+ const query = Lib.queryFromTableOrCardMetadata(
+ metadataProvider,
+ tableMetadata,
+ );
+
+ return new Map(
+ fields.map((field): [LegacyColumn, QueryAndColumn] => [
+ field,
+ { query, column: Lib.fromLegacyColumn(query, STAGE_INDEX, field) },
+ ]),
+ );
+};
diff --git a/frontend/src/metabase/querying/components/DataReference/FieldList.tsx b/frontend/src/metabase/querying/components/DataReference/FieldList.tsx
index 3ba8c9d10fb..af73716e91f 100644
--- a/frontend/src/metabase/querying/components/DataReference/FieldList.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/FieldList.tsx
@@ -1,11 +1,16 @@
+import { useMemo } from "react";
import { msgid, ngettext } from "ttag";
import {
HoverParent,
- TableColumnInfoIcon,
-} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+ QueryColumnInfoIcon,
+} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
+import { getQueryAndColumns } from "metabase/querying/common/utils";
+import { useSelector } from "metabase/redux";
+import { getMetadata } from "metabase/selectors/metadata";
import { DelayGroup } from "metabase/ui";
import type Field from "metabase-lib/v1/metadata/Field";
+import type Table from "metabase-lib/v1/metadata/Table";
import type { IconName } from "metabase-types/api";
import {
@@ -18,46 +23,67 @@ import {
} from "./NodeList";
import S from "./NodeList.module.css";
+const STAGE_INDEX = -1;
+
interface FieldListProps {
+ table: Table;
fields: Field[];
onFieldClick: (field: Field) => void;
}
-export const FieldList = ({ fields, onFieldClick }: FieldListProps) => (
- <DelayGroup>
- <NodeListContainer>
- <NodeListTitle>
- <NodeListIcon name="table2" size="12" />
- <NodeListTitleText>
- {ngettext(
- msgid`${fields.length} column`,
- `${fields.length} columns`,
- fields.length,
- )}
- </NodeListTitleText>
- </NodeListTitle>
- {fields.map((field) => {
- // field.icon() cannot be annotated to return IconName
- // because metabase-lib cannot import from metabase.
- const iconName = field.icon() as IconName;
- return (
- <HoverParent
- className={S.NodeListItem}
- as="li"
- key={field.getUniqueId()}
- >
- <NodeListItemLink onClick={() => onFieldClick(field)}>
- <TableColumnInfoIcon
- className={S.nodeListInfoIcon}
- field={field}
- position="left"
- icon={iconName}
- />
- <NodeListItemName>{field.name}</NodeListItemName>
- </NodeListItemLink>
- </HoverParent>
- );
- })}
- </NodeListContainer>
- </DelayGroup>
-);
+export const FieldList = ({ table, fields, onFieldClick }: FieldListProps) => {
+ const metadata = useSelector(getMetadata);
+ const queryAndColumns = useMemo(
+ () =>
+ getQueryAndColumns(
+ metadata,
+ table,
+ fields.map((field) => field.getPlainObject()),
+ ),
+ [metadata, table, fields],
+ );
+
+ return (
+ <DelayGroup>
+ <NodeListContainer>
+ <NodeListTitle>
+ <NodeListIcon name="table2" size="12" />
+ <NodeListTitleText>
+ {ngettext(
+ msgid`${fields.length} column`,
+ `${fields.length} columns`,
+ fields.length,
+ )}
+ </NodeListTitleText>
+ </NodeListTitle>
+ {fields.map((field) => {
+ // field.icon() cannot be annotated to return IconName
+ // because metabase-lib cannot import from metabase.
+ const iconName = field.icon() as IconName;
+ const queryAndColumn = queryAndColumns.get(field.getPlainObject());
+ return (
+ queryAndColumn && (
+ <HoverParent
+ className={S.NodeListItem}
+ as="li"
+ key={field.getUniqueId()}
+ >
+ <NodeListItemLink onClick={() => onFieldClick(field)}>
+ <QueryColumnInfoIcon
+ className={S.nodeListInfoIcon}
+ query={queryAndColumn.query}
+ stageIndex={STAGE_INDEX}
+ column={queryAndColumn.column}
+ position="left"
+ icon={iconName}
+ />
+ <NodeListItemName>{field.name}</NodeListItemName>
+ </NodeListItemLink>
+ </HoverParent>
+ )
+ );
+ })}
+ </NodeListContainer>
+ </DelayGroup>
+ );
+};
diff --git a/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx b/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx
index 07e5eaff5d5..2abbedacf62 100644
--- a/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx
@@ -1,19 +1,31 @@
-import { createMockMetadata } from "__support__/metadata";
+import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { createSampleDatabase } from "metabase-types/api/mocks/presets";
+import { createMockState } from "metabase/redux/store/mocks";
+import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
+import {
+ PRODUCTS_ID,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
import { FieldList } from "./FieldList";
-const database = createSampleDatabase();
-
-const metadata = createMockMetadata({
- databases: [database],
+const state = createMockState({
+ entities: createMockEntitiesState({
+ databases: [createSampleDatabase()],
+ }),
});
-function setup() {
- const fields = [Object.values(metadata.fields)[0]];
- renderWithProviders(<FieldList fields={fields} onFieldClick={jest.fn()} />);
-}
+const metadata = getMetadata(state);
+
+const setup = () => {
+ const table = checkNotNull(metadata.table(PRODUCTS_ID));
+ const fields = [checkNotNull(table.fields)[0]];
+ renderWithProviders(
+ <FieldList table={table} fields={fields} onFieldClick={jest.fn()} />,
+ { storeInitialState: state },
+ );
+};
describe("FieldList", () => {
it("should render the info icon", () => {
diff --git a/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx b/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx
index 126e8d510ff..fe0bcd50222 100644
--- a/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx
@@ -1,12 +1,18 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
import {
skipToken,
useGetCardQueryMetadataQuery,
useGetFieldQuery,
- useGetTableQuery,
+ useGetTableQueryMetadataQuery,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { TableColumnInfo } from "metabase/common/components/MetadataInfo/ColumnInfo";
+import { QueryColumnInfo } from "metabase/common/components/MetadataInfo/QueryColumnInfo";
import { SidebarContent } from "metabase/common/components/SidebarContent";
+import { getQueryAndColumns } from "metabase/querying/common/utils";
+import { useSelector } from "metabase/redux";
+import { getMetadata } from "metabase/selectors/metadata";
import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { FieldId } from "metabase-types/api";
@@ -16,17 +22,30 @@ import type {
UniqueFieldId,
} from "./types";
+const STAGE_INDEX = -1;
+
export const FieldPane = ({
onBack,
onClose,
id,
}: DataReferencePaneProps<DataReferenceFieldItem>) => {
const { field, table, isLoading, error } = useGetFieldAndTable(id);
+ const metadata = useSelector(getMetadata);
+ const queryAndColumns = useMemo(
+ () =>
+ getQueryAndColumns(metadata, table, field !== undefined ? [field] : []),
+ [metadata, table, field],
+ );
- if (isLoading || error || field == null) {
+ if (isLoading || error || !field) {
return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
}
+ const queryAndColumn = queryAndColumns.get(field);
+ if (!queryAndColumn) {
+ return <LoadingAndErrorWrapper error={t`Failed to load field metadata`} />;
+ }
+
return (
<SidebarContent
title={field.name}
@@ -35,8 +54,10 @@ export const FieldPane = ({
onClose={onClose}
>
<SidebarContent.Pane>
- <TableColumnInfo
- field={field}
+ <QueryColumnInfo
+ query={queryAndColumn.query}
+ stageIndex={STAGE_INDEX}
+ column={queryAndColumn.column}
timezone={table?.db?.timezone}
showAllFieldValues
showFingerprintInfo
@@ -73,7 +94,7 @@ function useGetFieldAndTableFromFieldId(id: FieldId | null) {
data: table,
isLoading: isLoadingTable,
error: tableError,
- } = useGetTableQuery(
+ } = useGetTableQueryMetadataQuery(
field?.table_id != null ? { id: field.table_id } : skipToken,
);
diff --git a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx
index 2e085c28b2d..696426ac599 100644
--- a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx
@@ -138,6 +138,7 @@ export const QuestionPane = ({
)}
{table.fields && (
<FieldList
+ table={table}
fields={table.fields}
onFieldClick={(field) => {
onItemClick({
diff --git a/frontend/src/metabase/querying/components/DataReference/TablePane.tsx b/frontend/src/metabase/querying/components/DataReference/TablePane.tsx
index d67c385948e..de9d004b72e 100644
--- a/frontend/src/metabase/querying/components/DataReference/TablePane.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/TablePane.tsx
@@ -68,6 +68,7 @@ export function TablePane({
{table.fields?.length ? (
<>
<FieldList
+ table={table}
fields={table.fields}
onFieldClick={(field) => {
onItemClick({
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.tsx
index 327b5eee069..f3c7802ef20 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.tsx
@@ -14,7 +14,7 @@ import {
} from "react";
import { c } from "ttag";
-import { QueryColumnInfoIcon } from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+import { QueryColumnInfoIcon } from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import type { ExpressionSuggestion } from "metabase/querying/expressions";
import { Box, DelayGroup, Icon } from "metabase/ui";
import type * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
index 41add9f3a83..52b20bd0626 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
@@ -9,7 +9,7 @@ import {
import {
HoverParent,
QueryColumnInfoIcon,
-} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { useLocale } from "metabase/common/hooks";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
import { modelIconMap } from "metabase/common/utils/icon";
diff --git a/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx b/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx
index 195662e2239..2d29afaccfc 100644
--- a/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import {
HoverParent,
QueryColumnInfoIcon,
-} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { Checkbox, DelayGroup } from "metabase/ui";
import * as Lib from "metabase-lib";