Skip to content

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

add more specs, fix implicit joins, polish code (#66630)

Aleksandr Lesnenkoeda5bd5102b6
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.ts
index 6e1bcc08a86..b4d2f65c9b4 100644
--- a/e2e/support/helpers/e2e-datamodel-helpers.ts
+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts
@@ -8,6 +8,7 @@ import type {
export const DataModel = {
visit,
visitDataStudio,
+ visitDataStudioSegments,
get: getDataModel,
TablePicker: {
get: getTablePicker,
@@ -64,6 +65,24 @@ export const DataModel = {
get: getPreviewSection,
getPreviewTypeInput: getPreviewTabsInput,
},
+ SegmentList: {
+ get: getSegmentList,
+ getEmptyState: getSegmentListEmptyState,
+ getNewSegmentLink: getSegmentListNewLink,
+ getSegment: getSegmentListItem,
+ getSegments: getSegmentListItems,
+ },
+ SegmentEditor: {
+ get: getSegmentEditor,
+ getNameInput: getSegmentEditorNameInput,
+ getDescriptionInput: getSegmentEditorDescriptionInput,
+ getFilterPlaceholder: getSegmentEditorFilterPlaceholder,
+ getRowCount: getSegmentEditorRowCount,
+ getPreviewLink: getSegmentEditorPreviewLink,
+ getSaveButton: getSegmentEditorSaveButton,
+ getActionsButton: getSegmentEditorActionsButton,
+ getBreadcrumb: getSegmentEditorBreadcrumb,
+ },
};
const DEFAULT_BASE_PATH = "/admin/datamodel";
@@ -397,3 +416,79 @@ function getPreviewSection() {
function getPreviewTabsInput() {
return getPreviewSection().findByLabelText("Preview type");
}
+
+/** segment list helpers */
+
+function visitDataStudioSegments(options: {
+ databaseId: DatabaseId;
+ schemaId: SchemaId;
+ tableId: TableId;
+}) {
+ cy.intercept("GET", "/api/table/*/query_metadata*").as(
+ "datamodel/visit/metadata",
+ );
+ cy.visit(
+ `/data-studio/data/database/${options.databaseId}/schema/${options.schemaId}/table/${options.tableId}/segments`,
+ );
+ cy.wait("@datamodel/visit/metadata");
+}
+
+function getSegmentList() {
+ return cy.findByRole("tabpanel");
+}
+
+function getSegmentListEmptyState() {
+ return getSegmentList().findByText("No segments yet");
+}
+
+function getSegmentListNewLink() {
+ return getSegmentList().findByRole("link", { name: /New segment/i });
+}
+
+function getSegmentListItem(name: string) {
+ return getSegmentList().findByRole("listitem", { name });
+}
+
+function getSegmentListItems() {
+ return getSegmentList().findAllByRole("listitem");
+}
+
+/** segment editor helpers */
+
+function getSegmentEditor() {
+ return cy.get(
+ "[data-testid='new-segment-page'], [data-testid='edit-segment-page']",
+ );
+}
+
+function getSegmentEditorNameInput() {
+ return getSegmentEditor().findByPlaceholderText("New segment");
+}
+
+function getSegmentEditorDescriptionInput() {
+ return getSegmentEditor().findByLabelText("Description");
+}
+
+function getSegmentEditorFilterPlaceholder() {
+ return getSegmentEditor().findByText("Add filters to narrow your answer");
+}
+
+function getSegmentEditorRowCount() {
+ return getSegmentEditor().findByText(/\d+ rows/);
+}
+
+function getSegmentEditorPreviewLink() {
+ return getSegmentEditor().findByRole("link", { name: /Preview/i });
+}
+
+function getSegmentEditorSaveButton() {
+ return getSegmentEditor().button("Save");
+}
+
+function getSegmentEditorActionsButton() {
+ return cy.findByLabelText("Segment actions");
+}
+
+function getSegmentEditorBreadcrumb(tableName: string) {
+ return getSegmentEditor().findByText(`${tableName} segments`);
+}
diff --git a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts
index 81c33882350..febccf8fde4 100644
--- a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts
@@ -2,7 +2,9 @@ import { SAMPLE_DB_ID, SAMPLE_DB_SCHEMA_ID } from "e2e/support/cypress_data";
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
const { H } = cy;
-const { ORDERS, ORDERS_ID, PRODUCTS_ID } = SAMPLE_DATABASE;
+const { SegmentList, SegmentEditor } = H.DataModel;
+const { ORDERS, ORDERS_ID, PRODUCTS, PRODUCTS_ID, PEOPLE, PEOPLE_ID } =
+ SAMPLE_DATABASE;
describe("scenarios > data studio > data model > segments", () => {
beforeEach(() => {
@@ -18,22 +20,16 @@ describe("scenarios > data studio > data model > segments", () => {
describe("Segment list", () => {
it("should show empty state and navigation when no segments exist", () => {
- visitDataStudioTableSegmentsTab(ORDERS_ID);
+ visitDataStudioSegments(ORDERS_ID);
cy.log("verify empty state");
- H.main()
- .findByText("No segments yet")
- .scrollIntoView()
- .should("be.visible");
- H.main()
+ SegmentList.getEmptyState().scrollIntoView().should("be.visible");
+ SegmentList.get()
.findByText("Create a segment to filter rows in this table.")
.should("be.visible");
cy.log("verify new segment link and navigation");
- H.main()
- .findByRole("link", { name: /New segment/i })
- .scrollIntoView()
- .click();
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
cy.url().should(
"include",
@@ -46,19 +42,18 @@ describe("scenarios > data studio > data model > segments", () => {
name: "High Value Orders",
filter: [">", ["field", ORDERS.TOTAL, null], 100],
});
- visitDataStudioTableSegmentsTab(ORDERS_ID);
+ visitDataStudioSegments(ORDERS_ID);
cy.log("verify segment in list with filter description");
- H.main()
- .findByRole("listitem", { name: "High Value Orders" })
+ SegmentList.getSegment("High Value Orders")
.scrollIntoView()
.should("be.visible");
- H.main()
+ SegmentList.get()
.findByTestId("list-item-description")
.should("contain", "Filtered by Total is greater than 100");
cy.log("navigate to edit page");
- H.main().findByRole("listitem", { name: "High Value Orders" }).click();
+ SegmentList.getSegment("High Value Orders").click();
cy.get<number>("@segmentId").then((segmentId) => {
cy.url().should(
"include",
@@ -80,10 +75,7 @@ describe("scenarios > data studio > data model > segments", () => {
"include",
`/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/segments`,
);
- H.main()
- .findByText("No segments yet")
- .scrollIntoView()
- .should("be.visible");
+ SegmentList.getEmptyState().scrollIntoView().should("be.visible");
cy.log("verify tab selection preserved on refresh");
cy.reload();
@@ -100,22 +92,16 @@ describe("scenarios > data studio > data model > segments", () => {
describe("Segment creation", () => {
it("should create a segment with filters and verify across features", () => {
- visitDataStudioTableSegmentsTab(ORDERS_ID);
+ visitDataStudioSegments(ORDERS_ID);
cy.log("navigate to new segment page");
- H.main()
- .findByRole("link", { name: /New segment/i })
- .scrollIntoView()
- .click();
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
cy.log("fill in segment name");
- cy.findByPlaceholderText("New segment").type("Premium Orders");
+ SegmentEditor.getNameInput().type("Premium Orders");
cy.log("add filter");
- H.main()
- .findByText("Add filters to narrow your answer")
- .scrollIntoView()
- .click();
+ SegmentEditor.getFilterPlaceholder().click();
H.popover().findByText("Total").click();
H.selectFilterOperator("Greater than");
H.popover().within(() => {
@@ -124,18 +110,13 @@ describe("scenarios > data studio > data model > segments", () => {
});
cy.log("verify row count preview");
- H.main()
- .findByText(/\d+ rows/)
- .scrollIntoView()
- .should("be.visible");
+ SegmentEditor.getRowCount().should("be.visible");
cy.log("verify preview link");
- H.main()
- .findByRole("link", { name: /Preview/i })
- .should("be.visible");
+ SegmentEditor.getPreviewLink().should("be.visible");
cy.log("save segment");
- H.main().button("Save").scrollIntoView().click();
+ SegmentEditor.getSaveButton().click();
cy.wait("@createSegment");
cy.log("verify redirect to edit page and toast");
@@ -147,17 +128,11 @@ describe("scenarios > data studio > data model > segments", () => {
});
it("should show row count when filters are added", () => {
- visitDataStudioTableSegmentsTab(PRODUCTS_ID);
+ visitDataStudioSegments(PRODUCTS_ID);
- H.main()
- .findByRole("link", { name: /New segment/i })
- .scrollIntoView()
- .click();
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
- H.main()
- .findByText("Add filters to narrow your answer")
- .scrollIntoView()
- .click();
+ SegmentEditor.getFilterPlaceholder().click();
H.popover().findByText("Price").click();
H.selectFilterOperator("Less than");
H.popover().within(() => {
@@ -165,10 +140,7 @@ describe("scenarios > data studio > data model > segments", () => {
cy.button("Add filter").click();
});
- H.main()
- .findByText(/\d+ rows/)
- .scrollIntoView()
- .should("be.visible");
+ SegmentEditor.getRowCount().should("be.visible");
});
});
@@ -183,15 +155,20 @@ describe("scenarios > data studio > data model > segments", () => {
});
cy.log("verify existing data displayed");
- H.main().findByText("Test Segment").scrollIntoView().should("be.visible");
- H.main()
- .findByLabelText("Description")
- .scrollIntoView()
- .should("have.value", "Test description");
+ SegmentEditor.get()
+ .findByDisplayValue("Test Segment")
+ .should("be.visible");
+ SegmentEditor.getDescriptionInput().should(
+ "have.value",
+ "Test description",
+ );
cy.log("update segment name");
- H.main().findByText("Test Segment").click().type(" Updated{enter}");
- H.main().button("Save").scrollIntoView().click();
+ SegmentEditor.get()
+ .findByDisplayValue("Test Segment")
+ .click()
+ .type(" Updated{enter}");
+ SegmentEditor.getSaveButton().click();
cy.wait("@updateSegment");
cy.log("verify toast (stays on edit page)");
@@ -207,7 +184,7 @@ describe("scenarios > data studio > data model > segments", () => {
cy.visit(`/data-studio/modeling/segments/${segmentId}`);
});
- H.main().findByText("Orders segments").scrollIntoView().click();
+ SegmentEditor.getBreadcrumb("Orders").click();
cy.url().should(
"include",
@@ -227,7 +204,7 @@ describe("scenarios > data studio > data model > segments", () => {
});
cy.log("delete via more menu");
- cy.findByLabelText("Segment actions").click();
+ SegmentEditor.getActionsButton().click();
H.popover().findByText("Remove segment").click();
H.modal().button("Remove").click();
cy.wait("@deleteSegment");
@@ -238,7 +215,7 @@ describe("scenarios > data studio > data model > segments", () => {
"include",
`/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/segments`,
);
- H.main()
+ SegmentList.get()
.findByText("Segment to Delete", { timeout: 1000 })
.should("not.exist");
@@ -249,16 +226,13 @@ describe("scenarios > data studio > data model > segments", () => {
describe("Unsaved changes", () => {
it("should show leave confirmation with unsaved changes", () => {
- visitDataStudioTableSegmentsTab(ORDERS_ID);
+ visitDataStudioSegments(ORDERS_ID);
- H.main()
- .findByRole("link", { name: /New segment/i })
- .scrollIntoView()
- .click();
- cy.findByPlaceholderText("New segment").type("Unsaved Segment");
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
+ SegmentEditor.getNameInput().type("Unsaved Segment");
cy.log("attempt to navigate away");
- H.main().findByText("Orders segments").scrollIntoView().click();
+ SegmentEditor.getBreadcrumb("Orders").click();
cy.log("verify confirmation modal");
H.modal().within(() => {
@@ -267,7 +241,245 @@ describe("scenarios > data studio > data model > segments", () => {
});
cy.log("verify still on editor");
- H.main().findByText("Unsaved Segment").should("be.visible");
+ SegmentEditor.get().findByText("Unsaved Segment").should("be.visible");
+ });
+ });
+
+ describe("Segment with implicit joins", () => {
+ it("should create a segment with implicit join filter", () => {
+ visitDataStudioSegments(ORDERS_ID);
+
+ cy.log("navigate to new segment page");
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
+
+ cy.log("fill in segment name");
+ SegmentEditor.getNameInput().type("Widget Orders");
+
+ cy.log("add filter via implicit join");
+ SegmentEditor.getFilterPlaceholder().click();
+ H.popover().within(() => {
+ cy.findByText("Product").click();
+ cy.findByText("Category").click();
+ cy.findByText("Widget").click();
+ cy.button("Add filter").click();
+ });
+
+ cy.log("verify row count and save");
+ SegmentEditor.getRowCount().should("be.visible");
+ SegmentEditor.getSaveButton().click();
+ cy.wait("@createSegment");
+
+ cy.log("verify redirected to edit page with segment name");
+ SegmentEditor.get().should("be.visible");
+ SegmentEditor.get()
+ .findByDisplayValue("Widget Orders")
+ .should("be.visible");
+
+ cy.log("verify segment works in query builder");
+ verifySegmentInQueryBuilder("Widget Orders");
+ });
+ });
+
+ describe("Segment field values modes", () => {
+ it("should display list values when creating segment filter on Category field", () => {
+ cy.request("PUT", `/api/field/${PRODUCTS.CATEGORY}`, {
+ has_field_values: "list",
+ });
+
+ visitDataStudioSegments(PRODUCTS_ID);
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
+
+ cy.log("open filter picker for Category");
+ SegmentEditor.getFilterPlaceholder().click();
+ H.popover().findByText("Category").click();
+
+ cy.log("verify list mode UI");
+ H.popover().within(() => {
+ cy.findByPlaceholderText("Search the list").should("be.visible");
+ cy.findByText("Widget").should("be.visible");
+ cy.findByText("Gadget").should("be.visible");
+ cy.findByText("Gizmo").should("be.visible");
+ cy.findByText("Doohickey").should("be.visible");
+ });
+ });
+
+ it("should display search input when creating segment filter on Email field", () => {
+ cy.request("PUT", `/api/field/${PEOPLE.EMAIL}`, {
+ has_field_values: "search",
+ });
+
+ visitDataStudioSegments(PEOPLE_ID);
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
+
+ cy.log("open filter picker for Email");
+ SegmentEditor.getFilterPlaceholder().click();
+ H.popover().findByText("Email").click();
+
+ cy.log("verify search mode UI and search for email");
+ H.popover().within(() => {
+ cy.findByRole("combobox").should("be.visible");
+ cy.findByRole("combobox").type("[email protected]");
+ });
+ cy.findByRole("listbox")
+ .findByText("[email protected]")
+ .should("be.visible");
+ });
+
+ it("should display list values for implicit join field", () => {
+ cy.request("PUT", `/api/field/${PRODUCTS.CATEGORY}`, {
+ has_field_values: "list",
+ });
+
+ visitDataStudioSegments(ORDERS_ID);
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
+
+ cy.log("fill in segment name");
+ SegmentEditor.getNameInput().type("Gadget Orders");
+
+ cy.log("open filter picker for Product → Category via implicit join");
+ SegmentEditor.getFilterPlaceholder().click();
+ H.popover().within(() => {
+ cy.findByText("Product").click();
+ cy.findByText("Category").click();
+ });
+
+ cy.log("verify list values are hydrated for FK table field");
+ H.popover().within(() => {
+ cy.findByPlaceholderText("Search the list").should("be.visible");
+ cy.findByText("Widget").should("be.visible");
+ cy.findByText("Gadget").should("be.visible");
+ cy.findByText("Gizmo").should("be.visible");
+ cy.findByText("Doohickey").should("be.visible");
+ cy.findByText("Gadget").click();
+ cy.button("Add filter").click();
+ });
+
+ cy.log("save segment");
+ SegmentEditor.getRowCount().should("be.visible");
+ SegmentEditor.getSaveButton().click();
+ cy.wait("@createSegment");
+
+ cy.log("verify segment created");
+ H.undoToast().should("contain.text", "Segment created");
+ SegmentEditor.get()
+ .findByDisplayValue("Gadget Orders")
+ .should("be.visible");
+ });
+
+ it("should not show segments from FK tables in the filter picker", () => {
+ cy.log("create segment on Products table");
+ H.createSegment({
+ name: "Expensive Products",
+ table_id: PRODUCTS_ID,
+ definition: {
+ type: "query",
+ database: SAMPLE_DB_ID,
+ query: {
+ "source-table": PRODUCTS_ID,
+ filter: [">", ["field", PRODUCTS.PRICE, null], 50],
+ },
+ },
+ });
+
+ cy.log("navigate to create segment on Orders table");
+ visitDataStudioSegments(ORDERS_ID);
+ SegmentList.getNewSegmentLink().scrollIntoView().click();
+
+ cy.log("open filter picker and expand Product table");
+ SegmentEditor.getFilterPlaceholder().click();
+ H.popover().findByText("Product").click();
+
+ cy.log("verify Category field is visible but Products segment is not");
+ H.popover().findByText("Category").should("be.visible");
+ H.popover().findByText("Expensive Products").should("not.exist");
+ });
+ });
+
+ describe("Segment dependencies", () => {
+ it("should create and use a segment based on another segment", () => {
+ cy.log("create base segment");
+ createTestSegment({
+ name: "High Value Orders",
+ filter: [">", ["field", ORDERS.TOTAL, null], 100],
+ });
+
+ cy.get<number>("@segmentId").then((baseSegmentId) => {
+ cy.log("create segment based on segment");
+ H.createSegment({
+ name: "High Value Recent Orders",
+ table_id: ORDERS_ID,
+ definition: {
+ type: "query",
+ database: SAMPLE_DB_ID,
+ query: {
+ "source-table": ORDERS_ID,
+ filter: [
+ "and",
+ ["segment", baseSegmentId],
+ [">", ["field", ORDERS.CREATED_AT, null], "2020-01-01"],
+ ],
+ },
+ },
+ });
+ });
+
+ cy.log("verify both segments appear in query builder");
+ verifySegmentInQueryBuilder("High Value Orders");
+ H.openTable({ table: ORDERS_ID, mode: "notebook" });
+ H.getNotebookStep("data").button("Filter").click();
+ H.popover().findByText("High Value Recent Orders").should("be.visible");
+
+ cy.log("verify dependent segment works");
+ H.popover().findByText("High Value Recent Orders").click();
+ H.visualize();
+ H.tableInteractive().should("be.visible");
+ });
+ });
+
+ describe("Segment cycles", () => {
+ it.skip("should prevent creating segment cycles", () => {
+ cy.log("create Segment A");
+ H.createSegment({
+ name: "Segment A",
+ table_id: ORDERS_ID,
+ definition: {
+ type: "query",
+ database: SAMPLE_DB_ID,
+ query: {
+ "source-table": ORDERS_ID,
+ filter: [">", ["field", ORDERS.TOTAL, null], 50],
+ },
+ },
+ }).then(({ body: segmentA }) => {
+ cy.log("create Segment B that depends on A");
+ H.createSegment({
+ name: "Segment B",
+ table_id: ORDERS_ID,
+ definition: {
+ type: "query",
+ database: SAMPLE_DB_ID,
+ query: {
+ "source-table": ORDERS_ID,
+ filter: ["segment", segmentA.id],
+ },
+ },
+ });
+
+ cy.log("edit Segment A via UI and try to add Segment B as filter");
+ cy.visit(`/data-studio/modeling/segments/${segmentA.id}`);
+ cy.wait("@metadata");
+
+ SegmentEditor.get().icon("add").click();
+ H.popover().findByText("Segment B").click();
+
+ cy.log("try to save and verify error");
+ SegmentEditor.getSaveButton().click();
+ cy.wait("@updateSegment");
+ H.undoToast().should(
+ "contain.text",
+ "Unable to save segments with circular dependencies",
+ );
+ });
});
});
});
@@ -280,11 +492,12 @@ function visitDataStudioTable(tableId: number) {
});
}
-function visitDataStudioTableSegmentsTab(tableId: number) {
- cy.visit(
- `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${tableId}/segments`,
- );
- cy.wait("@metadata");
+function visitDataStudioSegments(tableId: number) {
+ H.DataModel.visitDataStudioSegments({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId,
+ });
}
function createTestSegment(
@@ -326,7 +539,10 @@ function verifySegmentInQueryBuilder(
H.openTable({ table: tableId, mode: "notebook" });
H.getNotebookStep("data").button("Filter").click();
- H.popover().findByText(segmentName).should("be.visible");
+ H.popover().findByText(segmentName).click();
+
+ H.visualize();
+ H.tableInteractive().should("be.visible");
}
function verifySegmentNotInQueryBuilder(
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
index f310bd33db7..c309e5377b5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
@@ -1,7 +1,23 @@
-import { skipToken, useGetTableQueryMetadataQuery } from "metabase/api";
+import { useEffect } from "react";
+
+import {
+ fetchForeignTablesMetadata,
+ skipToken,
+ useGetTableQueryMetadataQuery,
+} from "metabase/api";
+import { useDispatch } from "metabase/lib/redux";
import type { TableId } from "metabase-types/api";
-export function useLoadTableWithMetadata(tableId: TableId | undefined) {
+type UseLoadTableWithMetadataOptions = {
+ includeForeignTables?: boolean;
+};
+
+export function useLoadTableWithMetadata(
+ tableId: TableId | undefined,
+ { includeForeignTables = false }: UseLoadTableWithMetadataOptions = {},
+) {
+ const dispatch = useDispatch();
+
const {
data: table,
isLoading,
@@ -12,9 +28,15 @@ export function useLoadTableWithMetadata(tableId: TableId | undefined) {
: skipToken,
);
- return {
- table,
- isLoading,
- error,
- };
+ useEffect(() => {
+ if (includeForeignTables && table) {
+ dispatch(
+ fetchForeignTablesMetadata(table, {
+ include_editable_data_model: true,
+ }),
+ );
+ }
+ }, [dispatch, table, includeForeignTables]);
+
+ return { table, isLoading, error };
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/EditSegmentPage/EditSegmentPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/EditSegmentPage/EditSegmentPage.tsx
index dbe9a13af98..ceab870bfc1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/EditSegmentPage/EditSegmentPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/EditSegmentPage/EditSegmentPage.tsx
@@ -39,7 +39,9 @@ export function EditSegmentPage({ params, route }: EditSegmentPageProps) {
table,
isLoading: isLoadingTable,
error: tableError,
- } = useLoadTableWithMetadata(segment?.table_id);
+ } = useLoadTableWithMetadata(segment?.table_id, {
+ includeForeignTables: true,
+ });
const [updateSegment, { isLoading: isSaving }] = useUpdateSegmentMutation();
const [deleteSegment, { isLoading: isRemoving }] = useDeleteSegmentMutation();
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
index dd242dd7de6..94cef8ab0fe 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
@@ -27,7 +27,9 @@ export function NewSegmentPage({ route, location }: NewSegmentPageProps) {
const tableIdParam = new URLSearchParams(location.search).get("tableId");
const tableId = tableIdParam ? Number(tableIdParam) : undefined;
- const { table, isLoading, error } = useLoadTableWithMetadata(tableId);
+ const { table, isLoading, error } = useLoadTableWithMetadata(tableId, {
+ includeForeignTables: true,
+ });
const [createSegment, { isLoading: isSaving }] = useCreateSegmentMutation();
diff --git a/frontend/src/metabase/api/table.ts b/frontend/src/metabase/api/table.ts
index 370100215b3..c072995257c 100644
--- a/frontend/src/metabase/api/table.ts
+++ b/frontend/src/metabase/api/table.ts
@@ -173,3 +173,23 @@ export const {
useSyncTableSchemaMutation,
useDiscardTableFieldValuesMutation,
} = tableApi;
+
+export const fetchForeignTablesMetadata = (
+ table: Table,
+ params?: Omit<GetTableQueryMetadataRequest, "id">,
+) => {
+ return (dispatch: (action: unknown) => void) => {
+ const fkTableIds = new Set<TableId>();
+ for (const field of table.fields ?? []) {
+ if (field.target?.table_id != null) {
+ fkTableIds.add(field.target.table_id);
+ }
+ }
+
+ fkTableIds.forEach((id) =>
+ dispatch(
+ tableApi.endpoints.getTableQueryMetadata.initiate({ id, ...params }),
+ ),
+ );
+ };
+};