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
Dependency tracking graph (#64202)
Alexander Polyankin1b03fa10a92d
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex a05aa61e32d..ef1d2bf6740 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -1721,6 +1721,7 @@premium-featuresqueriesquery-processor+ revisionssettingstaskutil}}@@ -2012,6 +2013,7 @@premium-featuresquery-processorrequest+ searchsettingssynctaskdiff --git a/e2e/test/scenarios/dependencies/dependencies.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.tssimilarity index 99%rename from e2e/test/scenarios/dependencies/dependencies.cy.spec.tsrename to e2e/test/scenarios/dependencies/dependency-checks.cy.spec.tsindex 8bc92b89c54..1e94b7c85ba 100644--- a/e2e/test/scenarios/dependencies/dependencies.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts@@ -6,7 +6,7 @@ import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";const { PRODUCTS_ID } = SAMPLE_DATABASE;-H.describeWithSnowplowEE("documents", () => {+H.describeWithSnowplowEE("scenarios > dependencies > dependency checks", () => {beforeEach(() => {H.restore("postgres-writable");H.resetTestTable({ type: "postgres", table: "many_schemas" });diff --git a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.tsnew file mode 100644index 00000000000..9ef236717e0--- /dev/null+++ b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts@@ -0,0 +1,1019 @@+const { H } = cy;++import { WRITABLE_DB_ID } from "e2e/support/cypress_data";+import {+ ADMIN_PERSONAL_COLLECTION_ID,+ FIRST_COLLECTION_ID,+ ORDERS_DASHBOARD_ID,+ SECOND_COLLECTION_ID,+} from "e2e/support/cypress_sample_instance_data";+import type { IconName } from "metabase/ui";+import type {+ CardId,+ CardType,+ CollectionId,+ DependencyId,+ DependencyType,+ NativeQuerySnippetId,+ TableId,+ TransformId,+} from "metabase-types/api";++const BASE_URL = "/dependencies";+const TABLE_NAME = "scoreboard_actions";+const TABLE_DISPLAY_NAME = "Scoreboard Actions";+const TABLE_ID_ALIAS = "tableId";+const TRANSFORM_TABLE_NAME = "transform_table";+const TRANSFORM_TABLE_DISPLAY_NAME = "Transform Table";+const TABLE_BASED_QUESTION_NAME = "Table-based question";+const TABLE_BASED_MODEL_NAME = "Table-based model";+const TABLE_BASED_METRIC_NAME = "Table-based metric";+const TABLE_BASED_TRANSFORM_NAME = "Table-based transform";+const CARD_BASED_QUESTION_NAME = "Card-based question";+const CARD_BASED_MODEL_NAME = "Card-based model";+const CARD_BASED_METRIC_NAME = "Card-based metric";+const CARD_BASED_TRANSFORM_NAME = "Card-based transform";+const CARD_BASED_SNIPPET_NAME = "Card-based snippet";+const METRIC_BASED_QUESTION_NAME = "Metric-based question";+const METRIC_BASED_MODEL_NAME = "Metric-based model";+const METRIC_BASED_METRIC_NAME = "Metric-based metric";+const METRIC_BASED_TRANSFORM_NAME = "Metric-based transform";+const EMPTY_SNIPPET_NAME = "Empty snippet";+const SNIPPET_BASED_QUESTION_NAME = "Snippet-based question";+const SNIPPET_BASED_MODEL_NAME = "Snippet-based model";+const SNIPPET_BASED_TRANSFORM_NAME = "Snippet-based transform";+const SNIPPET_BASED_SNIPPET_NAME = "Snippet-based snippet";++describe("scenarios > dependencies > dependency graph", () => {+ beforeEach(() => {+ H.restore("postgres-writable");+ H.resetTestTable({ type: "postgres", table: TABLE_NAME });+ cy.signInAsAdmin();+ H.activateToken("bleeding-edge");+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: TABLE_NAME });+ H.getTableId({ name: TABLE_NAME }).as(TABLE_ID_ALIAS);+ });++ describe("entity search", () => {+ function testEntitySearch({+ itemName,+ itemIcon,+ isRecentItem,+ }: {+ itemName: string;+ itemIcon: IconName;+ isRecentItem: boolean;+ }) {+ cy.log(`verify that "${itemName}" can be found via search`);+ graphEntrySearchInput().clear().type(itemName);+ H.popover().findByText(itemName).click();+ graphEntryButton().should("have.text", itemName);+ graphEntryButton().icon(itemIcon).should("be.visible");+ graphEntryButton().icon("close").click();++ if (isRecentItem) {+ graphEntrySearchInput().click();+ H.popover().findByText(itemName).should("be.visible");+ }+ }++ function testEntityPicker({+ tabName,+ itemName,+ itemLevel,+ itemIcon,+ }: {+ tabName: string;+ itemName: string;+ itemLevel: number;+ itemIcon: IconName;+ }) {+ cy.log(`verify that "${itemName}" can be selected in the picker`);+ graphEntrySearchInput().click();+ H.popover().findByText("Browse all").click();+ H.entityPickerModal().within(() => {+ H.entityPickerModalTab(tabName).click();+ H.entityPickerModalItem(itemLevel, itemName).click();+ });+ graphEntryButton().should("have.text", itemName);+ graphEntryButton().icon(itemIcon).should("be.visible");++ cy.log(`verify that "${itemName}" is selected when the picker is opened`);+ graphEntryButton().click();+ H.entityPickerModal().within(() => {+ H.entityPickerModalItem(itemLevel, itemName).should(+ "have.attr",+ "data-active",+ "true",+ );+ cy.findByLabelText("Close").click();+ });+ graphEntryButton().icon("close").click();++ cy.log(`verify that "${itemName}" can be found via search"`);+ graphEntrySearchInput().click();+ H.popover().findByText("Browse all").click();+ H.entityPickerModal().within(() => {+ H.entityPickerModalTab(tabName).click();+ cy.findByPlaceholderText(/Search/).type(itemName);+ cy.findByText(/result for/).should("be.visible");+ cy.findByText(itemName).click();+ });+ graphEntryButton().should("have.text", itemName);+ graphEntryButton().icon(itemIcon).should("be.visible");+ graphEntryButton().icon("close").click();+ }++ it("should be able to use inline search for all supported entity types", () => {+ getScoreboardTableId().then((tableId) => {+ createTableBasedMetric({ tableId });+ createTableBasedTransform({ tableName: TABLE_NAME });+ });+ visitGraph();++ testEntitySearch({+ itemName: "Products",+ itemIcon: "table",+ isRecentItem: true,+ });+ testEntitySearch({+ itemName: "Orders, Count, Grouped by Created At (year)",+ itemIcon: "line",+ isRecentItem: true,+ });+ testEntitySearch({+ itemName: "Orders Model",+ itemIcon: "model",+ isRecentItem: true,+ });+ testEntitySearch({+ itemName: TABLE_BASED_METRIC_NAME,+ itemIcon: "metric",+ isRecentItem: false,+ });+ testEntitySearch({+ itemName: TABLE_BASED_TRANSFORM_NAME,+ itemIcon: "refresh_downstream",+ isRecentItem: false,+ });+ });++ it("should be able to use the entity picker for all supported entity types", () => {+ getScoreboardTableId().then((tableId) => {+ createTableBasedMetric({ tableId });+ createTableBasedTransform({ tableName: TABLE_NAME });+ });++ visitGraph();+ testEntityPicker({+ tabName: "Tables",+ itemName: "Products",+ itemLevel: 2,+ itemIcon: "table",+ });+ testEntityPicker({+ tabName: "Collections",+ itemName: "Orders, Count, Grouped by Created At (year)",+ itemLevel: 1,+ itemIcon: "line",+ });+ testEntityPicker({+ tabName: "Collections",+ itemName: "Orders Model",+ itemLevel: 1,+ itemIcon: "model",+ });+ testEntityPicker({+ tabName: "Collections",+ itemName: TABLE_BASED_METRIC_NAME,+ itemLevel: 1,+ itemIcon: "metric",+ });+ testEntityPicker({+ tabName: "Transforms",+ itemName: TABLE_BASED_TRANSFORM_NAME,+ itemLevel: 0,+ itemIcon: "refresh_downstream",+ });+ });+ });++ describe("entity focus", () => {+ it("should be possible to select an entity via search", () => {+ getScoreboardTableId().then((tableId) => {+ createTableBasedQuestion({ tableId }).then(({ body: card }) => {+ visitGraphForEntity(card.id, "card");+ });+ });++ graphSelectionButton().click();+ H.popover().findByText(TABLE_DISPLAY_NAME).click();+ dependencyGraph().within(() => {+ cy.findByLabelText(TABLE_DISPLAY_NAME).should("be.visible");+ cy.findByLabelText(TABLE_BASED_QUESTION_NAME).should("be.visible");+ });+ });+ });++ describe("dependent types", () => {+ function verifyPanelNavigation({+ itemTitle,+ groupTitle,+ dependentItemTitle,+ }: {+ itemTitle: string;+ groupTitle: string;+ dependentItemTitle: string;+ }) {+ dependencyGraph()+ .findByLabelText(itemTitle)+ .findByText(groupTitle)+ .click();+ graphDependencyPanel()+ .findByLabelText(dependentItemTitle)+ .findByText(dependentItemTitle)+ .click();+ graphEntryButton().findByText(dependentItemTitle).should("be.visible");+ cy.go("back");+ }++ it("should display dependencies for a table and navigate to them", () => {+ getScoreboardTableId().then((tableId) => {+ createTableBasedQuestion({ tableId });+ createTableBasedModel({ tableId });+ createTableBasedMetric({ tableId });+ createTableBasedTransform({ tableName: TABLE_NAME });+ visitGraphForEntity(tableId, "table");+ });+ verifyPanelNavigation({+ itemTitle: TABLE_DISPLAY_NAME,+ groupTitle: "1 question",+ dependentItemTitle: TABLE_BASED_QUESTION_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_DISPLAY_NAME,+ groupTitle: "1 model",+ dependentItemTitle: TABLE_BASED_MODEL_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_DISPLAY_NAME,+ groupTitle: "1 metric",+ dependentItemTitle: TABLE_BASED_METRIC_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_DISPLAY_NAME,+ groupTitle: "1 transform",+ dependentItemTitle: TABLE_BASED_TRANSFORM_NAME,+ });+ });++ it("should display dependencies for a question and navigate to them", () => {+ getScoreboardTableId()+ .then((tableId) => createTableBasedQuestion({ tableId }))+ .then(({ body: card }) => {+ createCardBasedQuestion({ cardId: card.id });+ createCardBasedModel({ cardId: card.id });+ createCardBasedMetric({ cardId: card.id });+ createCardBasedTransform({ cardId: card.id });+ createCardBasedSnippet({ cardId: card.id });+ visitGraphForEntity(card.id, "card");+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_QUESTION_NAME,+ groupTitle: "1 question",+ dependentItemTitle: CARD_BASED_QUESTION_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_QUESTION_NAME,+ groupTitle: "1 model",+ dependentItemTitle: CARD_BASED_MODEL_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_QUESTION_NAME,+ groupTitle: "1 metric",+ dependentItemTitle: CARD_BASED_METRIC_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_QUESTION_NAME,+ groupTitle: "1 transform",+ dependentItemTitle: CARD_BASED_TRANSFORM_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_QUESTION_NAME,+ groupTitle: "1 snippet",+ dependentItemTitle: CARD_BASED_SNIPPET_NAME,+ });+ });++ it("should display dependencies for a model and navigate to them", () => {+ getScoreboardTableId()+ .then((tableId) => createTableBasedModel({ tableId }))+ .then(({ body: card }) => {+ createCardBasedQuestion({ cardId: card.id });+ createCardBasedModel({ cardId: card.id });+ createCardBasedMetric({ cardId: card.id });+ createCardBasedTransform({ cardId: card.id });+ createCardBasedSnippet({ cardId: card.id });+ visitGraphForEntity(card.id, "card");+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MODEL_NAME,+ groupTitle: "1 question",+ dependentItemTitle: CARD_BASED_QUESTION_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MODEL_NAME,+ groupTitle: "1 model",+ dependentItemTitle: CARD_BASED_MODEL_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MODEL_NAME,+ groupTitle: "1 metric",+ dependentItemTitle: CARD_BASED_METRIC_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MODEL_NAME,+ groupTitle: "1 transform",+ dependentItemTitle: CARD_BASED_TRANSFORM_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MODEL_NAME,+ groupTitle: "1 snippet",+ dependentItemTitle: CARD_BASED_SNIPPET_NAME,+ });+ });++ it("should display dependencies for a metric and navigate to them", () => {+ getScoreboardTableId().then((tableId) =>+ createTableBasedMetric({ tableId }).then(({ body: card }) => {+ createMetricBasedQuestion({ tableId, metricId: card.id });+ createMetricBasedModel({ tableId, metricId: card.id });+ createMetricBasedMetric({ tableId, metricId: card.id });+ createMetricBasedTransform({ tableId, metricId: card.id });+ visitGraphForEntity(card.id, "card");+ }),+ );+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_METRIC_NAME,+ groupTitle: "1 question",+ dependentItemTitle: METRIC_BASED_QUESTION_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_METRIC_NAME,+ groupTitle: "1 model",+ dependentItemTitle: METRIC_BASED_MODEL_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_METRIC_NAME,+ groupTitle: "1 metric",+ dependentItemTitle: METRIC_BASED_METRIC_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_METRIC_NAME,+ groupTitle: "1 transform",+ dependentItemTitle: METRIC_BASED_TRANSFORM_NAME,+ });+ });++ it("should display dependencies for a transform and navigate to them", () => {+ createTableBasedTransform({ tableName: TABLE_NAME }).then(+ ({ body: transform }) => {+ runTransformAndWaitForSuccess(transform.id);+ visitGraphForEntity(transform.id, "transform");+ },+ );+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_TRANSFORM_NAME,+ groupTitle: "1 table",+ dependentItemTitle: TRANSFORM_TABLE_DISPLAY_NAME,+ });+ });++ it("should display dependencies for a snippet and navigate to them", () => {+ createEmptySnippet().then(({ body: snippet }) => {+ createSnippetBasedQuestion({+ tableName: TABLE_NAME,+ snippetId: snippet.id,+ snippetName: snippet.name,+ });+ createSnippetBasedModel({+ tableName: TABLE_NAME,+ snippetId: snippet.id,+ snippetName: snippet.name,+ });+ createSnippetBasedTransform({+ tableName: TABLE_NAME,+ snippetId: snippet.id,+ snippetName: snippet.name,+ });+ createSnippetBasedSnippet({ snippetName: snippet.name });+ visitGraphForEntity(snippet.id, "snippet");+ });+ verifyPanelNavigation({+ itemTitle: EMPTY_SNIPPET_NAME,+ groupTitle: "1 question",+ dependentItemTitle: SNIPPET_BASED_QUESTION_NAME,+ });+ verifyPanelNavigation({+ itemTitle: EMPTY_SNIPPET_NAME,+ groupTitle: "1 model",+ dependentItemTitle: SNIPPET_BASED_MODEL_NAME,+ });+ verifyPanelNavigation({+ itemTitle: EMPTY_SNIPPET_NAME,+ groupTitle: "1 transform",+ dependentItemTitle: SNIPPET_BASED_TRANSFORM_NAME,+ });+ verifyPanelNavigation({+ itemTitle: EMPTY_SNIPPET_NAME,+ groupTitle: "1 snippet",+ dependentItemTitle: SNIPPET_BASED_SNIPPET_NAME,+ });+ });+ });++ describe("dependent filtering", () => {+ function verifyFilter({+ filterName,+ visibleItems,+ hiddenItems,+ }: {+ filterName: string;+ visibleItems: string[];+ hiddenItems: string[];+ }) {+ graphDependencyPanel().icon("filter").click();+ H.popover().findByText(filterName).click();+ graphDependencyPanel().within(() => {+ visibleItems.forEach((item) =>+ cy.findByText(item).should("be.visible"),+ );+ hiddenItems.forEach((item) => cy.findByText(item).should("not.exist"));+ });+ H.popover().findByText(filterName).click();+ graphDependencyPanel().icon("filter").click();+ }++ it("should be able to filter questions", () => {+ makeCollectionOfficial(FIRST_COLLECTION_ID);+ getScoreboardTableId().then((tableId) => {+ createTableBasedQuestion({+ name: "Verified question",+ tableId,+ }).then(({ body: card }) => {+ verifyCard(card.id);+ });+ createTableBasedQuestion({+ name: "Question in dashboard",+ tableId,+ dashboardId: ORDERS_DASHBOARD_ID,+ });+ createTableBasedQuestion({+ name: "Question in root collection",+ tableId,+ });+ createTableBasedQuestion({+ name: "Question in official collection",+ tableId,+ collectionId: FIRST_COLLECTION_ID,+ });+ createTableBasedQuestion({+ name: "Question in regular collection",+ tableId,+ collectionId: SECOND_COLLECTION_ID,+ });+ createTableBasedQuestion({+ name: "Question in personal collection",+ tableId,+ collectionId: ADMIN_PERSONAL_COLLECTION_ID,+ });+ visitGraphForEntity(tableId, "table");+ });+ dependencyGraph()+ .findByLabelText(TABLE_DISPLAY_NAME)+ .findByText("6 questions")+ .click();+ verifyFilter({+ filterName: "Verified",+ visibleItems: ["Verified question"],+ hiddenItems: ["Question in official collection"],+ });+ verifyFilter({+ filterName: "In a dashboard",+ visibleItems: ["Question in dashboard"],+ hiddenItems: ["Verified question", "Question in regular collection"],+ });+ verifyFilter({+ filterName: "In an official collection",+ visibleItems: ["Question in official collection"],+ hiddenItems: [+ "Verified question",+ "Question in dashboard",+ "Question in root collection",+ ],+ });+ verifyFilter({+ filterName: "Not in personal collection",+ visibleItems: [+ "Question in dashboard",+ "Question in root collection",+ "Question in regular collection",+ ],+ hiddenItems: ["Question in personal collection"],+ });+ });+ });++ describe.skip("permissions", () => {+ it("should be able to view database entities without collection access", () => {+ getScoreboardTableId().then((tableId) => {+ createTableBasedQuestion({ tableId });+ createTableBasedModel({ tableId });+ createTableBasedMetric({ tableId });+ createTableBasedTransform({ tableName: TABLE_NAME });+ cy.signIn("nocollection");+ visitGraphForEntity(tableId, "table");+ });++ dependencyGraph().within(() => {+ cy.findByLabelText(TABLE_DISPLAY_NAME).within(() => {+ cy.findByText(/question/).should("not.exist");+ cy.findByText(/model/).should("not.exist");+ cy.findByText(/metric/).should("not.exist");+ cy.findByText(/transform/).should("not.exist");+ });+ });+ });++ it("should be able to view collection entities without data access", () => {+ getScoreboardTableId()+ .then((tableId) => createTableBasedQuestion({ tableId }))+ .then(({ body: card }) => {+ createCardBasedQuestion({ cardId: card.id });+ createCardBasedModel({ cardId: card.id });+ createCardBasedMetric({ cardId: card.id });+ createCardBasedTransform({ cardId: card.id });+ createCardBasedSnippet({ cardId: card.id });+ cy.signIn("nodata");+ visitGraphForEntity(card.id, "card");+ });++ dependencyGraph().within(() => {+ cy.findByLabelText(TABLE_DISPLAY_NAME).should("not.exist");+ cy.findByLabelText(TABLE_BASED_QUESTION_NAME).within(() => {+ cy.findByText("1 question").should("be.visible");+ cy.findByText("1 model").should("be.visible");+ cy.findByText("1 metric").should("be.visible");+ cy.findByText("1 snippet").should("be.visible");+ cy.findByText(/transform/).should("not.exist");+ });+ });+ });+ });+});++function visitGraph() {+ cy.visit(BASE_URL);+}++function visitGraphForEntity(id: DependencyId, type: DependencyType) {+ return cy.visit(`/${BASE_URL}/${type}/${id}`);+}++function dependencyGraph() {+ return cy.findByTestId("dependency-graph");+}++function graphEntryButton() {+ return cy.findByTestId("graph-entry-button");+}++function graphEntrySearchInput() {+ return cy.findByTestId("graph-entry-search-input");+}++function graphSelectionButton() {+ return cy.findByTestId("graph-selection-button");+}++function graphDependencyPanel() {+ return cy.findByTestId("graph-dependency-panel");+}++function getScoreboardTableId() {+ return cy.get<number>(`@${TABLE_ID_ALIAS}`);+}++function makeCollectionOfficial(collectionId: CollectionId) {+ cy.request("PUT", `/api/collection/${collectionId}`, {+ authority_level: "official",+ });+}++function verifyCard(cardId: CardId) {+ cy.request("POST", "/api/moderation-review", {+ status: "verified",+ moderated_item_id: cardId,+ moderated_item_type: "card",+ });+}++function createTableBasedCard({+ name,+ type,+ tableId,+ collectionId,+ dashboardId,+}: {+ name: string;+ type: CardType;+ tableId: TableId;+ collectionId?: number | null;+ dashboardId?: number | null;+}) {+ return H.createQuestion({+ name,+ type,+ database: WRITABLE_DB_ID,+ query: {+ "source-table": tableId,+ },+ collection_id: collectionId,+ dashboard_id: dashboardId,+ });+}++function createTableBasedQuestion({+ name = TABLE_BASED_QUESTION_NAME,+ tableId,+ collectionId = null,+ dashboardId = null,+}: {+ name?: string;+ tableId: TableId;+ collectionId?: number | null;+ dashboardId?: number | null;+}) {+ return createTableBasedCard({+ name,+ type: "question",+ tableId,+ collectionId: collectionId,+ dashboardId,+ });+}++function createTableBasedModel({+ name = TABLE_BASED_MODEL_NAME,+ tableId,+ collectionId,+}: {+ name?: string;+ tableId: TableId;+ collectionId?: number | null;+}) {+ return createTableBasedCard({+ name,+ type: "model",+ tableId,+ collectionId,+ });+}++function createCardBasedCard({+ name,+ type,+ cardId,+}: {+ name: string;+ type: CardType;+ cardId: CardId;+}) {+ return H.createQuestion({+ name,+ type,+ database: WRITABLE_DB_ID,+ query: {+ "source-table": `card__${cardId}`,+ },+ });+}++function createCardBasedQuestion({ cardId }: { cardId: CardId }) {+ return createCardBasedCard({+ name: CARD_BASED_QUESTION_NAME,+ type: "question",+ cardId,+ });+}++function createCardBasedModel({ cardId }: { cardId: CardId }) {+ return createCardBasedCard({+ name: CARD_BASED_MODEL_NAME,+ type: "model",+ cardId,+ });+}++function createMetricBasedCard({+ name,+ type,+ tableId,+ metricId,+}: {+ name: string;+ type: CardType;+ tableId: TableId;+ metricId: CardId;+}) {+ return H.createQuestion({+ name,+ type,+ database: WRITABLE_DB_ID,+ query: {+ "source-table": tableId,+ aggregation: [["metric", metricId]],+ },+ });+}++function createMetricBasedQuestion({+ tableId,+ metricId,+}: {+ tableId: TableId;+ metricId: CardId;+}) {+ return createMetricBasedCard({+ name: METRIC_BASED_QUESTION_NAME,+ type: "question",+ tableId,+ metricId,+ });+}++function createMetricBasedModel({+ tableId,+ metricId,+}: {+ tableId: TableId;+ metricId: CardId;+}) {+ return createMetricBasedCard({+ name: METRIC_BASED_MODEL_NAME,+ type: "model",+ tableId,+ metricId,+ });+}++function createSnippetBasedCard({+ name,+ type,+ tableName,+ snippetId,+ snippetName,+}: {+ name: string;+ type: CardType;+ tableName: string;+ snippetId: NativeQuerySnippetId;+ snippetName: string;+}) {+ return H.createNativeQuestion({+ name,+ type,+ database: WRITABLE_DB_ID,+ native: {+ query: `SELECT * FROM ${tableName} WHERE {{snippet:${snippetName}}}`,+ "template-tags": {+ [`snippet:${snippetName}`]: {+ id: "4b77cc1f-ea70-4ef6-84db-58432fce6928",+ name: `snippet:${snippetName}`,+ "display-name": `snippet:${snippetName}`,+ type: "snippet",+ "snippet-id": snippetId,+ "snippet-name": snippetName,+ },+ },+ },+ });+}++function createSnippetBasedQuestion({+ tableName,+ snippetId,+ snippetName,+}: {+ tableName: string;+ snippetId: NativeQuerySnippetId;+ snippetName: string;+}) {+ return createSnippetBasedCard({+ name: SNIPPET_BASED_QUESTION_NAME,+ type: "question",+ tableName,+ snippetId,+ snippetName,+ });+}++function createSnippetBasedModel({+ tableName,+ snippetId,+ snippetName,+}: {+ tableName: string;+ snippetId: NativeQuerySnippetId;+ snippetName: string;+}) {+ return createSnippetBasedCard({+ name: SNIPPET_BASED_MODEL_NAME,+ type: "model",+ tableName,+ snippetId,+ snippetName,+ });+}++function createTableBasedMetric({ tableId }: { tableId: TableId }) {+ return H.createQuestion({+ name: TABLE_BASED_METRIC_NAME,+ type: "metric",+ database: WRITABLE_DB_ID,+ query: {+ "source-table": tableId,+ aggregation: [["count"]],+ },+ });+}++function createCardBasedMetric({ cardId }: { cardId: CardId }) {+ return H.createQuestion({+ name: CARD_BASED_METRIC_NAME,+ type: "metric",+ database: WRITABLE_DB_ID,+ query: {+ "source-table": `card__${cardId}`,+ aggregation: [["count"]],+ },+ });+}++function createMetricBasedMetric({+ tableId,+ metricId,+}: {+ tableId: TableId;+ metricId: CardId;+}) {+ return H.createQuestion({+ name: METRIC_BASED_METRIC_NAME,+ type: "metric",+ database: WRITABLE_DB_ID,+ query: {+ "source-table": tableId,+ aggregation: [["metric", metricId]],+ },+ });+}++function createTableBasedTransform({ tableName }: { tableName: string }) {+ return H.createTransform({+ name: TABLE_BASED_TRANSFORM_NAME,+ source: {+ type: "query",+ query: {+ database: WRITABLE_DB_ID,+ type: "native",+ native: {+ query: `SELECT * from ${tableName}`,+ "template-tags": {},+ },+ },+ },+ target: {+ type: "table",+ database: WRITABLE_DB_ID,+ schema: "public",+ name: TRANSFORM_TABLE_NAME,+ },+ });+}++function createCardBasedTransform({ cardId }: { cardId: CardId }) {+ return H.createTransform({+ name: CARD_BASED_TRANSFORM_NAME,+ source: {+ type: "query",+ query: {+ database: WRITABLE_DB_ID,+ type: "query",+ query: {+ "source-table": `card__${cardId}`,+ },+ },+ },+ target: {+ type: "table",+ database: WRITABLE_DB_ID,+ schema: "public",+ name: TRANSFORM_TABLE_NAME,+ },+ });+}++function createMetricBasedTransform({+ tableId,+ metricId,+}: {+ tableId: TableId;+ metricId: CardId;+}) {+ return H.createTransform({+ name: METRIC_BASED_TRANSFORM_NAME,+ source: {+ type: "query",+ query: {+ database: WRITABLE_DB_ID,+ type: "query",+ query: {+ "source-table": tableId,+ aggregation: [["metric", metricId]],+ },+ },+ },+ target: {+ type: "table",+ database: WRITABLE_DB_ID,+ schema: "public",+ name: TRANSFORM_TABLE_NAME,+ },+ });+}++function createSnippetBasedTransform({+ tableName,+ snippetId,+ snippetName,+}: {+ tableName: string;+ snippetId: NativeQuerySnippetId;+ snippetName: string;+}) {+ return H.createTransform({+ name: SNIPPET_BASED_TRANSFORM_NAME,+ source: {+ type: "query",+ query: {+ database: WRITABLE_DB_ID,+ type: "native",+ native: {+ query: `SELECT * FROM ${tableName} WHERE {{snippet:${snippetName}}}`,+ "template-tags": {+ [`snippet:${snippetName}`]: {+ id: "4b77cc1f-ea70-4ef6-84db-58432fce6928",+ name: `snippet:${snippetName}`,+ "display-name": `snippet:${snippetName}`,+ type: "snippet",+ "snippet-id": snippetId,+ "snippet-name": snippetName,+ },+ },+ },+ },+ },+ target: {+ type: "table",+ database: WRITABLE_DB_ID,+ schema: "public",+ name: TRANSFORM_TABLE_NAME,+ },+ });+}++function runTransformAndWaitForSuccess(transformId: TransformId) {+ cy.request("POST", `/api/ee/transform/${transformId}/run`);+ H.waitForSucceededTransformRuns();+}++function createEmptySnippet() {+ return H.createSnippet({+ name: EMPTY_SNIPPET_NAME,+ content: "1 = 1",+ });+}++function createCardBasedSnippet({ cardId }: { cardId: CardId }) {+ return H.createSnippet({+ name: CARD_BASED_SNIPPET_NAME,+ content: `{{#${cardId}}}`,+ });+}++function createSnippetBasedSnippet({ snippetName }: { snippetName: string }) {+ return H.createSnippet({+ name: SNIPPET_BASED_SNIPPET_NAME,+ content: `{{snippet:${snippetName}}}`,+ });+}diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj b/enterprise/backend/src/metabase_enterprise/dependencies/api.cljindex 29396ae49b8..389e2d6cbf6 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj@@ -2,16 +2,19 @@(:require[medley.core :as m][metabase-enterprise.dependencies.core :as dependencies]+ [metabase-enterprise.dependencies.models.dependency :as dependency][metabase.analyze.core :as analyze][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]][metabase.api.util.handlers :as handlers][metabase.collections.models.collection.root :as collection.root]+ [metabase.graph.core :as graph][metabase.lib-be.core :as lib-be][metabase.lib.metadata :as lib.metadata][metabase.models.interface :as mi][metabase.native-query-snippets.core :as native-query-snippets][metabase.queries.schema :as queries.schema]+ [metabase.revisions.core :as revisions][metabase.util.i18n :refer [tru]][metabase.util.log :as log][metabase.util.malli.registry :as mr]@@ -39,7 +42,7 @@:bad_cards (into [] (comp (filter (fn [card](if (mi/can-read? card)card- (do (log/warnf "Eliding broken card %d - not readable by the user" (:id card))+ (do (log/debugf "Eliding broken card %d - not readable by the user" (:id card))nil))))(map (fn [card](-> card@@ -122,6 +125,119 @@breakages (dependencies/errors-from-proposed-edits {:snippet [snippet]})](broken-cards-response breakages)))+(defn- entity-keys [entity-type]+ (case entity-type+ :table [:name :description :display_name :db_id :db :schema :fields]+ :card [:name :type :display :database_id :view_count+ :created_at :creator :description+ :result_metadata :last-edit-info+ :collection :collection_id :dashboard :dashboard_id+ :moderation_reviews]+ :snippet [:name :description]+ :transform [:name :description :table]+ []))++(defn- format-subentity [entity]+ (case (t2/model entity)+ :model/Collection (select-keys entity [:id :name :authority_level :is_personal])+ :model/Dashboard (select-keys entity [:id :name])+ entity))++(defn- entity-value [entity-type {:keys [id] :as entity} usages]+ {:id id+ :type entity-type+ :data (->> (select-keys entity (entity-keys entity-type))+ (m/map-vals format-subentity))+ :dependents_count (usages [entity-type id])})++(defn- entity-model [entity-type]+ (case entity-type+ :table :model/Table+ :card :model/Card+ :snippet :model/NativeQuerySnippet+ :transform :model/Transform))++(defn- calc-usages+ "Calculates the count of direct dependents for all nodes in `nodes`, based on `graph`. "+ [graph nodes]+ (let [children-map (graph/children-of graph nodes)+ all-cards (->> (vals children-map)+ (apply concat)+ distinct+ (keep #(when (= (first %) :card)+ (second %))))+ card->type (when (seq all-cards)+ (t2/select-fn->fn :id :type [:model/Card :id :type :card_schema] :id [:in all-cards]))]+ (m/map-vals (fn [children]+ (->> children+ (map (fn [[entity-type entity-id]]+ (let [dependency-type (if (= entity-type :card)+ (card->type entity-id)+ entity-type)]+ {dependency-type 1})))+ (apply merge-with +)))+ children-map)))++(defn- expanded-nodes [downstream-graph nodes]+ (let [usages (calc-usages downstream-graph nodes)+ nodes-by-type (->> (group-by first nodes)+ (m/map-vals #(map second %)))]+ (mapcat (fn [[entity-type entity-ids]]+ (->> (cond-> (t2/select (entity-model entity-type)+ :id [:in entity-ids])+ (= entity-type :card) (-> (t2/hydrate :creator :dashboard [:collection :is_personal] :moderation_reviews)+ (->> (map collection.root/hydrate-root-collection))+ (revisions/with-last-edit-info :card))+ (= entity-type :table) (t2/hydrate :fields :db)+ (= entity-type :transform) (t2/hydrate :table-with-db-and-fields))+ (mapv #(entity-value entity-type % usages))))+ nodes-by-type)))++(api.macros/defendpoint :get "/graph"+ "TODO: This endpoint is supposed to take an :id and :type of an entity (currently :table, :card, :snippet,+ or :transform) and return the entity with all its upstream and downstream dependencies that should be fetched+ recursively. :edges match our :model/Dependency format. Each node in :nodes has :id, :type, and :data, and :data+ depends on the node type. For :table, there should be :display_name. For :card, there should be :name+ and :type. For :snippet -> :name. For :transform -> :name."+ [_route-params+ {:keys [id type]} :- [:map+ [:id {:optional true} ms/PositiveInt]+ [:type {:optional true} (ms/enum-decode-keyword [:table :card :snippet :transform])]]]+ (let [starting-nodes [[type id]]+ upstream-graph (dependency/graph-dependencies)+ ;; cache the downstream graph specifically, because between calculating transitive children and calculating+ ;; edges, we'll call this multiple times on the same nodes.+ downstream-graph (graph/cached-graph (dependency/graph-dependents))+ nodes (into (set starting-nodes)+ (graph/transitive upstream-graph starting-nodes))+ edges (graph/calc-edges downstream-graph nodes)]+ {:nodes (expanded-nodes downstream-graph nodes)+ :edges edges}))++(def ^:private dependents-args+ [:map+ [:id ms/PositiveInt]+ [:type (ms/enum-decode-keyword [:table :card :snippet :transform])]+ [:dependent_type (ms/enum-decode-keyword [:table :card :snippet :transform])]+ [:dependent_card_type {:optional true} (ms/enum-decode-keyword+ [:question :model :metric])]])++(api.macros/defendpoint :get "/graph/dependents"+ "TODO: This endpoint is supposed to take an :id and :type of an entity (currently :table, :card, :snippet,+ or :transform) and return the entity with all its upstream and downstream dependencies that should be fetched+ recursively. :edges match our :model/Dependency format. Each node in :nodes has :id, :type, and :data, and :data+ depends on the node type. For :table, there should be :display_name. For :card, there should be :name+ and :type. For :snippet -> :name. For :transform -> :name."+ [_route-params+ {:keys [id type dependent_type dependent_card_type]} :- dependents-args]+ (let [downstream-graph (graph/cached-graph (dependency/graph-dependents))+ nodes (-> (graph/children-of downstream-graph [[type id]])+ (get [type id]))]+ (->> (expanded-nodes downstream-graph nodes)+ (filter #(and (= (:type %) dependent_type)+ (or (not= dependent_type :card)+ (= (-> % :data :type) dependent_card_type)))))))+(def ^{:arglists '([request respond raise])} routes"`/api/ee/dependencies` routes."(handlers/routesdiff --git a/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency.clj b/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency.cljindex 043ec6c7738..766dc84fe98 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/models/dependency.clj@@ -40,15 +40,27 @@[key-seq](deps-children :to_entity_type :to_entity_id :from_entity_type :from_entity_id key-seq))+(defn- key-dependencies+ "Get the dependency entity keys for the entity keys in `entity-keys`, a seq of keys.+ Entity keys are [entity-type, entity-id] pairs. See [[entity-type->model]]."+ [key-seq]+ (deps-children :from_entity_type :from_entity_id :to_entity_type :to_entity_id key-seq))+(p/deftype+ DependencyGraph [children-fn]graph/Graph(children-of [_this key-seq](children-fn key-seq)))-;; NOTE: We can easily construct a graph of upstream dependencies too, if it's useful.-(defn- graph-dependents []+(defn graph-dependents+ "Return a dependency graph for finding dependents (downstream entities)."+ [](->DependencyGraph key-dependents))+(defn graph-dependencies+ "Return a dependency graph for finding dependencies (upstream entities)."+ []+ (->DependencyGraph key-dependencies))+(defn transitive-dependents"Given a map of updated entities `{entity-type [{:id 1, ...} ...]}`, return a map of its transitive dependentsas `{entity-type #{4 5 6}}` - that is, a map from downstream entity type to a set of IDs.diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj b/enterprise/backend/src/metabase_enterprise/transforms/models/transform.cljindex 2dadfa7fdde..57a3b642a8d 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj@@ -2,12 +2,14 @@(:require[clojure.set :as set][medley.core :as m]+ [metabase-enterprise.transforms.interface :as transforms.i][metabase-enterprise.transforms.models.transform-run :as transform-run][metabase.events.core :as events][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.models.interface :as mi][metabase.models.serialization :as serdes]+ [metabase.search.spec :as search.spec][metabase.util :as u][methodical.core :as methodical][toucan2.core :as t2]))@@ -19,6 +21,11 @@(doseq [trait [:metabase/model :hook/entity-id :hook/timestamped?]](derive :model/Transform trait))+;; Only superusers can access transforms+(doto :model/Transform+ (derive ::mi/read-policy.superuser)+ (derive ::mi/write-policy.superuser))+(defn- transform-source-out [m](-> mmi/json-out-without-keywordization@@ -135,6 +142,21 @@:tag_id tag-id:position (get new-positions tag-id)})))))))+;;; ----------------------------------------------- Search ----------------------------------------------------------++(search.spec/define-spec "transform"+ {:model :model/Transform+ :attrs {:archived false+ :collection-id false+ :creator-id false+ :database-id false+ :view-count false+ :created-at true+ :updated-at true}+ :search-terms [:name]+ :render-terms {:transform-name :name+ :transform-id :id}})+;;; ------------------------------------------------- Serialization ------------------------------------------------(mi/define-batched-hydration-method tags@@ -150,6 +172,29 @@(for [transform transforms](assoc transform :tags (get tag-mappings (u/the-id transform) []))))))+(mi/define-batched-hydration-method table-with-db-and-fields+ :table-with-db-and-fields+ "Fetch tables with their fields. The tables show up under the `:table` property."+ [transforms]+ (let [table-key-fn (fn [{:keys [target] :as transform}]+ [(transforms.i/target-db-id transform) (:schema target) (:name target)])+ table-keys (into #{} (map table-key-fn) transforms)+ table-keys-with-schema (filter second table-keys)+ table-keys-without-schema (keep (fn [[db-id schema table-name]]+ (when-not schema+ [db-id table-name]))+ table-keys)+ tables (-> (t2/select :model/Table+ {:where [:or+ [:in [:composite :db_id :schema :name] table-keys-with-schema]+ [:and+ [:= :schema nil]+ [:in [:composite :db_id :name] table-keys-without-schema]]]})+ (t2/hydrate :db :fields))+ table-keys->table (m/index-by (juxt :db_id :schema :name) tables)]+ (for [transform transforms]+ (assoc transform :table (get table-keys->table (table-key-fn transform))))))+(defmethod serdes/hash-fields :model/Transform[_transform][:name :created_at])diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.cljnew file mode 100644index 00000000000..d721314ae97--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj@@ -0,0 +1,295 @@+(ns metabase-enterprise.dependencies.api-test+ (:require+ [clojure.test :refer :all]+ [medley.core :as m]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.queries.models.card :as card]+ [metabase.test :as mt]))++(defn card-with-query+ "Create a card map with the given name and dataset query."+ [card-name dataset-query]+ {:name card-name+ :database_id (mt/id)+ :display :table+ :query_type :query+ :type :question+ :dataset_query dataset-query+ :visualization_settings {}})++(defn basic-card+ "Construct a basic card for dependency testing."+ ([]+ (basic-card "Test card"))+ ([card-name]+ (basic-card card-name :orders))+ ([card-name table-keyword]+ (let [mp (mt/metadata-provider)]+ (card-with-query card-name (lib/query mp (lib.metadata/table mp (mt/id table-keyword)))))))++(defn wrap-card+ "Construct a card depending on `inner-card` for dependency testing."+ [inner-card]+ (let [mp (mt/metadata-provider)+ card-meta (lib.metadata/card mp (:id inner-card))]+ (card-with-query "Downstream card" (lib/query mp card-meta))))++(deftest check-card-test+ (testing "POST /api/ee/dependencies/check_card"+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (mt/with-model-cleanup [:model/Card]+ (let [card (card/create-card! (basic-card) user)+ response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_card"+ (assoc (card/create-card! (basic-card "Product question" :products)+ user)+ :id (:id card)))]+ (is (= {:bad_cards [], :bad_transforms [], :success true}+ response))))))))++(deftest check-card-removing-column-breaks-downstream-test+ (testing "POST /api/ee/dependencies/check_card detects when removing a column breaks downstream cards"+ (mt/dataset test-data+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (mt/with-model-cleanup [:model/Card]+ (let [mp (mt/metadata-provider)+ ;; Create base card querying real orders table+ base-card (card/create-card! (basic-card) user)+ ;; Create dependent card that filters on TOTAL+ base-card-meta (lib.metadata/card mp (:id base-card))+ dependent-query (let [q (lib/query mp base-card-meta)+ cols (lib/filterable-columns q)+ total-col (m/find-first #(= (:id %) (mt/id :orders :total)) cols)]+ (lib/filter q (lib/> total-col 100)))+ dependent-card (card/create-card!+ (card-with-query "Dependent Card filtering on Total" dependent-query)+ user)+ ;; Propose changing to products table (doesn't have TOTAL column, breaks downstream)+ proposed-query (lib/query mp (lib.metadata/table mp (mt/id :products)))+ proposed-card {:id (:id base-card)+ :type :question+ :dataset_query proposed-query+ :result_metadata nil}+ response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_card" proposed-card)]+ (is (=? {:success false+ :bad_cards [{:id (:id dependent-card)}]+ :bad_transforms []}+ response)))))))))++(deftest check-card-renaming-expression-breaks-downstream-test+ (testing "POST /api/ee/dependencies/check_card detects when renaming an expression breaks downstream cards"+ (mt/dataset test-data+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (mt/with-model-cleanup [:model/Card]+ (let [mp (mt/metadata-provider)+ orders-query (lib/query mp (lib.metadata/table mp (mt/id :orders)))+ base-query (-> orders-query+ (lib/expression "Tax Rate"+ (lib// (lib.metadata/field mp (mt/id :orders :tax))+ (lib.metadata/field mp (mt/id :orders :subtotal)))))+ base-card (card/create-card!+ (card-with-query "Base Card with Tax Rate" base-query)+ user)+ dependent-query (let [q (lib/query mp (lib.metadata/card mp (:id base-card)))+ cols (lib/filterable-columns q)+ tax-rate-col (m/find-first #(= (:lib/deduplicated-name %) "Tax Rate") cols)]+ (lib/filter q (lib/> tax-rate-col 0.06)))+ dependent-card (card/create-card!+ (card-with-query "Dependent Card filtering on Tax Rate" dependent-query)+ user)+ ;; renaming "Tax Rate" to "Sales Tax" should break downstream reference+ proposed-query (-> orders-query+ (lib/expression "Sales Tax"+ (lib// (lib.metadata/field mp (mt/id :orders :tax))+ (lib.metadata/field mp (mt/id :orders :subtotal)))))+ proposed-card {:id (:id base-card)+ :type :question+ :dataset_query proposed-query+ :result_metadata nil}+ response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_card"+ proposed-card)]+ (is (=? {:success false+ :bad_cards [{:id (:id dependent-card)}]+ :bad_transforms []}+ response)))))))))++(deftest check-card-breaks-multiple-downstream-cards-test+ (testing "POST /api/ee/dependencies/check_card detects when one change breaks multiple downstream cards"+ (mt/dataset test-data+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (mt/with-model-cleanup [:model/Card]+ (let [mp (mt/metadata-provider)+ ;; Create base card querying real orders table+ base-card (card/create-card! (basic-card) user)+ ;; Create first dependent card filtering on TOTAL+ base-card-meta (lib.metadata/card mp (:id base-card))+ dependent-query-1 (let [q (lib/query mp base-card-meta)+ total-col (m/find-first #(= (:id %) (mt/id :orders :total))+ (lib/filterable-columns q))]+ (lib/filter q (lib/> total-col 100)))+ dependent-card-1 (card/create-card!+ (card-with-query "First Dependent Card" dependent-query-1)+ user)+ ;; Create second dependent card also using TOTAL+ dependent-query-2 (let [q (lib/query mp base-card-meta)+ total-col (m/find-first #(= (:id %) (mt/id :orders :total))+ (lib/filterable-columns q))]+ (lib/filter q (lib/< total-col 50)))+ dependent-card-2 (card/create-card!+ (card-with-query "Second Dependent Card" dependent-query-2)+ user)+ ;; Propose changing to products table (no TOTAL, breaks both downstream cards)+ proposed-query (lib/query mp (lib.metadata/table mp (mt/id :products)))+ proposed-card {:id (:id base-card)+ :type :question+ :dataset_query proposed-query+ :result_metadata nil}+ response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_card" proposed-card)]+ (is (=? {:success false+ :bad_cards #{(:id dependent-card-1) (:id dependent-card-2)}+ :bad_transforms []}+ (update response :bad_cards #(into #{} (map :id) %)))))))))))++(deftest check-transform-test+ (testing "POST /api/ee/dependencies/check_transform"+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/Transform {_transform-id :id :as transform} {}]+ (let [response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_transform" transform)]+ (is (= {:bad_cards [], :bad_transforms [], :success true}+ response)))))))++(deftest check-snippet-test+ (testing "POST /api/ee/dependencies/check_snippet"+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/NativeQuerySnippet {_snippet-id :id :as snippet} {}]+ (let [response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_snippet" snippet)]+ (is (= {:bad_cards [], :bad_transforms [], :success true}+ response)))))))++(deftest check-snippet-content-change-breaks-cards-test+ (testing "POST /api/ee/dependencies/check_snippet detects when snippet content changes break dependent cards"+ (mt/dataset test-data+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/User user {:email "[email protected]"}+ :model/NativeQuerySnippet {snippet-id :id snippet-name :name} {:name "filter-snippet"+ :content "WHERE SUBTOTAL > 100"}]+ (mt/with-model-cleanup [:model/Card]+ (let [tag-name (str "snippet: " snippet-name)+ mp (mt/metadata-provider)+ native-query (-> (lib/native-query mp (format "SELECT * FROM ORDERS %s" (str "{{" tag-name "}}")))+ (lib/with-template-tags {tag-name {:name tag-name+ :display-name (str "Snippet: " snippet-name)+ :type :snippet+ :snippet-name snippet-name+ :snippet-id snippet-id}}))+ card (card/create-card! {:name "Card using snippet"+ :dataset_query native-query+ :display :table+ :visualization_settings {}}+ user)+ proposed-content "WHERE NONEXISTENT_COLUMN > 100"+ response (mt/user-http-request :rasta :post 200 "ee/dependencies/check_snippet"+ {:id snippet-id+ :content proposed-content})]+ (is (=? {:success false+ :bad_cards [{:id (:id card)}]+ :bad_transforms []}+ response)))))))))++(deftest graph-test+ (testing "GET /api/ee/dependencies/graph"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Card]+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (let [{card-id-1 :id :as dependency-card} (card/create-card! (basic-card) user)+ {card-id-2 :id} (card/create-card! (wrap-card dependency-card) user)+ response (mt/user-http-request :rasta :get 200 "ee/dependencies/graph" :id card-id-2 :type "card")+ creator {:email "[email protected]"+ :id (:id user)}]+ (is (=? {:edges+ #{{:from_entity_id card-id-2, :from_entity_type "card"+ :to_entity_id card-id-1, :to_entity_type "card"}+ {:from_entity_id card-id-1, :from_entity_type "card"+ :to_entity_id (mt/id :orders), :to_entity_type "table"}}+ :nodes+ [{:data {:collection+ {:metabase.collections.models.collection.root/is-root? true}+ :collection_id nil+ :creator creator+ :database_id (mt/id)+ :last-edit-info creator}+ :dependents_count {:question 1}+ :id card-id-1+ :type "card"}+ {:data {:collection+ {:metabase.collections.models.collection.root/is-root? true}+ :creator creator+ :database_id (mt/id)+ :last-edit-info creator+ :name "Downstream card"}+ :dependents_count nil+ :id card-id-2+ :type "card"}+ {:data {:db+ {:id (mt/id)}+ :db_id (mt/id)}+ :dependents_count {:question int?}+ :id (mt/id :orders)+ :type "table"}]}+ (-> response+ (update :edges set)+ (update :nodes #(sort-by :type %)))))))))))++(deftest graph-table-root-test+ (testing "GET /api/ee/dependencies/graph with table as root node"+ (mt/dataset test-data+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Card]+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (let [_card-1 (card/create-card! (basic-card "Card 1" :orders) user)+ _card-2 (card/create-card! (basic-card "Card 2" :orders) user)+ response (mt/user-http-request :rasta :get 200 "ee/dependencies/graph"+ :id (mt/id :orders)+ :type "table")]+ (testing "table has no upstream dependencies, so only the table node is returned"+ (is (=? {:nodes [{:id (mt/id :orders)+ :type "table"+ :data {:db_id (mt/id)}+ :dependents_count {:question #(and (int? %) (>= % 2))}}]+ :edges #{}}+ (update response :edges set)))))))))))++(deftest dependents-test+ (testing "GET /api/ee/dependencies/graph/dependents"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Card]+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (let [{card-id-1 :id :as dependency-card} (card/create-card! (basic-card) user)+ {card-id-2 :id} (card/create-card! (wrap-card dependency-card) user)+ response (mt/user-http-request :rasta :get 200 "ee/dependencies/graph/dependents"+ :id card-id-1+ :type "card"+ :dependent_type "card"+ :dependent_card_type "question")]+ (is (=? [{:data+ {:collection+ {:id "root"+ :metabase.collections.models.collection.root/is-root? true}+ :creator+ {:email "[email protected]"+ :id (:id user)}+ :database_id (mt/id)+ :display "table"+ :last-edit-info+ {:email "[email protected]"+ :id (:id user)}+ :name "Downstream card"+ :type "question"}+ :dependents_count nil+ :id card-id-2+ :type "card"}]+ response))))))))diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/models/dependency_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/models/dependency_test.cljindex af57d29840f..4aec0e2dcc5 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/models/dependency_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/models/dependency_test.clj@@ -18,7 +18,9 @@(t2/select-fn-set #(select-keys % [:from_entity_type :from_entity_id :to_entity_type :to_entity_id]):model/Dependency :from_entity_type from-type :from_entity_id from-id))-(defn- basic-orders []+(defn basic-orders+ "Construct a basic card for dependency testing."+ []{:name "Test card":database_id (mt/id):table_id (mt/id :orders)@@ -28,7 +30,9 @@:dataset_query (mt/mbql-query orders):visualization_settings {}})-(defn- wrap-card [inner-card]+(defn wrap-card+ "Construct a card depending on `inner-card` for dependency testing."+ [inner-card]{:name "Downstream card":database_id (mt/id):display :tablediff --git a/enterprise/backend/test/metabase_enterprise/transforms/api/search_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api/search_test.cljnew file mode 100644index 00000000000..314d40dfac2--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/transforms/api/search_test.clj@@ -0,0 +1,20 @@+(ns metabase-enterprise.transforms.api.search-test+ (:require+ [clojure.test :refer :all]+ [metabase.search.test-util :as search.tu]+ [metabase.test :as mt]))++(deftest basic-search-test+ (testing "Transform can be found with search"+ (mt/with-premium-features #{:transforms}+ (search.tu/with-temp-index-table+ (mt/with-temp [:model/Transform {transform1-id :id} {:name "transform1"}+ :model/Transform {_transform2-id :id} {:name "tr2"}]+ (testing "Admin user can see transforms"+ (let [results (mt/user-http-request :crowberto :get 200 "search" :q "trans" :models "transform")]+ (is (= #{transform1-id}+ (set (map :id (:data results)))))))++ (testing "Regular user can see no transforms"+ (let [results (mt/user-http-request :rasta :get 200 "search" :q "trans" :models "transform")]+ (is (empty? (:data results))))))))))diff --git a/enterprise/frontend/src/metabase-enterprise/api/dependencies.ts b/enterprise/frontend/src/metabase-enterprise/api/dependencies.tsindex 0df4d751f84..f594d5897a1 100644--- a/enterprise/frontend/src/metabase-enterprise/api/dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/dependencies.ts@@ -3,12 +3,43 @@ import type {CheckDependenciesResponse,CheckSnippetDependenciesRequest,CheckTransformDependenciesRequest,+ DependencyGraph,+ DependencyNode,+ GetDependencyGraphRequest,+ ListNodeDependentsRequest,} from "metabase-types/api";import { EnterpriseApi } from "./api";+import {+ provideDependencyGraphTags,+ provideDependencyNodeListTags,+} from "./tags";export const dependencyApi = EnterpriseApi.injectEndpoints({endpoints: (builder) => ({+ getDependencyGraph: builder.query<+ DependencyGraph,+ GetDependencyGraphRequest+ >({+ query: (params) => ({+ method: "GET",+ url: "/api/ee/dependencies/graph",+ params,+ }),+ providesTags: (graph) => (graph ? provideDependencyGraphTags(graph) : []),+ }),+ listNodeDependents: builder.query<+ DependencyNode[],+ ListNodeDependentsRequest+ >({+ query: (params) => ({+ method: "GET",+ url: "/api/ee/dependencies/graph/dependents",+ params,+ }),+ providesTags: (nodes) =>+ nodes ? provideDependencyNodeListTags(nodes) : [],+ }),checkCardDependencies: builder.query<CheckDependenciesResponse,CheckCardDependenciesRequest@@ -43,6 +74,8 @@ export const dependencyApi = EnterpriseApi.injectEndpoints({});export const {+ useGetDependencyGraphQuery,+ useListNodeDependentsQuery,useLazyCheckCardDependenciesQuery,useLazyCheckSnippetDependenciesQuery,useLazyCheckTransformDependenciesQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/api/tags.ts b/enterprise/frontend/src/metabase-enterprise/api/tags.tsindex 136bbe53a3b..cd0cb6c9f6f 100644--- a/enterprise/frontend/src/metabase-enterprise/api/tags.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/tags.ts@@ -1,10 +1,23 @@import type { TagDescription } from "@reduxjs/toolkit/query";-import { TAG_TYPES, provideUserTags } from "metabase/api/tags";+import {+ TAG_TYPES,+ provideCollectionTags,+ provideDatabaseTags,+ provideFieldListTags,+ provideTableTags,+ provideUserTags,+} from "metabase/api/tags";import type {+ CardDependencyNode,Comment,+ DependencyGraph,+ DependencyNode,PythonLibrary,+ SnippetDependencyNode,+ TableDependencyNode,Transform,+ TransformDependencyNode,TransformJob,TransformRun,TransformTag,@@ -19,7 +32,6 @@ export const ENTERPRISE_TAG_TYPES = ["gsheets-status","document","comment",- "transform","transform-tag","transform-job","transform-job-via-tag",@@ -134,3 +146,77 @@ export function providePythonLibraryTags(): TagDescription<EnterpriseTagType>[] {return [idTag("python-transform-library", library.path)];}++function provideCardDependencyNodeTags(+ node: CardDependencyNode,+): TagDescription<EnterpriseTagType>[] {+ return [+ idTag("card", node.id),+ ...(node.data.creator != null ? provideUserTags(node.data.creator) : []),+ ...(node.data["last-edit-info"] != null+ ? provideUserTags(node.data["last-edit-info"])+ : []),+ ...(node.data.collection != null+ ? provideCollectionTags(node.data.collection)+ : []),+ ...(node.data.dashboard != null+ ? [idTag("dashboard", node.data.dashboard.id)]+ : []),+ ];+}++function provideTableDependencyNodeTags(+ node: TableDependencyNode,+): TagDescription<EnterpriseTagType>[] {+ return [+ idTag("table", node.id),+ ...(node.data.db != null ? provideDatabaseTags(node.data.db) : []),+ ...(node.data.fields != null ? provideFieldListTags(node.data.fields) : []),+ ];+}++function provideTransformDependencyNodeTags(+ node: TransformDependencyNode,+): TagDescription<EnterpriseTagType>[] {+ return [+ idTag("transform", node.id),+ ...(node.data.table != null ? provideTableTags(node.data.table) : []),+ ];+}++function provideSnippetDependencyNodeTags(+ node: SnippetDependencyNode,+): TagDescription<EnterpriseTagType>[] {+ return [idTag("snippet", node.id)];+}++export function provideDependencyNodeTags(+ node: DependencyNode,+): TagDescription<EnterpriseTagType>[] {+ switch (node.type) {+ case "card":+ return provideCardDependencyNodeTags(node);+ case "table":+ return provideTableDependencyNodeTags(node);+ case "transform":+ return provideTransformDependencyNodeTags(node);+ case "snippet":+ return provideSnippetDependencyNodeTags(node);+ }+}++export function provideDependencyNodeListTags(nodes: DependencyNode[]) {+ return [+ listTag("card"),+ listTag("table"),+ listTag("transform"),+ listTag("snippet"),+ ...nodes.flatMap(provideDependencyNodeTags),+ ];+}++export function provideDependencyGraphTags(+ graph: DependencyGraph,+): TagDescription<EnterpriseTagType>[] {+ return provideDependencyNodeListTags(graph.nodes);+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsxindex 60319e50cbb..910ca1bbdf4 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx@@ -22,7 +22,6 @@ import {Text,} from "metabase/ui";import visualizations from "metabase/visualizations";-import { getTransformUrl } from "metabase-enterprise/transforms/urls";import type {Card as ApiCard,CheckDependenciesResponse,@@ -157,7 +156,7 @@ function getItemLink(item: DependencyItem) {case "card":return Urls.question(item.card);default:- return getTransformUrl(item.transform.id);+ return Urls.transform(item.transform.id);}}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.cssnew file mode 100644index 00000000000..8cb9a138739--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.css@@ -0,0 +1,6 @@+.panel {+ display: flex;+ flex-direction: column;+ bottom: 0;+ pointer-events: none;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsxnew file mode 100644index 00000000000..5f013a3c180--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx@@ -0,0 +1,128 @@+import {+ Background,+ Controls,+ type Edge,+ Panel,+ ReactFlow,+ useEdgesState,+ useNodesState,+} from "@xyflow/react";+import { useEffect, useMemo, useState } from "react";+import { t } from "ttag";++import { skipToken } from "metabase/api";+import { useMetadataToasts } from "metabase/metadata/hooks";+import { Group } from "metabase/ui";+import { useGetDependencyGraphQuery } from "metabase-enterprise/api";+import type { DependencyEntry } from "metabase-types/api";++import S from "./DependencyGraph.module.css";+import { GraphContext } from "./GraphContext";+import { GraphDependencyPanel } from "./GraphDependencyPanel";+import { GraphEntryInput } from "./GraphEntryInput";+import { GraphInfoPanel } from "./GraphInfoPanel";+import { GraphNode } from "./GraphNode";+import { GraphNodeLayout } from "./GraphNodeLayout";+import { GraphSelectInput } from "./GraphSelectionInput";+import { MAX_ZOOM, MIN_ZOOM } from "./constants";+import type { GraphSelection, NodeType } from "./types";+import { findNode, getInitialGraph } from "./utils";++const NODE_TYPES = {+ node: GraphNode,+};++type DependencyGraphProps = {+ entry?: DependencyEntry;+};++export function DependencyGraph({ entry }: DependencyGraphProps) {+ const {+ data: graph,+ isFetching,+ error,+ } = useGetDependencyGraphQuery(entry ?? skipToken);+ const [nodes, setNodes, onNodesChange] = useNodesState<NodeType>([]);+ const [edges, setEdges, onEdgesChange] = useEdgesState<Edge>([]);+ const [selection, setSelection] = useState<GraphSelection | null>(null);+ const { sendErrorToast } = useMetadataToasts();++ const entryNode = useMemo(() => {+ return entry != null ? findNode(nodes, entry.id, entry.type) : null;+ }, [nodes, entry]);++ const selectedNode = useMemo(() => {+ return selection != null+ ? findNode(nodes, selection.id, selection.type)+ : null;+ }, [nodes, selection]);++ useEffect(() => {+ if (entry == null || error != null) {+ setNodes([]);+ setEdges([]);+ setSelection(null);+ } else if (graph != null) {+ const { nodes: initialNodes, edges: initialEdges } =+ getInitialGraph(graph);+ setNodes(initialNodes);+ setEdges(initialEdges);+ setSelection(null);+ }+ }, [entry, graph, error, setNodes, setEdges]);++ useEffect(() => {+ if (error != null) {+ sendErrorToast(t`Failed to load dependencies`);+ }+ }, [error, sendErrorToast]);++ const handlePanelClose = () => {+ setSelection(null);+ };++ return (+ <GraphContext.Provider value={{ selection, setSelection }}>+ <ReactFlow+ nodes={nodes}+ edges={edges}+ nodeTypes={NODE_TYPES}+ fitView+ minZoom={MIN_ZOOM}+ maxZoom={MAX_ZOOM}+ data-testid="dependency-graph"+ onNodesChange={onNodesChange}+ onEdgesChange={onEdgesChange}+ >+ <Background />+ <Controls />+ <GraphNodeLayout />+ <Panel position="top-left">+ <Group>+ <GraphEntryInput+ node={entryNode?.data ?? null}+ isGraphFetching={isFetching}+ />+ {nodes.length > 1 && <GraphSelectInput nodes={nodes} />}+ </Group>+ </Panel>+ {selection != null && selection.withInfo && selectedNode != null && (+ <Panel className={S.panel} position="top-right">+ {selection.groupType != null ? (+ <GraphDependencyPanel+ node={selectedNode.data}+ groupType={selection.groupType}+ onClose={handlePanelClose}+ />+ ) : (+ <GraphInfoPanel+ node={selectedNode.data}+ onClose={handlePanelClose}+ />+ )}+ </Panel>+ )}+ </ReactFlow>+ </GraphContext.Provider>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.module.cssnew file mode 100644index 00000000000..f8a8ed70182--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.module.css@@ -0,0 +1,8 @@+.link {+ color: var(--mb-color-text-secondary);++ &:hover {+ color: var(--mb-color-brand);+ text-decoration: none;+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsxnew file mode 100644index 00000000000..246b3d50ba1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx@@ -0,0 +1,38 @@+import { Fragment } from "react";+import { Link } from "react-router";++import { Box, Group, type GroupProps } from "metabase/ui";++import type { NodeLink } from "../types";++import S from "./GraphBreadcrumbs.module.css";++type GraphBreadcrumbsProps = GroupProps & {+ location: NodeLink[];+};++export function GraphBreadcrumbs({+ location,+ ...props+}: GraphBreadcrumbsProps) {+ return (+ <Group c="text-secondary" gap="sm" wrap="nowrap" {...props}>+ <Group fz="sm" gap="xs">+ {location.map((part, partIndex) => (+ <Fragment key={partIndex}>+ {partIndex > 0 && <Box>/</Box>}+ <Box+ className={S.link}+ component={Link}+ to={part.url}+ target="_blank"+ lh="1rem"+ >+ {part.label}+ </Box>+ </Fragment>+ ))}+ </Group>+ </Group>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/index.tsnew file mode 100644index 00000000000..c78d3fd5397--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/index.ts@@ -0,0 +1 @@+export * from "./GraphBreadcrumbs";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphContext/GraphContext.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphContext/GraphContext.tsxnew file mode 100644index 00000000000..b539125ee8c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphContext/GraphContext.tsx@@ -0,0 +1,8 @@+import { createContext } from "react";++import type { GraphContextType } from "../types";++export const GraphContext = createContext<GraphContextType>({+ selection: null,+ setSelection: () => undefined,+});diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphContext/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphContext/index.tsnew file mode 100644index 00000000000..bf8f11559b1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphContext/index.ts@@ -0,0 +1 @@+export * from "./GraphContext";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.module.cssnew file mode 100644index 00000000000..d0103e464bd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.module.css@@ -0,0 +1,7 @@+.root {+ display: flex;+ flex-direction: column;+ padding: 0;+ width: 32rem;+ pointer-events: all;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsxnew file mode 100644index 00000000000..88a21d0029b--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx@@ -0,0 +1,90 @@+import { useDebouncedValue } from "@mantine/hooks";+import { useLayoutEffect, useMemo, useState } from "react";+import { t } from "ttag";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";+import { Box, Card } from "metabase/ui";+import { useListNodeDependentsQuery } from "metabase-enterprise/api";+import type { DependencyGroupType, DependencyNode } from "metabase-types/api";++import { DEPENDENTS_SEARCH_THRESHOLD } from "../constants";++import S from "./GraphDependencyPanel.module.css";+import { PanelBody } from "./PanelBody";+import { PanelHeader } from "./PanelHeader";+import type { FilterOption } from "./types";+import {+ canFilterByOption,+ canSortByColumn,+ getDefaultSortOptions,+ getListRequest,+ getVisibleNodes,+} from "./utils";++type GraphDependencyPanelProps = {+ node: DependencyNode;+ groupType: DependencyGroupType;+ onClose: () => void;+};++export function GraphDependencyPanel({+ node,+ groupType,+ onClose,+}: GraphDependencyPanelProps) {+ const {+ data: nodes = [],+ isFetching,+ error,+ } = useListNodeDependentsQuery(getListRequest(node, groupType));+ const [searchText, setSearchText] = useState("");+ const [searchQuery] = useDebouncedValue(+ searchText.trim(),+ SEARCH_DEBOUNCE_DURATION,+ );+ const [filterOptions, setFilterOptions] = useState<FilterOption[]>([]);+ const [sortOptions, setSortOptions] = useState(() =>+ getDefaultSortOptions(groupType),+ );+ const visibleNodes = useMemo(+ () => getVisibleNodes(nodes, { searchQuery, filterOptions, sortOptions }),+ [nodes, searchQuery, filterOptions, sortOptions],+ );++ useLayoutEffect(() => {+ if (filterOptions.some((option) => !canFilterByOption(groupType, option))) {+ setFilterOptions([]);+ }++ if (!canSortByColumn(groupType, sortOptions.column)) {+ setSortOptions(getDefaultSortOptions(groupType));+ }+ }, [groupType, filterOptions, sortOptions]);++ return (+ <Card className={S.root} withBorder data-testid="graph-dependency-panel">+ <PanelHeader+ node={node}+ groupType={groupType}+ searchText={searchText}+ filterOptions={filterOptions}+ sortOptions={sortOptions}+ hasSearch={nodes.length >= DEPENDENTS_SEARCH_THRESHOLD}+ onSearchTextChange={setSearchText}+ onFilterOptionsChange={setFilterOptions}+ onSortOptionsChange={setSortOptions}+ onClose={onClose}+ />+ {isFetching || error != null ? (+ <LoadingAndErrorWrapper loading={isFetching} error={error} />+ ) : visibleNodes.length === 0 ? (+ <Box p="lg" c="text-secondary" ta="center">+ {t`Didn't find any results`}+ </Box>+ ) : (+ <PanelBody nodes={visibleNodes} />+ )}+ </Card>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.module.cssnew file mode 100644index 00000000000..26c64593cd4--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.module.css@@ -0,0 +1,9 @@+.body {+ overflow: auto;+}++.item {+ &:not(:last-child) {+ border-bottom: 1px solid var(--mb-color-border);+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsxnew file mode 100644index 00000000000..aa81e70fb0a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsx@@ -0,0 +1,74 @@+import { memo } from "react";++import * as Urls from "metabase/lib/urls";+import { Box, Group, Stack } from "metabase/ui";+import type { DependencyNode } from "metabase-types/api";++import { GraphBreadcrumbs } from "../../GraphBreadcrumbs";+import { GraphExternalLink } from "../../GraphExternalLink";+import { GraphLink } from "../../GraphLink";+import {+ getNodeIcon,+ getNodeId,+ getNodeLabel,+ getNodeLink,+ getNodeLocationInfo,+ getNodeViewCount,+} from "../../utils";++import S from "./PanelBody.module.css";+import { getNodeViewCountLabel } from "./utils";++type PanelBodyProps = {+ nodes: DependencyNode[];+};++export const PanelBody = memo(function ListBody({ nodes }: PanelBodyProps) {+ return (+ <Box className={S.body}>+ {nodes.map((node) => (+ <ListItem key={getNodeId(node.id, node.type)} node={node} />+ ))}+ </Box>+ );+});++type ListItemProps = {+ node: DependencyNode;+};++function ListItem({ node }: ListItemProps) {+ const label = getNodeLabel(node);+ const link = getNodeLink(node);+ const location = getNodeLocationInfo(node);+ const viewCount = getNodeViewCount(node);++ return (+ <Stack className={S.item} p="lg" gap="sm" aria-label={label}>+ <Group justify="space-between">+ <GraphLink+ label={label}+ icon={getNodeIcon(node)}+ url={Urls.dependencyGraph({ entry: node })}+ />+ {viewCount != null ? (+ <Box c="text-secondary" fz="sm" lh="1rem">+ {getNodeViewCountLabel(viewCount)}+ </Box>+ ) : link != null ? (+ <GraphExternalLink label={link.label} url={link.url} />+ ) : null}+ </Group>+ {(location != null || (link != null && viewCount != null)) && (+ <Group justify={location != null ? "space-between" : "flex-end"}>+ {location != null && (+ <GraphBreadcrumbs location={location} ml="1rem" pl="sm" />+ )}+ {link != null && viewCount != null && (+ <GraphExternalLink label={link.label} url={link.url} />+ )}+ </Group>+ )}+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/index.tsnew file mode 100644index 00000000000..01d44bb3bfd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/index.ts@@ -0,0 +1 @@+export * from "./PanelBody";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/utils.tsnew file mode 100644index 00000000000..6eec4fcfd51--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/utils.ts@@ -0,0 +1,5 @@+import { msgid, ngettext } from "ttag";++export function getNodeViewCountLabel(viewCount: number) {+ return ngettext(msgid`${viewCount} view`, `${viewCount} views`, viewCount);+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/FilterOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/FilterOptionsPicker.tsxnew file mode 100644index 00000000000..cefee9789fd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/FilterOptionsPicker.tsx@@ -0,0 +1,83 @@+import { useDisclosure } from "@mantine/hooks";+import { t } from "ttag";++import {+ ActionIcon,+ Box,+ Checkbox,+ FixedSizeIcon,+ Popover,+ Stack,+} from "metabase/ui";+import type { DependencyGroupType } from "metabase-types/api";++import type { FilterOption } from "../../types";+import { canFilterByOption } from "../../utils";++import { getFilterItems } from "./utils";++type FilterOptionsPickerProps = {+ groupType: DependencyGroupType;+ filterOptions: FilterOption[];+ onFilterOptionsChange: (filterOptions: FilterOption[]) => void;+};++export function FilterOptionsPicker({+ groupType,+ filterOptions,+ onFilterOptionsChange,+}: FilterOptionsPickerProps) {+ const [isOpened, { toggle, close }] = useDisclosure();++ return (+ <Popover opened={isOpened} onDismiss={close}>+ <Popover.Target>+ <ActionIcon aria-label={t`Filter`} onClick={toggle}>+ <FixedSizeIcon c="text-primary" name="filter" />+ </ActionIcon>+ </Popover.Target>+ <Popover.Dropdown>+ <FilterOptionsPopover+ groupType={groupType}+ filterOptions={filterOptions}+ onFilterOptionsChange={onFilterOptionsChange}+ />+ </Popover.Dropdown>+ </Popover>+ );+}++type FilterOptionsPopoverProps = {+ groupType: DependencyGroupType;+ filterOptions: FilterOption[];+ onFilterOptionsChange: (filterOptions: FilterOption[]) => void;+};++function FilterOptionsPopover({+ groupType,+ filterOptions,+ onFilterOptionsChange,+}: FilterOptionsPopoverProps) {+ const filterItems = getFilterItems().filter((item) =>+ canFilterByOption(groupType, item.value),+ );++ const handleFilterOptionsChange = (filterOptions: string[]) => {+ onFilterOptionsChange(filterOptions as FilterOption[]);+ };++ return (+ <Box w="15rem" p="md">+ <Checkbox.Group+ value={filterOptions}+ onChange={handleFilterOptionsChange}+ >+ <Stack gap="0.75rem">+ {filterItems.map((item) => (+ <Checkbox key={item.value} value={item.value} label={item.label} />+ ))}+ </Stack>+ </Checkbox.Group>+ </Box>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/index.tsnew file mode 100644index 00000000000..ba6bd22e417--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/index.ts@@ -0,0 +1 @@+export * from "./FilterOptionsPicker";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/types.tsnew file mode 100644index 00000000000..a84e6c9337f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/types.ts@@ -0,0 +1,6 @@+import type { FilterOption } from "../../types";++export type FilterItem = {+ value: FilterOption;+ label: string;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/utils.tsnew file mode 100644index 00000000000..7e050a1ba96--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/utils.ts@@ -0,0 +1,20 @@+import { t } from "ttag";++import { FILTER_OPTIONS } from "../../constants";+import type { FilterOption } from "../../types";++import type { FilterItem } from "./types";++export function getFilterItems(): FilterItem[] {+ const allLabels: Record<FilterOption, string> = {+ verified: t`Verified`,+ "in-dashboard": t`In a dashboard`,+ "in-official-collection": t`In an official collection`,+ "not-in-personal-collection": t`Not in personal collection`,+ };++ return FILTER_OPTIONS.map((option) => ({+ value: option,+ label: allLabels[option],+ }));+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.module.cssnew file mode 100644index 00000000000..0c804d41296--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.module.css@@ -0,0 +1,3 @@+.root {+ border-bottom: 1px solid var(--mb-color-border);+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsxnew file mode 100644index 00000000000..915a8459400--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsx@@ -0,0 +1,91 @@+import { t } from "ttag";++import {+ ActionIcon,+ FixedSizeIcon,+ Group,+ Stack,+ TextInput,+ Title,+ rem,+} from "metabase/ui";+import type { DependencyGroupType, DependencyNode } from "metabase-types/api";++import { ACTION_ICON_PADDING } from "../../constants";+import type { FilterOption, SortOptions } from "../types";+import { canFilter } from "../utils";++import { FilterOptionsPicker } from "./FilterOptionsPicker";+import S from "./PanelHeader.module.css";+import { SortOptionsPicker } from "./SortOptionsPicker";+import { getHeaderLabel } from "./utils";++type PanelHeaderProps = {+ node: DependencyNode;+ groupType: DependencyGroupType;+ searchText: string;+ filterOptions: FilterOption[];+ sortOptions: SortOptions;+ hasSearch: boolean;+ onSearchTextChange: (searchText: string) => void;+ onFilterOptionsChange: (filterOptions: FilterOption[]) => void;+ onSortOptionsChange: (sortOptions: SortOptions) => void;+ onClose: () => void;+};++export function PanelHeader({+ node,+ groupType,+ searchText,+ filterOptions,+ sortOptions,+ hasSearch,+ onSearchTextChange,+ onFilterOptionsChange,+ onSortOptionsChange,+ onClose,+}: PanelHeaderProps) {+ const hasFilterPicker = canFilter(groupType);++ return (+ <Stack className={S.root} p="lg" gap="lg">+ <Group wrap="nowrap">+ <Title flex={1} order={4} lh="1rem">+ {getHeaderLabel(node, groupType)}+ </Title>+ <ActionIcon+ m={rem(-ACTION_ICON_PADDING)}+ aria-label={t`Close`}+ onClick={onClose}+ >+ <FixedSizeIcon name="close" />+ </ActionIcon>+ </Group>+ {hasSearch && (+ <TextInput+ value={searchText}+ placeholder={t`Search`}+ leftSection={<FixedSizeIcon name="search" />}+ rightSection={+ <Group gap={0}>+ <SortOptionsPicker+ groupType={groupType}+ sortOptions={sortOptions}+ onSortOptionsChange={onSortOptionsChange}+ />+ {hasFilterPicker && (+ <FilterOptionsPicker+ groupType={groupType}+ filterOptions={filterOptions}+ onFilterOptionsChange={onFilterOptionsChange}+ />+ )}+ </Group>+ }+ rightSectionWidth={hasFilterPicker ? "4.25rem" : undefined}+ onChange={(event) => onSearchTextChange(event.target.value)}+ />+ )}+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/SortOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/SortOptionsPicker.tsxnew file mode 100644index 00000000000..5927d97fac5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/SortOptionsPicker.tsx@@ -0,0 +1,102 @@+import { useDisclosure } from "@mantine/hooks";+import { t } from "ttag";++import {+ ActionIcon,+ FixedSizeIcon,+ Popover,+ Radio,+ SegmentedControl,+ Stack,+} from "metabase/ui";+import type { DependencyGroupType } from "metabase-types/api";++import type { SortColumn, SortDirection, SortOptions } from "../../types";+import { canSortByColumn } from "../../utils";++import { getSortColumnItems, getSortDirectionItems } from "./utils";++type SortOptionsPickerProps = {+ groupType: DependencyGroupType;+ sortOptions: SortOptions;+ onSortOptionsChange: (sortOptions: SortOptions) => void;+};++export function SortOptionsPicker({+ groupType,+ sortOptions,+ onSortOptionsChange,+}: SortOptionsPickerProps) {+ const [isOpened, { toggle, close }] = useDisclosure();++ return (+ <Popover opened={isOpened} onDismiss={close}>+ <Popover.Target>+ <ActionIcon aria-label={t`Sort`} onClick={toggle}>+ <FixedSizeIcon c="text-primary" name="sort" />+ </ActionIcon>+ </Popover.Target>+ <Popover.Dropdown>+ <SortOptionsPopover+ groupType={groupType}+ sortOptions={sortOptions}+ onSortOptionsChange={onSortOptionsChange}+ />+ </Popover.Dropdown>+ </Popover>+ );+}++type SortOptionsPopoverProps = {+ groupType: DependencyGroupType;+ sortOptions: SortOptions;+ onSortOptionsChange: (sortOptions: SortOptions) => void;+};++function SortOptionsPopover({+ groupType,+ sortOptions,+ onSortOptionsChange,+}: SortOptionsPopoverProps) {+ const columnItems = getSortColumnItems().filter((option) =>+ canSortByColumn(groupType, option.value),+ );++ const handleColumnChange = (column: string) => {+ onSortOptionsChange({ ...sortOptions, column: column as SortColumn });+ };++ const handleDirectionChange = (direction: string) => {+ onSortOptionsChange({+ ...sortOptions,+ direction: direction as SortDirection,+ });+ };++ return (+ <Stack w="15rem" p="md" gap="lg">+ <Radio.Group+ value={sortOptions.column}+ label={t`Sort by`}+ onChange={handleColumnChange}+ >+ <Stack mt="sm" gap="sm">+ {columnItems.map((option) => (+ <Radio+ key={option.value}+ value={option.value}+ label={option.label}+ />+ ))}+ </Stack>+ </Radio.Group>+ <SegmentedControl+ value={sortOptions.direction}+ data={getSortDirectionItems()}+ size="sm"+ fullWidth+ onChange={handleDirectionChange}+ />+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/index.tsnew file mode 100644index 00000000000..35ebc187462--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/index.ts@@ -0,0 +1 @@+export * from "./SortOptionsPicker";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/types.tsnew file mode 100644index 00000000000..dbb1a02c226--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/types.ts@@ -0,0 +1,13 @@+import type { ReactNode } from "react";++import type { SortColumn, SortDirection } from "../../types";++export type SortColumnItem = {+ value: SortColumn;+ label: string;+};++export type SortDirectionItem = {+ value: SortDirection;+ label: ReactNode;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/utils.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/utils.tsxnew file mode 100644index 00000000000..524f84d7b1f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/utils.tsx@@ -0,0 +1,34 @@+import { t } from "ttag";++import { FixedSizeIcon } from "metabase/ui";++import { SORT_COLUMNS } from "../../constants";+import type { SortColumn } from "../../types";++import type { SortColumnItem, SortDirectionItem } from "./types";++export function getSortColumnItems(): SortColumnItem[] {+ const allLabels: Record<SortColumn, string> = {+ name: t`Name`,+ location: t`Location`,+ "view-count": t`View count`,+ };++ return SORT_COLUMNS.map((column) => ({+ value: column,+ label: allLabels[column],+ }));+}++export function getSortDirectionItems(): SortDirectionItem[] {+ return [+ {+ value: "asc",+ label: <FixedSizeIcon name="arrow_up" aria-label={t`Ascending`} />,+ },+ {+ value: "desc",+ label: <FixedSizeIcon name="arrow_down" aria-label={t`Descending`} />,+ },+ ];+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/index.tsnew file mode 100644index 00000000000..40b8fa71048--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/index.ts@@ -0,0 +1 @@+export * from "./PanelHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.tsnew file mode 100644index 00000000000..80e851c30f1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.ts@@ -0,0 +1,29 @@+import { t } from "ttag";++import type { DependencyGroupType, DependencyNode } from "metabase-types/api";++import { getNodeLabel } from "../../utils";++export function getHeaderLabel(+ node: DependencyNode,+ groupType: DependencyGroupType,+): string {+ const nodeLabel = getNodeLabel(node);++ switch (groupType) {+ case "question":+ return t`Questions that use ${nodeLabel}`;+ case "model":+ return t`Models that use ${nodeLabel}`;+ case "metric":+ return t`Metrics that use ${nodeLabel}`;+ case "table":+ return node.type === "transform"+ ? t`Table generated by ${nodeLabel}`+ : t`Tables that use ${nodeLabel}`;+ case "transform":+ return t`Transforms that use ${nodeLabel}`;+ case "snippet":+ return t`Snippets that use ${nodeLabel}`;+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.tsnew file mode 100644index 00000000000..b621fe11928--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.ts@@ -0,0 +1,10 @@+// order of options matches the UI+export const FILTER_OPTIONS = [+ "verified",+ "in-dashboard",+ "in-official-collection",+ "not-in-personal-collection",+] as const;++// order of options matches the UI+export const SORT_COLUMNS = ["view-count", "name", "location"] as const;diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/index.tsnew file mode 100644index 00000000000..485cf3b2b1b--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/index.ts@@ -0,0 +1 @@+export * from "./GraphDependencyPanel";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/types.tsnew file mode 100644index 00000000000..30e07f326cf--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/types.ts@@ -0,0 +1,27 @@+import type { DependencyNode } from "metabase-types/api";++import type { FILTER_OPTIONS, SORT_COLUMNS } from "./constants";++export type FilterOption = (typeof FILTER_OPTIONS)[number];++export type SortColumn = (typeof SORT_COLUMNS)[number];++export type SortDirection = "asc" | "desc";++export type SortOptions = {+ column: SortColumn;+ direction: SortDirection;+};++export type SearchOptions = {+ searchQuery: string;+ filterOptions: FilterOption[];+ sortOptions: SortOptions;+};++export type FilterCallback = (node: DependencyNode) => boolean;++export type SortCallback = (+ node1: DependencyNode,+ node2: DependencyNode,+) => number;diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/utils.tsnew file mode 100644index 00000000000..67101e8accc--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/utils.ts@@ -0,0 +1,201 @@+import type {+ DependencyGroupType,+ DependencyNode,+ ListNodeDependentsRequest,+} from "metabase-types/api";++import {+ getCardType,+ getDependencyType,+ getNodeLabel,+ getNodeLocationInfo,+ getNodeViewCount,+} from "../utils";++import { FILTER_OPTIONS } from "./constants";+import type {+ FilterCallback,+ FilterOption,+ SearchOptions,+ SortCallback,+ SortColumn,+ SortOptions,+} from "./types";++export function getListRequest(+ node: DependencyNode,+ groupType: DependencyGroupType,+): ListNodeDependentsRequest {+ return {+ id: node.id,+ type: node.type,+ dependent_type: getDependencyType(groupType),+ dependent_card_type: getCardType(groupType) ?? undefined,+ };+}++function isMatchingSearchQuery(+ node: DependencyNode,+ lowerCaseSearchQuery: string,+): boolean {+ return getNodeLabel(node).toLowerCase().includes(lowerCaseSearchQuery);+}++const FILTERS: Record<FilterOption, FilterCallback> = {+ verified: (node) => {+ if (node.type !== "card") {+ return false;+ }+ const lastReview = node.data.moderation_reviews?.find(+ (review) => review.most_recent,+ );+ return lastReview != null && lastReview.status === "verified";+ },+ "in-dashboard": (node) => {+ if (node.type !== "card") {+ return false;+ }+ const dashboard = node.data.dashboard;+ return dashboard != null;+ },+ "in-official-collection": (node) => {+ if (node.type !== "card") {+ return false;+ }+ const collection = node.data.collection;+ return collection != null && collection.authority_level === "official";+ },+ "not-in-personal-collection": (node) => {+ if (node.type !== "card") {+ return false;+ }+ const collection = node.data.collection;+ return collection != null && !collection.is_personal;+ },+};++export function canFilterByOption(+ groupType: DependencyGroupType,+ option: FilterOption,+): boolean {+ const type = getDependencyType(groupType);+ switch (option) {+ case "verified":+ case "in-dashboard":+ case "in-official-collection":+ case "not-in-personal-collection":+ switch (type) {+ case "card":+ return true;+ case "table":+ case "transform":+ case "snippet":+ return false;+ }+ }+}++export function canFilter(groupType: DependencyGroupType): boolean {+ return FILTER_OPTIONS.some((option) => canFilterByOption(groupType, option));+}++function isMatchingFilters(+ node: DependencyNode,+ filterOptions: FilterOption[],+): boolean {+ if (filterOptions.length === 0) {+ return true;+ }++ return filterOptions.every((option) => FILTERS[option](node));+}++const COMPARATORS: Record<SortColumn, SortCallback> = {+ name: (node1, node2) => {+ const label1 = getNodeLabel(node1);+ const label2 = getNodeLabel(node2);+ return label1.localeCompare(label2);+ },+ location: (node1, node2) => {+ const parts1 = getNodeLocationInfo(node1) ?? [];+ const parts2 = getNodeLocationInfo(node2) ?? [];+ const minParts = parts1.length < parts2.length ? parts1 : parts2;+ const result = minParts+ .map((_link, i) => parts1[i].label.localeCompare(parts2[i].label))+ .find((result) => result !== 0);+ return result ?? parts1.length - parts2.length;+ },+ "view-count": (node1, node2) => {+ const count1 = getNodeViewCount(node1) ?? 0;+ const count2 = getNodeViewCount(node2) ?? 0;+ return count1 - count2;+ },+};++export function canSortByColumn(+ groupType: DependencyGroupType,+ column: SortColumn,+): boolean {+ switch (column) {+ case "name":+ return true;+ case "location":+ switch (groupType) {+ case "question":+ case "model":+ case "metric":+ return true;+ case "table":+ case "transform":+ case "snippet":+ return false;+ }+ break;+ case "view-count":+ switch (groupType) {+ case "question":+ return true;+ case "model":+ case "metric":+ case "table":+ case "transform":+ case "snippet":+ return false;+ }+ break;+ }+}++export function getDefaultSortOptions(type: DependencyGroupType): SortOptions {+ if (canSortByColumn(type, "view-count")) {+ return { column: "view-count", direction: "desc" };+ } else {+ return { column: "name", direction: "asc" };+ }+}++function compareNodes(+ node1: DependencyNode,+ node2: DependencyNode,+ { column, direction }: SortOptions,+): number {+ const result = COMPARATORS[column](node1, node2);+ const factor = direction === "asc" ? 1 : -1;+ return result * factor;+}++export function getVisibleNodes(+ nodes: DependencyNode[],+ options: SearchOptions,+): DependencyNode[] {+ const lowerCaseSearchQuery = options.searchQuery.toLowerCase();+ const visibleNodes = nodes.filter(+ (node) =>+ isMatchingSearchQuery(node, lowerCaseSearchQuery) &&+ isMatchingFilters(node, options.filterOptions),+ );+ visibleNodes.sort((node1, node2) =>+ compareNodes(node1, node2, options.sortOptions),+ );+ return visibleNodes;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryButton/EntryButton.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryButton/EntryButton.tsxnew file mode 100644index 00000000000..df128ad831a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryButton/EntryButton.tsx@@ -0,0 +1,46 @@+import type { MouseEvent } from "react";+import { t } from "ttag";++import { Button, FixedSizeIcon } from "metabase/ui";+import type { DependencyEntry, DependencyNode } from "metabase-types/api";++import { getNodeIcon, getNodeLabel } from "../../utils";++type EntryButtonProps = {+ node: DependencyNode | null;+ onEntryChange: (entry: DependencyEntry | null) => void;+ onPickerOpen: () => void;+};++export function EntryButton({+ node,+ onEntryChange,+ onPickerOpen,+}: EntryButtonProps) {+ const handleIconClick = (event: MouseEvent) => {+ event.stopPropagation();+ onEntryChange(null);+ };++ return (+ <Button+ leftSection={+ node ? <FixedSizeIcon name={getNodeIcon(node)} /> : undefined+ }+ rightSection={+ node ? (+ <FixedSizeIcon+ name="close"+ display="block"+ aria-label={t`Remove`}+ onClick={handleIconClick}+ />+ ) : undefined+ }+ data-testid="graph-entry-button"+ onClick={onPickerOpen}+ >+ {node ? getNodeLabel(node) : undefined}+ </Button>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryButton/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryButton/index.tsnew file mode 100644index 00000000000..f1ed39e7e31--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryButton/index.ts@@ -0,0 +1 @@+export * from "./EntryButton";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsxnew file mode 100644index 00000000000..66ed0fa987a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsx@@ -0,0 +1,165 @@+import { useMemo, useState } from "react";+import { t } from "ttag";++import { useLogRecentItemMutation, useSearchQuery } from "metabase/api";+import {+ EntityPickerModal,+ type EntityPickerTab,+} from "metabase/common/components/EntityPicker";+import {+ QuestionPicker,+ type QuestionPickerStatePath,+} from "metabase/common/components/Pickers/QuestionPicker";+import {+ TablePicker,+ type TablePickerStatePath,+} from "metabase/common/components/Pickers/TablePicker";+import { PLUGIN_TRANSFORMS } from "metabase/plugins";+import {+ type DependencyEntry,+ type DependencyNode,+ isActivityModel,+} from "metabase-types/api";++import { SEARCH_MODELS } from "../constants";++import {+ ENTITY_PICKER_OPTIONS,+ QUESTION_FOLDER_MODELS,+ QUESTION_MODELS,+ QUESTION_MODELS_WITH_DASHBOARDS,+ QUESTION_PICKER_OPTIONS,+ RECENTS_CONTEXT,+ TABLE_FOLDER_MODELS,+ TABLE_MODELS,+ TRANSFORM_FOLDER_MODELS,+ TRANSFORM_MODELS,+} from "./constants";+import type {+ EntryPickerItem,+ EntryPickerItemId,+ EntryPickerItemModel,+} from "./types";+import {+ getEntryPickerItem,+ getEntryPickerValue,+ getQuestionPickerItem,+ getTablePickerValue,+ getTransformPickerItem,+ hasAvailableModels,+} from "./utils";++type EntryPickerModalProps = {+ value: DependencyNode | null;+ onChange: (value: DependencyEntry) => void;+ onClose: () => void;+};++export function EntryPickerModal({+ value,+ onChange,+ onClose,+}: EntryPickerModalProps) {+ const [tablesPath, setTablesPath] = useState<TablePickerStatePath>();+ const [questionsPath, setQuestionsPath] = useState<QuestionPickerStatePath>();+ const { data: searchResponse, isLoading: isSearchLoading } = useSearchQuery({+ models: SEARCH_MODELS,+ limit: 0,+ calculate_available_models: true,+ });+ const [logRecentItem] = useLogRecentItemMutation();++ const selectedItem = useMemo(() => {+ return value != null ? getEntryPickerItem(value) : undefined;+ }, [value]);++ const tabs = useMemo(() => {+ const computedTabs: EntityPickerTab<+ EntryPickerItemId,+ EntryPickerItemModel,+ EntryPickerItem+ >[] = [];++ computedTabs.push({+ id: "tables-tab",+ displayName: t`Tables`,+ models: TABLE_MODELS,+ folderModels: TABLE_FOLDER_MODELS,+ icon: "table",+ render: ({ onItemSelect }) => (+ <TablePicker+ value={value ? getTablePickerValue(value) : undefined}+ path={tablesPath}+ onItemSelect={onItemSelect}+ onPathChange={setTablesPath}+ />+ ),+ });++ if (hasAvailableModels(searchResponse, TRANSFORM_MODELS)) {+ computedTabs.push({+ id: "transforms-tab",+ displayName: t`Transforms`,+ models: TRANSFORM_MODELS,+ folderModels: TRANSFORM_FOLDER_MODELS,+ icon: "refresh_downstream",+ render: ({ onItemSelect }) => (+ <PLUGIN_TRANSFORMS.TransformPicker+ value={value ? getTransformPickerItem(value) : undefined}+ onItemSelect={onItemSelect}+ />+ ),+ });+ }++ if (hasAvailableModels(searchResponse, QUESTION_MODELS)) {+ computedTabs.push({+ id: "collections-tab",+ displayName: t`Collections`,+ models: QUESTION_MODELS,+ folderModels: QUESTION_FOLDER_MODELS,+ icon: "folder",+ render: ({ onItemSelect }) => (+ <QuestionPicker+ initialValue={value ? getQuestionPickerItem(value) : undefined}+ models={QUESTION_MODELS_WITH_DASHBOARDS}+ options={QUESTION_PICKER_OPTIONS}+ path={questionsPath}+ onInit={onItemSelect}+ onItemSelect={onItemSelect}+ onPathChange={setQuestionsPath}+ />+ ),+ });+ }++ return computedTabs;+ }, [value, searchResponse, tablesPath, questionsPath]);++ const handleItemSelect = (item: EntryPickerItem) => {+ const value = getEntryPickerValue(item);+ if (value != null) {+ if (isActivityModel(item.model)) {+ logRecentItem({ model: item.model, model_id: value.id });+ }++ onChange(value);+ }+ };++ return (+ <EntityPickerModal+ title={t`Pick an item to see its dependencies`}+ tabs={tabs}+ initialValue={selectedItem}+ selectedItem={selectedItem ?? null}+ options={ENTITY_PICKER_OPTIONS}+ recentsContext={RECENTS_CONTEXT}+ isLoadingTabs={isSearchLoading}+ canSelectItem+ defaultToRecentTab={false}+ onItemSelect={handleItemSelect}+ onClose={onClose}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/constants.tsnew file mode 100644index 00000000000..3305efa74c7--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/constants.ts@@ -0,0 +1,59 @@+import {+ type EntityPickerModalOptions,+ defaultOptions,+} from "metabase/common/components/EntityPicker";+import type {+ QuestionPickerModel,+ QuestionPickerOptions,+} from "metabase/common/components/Pickers/QuestionPicker";+import type {+ CollectionItemModel,+ RecentContexts,+ SearchModel,+} from "metabase-types/api";++import type { EntryPickerItemModel } from "./types";++export const TABLE_MODELS: EntryPickerItemModel[] = ["table"];++export const TABLE_FOLDER_MODELS: EntryPickerItemModel[] = [+ "database",+ "schema",+];++export const TRANSFORM_MODELS: (EntryPickerItemModel & SearchModel)[] = [+ "transform",+];++export const TRANSFORM_FOLDER_MODELS: EntryPickerItemModel[] = [];++export const QUESTION_MODELS: (EntryPickerItemModel & QuestionPickerModel)[] = [+ "card",+ "dataset",+ "metric",+];++export const QUESTION_MODELS_WITH_DASHBOARDS: CollectionItemModel[] = [+ "card",+ "dataset",+ "metric",+ "dashboard",+];++export const QUESTION_FOLDER_MODELS: EntryPickerItemModel[] = [+ "collection",+ "dashboard",+];++export const RECENTS_CONTEXT: RecentContexts[] = ["selections"];++export const ENTITY_PICKER_OPTIONS: EntityPickerModalOptions = {+ ...defaultOptions,+ hasConfirmButtons: false,+ hasRecents: true,+};++export const QUESTION_PICKER_OPTIONS: QuestionPickerOptions = {+ showRootCollection: true,+ showPersonalCollections: true,+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/index.tsnew file mode 100644index 00000000000..1975a91ad5b--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/index.ts@@ -0,0 +1 @@+export * from "./EntryPickerModal";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/types.tsnew file mode 100644index 00000000000..51822f80ec0--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/types.ts@@ -0,0 +1,12 @@+import type { QuestionPickerItem } from "metabase/common/components/Pickers/QuestionPicker";+import type { TablePickerItem } from "metabase/common/components/Pickers/TablePicker";+import type { TransformPickerItem } from "metabase/plugins";++export type EntryPickerItem =+ | TablePickerItem+ | QuestionPickerItem+ | TransformPickerItem;++export type EntryPickerItemId = EntryPickerItem["id"];++export type EntryPickerItemModel = EntryPickerItem["model"];diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.tsnew file mode 100644index 00000000000..5a45cb0a743--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.ts@@ -0,0 +1,121 @@+import type { QuestionPickerItem } from "metabase/common/components/Pickers/QuestionPicker";+import type {+ TablePickerItem,+ TablePickerValue,+} from "metabase/common/components/Pickers/TablePicker";+import type { TransformPickerItem } from "metabase/plugins";+import type {+ CardType,+ DependencyEntry,+ DependencyNode,+ SearchModel,+ SearchResponse,+} from "metabase-types/api";++import { getDependencyType } from "../../utils";+import { SEARCH_MODEL_TO_GROUP_TYPE } from "../constants";++import type { EntryPickerItem } from "./types";++export function getTablePickerValue(+ node: DependencyNode,+): TablePickerValue | undefined {+ if (node.type === "table") {+ return {+ id: node.id,+ model: "table",+ name: node.data.name,+ schema: node.data.schema,+ db_id: node.data.db_id,+ };+ }+}++export function getTablePickerItem(+ node: DependencyNode,+): TablePickerItem | undefined {+ if (node.type !== "table") {+ return;+ }++ return {+ id: node.id,+ model: "table",+ name: node.data.name,+ database_id: node.data.db_id,+ };+}++function getQuestionPickerModel(type: CardType): QuestionPickerItem["model"] {+ switch (type) {+ case "question":+ return "card";+ case "model":+ return "dataset";+ case "metric":+ return "metric";+ }+}++export function getQuestionPickerItem(+ node: DependencyNode,+): QuestionPickerItem | undefined {+ if (node.type !== "card") {+ return;+ }++ return {+ id: node.id,+ name: node.data.name,+ model: getQuestionPickerModel(node.data.type),+ };+}++export function getTransformPickerItem(+ node: DependencyNode,+): TransformPickerItem | undefined {+ if (node.type !== "transform") {+ return;+ }++ return {+ id: node.id,+ name: node.data.name,+ model: "transform",+ };+}++export function getEntryPickerItem(+ node: DependencyNode,+): EntryPickerItem | undefined {+ return (+ getTablePickerItem(node) ??+ getQuestionPickerItem(node) ??+ getTransformPickerItem(node)+ );+}++export function getEntryPickerValue(+ item: EntryPickerItem,+): DependencyEntry | undefined {+ if (+ typeof item.id !== "number" ||+ item.model === "database" ||+ item.model === "schema"+ ) {+ return;+ }++ const groupType = SEARCH_MODEL_TO_GROUP_TYPE[item.model];+ if (groupType != null) {+ return { id: item.id, type: getDependencyType(groupType) };+ }+}++export function hasAvailableModels(+ response: SearchResponse | undefined,+ models: SearchModel[],+) {+ const availableModels = response?.available_models ?? [];+ return models.some((model) => availableModels.includes(model));+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsxnew file mode 100644index 00000000000..3c5a474e5b1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsx@@ -0,0 +1,128 @@+import { useDebouncedValue } from "@mantine/hooks";+import { useMemo, useState } from "react";+import { t } from "ttag";++import {+ useListRecentsQuery,+ useLogRecentItemMutation,+ useSearchQuery,+} from "metabase/api";+import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";+import { DefaultSelectItem, FixedSizeIcon, Loader, Select } from "metabase/ui";+import {+ type DependencyEntry,+ type SearchModel,+ isActivityModel,+} from "metabase-types/api";++import { SearchModelPicker } from "./SearchModelPicker";+import { BROWSE_OPTION_VALUE } from "./constants";+import { getSelectOptions } from "./utils";++type EntrySearchInputProps = {+ searchModels: SearchModel[];+ isGraphFetching: boolean;+ onEntryChange: (entry: DependencyEntry) => void;+ onSearchModelsChange: (searchModels: SearchModel[]) => void;+ onPickerOpen: () => void;+};++export function EntrySearchInput({+ searchModels,+ isGraphFetching,+ onEntryChange,+ onSearchModelsChange,+ onPickerOpen,+}: EntrySearchInputProps) {+ const [searchValue, setSearchValue] = useState("");+ const [searchQuery] = useDebouncedValue(+ searchValue.trim(),+ SEARCH_DEBOUNCE_DURATION,+ );+ const isSearchEnabled = searchQuery.length > 0;++ const { data: recentItems } = useListRecentsQuery(+ {+ context: ["selections"],+ },+ {+ skip: isSearchEnabled,+ },+ );++ const { data: searchResponse, isFetching: isSearchFetching } = useSearchQuery(+ {+ q: searchQuery,+ models: searchModels,+ },+ {+ skip: !isSearchEnabled,+ },+ );++ const [logRecentItem] = useLogRecentItemMutation();++ const searchOptions = useMemo(+ () =>+ getSelectOptions(+ searchResponse?.data ?? [],+ recentItems ?? [],+ searchModels,+ isSearchEnabled,+ ),+ [searchResponse, recentItems, searchModels, isSearchEnabled],+ );++ const handleChange = (value: string | null) => {+ const option = searchOptions.find((option) => option.value === value);+ if (option == null) {+ return;+ }+ if (option.entry != null) {+ onEntryChange(option.entry);++ if (option.model != null && isActivityModel(option.model)) {+ logRecentItem({+ model: option.model,+ model_id: option.entry.id,+ });+ }+ }+ if (option.value === BROWSE_OPTION_VALUE) {+ onPickerOpen();+ }+ };++ return (+ <Select+ value={null}+ data={searchOptions}+ searchValue={searchValue}+ placeholder={t`Pick an item to see its dependencies`}+ filter={({ options }) => options}+ leftSection={<FixedSizeIcon name="search" />}+ rightSection={+ isSearchFetching || isGraphFetching ? (+ <Loader size="sm" />+ ) : (+ <SearchModelPicker+ searchModels={searchModels}+ onSearchModelsChange={onSearchModelsChange}+ />+ )+ }+ renderOption={({ option }) => (+ <DefaultSelectItem+ {...option}+ fw={option.value === BROWSE_OPTION_VALUE ? "bold" : undefined}+ />+ )}+ w="20rem"+ searchable+ autoFocus={!isGraphFetching}+ data-testid="graph-entry-search-input"+ onChange={handleChange}+ onSearchChange={setSearchValue}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.module.cssnew file mode 100644index 00000000000..c93942911e8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.module.css@@ -0,0 +1,3 @@+.button {+ pointer-events: all;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsxnew file mode 100644index 00000000000..ce897a60860--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsx@@ -0,0 +1,95 @@+import { useDisclosure } from "@mantine/hooks";+import { t } from "ttag";++import { useSearchQuery } from "metabase/api";+import {+ ActionIcon,+ Box,+ Center,+ Checkbox,+ FixedSizeIcon,+ Loader,+ Popover,+ Stack,+} from "metabase/ui";+import type { SearchModel } from "metabase-types/api";++import { SEARCH_MODELS } from "../../constants";++import S from "./SearchModelPicker.module.css";+import { getSearchModelItems } from "./utils";++type SearchModelPickerProps = {+ searchModels: SearchModel[];+ onSearchModelsChange: (models: SearchModel[]) => void;+};++export function SearchModelPicker({+ searchModels,+ onSearchModelsChange,+}: SearchModelPickerProps) {+ const [isOpened, { toggle, close }] = useDisclosure();++ return (+ <Popover opened={isOpened} position="right" onDismiss={close}>+ <Popover.Target>+ <ActionIcon+ className={S.button}+ aria-label={t`Filter`}+ onClick={toggle}+ >+ <FixedSizeIcon c="text-primary" name="filter" />+ </ActionIcon>+ </Popover.Target>+ <Popover.Dropdown>+ <SearchModelPopover+ searchModels={searchModels}+ onSearchModelsChange={onSearchModelsChange}+ />+ </Popover.Dropdown>+ </Popover>+ );+}++type SearchModelPopoverProps = {+ searchModels: SearchModel[];+ onSearchModelsChange: (models: SearchModel[]) => void;+};++function SearchModelPopover({+ searchModels,+ onSearchModelsChange,+}: SearchModelPopoverProps) {+ const { data, isLoading } = useSearchQuery({+ models: SEARCH_MODELS,+ limit: 0,+ calculate_available_models: true,+ });+ const items = data ? getSearchModelItems(data) : [];++ const handleChange = (value: string[]) => {+ onSearchModelsChange(value as SearchModel[]);+ };++ return (+ <Box w="15rem" p="md">+ {isLoading ? (+ <Center>+ <Loader />+ </Center>+ ) : (+ <Checkbox.Group value={searchModels} onChange={handleChange}>+ <Stack gap="0.75rem">+ {items.map((item) => (+ <Checkbox+ key={item.value}+ value={item.value}+ label={item.label}+ />+ ))}+ </Stack>+ </Checkbox.Group>+ )}+ </Box>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/index.tsnew file mode 100644index 00000000000..cb193d8573e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/index.ts@@ -0,0 +1 @@+export * from "./SearchModelPicker";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/types.tsnew file mode 100644index 00000000000..64f9de78149--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/types.ts@@ -0,0 +1,6 @@+import type { SearchModel } from "metabase-types/api";++export type SearchModelItem = {+ value: SearchModel;+ label: string;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/utils.tsnew file mode 100644index 00000000000..03670b404cc--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/utils.ts@@ -0,0 +1,28 @@+import { t } from "ttag";++import type { SearchResponse } from "metabase-types/api";++import {+ ENABLED_SEARCH_MODELS,+ type EnabledSearchModel,+} from "../../constants";++import type { SearchModelItem } from "./types";++export function getSearchModelItems(data: SearchResponse): SearchModelItem[] {+ const allLabels: Record<EnabledSearchModel, string> = {+ table: t`Tables`,+ card: t`Questions`,+ dataset: t`Models`,+ metric: t`Metrics`,+ transform: t`Transforms`,+ };++ const allItems = ENABLED_SEARCH_MODELS.map((model) => ({+ value: model,+ label: allLabels[model],+ }));++ const availableModels = data.available_models ?? [];+ return allItems.filter((item) => availableModels.includes(item.value));+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/constants.tsnew file mode 100644index 00000000000..98741229e6b--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/constants.ts@@ -0,0 +1 @@+export const BROWSE_OPTION_VALUE = "browse";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/index.tsnew file mode 100644index 00000000000..dde8acfd881--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/index.ts@@ -0,0 +1 @@+export * from "./EntrySearchInput";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/types.tsnew file mode 100644index 00000000000..3e70761f740--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/types.ts@@ -0,0 +1,7 @@+import type { SelectOption } from "metabase/ui";+import type { DependencyEntry, SearchModel } from "metabase-types/api";++export type EntrySelectOption = SelectOption & {+ entry?: DependencyEntry;+ model?: SearchModel;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/utils.tsnew file mode 100644index 00000000000..27188fe994d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/utils.ts@@ -0,0 +1,111 @@+import { t } from "ttag";++import type {+ CardType,+ DependencyId,+ DependencyType,+ RecentItem,+ SearchModel,+ SearchResult,+ SearchResultId,+} from "metabase-types/api";++import { getDependencyType, getNodeIconWithType } from "../../utils";+import { SEARCH_MODEL_TO_GROUP_TYPE } from "../constants";++import { BROWSE_OPTION_VALUE } from "./constants";+import type { EntrySelectOption } from "./types";++function getItemDependencyId(id: SearchResultId): DependencyId {+ if (typeof id === "number") {+ return id;+ } else {+ throw new TypeError(`Unsupported search result id: ${id}`);+ }+}++function getItemDependencyType(model: SearchModel): DependencyType {+ const groupType = SEARCH_MODEL_TO_GROUP_TYPE[model];+ if (groupType == null) {+ throw new Error(`Search model "${model}" is not supported`);+ }+ return getDependencyType(groupType);+}++function getItemCardType(model: SearchModel): CardType | undefined {+ switch (model) {+ case "card":+ return "question";+ case "dataset":+ return "model";+ case "metric":+ return "metric";+ default:+ return undefined;+ }+}++function getOptionValue(id: DependencyId, type: DependencyType) {+ return `${id}-${type}`;+}++function getItemOptions<T extends SearchResult | RecentItem>(+ items: T[],+ getLabel: (item: T) => string,+): EntrySelectOption[] {+ return items.map((item) => {+ const id = getItemDependencyId(item.id);+ const type = getItemDependencyType(item.model);+ const cardType = getItemCardType(item.model);+ const cardDisplay =+ item.model === "card" ? (item.display ?? undefined) : undefined;++ return {+ type: "item",+ value: getOptionValue(id, type),+ label: getLabel(item),+ icon: getNodeIconWithType(type, cardType, cardDisplay),+ model: item.model,+ entry: {+ id,+ type,+ },+ };+ });+}++function getSearchOptions(searchResults: SearchResult[]): EntrySelectOption[] {+ return getItemOptions(searchResults, (item) => item.name);+}++function getRecentOptions(+ recentItems: RecentItem[],+ searchModels: SearchModel[],+): EntrySelectOption[] {+ return getItemOptions(+ recentItems.filter((item) => searchModels.includes(item.model)),+ (item) => (item.model === "table" ? item.display_name : item.name),+ );+}++function getBrowseOption(): EntrySelectOption {+ return {+ type: "browse",+ value: BROWSE_OPTION_VALUE,+ label: t`Browse all`,+ icon: "search",+ };+}++export function getSelectOptions(+ searchResults: SearchResult[],+ recentItems: RecentItem[],+ searchModels: SearchModel[],+ isSearchEnabled: boolean,+): EntrySelectOption[] {+ const options = isSearchEnabled+ ? getSearchOptions(searchResults)+ : getRecentOptions(recentItems, searchModels);++ return [...options, getBrowseOption()];+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsxnew file mode 100644index 00000000000..7c4d42d5e89--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx@@ -0,0 +1,71 @@+import { useDisclosure } from "@mantine/hooks";+import { useState } from "react";+import { push } from "react-router-redux";++import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";+import { Card } from "metabase/ui";+import type {+ DependencyEntry,+ DependencyNode,+ SearchModel,+} from "metabase-types/api";++import { EntryButton } from "./EntryButton";+import { EntryPickerModal } from "./EntryPickerModal";+import { EntrySearchInput } from "./EntrySearchInput";+import { SEARCH_MODELS } from "./constants";++type GraphEntryInputProps = {+ node: DependencyNode | null;+ isGraphFetching: boolean;+};++export function GraphEntryInput({+ node,+ isGraphFetching,+}: GraphEntryInputProps) {+ const [searchModels, setSearchModels] =+ useState<SearchModel[]>(SEARCH_MODELS);+ const dispatch = useDispatch();+ const [isPickerOpened, { open: openPicker, close: closePicker }] =+ useDisclosure();++ const handleEntryChange = (newEntry: DependencyEntry | null) => {+ dispatch(push(Urls.dependencyGraph(newEntry ? { entry: newEntry } : {})));+ };++ const handlePickerChange = (newEntry: DependencyEntry) => {+ closePicker();+ handleEntryChange(newEntry);+ };++ return (+ <>+ <Card p={0} bdrs={0}>+ {node != null ? (+ <EntryButton+ node={node}+ onEntryChange={handleEntryChange}+ onPickerOpen={openPicker}+ />+ ) : (+ <EntrySearchInput+ searchModels={searchModels}+ isGraphFetching={isGraphFetching}+ onEntryChange={handleEntryChange}+ onSearchModelsChange={setSearchModels}+ onPickerOpen={openPicker}+ />+ )}+ </Card>+ {isPickerOpened && (+ <EntryPickerModal+ value={node}+ onChange={handlePickerChange}+ onClose={closePicker}+ />+ )}+ </>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/constants.tsnew file mode 100644index 00000000000..3262b012347--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/constants.ts@@ -0,0 +1,28 @@+import type { DependencyGroupType, SearchModel } from "metabase-types/api";++export type EnabledSearchModel = (typeof ENABLED_SEARCH_MODELS)[number];++export const ENABLED_SEARCH_MODELS = [+ "card",+ "dataset",+ "metric",+ "table",+ "transform",+] as const satisfies SearchModel[];++export const ENABLED_SEARCH_MODEL_TO_GROUP_TYPE: Record<+ EnabledSearchModel,+ DependencyGroupType+> = {+ card: "question",+ dataset: "model",+ metric: "metric",+ table: "table",+ transform: "transform",+};++export const SEARCH_MODELS: SearchModel[] = ENABLED_SEARCH_MODELS;++export const SEARCH_MODEL_TO_GROUP_TYPE: Partial<+ Record<SearchModel, DependencyGroupType>+> = ENABLED_SEARCH_MODEL_TO_GROUP_TYPE;diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/index.tsnew file mode 100644index 00000000000..74c76b5d9c9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/index.ts@@ -0,0 +1 @@+export * from "./GraphEntryInput";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsxnew file mode 100644index 00000000000..b7485759be5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsx@@ -0,0 +1,25 @@+import { ForwardRefLink } from "metabase/common/components/Link";+import { ActionIcon, FixedSizeIcon, Tooltip, rem } from "metabase/ui";++import { ACTION_ICON_PADDING, TOOLTIP_OPEN_DELAY } from "../constants";++type GraphExternalLinkProps = {+ label: string;+ url: string;+};++export function GraphExternalLink({ label, url }: GraphExternalLinkProps) {+ return (+ <Tooltip label={label} openDelay={TOOLTIP_OPEN_DELAY}>+ <ActionIcon+ component={ForwardRefLink}+ to={url}+ target="_blank"+ m={rem(-ACTION_ICON_PADDING)}+ aria-label={label}+ >+ <FixedSizeIcon name="external" />+ </ActionIcon>+ </Tooltip>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/index.tsnew file mode 100644index 00000000000..c2b379592bd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/index.ts@@ -0,0 +1 @@+export * from "./GraphExternalLink";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/GraphInfoPanel.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/GraphInfoPanel.module.cssnew file mode 100644index 00000000000..d0103e464bd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/GraphInfoPanel.module.css@@ -0,0 +1,7 @@+.root {+ display: flex;+ flex-direction: column;+ padding: 0;+ width: 32rem;+ pointer-events: all;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/GraphInfoPanel.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/GraphInfoPanel.tsxnew file mode 100644index 00000000000..94a15797807--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/GraphInfoPanel.tsx@@ -0,0 +1,20 @@+import { Card } from "metabase/ui";+import type { DependencyNode } from "metabase-types/api";++import S from "./GraphInfoPanel.module.css";+import { PanelBody } from "./PanelBody";+import { PanelHeader } from "./PanelHeader";++type GraphInfoPanelProps = {+ node: DependencyNode;+ onClose: () => void;+};++export function GraphInfoPanel({ node, onClose }: GraphInfoPanelProps) {+ return (+ <Card className={S.root} withBorder data-testid="graph-info-panel">+ <PanelHeader node={node} onClose={onClose} />+ <PanelBody node={node} />+ </Card>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.module.cssnew file mode 100644index 00000000000..6c501d14c20--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.module.css@@ -0,0 +1,3 @@+.body {+ overflow: auto;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsxnew file mode 100644index 00000000000..d6a8d12275c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx@@ -0,0 +1,143 @@+import { c, t } from "ttag";++import DateTime from "metabase/common/components/DateTime";+import { getColumnIcon } from "metabase/common/utils/columns";+import { getUserName } from "metabase/lib/user";+import { Box, FixedSizeIcon, Group, Stack, Title } from "metabase/ui";+import * as Lib from "metabase-lib";+import type { DependencyNode } from "metabase-types/api";++import { GraphBreadcrumbs } from "../../GraphBreadcrumbs";+import { GraphExternalLink } from "../../GraphExternalLink";+import { GraphLink } from "../../GraphLink";+import { getNodeDescription } from "../../utils";++import S from "./PanelBody.module.css";+import {+ getNodeCreatedAt,+ getNodeCreatedBy,+ getNodeFields,+ getNodeFieldsLabel,+ getNodeLastEditedAt,+ getNodeLastEditedBy,+ getNodeTableInfo,+} from "./utils";++type PanelBodyProps = {+ node: DependencyNode;+};++export function PanelBody({ node }: PanelBodyProps) {+ return (+ <Stack className={S.body} p="lg" gap="lg">+ <DescriptionSection node={node} />+ <CreatorAndLastEditorSection node={node} />+ <GeneratedTableSection node={node} />+ <FieldsSection node={node} />+ </Stack>+ );+}++type SectionProps = {+ node: DependencyNode;+};++function DescriptionSection({ node }: SectionProps) {+ const description = getNodeDescription(node);++ return (+ <Box c={description ? "text-primary" : "text-secondary"} lh="h4">+ {description ?? t`No description`}+ </Box>+ );+}++function CreatorAndLastEditorSection({ node }: SectionProps) {+ const createdAt = getNodeCreatedAt(node);+ const createdBy = getNodeCreatedBy(node);+ const editedAt = getNodeLastEditedAt(node);+ const editedBy = getNodeLastEditedBy(node);+ const hasCreatedInfo = createdAt != null && createdBy != null;+ const hasEditedInfo = editedAt != null && editedBy != null;++ if (!hasCreatedInfo && !hasEditedInfo) {+ return null;+ }++ return (+ <Stack gap="sm" lh="1rem">+ <Title order={6}>{t`Creator and last editor`}</Title>+ {createdAt != null && createdBy != null && (+ <Group gap="sm" wrap="nowrap">+ <FixedSizeIcon name="ai" />+ <Box>+ {c(+ "Describes when an entity was created. {0} is a date/time and {1} is a person's name",+ ).jt`${(+ <DateTime unit="day" value={createdAt} key="date" />+ )} by ${getUserName(createdBy)}`}+ </Box>+ </Group>+ )}+ {editedAt != null && editedBy != null && (+ <Group gap="sm" wrap="nowrap">+ <FixedSizeIcon name="pencil" />+ <Box>+ {c(+ "Describes when an entity was last edited. {0} is a date/time and {1} is a person's name",+ ).jt`${(+ <DateTime unit="day" value={editedAt} key="date" />+ )} by ${getUserName(editedBy)}`}+ </Box>+ </Group>+ )}+ </Stack>+ );+}++function GeneratedTableSection({ node }: SectionProps) {+ const info = getNodeTableInfo(node);+ if (info == null) {+ return null;+ }++ return (+ <Stack gap="sm" lh="1rem">+ <Title order={6}>{t`Generated table`}</Title>+ <Group justify="space-between">+ <GraphLink label={info.title.label} icon="table" url={info.title.url} />+ <GraphExternalLink+ label={info.metadata.label}+ url={info.metadata.url}+ />+ </Group>+ {info.location && (+ <GraphBreadcrumbs location={info.location} ml="1rem" pl="sm" />+ )}+ </Stack>+ );+}++function FieldsSection({ node }: SectionProps) {+ const fields = getNodeFields(node);+ if (fields.length === 0) {+ return null;+ }++ return (+ <Stack gap="md" lh="1rem">+ <Title order={6}>{getNodeFieldsLabel(fields.length)}</Title>+ {fields.map((field, fieldIndex) => {+ const fieldTypeInfo = Lib.legacyColumnTypeInfo(field);+ const fieldIcon = getColumnIcon(fieldTypeInfo);++ return (+ <Group key={fieldIndex} gap="sm" wrap="nowrap">+ <FixedSizeIcon name={fieldIcon} c="text-secondary" />+ {field.display_name}+ </Group>+ );+ })}+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/index.tsnew file mode 100644index 00000000000..01d44bb3bfd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/index.ts@@ -0,0 +1 @@+export * from "./PanelBody";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/types.tsnew file mode 100644index 00000000000..8c416b25973--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/types.ts@@ -0,0 +1,7 @@+import type { NodeLink } from "../../types";++export type NodeTableInfo = {+ title: NodeLink;+ metadata: NodeLink;+ location: NodeLink[] | null;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.tsnew file mode 100644index 00000000000..0ec7ccd899c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts@@ -0,0 +1,109 @@+import { msgid, ngettext, t } from "ttag";++import * as Urls from "metabase/lib/urls";+import type {+ CardCreatorInfo,+ DependencyNode,+ LastEditInfo,+} from "metabase-types/api";++import type { NodeTableInfo } from "./types";++export function getNodeCreatedAt(node: DependencyNode): string | null {+ switch (node.type) {+ case "card":+ return node.data.created_at;+ case "table":+ case "transform":+ case "snippet":+ return null;+ }+}++export function getNodeCreatedBy(node: DependencyNode): CardCreatorInfo | null {+ switch (node.type) {+ case "card":+ return node.data.creator ?? null;+ case "table":+ case "transform":+ case "snippet":+ return null;+ }+}++export function getNodeLastEditedAt(node: DependencyNode): string | null {+ switch (node.type) {+ case "card":+ return node.data["last-edit-info"]?.timestamp ?? null;+ case "table":+ case "transform":+ case "snippet":+ return null;+ }+}++export function getNodeLastEditedBy(node: DependencyNode): LastEditInfo | null {+ switch (node.type) {+ case "card":+ return node.data["last-edit-info"] ?? null;+ case "table":+ case "transform":+ case "snippet":+ return null;+ }+}++export function getNodeTableInfo(node: DependencyNode): NodeTableInfo | null {+ if (node.type !== "transform") {+ return null;+ }++ const table = node.data.table;+ if (table == null || typeof table.id !== "number") {+ return null;+ }++ return {+ title: {+ label: table.display_name,+ url: Urls.dependencyGraph({ entry: { id: table.id, type: "table" } }),+ },+ metadata: {+ label: t`View metadata`,+ url: Urls.dataModelTable(table.db_id, table.schema, table.id),+ },+ location: table.db+ ? [+ {+ label: table.db.name,+ url: Urls.dataModelDatabase(table.db.id),+ },+ {+ label: table.schema,+ url: Urls.dataModelSchema(table.db.id, table.schema),+ },+ ]+ : null,+ };+}++export function getNodeFields(node: DependencyNode) {+ switch (node.type) {+ case "card":+ return node.data.result_metadata ?? [];+ case "table":+ return node.data.fields ?? [];+ case "transform":+ return node.data.table?.fields ?? [];+ case "snippet":+ return [];+ }+}++export function getNodeFieldsLabel(fieldCount: number) {+ return ngettext(+ msgid`${fieldCount} field`,+ `${fieldCount} fields`,+ fieldCount,+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.module.cssnew file mode 100644index 00000000000..0c804d41296--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.module.css@@ -0,0 +1,3 @@+.root {+ border-bottom: 1px solid var(--mb-color-border);+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsxnew file mode 100644index 00000000000..ec3df58aa26--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx@@ -0,0 +1,56 @@+import { t } from "ttag";++import {+ ActionIcon,+ Center,+ FixedSizeIcon,+ Group,+ Stack,+ Title,+ rem,+} from "metabase/ui";+import type { DependencyNode } from "metabase-types/api";++import { GraphBreadcrumbs } from "../../GraphBreadcrumbs";+import { GraphExternalLink } from "../../GraphExternalLink";+import { ACTION_ICON_PADDING } from "../../constants";+import {+ getNodeIcon,+ getNodeLabel,+ getNodeLink,+ getNodeLocationInfo,+} from "../../utils";++import S from "./PanelHeader.module.css";++type PanelHeaderProps = {+ node: DependencyNode;+ onClose: () => void;+};++export function PanelHeader({ node, onClose }: PanelHeaderProps) {+ const link = getNodeLink(node);+ const location = getNodeLocationInfo(node);++ return (+ <Group className={S.root} p="lg" gap="0.75rem" wrap="nowrap">+ <Center w="2.75rem" h="2.75rem" bdrs="50%" bg="bg-secondary">+ <FixedSizeIcon name={getNodeIcon(node)} c="brand" size={20} />+ </Center>+ <Stack gap="xs" flex={1}>+ <Title order={3} lh="1.5rem">+ {getNodeLabel(node)}+ </Title>+ {location != null && <GraphBreadcrumbs location={location} />}+ </Stack>+ <Group m={rem(-ACTION_ICON_PADDING)} gap="xs">+ {link != null && (+ <GraphExternalLink label={link.label} url={link.url} />+ )}+ <ActionIcon aria-label={t`Close`} onClick={onClose}>+ <FixedSizeIcon name="close" />+ </ActionIcon>+ </Group>+ </Group>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/index.tsnew file mode 100644index 00000000000..40b8fa71048--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/index.ts@@ -0,0 +1 @@+export * from "./PanelHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/index.tsnew file mode 100644index 00000000000..0ba49dc05b0--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/index.ts@@ -0,0 +1 @@+export * from "./GraphInfoPanel";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.module.cssnew file mode 100644index 00000000000..9a839f16be9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.module.css@@ -0,0 +1,8 @@+.link {+ color: var(--mb-color-text-primary);++ &:hover {+ color: var(--mb-color-brand);+ text-decoration: none;+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsxnew file mode 100644index 00000000000..c78afc9683e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx@@ -0,0 +1,22 @@+import { Link } from "react-router";++import { Box, FixedSizeIcon, Flex, type IconName } from "metabase/ui";++import S from "./GraphLink.module.css";++type GraphLinkProps = {+ label: string;+ icon: IconName;+ url: string;+};++export function GraphLink({ label, icon, url }: GraphLinkProps) {+ return (+ <Box className={S.link} component={Link} to={url}>+ <Flex gap="sm" align="center">+ <FixedSizeIcon name={icon} c="brand" />+ <Box lh="h4">{label}</Box>+ </Flex>+ </Box>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/index.tsnew file mode 100644index 00000000000..108da8c2b60--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/index.ts@@ -0,0 +1 @@+export * from "./GraphLink";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.cssnew file mode 100644index 00000000000..99cf557f84a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css@@ -0,0 +1,19 @@+.card {+ min-width: 15rem;++ &:hover,+ &.selected {+ border-color: var(--mb-color-brand);+ }+}++.pill {+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-bg-medium);++ &:hover,+ &.selected {+ color: var(--mb-color-white);+ background-color: var(--mb-color-brand);+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsxnew file mode 100644index 00000000000..8ee586b0add--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx@@ -0,0 +1,142 @@+import {+ Handle,+ type NodeProps,+ Position,+ useNodeConnections,+} from "@xyflow/react";+import cx from "classnames";+import { type MouseEvent, memo, useContext } from "react";++import {+ Box,+ Card,+ FixedSizeIcon,+ Group,+ Pill,+ Stack,+ UnstyledButton,+} from "metabase/ui";+import type { DependencyNode } from "metabase-types/api";++import { GraphContext } from "../GraphContext";+import type { GraphSelection, NodeType } from "../types";+import {+ getNodeIcon,+ getNodeLabel,+ getNodeTypeInfo,+ isSameNode,+} from "../utils";++import S from "./GraphNode.module.css";+import type { DependentGroup } from "./types";+import {+ getDependencyGroupTitle,+ getDependentGroupLabel,+ getDependentGroups,+} from "./utils";++type GraphNodeProps = NodeProps<NodeType>;++export const GraphNode = memo(function ItemNode({+ data: node,+}: GraphNodeProps) {+ const { selection, setSelection } = useContext(GraphContext);+ const label = getNodeLabel(node);+ const typeInfo = getNodeTypeInfo(node);+ const groups = getDependentGroups(node);+ const sources = useNodeConnections({ handleType: "source" });+ const targets = useNodeConnections({ handleType: "target" });+ const isSelected =+ selection != null && isSameNode(node, selection.id, selection.type);++ const handleClick = () => {+ setSelection({ id: node.id, type: node.type, withInfo: true });+ };++ return (+ <>+ <Card+ className={cx(S.card, { [S.selected]: isSelected })}+ p="lg"+ withBorder+ aria-label={label}+ aria-selected={isSelected}+ data-testid="graph-node"+ onClick={handleClick}+ >+ <Stack gap="sm">+ <Group c={typeInfo.color} gap="xs">+ <FixedSizeIcon name={getNodeIcon(node)} />+ <Box fz="sm" fw="bold" lh="1rem">+ {typeInfo.label}+ </Box>+ </Group>+ <Box fw="bold" lh="1rem">+ {label}+ </Box>+ </Stack>+ <Stack mt="md" gap="sm" align="start">+ <Box c="text-secondary" fz="sm" lh="1rem">+ {getDependencyGroupTitle(node, groups)}+ </Box>+ {groups.map((group) => (+ <DependencyGroupButton+ key={group.type}+ node={node}+ group={group}+ selection={selection}+ onSelectionChange={setSelection}+ />+ ))}+ </Stack>+ </Card>+ {sources.length > 0 && (+ <Handle type="source" position={Position.Left} isConnectable={false} />+ )}+ {targets.length > 0 && (+ <Handle type="target" position={Position.Right} isConnectable={false} />+ )}+ </>+ );+});++type DependencyGroupButtonProps = {+ node: DependencyNode;+ group: DependentGroup;+ selection: GraphSelection | null;+ onSelectionChange: (selection: GraphSelection) => void;+};++function DependencyGroupButton({+ node,+ group,+ selection,+ onSelectionChange,+}: DependencyGroupButtonProps) {+ const isSelected =+ selection != null &&+ isSameNode(node, selection.id, selection.type) &&+ selection.groupType === group.type;++ const handleClick = (event: MouseEvent) => {+ event.stopPropagation();+ onSelectionChange({+ id: node.id,+ type: node.type,+ groupType: group.type,+ withInfo: true,+ });+ };++ return (+ <Pill+ key={group.type}+ component={UnstyledButton}+ className={cx(S.pill, { [S.selected]: isSelected })}+ fw="normal"+ onClick={handleClick}+ >+ {getDependentGroupLabel(group)}+ </Pill>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/index.tsnew file mode 100644index 00000000000..14fe2f06593--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/index.ts@@ -0,0 +1 @@+export * from "./GraphNode";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/types.tsnew file mode 100644index 00000000000..8db2bedc247--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/types.ts@@ -0,0 +1,6 @@+import type { DependencyGroupType } from "metabase-types/api";++export type DependentGroup = {+ type: DependencyGroupType;+ count: number;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.tsnew file mode 100644index 00000000000..e245260dd8c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.ts@@ -0,0 +1,64 @@+import { msgid, ngettext, t } from "ttag";++import type { DependencyNode } from "metabase-types/api";++import type { DependentGroup } from "./types";++export function getDependentGroups(node: DependencyNode): DependentGroup[] {+ const {+ question = 0,+ model = 0,+ metric = 0,+ table = 0,+ transform = 0,+ snippet = 0,+ } = node.dependents_count ?? {};++ const groups: DependentGroup[] = [+ { type: "question", count: question },+ { type: "model", count: model },+ { type: "metric", count: metric },+ { type: "table", count: table },+ { type: "transform", count: transform },+ { type: "snippet", count: snippet },+ ];++ return groups.filter(({ count }) => count !== 0);+}++export function getDependencyGroupTitle(+ node: DependencyNode,+ groups: DependentGroup[],+) {+ if (groups.length === 0) {+ return t`Nothing uses this`;+ }+ if (+ node.type === "transform" &&+ groups.length === 1 &&+ groups[0].type === "table"+ ) {+ return t`Generates`;+ }+ return t`Used by`;+}++export function getDependentGroupLabel({+ type,+ count,+}: DependentGroup): string {+ switch (type) {+ case "question":+ return ngettext(msgid`${count} question`, `${count} questions`, count);+ case "model":+ return ngettext(msgid`${count} model`, `${count} models`, count);+ case "metric":+ return ngettext(msgid`${count} metric`, `${count} metrics`, count);+ case "table":+ return ngettext(msgid`${count} table`, `${count} tables`, count);+ case "transform":+ return ngettext(msgid`${count} transform`, `${count} transforms`, count);+ case "snippet":+ return ngettext(msgid`${count} snippet`, `${count} snippet`, count);+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/GraphNodeLayout.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/GraphNodeLayout.tsxnew file mode 100644index 00000000000..d0e1d8971d2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/GraphNodeLayout.tsx@@ -0,0 +1,23 @@+import { useNodesInitialized, useReactFlow } from "@xyflow/react";+import { useLayoutEffect } from "react";++import type { NodeType } from "../types";++import { getNodesWithPositions } from "./utils";++export function GraphNodeLayout() {+ const { getNodes, getEdges, setNodes, fitView } = useReactFlow<NodeType>();+ const isInitialized = useNodesInitialized();++ useLayoutEffect(() => {+ if (isInitialized) {+ const nodes = getNodes();+ const edges = getEdges();+ const newNodes = getNodesWithPositions(nodes, edges);+ setNodes(newNodes);+ fitView({ nodes: newNodes });+ }+ }, [isInitialized, getNodes, getEdges, setNodes, fitView]);++ return null;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/index.tsnew file mode 100644index 00000000000..52b3653194a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/index.ts@@ -0,0 +1 @@+export * from "./GraphNodeLayout";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/utils.tsnew file mode 100644index 00000000000..88a256c89d3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNodeLayout/utils.ts@@ -0,0 +1,37 @@+import dagre from "@dagrejs/dagre";+import type { Edge } from "@xyflow/react";++import type { NodeType } from "../types";++export function getNodesWithPositions(+ nodes: NodeType[],+ edges: Edge[],+): NodeType[] {+ const dagreGraph = new dagre.graphlib.Graph();+ dagreGraph.setGraph({ rankdir: "LR" });+ dagreGraph.setDefaultEdgeLabel(() => ({}));++ nodes.forEach((node) => {+ dagreGraph.setNode(node.id, {+ width: node.measured?.width,+ height: node.measured?.height,+ });+ });++ edges.forEach((edge) => {+ dagreGraph.setEdge(edge.target, edge.source);+ });++ dagre.layout(dagreGraph);++ return nodes.map((node) => {+ const { x, y, width, height } = dagreGraph.node(node.id);+ return {+ ...node,+ position: {+ x: x - width / 2,+ y: y - height / 2,+ },+ };+ });+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsxnew file mode 100644index 00000000000..6f770f0a2a1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsx@@ -0,0 +1,66 @@+import { useDisclosure } from "@mantine/hooks";+import { useReactFlow } from "@xyflow/react";+import { useMemo } from "react";+import { t } from "ttag";++import { Button, Card, FixedSizeIcon, Select, Tooltip } from "metabase/ui";++import { TOOLTIP_OPEN_DELAY } from "../constants";+import type { NodeType } from "../types";+import { getNodeIcon, getNodeLabel } from "../utils";++type GraphSelectInputProps = {+ nodes: NodeType[];+};++export function GraphSelectInput({ nodes }: GraphSelectInputProps) {+ const { fitView } = useReactFlow();+ const data = useMemo(() => getSelectItems(nodes), [nodes]);+ const [isOpened, { open, close }] = useDisclosure(false);++ const handleChange = (value: string | null) => {+ const selectedNode = nodes.find((node) => node.id === value);+ if (selectedNode != null) {+ fitView({ nodes: [selectedNode] });+ }+ };++ return (+ <Card p={0} bdrs={0}>+ {isOpened ? (+ <Select+ value={null}+ data={data}+ placeholder={t`Jump to an item on the graph`}+ nothingFoundMessage={t`Didn't find any results`}+ leftSection={<FixedSizeIcon name="search" />}+ w="20rem"+ searchable+ autoFocus+ data-testid="graph-selection-input"+ onChange={handleChange}+ onBlur={close}+ />+ ) : (+ <Tooltip+ label={t`Jump to an item on the graph`}+ openDelay={TOOLTIP_OPEN_DELAY}+ >+ <Button+ leftSection={<FixedSizeIcon name="search" />}+ data-testid="graph-selection-button"+ onClick={open}+ />+ </Tooltip>+ )}+ </Card>+ );+}++function getSelectItems(nodes: NodeType[]) {+ return nodes.map((node) => ({+ value: node.id,+ label: getNodeLabel(node.data),+ icon: getNodeIcon(node.data),+ }));+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/index.tsnew file mode 100644index 00000000000..256742116fb--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/index.ts@@ -0,0 +1 @@+export * from "./GraphSelectionInput";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.tsnew file mode 100644index 00000000000..aa11ca9e746--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.ts@@ -0,0 +1,5 @@+export const MIN_ZOOM = 0.1;+export const MAX_ZOOM = 1;+export const ACTION_ICON_PADDING = 6;+export const DEPENDENTS_SEARCH_THRESHOLD = 5;+export const TOOLTIP_OPEN_DELAY = 700;diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/index.tsnew file mode 100644index 00000000000..9c947e0dbf4--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/index.ts@@ -0,0 +1 @@+export * from "./DependencyGraph";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.tsnew file mode 100644index 00000000000..086a3d922c3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.ts@@ -0,0 +1,39 @@+import type { Edge, Node } from "@xyflow/react";++import type {+ DependencyGroupType,+ DependencyId,+ DependencyNode,+ DependencyType,+} from "metabase-types/api";++export type NodeId = string;+export type EdgeId = string;+export type NodeType = Node<DependencyNode>;++export type NodeTypeInfo = {+ label: string;+ color: string;+};++export type NodeLink = {+ label: string;+ url: string;+};++export type GraphData = {+ nodes: NodeType[];+ edges: Edge[];+};++export type GraphSelection = {+ id: DependencyId;+ type: DependencyType;+ groupType?: DependencyGroupType;+ withInfo?: boolean;+};++export type GraphContextType = {+ selection: GraphSelection | null;+ setSelection: (selection: GraphSelection | null) => void;+};diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.tsnew file mode 100644index 00000000000..df329a6065d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts@@ -0,0 +1,268 @@+import type { Edge } from "@xyflow/react";+import { t } from "ttag";++import * as Urls from "metabase/lib/urls";+import type { IconName } from "metabase/ui";+import visualizations from "metabase/visualizations";+import type {+ CardType,+ DependencyEdge,+ DependencyGraph,+ DependencyGroupType,+ DependencyId,+ DependencyNode,+ DependencyType,+ VisualizationDisplay,+} from "metabase-types/api";++import type {+ EdgeId,+ GraphData,+ NodeId,+ NodeLink,+ NodeType,+ NodeTypeInfo,+} from "./types";++export function getNodeId(id: DependencyId, type: DependencyType): NodeId {+ return `${id}-${type}`;+}++export function getEdgeId(sourceId: NodeId, targetId: NodeId): EdgeId {+ return `${sourceId}-${targetId}`;+}++function getNodes(nodes: DependencyNode[]): NodeType[] {+ return nodes.map((node) => {+ const nodeId = getNodeId(node.id, node.type);++ return {+ id: nodeId,+ type: "node",+ data: node,+ position: { x: 0, y: 0 },+ draggable: false,+ deletable: false,+ };+ });+}++function getEdges(edges: DependencyEdge[]): Edge[] {+ return edges.map((edge) => {+ const sourceId = getNodeId(edge.from_entity_id, edge.from_entity_type);+ const targetId = getNodeId(edge.to_entity_id, edge.to_entity_type);++ return {+ id: getEdgeId(sourceId, targetId),+ data: edge,+ source: sourceId,+ target: targetId,+ selectable: false,+ deletable: false,+ };+ });+}++export function getInitialGraph({ nodes, edges }: DependencyGraph): GraphData {+ return {+ nodes: getNodes(nodes),+ edges: getEdges(edges),+ };+}++export function isSameNode(+ node: DependencyNode,+ id: DependencyId,+ type: DependencyType,+): boolean {+ return node.id === id && node.type === type;+}++export function findNode(+ nodes: NodeType[],+ id: DependencyId,+ type: DependencyType,+): NodeType | null {+ return nodes.find((node) => isSameNode(node.data, id, type)) ?? null;+}++export function getNodeLabel(node: DependencyNode): string {+ return node.type === "table" ? node.data.display_name : node.data.name;+}++export function getNodeDescription(node: DependencyNode): string | null {+ return node.data.description;+}++export function getNodeIcon(node: DependencyNode): IconName {+ return getNodeIconWithType(+ node.type,+ node.type === "card" ? node.data.type : undefined,+ node.type === "card" ? node.data.display : undefined,+ );+}++export function getNodeIconWithType(+ type: DependencyType,+ cardType?: CardType,+ cardDisplay?: VisualizationDisplay,+): IconName {+ switch (type) {+ case "card":+ switch (cardType) {+ case "question":+ return cardDisplay != null+ ? (visualizations.get(cardDisplay)?.iconName ?? "table2")+ : "table2";+ case "model":+ return "model";+ case "metric":+ return "metric";+ default:+ return "table2";+ }+ case "table":+ return "table";+ case "transform":+ return "refresh_downstream";+ case "snippet":+ return "sql";+ }+}++function getCardLinkLabel(cardType: CardType): string {+ switch (cardType) {+ case "question":+ return t`View this question`;+ case "model":+ return t`View this model`;+ case "metric":+ return t`View this metric`;+ }+}++export function getNodeLink(node: DependencyNode): NodeLink | null {+ switch (node.type) {+ case "card":+ return {+ label: getCardLinkLabel(node.data.type),+ url: Urls.question({+ id: node.id,+ name: node.data.name,+ type: node.data.type,+ }),+ };+ case "table":+ return {+ label: t`View metadata`,+ url: Urls.dataModelTable(node.data.db_id, node.data.schema, node.id),+ };+ case "transform":+ return {+ label: t`View this transform`,+ url: Urls.transform(node.id),+ };+ case "snippet":+ return null;+ }+}++export function getNodeLocationInfo(node: DependencyNode): NodeLink[] | null {+ switch (node.type) {+ case "card":+ if (node.data.dashboard != null) {+ return [+ {+ label: node.data.dashboard.name,+ url: Urls.dashboard(node.data.dashboard),+ },+ ];+ }+ if (node.data.collection != null) {+ return [+ {+ label: node.data.collection.name,+ url: Urls.collection(node.data.collection),+ },+ ];+ }+ return null;+ case "table":+ if (node.data.db != null) {+ return [+ {+ label: node.data.db.name,+ url: Urls.dataModelDatabase(node.data.db_id),+ },+ {+ label: node.data.schema,+ url: Urls.dataModelSchema(node.data.db_id, node.data.schema),+ },+ ];+ }+ return null;+ case "transform":+ case "snippet":+ return null;+ }+}++export function getNodeViewCount(node: DependencyNode): number | null {+ switch (node.type) {+ case "card":+ // view_count is not calculated property for models and metrics since+ // they are typically not run directly+ return node.data.type === "question"+ ? (node.data.view_count ?? null)+ : null;+ case "table":+ case "transform":+ case "snippet":+ return null;+ }+}++export function getCardType(groupType: DependencyGroupType): CardType | null {+ switch (groupType) {+ case "question":+ case "model":+ case "metric":+ return groupType;+ default:+ return null;+ }+}++export function getDependencyType(+ groupType: DependencyGroupType,+): DependencyType {+ switch (groupType) {+ case "question":+ case "model":+ case "metric":+ return "card";+ default:+ return groupType;+ }+}++export function getNodeTypeInfo(node: DependencyNode): NodeTypeInfo {+ switch (node.type) {+ case "card":+ switch (node.data.type) {+ case "question":+ return { label: t`Question`, color: "text-secondary" };+ case "model":+ return { label: t`Model`, color: "brand" };+ case "metric":+ return { label: t`Metric`, color: "summarize" };+ }+ break;+ case "table":+ return { label: t`Table`, color: "brand" };+ case "transform":+ return { label: t`Transform`, color: "warning" };+ case "snippet":+ return { label: t`Snippet`, color: "text-secondary" };+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.tsnew file mode 100644index 00000000000..abacc4ef836--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts@@ -0,0 +1,127 @@+import type { IconName } from "metabase/ui";+import registerVisualizations from "metabase/visualizations/register";+import type { DependencyNode } from "metabase-types/api";+import {+ createMockCardDependencyNode,+ createMockCardDependencyNodeData,+ createMockSnippetDependencyNode,+ createMockTableDependencyNode,+ createMockTableDependencyNodeData,+ createMockTransformDependencyNode,+} from "metabase-types/api/mocks";++import type { NodeLink } from "./types";+import { getNodeIcon, getNodeLink } from "./utils";++registerVisualizations();++describe("getNodeIcon", () => {+ it.each<{+ node: DependencyNode;+ expectedIcon: IconName;+ }>([+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "question",+ display: "pie",+ }),+ }),+ expectedIcon: "pie",+ },+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "model",+ display: "table",+ }),+ }),+ expectedIcon: "model",+ },+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "metric",+ display: "scalar",+ }),+ }),+ expectedIcon: "metric",+ },+ {+ node: createMockTableDependencyNode(),+ expectedIcon: "table",+ },+ {+ node: createMockTransformDependencyNode(),+ expectedIcon: "refresh_downstream",+ },+ {+ node: createMockSnippetDependencyNode(),+ expectedIcon: "sql",+ },+ ])("should get the node icon", ({ node, expectedIcon }) => {+ expect(getNodeIcon(node)).toBe(expectedIcon);+ });+});++describe("getNodeLink", () => {+ it.each<{+ node: DependencyNode;+ expectedLink: NodeLink;+ }>([+ {+ node: createMockCardDependencyNode({+ id: 1,+ data: createMockCardDependencyNodeData({+ type: "question",+ name: "My question",+ }),+ }),+ expectedLink: {+ label: "View this question",+ url: "/question/1-my-question",+ },+ },+ {+ node: createMockCardDependencyNode({+ id: 1,+ data: createMockCardDependencyNodeData({+ type: "model",+ name: "My model",+ }),+ }),+ expectedLink: {+ label: "View this model",+ url: "/model/1-my-model",+ },+ },+ {+ node: createMockCardDependencyNode({+ id: 1,+ data: createMockCardDependencyNodeData({+ type: "metric",+ name: "My metric",+ }),+ }),+ expectedLink: {+ label: "View this metric",+ url: "/metric/1-my-metric",+ },+ },+ {+ node: createMockTableDependencyNode({+ id: 1,+ data: createMockTableDependencyNodeData({+ db_id: 2,+ schema: "not public",+ }),+ }),+ expectedLink: {+ label: "View metadata",+ url: "/admin/datamodel/database/2/schema/2:not%20public/table/1",+ },+ },+ ])("should get the node link", ({ node, expectedLink }) => {+ expect(getNodeLink(node)).toEqual(expectedLink);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/index.tsindex 3e103cc4c9d..39e00eb354b 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts@@ -7,8 +7,11 @@ import { CheckDependenciesTitle } from "./components/CheckDependenciesTitle";import { useCheckCardDependencies } from "./hooks/use-check-card-dependencies";import { useCheckSnippetDependencies } from "./hooks/use-check-snippet-dependencies";import { useCheckTransformDependencies } from "./hooks/use-check-transform-dependencies";+import { DependencyGraphPage } from "./pages/DependencyGraphPage";if (hasPremiumFeature("dependencies")) {+ PLUGIN_DEPENDENCIES.isEnabled = true;+ PLUGIN_DEPENDENCIES.DependencyGraphPage = DependencyGraphPage;PLUGIN_DEPENDENCIES.CheckDependenciesForm = CheckDependenciesForm;PLUGIN_DEPENDENCIES.CheckDependenciesModal = CheckDependenciesModal;PLUGIN_DEPENDENCIES.CheckDependenciesTitle = CheckDependenciesTitle;diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsxnew file mode 100644index 00000000000..9fb0f63c5f2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx@@ -0,0 +1,13 @@+import { DependencyGraph } from "../../components/DependencyGraph";+import type { DependencyGraphRawParams } from "../../types";++import { parseParams } from "./utils";++type DependencyGraphPageProps = {+ params?: DependencyGraphRawParams;+};++export function DependencyGraphPage({ params }: DependencyGraphPageProps) {+ const { entry } = parseParams(params);+ return <DependencyGraph entry={entry} />;+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/index.tsnew file mode 100644index 00000000000..90cc934da97--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/index.ts@@ -0,0 +1 @@+export * from "./DependencyGraphPage";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.tsnew file mode 100644index 00000000000..3250dcbe5fd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts@@ -0,0 +1,26 @@+import * as Urls from "metabase/lib/urls";+import type { DependencyType } from "metabase-types/api";++import type { DependencyGraphRawParams } from "../../types";++export function parseParams(+ params: DependencyGraphRawParams = {},+): Urls.DependencyGraphParams {+ const id = Urls.extractEntityId(params.id);+ const type = parseDependencyType(params.type);+ return {+ entry: id != null && type != null ? { id, type } : undefined,+ };+}++function parseDependencyType(type: unknown): DependencyType | undefined {+ switch (type) {+ case "card":+ case "table":+ case "transform":+ case "snippet":+ return type;+ default:+ return undefined;+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/types.tsnew file mode 100644index 00000000000..910df0c50cd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts@@ -0,0 +1,4 @@+export type DependencyGraphRawParams = {+ id?: string;+ type?: string;+};diff --git a/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentArchivedEntityBanner.tsx b/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentArchivedEntityBanner.tsxindex 8f5a6b6feb0..53f37b46e8c 100644--- a/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentArchivedEntityBanner.tsx+++ b/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentArchivedEntityBanner.tsx@@ -4,7 +4,7 @@ import { deletePermanently } from "metabase/archive/actions";import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner";import Bookmarks from "metabase/entities/bookmarks";import { useDispatch, useSelector } from "metabase/lib/redux";-import Documents from "metabase-enterprise/entities/document";+import Documents from "metabase-enterprise/entities/documents";import { getCurrentDocument } from "../selectors";diff --git a/enterprise/frontend/src/metabase-enterprise/documents/index.ts b/enterprise/frontend/src/metabase-enterprise/documents/index.tsindex b3625dcbf02..82be98a4ca6 100644--- a/enterprise/frontend/src/metabase-enterprise/documents/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/documents/index.ts@@ -3,7 +3,7 @@ import {PLUGIN_ENTITIES,PLUGIN_REDUCERS,} from "metabase/plugins";-import Documents from "metabase-enterprise/entities/document";+import Documents from "metabase-enterprise/entities/documents";import { hasPremiumFeature } from "metabase-enterprise/settings";import { DocumentCopyForm } from "./components/DocumentCopyForm/DocumentCopyForm";diff --git a/enterprise/frontend/src/metabase-enterprise/entities/document.ts b/enterprise/frontend/src/metabase-enterprise/entities/documents.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/entities/document.tsrename to enterprise/frontend/src/metabase-enterprise/entities/documents.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts b/enterprise/frontend/src/metabase-enterprise/entities/transforms.tsnew file mode 100644index 00000000000..ae655e7784c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts@@ -0,0 +1,23 @@+import { createEntity } from "metabase/lib/entities";+import * as Urls from "metabase/lib/urls";+import { TransformSchema } from "metabase/schema";+import { color } from "metabase/ui/utils/colors";+import type { Transform } from "metabase-types/api";++/**+ * @deprecated use "metabase/api" instead+ * used for search only that relies on .wrapEntity+ */+export const Transforms = createEntity({+ name: "transforms",+ nameOne: "transform",+ path: "/api/ee/transform",+ schema: TransformSchema,++ objectSelectors: {+ getName: (transform: Transform) => transform && transform.name,+ getUrl: (transform: Transform) => transform && Urls.transform(transform.id),+ getIcon: () => ({ name: "refresh_downstream" }),+ getColor: () => color("brand"),+ },+});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsxindex 1c1ba2f82d2..cc5675009d4 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx@@ -3,10 +3,10 @@ import { ResizableBox } from "react-resizable";import { t } from "ttag";import Link from "metabase/common/components/Link";+import * as Urls from "metabase/lib/urls";import RunButtonWithTooltip from "metabase/query_builder/components/RunButtonWithTooltip";import { Box, Checkbox, Flex, Icon, Stack } from "metabase/ui";import { SHARED_LIB_IMPORT_PATH } from "metabase-enterprise/transforms-python/constants";-import { getPythonLibraryUrl } from "metabase-enterprise/transforms-python/urls";import { PythonEditor } from "../../PythonEditor";@@ -136,7 +136,7 @@ function SharedLibraryEditLink() {<Flexcomponent={Link}target="_blank"- to={getPythonLibraryUrl({ path: SHARED_LIB_IMPORT_PATH })}+ to={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}gap="sm"><Icon name="pencil" />diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsxindex a98fca724e9..cce4a5b22b9 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsx@@ -3,13 +3,9 @@ import { t } from "ttag";import { skipToken, useGetTableQuery } from "metabase/api";import Link from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import * as Urls from "metabase/lib/urls";import { Box, Group, Icon, type IconName, Loader, Stack } from "metabase/ui";import { SplitSection } from "metabase-enterprise/transforms/components/SplitSection";-import {- getBrowseDatabaseUrl,- getBrowseSchemaUrl,- getQueryBuilderUrl,-} from "metabase-enterprise/transforms/urls";import type { Transform } from "metabase-types/api";import S from "./SourceSection.module.css";@@ -70,7 +66,7 @@ function TableWithAlias({ alias, tableId, databaseId }: TableWithAliasProps) {<SourceItemLinklabel={table.db.name}icon="database"- to={getBrowseDatabaseUrl(table.db.id)}+ to={Urls.dataModelDatabase(table.db.id)}data-testid="source-database-link"/><SourceItemDivider />@@ -81,7 +77,7 @@ function TableWithAlias({ alias, tableId, databaseId }: TableWithAliasProps) {<SourceItemLinklabel={table.schema}icon="folder"- to={getBrowseSchemaUrl(databaseId, table.schema)}+ to={Urls.dataModelSchema(databaseId, table.schema)}/><SourceItemDivider /></>@@ -89,7 +85,7 @@ function TableWithAlias({ alias, tableId, databaseId }: TableWithAliasProps) {<SourceItemLinklabel={table?.display_name || table?.name || `Table ${tableId}`}icon="table2"- to={table ? getQueryBuilderUrl(table.id, table.db_id) : undefined}+ to={table ? Urls.queryBuilderTable(table.id, table.db_id) : undefined}/></Group></>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsxindex 29a5028c651..97b2fe720c7 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx@@ -3,19 +3,18 @@ import { t } from "ttag";import { AdminNavItem } from "metabase/admin/components/AdminNav";import { ForwardRefLink } from "metabase/common/components/Link";import { Route } from "metabase/hoc/Title";+import * as Urls from "metabase/lib/urls";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { Icon, Menu } from "metabase/ui";import { hasPremiumFeature } from "metabase-enterprise/settings";import { trackTransformCreate } from "metabase-enterprise/transforms/analytics";import { FullWidthTransformPageLayout } from "metabase-enterprise/transforms/pages/TransformPageLayout";-import { getNewTransformFromTypeUrl } from "metabase-enterprise/transforms/urls";import { PythonTransformEditor } from "./components/PythonTransformEditor";import { SourceSection } from "./components/SourceSection";import { SHARED_LIB_IMPORT_PATH } from "./constants";import { PythonLibraryEditorPage } from "./pages/PythonLibraryEditorPage";import { PythonRunnerSettingsPage } from "./pages/PythonRunnerSettingsPage";-import { getPythonLibraryUrl } from "./urls";if (hasPremiumFeature("transforms-python")) {PLUGIN_TRANSFORMS_PYTHON.PythonRunnerSettingsPage = PythonRunnerSettingsPage;@@ -31,7 +30,7 @@ if (hasPremiumFeature("transforms-python")) {PLUGIN_TRANSFORMS_PYTHON.getTransformsNavLinks = () => (<AdminNavItemlabel={t`Python library`}- path={getPythonLibraryUrl({ path: SHARED_LIB_IMPORT_PATH })}+ path={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}icon="code_block"/>);@@ -39,7 +38,7 @@ if (hasPremiumFeature("transforms-python")) {PLUGIN_TRANSFORMS_PYTHON.getCreateTransformsMenuItems = () => (<Menu.Itemcomponent={ForwardRefLink}- to={getNewTransformFromTypeUrl("python")}+ to={Urls.newTransformFromType("python")}leftSection={<Icon name="code_block" />}onClick={() => {trackTransformCreate({diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsxindex a6b4e971ea3..b5254eebd41 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx@@ -5,6 +5,7 @@ import Button from "metabase/common/components/Button";import EditBar from "metabase/common/components/EditBar";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { isResourceNotFoundError } from "metabase/lib/errors";+import type * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import { Box, Flex } from "metabase/ui";import {@@ -13,12 +14,11 @@ import {} from "metabase-enterprise/api/python-transform-library";import { PythonEditor } from "../../components/PythonEditor";-import type { PythonLibraryEditorPageParams } from "../../types";import S from "./PythonLibraryEditorPage.module.css";type PythonLibraryEditorPageProps = {- params: PythonLibraryEditorPageParams;+ params: Urls.TransformPythonLibraryParams;};const EMPTY_LIBRARY_SOURCE = `diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/types.tsdeleted file mode 100644index 97f8c0deb69..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/types.ts+++ /dev/null@@ -1,3 +0,0 @@-export type PythonLibraryEditorPageParams = {- path: string;-};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/urls.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/urls.tsdeleted file mode 100644index 6f96c6a70ea..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/urls.ts+++ /dev/null@@ -1,5 +0,0 @@-import type { PythonLibraryEditorPageParams } from "./types";--export function getPythonLibraryUrl({ path }: PythonLibraryEditorPageParams) {- return `/admin/transforms/library/${path}`;-}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsxindex b71f2ca5242..3b2fc9136f3 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";+import * as Urls from "metabase/lib/urls";-import { getJobListUrl, getJobUrl } from "../../../urls";import type { TransformJobInfo } from "../types";type HeaderSectionProps = {@@ -13,8 +13,14 @@ export function HeaderSection({ job }: HeaderSectionProps) {return (<BrowserCrumbscrumbs={[- { title: t`Jobs`, to: getJobListUrl() },- { title: job.name, to: job.id != null ? getJobUrl(job.id) : "" },+ {+ title: t`Jobs`,+ to: Urls.transformJobList(),+ },+ {+ title: job.name,+ to: job.id != null ? Urls.transformJob(job.id) : "",+ },]}/>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsxindex 5fffc52bf5b..ff04fe547a1 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsx@@ -3,11 +3,11 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import { Box, Button, Icon } from "metabase/ui";import { SplitSection } from "../../../components/SplitSection";-import { getJobListUrl } from "../../../urls";import type { TransformJobInfo } from "../types";import { DeleteJobModal } from "./DeleteJobModal";@@ -41,7 +41,7 @@ function DeleteJobButton({ job }: DeleteJobButtonProps) {const handleDelete = () => {sendSuccessToast(t`Job deleted`);- dispatch(push(getJobListUrl()));+ dispatch(push(Urls.transformJobList()));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsxindex bda503737bd..f9759f3317a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsx@@ -3,11 +3,10 @@ import { Route } from "react-router";import { setupDeleteTransformJobEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import * as Urls from "metabase/lib/urls";import type { TransformJob } from "metabase-types/api";import { createMockTransformJob } from "metabase-types/api/mocks";-import { getJobListUrl, getJobUrl } from "../../../urls";-import { ManageSection } from "./ManageSection";type SetupOpts = {@@ -19,13 +18,16 @@ function setup({ job = createMockTransformJob() }: SetupOpts = {}) {renderWithProviders(<>- <Route path={getJobListUrl()} component={() => <div>Job list</div>} /><Route- path={getJobUrl(job.id)}+ path={Urls.transformJobList()}+ component={() => <div>Job list</div>}+ />+ <Route+ path={Urls.transformJob(job.id)}component={() => <ManageSection job={job} />}/></>,- { withRouter: true, initialRoute: getJobUrl(job.id) },+ { withRouter: true, initialRoute: Urls.transformJob(job.id) },);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsxindex 8c379d79786..4374e77d7ba 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsx@@ -3,6 +3,7 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import { Button, Group } from "metabase/ui";import {@@ -10,7 +11,6 @@ import {useLazyGetTransformJobQuery,} from "metabase-enterprise/api";-import { getJobListUrl, getJobUrl } from "../../../urls";import type { TransformJobInfo } from "../types";import S from "./SaveSection.module.css";@@ -35,7 +35,7 @@ export function SaveSection({ job: jobInfo }: SaveSectionProps) {// prefetch the job to avoid the loader on the job details pageawait fetchJob(job.id);sendSuccessToast(t`New job created`);- dispatch(push(getJobUrl(job.id)));+ dispatch(push(Urls.transformJob(job.id)));}};@@ -48,7 +48,7 @@ export function SaveSection({ job: jobInfo }: SaveSectionProps) {>{t`Save`}</Button>- <Button component={Link} to={getJobListUrl()}>{t`Cancel`}</Button>+ <Button component={Link} to={Urls.transformJobList()}>{t`Cancel`}</Button></Group>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsxindex 583bf16d624..4a4e2b87c07 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsx@@ -6,11 +6,10 @@ import {setupGetTransformJobEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import * as Urls from "metabase/lib/urls";import type { TransformJob } from "metabase-types/api";import { createMockTransformJob } from "metabase-types/api/mocks";-import { getJobListUrl, getJobUrl, getNewJobUrl } from "../../../urls";-import { SaveSection } from "./SaveSection";type SetupOpts = {@@ -24,16 +23,19 @@ function setup({ job = createMockTransformJob() }: SetupOpts = {}) {renderWithProviders(<><Route- path={getNewJobUrl()}+ path={Urls.newTransformJob()}component={() => <SaveSection job={job} />}/>- <Route path={getJobUrl(job.id)} component={() => <div>Job page</div>} /><Route- path={getJobListUrl()}+ path={Urls.transformJob(job.id)}+ component={() => <div>Job page</div>}+ />+ <Route+ path={Urls.transformJobList()}component={() => <div>Job list page</div>}/></>,- { withRouter: true, initialRoute: getNewJobUrl() },+ { withRouter: true, initialRoute: Urls.newTransformJob() },);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformPicker/TransformPicker.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformPicker/TransformPicker.tsxnew file mode 100644index 00000000000..da8c93649c8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformPicker/TransformPicker.tsx@@ -0,0 +1,65 @@+import { useMemo, useState } from "react";++import {+ AutoScrollBox,+ ItemList,+ ListBox,+} from "metabase/common/components/EntityPicker";+import type {+ TransformPickerItem,+ TransformPickerProps,+} from "metabase/plugins";+import { Flex } from "metabase/ui";+import { useListTransformsQuery } from "metabase-enterprise/api";+import type { TransformId } from "metabase-types/api";++export function TransformPicker({ value, onItemSelect }: TransformPickerProps) {+ const [selectedTransformId, setSelectedTransformId] = useState(value?.id);+ const { data: transforms, error, isLoading } = useListTransformsQuery({});++ const items: TransformPickerItem[] | undefined = useMemo(() => {+ return transforms?.map((transform) => ({+ id: transform.id,+ model: "transform",+ name: transform.name,+ }));+ }, [transforms]);++ const selectedItem = useMemo(() => {+ return items?.find((item) => item.id === selectedTransformId) ?? null;+ }, [items, selectedTransformId]);++ const handleTransformClick = (item: TransformPickerItem) => {+ setSelectedTransformId(item.id);+ onItemSelect(item);+ };++ return (+ <AutoScrollBox+ contentHash={getContentHash(selectedTransformId)}+ data-testid="nested-item-picker"+ >+ <Flex h="100%" w="fit-content">+ <ListBox data-testid="item-picker-level-0">+ <ItemList+ items={items}+ selectedItem={selectedItem}+ error={error}+ isLoading={isLoading}+ isFolder={isFolder}+ isCurrentLevel+ onClick={handleTransformClick}+ />+ </ListBox>+ </Flex>+ </AutoScrollBox>+ );+}++function isFolder() {+ return false;+}++function getContentHash(selectedTransformId?: TransformId) {+ return selectedTransformId?.toString() ?? "";+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformPicker/index.tsnew file mode 100644index 00000000000..7bdaa7d547d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformPicker/index.ts@@ -0,0 +1 @@+export * from "./TransformPicker";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsxindex 6690dd3d092..c17bc37d02e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx@@ -3,11 +3,10 @@ import { t } from "ttag";import { AdminContentTable } from "metabase/common/components/AdminContentTable";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { Card } from "metabase/ui";import type { Transform } from "metabase-types/api";-import { getTransformUrl } from "../../urls";-import S from "./TransformTable.module.css";type TransformTableProps = {@@ -18,7 +17,7 @@ export function TransformTable({ transforms }: TransformTableProps) {const dispatch = useDispatch();const handleRowClick = (transform: Transform) => {- dispatch(push(getTransformUrl(transform.id)));+ dispatch(push(Urls.transform(transform.id)));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsxindex af18a28c5f1..a4376ed6013 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx@@ -3,9 +3,15 @@ import { t } from "ttag";import { createAdminRouteGuard } from "metabase/admin/utils";import { Route } from "metabase/hoc/Title";-import { PLUGIN_TRANSFORMS, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";+import {+ PLUGIN_ENTITIES,+ PLUGIN_TRANSFORMS,+ PLUGIN_TRANSFORMS_PYTHON,+} from "metabase/plugins";+import { Transforms } from "metabase-enterprise/entities/transforms";import { hasPremiumFeature } from "metabase-enterprise/settings";+import { TransformPicker } from "./components/TransformPicker";import { JobListPage } from "./pages/JobListPage";import { JobPage } from "./pages/JobPage";import { NewJobPage } from "./pages/NewJobPage";@@ -17,6 +23,9 @@ import { DetailsPageLayout, ListPageLayout } from "./pages/TransformPageLayout";import { TransformQueryPage } from "./pages/TransformQueryPage";if (hasPremiumFeature("transforms")) {+ PLUGIN_ENTITIES.entities["transforms"] = Transforms;+ PLUGIN_TRANSFORMS.TransformPicker = TransformPicker;+PLUGIN_TRANSFORMS.getAdminPaths = () => [{ key: "transforms", name: t`Transforms`, path: "/admin/transforms" },];diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsxindex 7daa672f1ce..2e713c14c38 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx@@ -2,9 +2,9 @@ import { replace } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import type { RelativeIntervalDirection } from "metabase/querying/filters/types";import { Group } from "metabase/ui";-import { getJobListUrl } from "metabase-enterprise/transforms/urls";import type {TransformRunStatus,TransformTag,@@ -14,10 +14,9 @@ import type {import { StatusFilterWidget } from "../../../components/StatusFilterWidget";import { TagFilterWidget } from "../../../components/TagFilterWidget";import { TimeFilterWidget } from "../../../components/TimeFilterWidget";-import type { JobListParams } from "../../../types";type JobFilterListProps = {- params: JobListParams;+ params: Urls.TransformJobListParams;tags: TransformTag[];};@@ -35,21 +34,21 @@ export function JobFilterList({ params, tags }: JobFilterListProps) {const dispatch = useDispatch();const handleLastRunStartTimeChange = (lastRunStartTime?: string) => {- dispatch(replace(getJobListUrl({ ...params, lastRunStartTime })));+ dispatch(replace(Urls.transformJobList({ ...params, lastRunStartTime })));};const handleLastRunStatusesChange = (lastRunStatuses?: TransformRunStatus[],) => {- dispatch(replace(getJobListUrl({ ...params, lastRunStatuses })));+ dispatch(replace(Urls.transformJobList({ ...params, lastRunStatuses })));};const handleNextRunStartTimeChange = (nextRunStartTime?: string) => {- dispatch(replace(getJobListUrl({ ...params, nextRunStartTime })));+ dispatch(replace(Urls.transformJobList({ ...params, nextRunStartTime })));};const handleTagsChange = (tagIds: TransformTagId[]) => {- dispatch(replace(getJobListUrl({ ...params, tagIds })));+ dispatch(replace(Urls.transformJobList({ ...params, tagIds })));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsxindex 96d0aff6326..c40f896e918 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsx@@ -1,13 +1,13 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { JobListParams } from "metabase-enterprise/transforms/types";+import type * as Urls from "metabase/lib/urls";import type { TransformTag } from "metabase-types/api";import { JobFilterList } from "./JobFilterList";type SetupOpts = {- params?: JobListParams;+ params?: Urls.TransformJobListParams;tags?: TransformTag[];};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsxindex 984d0cc261b..85c0f4ab094 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx@@ -6,6 +6,7 @@ import { AdminContentTable } from "metabase/common/components/AdminContentTable"import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { Card, FixedSizeIcon, Flex, Loader } from "metabase/ui";import {useListTransformJobTransformsQuery,@@ -13,19 +14,21 @@ import {useListTransformTagsQuery,} from "metabase-enterprise/api";import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";-import type { JobListParams } from "metabase-enterprise/transforms/types";import type { TransformJob, TransformJobId } from "metabase-types/api";import { ListEmptyState } from "../../../components/ListEmptyState";import { RunStatusInfo } from "../../../components/RunStatusInfo";import { TagList } from "../../../components/TagList";-import { getJobUrl } from "../../../urls";import { parseTimestampWithTimezone } from "../../../utils";import { hasFilterParams } from "../utils";import S from "./JobList.module.css";-export function JobList({ params }: { params: JobListParams }) {+type JobListProps = {+ params: Urls.TransformJobListParams;+};++export function JobList({ params }: JobListProps) {const systemTimezone = useSetting("system-timezone");const {data: jobs = [],@@ -47,7 +50,7 @@ export function JobList({ params }: { params: JobListParams }) {const dispatch = useDispatch();const handleRowClick = (job: TransformJob) => {- dispatch(push(getJobUrl(job.id)));+ dispatch(push(Urls.transformJob(job.id)));};if (isLoading || error != null) {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsxindex d6884584aa6..a72a3b8ff5e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx@@ -8,8 +8,7 @@ import {setupListTransformTagsEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen, within } from "__support__/ui";-import type { JobListParams } from "metabase-enterprise/transforms/types";-import { getJobListUrl } from "metabase-enterprise/transforms/urls";+import * as Urls from "metabase/lib/urls";import type {Transform,TransformJob,@@ -33,7 +32,7 @@ type SetupOpts = {jobs?: TransformJob[];jobTransforms?: Map<TransformJobId, TransformListInfo>;tags?: TransformTag[];- params?: JobListParams;+ params?: Urls.TransformJobListParams;};function setup({@@ -55,10 +54,10 @@ function setup({renderWithProviders(<Route- path={getJobListUrl(params)}+ path={Urls.transformJobList(params)}component={() => <JobList params={params} />}/>,- { withRouter: true, initialRoute: getJobListUrl(params) },+ { withRouter: true, initialRoute: Urls.transformJobList(params) },);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsxindex 2527ea66694..cd966618a79 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx@@ -3,11 +3,10 @@ import { Link } from "react-router";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import * as Urls from "metabase/lib/urls";import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";import { useListTransformTagsQuery } from "metabase-enterprise/api";-import { getNewJobUrl } from "../../urls";-import { JobFilterList } from "./JobFilterList";import { JobList } from "./JobList";import { getParsedParams } from "./utils";@@ -33,7 +32,7 @@ export function JobListPage({ location }: JobListPageProps) {</Stack><Buttoncomponent={Link}- to={getNewJobUrl()}+ to={Urls.newTransformJob()}variant="filled"leftSection={<Icon name="add" aria-hidden />}>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.tsindex 7e0b72c6b4a..c5b5af84284 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts@@ -1,6 +1,6 @@import type { Location } from "history";-import type { JobListParams } from "metabase-enterprise/transforms/types";+import type * as Urls from "metabase/lib/urls";import {parseInteger,@@ -9,7 +9,9 @@ import {parseString,} from "../../utils";-export function getParsedParams(location: Location): JobListParams {+export function getParsedParams(+ location: Location,+): Urls.TransformJobListParams {const { lastRunStartTime, lastRunStatuses, nextRunStartTime, tagIds } =location.query;@@ -21,7 +23,7 @@ export function getParsedParams(location: Location): JobListParams {};}-export function hasFilterParams(params: JobListParams) {+export function hasFilterParams(params: Urls.TransformJobListParams) {return (params.lastRunStartTime != null ||params.lastRunStatuses != null ||diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsxindex c5369e72971..240b59b0a3f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -15,7 +15,6 @@ import type {} from "metabase-types/api";import { QueryEditor } from "../../components/QueryEditor";-import { getTransformListUrl, getTransformUrl } from "../../urls";import { CreateTransformModal } from "./CreateTransformModal";import {@@ -46,7 +45,7 @@ export function NewTransformPage({ params }: NewTransformPageProps) {const dispatch = useDispatch();const handleCreate = (transform: Transform) => {- dispatch(push(getTransformUrl(transform.id)));+ dispatch(push(Urls.transform(transform.id)));};const handleSave = (newSource: TransformSource) => {@@ -55,7 +54,7 @@ export function NewTransformPage({ params }: NewTransformPageProps) {};const handleCancel = () => {- dispatch(push(getTransformListUrl()));+ dispatch(push(Urls.transformList()));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsxindex 589bfdec9a8..b9fff97dac9 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx@@ -2,9 +2,9 @@ import { replace } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import type { RelativeIntervalDirection } from "metabase/querying/filters/types";import { Group } from "metabase/ui";-import { getRunListUrl } from "metabase-enterprise/transforms/urls";import type {Transform,TransformId,@@ -17,7 +17,6 @@ import type {import { StatusFilterWidget } from "../../../components/StatusFilterWidget";import { TagFilterWidget } from "../../../components/TagFilterWidget";import { TimeFilterWidget } from "../../../components/TimeFilterWidget";-import type { RunListParams } from "../../../types";import { RunMethodFilterWidget } from "./RunMethodFilterWidget";import { TransformFilterWidget } from "./TransformFilterWidget";@@ -28,7 +27,7 @@ const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [];type RunFilterListProps = {- params: RunListParams;+ params: Urls.TransformRunListParams;transforms: Transform[];tags: TransformTag[];};@@ -41,27 +40,31 @@ export function RunFilterList({const dispatch = useDispatch();const handleTransformsChange = (transformIds: TransformId[]) => {- dispatch(replace(getRunListUrl({ ...params, transformIds: transformIds })));+ dispatch(+ replace(Urls.transformRunList({ ...params, transformIds: transformIds })),+ );};const handleStatusesChange = (statuses: TransformRunStatus[]) => {- dispatch(replace(getRunListUrl({ ...params, statuses })));+ dispatch(replace(Urls.transformRunList({ ...params, statuses })));};const handleTagsChange = (tagIds: TransformTagId[]) => {- dispatch(replace(getRunListUrl({ ...params, transformTagIds: tagIds })));+ dispatch(+ replace(Urls.transformRunList({ ...params, transformTagIds: tagIds })),+ );};const handleStartTimeChange = (startTime: string | undefined) => {- dispatch(replace(getRunListUrl({ ...params, startTime })));+ dispatch(replace(Urls.transformRunList({ ...params, startTime })));};const handleEndTimeChange = (endTime: string | undefined) => {- dispatch(replace(getRunListUrl({ ...params, endTime })));+ dispatch(replace(Urls.transformRunList({ ...params, endTime })));};const handleRunMethodsChange = (runMethods: TransformRunMethod[]) => {- dispatch(replace(getRunListUrl({ ...params, runMethods })));+ dispatch(replace(Urls.transformRunList({ ...params, runMethods })));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsxindex 9629379a337..ce366b52560 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx@@ -1,13 +1,13 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { RunListParams } from "metabase-enterprise/transforms/types";+import type * as Urls from "metabase/lib/urls";import type { Transform, TransformTag } from "metabase-types/api";import { RunFilterList } from "./RunFilterList";type SetupOpts = {- params?: RunListParams;+ params?: Urls.TransformRunListParams;transforms?: Transform[];tags?: TransformTag[];};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsxindex d69d7d6236d..00f36c991f6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx@@ -5,6 +5,7 @@ import { AdminContentTable } from "metabase/common/components/AdminContentTable"import { PaginationControls } from "metabase/common/components/PaginationControls";import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { Card, Flex, Group, Stack } from "metabase/ui";import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";import type { TransformRun, TransformTag } from "metabase-types/api";@@ -12,8 +13,6 @@ import type { TransformRun, TransformTag } from "metabase-types/api";import { ListEmptyState } from "../../../components/ListEmptyState";import { RunStatusInfo } from "../../../components/RunStatusInfo";import { TagList } from "../../../components/TagList";-import type { RunListParams } from "../../../types";-import { getRunListUrl, getTransformUrl } from "../../../urls";import { formatRunMethod, parseTimestampWithTimezone } from "../../../utils";import { PAGE_SIZE } from "../constants";import { hasFilterParams } from "../utils";@@ -23,7 +22,7 @@ import S from "./RunList.module.css";type RunListProps = {runs: TransformRun[];totalCount: number;- params: RunListParams;+ params: Urls.TransformRunListParams;tags: TransformTag[];};@@ -66,7 +65,7 @@ function RunTable({ runs, tags }: RunTableProps) {const handleRowClick = (run: TransformRun) => {if (run.transform) {- dispatch(push(getTransformUrl(run.transform.id)));+ dispatch(push(Urls.transform(run.transform.id)));}};@@ -139,7 +138,7 @@ type RunTablePaginationControlsProps = {page: number;itemCount: number;totalCount: number;- params: RunListParams;+ params: Urls.TransformRunListParams;};function RunTablePaginationControls({@@ -151,11 +150,11 @@ function RunTablePaginationControls({const dispatch = useDispatch();const handlePreviousPage = () => {- dispatch(push(getRunListUrl({ ...params, page: page - 1 })));+ dispatch(push(Urls.transformRunList({ ...params, page: page - 1 })));};const handleNextPage = () => {- dispatch(push(getRunListUrl({ ...params, page: page + 1 })));+ dispatch(push(Urls.transformRunList({ ...params, page: page + 1 })));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsxindex 73ba0678dfe..a79a0a7bbf0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx@@ -3,6 +3,7 @@ import { useState } from "react";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type * as Urls from "metabase/lib/urls";import { Box, Stack, Title } from "metabase/ui";import {useListTransformRunsQuery,@@ -12,8 +13,6 @@ import {import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";import type { TransformRun } from "metabase-types/api";-import type { RunListParams } from "../../types";-import { RunFilterList } from "./RunFilterList";import { RunList } from "./RunList";import { PAGE_SIZE } from "./constants";@@ -36,7 +35,7 @@ export function RunListPage({ location }: RunListPageProps) {}type RunListPageBodyProps = {- params: RunListParams;+ params: Urls.TransformRunListParams;};function RunListPageBody({ params }: RunListPageBodyProps) {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.tsindex 5c18fc08c72..46bd72fb19c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts@@ -1,6 +1,6 @@import type { Location } from "history";-import type { RunListParams } from "metabase-enterprise/transforms/types";+import type * as Urls from "metabase/lib/urls";import {parseInteger,@@ -10,7 +10,9 @@ import {parseString,} from "../../utils";-export function getParsedParams(location: Location): RunListParams {+export function getParsedParams(+ location: Location,+): Urls.TransformRunListParams {const {page,statuses,@@ -31,7 +33,7 @@ export function getParsedParams(location: Location): RunListParams {};}-export function hasFilterParams(params: RunListParams) {+export function hasFilterParams(params: Urls.TransformRunListParams) {return (params.statuses != null ||params.transformIds != null ||diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsxindex 4432802e828..a101eb9542f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx@@ -10,16 +10,12 @@ import {type QuestionPickerValueItem,} from "metabase/common/components/Pickers/QuestionPicker";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { Button, Center, Icon, Loader, Menu } from "metabase/ui";import { trackTransformCreate } from "metabase-enterprise/transforms/analytics";import { doesDatabaseSupportTransforms } from "metabase-enterprise/transforms/utils";-import {- getNewTransformFromCardUrl,- getNewTransformFromTypeUrl,-} from "../../../urls";-export function CreateTransformMenu() {const dispatch = useDispatch();const [isPickerOpened, { open: openPicker, close: closePicker }] =@@ -34,7 +30,7 @@ export function CreateTransformMenu() {};const handlePickerChange = (item: QuestionPickerValueItem) => {- dispatch(push(getNewTransformFromCardUrl(item.id)));+ dispatch(push(Urls.newTransformFromCard(item.id)));};const { data: databases, isLoading } = useListDatabasesQuery({@@ -62,7 +58,7 @@ export function CreateTransformMenu() {<Menu.Label>{t`Create your transform with…`}</Menu.Label><Menu.Itemcomponent={ForwardRefLink}- to={getNewTransformFromTypeUrl("query")}+ to={Urls.newTransformFromType("query")}leftSection={<Icon name="notebook" />}onClick={() => {trackTransformCreate({@@ -75,7 +71,7 @@ export function CreateTransformMenu() {</Menu.Item><Menu.Itemcomponent={ForwardRefLink}- to={getNewTransformFromTypeUrl("native")}+ to={Urls.newTransformFromType("native")}leftSection={<Icon name="sql" />}onClick={() => {trackTransformCreate({diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsxindex 52f06825587..3f665f4b65c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx@@ -2,9 +2,9 @@ import { replace } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import type { RelativeIntervalDirection } from "metabase/querying/filters/types";import { Group } from "metabase/ui";-import { getTransformListUrl } from "metabase-enterprise/transforms/urls";import type {TransformRunStatus,TransformTag,@@ -14,10 +14,9 @@ import type {import { StatusFilterWidget } from "../../../components/StatusFilterWidget";import { TagFilterWidget } from "../../../components/TagFilterWidget";import { TimeFilterWidget } from "../../../components/TimeFilterWidget";-import type { TransformListParams } from "../../../types";type TransformFilterListProps = {- params: TransformListParams;+ params: Urls.TransformListParams;tags: TransformTag[];};@@ -33,17 +32,17 @@ export function TransformFilterList({const dispatch = useDispatch();const handleLastRunStartTimeChange = (lastRunStartTime?: string) => {- dispatch(replace(getTransformListUrl({ ...params, lastRunStartTime })));+ dispatch(replace(Urls.transformList({ ...params, lastRunStartTime })));};const handleLastRunStatusesChange = (lastRunStatuses?: TransformRunStatus[],) => {- dispatch(replace(getTransformListUrl({ ...params, lastRunStatuses })));+ dispatch(replace(Urls.transformList({ ...params, lastRunStatuses })));};const handleTagsChange = (tagIds: TransformTagId[]) => {- dispatch(replace(getTransformListUrl({ ...params, tagIds })));+ dispatch(replace(Urls.transformList({ ...params, tagIds })));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsxindex a4295d8e457..8694e367bcc 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx@@ -1,13 +1,13 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { TransformListParams } from "metabase-enterprise/transforms/types";+import type * as Urls from "metabase/lib/urls";import type { TransformTag } from "metabase-types/api";import { TransformFilterList } from "./TransformFilterList";type SetupOpts = {- params?: TransformListParams;+ params?: Urls.TransformListParams;tags?: TransformTag[];};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsxindex 32bcb29e42f..8789b9c9321 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx@@ -5,6 +5,7 @@ import { AdminContentTable } from "metabase/common/components/AdminContentTable"import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { Card, Flex } from "metabase/ui";import {useListTransformTagsQuery,@@ -16,15 +17,13 @@ import type { Transform } from "metabase-types/api";import { ListEmptyState } from "../../../components/ListEmptyState";import { RunStatusInfo } from "../../../components/RunStatusInfo";import { TagList } from "../../../components/TagList";-import type { TransformListParams } from "../../../types";-import { getTransformUrl } from "../../../urls";import { parseTimestampWithTimezone } from "../../../utils";import { hasFilterParams } from "../utils";import S from "./TransformList.module.css";type TransformListProps = {- params: TransformListParams;+ params: Urls.TransformListParams;};export function TransformList({ params }: TransformListProps) {@@ -48,7 +47,7 @@ export function TransformList({ params }: TransformListProps) {const dispatch = useDispatch();const handleRowClick = (transform: Transform) => {- dispatch(push(getTransformUrl(transform.id)));+ dispatch(push(Urls.transform(transform.id)));};if (isLoading || error != null) {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.tsindex 7922f0633c9..b04103e6b37 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts@@ -1,6 +1,6 @@import type { Location } from "history";-import type { TransformListParams } from "metabase-enterprise/transforms/types";+import type * as Urls from "metabase/lib/urls";import {parseInteger,@@ -9,7 +9,7 @@ import {parseString,} from "../../utils";-export function getParsedParams(location: Location): TransformListParams {+export function getParsedParams(location: Location): Urls.TransformListParams {const { lastRunStartTime, lastRunStatuses, tagIds } = location.query;return {@@ -19,7 +19,7 @@ export function getParsedParams(location: Location): TransformListParams {};}-export function hasFilterParams(params: TransformListParams) {+export function hasFilterParams(params: Urls.TransformListParams) {return (params.lastRunStartTime != null ||params.lastRunStatuses != null ||diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsxindex db503f8f597..96f2b3a3b5f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsx@@ -1,10 +1,9 @@import { t } from "ttag";import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";+import * as Urls from "metabase/lib/urls";import type { Transform } from "metabase-types/api";-import { getTransformListUrl, getTransformUrl } from "../../../urls";-type HeaderSectionProps = {transform: Transform;};@@ -13,8 +12,8 @@ export function HeaderSection({ transform }: HeaderSectionProps) {return (<BrowserCrumbscrumbs={[- { title: t`Transforms`, to: getTransformListUrl() },- { title: transform.name, to: getTransformUrl(transform.id) },+ { title: t`Transforms`, to: Urls.transformList() },+ { title: transform.name, to: Urls.transform(transform.id) },]}/>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsxindex 828205fbbeb..7551c9decda 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsx@@ -4,6 +4,7 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import { Button, Card, Group, Icon } from "metabase/ui";import { PythonEditor } from "metabase-enterprise/transforms-python/components/PythonEditor";@@ -11,7 +12,6 @@ import type { Transform } from "metabase-types/api";import { QueryView } from "../../../components/QueryView";import { TitleSection } from "../../../components/TitleSection";-import { getTransformListUrl, getTransformQueryUrl } from "../../../urls";import { isTransformRunning } from "../utils";import { DeleteTransformModal } from "./DeleteTransformModal";@@ -58,7 +58,7 @@ function EditQueryButton({ transform }: EditQueryButtonProps) {return (<Buttoncomponent={isDisabled ? undefined : Link}- to={getTransformQueryUrl(transform.id)}+ to={Urls.transformQuery(transform.id)}leftSection={<Icon name="pencil_lines" aria-hidden />}disabled={isDisabled}>@@ -79,7 +79,7 @@ function DeleteTransformButton({ transform }: DeleteTransformButtonProps) {const handleDelete = () => {sendSuccessToast(t`Transform deleted`);- dispatch(push(getTransformListUrl()));+ dispatch(push(Urls.transformList()));};return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsxindex 80685c6533a..30469394deb 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsx@@ -2,7 +2,7 @@ import { Route } from "react-router";import { setupAdhocQueryMetadataEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { getTransformUrl } from "metabase-enterprise/transforms/urls";+import * as Urls from "metabase/lib/urls";import type { Transform } from "metabase-types/api";import {createMockCardQueryMetadata,@@ -21,10 +21,10 @@ function setup({ transform = createMockTransform() }: SetupOpts) {renderWithProviders(<Route- path={getTransformUrl(transform.id)}+ path={Urls.transform(transform.id)}component={() => <ManageSection transform={transform} />}/>,- { withRouter: true, initialRoute: getTransformUrl(transform.id) },+ { withRouter: true, initialRoute: Urls.transform(transform.id) },);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsxindex a415209fac0..4d346b9baa6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { isResourceNotFoundError } from "metabase/lib/errors";+import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import { Anchor, Box, Divider, Group, Stack } from "metabase/ui";import {@@ -20,7 +21,6 @@ import { RunButton } from "../../../components/RunButton";import { RunStatus } from "../../../components/RunStatus";import { SplitSection } from "../../../components/SplitSection";import { TagMultiSelect } from "../../../components/TagMultiSelect";-import { getRunListUrl } from "../../../urls";type RunSectionProps = {transform: Transform;@@ -78,7 +78,7 @@ function RunStatusSection({ transform }: RunStatusSectionProps) {<Anchorkey="link"component={Link}- to={getRunListUrl({ transformIds: [id] })}+ to={Urls.transformRunList({ transformIds: [id] })}>{t`See all runs`}</Anchor>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsxindex 7a9540c47bc..72fa8d442d0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx@@ -8,6 +8,7 @@ import {} from "metabase/api";import Link from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import {Button,@@ -22,12 +23,6 @@ import { sourceDatabaseId } from "metabase-enterprise/transforms/utils";import type { Transform } from "metabase-types/api";import { SplitSection } from "../../../components/SplitSection";-import {- getBrowseDatabaseUrl,- getBrowseSchemaUrl,- getQueryBuilderUrl,- getTableMetadataUrl,-} from "../../../urls";import { isTransformRunning } from "../utils";import { UpdateTargetModal } from "./UpdateTargetModal";@@ -95,7 +90,7 @@ function TargetInfo({ transform }: TargetInfoProps) {<TargetItemLinklabel={database.name}icon="database"- to={getBrowseDatabaseUrl(database.id)}+ to={Urls.dataModelDatabase(database.id)}data-testid="database-link"/><TargetItemDivider />@@ -108,7 +103,7 @@ function TargetInfo({ transform }: TargetInfoProps) {icon="folder"to={table || targetSchemaExists- ? getBrowseSchemaUrl(database.id, target.schema)+ ? Urls.dataModelSchema(database.id, target.schema): undefined}tooltip={@@ -125,7 +120,7 @@ function TargetInfo({ transform }: TargetInfoProps) {<TargetItemLinklabel={target.name}icon="table2"- to={table ? getQueryBuilderUrl(table.id, table.db_id) : undefined}+ to={table ? Urls.queryBuilderTable(table.id, table.db_id) : undefined}data-testid="table-link"/></Group>@@ -215,7 +210,7 @@ function EditMetadataButton({ transform }: EditMetadataButtonProps) {return (<Buttoncomponent={Link}- to={getTableMetadataUrl(table.id, table.schema, table.db_id)}+ to={Urls.dataModelTable(table.db_id, table.schema, table.id)}leftSection={<Icon name="label" aria-hidden />}data-testid="table-metadata-link">diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.unit.spec.tsxindex d65110af526..6883be5cd4a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.unit.spec.tsx@@ -2,7 +2,7 @@ import { Route } from "react-router";import { setupDatabaseEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { getTransformUrl } from "metabase-enterprise/transforms/urls";+import * as Urls from "metabase/lib/urls";import type { Transform } from "metabase-types/api";import {createMockDatabase,@@ -21,10 +21,10 @@ function setup({ transform = createMockTransform() }: SetupOpts) {renderWithProviders(<Route- path={getTransformUrl(transform.id)}+ path={Urls.transform(transform.id)}component={() => <TargetSection transform={transform} />}/>,- { withRouter: true, initialRoute: getTransformUrl(transform.id) },+ { withRouter: true, initialRoute: Urls.transform(transform.id) },);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsxindex ad4d9853f4a..1f6d0547147 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsx@@ -7,11 +7,10 @@ import {} from "metabase/admin/components/AdminNav";import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";import { useSelector } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getLocation } from "metabase/selectors/routing";-import { getJobListUrl, getRunListUrl, getTransformListUrl } from "../../urls";-type TransformPageLayoutPropsParams = {transformId?: string;jobId?: string;@@ -75,9 +74,9 @@ function TransformPageSidebar({ params }: TransformPageSidebarProps) {const { transformId, jobId } = params;const location = useSelector(getLocation);const pathname = location?.pathname;- const transformListUrl = getTransformListUrl();- const jobListUrl = getJobListUrl();- const runListUrl = getRunListUrl();+ const transformListUrl = Urls.transformList();+ const jobListUrl = Urls.transformJobList();+ const runListUrl = Urls.transformRunList();return (<AdminNavWrapper data-testid="transform-sidebar">diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex c392cbc9a21..9d5fdab6fd2 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -17,7 +17,6 @@ import {import type { Transform, TransformSource } from "metabase-types/api";import { QueryEditor } from "../../components/QueryEditor";-import { getTransformUrl } from "../../urls";type TransformQueryPageParams = {transformId: string;@@ -72,7 +71,7 @@ export function TransformQueryPageBody({sendErrorToast(t`Failed to update transform query`);} else {sendSuccessToast(t`Transform query updated`);- dispatch(push(getTransformUrl(transform.id)));+ dispatch(push(Urls.transform(transform.id)));}},});@@ -85,7 +84,7 @@ export function TransformQueryPageBody({};const handleCancel = () => {- dispatch(push(getTransformUrl(transform.id)));+ dispatch(push(Urls.transform(transform.id)));};if (transform.source.type === "python") {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/types.tsdeleted file mode 100644index 5a6ba1e41ee..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/types.ts+++ /dev/null@@ -1,29 +0,0 @@-import type {- TransformId,- TransformRunMethod,- TransformRunStatus,- TransformTagId,-} from "metabase-types/api";--export type TransformListParams = {- lastRunStartTime?: string;- lastRunStatuses?: TransformRunStatus[];- tagIds?: TransformTagId[];-};--export type JobListParams = {- lastRunStartTime?: string;- lastRunStatuses?: TransformRunStatus[];- nextRunStartTime?: string;- tagIds?: TransformTagId[];-};--export type RunListParams = {- page?: number;- statuses?: TransformRunStatus[];- transformIds?: TransformId[];- transformTagIds?: TransformTagId[];- startTime?: string;- endTime?: string;- runMethods?: TransformRunMethod[];-};diff --git a/frontend/src/metabase-types/analytics/search.ts b/frontend/src/metabase-types/analytics/search.tsindex 5c0c701be60..e5f233d3413 100644--- a/frontend/src/metabase-types/analytics/search.ts+++ b/frontend/src/metabase-types/analytics/search.ts@@ -28,6 +28,7 @@ type ValidateEvent<Record<Exclude<keyof T, keyof SearchEventSchema>, never>,> = T;+// keep in sync with the `search` snowplow schematype SearchContentType =| "dashboard"| "card"@@ -39,7 +40,8 @@ type SearchContentType =| "table"| "action"| "indexed-entity"- | "document";+ | "document"+ | "transform";type SearchContext =| "search-app"diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.tsindex 0a1309cd161..8f456ad6606 100644--- a/frontend/src/metabase-types/api/card.ts+++ b/frontend/src/metabase-types/api/card.ts@@ -27,11 +27,13 @@ import type { CardDisplayType, VisualizationDisplay } from "./visualization";import type { SmartScalarComparison } from "./visualization-settings";export type CardType = "model" | "question" | "metric";-type CreatorInfo = Pick<+export type CardCreatorInfo = Pick<UserInfo,"first_name" | "last_name" | "email" | "id" | "common_name">;+export type CardDashboardInfo = Pick<Dashboard, "id" | "name">;+export interface Card<Q extends DatasetQuery = DatasetQuery>extends UnsavedCard<Q> {id: CardId;@@ -56,7 +58,7 @@ export interface Card<Q extends DatasetQuery = DatasetQuery>collection?: Collection | null;collection_id: number | null;collection_position: number | null;- dashboard: Pick<Dashboard, "id" | "name"> | null;+ dashboard: CardDashboardInfo | null;dashboard_id: DashboardId | null;document_id?: DocumentId;dashboard_count: number | null;@@ -73,7 +75,7 @@ export interface Card<Q extends DatasetQuery = DatasetQuery>archived: boolean;- creator?: CreatorInfo;+ creator?: CardCreatorInfo;"last-edit-info"?: LastEditInfo;table_id?: TableId;}diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.tsindex 968cedea519..b9b4dfd7180 100644--- a/frontend/src/metabase-types/api/dependencies.ts+++ b/frontend/src/metabase-types/api/dependencies.ts@@ -1,8 +1,111 @@-import type { NativeQuerySnippet } from "metabase-types/api/snippets";--import type { Card } from "./card";+import type { Card, CardType } from "./card";+import type { NativeQuerySnippet } from "./snippets";+import type { Table } from "./table";import type { Transform } from "./transform";+export type DependencyId = number;+export type DependencyType = "card" | "table" | "transform" | "snippet";+export type DependencyGroupType = CardType | Exclude<DependencyType, "card">;++export type DependencyEntry = {+ id: DependencyId;+ type: DependencyType;+};++export type DependentsCount = Partial<Record<DependencyGroupType, number>>;++type BaseDependencyNode<TType extends DependencyType, TData> = {+ id: DependencyId;+ type: TType;+ data: TData;+ dependents_count?: DependentsCount | null;+};++export type TableDependencyNodeData = Pick<+ Table,+ "name" | "display_name" | "description" | "db_id" | "schema" | "db" | "fields"+>;++export type TransformDependencyNodeData = Pick<+ Transform,+ "name" | "description" | "table"+>;++export type CardDependencyNodeData = Pick<+ Card,+ | "name"+ | "description"+ | "type"+ | "display"+ | "database_id"+ | "collection_id"+ | "collection"+ | "dashboard_id"+ | "dashboard"+ | "result_metadata"+ | "creator"+ | "created_at"+ | "last-edit-info"+ | "moderation_reviews"+> & {+ view_count?: number | null;+};++export type SnippetDependencyNodeData = Pick<+ NativeQuerySnippet,+ "name" | "description"+>;++export type TableDependencyNode = BaseDependencyNode<+ "table",+ TableDependencyNodeData+>;++export type TransformDependencyNode = BaseDependencyNode<+ "transform",+ TransformDependencyNodeData+>;++export type CardDependencyNode = BaseDependencyNode<+ "card",+ CardDependencyNodeData+>;++export type SnippetDependencyNode = BaseDependencyNode<+ "snippet",+ SnippetDependencyNodeData+>;++export type DependencyNode =+ | TableDependencyNode+ | TransformDependencyNode+ | CardDependencyNode+ | SnippetDependencyNode;++export type DependencyEdge = {+ from_entity_id: DependencyId;+ from_entity_type: DependencyType;+ to_entity_id: DependencyId;+ to_entity_type: DependencyType;+};++export type DependencyGraph = {+ nodes: DependencyNode[];+ edges: DependencyEdge[];+};++export type GetDependencyGraphRequest = {+ id: DependencyId;+ type: DependencyType;+};++export type ListNodeDependentsRequest = {+ id: DependencyId;+ type: DependencyType;+ dependent_type: DependencyType;+ dependent_card_type?: CardType;+};+export type CheckDependenciesResponse = {success: boolean;bad_cards?: Card[];diff --git a/frontend/src/metabase-types/api/mocks/dependencies.ts b/frontend/src/metabase-types/api/mocks/dependencies.tsindex 9552e424e4d..6bf25ad5abe 100644--- a/frontend/src/metabase-types/api/mocks/dependencies.ts+++ b/frontend/src/metabase-types/api/mocks/dependencies.ts@@ -1,10 +1,151 @@import type {+ CardDependencyNode,+ CardDependencyNodeData,CheckCardDependenciesRequest,CheckDependenciesResponse,CheckSnippetDependenciesRequest,CheckTransformDependenciesRequest,+ DependencyEdge,+ DependencyEntry,+ DependencyGraph,+ SnippetDependencyNode,+ SnippetDependencyNodeData,+ TableDependencyNode,+ TableDependencyNodeData,+ TransformDependencyNode,+ TransformDependencyNodeData,} from "metabase-types/api";+export function createMockDependencyEntry(+ opts?: Partial<DependencyEntry>,+): DependencyEntry {+ return {+ id: 1,+ type: "table",+ ...opts,+ };+}++export function createMockTableDependencyNodeData(+ opts?: Partial<TableDependencyNodeData>,+): TableDependencyNodeData {+ return {+ name: "table",+ display_name: "Table",+ description: null,+ db_id: 1,+ schema: "public",+ ...opts,+ };+}++export function createMockTransformDependencyNodeData(+ opts?: Partial<TransformDependencyNodeData>,+): TransformDependencyNodeData {+ return {+ name: "Transform",+ description: null,+ ...opts,+ };+}++export function createMockCardDependencyNodeData(+ opts?: Partial<CardDependencyNodeData>,+): CardDependencyNodeData {+ return {+ name: "Card",+ description: null,+ type: "question",+ display: "table",+ dashboard_id: 1,+ collection_id: null,+ result_metadata: [],+ dashboard: null,+ created_at: "2020-01-01T00:00:00Z",+ ...opts,+ };+}++export function createMockTableDependencyNode(+ opts?: Partial<TableDependencyNode>,+): TableDependencyNode {+ return {+ id: 1,+ type: "table",+ data: createMockTableDependencyNodeData(),+ dependents_count: {},+ ...opts,+ };+}++export function createMockCardDependencyNode(+ opts?: Partial<CardDependencyNode>,+): CardDependencyNode {+ return {+ id: 1,+ type: "card",+ data: createMockCardDependencyNodeData(),+ dependents_count: {},+ ...opts,+ };+}++export function createMockTransformDependencyNode(+ opts?: Partial<TransformDependencyNode>,+): TransformDependencyNode {+ return {+ id: 1,+ type: "transform",+ data: createMockTransformDependencyNodeData(),+ dependents_count: {},+ ...opts,+ };+}++export function createMockSnippetDependencyNode(+ opts?: Partial<SnippetDependencyNode>,+): SnippetDependencyNode {+ return {+ id: 1,+ type: "snippet",+ data: createMockSnippetDependencyNodeData(),+ dependents_count: {},+ ...opts,+ };+}++export function createMockDependencyEdge(+ opts?: Partial<DependencyEdge>,+): DependencyEdge {+ return {+ from_entity_id: 1,+ from_entity_type: "card",+ to_entity_id: 1,+ to_entity_type: "table",+ ...opts,+ };+}++export function createMockDependencyGraph(+ opts?: Partial<DependencyGraph>,+): DependencyGraph {+ return {+ nodes: [],+ edges: [],+ ...opts,+ };+}++export function createMockSnippetDependencyNodeData(+ opts?: Partial<SnippetDependencyNodeData>,+): SnippetDependencyNodeData {+ return {+ name: "Snippet",+ description: null,+ ...opts,+ };+}+export function createMockCheckCardDependenciesRequest(opts?: Partial<CheckCardDependenciesRequest>,): CheckCardDependenciesRequest {diff --git a/frontend/src/metabase-types/api/search.ts b/frontend/src/metabase-types/api/search.tsindex 24e4bd78b54..6dc3de485a3 100644--- a/frontend/src/metabase-types/api/search.ts+++ b/frontend/src/metabase-types/api/search.ts@@ -22,6 +22,7 @@ const ENABLED_SEARCH_MODELS = ["action","indexed-entity","document",+ "transform",] as const;export const SEARCH_MODELS = [...ENABLED_SEARCH_MODELS, "segment"] as const;diff --git a/frontend/src/metabase/api/activity.ts b/frontend/src/metabase/api/activity.tsindex e2ccc7d32db..a36020d71a9 100644--- a/frontend/src/metabase/api/activity.ts+++ b/frontend/src/metabase/api/activity.ts@@ -14,6 +14,7 @@ import {TAG_TYPE_MAPPING,idTag,invalidateTags,+ listTag,provideActivityItemListTags,} from "./tags";@@ -70,6 +71,7 @@ export const activityApi = Api.injectEndpoints({}),invalidatesTags: (_, error, item) =>invalidateTags(error, [+ listTag(TAG_TYPE_MAPPING[item.model]),idTag(TAG_TYPE_MAPPING[item.model], item.model_id),]),},diff --git a/frontend/src/metabase/api/tags/constants.ts b/frontend/src/metabase/api/tags/constants.tsindex 99999866831..eefc1fdff10 100644--- a/frontend/src/metabase/api/tags/constants.ts+++ b/frontend/src/metabase/api/tags/constants.ts@@ -37,6 +37,7 @@ export const TAG_TYPES = ["task","timeline","timeline-event",+ "transform","user","public-dashboard","embed-dashboard",@@ -62,4 +63,5 @@ export const TAG_TYPE_MAPPING = {metric: "card",snippet: "snippet",pulse: "subscription",+ transform: "transform",} as const;diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.tsindex 7b59cf7a039..588cfb01f36 100644--- a/frontend/src/metabase/api/tags/utils.ts+++ b/frontend/src/metabase/api/tags/utils.ts@@ -598,6 +598,7 @@ export function provideTableTags(table: Table): TagDescription<TagType>[] {...(table.fields ? provideFieldListTags(table.fields) : []),...(table.fks ? provideForeignKeyListTags(table.fks) : []),...(table.segments ? provideSegmentListTags(table.segments) : []),+ ...(table.metrics ? provideCardListTags(table.metrics) : []),];}diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex 8aa974fca50..e4496066827 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -1,5 +1,6 @@import "@mantine/core/styles.css";import "@mantine/dates/styles.css";+import "@xyflow/react/dist/style.css";import "regenerator-runtime/runtime";diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsxindex 80afec2bd67..c1f83d2d9bc 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx@@ -20,12 +20,13 @@ import {QuestionPicker,type QuestionPickerStatePath,} from "../../QuestionPicker";+import { TablePicker } from "../../TablePicker";+import type { TablePickerStatePath } from "../../TablePicker/types";import { useAvailableData } from "../hooks";import type {DataPickerItem,DataPickerModalOptions,DataPickerValue,- TablePickerStatePath,} from "../types";import {createQuestionPickerItemSelectHandler,@@ -36,8 +37,6 @@ import {isValueItem,} from "../utils";-import { TablePicker } from "./TablePicker";-interface Props {/*** Limit selection to a particular databasediff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts b/frontend/src/metabase/common/components/Pickers/DataPicker/types.tsindex 3d5b9e2ff01..2def93f1588 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts@@ -3,12 +3,16 @@ import type {Collection,DashboardId,DatabaseId,- SchemaName,- TableId,} from "metabase-types/api";import type { EntityPickerModalOptions } from "../../EntityPicker";import type { QuestionPickerOptions } from "../QuestionPicker";+import type {+ DatabaseItem,+ SchemaItem,+ TableItem,+ TablePickerValue,+} from "../TablePicker/types";export type CollectionItem = {id: Collection["id"];@@ -16,28 +20,6 @@ export type CollectionItem = {model: "collection";};-export type DatabaseItem = {- id: DatabaseId;- name: string;- model: "database";-};--export type SchemaItem = {- id: SchemaName;- dbId: DatabaseId;- dbName: string | undefined;- isOnlySchema: boolean;- name: string;- model: "schema";-};--export type TableItem = {- id: TableId;- name: string;- model: "table";- database_id?: DatabaseId;-};-export type QuestionItem = {id: CardId;name: string;@@ -65,14 +47,6 @@ export type MetricItem = {database_id: DatabaseId;};-export type TablePickerValue = {- id: TableId;- name: string;- model: "table";- db_id: DatabaseId;- schema: SchemaName;-};-export type DataPickerValue =| TablePickerValue| QuestionItem@@ -95,9 +69,3 @@ export type DataPickerItem = DataPickerFolderItem | DataPickerValueItem;export type DataPickerModalOptions = EntityPickerModalOptions &QuestionPickerOptions;--export type TablePickerStatePath = [- DatabaseId | undefined,- SchemaName | undefined,- TableId | undefined,-];diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/DataPicker/utils.tsindex e4fafbb9daa..c7a61d2aa02 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts@@ -1,19 +1,15 @@-import { humanize, titleize } from "metabase/lib/formatting";import { isNullOrUndefined } from "metabase/lib/types";import * as Lib from "metabase-lib";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import type {CollectionItem,CollectionItemModel,- Database,DatabaseId,RecentItem,- SchemaName,- Table,- TableId,} from "metabase-types/api";import type { QuestionPickerItem } from "../QuestionPicker";+import type { TablePickerValue } from "../TablePicker";import type {DataPickerFolderItem,@@ -23,17 +19,8 @@ import type {MetricItem,ModelItem,QuestionItem,- TablePickerValue,} from "./types";-export const generateKey = (- dbItem: DataPickerFolderItem | null,- schemaItem: DataPickerFolderItem | null,- tableItem: DataPickerValueItem | null,-) => {- return [dbItem?.id, schemaItem?.id, tableItem?.id].join("-");-};-export const getDataPickerValue = (query: Lib.Query,stageIndex: number,@@ -68,62 +55,6 @@ export const getDataPickerValue = (};};-export const getDbItem = (- databases: Database[] | undefined,- dbId: DatabaseId | undefined,-): DataPickerFolderItem | null => {- if (typeof dbId === "undefined") {- return null;- }-- const database = databases?.find((db) => db.id === dbId);- const name = database?.name ?? "";-- return { model: "database", id: dbId, name };-};--export const getSchemaItem = (- dbId: DatabaseId | undefined,- dbName: string | undefined,- schemaName: SchemaName | undefined,- isOnlySchema: boolean,-): DataPickerFolderItem | null => {- if (typeof schemaName === "undefined" || typeof dbId === "undefined") {- return null;- }-- const name = getSchemaDisplayName(schemaName);-- return { model: "schema", id: schemaName, name, dbId, dbName, isOnlySchema };-};--export const getTableItem = (- tables: Table[] | undefined,- tableId: TableId | undefined,-): DataPickerValueItem | null => {- if (typeof tableId === "undefined") {- return null;- }-- const table = tables?.find((db) => db.id === tableId);- const name = table?.name ?? "";-- return {- model: "table",- id: tableId,- name,- database_id: table?.db_id,- };-};--export const getSchemaDisplayName = (schemaName: SchemaName | undefined) => {- if (typeof schemaName === "undefined") {- return "";- }-- return titleize(humanize(schemaName));-};-export const isCollectionItem = (value: DataPickerValue | undefined,): value is QuestionItem | ModelItem | MetricItem => {diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/components/DatabaseList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsxsimilarity index 79%rename from frontend/src/metabase/common/components/Pickers/DataPicker/components/DatabaseList.tsxrename to frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsxindex bc54311f9da..c3fb9a85653 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/components/DatabaseList.tsx+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsx@@ -2,17 +2,18 @@ import { useMemo } from "react";import type { Database } from "metabase-types/api";-import { ItemList, ListBox } from "../../../EntityPicker";-import type { DataPickerFolderItem } from "../types";+import { ItemList, ListBox } from "../../EntityPicker";++import type { TablePickerFolderItem } from "./types";interface Props {databases: Database[] | undefined;error: unknown;isCurrentLevel: boolean;isLoading: boolean;- selectedItem: DataPickerFolderItem | null;- onClick: (item: DataPickerFolderItem) => void;- shouldDisableItem?: (item: DataPickerFolderItem) => boolean;+ selectedItem: TablePickerFolderItem | null;+ onClick: (item: TablePickerFolderItem) => void;+ shouldDisableItem?: (item: TablePickerFolderItem) => boolean;}const isFolder = () => true;@@ -26,7 +27,7 @@ export const DatabaseList = ({onClick,shouldDisableItem,}: Props) => {- const items: DataPickerFolderItem[] | undefined = useMemo(() => {+ const items: TablePickerFolderItem[] | undefined = useMemo(() => {return databases?.map((database) => ({id: database.id,model: "database",diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/components/SchemaList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsxsimilarity index 77%rename from frontend/src/metabase/common/components/Pickers/DataPicker/components/SchemaList.tsxrename to frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsxindex 316d6b758e6..51adee9ff38 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/components/SchemaList.tsx+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsx@@ -2,9 +2,10 @@ import { useMemo } from "react";import type { DatabaseId, SchemaName } from "metabase-types/api";-import { ItemList, ListBox } from "../../../EntityPicker";-import type { DataPickerFolderItem } from "../types";-import { getSchemaDisplayName } from "../utils";+import { ItemList, ListBox } from "../../EntityPicker";++import type { TablePickerFolderItem } from "./types";+import { getSchemaDisplayName } from "./utils";interface Props {dbId: DatabaseId;@@ -13,8 +14,8 @@ interface Props {isCurrentLevel: boolean;isLoading: boolean;schemas: SchemaName[] | undefined;- selectedItem: DataPickerFolderItem | null;- onClick: (item: DataPickerFolderItem) => void;+ selectedItem: TablePickerFolderItem | null;+ onClick: (item: TablePickerFolderItem) => void;}const isFolder = () => true;@@ -29,7 +30,7 @@ export const SchemaList = ({selectedItem,onClick,}: Props) => {- const items: DataPickerFolderItem[] | undefined = useMemo(() => {+ const items: TablePickerFolderItem[] | undefined = useMemo(() => {return schemas?.map((schema) => ({id: schema,model: "schema",diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/components/TableList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsxsimilarity index 73%rename from frontend/src/metabase/common/components/Pickers/DataPicker/components/TableList.tsxrename to frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsxindex 3b0ca5524e8..5f9969f6f5e 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/components/TableList.tsx+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx@@ -2,17 +2,18 @@ import { useMemo } from "react";import type { Table } from "metabase-types/api";-import { ItemList, ListBox } from "../../../EntityPicker";-import type { DataPickerValueItem } from "../types";+import { ItemList, ListBox } from "../../EntityPicker";++import type { TableItem } from "./types";interface Props {error: unknown;isLoading: boolean;isCurrentLevel: boolean;- selectedItem: DataPickerValueItem | null;+ selectedItem: TableItem | null;tables: Table[] | undefined;- onClick: (item: DataPickerValueItem) => void;- shouldDisableItem?: (item: DataPickerValueItem) => boolean;+ onClick: (item: TableItem) => void;+ shouldDisableItem?: (item: TableItem) => boolean;}const isFolder = () => false;@@ -26,7 +27,7 @@ export const TableList = ({onClick,shouldDisableItem,}: Props) => {- const items: DataPickerValueItem[] | undefined = useMemo(() => {+ const items: TableItem[] | undefined = useMemo(() => {return tables?.map((table) => ({id: table.id,model: "table",diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/components/TablePicker.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsxsimilarity index 95%rename from frontend/src/metabase/common/components/Pickers/DataPicker/components/TablePicker.tsxrename to frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsxindex 9b9a8d5a589..2b9d80405bc 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/components/TablePicker.tsx+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsx@@ -11,19 +11,19 @@ import { isNotNull } from "metabase/lib/types";import { Flex } from "metabase/ui";import type { DatabaseId, SchemaName, TableId } from "metabase-types/api";-import { AutoScrollBox } from "../../../EntityPicker";-import type {- DataPickerFolderItem,- DataPickerItem,- DataPickerValueItem,- TablePickerStatePath,- TablePickerValue,-} from "../types";-import { generateKey, getDbItem, getSchemaItem, getTableItem } from "../utils";+import { AutoScrollBox } from "../../EntityPicker";import { DatabaseList } from "./DatabaseList";import { SchemaList } from "./SchemaList";import { TableList } from "./TableList";+import type {+ TableItem,+ TablePickerFolderItem,+ TablePickerItem,+ TablePickerStatePath,+ TablePickerValue,+} from "./types";+import { generateKey, getDbItem, getSchemaItem, getTableItem } from "./utils";interface Props {/**@@ -32,9 +32,9 @@ interface Props {databaseId?: DatabaseId;path: TablePickerStatePath | undefined;value: TablePickerValue | undefined;- onItemSelect: (value: DataPickerItem) => void;+ onItemSelect: (value: TablePickerItem) => void;onPathChange: (path: TablePickerStatePath) => void;- shouldDisableItem?: (item: DataPickerItem) => boolean;+ shouldDisableItem?: (item: TablePickerItem) => boolean;}export const TablePicker = ({@@ -101,7 +101,7 @@ export const TablePicker = ({);const handleFolderSelect = useCallback(- (folder: DataPickerFolderItem) => {+ (folder: TablePickerFolderItem) => {if (folder.model === "database") {if (dbId === folder.id) {const newSchemaName =@@ -153,7 +153,7 @@ export const TablePicker = ({);const handleTableSelect = useCallback(- (item: DataPickerValueItem) => {+ (item: TableItem) => {setTableId(item.id);onItemSelect(item);onPathChange([dbId, schemaName, item.id]);diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/index.ts b/frontend/src/metabase/common/components/Pickers/TablePicker/index.tsnew file mode 100644index 00000000000..21177136be3--- /dev/null+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/index.ts@@ -0,0 +1,2 @@+export * from "./TablePicker";+export * from "./types";diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/types.ts b/frontend/src/metabase/common/components/Pickers/TablePicker/types.tsnew file mode 100644index 00000000000..2d822fe8ac5--- /dev/null+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/types.ts@@ -0,0 +1,43 @@+import type { DatabaseId, SchemaName, TableId } from "metabase-types/api";++export type DatabaseItem = {+ id: DatabaseId;+ name: string;+ model: "database";+};++export type SchemaItem = {+ id: SchemaName;+ dbId: DatabaseId;+ dbName: string | undefined;+ isOnlySchema: boolean;+ name: string;+ model: "schema";+};++export type TableItem = {+ id: TableId;+ name: string;+ model: "table";+ database_id?: DatabaseId;+};++export type TablePickerValue = {+ id: TableId;+ name: string;+ model: "table";+ db_id: DatabaseId;+ schema: SchemaName;+};++export type TablePickerStatePath = [+ DatabaseId | undefined,+ SchemaName | undefined,+ TableId | undefined,+];++export type TablePickerValueItem = TableItem;++export type TablePickerFolderItem = DatabaseItem | SchemaItem;++export type TablePickerItem = TablePickerValueItem | TablePickerFolderItem;diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/utils.ts b/frontend/src/metabase/common/components/Pickers/TablePicker/utils.tsnew file mode 100644index 00000000000..095d26d7012--- /dev/null+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/utils.ts@@ -0,0 +1,74 @@+import { humanize, titleize } from "metabase/lib/formatting/strings";+import type {+ Database,+ DatabaseId,+ SchemaName,+ Table,+ TableId,+} from "metabase-types/api";++import type { TableItem, TablePickerFolderItem } from "./types";++export const generateKey = (+ dbItem: TablePickerFolderItem | null,+ schemaItem: TablePickerFolderItem | null,+ tableItem: TableItem | null,+) => {+ return [dbItem?.id, schemaItem?.id, tableItem?.id].join("-");+};++export const getDbItem = (+ databases: Database[] | undefined,+ dbId: DatabaseId | undefined,+): TablePickerFolderItem | null => {+ if (typeof dbId === "undefined") {+ return null;+ }++ const database = databases?.find((db) => db.id === dbId);+ const name = database?.name ?? "";++ return { model: "database", id: dbId, name };+};++export const getSchemaItem = (+ dbId: DatabaseId | undefined,+ dbName: string | undefined,+ schemaName: SchemaName | undefined,+ isOnlySchema: boolean,+): TablePickerFolderItem | null => {+ if (typeof schemaName === "undefined" || typeof dbId === "undefined") {+ return null;+ }++ const name = getSchemaDisplayName(schemaName);++ return { model: "schema", id: schemaName, name, dbId, dbName, isOnlySchema };+};++export const getTableItem = (+ tables: Table[] | undefined,+ tableId: TableId | undefined,+): TableItem | null => {+ if (typeof tableId === "undefined") {+ return null;+ }++ const table = tables?.find((db) => db.id === tableId);+ const name = table?.name ?? "";++ return {+ model: "table",+ id: tableId,+ name,+ database_id: table?.db_id,+ };+};++export const getSchemaDisplayName = (schemaName: SchemaName | undefined) => {+ if (typeof schemaName === "undefined") {+ return "";+ }++ return titleize(humanize(schemaName));+};diff --git a/frontend/src/metabase/common/utils/model-names.ts b/frontend/src/metabase/common/utils/model-names.tsindex b26ec8c8796..fa24bd66198 100644--- a/frontend/src/metabase/common/utils/model-names.ts+++ b/frontend/src/metabase/common/utils/model-names.ts@@ -1,6 +1,8 @@import { t } from "ttag";-const TRANSLATED_NAME_BY_MODEL_TYPE: Record<string, string> = {+import type { SearchModel } from "metabase-types/api";++const TRANSLATED_NAME_BY_MODEL_TYPE: Record<SearchModel, string> = {get action() {return t`Action`;},@@ -25,9 +27,6 @@ const TRANSLATED_NAME_BY_MODEL_TYPE: Record<string, string> = {get metric() {return t`Metric`;},- get pulse() {- return t`Pulse`;- },get segment() {return t`Segment`;},@@ -37,7 +36,10 @@ const TRANSLATED_NAME_BY_MODEL_TYPE: Record<string, string> = {get document() {return t`Document`;},+ get transform() {+ return t`Transform`;+ },};-export const getTranslatedEntityName = (type: string) =>+export const getTranslatedEntityName = (type: SearchModel) =>TRANSLATED_NAME_BY_MODEL_TYPE[type] || null;diff --git a/frontend/src/metabase/common/utils/model-names.unit.spec.ts b/frontend/src/metabase/common/utils/model-names.unit.spec.tsindex 95d49999750..229ccfb4ebd 100644--- a/frontend/src/metabase/common/utils/model-names.unit.spec.ts+++ b/frontend/src/metabase/common/utils/model-names.unit.spec.ts@@ -1,11 +1,6 @@import { getTranslatedEntityName } from "./model-names";describe("common/utils/model-names", () => {- it("returns null if the model doesn't exist", () => {- expect(getTranslatedEntityName("foo")).toBeNull();- expect(getTranslatedEntityName("")).toBeNull();- });-it("returns the correct colloquial name for the underlying model", () => {expect(getTranslatedEntityName("dashboard")).toBe("Dashboard");expect(getTranslatedEntityName("card")).toBe("Question");diff --git a/frontend/src/metabase/entities/bookmarks.js b/frontend/src/metabase/entities/bookmarks.jsindex a075b5949df..37dc0116e5e 100644--- a/frontend/src/metabase/entities/bookmarks.js+++ b/frontend/src/metabase/entities/bookmarks.js@@ -151,6 +151,7 @@ function getEntityFor(type) {collection: Collections,dashboard: Dashboards,document: PLUGIN_ENTITIES.entities["documents"],+ transform: PLUGIN_ENTITIES.entities["transforms"],};return entities[type];diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/lib/icon.tsindex 4e4063ebeb0..223d8a6e54d 100644--- a/frontend/src/metabase/lib/icon.ts+++ b/frontend/src/metabase/lib/icon.ts@@ -38,6 +38,7 @@ export const modelIconMap: Record<IconModel, IconName> = {metric: "metric",snippet: "unknown",document: "document",+ transform: "refresh_downstream",};export type IconData = {diff --git a/frontend/src/metabase/lib/urls/admin.ts b/frontend/src/metabase/lib/urls/admin.tsindex fb96260b828..60ce0c73a43 100644--- a/frontend/src/metabase/lib/urls/admin.ts+++ b/frontend/src/metabase/lib/urls/admin.ts@@ -1,4 +1,9 @@-import type { DatabaseId, UserId } from "metabase-types/api";+import type {+ DatabaseId,+ SchemaName,+ TableId,+ UserId,+} from "metabase-types/api";export function newUser() {return `/admin/people/new`;@@ -44,6 +49,21 @@ export function dataModelDatabase(databaseId: DatabaseId) {return `/admin/datamodel/database/${databaseId}`;}+export function dataModelSchema(+ databaseId: DatabaseId,+ schema: SchemaName | null,+) {+ return `${dataModelDatabase(databaseId)}/schema/${databaseId}:${encodeURIComponent(schema ?? "")}`;+}++export function dataModelTable(+ databaseId: DatabaseId,+ schema: SchemaName | null,+ tableId: TableId,+) {+ return `${dataModelSchema(databaseId, schema)}/table/${tableId}`;+}+export function uploadsSettings() {return "/admin/settings/uploads";}diff --git a/frontend/src/metabase/lib/urls/dependencies.ts b/frontend/src/metabase/lib/urls/dependencies.tsnew file mode 100644index 00000000000..d2344008d03--- /dev/null+++ b/frontend/src/metabase/lib/urls/dependencies.ts@@ -0,0 +1,11 @@+import type { DependencyEntry } from "metabase-types/api";++const BASE_URL = `/dependencies`;++export type DependencyGraphParams = {+ entry?: DependencyEntry;+};++export function dependencyGraph({ entry }: DependencyGraphParams) {+ return entry ? `${BASE_URL}/${entry.type}/${entry.id}` : BASE_URL;+}diff --git a/frontend/src/metabase/lib/urls/index.ts b/frontend/src/metabase/lib/urls/index.tsindex a1efd746436..5569a2fe6de 100644--- a/frontend/src/metabase/lib/urls/index.ts+++ b/frontend/src/metabase/lib/urls/index.ts@@ -5,6 +5,7 @@ export * from "./bookmarks";export * from "./browse";export * from "./collections";export * from "./dashboards";+export * from "./dependencies";export * from "./documents";export * from "./indexed-entities";export * from "./modelToUrl";@@ -13,4 +14,5 @@ export * from "./models";export * from "./pulses";export * from "./questions";export * from "./timelines";+export * from "./transforms";export * from "./utils";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/urls.ts b/frontend/src/metabase/lib/urls/transforms.tssimilarity index 64%rename from enterprise/frontend/src/metabase-enterprise/transforms/urls.tsrename to frontend/src/metabase/lib/urls/transforms.tsindex 18718968e9a..a379f5fe952 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/urls.ts+++ b/frontend/src/metabase/lib/urls/transforms.ts@@ -1,21 +1,44 @@import type {CardId,DatabaseId,- LegacyDatasetQuery,TableId,TransformId,TransformJobId,+ TransformRunMethod,+ TransformRunStatus,+ TransformTagId,} from "metabase-types/api";-import type {- JobListParams,- RunListParams,- TransformListParams,-} from "./types";--export const ROOT_URL = "/admin/transforms";--export function getTransformListUrl({+const ROOT_URL = "/admin/transforms";++export type TransformListParams = {+ lastRunStartTime?: string;+ lastRunStatuses?: TransformRunStatus[];+ tagIds?: TransformTagId[];+};++export type TransformJobListParams = {+ lastRunStartTime?: string;+ lastRunStatuses?: TransformRunStatus[];+ nextRunStartTime?: string;+ tagIds?: TransformTagId[];+};++export type TransformRunListParams = {+ page?: number;+ statuses?: TransformRunStatus[];+ transformIds?: TransformId[];+ transformTagIds?: TransformTagId[];+ startTime?: string;+ endTime?: string;+ runMethods?: TransformRunMethod[];+};++export type TransformPythonLibraryParams = {+ path: string;+};++export function transformList({lastRunStartTime,lastRunStatuses,tagIds,@@ -38,30 +61,28 @@ export function getTransformListUrl({}}-export function getNewTransformFromTypeUrl(- type: LegacyDatasetQuery["type"] | "python",-) {+export function newTransformFromType(type: "query" | "native" | "python") {return `${ROOT_URL}/new/${type}`;}-export function getNewTransformFromCardUrl(cardId: CardId) {+export function newTransformFromCard(cardId: CardId) {return `${ROOT_URL}/new/card/${cardId}`;}-export function getTransformUrl(transformId: TransformId) {+export function transform(transformId: TransformId) {return `${ROOT_URL}/${transformId}`;}-export function getTransformQueryUrl(transformId: TransformId) {+export function transformQuery(transformId: TransformId) {return `${ROOT_URL}/${transformId}/query`;}-export function getJobListUrl({+export function transformJobList({lastRunStartTime,lastRunStatuses,nextRunStartTime,tagIds,-}: JobListParams = {}) {+}: TransformJobListParams = {}) {const searchParams = new URLSearchParams();if (lastRunStartTime != null) {searchParams.set("lastRunStartTime", lastRunStartTime);@@ -83,15 +104,15 @@ export function getJobListUrl({}}-export function getNewJobUrl() {+export function newTransformJob() {return `${ROOT_URL}/jobs/new`;}-export function getJobUrl(id: TransformJobId) {+export function transformJob(id: TransformJobId) {return `${ROOT_URL}/jobs/${id}`;}-export function getRunListUrl({+export function transformRunList({page,transformIds,statuses,@@ -99,7 +120,7 @@ export function getRunListUrl({startTime,endTime,runMethods,-}: RunListParams = {}) {+}: TransformRunListParams = {}) {const searchParams = new URLSearchParams();if (page != null) {searchParams.set("page", String(page));@@ -131,22 +152,10 @@ export function getRunListUrl({}}-export function getBrowseDatabaseUrl(databaseId: DatabaseId) {- return `/browse/databases/${databaseId}`;+export function transformPythonLibrary({ path }: TransformPythonLibraryParams) {+ return `/admin/transforms/library/${path}`;}-export function getBrowseSchemaUrl(databaseId: DatabaseId, schema: string) {- return `/browse/databases/${databaseId}/schema/${schema ?? ""}`;-}--export function getQueryBuilderUrl(tableId: TableId, databaseId: DatabaseId) {+export function queryBuilderTable(tableId: TableId, databaseId: DatabaseId) {return `/question#?db=${databaseId}&table=${tableId}`;}--export function getTableMetadataUrl(- tableId: TableId,- schema: string | null,- databaseId: DatabaseId,-) {- return `/admin/datamodel/database/${databaseId}/schema/${databaseId}:${encodeURIComponent(schema ?? "")}/table/${tableId}`;-}diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.tsindex 4306d62d22d..f0936b542da 100644--- a/frontend/src/metabase/plugins/index.ts+++ b/frontend/src/metabase/plugins/index.ts@@ -85,6 +85,7 @@ import type {Timeline,TimelineEvent,Transform,+ TransformId,UpdateSnippetRequest,UpdateTransformRequest,User,@@ -846,12 +847,25 @@ export const PLUGIN_SEMANTIC_SEARCH = {SearchSettingsWidget: PluginPlaceholder,};+export type TransformPickerItem = {+ id: TransformId;+ name: string;+ model: "transform";+};++export type TransformPickerProps = {+ value: TransformPickerItem | undefined;+ onItemSelect: (transform: TransformPickerItem) => void;+};+export type TransformsPlugin = {+ TransformPicker: ComponentType<TransformPickerProps>;getAdminPaths(): AdminPath[];getAdminRoutes(): ReactNode;};export const PLUGIN_TRANSFORMS: TransformsPlugin = {+ TransformPicker: PluginPlaceholder,getAdminPaths: () => [],getAdminRoutes: () => null,};@@ -887,6 +901,8 @@ export const PLUGIN_TRANSFORMS_PYTHON: PythonTransformsPlugin = {};type DependenciesPlugin = {+ isEnabled: boolean;+ DependencyGraphPage: ComponentType;CheckDependenciesForm: ComponentType<CheckDependenciesFormProps>;CheckDependenciesModal: ComponentType<CheckDependenciesModalProps>;CheckDependenciesTitle: ComponentType;@@ -940,6 +956,8 @@ function useCheckDependencies<TChange>({}export const PLUGIN_DEPENDENCIES: DependenciesPlugin = {+ isEnabled: false,+ DependencyGraphPage: PluginPlaceholder,CheckDependenciesForm: PluginPlaceholder,CheckDependenciesModal: PluginPlaceholder,CheckDependenciesTitle: PluginPlaceholder,diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsxindex 06dd9ae9131..65ef4595a5c 100644--- a/frontend/src/metabase/routes.jsx+++ b/frontend/src/metabase/routes.jsx@@ -40,6 +40,7 @@ import NewModelOptions from "metabase/models/containers/NewModelOptions";import { getRoutes as getModelRoutes } from "metabase/models/routes";import {PLUGIN_COLLECTIONS,+ PLUGIN_DEPENDENCIES,PLUGIN_DOCUMENTS,PLUGIN_EMBEDDING_IFRAME_SDK_SETUP,PLUGIN_LANDING_PAGE,@@ -154,6 +155,16 @@ export const getRoutes = (store) => {<IndexRoute component={Onboarding} /></Route>+ {PLUGIN_DEPENDENCIES.isEnabled && (+ <Route title={t`Dependencies`} path="dependencies">+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route+ path=":type/:id"+ component={PLUGIN_DEPENDENCIES.DependencyGraphPage}+ />+ </Route>+ )}+<Route path="search" title={t`Search`} component={SearchApp} />{/* Send historical /archive route to trash - can remove in v52 */}<Redirect from="archive" to="trash" replace />diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.jsindex 3133c951008..75aee106a17 100644--- a/frontend/src/metabase/schema.js+++ b/frontend/src/metabase/schema.js@@ -13,6 +13,7 @@ export const CacheConfigSchema = new schema.Entity("cacheConfigs");export const IndexedEntitySchema = new schema.Entity("indexedEntities");export const BookmarkSchema = new schema.Entity("bookmarks");export const DocumentSchema = new schema.Entity("documents");+export const TransformSchema = new schema.Entity("transforms");export const DashboardSchema = new schema.Entity("dashboards");export const PulseSchema = new schema.Entity("pulses");export const CollectionSchema = new schema.Entity("collections");diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsxindex cc87bb26b4e..95043dc0413 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx@@ -27,6 +27,7 @@ const MODEL_NAME: Record<EnabledSearchModel, string> = {table: "Table","indexed-entity": "Indexed record",document: "Document",+ transform: "Transform",};const TEST_TYPES: Array<EnabledSearchModel> = [diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsxindex 52cef6a3170..a1d7947fc45 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx@@ -15,6 +15,7 @@ const MODEL_TYPE_DISPLAY_NAMES: Record<EnabledSearchModel, string> = {table: "Table","indexed-entity": "Indexed record",document: "Document",+ transform: "Transform",};const setup = (value: TypeFilterProps) => {diff --git a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsxindex 4802c5c21ea..ad418b1d889 100644--- a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx+++ b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx@@ -42,6 +42,7 @@ const TYPE_FILTER_LABELS: Record<EnabledSearchModel, string> = {action: "Action","indexed-entity": "Indexed record",document: "Document",+ transform: "Transform",};const TEST_ITEMS: Partial<SearchResult>[] = [diff --git a/frontend/src/metabase/ui/components/inputs/Combobox/index.ts b/frontend/src/metabase/ui/components/inputs/Combobox/index.tsindex 32bc0ba61d3..b06a7bff9ae 100644--- a/frontend/src/metabase/ui/components/inputs/Combobox/index.ts+++ b/frontend/src/metabase/ui/components/inputs/Combobox/index.ts@@ -3,5 +3,6 @@ export type {ComboboxGroupProps,ComboboxProps,ComboboxItem,+ OptionsFilter,} from "@mantine/core";export { comboboxOverrides } from "./Combobox.config";diff --git a/frontend/src/metabase/ui/components/inputs/Input/Input.config.tsx b/frontend/src/metabase/ui/components/inputs/Input/Input.config.tsxindex 7e9ab818b2b..bfa1d38df2e 100644--- a/frontend/src/metabase/ui/components/inputs/Input/Input.config.tsx+++ b/frontend/src/metabase/ui/components/inputs/Input/Input.config.tsx@@ -17,7 +17,10 @@ export const inputOverrides = {input: Styles.input,section: Styles.section,},- vars: (theme, { radius, leftSection, rightSection, variant }) => ({+ vars: (+ theme,+ { radius, leftSection, rightSection, rightSectionWidth, variant },+ ) => ({wrapper: {"--input-border-radius": radius ?? theme.radius.xs,"--input-padding-inline-start": leftSection@@ -27,9 +30,11 @@ export const inputOverrides = {? rem(DEFAULT_ICON_WIDTH - BORDER_WIDTH): rem(PADDING - BORDER_WIDTH),"--input-right-section-width":- variant === "unstyled"- ? rem(UNSTYLED_ICON_WIDTH)- : rem(DEFAULT_ICON_WIDTH),+ typeof rightSectionWidth === "string"+ ? rightSectionWidth+ : variant === "unstyled"+ ? rem(UNSTYLED_ICON_WIDTH)+ : rem(DEFAULT_ICON_WIDTH),},}),}),diff --git a/frontend/src/metabase/ui/components/inputs/Select/SelectItem/DefaultSelectItem.tsx b/frontend/src/metabase/ui/components/inputs/Select/SelectItem/DefaultSelectItem.tsxindex cb1d48c898f..9d80965312f 100644--- a/frontend/src/metabase/ui/components/inputs/Select/SelectItem/DefaultSelectItem.tsx+++ b/frontend/src/metabase/ui/components/inputs/Select/SelectItem/DefaultSelectItem.tsx@@ -1,5 +1,5 @@import { Text } from "@mantine/core";-import { type Ref, forwardRef } from "react";+import { type ReactNode, type Ref, forwardRef } from "react";import { Icon, type IconName } from "metabase/ui";@@ -7,7 +7,7 @@ import { SelectItem, type SelectItemProps } from "./SelectItem";export interface DefaultSelectItemProps extends SelectItemProps {icon?: IconName;- label?: string | JSX.Element;+ label?: ReactNode;value: string;}diff --git a/frontend/src/metabase/ui/components/inputs/Select/SelectItem/SelectItem.tsx b/frontend/src/metabase/ui/components/inputs/Select/SelectItem/SelectItem.tsxindex 5c77b810dcf..a93486ce807 100644--- a/frontend/src/metabase/ui/components/inputs/Select/SelectItem/SelectItem.tsx+++ b/frontend/src/metabase/ui/components/inputs/Select/SelectItem/SelectItem.tsx@@ -35,6 +35,7 @@ export const SelectItem = forwardRef(function SelectItem(gap="sm"flex={1}aria-selected={selected}+ wrap="nowrap"{...props}/>);diff --git a/package.json b/package.jsonindex 03fcfb446d8..140c7e7ca7f 100644--- a/package.json+++ b/package.json@@ -17,6 +17,7 @@"@codemirror/lang-python": "^6.1.7","@codemirror/lang-sql": "^6.8.0","@codemirror/legacy-modes": "^6.4.2",+ "@dagrejs/dagre": "^1.1.5","@dnd-kit/core": "^6.0.8","@dnd-kit/modifiers": "^6.0.1","@dnd-kit/sortable": "^8.0.0",@@ -56,6 +57,7 @@"@visx/shape": "^3.5.0","@visx/text": "^3.3.0","@xiechao/codemirror-lang-handlebars": "^1.0.4",+ "@xyflow/react": "^12.8.5","bowser": "^2.11.0","buffer": "^6.0.3","classnames": "^2.1.3",diff --git a/snowplow/iglu-client-embedded/schemas/com.metabase/search/jsonschema/1-1-3 b/snowplow/iglu-client-embedded/schemas/com.metabase/search/jsonschema/1-1-3new file mode 100644index 00000000000..3c2ede7ca25--- /dev/null+++ b/snowplow/iglu-client-embedded/schemas/com.metabase/search/jsonschema/1-1-3@@ -0,0 +1,221 @@+{+ "$schema": "http://iglucentral.com/schemas/com.snowplowanalytics.self-desc/schema/jsonschema/1-0-0#",+ "description": "Search events",+ "self": {+ "vendor": "com.metabase",+ "name": "search",+ "format": "jsonschema",+ "version": "1-1-3"+ },+ "type": "object",+ "properties": {+ "event": {+ "description": "Event name",+ "type": "string",+ "enum": [+ "search_query",+ "search_click",+ "new_search_query",+ "search_results_filtered"+ ],+ "maxLength": 1024+ },+ "runtime_milliseconds": {+ "description": "Number of milliseconds it took to successfully run the search query",+ "type": [+ "integer",+ "null"+ ],+ "minimum": 0,+ "maximum": 2147483647+ },+ "context": {+ "description": "Source of the search event",+ "type": [+ "string",+ "null"+ ],+ "enum": [+ "search-app",+ "search-bar",+ "command-palette",+ "entity-picker"+ ],+ "maxLength": 1024+ },+ "total_results": {+ "description": "The total number of results that matched the query",+ "type": [+ "integer",+ "null"+ ],+ "minimum": 0,+ "maximum": 2147483647+ },+ "page_results": {+ "description": "The number of results returned per page",+ "type": [+ "integer",+ "null"+ ],+ "minimum": 0,+ "maximum": 2147483647+ },+ "position": {+ "description": "The position of the result in the list that was clicked. Zero indexed",+ "type": [+ "integer",+ "null"+ ],+ "minimum": 0,+ "maximum": 2147483647+ },+ "target_type": {+ "description": "The type of item in the search list that was clicked.",+ "type": [+ "string",+ "null"+ ],+ "enum": [+ "item",+ "view_more"+ ]+ },+ "content_type": {+ "description": "Filter for entity types (question, database, model, etc.)",+ "type": [+ "array",+ "null"+ ],+ "items": {+ "description": "An entity type (card, question, dashboard, etc.)",+ "type": "string",+ "enum": [+ "dashboard",+ "card",+ "segment",+ "metric",+ "collection",+ "database",+ "table",+ "action",+ "indexed-entity",+ "document",+ "transform"+ ],+ "maxLength": 1024+ }+ },+ "creator": {+ "description": "Filter for created by a user",+ "type": [+ "boolean",+ "null"+ ]+ },+ "last_editor": {+ "description": "Filter for last edited by a user",+ "type": [+ "boolean",+ "null"+ ]+ },+ "creation_date": {+ "description": "Filter for a time when a user creates an entity",+ "type": [+ "boolean",+ "null"+ ]+ },+ "last_edit_date": {+ "description": "Filter for a time when a user last edited an entity",+ "type": [+ "boolean",+ "null"+ ]+ },+ "verified_items": {+ "description": "Filter for entities that have been marked as verified",+ "type": [+ "boolean",+ "null"+ ]+ },+ "search_native_queries": {+ "description": "Toggles whether search should include SQL and/or native queries",+ "type": [+ "boolean",+ "null"+ ]+ },+ "search_archived": {+ "description": "Toggles whether search should include archived items",+ "type": [+ "boolean",+ "null"+ ]+ },+ "search_engine": {+ "description": "The search engine used to perform the search",+ "type": [+ "string",+ "null"+ ],+ "maxLength": 1024+ },+ "request_id": {+ "description": "The unique request ID for the search request",+ "type": [+ "string",+ "null"+ ],+ "maxLength": 1024+ },+ "offset": {+ "description": "The offset of the search results (for pagination)",+ "type": [+ "integer",+ "null"+ ],+ "minimum": 0,+ "maximum": 2147483647+ },+ "entity_model": {+ "description": "The model type of the clicked entity",+ "type": [+ "string",+ "null"+ ],+ "maxLength": 1024+ },+ "entity_id": {+ "description": "The ID of the clicked entity",+ "type": [+ "integer",+ "null"+ ],+ "minimum": 0,+ "maximum": 2147483647+ },+ "search_term_hash": {+ "description": "A hash of the search term and instance id",+ "type": [+ "string",+ "null"+ ],+ "maxLength": 1024+ },+ "search_term": {+ "description": "The search term as a string (only reported for specific analytics UUIDs)",+ "type": [+ "string",+ "null"+ ],+ "maxLength": 1024+ }+ },+ "required": [+ "event"+ ],+ "additionalProperties": true+}diff --git a/src/metabase/graph/core.cljc b/src/metabase/graph/core.cljcindex e389054aee1..db296852c4d 100644--- a/src/metabase/graph/core.cljc+++ b/src/metabase/graph/core.cljc@@ -27,6 +27,21 @@- If a key is found in the graph, and it has no children, its value is `#{}`.- If the input `key-seq` is empty, return `{}`."))+(p/deftype+ CachedGraph [graph cache]+ Graph+ (children-of [_this key-seq]+ (let [new-cache (swap! cache (fn [current-cache]+ (let [current-keys (into #{} (keys current-cache))+ missing-keys (remove current-keys key-seq)]+ (->> (children-of graph missing-keys)+ (merge current-cache)))))]+ (select-keys new-cache key-seq))))++(defn cached-graph+ "Wraps a graph with an implementation that automatically caches results."+ [graph]+ (->CachedGraph graph (atom {})))+(defn- stable-iteration-set [];; Both of these sets explicitly have stable iteration order: values are returned in the order of (first) insertion.#?(:clj (let [s (LinkedHashSet.)]@@ -60,6 +75,20 @@(recur new-children))(drop (count key-seq) (->iterable))))))+(defn calc-edges+ "Calculates the edges within `nodes`, based on `graph`."+ [graph nodes]+ (let [node-set (into #{} nodes)+ all-children (children-of graph nodes)+ edges (for [[[parent-type parent-id] children] all-children+ [child-type child-id] children+ :when (node-set [child-type child-id])]+ {:from_entity_type child-type+ :from_entity_id child-id+ :to_entity_type parent-type+ :to_entity_id parent-id})]+ edges))+(defn graph?"Whether `x` is a valid `Graph`."[x]diff --git a/src/metabase/search/config.clj b/src/metabase/search/config.cljindex 154e5a996b6..af6798f23b0 100644--- a/src/metabase/search/config.clj+++ b/src/metabase/search/config.clj@@ -43,7 +43,8 @@(def model->db-model"Mapping of model name to :db_model and :alias"(cond-> api/model->db-model- config/ee-available? (assoc "document" {:db-model :model/Document :alias :document})))+ config/ee-available? (assoc "document" {:db-model :model/Document :alias :document})+ config/ee-available? (assoc "transform" {:db-model :model/Transform :alias :transform})));; We won't need this once fully migrated to specs, but kept for now in case legacy cod falls out of sync(def excluded-models@@ -75,6 +76,7 @@list will be ranked higher."(cond-> ["dashboard" "metric" "segment" "indexed-entity" "card" "dataset" "collection" "table" "action"]config/ee-available? (conj "document")+ config/ee-available? (conj "transform"):always (conj "database")))(assert (= all-models (set models-search-order)) "The models search order has to include all models")diff --git a/src/metabase/search/impl.clj b/src/metabase/search/impl.cljindex 69928346343..77a255eb9f9 100644--- a/src/metabase/search/impl.clj+++ b/src/metabase/search/impl.clj@@ -61,6 +61,14 @@(can-write? search-ctx instance)true)))+(defmethod check-permissions-for-model :transform+ [search-ctx instance]+ (and (:is-superuser? search-ctx)+ (premium-features/enable-transforms?)+ (if (:archived? search-ctx)+ (can-write? search-ctx instance)+ true)))+;; TODO: remove this implementation now that we check permissions in the SQL, leaving it in for now to guard against;; issue with new pure sql implementation(defmethod check-permissions-for-model :tablediff --git a/src/metabase/search/in_place/filter.clj b/src/metabase/search/in_place/filter.cljindex 7907e8dee1c..31d12003aee 100644--- a/src/metabase/search/in_place/filter.clj+++ b/src/metabase/search/in_place/filter.clj@@ -41,18 +41,13 @@[model archived?][:= (search.config/column-with-model-alias model :archived) archived?])-;; Databases can't be archived-(defmethod archived-clause "database"- [_model archived?]- (if archived?- false-clause- true-clause))--(defmethod archived-clause "indexed-entity"- [_model archived?]- (if-not archived?- true-clause- false-clause))+;; Databases, transforms, and indexed-entities can't be archived+(doseq [model ["database" "transform" "indexed-entity"]]+ (defmethod archived-clause model+ [_model archived?]+ (if archived?+ false-clause+ true-clause)));; Table has an `:active` flag, but no `:archived` flag; never return inactive Tables(defmethod archived-clause "table"@@ -186,7 +181,8 @@:else[:and [:>= dt-col start] [:< dt-col end]])))-(doseq [model ["collection" "database" "table" "dashboard" "card" "dataset" "metric" "action" "document"]]+(doseq [model ["collection" "database" "table" "dashboard" "card" "dataset" "metric" "action" "document"+ "transform"]](defmethod build-optional-filter-query [:created-at model][_filter model query created-at](sql.helpers/where query (date-range-filter-clausediff --git a/src/metabase/search/in_place/legacy.clj b/src/metabase/search/in_place/legacy.cljindex b9071028134..fae15ae4516 100644--- a/src/metabase/search/in_place/legacy.clj+++ b/src/metabase/search/in_place/legacy.clj@@ -371,6 +371,10 @@[_][:id :name :archived :created_at :updated_at :collection_id :creator_id])+(defmethod columns-for-model "transform"+ [_]+ [:id :name :created_at :updated_at])+(defmethod columns-for-model "indexed-entity" [_][[:model-index-value.name :name][:model-index-value.model_pk :id]@@ -525,6 +529,10 @@[:= :bookmark.user_id (:current-user-id search-ctx)]])(add-collection-join-and-where-clauses model search-ctx)))+(defmethod search-query-for-model "transform"+ [_model search-ctx]+ (base-query-for-model "transform" search-ctx))+(defmethod search-query-for-model "database"[model search-ctx](-> (base-query-for-model model search-ctx)diff --git a/src/metabase/search/spec.clj b/src/metabase/search/spec.cljindex 2349d833523..94bf75756a9 100644--- a/src/metabase/search/spec.clj+++ b/src/metabase/search/spec.clj@@ -15,6 +15,7 @@"Set of search model string names. Sorted by order to index based on importance and amount of time to index"(cond-> ["collection" "dashboard" "segment" "database" "action"]config/ee-available? (conj "document")+ config/ee-available? (conj "transform");; metric/card/dataset moved to the end because they take a long time due to computing has_temporal_dim etc.;; table and indexed-entity moved to the end because there can be a large number of themtrue (conj "table" "indexed-entity" "metric" "card" "dataset")))diff --git a/test/metabase/search/filter_test.clj b/test/metabase/search/filter_test.cljindex a0edfa33617..14f14bfca25 100644--- a/test/metabase/search/filter_test.clj+++ b/test/metabase/search/filter_test.clj@@ -107,7 +107,7 @@;; This :where clause is a set to avoid flakes, since the clause order will be non-deterministic.:where #{:and[:in :search_index.model (cond-> #{"dashboard" "table" "segment" "collection" "database" "action" "indexed-entity" "metric" "card"}- config/ee-available? (conj "document"))]+ config/ee-available? (conj "document" "transform"))][:in :search_index.model_id ["1" "2" "3" "4"]][:in :search_index.model ["card" "dataset" "metric" "dashboard" "action"]][:= :search_index.archived true]diff --git a/test/metabase/search/in_place/filter_test.clj b/test/metabase/search/in_place/filter_test.cljindex a2ef3c0231c..f392ca9155d 100644--- a/test/metabase/search/in_place/filter_test.clj+++ b/test/metabase/search/in_place/filter_test.clj@@ -52,7 +52,7 @@(testing "created at"(is (= (cond-> #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric"}- config/ee-available? (conj "document"))+ config/ee-available? (conj "document" "transform"))(search.filter/search-context->applicable-models(merge default-search-ctx{:created-at "past3days"}))))diff --git a/yarn.lock b/yarn.lockindex 34cb321672a..8053da96e56 100644--- a/yarn.lock+++ b/yarn.lock@@ -1700,6 +1700,18 @@debug "^3.1.0"lodash.once "^4.1.1"+"@dagrejs/dagre@^1.1.5":+ version "1.1.5"+ resolved "https://registry.yarnpkg.com/@dagrejs/dagre/-/dagre-1.1.5.tgz#af392e24723c479f00661af3f4e8ede5c6acce51"+ integrity sha512-Ghgrh08s12DCL5SeiR6AoyE80mQELTWhJBRmXfFoqDiFkR458vPEdgTbbjA0T+9ETNxUblnD0QW55tfdvi5pjQ==+ dependencies:+ "@dagrejs/graphlib" "2.2.4"++"@dagrejs/[email protected]":+ version "2.2.4"+ resolved "https://registry.yarnpkg.com/@dagrejs/graphlib/-/graphlib-2.2.4.tgz#d77bfa9ff49e2307c0c6e6b8b26b5dd3c05816c4"+ integrity sha512-mepCf/e9+SKYy1d02/UkvSy6+6MoyXhVxP8lLDfA7BPE1X1d4dR0sZznmbM8/XVJ1GPM+Svnx7Xj6ZweByWUkw==+"@dependents/detective-less@^5.0.1":version "5.0.1"resolved "https://registry.yarnpkg.com/@dependents/detective-less/-/detective-less-5.0.1.tgz#e6c5b502f0d26a81da4170c1ccd848a6eaa68470"@@ -4822,7 +4834,7 @@resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz#096efdf55eb97480e3f5621ff9a8da552f0961e7"integrity sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==-"@types/d3-drag@*":+"@types/d3-drag@*", "@types/d3-drag@^3.0.7":version "3.0.7"resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-3.0.7.tgz#b13aba8b2442b4068c9a9e6d1d82f8bcea77fc02"integrity sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==@@ -4873,7 +4885,7 @@resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz#6023fb3b2d463229f2d680f9ac4b47466f71f17b"integrity sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==-"@types/d3-interpolate@*":+"@types/d3-interpolate@*", "@types/d3-interpolate@^3.0.4":version "3.0.4"resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz#412b90e84870285f2ff8a846c6eb60344f12a41c"integrity sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==@@ -4936,6 +4948,11 @@resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.10.tgz#98cdcf986d0986de6912b5892e7c015a95ca27fe"integrity sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==+"@types/d3-selection@^3.0.10":+ version "3.0.11"+ resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.11.tgz#bd7a45fc0a8c3167a631675e61bc2ca2b058d4a3"+ integrity sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==+"@types/d3-shape@*":version "3.1.6"resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.1.6.tgz#65d40d5a548f0a023821773e39012805e6e31a72"@@ -4982,7 +4999,14 @@dependencies:"@types/d3-selection" "*"-"@types/d3-zoom@*":+"@types/d3-transition@^3.0.8":+ version "3.0.9"+ resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.9.tgz#1136bc57e9ddb3c390dccc9b5ff3b7d2b8d94706"+ integrity sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==+ dependencies:+ "@types/d3-selection" "*"++"@types/d3-zoom@*", "@types/d3-zoom@^3.0.8":version "3.0.8"resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-3.0.8.tgz#dccb32d1c56b1e1c6e0f1180d994896f038bc40b"integrity sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==@@ -6549,6 +6573,30 @@resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==+"@xyflow/react@^12.8.5":+ version "12.8.6"+ resolved "https://registry.yarnpkg.com/@xyflow/react/-/react-12.8.6.tgz#4cb80abe1bf7123dd989f2c8554bff679980bd8b"+ integrity sha512-SksAm2m4ySupjChphMmzvm55djtgMDPr+eovPDdTnyGvShf73cvydfoBfWDFllooIQ4IaiUL5yfxHRwU0c37EA==+ dependencies:+ "@xyflow/system" "0.0.70"+ classcat "^5.0.3"+ zustand "^4.4.0"++"@xyflow/[email protected]":+ version "0.0.70"+ resolved "https://registry.yarnpkg.com/@xyflow/system/-/system-0.0.70.tgz#c397d2a802e250fe852717dd55b5be5d306d7c1c"+ integrity sha512-PpC//u9zxdjj0tfTSmZrg3+sRbTz6kop/Amky44U2Dl51sxzDTIUfXMwETOYpmr2dqICWXBIJwXL2a9QWtX2XA==+ dependencies:+ "@types/d3-drag" "^3.0.7"+ "@types/d3-interpolate" "^3.0.4"+ "@types/d3-selection" "^3.0.10"+ "@types/d3-transition" "^3.0.8"+ "@types/d3-zoom" "^3.0.8"+ d3-drag "^3.0.0"+ d3-interpolate "^3.0.1"+ d3-selection "^3.0.0"+ d3-zoom "^3.0.0"+"@yarnpkg/lockfile@^1.1.0":version "1.1.0"resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"@@ -8072,6 +8120,11 @@ cjs-module-lexer@^1.2.3:resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz#707413784dbb3a72aa11c2f2b042a0bef4004170"integrity sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==+classcat@^5.0.3:+ version "5.0.5"+ resolved "https://registry.yarnpkg.com/classcat/-/classcat-5.0.5.tgz#8c209f359a93ac302404a10161b501eba9c09c77"+ integrity sha512-JhZUT7JFcQy/EzW605k/ktHtncoo9vnyW/2GspNYwFlN1C/WmjuV/xtS04e9SOkL2sTdw0VAZ2UGCcQ9lR6p6w==+classnames@^2.1.3:version "2.3.2"resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"@@ -9155,7 +9208,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==-"d3-drag@2 - 3", d3-drag@3:+"d3-drag@2 - 3", d3-drag@3, d3-drag@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==@@ -9217,7 +9270,7 @@ d3-hierarchy@3:resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==-"d3-interpolate@1 - 3", "[email protected] - 3", d3-interpolate@3, [email protected]:+"d3-interpolate@1 - 3", "[email protected] - 3", d3-interpolate@3, [email protected], d3-interpolate@^3.0.1:version "3.0.1"resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==@@ -9273,7 +9326,7 @@ d3-scale@4, [email protected], d3-scale@^4.0.2:d3-time "2.1.1 - 3"d3-time-format "2 - 4"-"d3-selection@2 - 3", d3-selection@3:+"d3-selection@2 - 3", d3-selection@3, d3-selection@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==@@ -9322,7 +9375,7 @@ d3-shape@^1.0.6, d3-shape@^1.2.0:d3-interpolate "1 - 3"d3-timer "1 - 3"-d3-zoom@3:+d3-zoom@3, d3-zoom@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==@@ -21582,7 +21635,7 @@ use-sync-external-store@^1.0.0:resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==-use-sync-external-store@^1.4.0:+use-sync-external-store@^1.2.2, use-sync-external-store@^1.4.0:version "1.5.0"resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz#55122e2a3edd2a6c106174c27485e0fd59bcfca0"integrity sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==@@ -22563,6 +22616,13 @@ [email protected]:dependencies:tslib "2.3.0"+zustand@^4.4.0:+ version "4.5.7"+ resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.7.tgz#7d6bb2026a142415dd8be8891d7870e6dbe65f55"+ integrity sha512-CHOUy7mu3lbD6o6LJLfllpjkzhHXSBlX8B9+qPddUsIfeF5S/UZ5q0kmCsnRqT1UHFQZchNFDDzMbQsuesHWlw==+ dependencies:+ use-sync-external-store "^1.2.2"+zwitch@^1.0.0:version "1.0.5"resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"