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 diagnostics - update the url, reset page on filter change, fix visibility checks (#68650)
Alexander Polyankinceb518ab4bcf
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.tsindex 92fa9fbb53e..1c4eb26e9bc 100644--- a/e2e/support/helpers/e2e-data-studio-helpers.ts+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts@@ -132,26 +132,4 @@ export const DataStudio = {collectionItem: (name: string) =>libraryPage().findAllByTestId("collection-name").contains(name),},- Tasks: {- visitBrokenEntities: () => cy.visit("/data-studio/tasks/broken"),- visitUnreferencedEntities: () =>- cy.visit("/data-studio/tasks/unreferenced"),- list: () => cy.findByTestId("dependency-list"),- searchInput: () => cy.findByTestId("dependency-list-search-input"),- filterButton: () => cy.findByTestId("dependency-filter-button"),- sidebar: () => cy.findByTestId("dependency-list-sidebar"),-- Sidebar: {- get: () => cy.findByTestId("dependency-list-sidebar"),- header: () => cy.findByTestId("dependency-list-sidebar-header"),- locationSection: () => cy.findByRole("region", { name: "Location" }),- transformSection: () => cy.findByRole("region", { name: "Transform" }),- missingColumnsSection: () =>- cy.findByRole("region", { name: "Missing columns" }),- creationSection: () =>- cy.findByRole("region", { name: "Creator and last editor" }),- brokenDependentsSection: () =>- cy.findByRole("region", { name: "Broken dependents" }),- },- },};diff --git a/e2e/support/helpers/e2e-dependency-graph-helpers.ts b/e2e/support/helpers/e2e-dependency-graph-helpers.tsdeleted file mode 100644index fee6bf9d85e..00000000000--- a/e2e/support/helpers/e2e-dependency-graph-helpers.ts+++ /dev/null@@ -1,7 +0,0 @@-export const DependencyGraph = {- graph: () => cy.findByTestId("dependency-graph"),- entryButton: () => cy.findByTestId("graph-entry-button"),- entrySearchInput: () => cy.findByTestId("graph-entry-search-input"),- selectionButton: () => cy.findByTestId("graph-selection-button"),- dependencyPanel: () => cy.findByTestId("graph-dependency-panel"),-};diff --git a/e2e/support/helpers/e2e-dependency-helpers.ts b/e2e/support/helpers/e2e-dependency-helpers.tsnew file mode 100644index 00000000000..de761f83d47--- /dev/null+++ b/e2e/support/helpers/e2e-dependency-helpers.ts@@ -0,0 +1,31 @@+export const DependencyGraph = {+ graph: () => cy.findByTestId("dependency-graph"),+ entryButton: () => cy.findByTestId("graph-entry-button"),+ entrySearchInput: () => cy.findByTestId("graph-entry-search-input"),+ selectionButton: () => cy.findByTestId("graph-selection-button"),+ dependencyPanel: () => cy.findByTestId("graph-dependency-panel"),+};++export const DependencyDiagnostics = {+ visitBrokenDependencies: () =>+ cy.visit("/data-studio/dependency-diagnostics/broken"),+ visitUnreferencedEntities: () =>+ cy.visit("/data-studio/dependency-diagnostics/unreferenced"),+ list: () => cy.findByTestId("dependency-list"),+ searchInput: () => cy.findByTestId("dependency-list-search-input"),+ filterButton: () => cy.findByTestId("dependency-filter-button"),+ sidebar: () => cy.findByTestId("dependency-list-sidebar"),++ Sidebar: {+ get: () => cy.findByTestId("dependency-list-sidebar"),+ header: () => cy.findByTestId("dependency-list-sidebar-header"),+ locationSection: () => cy.findByRole("region", { name: "Location" }),+ transformSection: () => cy.findByRole("region", { name: "Transform" }),+ missingColumnsSection: () =>+ cy.findByRole("region", { name: "Missing columns" }),+ creationSection: () =>+ cy.findByRole("region", { name: "Creator and last editor" }),+ brokenDependentsSection: () =>+ cy.findByRole("region", { name: "Broken dependents" }),+ },+};diff --git a/e2e/support/helpers/index.ts b/e2e/support/helpers/index.tsindex abdd3dcb8a8..61517cff7d6 100644--- a/e2e/support/helpers/index.ts+++ b/e2e/support/helpers/index.ts@@ -16,7 +16,7 @@ export * from "./e2e-dashboard-visualizer-helpers";export * from "./e2e-database-metadata-helpers";export * from "./e2e-datamodel-helpers";export * from "./e2e-data-studio-helpers";-export * from "./e2e-dependency-graph-helpers";+export * from "./e2e-dependency-helpers";export * from "./e2e-detail-view-helpers";export * from "./e2e-dimension-list-helpers";export * from "./e2e-document-helpers";diff --git a/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.tsindex c85fbf4b41a..3c255b78a7c 100644--- a/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts@@ -90,7 +90,7 @@ describe("scenarios > dependencies > broken list", () => {describe("analysis", () => {it("should show broken dependencies", () => {- H.DataStudio.Tasks.visitBrokenEntities();+ H.DependencyDiagnostics.visitBrokenDependencies();checkList({visibleEntities: BROKEN_DEPENDENCIES,hiddenEntities: BROKEN_DEPENDENTS,@@ -100,10 +100,10 @@ describe("scenarios > dependencies > broken list", () => {describe("sidebar", () => {it("should show broken dependents", () => {- H.DataStudio.Tasks.visitBrokenEntities();+ H.DependencyDiagnostics.visitBrokenDependencies();cy.log("table dependents");- H.DataStudio.Tasks.list().findByText(TABLE_DISPLAY_NAME).click();+ H.DependencyDiagnostics.list().findByText(TABLE_DISPLAY_NAME).click();checkSidebar({entityName: TABLE_DISPLAY_NAME,transformName: TABLE_TRANSFORM,@@ -112,7 +112,7 @@ describe("scenarios > dependencies > broken list", () => {});cy.log("question dependents");- H.DataStudio.Tasks.list().findByText(TABLE_BASED_QUESTION).click();+ H.DependencyDiagnostics.list().findByText(TABLE_BASED_QUESTION).click();checkSidebar({entityName: TABLE_BASED_QUESTION,missingColumns: ["PRICE"],@@ -120,7 +120,7 @@ describe("scenarios > dependencies > broken list", () => {});cy.log("model dependents");- H.DataStudio.Tasks.list().findByText(TABLE_BASED_MODEL).click();+ H.DependencyDiagnostics.list().findByText(TABLE_BASED_MODEL).click();checkSidebar({entityName: TABLE_BASED_MODEL,missingColumns: ["AMOUNT"],@@ -131,8 +131,8 @@ describe("scenarios > dependencies > broken list", () => {describe("search", () => {it("should search for entities", () => {- H.DataStudio.Tasks.visitBrokenEntities();- H.DataStudio.Tasks.searchInput().type(TABLE_DISPLAY_NAME);+ H.DependencyDiagnostics.visitBrokenDependencies();+ H.DependencyDiagnostics.searchInput().type(TABLE_DISPLAY_NAME);checkList({visibleEntities: [TABLE_DISPLAY_NAME],hiddenEntities: [TABLE_BASED_QUESTION, TABLE_BASED_MODEL],@@ -142,8 +142,8 @@ describe("scenarios > dependencies > broken list", () => {describe("filtering", () => {it("should filter entities by type", () => {- H.DataStudio.Tasks.visitBrokenEntities();- H.DataStudio.Tasks.filterButton().click();+ H.DependencyDiagnostics.visitBrokenDependencies();+ H.DependencyDiagnostics.filterButton().click();H.popover().within(() => {cy.findByText("Table").click();cy.findByText("Question").click();@@ -188,8 +188,8 @@ describe("scenarios > dependencies > broken list", () => {});it("should filter entities by location", () => {- H.DataStudio.Tasks.visitBrokenEntities();- H.DataStudio.Tasks.filterButton().click();+ H.DependencyDiagnostics.visitBrokenDependencies();+ H.DependencyDiagnostics.filterButton().click();H.popover().within(() => {cy.findByText("Include items in personal collections").click();});@@ -205,7 +205,7 @@ describe("scenarios > dependencies > broken list", () => {describe("sorting", () => {it("should sort by name", () => {- H.DataStudio.Tasks.visitBrokenEntities();+ H.DependencyDiagnostics.visitBrokenDependencies();cy.log("sorted by name by default");checkListSorting({@@ -213,39 +213,39 @@ describe("scenarios > dependencies > broken list", () => {});cy.log("sorted by name ascending");- H.DataStudio.Tasks.list().findByText("Dependency").click();+ H.DependencyDiagnostics.list().findByText("Dependency").click();checkListSorting({visibleEntities: BROKEN_DEPENDENCIES_SORTED_BY_NAME,});cy.log("sorted by name descending");- H.DataStudio.Tasks.list().findByText("Dependency").click();+ H.DependencyDiagnostics.list().findByText("Dependency").click();checkListSorting({visibleEntities: [...BROKEN_DEPENDENCIES_SORTED_BY_NAME].reverse(),});});it("should sort by location", () => {- H.DataStudio.Tasks.visitBrokenEntities();+ H.DependencyDiagnostics.visitBrokenDependencies();cy.log("sorted by location ascending");- H.DataStudio.Tasks.list().findByText("Location").click();+ H.DependencyDiagnostics.list().findByText("Location").click();checkListSorting({visibleEntities: BROKEN_DEPENDENCIES_SORTED_BY_LOCATION,});cy.log("sorted by location descending");- H.DataStudio.Tasks.list().findByText("Location").click();+ H.DependencyDiagnostics.list().findByText("Location").click();checkListSorting({visibleEntities: [...BROKEN_DEPENDENCIES_SORTED_BY_LOCATION].reverse(),});});it("should sort by dependents errors", () => {- H.DataStudio.Tasks.visitBrokenEntities();+ H.DependencyDiagnostics.visitBrokenDependencies();cy.log("sorted by dependents errors ascending");- H.DataStudio.Tasks.list().findByText("Problems").click();+ H.DependencyDiagnostics.list().findByText("Problems").click();checkListSorting({visibleEntities: [...BROKEN_DEPENDENTS_SORTED_BY_DEPENDENTS_ERRORS,@@ -253,17 +253,17 @@ describe("scenarios > dependencies > broken list", () => {});cy.log("sorted by dependents errors descending");- H.DataStudio.Tasks.list().findByText("Problems").click();+ H.DependencyDiagnostics.list().findByText("Problems").click();checkListSorting({visibleEntities: BROKEN_DEPENDENTS_SORTED_BY_DEPENDENTS_ERRORS,});});it("should sort by dependents with errors", () => {- H.DataStudio.Tasks.visitBrokenEntities();+ H.DependencyDiagnostics.visitBrokenDependencies();cy.log("sorted by dependents with errors ascending");- H.DataStudio.Tasks.list().findByText("Broken dependents").click();+ H.DependencyDiagnostics.list().findByText("Broken dependents").click();checkListSorting({visibleEntities: [...BROKEN_DEPENDENTS_SORTED_BY_DEPENDENTS_WITH_ERRORS,@@ -271,7 +271,7 @@ describe("scenarios > dependencies > broken list", () => {});cy.log("sorted by dependents with errors descending");- H.DataStudio.Tasks.list().findByText("Broken dependents").click();+ H.DependencyDiagnostics.list().findByText("Broken dependents").click();checkListSorting({visibleEntities: BROKEN_DEPENDENTS_SORTED_BY_DEPENDENTS_WITH_ERRORS,});@@ -484,7 +484,7 @@ function checkList({visibleEntities?: string[];hiddenEntities?: string[];}) {- H.DataStudio.Tasks.list().within(() => {+ H.DependencyDiagnostics.list().within(() => {visibleEntities.forEach((name) => {cy.findByText(name).should("exist");});@@ -505,24 +505,24 @@ function checkSidebar({missingColumns?: string[];brokenDependents?: string[];}) {- H.DataStudio.Tasks.sidebar().within(() => {- H.DataStudio.Tasks.Sidebar.header()+ H.DependencyDiagnostics.sidebar().within(() => {+ H.DependencyDiagnostics.Sidebar.header().findByText(entityName).should("be.visible");if (transformName) {- H.DataStudio.Tasks.Sidebar.transformSection()+ H.DependencyDiagnostics.Sidebar.transformSection().findByText(transformName).should("exist");}if (missingColumns) {- H.DataStudio.Tasks.Sidebar.missingColumnsSection().within(() => {+ H.DependencyDiagnostics.Sidebar.missingColumnsSection().within(() => {missingColumns.forEach((column) => {cy.findByText(column).should("exist");});});}if (brokenDependents) {- H.DataStudio.Tasks.Sidebar.brokenDependentsSection().within(() => {+ H.DependencyDiagnostics.Sidebar.brokenDependentsSection().within(() => {brokenDependents.forEach((dependent) => {cy.findByText(dependent).should("exist");});@@ -532,7 +532,7 @@ function checkSidebar({}function checkListSorting({ visibleEntities }: { visibleEntities: string[] }) {- H.DataStudio.Tasks.list().within(() => {+ H.DependencyDiagnostics.list().within(() => {visibleEntities.forEach((name, index) => {cy.findByText(name).parents("[data-index]")diff --git a/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.tsindex 54c4c3e92de..7c6244f45c3 100644--- a/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts@@ -104,8 +104,8 @@ describe("scenarios > dependencies > unreferenced list", () => {describe("analysis", () => {it("should show unreferenced entities", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();- H.DataStudio.Tasks.list().within(() => {+ H.DependencyDiagnostics.visitUnreferencedEntities();+ H.DependencyDiagnostics.list().within(() => {ENTITY_NAMES.forEach((name) => {cy.findByText(name).should("be.visible");});@@ -114,8 +114,8 @@ describe("scenarios > dependencies > unreferenced list", () => {it("should not show referenced entities", () => {createEntities({ withReferences: true });- H.DataStudio.Tasks.visitUnreferencedEntities();- H.DataStudio.Tasks.list().within(() => {+ H.DependencyDiagnostics.visitUnreferencedEntities();+ H.DependencyDiagnostics.list().within(() => {ENTITY_NAMES.forEach((name) => {cy.findByText(name).should("not.exist");});@@ -126,8 +126,10 @@ describe("scenarios > dependencies > unreferenced list", () => {describe("search", () => {it("should search for entities", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();- H.DataStudio.Tasks.searchInput().type(MODEL_FOR_QUESTION_DATA_SOURCE);+ H.DependencyDiagnostics.visitUnreferencedEntities();+ H.DependencyDiagnostics.searchInput().type(+ MODEL_FOR_QUESTION_DATA_SOURCE,+ );checkList({visibleEntities: [MODEL_FOR_QUESTION_DATA_SOURCE],hiddenEntities: [MODEL_FOR_MODEL_DATA_SOURCE],@@ -136,8 +138,8 @@ describe("scenarios > dependencies > unreferenced list", () => {it("should search for entities with type filters", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();- H.DataStudio.Tasks.searchInput().type("tag");+ H.DependencyDiagnostics.visitUnreferencedEntities();+ H.DependencyDiagnostics.searchInput().type("tag");checkList({visibleEntities: [MODEL_FOR_NATIVE_QUESTION_CARD_TAG,@@ -146,7 +148,7 @@ describe("scenarios > dependencies > unreferenced list", () => {hiddenEntities: [MODEL_FOR_QUESTION_DATA_SOURCE],});- H.DataStudio.Tasks.filterButton().click();+ H.DependencyDiagnostics.filterButton().click();H.popover().findByText("Snippet").click();checkList({visibleEntities: [MODEL_FOR_NATIVE_QUESTION_CARD_TAG],@@ -158,10 +160,10 @@ describe("scenarios > dependencies > unreferenced list", () => {describe("filters", () => {it("should filter entities by type", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();+ H.DependencyDiagnostics.visitUnreferencedEntities();checkList({ visibleEntities: ENTITY_NAMES });- H.DataStudio.Tasks.filterButton().click();+ H.DependencyDiagnostics.filterButton().click();H.popover().findByText("Model").click();checkList({ hiddenEntities: [MODEL_FOR_NATIVE_QUESTION_CARD_TAG] });@@ -188,7 +190,7 @@ describe("scenarios > dependencies > unreferenced list", () => {it("should filter by location", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();+ H.DependencyDiagnostics.visitUnreferencedEntities();checkList({visibleEntities: [MODEL_FOR_MODEL_DATA_SOURCE,@@ -197,7 +199,7 @@ describe("scenarios > dependencies > unreferenced list", () => {],});- H.DataStudio.Tasks.filterButton().click();+ H.DependencyDiagnostics.filterButton().click();H.popover().findByText("Include items in personal collections").click();checkList({visibleEntities: [@@ -221,8 +223,8 @@ describe("scenarios > dependencies > unreferenced list", () => {describe("sorting", () => {it("should sort by name", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();- H.DataStudio.Tasks.searchInput().type("Model for");+ H.DependencyDiagnostics.visitUnreferencedEntities();+ H.DependencyDiagnostics.searchInput().type("Model for");cy.log("sorted by name by default");checkListSorting({@@ -230,13 +232,13 @@ describe("scenarios > dependencies > unreferenced list", () => {});cy.log("sorted by name ascending");- H.DataStudio.Tasks.list().findByText("Name").click();+ H.DependencyDiagnostics.list().findByText("Name").click();checkListSorting({visibleEntities: MODELS_SORTED_BY_NAME,});cy.log("sorted by name descending");- H.DataStudio.Tasks.list().findByText("Name").click();+ H.DependencyDiagnostics.list().findByText("Name").click();checkListSorting({visibleEntities: [...MODELS_SORTED_BY_NAME].reverse(),});@@ -244,17 +246,17 @@ describe("scenarios > dependencies > unreferenced list", () => {it("should sort by location", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();- H.DataStudio.Tasks.searchInput().type("Model for");+ H.DependencyDiagnostics.visitUnreferencedEntities();+ H.DependencyDiagnostics.searchInput().type("Model for");cy.log("sorted by location ascending");- H.DataStudio.Tasks.list().findByText("Location").click();+ H.DependencyDiagnostics.list().findByText("Location").click();checkListSorting({visibleEntities: MODELS_SORTED_BY_LOCATION,});cy.log("sorted by location descending");- H.DataStudio.Tasks.list().findByText("Location").click();+ H.DependencyDiagnostics.list().findByText("Location").click();checkListSorting({visibleEntities: [...MODELS_SORTED_BY_LOCATION].reverse(),});@@ -264,9 +266,9 @@ describe("scenarios > dependencies > unreferenced list", () => {describe("sidebar", () => {it("should show the sidebar for supported entities", () => {createEntities();- H.DataStudio.Tasks.visitUnreferencedEntities();+ H.DependencyDiagnostics.visitUnreferencedEntities();- H.DataStudio.Tasks.list()+ H.DependencyDiagnostics.list().findByText(MODEL_FOR_QUESTION_DATA_SOURCE).click();checkSidebar({@@ -275,21 +277,25 @@ describe("scenarios > dependencies > unreferenced list", () => {creatorName: "Bobby Tables",});- H.DataStudio.Tasks.list().findByText(MODEL_FOR_MODEL_DATA_SOURCE).click();+ H.DependencyDiagnostics.list()+ .findByText(MODEL_FOR_MODEL_DATA_SOURCE)+ .click();checkSidebar({entityName: MODEL_FOR_MODEL_DATA_SOURCE,locationName: "First collection",creatorName: "Bobby Tables",});- H.DataStudio.Tasks.list().findByText(SEGMENT_FOR_QUESTION_FILTER).click();+ H.DependencyDiagnostics.list()+ .findByText(SEGMENT_FOR_QUESTION_FILTER)+ .click();checkSidebar({entityName: SEGMENT_FOR_QUESTION_FILTER,locationName: "Orders",creatorName: "Bobby Tables",});- H.DataStudio.Tasks.list()+ H.DependencyDiagnostics.list().findByText(METRIC_FOR_QUESTION_AGGREGATION).click();checkSidebar({@@ -298,7 +304,7 @@ describe("scenarios > dependencies > unreferenced list", () => {creatorName: "Bobby Tables",});- H.DataStudio.Tasks.list()+ H.DependencyDiagnostics.list().findByText(METRIC_FOR_MODEL_AGGREGATION).click();checkSidebar({@@ -307,7 +313,7 @@ describe("scenarios > dependencies > unreferenced list", () => {creatorName: "Bobby Tables",});- H.DataStudio.Tasks.list()+ H.DependencyDiagnostics.list().findByText(SNIPPET_FOR_NATIVE_QUESTION_CARD_TAG).click();checkSidebar({@@ -986,7 +992,7 @@ function checkList({visibleEntities?: string[];hiddenEntities?: string[];}) {- H.DataStudio.Tasks.list().within(() => {+ H.DependencyDiagnostics.list().within(() => {visibleEntities.forEach((name) => {cy.findByText(name).should("be.visible");});@@ -997,7 +1003,7 @@ function checkList({}function checkListSorting({ visibleEntities }: { visibleEntities: string[] }) {- H.DataStudio.Tasks.list().within(() => {+ H.DependencyDiagnostics.list().within(() => {visibleEntities.forEach((name, index) => {cy.findByText(name).parents("[data-index]")@@ -1015,17 +1021,17 @@ function checkSidebar({locationName?: string;creatorName?: string;}) {- H.DataStudio.Tasks.sidebar().within(() => {- H.DataStudio.Tasks.Sidebar.header()+ H.DependencyDiagnostics.sidebar().within(() => {+ H.DependencyDiagnostics.Sidebar.header().findByText(entityName).should("be.visible");if (locationName) {- H.DataStudio.Tasks.Sidebar.locationSection()+ H.DependencyDiagnostics.Sidebar.locationSection().findByText(locationName).should("be.visible");}if (creatorName) {- H.DataStudio.Tasks.Sidebar.creationSection().should(+ H.DependencyDiagnostics.Sidebar.creationSection().should("contain.text",creatorName,);diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj b/enterprise/backend/src/metabase_enterprise/dependencies/api.cljindex e8b3875889d..cf86906654d 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj@@ -768,20 +768,28 @@(:segment :measure) :table.display_name)}))(defn- query-type-join-and-filter- [query-type entity-type]+ [query-type entity-type {:keys [include-archived-items]}](case query-type:unreferenced {:join [:dependency [:and[:= :dependency.to_entity_id :entity.id]- [:= :dependency.to_entity_type (name entity-type)]]]- :filter [:= :dependency.id nil]}+ [:= :dependency.to_entity_type (name entity-type)]+ (visible-entities-filter-clause+ :dependency.from_entity_type+ :dependency.from_entity_id+ {:include-archived-items include-archived-items})]]+ :join-filter [:= :dependency.id nil]}:broken {:join [:analysis_finding [:and[:= :analysis_finding.analyzed_entity_id :entity.id][:= :analysis_finding.analyzed_entity_type (name entity-type)]]]- :filter [:= :analysis_finding.result false]}+ :join-filter [:= :analysis_finding.result false]}:breaking {:join [:analysis_finding_error [:and[:= :analysis_finding_error.source_entity_id :entity.id]- [:= :analysis_finding_error.source_entity_type (name entity-type)]]]- :filter [:!= :analysis_finding_error.id nil]}))+ [:= :analysis_finding_error.source_entity_type (name entity-type)]+ (visible-entities-filter-clause+ :analysis_finding_error.analyzed_entity_type+ :analysis_finding_error.analyzed_entity_id+ {:include-archived-items include-archived-items})]]+ :join-filter [:!= :analysis_finding_error.id nil]}))(defn- location-joins-for-entity"Returns the set of join keywords needed for location-based operations."@@ -877,11 +885,14 @@(:table joins) (conj [:metabase_table :table] [:= :entity.table_id :table.id])))(defn- dependency-items-query- [{:keys [query-type entity-type sort-column] :as params}]+ [{:keys [query-type entity-type sort-column include-archived-items] :as params}](let [{:keys [table-name name-column location-column] :as config} (entity-type-config entity-type)- {:keys [join filter]} (query-type-join-and-filter query-type entity-type)+ {:keys [join join-filter]} (query-type-join-and-filter query-type entity-type+ {:include-archived-items include-archived-items}){:keys [filters filter-joins]} (build-optional-filters params config){:keys [sort-column sort-joins]} (sort-key-cols-and-joins sort-column entity-type name-column location-column)+ visible-filter (visible-entities-filter-clause (name entity-type) :entity.id+ {:include-archived-items include-archived-items})all-required-joins (set/union filter-joins sort-joins)select-clause [[[:inline (name entity-type)] :entity_type][:entity.id :entity_id]@@ -889,7 +900,7 @@{(if (= query-type :breaking) :select-distinct :select) select-clause:from [[table-name :entity]]:left-join (build-left-joins join all-required-joins)- :where (into [:and filter] (keep identity) filters)}))+ :where (into [:and join-filter visible-filter] (keep identity) filters)}))(def ^:private breaking-items-sort-columns"Valid sort columns for /graph/broken and /graph/unreferenced endpoints."diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.cljindex f468ebc9eea..dd681102808 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj@@ -2496,3 +2496,50 @@;; BUG: Without fix, this fails because sort counts total errors (A=3, B=2);; so B comes first. With fix, sort counts visible errors (A=1, B=2) so A comes first.(is (= (:id model-card-a) (-> asc-response :data first :id)))))))))))++(deftest ^:sequential unreferenced-pagination-with-archived-items-test+ (testing "GET /api/ee/dependencies/graph/unreferenced - pagination works correctly with archived items"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Dependency]+ (mt/with-temp [:model/Card _ {:name "A Card - unreftest" :archived true}+ :model/Card {card2-id :id} {:name "B Card - unreftest"}+ :model/Card {card3-id :id} {:name "C Card - unreftest"}]+ (while (#'dependencies.backfill/backfill-dependencies!))+ (let [response (mt/user-http-request :crowberto :get 200+ "ee/dependencies/graph/unreferenced"+ :types "card"+ :query "unreftest"+ :offset 0+ :limit 2+ :sort_column "name"+ :sort_direction "asc")]+ (is (=? {:data [{:id card2-id} {:id card3-id}]+ :total 2+ :offset 0+ :limit 2}+ response))))))))++(deftest ^:sequential unreferenced-pagination-with-archived-dependents-test+ (testing "GET /api/ee/dependencies/graph/unreferenced - should return items if all dependents are archived"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Dependency]+ (mt/with-temp [:model/Card {card1-id :id, :as card1} {:name "A Card - unreftest"}+ :model/Card card2 {:name "B Card - unreftest"}+ :model/Card _ {:name "C Card - unreftest"+ :dataset_query (wrap-card-query card1)+ :archived true}+ :model/Card {card4-id :id} {:name "D Card - unreftest"+ :dataset_query (wrap-card-query card2)}+ :model/Card _ {:name "E Card - unreftest"+ :dataset_query (wrap-card-query card2)+ :archived true}]+ (while (#'dependencies.backfill/backfill-dependencies!))+ (let [response (mt/user-http-request :crowberto :get 200+ "ee/dependencies/graph/unreferenced"+ :types "card"+ :query "unreftest"+ :sort_column "name"+ :sort_direction "asc")]+ (is (=? {:data [{:id card1-id}, {:id card4-id}]+ :total 2}+ response))))))))diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex 1f1a3ac0794..fda3346f50d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -150,8 +150,8 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {<DataStudioTablabel={t`Dependency diagnostics`}icon="search_check"- to={Urls.dependencyTasks()}- isSelected={currentTab === "tasks"}+ to={Urls.dependencyDiagnostics()}+ isSelected={currentTab === "dependency-diagnostics"}showLabel={isNavbarOpened}/>)}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.tsindex f178e40e603..d568c062654 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts@@ -6,8 +6,8 @@ type TabName =| "transforms"| "jobs"| "runs"- | "tasks"| "dependencies"+ | "dependency-diagnostics"| "glossary";export const getCurrentTab = (pathname: string): TabName => {@@ -16,10 +16,10 @@ export const getCurrentTab = (pathname: string): TabName => {return "glossary";case pathname.startsWith(Urls.transformJobList()):return "jobs";- case pathname.startsWith(Urls.dependencyTasks()):- return "tasks";case pathname.startsWith(Urls.dependencyGraph()):return "dependencies";+ case pathname.startsWith(Urls.dependencyDiagnostics()):+ return "dependency-diagnostics";case pathname.startsWith(Urls.dataStudioLibrary()):return "library";case pathname.startsWith(Urls.transformRunList()):diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.tsindex 87f3a4c9143..7d95447601e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts@@ -2,28 +2,28 @@ import { getCurrentTab } from "./utils";describe("getCurrentTab", () => {it.each`- pathname | expectedTab- ${"/data-studio/glossary"} | ${"glossary"}- ${"/data-studio/glossary/some-path"} | ${"glossary"}- ${"/data-studio/transforms/jobs"} | ${"jobs"}- ${"/data-studio/transforms/jobs/123"} | ${"jobs"}- ${"/data-studio/transforms/jobs/new"} | ${"jobs"}- ${"/data-studio/dependencies"} | ${"dependencies"}- ${"/data-studio/dependencies?id=1&type=card"} | ${"dependencies"}- ${"/data-studio/tasks"} | ${"tasks"}- ${"/data-studio/tasks/broken"} | ${"tasks"}- ${"/data-studio/tasks/unreferenced"} | ${"tasks"}- ${"/data-studio/library"} | ${"library"}- ${"/data-studio/library/collections/123"} | ${"library"}- ${"/data-studio/library/metrics/456"} | ${"library"}- ${"/data-studio/transforms/runs"} | ${"runs"}- ${"/data-studio/transforms/runs?page=2"} | ${"runs"}- ${"/data-studio/transforms"} | ${"transforms"}- ${"/data-studio/transforms/123"} | ${"transforms"}- ${"/data-studio/transforms/new/query"} | ${"transforms"}- ${"/data-studio/data"} | ${"data"}- ${"/data-studio/data/database/1"} | ${"data"}- ${"/data-studio"} | ${"data"}+ pathname | expectedTab+ ${"/data-studio/glossary"} | ${"glossary"}+ ${"/data-studio/glossary/some-path"} | ${"glossary"}+ ${"/data-studio/transforms/jobs"} | ${"jobs"}+ ${"/data-studio/transforms/jobs/123"} | ${"jobs"}+ ${"/data-studio/transforms/jobs/new"} | ${"jobs"}+ ${"/data-studio/dependencies"} | ${"dependencies"}+ ${"/data-studio/dependencies?id=1&type=card"} | ${"dependencies"}+ ${"/data-studio/dependency-diagnostics"} | ${"dependency-diagnostics"}+ ${"/data-studio/dependency-diagnostics/broken"} | ${"dependency-diagnostics"}+ ${"/data-studio/dependency-diagnostics/unreferenced"} | ${"dependency-diagnostics"}+ ${"/data-studio/library"} | ${"library"}+ ${"/data-studio/library/collections/123"} | ${"library"}+ ${"/data-studio/library/metrics/456"} | ${"library"}+ ${"/data-studio/transforms/runs"} | ${"runs"}+ ${"/data-studio/transforms/runs?page=2"} | ${"runs"}+ ${"/data-studio/transforms"} | ${"transforms"}+ ${"/data-studio/transforms/123"} | ${"transforms"}+ ${"/data-studio/transforms/new/query"} | ${"transforms"}+ ${"/data-studio/data"} | ${"data"}+ ${"/data-studio/data/database/1"} | ${"data"}+ ${"/data-studio"} | ${"data"}`("should return '$expectedTab' for pathname '$pathname'",({ pathname, expectedTab }) => {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TasksSectionLayout/TasksSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsxsimilarity index 66%rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TasksSectionLayout/TasksSectionLayout.tsxrename to enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsxindex 7bf5e2927eb..f0544b74a82 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TasksSectionLayout/TasksSectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx@@ -5,11 +5,13 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { SectionLayout } from "../../components/SectionLayout";-type TasksSectionLayoutProps = {+type DependencyDiagnosticsSectionLayoutProps = {children?: ReactNode;};-export function TasksSectionLayout({ children }: TasksSectionLayoutProps) {+export function DependencyDiagnosticsSectionLayout({+ children,+}: DependencyDiagnosticsSectionLayoutProps) {usePageTitle(t`Dependency diagnostics`);return <SectionLayout>{children}</SectionLayout>;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/index.tsnew file mode 100644index 00000000000..e07baaef43d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/index.ts@@ -0,0 +1 @@+export * from "./DependencyDiagnosticsSectionLayout";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TasksSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TasksSectionLayout/index.tsdeleted file mode 100644index 7a5a8f6a7d6..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TasksSectionLayout/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./TasksSectionLayout";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsxindex 7581f6703f8..6fd4610a32d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx@@ -13,8 +13,8 @@ import type { State } from "metabase-types/store";import { DataSectionLayout } from "./app/pages/DataSectionLayout";import { DataStudioLayout } from "./app/pages/DataStudioLayout";import { DependenciesSectionLayout } from "./app/pages/DependenciesSectionLayout";+import { DependencyDiagnosticsSectionLayout } from "./app/pages/DependencyDiagnosticsSectionLayout";import { LibrarySectionLayout } from "./app/pages/LibrarySectionLayout";-import { TasksSectionLayout } from "./app/pages/TasksSectionLayout";import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";import { getDataStudioMetadataRoutes } from "./data-model/routes";import { getDataStudioGlossaryRoutes } from "./glossary/routes";@@ -58,13 +58,16 @@ export function getDataStudioRoutes({getDataStudioSnippetRoutes()}</Route>{PLUGIN_DEPENDENCIES.isEnabled && (- <Route path="tasks" component={TasksSectionLayout}>- {PLUGIN_DEPENDENCIES.getDataStudioTasksRoutes()}+ <Route path="dependencies" component={DependenciesSectionLayout}>+ {PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes()}</Route>)}{PLUGIN_DEPENDENCIES.isEnabled && (- <Route path="dependencies" component={DependenciesSectionLayout}>- {PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes()}+ <Route+ path="dependency-diagnostics"+ component={DependencyDiagnosticsSectionLayout}+ >+ {PLUGIN_DEPENDENCIES.getDataStudioDependencyDiagnosticsRoutes()}</Route>)}</Route>diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsxindex 5d5d91d4f44..3292adba4b5 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx@@ -70,7 +70,7 @@ export function DependencyList({limit: PAGE_SIZE,});- const { ref, width } = useElementSize();+ const { ref: containerRef, width: containerWidth } = useElementSize();const [isResizing, { open: startResizing, close: stopResizing }] =useDisclosure();@@ -83,13 +83,19 @@ export function DependencyList({: undefined;const handleQueryChange = (query: string | undefined) => {- onParamsChange({ ...params, query });+ onParamsChange({ ...params, query, page: undefined });};- const handleFilterOptionsChange = (- filterOptions: DependencyFilterOptions,- ) => {- onParamsChange({ ...params, ...filterOptions });+ const handleFilterOptionsChange = ({+ groupTypes,+ includePersonalCollections,+ }: DependencyFilterOptions) => {+ onParamsChange({+ ...params,+ groupTypes,+ includePersonalCollections,+ page: undefined,+ });};const handleSortOptionsChange = (@@ -99,6 +105,7 @@ export function DependencyList({...params,sortColumn: sortOptions?.column,sortDirection: sortOptions?.direction,+ page: undefined,});};@@ -115,7 +122,7 @@ export function DependencyList({return (<FlexclassName={cx({ [S.resizing]: isResizing })}- ref={ref}+ ref={containerRef}h="100%"wrap="nowrap">@@ -155,7 +162,7 @@ export function DependencyList({{selectedNode != null && (<ListSidebarnode={selectedNode}- containerWidth={width}+ containerWidth={containerWidth}onResizeStart={startResizing}onResizeStop={stopResizing}onClose={() => setSelectedEntry(undefined)}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/index.tsindex c267d398093..5f0d87b7682 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts@@ -10,8 +10,8 @@ import { useCheckTransformDependencies } from "./hooks/use-check-transform-depenimport { useGetDependenciesCount } from "./hooks/use-get-dependencies-count";import { DependencyGraphPage } from "./pages/DependencyGraphPage";import {+ getDataStudioDependencyDiagnosticsRoutes,getDataStudioDependencyRoutes,- getDataStudioTasksRoutes,} from "./routes";/**@@ -22,7 +22,8 @@ export function initializePlugin() {PLUGIN_DEPENDENCIES.isEnabled = true;PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes =getDataStudioDependencyRoutes;- PLUGIN_DEPENDENCIES.getDataStudioTasksRoutes = getDataStudioTasksRoutes;+ PLUGIN_DEPENDENCIES.getDataStudioDependencyDiagnosticsRoutes =+ getDataStudioDependencyDiagnosticsRoutes;PLUGIN_DEPENDENCIES.DependencyGraphPage = DependencyGraphPage;PLUGIN_DEPENDENCIES.CheckDependenciesForm = CheckDependenciesForm;PLUGIN_DEPENDENCIES.CheckDependenciesModal = CheckDependenciesModal;diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsxindex e6a26fb425e..b5d948a27ca 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx@@ -10,7 +10,7 @@ export function getDataStudioDependencyRoutes() {return <IndexRoute component={DependencyGraphPage} />;}-export function getDataStudioTasksRoutes() {+export function getDataStudioDependencyDiagnosticsRoutes() {return (<><IndexRedirect to="broken" />diff --git a/frontend/src/metabase/lib/urls/dependencies.ts b/frontend/src/metabase/lib/urls/dependencies.tsindex 6b807c98d61..cdb452671e7 100644--- a/frontend/src/metabase/lib/urls/dependencies.ts+++ b/frontend/src/metabase/lib/urls/dependencies.ts@@ -7,7 +7,7 @@ import type {const BASE_URL = `/data-studio`;const GRAPH_URL = `${BASE_URL}/dependencies`;-const TASKS_URL = `${BASE_URL}/tasks`;+const DIAGNOSTICS_URL = `${BASE_URL}/dependency-diagnostics`;export type DependencyGraphParams = {entry?: DependencyEntry;@@ -27,8 +27,8 @@ export function dependencyGraph({return queryString.length > 0 ? `${baseUrl}?${queryString}` : baseUrl;}-export function dependencyTasks() {- return TASKS_URL;+export function dependencyDiagnostics() {+ return DIAGNOSTICS_URL;}export type DependencyListParams = {@@ -79,9 +79,9 @@ function dependencyListQueryString({}export function brokenDependencies(params?: DependencyListParams) {- return `${dependencyTasks()}/broken${dependencyListQueryString(params)}`;+ return `${dependencyDiagnostics()}/broken${dependencyListQueryString(params)}`;}export function unreferencedDependencies(params?: DependencyListParams) {- return `${dependencyTasks()}/unreferenced${dependencyListQueryString(params)}`;+ return `${dependencyDiagnostics()}/unreferenced${dependencyListQueryString(params)}`;}diff --git a/frontend/src/metabase/plugins/oss/transforms.ts b/frontend/src/metabase/plugins/oss/transforms.tsindex 474b6eb3085..3869e8f648b 100644--- a/frontend/src/metabase/plugins/oss/transforms.ts+++ b/frontend/src/metabase/plugins/oss/transforms.ts@@ -77,7 +77,7 @@ export type PythonTransformsPlugin = {type DependenciesPlugin = {isEnabled: boolean;getDataStudioDependencyRoutes: () => ReactNode;- getDataStudioTasksRoutes: () => ReactNode;+ getDataStudioDependencyDiagnosticsRoutes: () => ReactNode;DependencyGraphPage: ComponentType;DependencyGraphPageContext: Context<DependencyGraphPageContextType>;CheckDependenciesForm: ComponentType<CheckDependenciesFormProps>;@@ -168,7 +168,7 @@ export const PLUGIN_TRANSFORMS_PYTHON = getDefaultPluginTransformsPython();const getDefaultPluginDependencies = (): DependenciesPlugin => ({isEnabled: false,getDataStudioDependencyRoutes: () => null,- getDataStudioTasksRoutes: () => null,+ getDataStudioDependencyDiagnosticsRoutes: () => null,DependencyGraphPage: PluginPlaceholder,DependencyGraphPageContext: createContext({}),CheckDependenciesForm: PluginPlaceholder,