Skip to content

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

Add options to the /graph/dependents endpoint (#68573)

metambenbafd49ee17dc
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index dfc03f74cbf..67d94215356 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -522,6 +522,7 @@
metabase-enterprise.advanced-permissions.models.permissions.application-permissions-test/with-new-group-and-current-graph hooks.common/with-two-top-level-bindings
metabase-enterprise.audit-app.pages-test/with-temp-objects hooks.common/with-one-binding
metabase-enterprise.cache.config-test/with-temp-persist-models hooks.common/with-seven-bindings
+ metabase-enterprise.dependencies.api-test/with-dependents-test! hooks.common/with-two-bindings
metabase-enterprise.metabot-v3.tools.dependencies-test/with-dependent-transforms! hooks.common/with-two-bindings
metabase-enterprise.semantic-search.db.connection/with-migrate-tx hooks.common/let-one-with-optional-value
metabase-enterprise.serialization.api-test/with-serialization-test-data! hooks.common/with-three-bindings
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
index d9a16ad94f5..5f0f6957e2f 100644
--- a/e2e/support/helpers/e2e-data-studio-helpers.ts
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -137,19 +137,19 @@ export const DataStudio = {
cy.visit("/data-studio/tasks/unreferenced"),
list: () => cy.findByTestId("dependency-list"),
searchInput: () => cy.findByTestId("dependency-list-search-input"),
- filterButton: () => cy.findByTestId("dependency-list-filter-button"),
+ 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"),
- locationInfo: () => cy.findByRole("region", { name: "Location" }),
- transformInfo: () => cy.findByRole("region", { name: "Transform" }),
- missingColumnsInfo: () =>
+ locationSection: () => cy.findByRole("region", { name: "Location" }),
+ transformSection: () => cy.findByRole("region", { name: "Transform" }),
+ missingColumnsSection: () =>
cy.findByRole("region", { name: "Missing columns" }),
- creationInfo: () =>
+ creationSection: () =>
cy.findByRole("region", { name: "Creator and last editor" }),
- brokenDependentsInfo: () =>
+ brokenDependentsSection: () =>
cy.findByRole("region", { name: "Broken dependents" }),
},
},
diff --git a/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts
index 4444a4a5bf5..c85fbf4b41a 100644
--- a/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts
@@ -510,19 +510,19 @@ function checkSidebar({
.findByText(entityName)
.should("be.visible");
if (transformName) {
- H.DataStudio.Tasks.Sidebar.transformInfo()
+ H.DataStudio.Tasks.Sidebar.transformSection()
.findByText(transformName)
.should("exist");
}
if (missingColumns) {
- H.DataStudio.Tasks.Sidebar.missingColumnsInfo().within(() => {
+ H.DataStudio.Tasks.Sidebar.missingColumnsSection().within(() => {
missingColumns.forEach((column) => {
cy.findByText(column).should("exist");
});
});
}
if (brokenDependents) {
- H.DataStudio.Tasks.Sidebar.brokenDependentsInfo().within(() => {
+ H.DataStudio.Tasks.Sidebar.brokenDependentsSection().within(() => {
brokenDependents.forEach((dependent) => {
cy.findByText(dependent).should("exist");
});
diff --git a/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts
index 4476bb7fc6e..54c4c3e92de 100644
--- a/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-unreferenced-list.cy.spec.ts
@@ -1020,12 +1020,12 @@ function checkSidebar({
.findByText(entityName)
.should("be.visible");
if (locationName) {
- H.DataStudio.Tasks.Sidebar.locationInfo()
+ H.DataStudio.Tasks.Sidebar.locationSection()
.findByText(locationName)
.should("be.visible");
}
if (creatorName) {
- H.DataStudio.Tasks.Sidebar.creationInfo().should(
+ H.DataStudio.Tasks.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.clj
index 66d7b89923b..3cd403f4a7a 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj
@@ -1,6 +1,7 @@
(ns metabase-enterprise.dependencies.api
(:require
[clojure.set :as set]
+ [clojure.string :as str]
[medley.core :as m]
[metabase-enterprise.dependencies.core :as dependencies]
[metabase-enterprise.dependencies.dependency-types :as deps.dependency-types]
@@ -587,20 +588,84 @@
{:nodes (expanded-nodes downstream-graph nodes {:include-errors? false})
:edges edges})))
+(def ^:private sort-directions
+ "Valid sort directions for dependency item endpoints."
+ #{:asc :desc})
+
+(def ^:private dependents-sort-columns
+ "Valid sort columns for the /graph/dependents endpoint."
+ #{:name :location :view-count})
+
+(defn- entity-name
+ "Returns the name string for an entity based on its type. Might return nil."
+ [entity]
+ (let [data (:data entity)]
+ (case (:type entity)
+ :table (:display_name data)
+ :sandbox nil
+ (:name data))))
+
+(defn- entity-location
+ "Returns the location string for an entity based on its type. Might return nil."
+ [entity]
+ (let [data (:data entity)]
+ (case (:type entity)
+ :card (or (-> data :dashboard :name)
+ (-> data :document :name)
+ (-> data :collection :name))
+ :table (-> data :db :name)
+ (:transform :snippet :dashboard :document) (-> data :collection :name)
+ :sandbox nil
+ (:segment :measure) (-> data :table :display_name)
+ nil)))
+
+(defn- string-matches-query?
+ "Returns true if `s` is a string and its lower-case version contains the string `query`.
+ `query` is expected to be lower-case."
+ [s query]
+ (some-> s u/lower-case-en (str/includes? query)))
+
+(defn- entity-matches-query?
+ "Returns true if `entity`'s name or location contains the string `query` (case-insensitive)."
+ [entity query]
+ (let [q (u/lower-case-en query)]
+ (or (string-matches-query? (entity-name entity) q)
+ (string-matches-query? (entity-location entity) q))))
+
+(defn- in-personal-collection?
+ "Returns true if `entity` is in a personal collection."
+ [entity]
+ (get-in entity [:data :collection :is_personal]))
+
+(defn- sort-dependents
+ "Sort `entities` by `sort-column` in `sort-direction`."
+ [entities sort-column sort-direction]
+ (let [key-fn (case sort-column
+ :name #(some-> (entity-name %) u/lower-case-en)
+ :location #(some-> (entity-location %) u/lower-case-en)
+ :view-count #(or (-> % :data :view_count) 0))
+ comp-fn (cond->> compare
+ (= sort-direction :desc) (comp -))]
+ (sort-by key-fn comp-fn entities)))
+
(def ^:private dependents-args
[:map
- [:id ms/PositiveInt]
- [:type ::deps.dependency-types/dependency-types]
- [:dependent_types {:optional true}
+ [:id ms/PositiveInt]
+ [:type ::deps.dependency-types/dependency-types]
+ [:dependent_types {:optional true}
[:or
::deps.dependency-types/dependency-types
[:sequential ::deps.dependency-types/dependency-types]]]
- [:dependent_card_types {:optional true}
+ [:dependent_card_types {:optional true}
[:or
(ms/enum-decode-keyword lib.schema.metadata/card-types)
[:sequential (ms/enum-decode-keyword lib.schema.metadata/card-types)]]]
- [:archived {:optional true} :boolean]
- [:broken {:optional true} :boolean]])
+ [:archived {:optional true} :boolean]
+ [:broken {:optional true} :boolean]
+ [:query {:optional true} :string]
+ [:include_personal_collections {:optional true} :boolean]
+ [:sort_column {:optional true} (ms/enum-decode-keyword dependents-sort-columns)]
+ [:sort_direction {:optional true} (ms/enum-decode-keyword sort-directions)]])
(api.macros/defendpoint :get "/graph/dependents" :- [:sequential ::entity]
"Returns a list of dependents for the specified entity.
@@ -615,9 +680,17 @@
- `dependent_card_types`: Card types to filter by when dependent_types includes :card.
Ignored if dependent_types doesn't include :card. Example: ?dependent_card_types=question&dependent_card_types=model
- `archived`: Include entities in archived collections (default: false)
- - `broken`: Return only broken entities (default: false)"
+ - `broken`: Return only broken entities (default: false)
+ - `query`: Search string to filter results by name or location (case-insensitive)
+ - `include_personal_collections`: Include items in personal collections (default: false)
+ - `sort_column`: Column to sort by - name, location, or view-count (default: name)
+ - `sort_direction`: Sort direction - asc or desc (default: asc)"
[_route-params
- {:keys [id type dependent_types dependent_card_types archived broken]} :- dependents-args]
+ {:keys [id type dependent_types dependent_card_types archived broken
+ query include_personal_collections sort_column sort_direction]
+ :or {include_personal_collections false
+ sort_column :name
+ sort_direction :asc}} :- dependents-args]
(api/read-check (deps.dependency-types/dependency-type->model type) id)
(lib-be/with-metadata-provider-cache
(let [graph-opts {:include-archived-items (if archived :all :exclude)
@@ -632,14 +705,26 @@
card-types-set (cond
(nil? dependent_card_types) lib.schema.metadata/card-types
(sequential? dependent_card_types) (set dependent_card_types)
- :else #{dependent_card_types})]
- (->> (expanded-nodes downstream-graph nodes {:include-errors? false})
+ :else #{dependent_card_types})
+ dependents-filter
+ (comp
+ ;; Filter by dependent types and card types
(filter (fn [node]
(and (or (nil? dep-types-set)
(contains? dep-types-set (:type node)))
(or (not= (:type node) :card)
(nil? card-types-set)
- (contains? card-types-set (-> node :data :type))))))))))
+ (contains? card-types-set (-> node :data :type))))))
+ ;; Filter out personal collections unless explicitly included
+ (if include_personal_collections
+ identity
+ (remove in-personal-collection?))
+ ;; Filter by query (sandboxes are excluded since they have no name or location)
+ (if query
+ (filter #(entity-matches-query? % query))
+ identity))]
+ (-> (into [] dependents-filter (expanded-nodes downstream-graph nodes {:include-errors? false}))
+ (sort-dependents sort_column sort_direction)))))
(defn- entity-type-config
[entity-type]
@@ -792,14 +877,10 @@
:left-join (build-left-joins join all-required-joins)
:where (into [:and filter] (keep identity) filters)}))
-(def ^:private sort-columns
- "Valid sort columns for dependency item endpoints."
+(def ^:private breaking-items-sort-columns
+ "Valid sort columns for /graph/broken and /graph/unreferenced endpoints."
#{:name :location :dependents-with-errors :dependents-errors})
-(def ^:private sort-directions
- "Valid sort directions for dependency item endpoints."
- #{:asc :desc})
-
(def ^:private dependency-items-args
[:map
[:types {:optional true} [:or
@@ -811,7 +892,7 @@
[:query {:optional true} :string]
[:archived {:optional true} :boolean]
[:include_personal_collections {:optional true} :boolean]
- [:sort_column {:optional true} (ms/enum-decode-keyword sort-columns)]
+ [:sort_column {:optional true} (ms/enum-decode-keyword breaking-items-sort-columns)]
[:sort_direction {:optional true} (ms/enum-decode-keyword sort-directions)]])
(def ^:private dependency-items-response
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
index 46e75c1477d..1481dcc3d25 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
@@ -2147,3 +2147,128 @@
"Card 1 sorterrorstest"]
(= sort-direction :desc) reverse)
names))))))))))
+
+(defn- get-dependents
+ "Helper to call the /graph/dependents endpoint."
+ [base-card-id & opts]
+ (apply mt/user-http-request :crowberto :get 200 "ee/dependencies/graph/dependents"
+ :id base-card-id :type "card" opts))
+
+(defn- create-dependent!
+ "Create a dependent card with the given name."
+ [base-card user card-name & opts]
+ (card/create-card! (apply assoc (wrap-card base-card) :name card-name opts) user))
+
+(defmacro ^:private with-dependents-test!
+ [[user-binding base-card-binding] & body]
+ `(mt/with-premium-features #{:dependencies}
+ (mt/with-model-cleanup [:model/Card :model/Dependency]
+ (mt/with-temp [:model/User user# {:email "[email protected]"}]
+ (let [~user-binding user#
+ ~base-card-binding (card/create-card! (basic-card "Base") user#)]
+ ~@body)))))
+
+(deftest ^:sequential dependents-query-filter-test
+ (testing "GET /api/ee/dependencies/graph/dependents with query parameter"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (create-dependent! base-card user "Alpha")
+ (create-dependent! base-card user "Beta")
+ (create-dependent! base-card user "Gamma")
+ (testing "filters by name"
+ (is (=? [{:data {:name "Alpha"}}]
+ (get-dependents base-card-id :query "Alpha"))))
+ (testing "query is case-insensitive"
+ (is (=? [{:data {:name "Beta"}}]
+ (get-dependents base-card-id :query "BETA"))))
+ (testing "no query returns all dependents"
+ (is (= 3 (count (get-dependents base-card-id))))))))
+
+(deftest ^:sequential dependents-query-filter-by-location-test
+ (testing "GET /api/ee/dependencies/graph/dependents query filters by location (collection name)"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (mt/with-temp [:model/Collection {coll-id :id} {:name "SpecialCollection"}]
+ (create-dependent! base-card user "Card in root")
+ (create-dependent! base-card user "Card in collection" :collection_id coll-id)
+ (is (=? [{:data {:name "Card in collection"}}]
+ (get-dependents base-card-id :query "SpecialCollection")))))))
+
+(deftest ^:sequential dependents-personal-collections-test
+ (testing "GET /api/ee/dependencies/graph/dependents with include_personal_collections parameter"
+ (binding [collection/*allow-deleting-personal-collections* true]
+ (with-dependents-test! [{user-id :id :as user} {base-card-id :id :as base-card}]
+ (mt/with-temp [:model/Collection {personal-coll-id :id} {:personal_owner_id user-id}
+ :model/Collection {sub-coll-id :id} {:location (format "/%d/" personal-coll-id)}]
+ (create-dependent! base-card user "In Personal" :collection_id personal-coll-id)
+ (create-dependent! base-card user "In Sub" :collection_id sub-coll-id)
+ (create-dependent! base-card user "Regular")
+ (testing "default excludes personal collections"
+ (is (=? [{:data {:name "Regular"}}]
+ (get-dependents base-card-id))))
+ (testing "include_personal_collections=true includes them"
+ (is (= 3 (count (get-dependents base-card-id :include_personal_collections true))))))))))
+
+(deftest ^:sequential dependents-sort-by-name-test
+ (testing "GET /api/ee/dependencies/graph/dependents - sorting by name"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (create-dependent! base-card user "C Card")
+ (create-dependent! base-card user "A Card")
+ (create-dependent! base-card user "B Card")
+ (is (=? [{:data {:name "A Card"}} {:data {:name "B Card"}} {:data {:name "C Card"}}]
+ (get-dependents base-card-id :sort_column :name :sort_direction :asc)))
+ (is (=? [{:data {:name "C Card"}} {:data {:name "B Card"}} {:data {:name "A Card"}}]
+ (get-dependents base-card-id :sort_column :name :sort_direction :desc))))))
+
+(deftest ^:sequential dependents-sort-by-location-test
+ (testing "GET /api/ee/dependencies/graph/dependents - sorting by location"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (mt/with-temp [:model/Collection {coll-a :id} {:name "A Collection"}
+ :model/Collection {coll-b :id} {:name "B Collection"}
+ :model/Collection {coll-c :id} {:name "C Collection"}]
+ (create-dependent! base-card user "In C" :collection_id coll-c)
+ (create-dependent! base-card user "In A" :collection_id coll-a)
+ (create-dependent! base-card user "In B" :collection_id coll-b)
+ (is (=? [{:data {:name "In A"}} {:data {:name "In B"}} {:data {:name "In C"}}]
+ (get-dependents base-card-id :sort_column :location :sort_direction :asc)))
+ (is (=? [{:data {:name "In C"}} {:data {:name "In B"}} {:data {:name "In A"}}]
+ (get-dependents base-card-id :sort_column :location :sort_direction :desc)))))))
+
+(deftest ^:sequential dependents-sort-by-view-count-test
+ (testing "GET /api/ee/dependencies/graph/dependents - sorting by view-count"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (let [{low-id :id} (create-dependent! base-card user "Low")
+ {mid-id :id} (create-dependent! base-card user "Mid")
+ {high-id :id} (create-dependent! base-card user "High")]
+ (t2/update! :model/Card low-id {:view_count 10})
+ (t2/update! :model/Card mid-id {:view_count 50})
+ (t2/update! :model/Card high-id {:view_count 100})
+ (is (=? [{:data {:view_count 10}} {:data {:view_count 50}} {:data {:view_count 100}}]
+ (get-dependents base-card-id :sort_column :view-count :sort_direction :asc)))
+ (is (=? [{:data {:view_count 100}} {:data {:view_count 50}} {:data {:view_count 10}}]
+ (get-dependents base-card-id :sort_column :view-count :sort_direction :desc)))))))
+
+(deftest ^:sequential dependents-sort-view-count-mixed-types-test
+ (testing "GET /api/ee/dependencies/graph/dependents - view-count sorting with mixed entity types"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (mt/with-model-cleanup [:model/DashboardCard]
+ (mt/with-temp [:model/Dashboard {dashboard-id :id} {:name "Dashboard" :view_count 200}]
+ (let [{low-id :id} (create-dependent! base-card user "Low")
+ {high-id :id} (create-dependent! base-card user "High")]
+ (t2/insert! :model/DashboardCard {:dashboard_id dashboard-id :card_id base-card-id
+ :row 0 :col 0 :size_x 4 :size_y 4})
+ (while (#'dependencies.backfill/backfill-dependencies!))
+ (t2/update! :model/Card low-id {:view_count 10})
+ (t2/update! :model/Card high-id {:view_count 100})
+ (is (=? [{:data {:view_count 10}} {:data {:view_count 100}} {:data {:view_count 200}}]
+ (get-dependents base-card-id :sort_column :view-count :sort_direction :asc)))
+ (is (=? [{:data {:view_count 200}} {:data {:view_count 100}} {:data {:view_count 10}}]
+ (get-dependents base-card-id :sort_column :view-count :sort_direction :desc)))))))))
+
+(deftest ^:sequential dependents-query-and-sort-combined-test
+ (testing "GET /api/ee/dependencies/graph/dependents with query and sort together"
+ (with-dependents-test! [user {base-card-id :id :as base-card}]
+ (create-dependent! base-card user "C Match")
+ (create-dependent! base-card user "A Match")
+ (create-dependent! base-card user "B Match")
+ (create-dependent! base-card user "Should not appear")
+ (is (=? [{:data {:name "A Match"}} {:data {:name "B Match"}} {:data {:name "C Match"}}]
+ (get-dependents base-card-id :query "Match" :sort_column :name :sort_direction :asc))))))
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.tsx
index 706fcbdbff1..1f1a3ac0794 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
@@ -149,7 +149,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
{PLUGIN_DEPENDENCIES.isEnabled && (
<DataStudioTab
label={t`Dependency diagnostics`}
- icon="list"
+ icon="search_check"
to={Urls.dependencyTasks()}
isSelected={currentTab === "tasks"}
showLabel={isNavbarOpened}
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.tsx
index 4687cf7d909..4e700078d07 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx
@@ -1,8 +1,8 @@
import { useDebouncedValue } from "@mantine/hooks";
-import { useLayoutEffect, useMemo, useState } from "react";
+import { useLayoutEffect, useState } from "react";
import { t } from "ttag";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { Box, Card } from "metabase/ui";
import { useListNodeDependentsQuery } from "metabase-enterprise/api";
@@ -12,18 +12,21 @@ import type {
DependencyNode,
} from "metabase-types/api";
-import { DEPENDENTS_SEARCH_THRESHOLD } from "../constants";
+import { DEPENDENTS_SEARCH_THRESHOLD } from "../../../constants";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../../types";
+import { getDependentsCount, getSearchQuery } from "../../../utils";
import S from "./GraphDependencyPanel.module.css";
import { PanelBody } from "./PanelBody";
import { PanelHeader } from "./PanelHeader";
import {
- canFilterByOption,
- canSortByColumn,
+ getAvailableSortColumns,
getDefaultFilterOptions,
getDefaultSortOptions,
getListRequest,
- getVisibleNodes,
} from "./utils";
type GraphDependencyPanelProps = {
@@ -39,36 +42,32 @@ export function GraphDependencyPanel({
getGraphUrl,
onClose,
}: GraphDependencyPanelProps) {
- const {
- data: nodes = [],
- isFetching,
- error,
- } = useListNodeDependentsQuery(getListRequest(node, groupType));
const [searchText, setSearchText] = useState("");
const [searchQuery] = useDebouncedValue(
- searchText.trim(),
+ getSearchQuery(searchText),
SEARCH_DEBOUNCE_DURATION,
);
- const [filterOptions, setFilterOptions] = useState(() =>
- getDefaultFilterOptions(groupType),
+ const [filterOptions, setFilterOptions] = useState<DependencyFilterOptions>(
+ getDefaultFilterOptions(),
);
- const [sortOptions, setSortOptions] = useState(() =>
+ const [sortOptions, setSortOptions] = useState<DependencySortOptions>(
getDefaultSortOptions(groupType),
);
- const visibleNodes = useMemo(
- () => getVisibleNodes(nodes, { searchQuery, filterOptions, sortOptions }),
- [nodes, searchQuery, filterOptions, sortOptions],
+ const {
+ data: nodes = [],
+ isLoading,
+ error,
+ } = useListNodeDependentsQuery(
+ getListRequest(node, groupType, searchQuery, filterOptions, sortOptions),
);
+ const dependentsCount = getDependentsCount(node);
useLayoutEffect(() => {
- if (filterOptions.some((option) => !canFilterByOption(groupType, option))) {
- setFilterOptions(getDefaultFilterOptions(groupType));
- }
-
- if (!canSortByColumn(groupType, sortOptions.column)) {
+ const availableSortColumns = getAvailableSortColumns(groupType);
+ if (!availableSortColumns.includes(sortOptions.column)) {
setSortOptions(getDefaultSortOptions(groupType));
}
- }, [groupType, filterOptions, sortOptions]);
+ }, [groupType, sortOptions]);
return (
<Card className={S.root} withBorder data-testid="graph-dependency-panel">
@@ -78,20 +77,20 @@ export function GraphDependencyPanel({
searchText={searchText}
filterOptions={filterOptions}
sortOptions={sortOptions}
- hasSearch={nodes.length >= DEPENDENTS_SEARCH_THRESHOLD}
+ hasSearch={dependentsCount >= DEPENDENTS_SEARCH_THRESHOLD}
onSearchTextChange={setSearchText}
onFilterOptionsChange={setFilterOptions}
onSortOptionsChange={setSortOptions}
onClose={onClose}
/>
- {isFetching || error != null ? (
- <LoadingAndErrorWrapper loading={isFetching} error={error} />
- ) : visibleNodes.length === 0 ? (
+ {isLoading || error != null ? (
+ <DelayedLoadingAndErrorWrapper loading={isLoading} error={error} />
+ ) : nodes.length === 0 ? (
<Box p="lg" c="text-secondary" ta="center">
{t`Didn't find any results`}
</Box>
) : (
- <PanelBody nodes={visibleNodes} getGraphUrl={getGraphUrl} />
+ <PanelBody nodes={nodes} getGraphUrl={getGraphUrl} />
)}
</Card>
);
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.tsx
deleted file mode 100644
index 84f4377e079..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/FilterOptionsPicker.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-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="20rem" p="md">
- <Checkbox.Group
- label={t`Location`}
- value={filterOptions}
- onChange={handleFilterOptionsChange}
- >
- <Stack gap="sm" mt="sm">
- {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/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/types.ts
deleted file mode 100644
index a84e6c9337f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-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.ts
deleted file mode 100644
index 1853885891c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/utils.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-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> = {
- "include-in-personal-collections": t`Include items in personal collections`,
- };
-
- return FILTER_OPTIONS.map((option) => ({
- value: option,
- label: allLabels[option],
- }));
-}
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.tsx
index 33dd3704a0b..43365c23e82 100644
--- 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.tsx
@@ -10,24 +10,27 @@ import {
} from "metabase/ui";
import type { DependencyGroupType, DependencyNode } from "metabase-types/api";
-import type { FilterOption, SortOptions } from "../types";
-import { canFilter } from "../utils";
+import { FilterOptionsPicker } from "../../../../components/FilterOptionsPicker";
+import { SortOptionsPicker } from "../../../../components/SortOptionsPicker";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../../../types";
+import { canFilter, getAvailableSortColumns } 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;
+ filterOptions: DependencyFilterOptions;
+ sortOptions: DependencySortOptions;
hasSearch: boolean;
onSearchTextChange: (searchText: string) => void;
- onFilterOptionsChange: (filterOptions: FilterOption[]) => void;
- onSortOptionsChange: (sortOptions: SortOptions) => void;
+ onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
+ onSortOptionsChange: (sortOptions: DependencySortOptions) => void;
onClose: () => void;
};
@@ -61,16 +64,16 @@ export function PanelHeader({
placeholder={t`Search`}
leftSection={<FixedSizeIcon name="search" />}
rightSection={
- <Group gap={0}>
+ <Group gap={0} wrap="nowrap">
<SortOptionsPicker
- groupType={groupType}
sortOptions={sortOptions}
+ availableSortColumns={getAvailableSortColumns(groupType)}
onSortOptionsChange={onSortOptionsChange}
/>
{hasFilterPicker && (
<FilterOptionsPicker
- groupType={groupType}
filterOptions={filterOptions}
+ compact
onFilterOptionsChange={onFilterOptionsChange}
/>
)}
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.ts
deleted file mode 100644
index dbb1a02c226..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-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/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.ts
deleted file mode 100644
index 78972e5dbc1..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// defines the order of options in the UI
-export const FILTER_OPTIONS = ["include-in-personal-collections"] as const;
-
-// defines the order of options in the UI
-export const SORT_COLUMNS = ["view-count", "name", "location"] as const;
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.ts
deleted file mode 100644
index 78629ff4ebf..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/types.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-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,
- isEnabled: boolean,
-) => 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.ts
index e06f305be9d..d4b64a33f0c 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/utils.ts
@@ -1,30 +1,27 @@
import type {
DependencyGroupType,
DependencyNode,
+ DependencySortColumn,
ListNodeDependentsRequest,
} from "metabase-types/api";
+import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "../../../constants";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../../types";
import {
+ canHaveViewCount,
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,
+ query: string | undefined,
+ filterOptions: DependencyFilterOptions,
+ sortOptions: DependencySortOptions,
): ListNodeDependentsRequest {
const type = getDependencyType(groupType);
const cardType = getCardType(groupType);
@@ -34,155 +31,46 @@ export function getListRequest(
type: node.type,
dependent_types: [type],
dependent_card_types: cardType != null ? [cardType] : undefined,
+ query: query,
+ include_personal_collections: filterOptions.includePersonalCollections,
+ sort_column: sortOptions.column,
+ sort_direction: sortOptions.direction,
};
}
-function isMatchingSearchQuery(
- node: DependencyNode,
- lowerCaseSearchQuery: string,
-): boolean {
- return getNodeLabel(node).toLowerCase().includes(lowerCaseSearchQuery);
-}
-
-const FILTERS: Record<FilterOption, FilterCallback> = {
- "include-in-personal-collections": (node, isEnabled) => {
- if (isEnabled) {
- return true;
- }
- switch (node.type) {
- case "card":
- case "dashboard":
- case "document": {
- const collection = node.data.collection;
- return collection != null && !collection.is_personal;
- }
- default:
- return true;
- }
- },
-};
-
-export function canFilterByOption(
- groupType: DependencyGroupType,
- option: FilterOption,
-): boolean {
+export function canFilter(groupType: DependencyGroupType): boolean {
const type = getDependencyType(groupType);
- switch (option) {
- case "include-in-personal-collections":
- switch (type) {
- case "card":
- case "dashboard":
- case "document":
- return true;
- default:
- return false;
- }
+ switch (type) {
+ case "card":
+ case "dashboard":
+ case "document":
+ return true;
+ default:
+ return false;
}
}
-export function canFilter(groupType: DependencyGroupType): boolean {
- return FILTER_OPTIONS.some((option) => canFilterByOption(groupType, option));
+export function getDefaultFilterOptions(): DependencyFilterOptions {
+ return {
+ groupTypes: [],
+ includePersonalCollections: DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
+ };
}
-export function getDefaultFilterOptions(
+export function getAvailableSortColumns(
groupType: DependencyGroupType,
-): FilterOption[] {
- return FILTER_OPTIONS.filter((option) =>
- canFilterByOption(groupType, option),
- );
+): DependencySortColumn[] {
+ return [
+ "name",
+ "location",
+ ...(canHaveViewCount(groupType) ? ["view-count" as const] : []),
+ ];
}
-function isMatchingFilters(
- node: DependencyNode,
- filterOptions: FilterOption[],
-): boolean {
- return FILTER_OPTIONS.every((option) =>
- FILTERS[option](node, filterOptions.includes(option)),
- );
-}
-
-const COMPARATORS: Record<SortColumn, SortCallback> = {
- name: (node1, node2) => {
- const label1 = getNodeLabel(node1);
- const label2 = getNodeLabel(node2);
- return label1.localeCompare(label2);
- },
- location: (node1, node2) => {
- const links1 = getNodeLocationInfo(node1)?.links ?? [];
- const links2 = getNodeLocationInfo(node2)?.links ?? [];
- const minLinks = links1.length < links2.length ? links1 : links2;
- const result = minLinks
- .map((_link, i) => links1[i].label.localeCompare(links2[i].label))
- .find((result) => result !== 0);
- return result ?? links1.length - links2.length;
- },
- "view-count": (node1, node2) => {
- const count1 = getNodeViewCount(node1) ?? 0;
- const count2 = getNodeViewCount(node2) ?? 0;
- return count1 - count2;
- },
-};
-
-export function canSortByColumn(
+export function getDefaultSortOptions(
groupType: DependencyGroupType,
- column: SortColumn,
-): boolean {
- switch (column) {
- case "name":
- return true;
- case "location":
- switch (groupType) {
- case "question":
- case "model":
- case "metric":
- case "dashboard":
- case "document":
- return true;
- default:
- return false;
- }
- case "view-count":
- switch (groupType) {
- case "question":
- case "dashboard":
- case "document":
- return true;
- default:
- return false;
- }
- }
-}
-
-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;
+): DependencySortOptions {
+ return canHaveViewCount(groupType)
+ ? { column: "view-count", direction: "desc" }
+ : { column: "name", direction: "asc" };
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.ts
index 711c8253c4a..4da0e6966e7 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/constants.ts
@@ -1,3 +1,2 @@
export const MIN_ZOOM = 0.1;
export const MAX_ZOOM = 1;
-export const DEPENDENTS_SEARCH_THRESHOLD = 5;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
index c36f18a04ca..79756ddf14f 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
@@ -7,11 +7,13 @@ import {
useListBrokenGraphNodesQuery,
useListUnreferencedGraphNodesQuery,
} from "metabase-enterprise/api";
-import type {
- DependencyEntry,
- DependencySortingOptions,
-} from "metabase-types/api";
+import type { DependencyEntry } from "metabase-types/api";
+import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "../../constants";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../types";
import { getCardTypes, getDependencyTypes, isSameNode } from "../../utils";
import S from "./DependencyList.module.css";
@@ -22,7 +24,11 @@ import { ListSearchBar } from "./ListSearchBar";
import { ListSidebar } from "./ListSidebar";
import { PAGE_SIZE } from "./constants";
import type { DependencyListMode } from "./types";
-import { getAvailableGroupTypes } from "./utils";
+import {
+ getAvailableGroupTypes,
+ getFilterOptions,
+ getSortOptions,
+} from "./utils";
type DependencyListProps = {
mode: DependencyListMode;
@@ -43,20 +49,21 @@ export function DependencyList({
: useListUnreferencedGraphNodesQuery;
const {
+ page = 0,
query,
groupTypes = getAvailableGroupTypes(mode),
- includePersonalCollections = true,
- sorting,
- page = 0,
+ includePersonalCollections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
+ sortColumn,
+ sortDirection,
} = params;
const { data, isFetching, isLoading, error } = useListGraphNodesQuery({
- query,
types: getDependencyTypes(groupTypes),
card_types: getCardTypes(groupTypes),
+ query: query,
include_personal_collections: includePersonalCollections,
- sort_column: sorting?.column,
- sort_direction: sorting?.direction,
+ sort_column: sortColumn,
+ sort_direction: sortDirection,
offset: page * PAGE_SIZE,
limit: PAGE_SIZE,
});
@@ -69,10 +76,28 @@ export function DependencyList({
? nodes.find((node) => isSameNode(node, selectedEntry))
: undefined;
- const handleSortingChange = (
- sorting: DependencySortingOptions | undefined,
+ const handleQueryChange = (query: string | undefined) => {
+ onParamsChange({ ...params, query });
+ };
+
+ const handleFilterOptionsChange = (
+ filterOptions: DependencyFilterOptions,
+ ) => {
+ onParamsChange({ ...params, ...filterOptions });
+ };
+
+ const handleSortOptionsChange = (
+ sortOptions: DependencySortOptions | undefined,
) => {
- onParamsChange({ ...params, sorting });
+ onParamsChange({
+ ...params,
+ sortColumn: sortOptions?.column,
+ sortDirection: sortOptions?.direction,
+ });
+ };
+
+ const handlePageChange = (page: number) => {
+ onParamsChange({ ...params, page });
};
useLayoutEffect(() => {
@@ -87,9 +112,11 @@ export function DependencyList({
<ListHeader />
<ListSearchBar
mode={mode}
- params={params}
+ query={query}
+ filterOptions={getFilterOptions(mode, params)}
hasLoader={isFetching && !isLoading}
- onParamsChange={onParamsChange}
+ onQueryChange={handleQueryChange}
+ onFilterOptionsChange={handleFilterOptionsChange}
/>
{error != null ? (
<Center flex={1}>
@@ -99,18 +126,18 @@ export function DependencyList({
<ListBody
nodes={nodes}
mode={mode}
- sorting={sorting}
+ sortOptions={getSortOptions(params)}
isLoading={isLoading}
onSelect={setSelectedEntry}
- onSortingChange={handleSortingChange}
+ onSortOptionsChange={handleSortOptionsChange}
/>
)}
{!isLoading && error == null && (
<ListPaginationControls
- params={params}
+ page={page}
pageNodesCount={nodes.length}
totalNodesCount={totalNodesCount}
- onParamsChange={onParamsChange}
+ onPageChange={handlePageChange}
/>
)}
</Stack>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
index 63b229a9285..fc709420842 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
@@ -7,11 +7,9 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
-import type {
- DependencyNode,
- DependencySortingOptions,
-} from "metabase-types/api";
+import type { DependencyNode } from "metabase-types/api";
+import type { DependencySortOptions } from "../../../types";
import { getNodeId } from "../../../utils";
import { ListEmptyState } from "../ListEmptyState";
import type { DependencyListMode } from "../types";
@@ -27,22 +25,25 @@ import {
type ListBodyProps = {
nodes: DependencyNode[];
mode: DependencyListMode;
- sorting: DependencySortingOptions | undefined;
+ sortOptions: DependencySortOptions | undefined;
isLoading?: boolean;
onSelect: (node: DependencyNode) => void;
- onSortingChange: (sorting: DependencySortingOptions | undefined) => void;
+ onSortOptionsChange: (sortOptions: DependencySortOptions | undefined) => void;
};
export const ListBody = function ListBody({
nodes,
mode,
- sorting,
+ sortOptions,
isLoading = false,
onSelect,
- onSortingChange,
+ onSortOptionsChange,
}: ListBodyProps) {
const columns = useMemo(() => getColumns(mode), [mode]);
- const sortingState = useMemo(() => getSortingState(sorting), [sorting]);
+ const sortingState = useMemo(
+ () => getSortingState(sortOptions),
+ [sortOptions],
+ );
const handleRowActivate = useCallback(
(row: Row<DependencyNode>) => onSelect(row.original),
@@ -53,9 +54,9 @@ export const ListBody = function ListBody({
(updater: Updater<SortingState>) => {
const newSortingState =
typeof updater === "function" ? updater(sortingState) : updater;
- onSortingChange(getSortingOptions(newSortingState));
+ onSortOptionsChange(getSortingOptions(newSortingState));
},
- [sortingState, onSortingChange],
+ [sortingState, onSortOptionsChange],
);
const treeTableInstance = useTreeTableInstance<DependencyNode>({
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx
index 441a6fc9af5..0224d5d1117 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx
@@ -6,9 +6,9 @@ import {
DEPENDENCY_SORT_COLUMNS,
type DependencyNode,
type DependencySortColumn,
- type DependencySortingOptions,
} from "metabase-types/api";
+import type { DependencySortOptions } from "../../../types";
import {
getDependentErrorNodesCount,
getNodeLabel,
@@ -107,16 +107,16 @@ export function getColumnWidths(mode: DependencyListMode): number[] {
}
export function getSortingState(
- sorting: DependencySortingOptions | undefined,
+ sortOptions: DependencySortOptions | undefined,
): SortingState {
- return sorting != null
- ? [{ id: sorting.column, desc: sorting.direction === "desc" }]
+ return sortOptions?.column != null
+ ? [{ id: sortOptions.column, desc: sortOptions.direction === "desc" }]
: [];
}
export function getSortingOptions(
sortingState: SortingState,
-): DependencySortingOptions | undefined {
+): DependencySortOptions | undefined {
if (sortingState.length === 0) {
return undefined;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx
index e77b60831c9..737f5014277 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx
@@ -1,24 +1,21 @@
import { PaginationControls } from "metabase/common/components/PaginationControls";
-import type * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
import { PAGE_SIZE } from "../constants";
type ListPaginationControlsProps = {
- params: Urls.DependencyListParams;
+ page: number;
pageNodesCount: number;
totalNodesCount: number;
- onParamsChange: (params: Urls.DependencyListParams) => void;
+ onPageChange: (page: number) => void;
};
export function ListPaginationControls({
- params,
+ page,
pageNodesCount,
totalNodesCount,
- onParamsChange,
+ onPageChange,
}: ListPaginationControlsProps) {
- const { page = 0 } = params;
-
return (
<Flex justify="end">
<PaginationControls
@@ -27,8 +24,8 @@ export function ListPaginationControls({
itemsLength={pageNodesCount}
total={totalNodesCount}
showTotal
- onPreviousPage={() => onParamsChange({ ...params, page: page - 1 })}
- onNextPage={() => onParamsChange({ ...params, page: page + 1 })}
+ onPreviousPage={() => onPageChange(page - 1)}
+ onNextPage={() => onPageChange(page + 1)}
/>
</Flex>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/FilterOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/FilterOptionsPicker.tsx
deleted file mode 100644
index f0e78c144cd..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/FilterOptionsPicker.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { t } from "ttag";
-
-import type * as Urls from "metabase/lib/urls";
-import { Box, Button, FixedSizeIcon, Popover, Stack } from "metabase/ui";
-
-import type { DependencyListMode } from "../../types";
-
-import { LocationFilterPicker } from "./LocationFilterPicker";
-import { TypeFilterPicker } from "./TypeFilterPicker";
-
-type FilterOptionsPickerProps = {
- mode: DependencyListMode;
- params: Urls.DependencyListParams;
- onParamsChange: (params: Urls.DependencyListParams) => void;
-};
-
-export function FilterOptionsPicker({
- mode,
- params,
- onParamsChange,
-}: FilterOptionsPickerProps) {
- const [isOpened, { toggle, close }] = useDisclosure();
-
- return (
- <Popover opened={isOpened} onDismiss={close}>
- <Popover.Target>
- <Button
- leftSection={<FixedSizeIcon name="filter" aria-hidden />}
- data-testid="dependency-list-filter-button"
- onClick={toggle}
- >
- {t`Filter`}
- </Button>
- </Popover.Target>
- <Popover.Dropdown>
- <FilterOptionsPopover
- mode={mode}
- params={params}
- onParamsChange={onParamsChange}
- />
- </Popover.Dropdown>
- </Popover>
- );
-}
-
-type FilterOptionsPopoverProps = {
- mode: DependencyListMode;
- params: Urls.DependencyListParams;
- onParamsChange: (params: Urls.DependencyListParams) => void;
-};
-
-function FilterOptionsPopover({
- mode,
- params,
- onParamsChange,
-}: FilterOptionsPopoverProps) {
- return (
- <Box w="20rem" p="md">
- <Stack>
- <TypeFilterPicker
- mode={mode}
- params={params}
- onParamsChange={onParamsChange}
- />
- <LocationFilterPicker params={params} onParamsChange={onParamsChange} />
- </Stack>
- </Box>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/index.ts
deleted file mode 100644
index ba6bd22e417..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./FilterOptionsPicker";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
index 0f83178706c..a35f7b3ff82 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
@@ -3,28 +3,32 @@ import { type ChangeEvent, memo, useState } from "react";
import { t } from "ttag";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import type * as Urls from "metabase/lib/urls";
import { FixedSizeIcon, Flex, Loader, TextInput } from "metabase/ui";
+import type { DependencyFilterOptions } from "../../../types";
import { getSearchQuery } from "../../../utils";
+import { FilterOptionsPicker } from "../../FilterOptionsPicker";
import type { DependencyListMode } from "../types";
-
-import { FilterOptionsPicker } from "./FilterOptionsPicker";
+import { getAvailableGroupTypes } from "../utils";
type ListSearchBarProps = {
mode: DependencyListMode;
- params: Urls.DependencyListParams;
+ query?: string;
+ filterOptions: DependencyFilterOptions;
hasLoader: boolean;
- onParamsChange: (params: Urls.DependencyListParams) => void;
+ onQueryChange: (query: string | undefined) => void;
+ onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
};
export const ListSearchBar = memo(function ListSearchBar({
mode,
- params,
+ query,
+ filterOptions,
hasLoader,
- onParamsChange,
+ onQueryChange,
+ onFilterOptionsChange,
}: ListSearchBarProps) {
- const [searchValue, setSearchValue] = useState(params.query ?? "");
+ const [searchValue, setSearchValue] = useState(query ?? "");
const handleSearchChange = (event: ChangeEvent<HTMLInputElement>) => {
const newSearchValue = event.target.value;
@@ -35,11 +39,17 @@ export const ListSearchBar = memo(function ListSearchBar({
const handleSearchDebounce = useDebouncedCallback(
(newSearchValue: string) => {
const newQuery = getSearchQuery(newSearchValue);
- onParamsChange({ ...params, query: newQuery });
+ onQueryChange(newQuery);
},
SEARCH_DEBOUNCE_DURATION,
);
+ const handleFilterOptionsChange = (
+ newFilterOptions: DependencyFilterOptions,
+ ) => {
+ onFilterOptionsChange(newFilterOptions);
+ };
+
return (
<Flex gap="md" align="center">
<TextInput
@@ -52,9 +62,9 @@ export const ListSearchBar = memo(function ListSearchBar({
onChange={handleSearchChange}
/>
<FilterOptionsPicker
- mode={mode}
- params={params}
- onParamsChange={onParamsChange}
+ filterOptions={filterOptions}
+ availableGroupTypes={getAvailableGroupTypes(mode)}
+ onFilterOptionsChange={handleFilterOptionsChange}
/>
</Flex>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
index b9c37db84e5..3dccfcde3a9 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
@@ -6,12 +6,12 @@ import type { DependencyNode } from "metabase-types/api";
import { getDependencyErrorGroups, getDependencyErrors } from "../../../utils";
import S from "./ListSidebar.module.css";
-import { SidebarCreationInfo } from "./SidebarCreationInfo";
-import { SidebarDependentsInfo } from "./SidebarDependentsInfo";
-import { SidebarErrorInfo } from "./SidebarErrorInfo";
+import { SidebarCreationSection } from "./SidebarCreationSection";
+import { SidebarDependentsSection } from "./SidebarDependentsSection";
+import { SidebarErrorSection } from "./SidebarErrorSection";
import { SidebarHeader } from "./SidebarHeader";
-import { SidebarLocationInfo } from "./SidebarLocationInfo";
-import { SidebarTransformInfo } from "./SidebarTransformInfo";
+import { SidebarLocationSection } from "./SidebarLocationSection";
+import { SidebarTransformSection } from "./SidebarTransformSection";
type ListSidebarProps = {
node: DependencyNode;
@@ -36,18 +36,18 @@ export const ListSidebar = memo(function ListSidebar({
>
<Stack gap="lg">
<SidebarHeader node={node} onClose={onClose} />
- <SidebarLocationInfo node={node} />
- <SidebarTransformInfo node={node} />
- <SidebarCreationInfo node={node} />
+ <SidebarLocationSection node={node} />
+ <SidebarTransformSection node={node} />
+ <SidebarCreationSection node={node} />
</Stack>
{errorGroups.map((errorGroup) => (
- <SidebarErrorInfo
+ <SidebarErrorSection
key={errorGroup.type}
type={errorGroup.type}
errors={errorGroup.errors}
/>
))}
- <SidebarDependentsInfo node={node} />
+ <SidebarDependentsSection node={node} />
</Stack>
);
});
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationInfo/index.ts
deleted file mode 100644
index 38c20047114..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SidebarCreationInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationInfo/SidebarCreationInfo.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationInfo/SidebarCreationInfo.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx
index 77e2986c1e6..d9cb405518d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationInfo/SidebarCreationInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx
@@ -14,11 +14,11 @@ import {
} from "../../../../utils";
import S from "../ListSidebar.module.css";
-type SidebarCreationInfoProps = {
+type SidebarCreationSectionProps = {
node: DependencyNode;
};
-export function SidebarCreationInfo({ node }: SidebarCreationInfoProps) {
+export function SidebarCreationSection({ node }: SidebarCreationSectionProps) {
const createdBy = getNodeCreatedBy(node);
const createdAt = getNodeCreatedAt(node);
const editedBy = getNodeLastEditedBy(node);
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/index.ts
new file mode 100644
index 00000000000..608f16613f9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/index.ts
@@ -0,0 +1 @@
+export * from "./SidebarCreationSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/index.ts
deleted file mode 100644
index ff946cb9c36..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SidebarDependentsInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/SidebarDependentsInfo.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/SidebarDependentsInfo.module.css
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/SidebarDependentsInfo.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx
similarity index 60%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/SidebarDependentsInfo.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx
index f68324403e2..66891e1a5df 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsInfo/SidebarDependentsInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx
@@ -12,6 +12,7 @@ import {
Card,
FixedSizeIcon,
Group,
+ Loader,
Menu,
Stack,
Title,
@@ -19,6 +20,11 @@ import {
import { useListNodeDependentsQuery } from "metabase-enterprise/api";
import type { DependencyNode } from "metabase-types/api";
+import { DEPENDENTS_SEARCH_THRESHOLD } from "../../../../constants";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../../../types";
import {
getDependentErrorNodesCount,
getDependentErrorNodesLabel,
@@ -29,23 +35,37 @@ import {
getNodeViewCount,
getNodeViewCountLabel,
} from "../../../../utils";
+import { FilterOptionsPicker } from "../../../FilterOptionsPicker";
+import { SortOptionsPicker } from "../../../SortOptionsPicker";
+import {
+ BROKEN_DEPENDENTS_GROUP_TYPES,
+ BROKEN_DEPENDENTS_SORT_COLUMNS,
+} from "../../constants";
-import S from "./SidebarDependentsInfo.module.css";
+import S from "./SidebarDependentsSection.module.css";
+import {
+ getDefaultFilterOptions,
+ getDefaultSortOptions,
+ getListRequest,
+} from "./utils";
-type SidebarDependentsInfoProps = {
+type SidebarDependentsSectionProps = {
node: DependencyNode;
};
-export function SidebarDependentsInfo({ node }: SidebarDependentsInfoProps) {
+export function SidebarDependentsSection({
+ node,
+}: SidebarDependentsSectionProps) {
const count = getDependentErrorNodesCount(node.dependents_errors ?? []);
- const title = getDependentErrorNodesLabel(count);
+ const [filterOptions, setFilterOptions] = useState<DependencyFilterOptions>(
+ getDefaultFilterOptions(),
+ );
+ const [sortOptions, setSortOptions] = useState<DependencySortOptions>(
+ getDefaultSortOptions(),
+ );
- const { data: dependents = [] } = useListNodeDependentsQuery(
- {
- id: node.id,
- type: node.type,
- broken: true,
- },
+ const { data: dependents = [], isFetching } = useListNodeDependentsQuery(
+ getListRequest(node, filterOptions, sortOptions),
{
skip: count === 0,
},
@@ -57,11 +77,31 @@ export function SidebarDependentsInfo({ node }: SidebarDependentsInfoProps) {
return (
<Stack role="region" aria-label={getDependentErrorNodesLabel()}>
- <Group gap="sm">
- <Badge c="text-selected" bg="error">
- {count}
- </Badge>
- <Title order={5}>{title}</Title>
+ <Group justify="space-between" wrap="nowrap">
+ <Group gap="sm" wrap="nowrap">
+ <Badge c="text-selected" bg="error">
+ {count}
+ </Badge>
+ <Title order={5}>
+ {getDependentErrorNodesLabel(dependents.length)}
+ </Title>
+ {isFetching && <Loader size="sm" />}
+ </Group>
+ {count > DEPENDENTS_SEARCH_THRESHOLD && (
+ <Group gap={0}>
+ <SortOptionsPicker
+ sortOptions={sortOptions}
+ availableSortColumns={BROKEN_DEPENDENTS_SORT_COLUMNS}
+ onSortOptionsChange={setSortOptions}
+ />
+ <FilterOptionsPicker
+ filterOptions={filterOptions}
+ availableGroupTypes={BROKEN_DEPENDENTS_GROUP_TYPES}
+ compact
+ onFilterOptionsChange={setFilterOptions}
+ />
+ </Group>
+ )}
</Group>
{dependents.length > 0 && (
<Card p={0} shadow="none" withBorder>
@@ -103,7 +143,12 @@ function DependentItem({ node }: DependentItemProps) {
</Box>
</Group>
{viewCount != null && (
- <Box c="text-secondary" fz="sm" lh="1rem">
+ <Box
+ className={CS.textNoWrap}
+ c="text-secondary"
+ fz="sm"
+ lh="1rem"
+ >
{getNodeViewCountLabel(viewCount)}
</Box>
)}
@@ -129,6 +174,7 @@ function DependentItem({ node }: DependentItemProps) {
<Menu.Item
component={ForwardRefLink}
to={link.url}
+ target="_blank"
leftSection={<FixedSizeIcon name="external" />}
>
{t`Go to this`}
@@ -137,6 +183,7 @@ function DependentItem({ node }: DependentItemProps) {
<Menu.Item
component={ForwardRefLink}
to={Urls.dependencyGraph({ entry: node })}
+ target="_blank"
leftSection={<FixedSizeIcon name="dependencies" />}
>
{t`View in dependency graph`}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/index.ts
new file mode 100644
index 00000000000..ca7719357d0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/index.ts
@@ -0,0 +1 @@
+export * from "./SidebarDependentsSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/utils.ts
new file mode 100644
index 00000000000..7b9faf01f74
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/utils.ts
@@ -0,0 +1,40 @@
+import type {
+ DependencyNode,
+ ListNodeDependentsRequest,
+} from "metabase-types/api";
+
+import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "../../../../constants";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../../../types";
+import { getCardTypes, getDependencyTypes } from "../../../../utils";
+import { BROKEN_DEPENDENTS_GROUP_TYPES } from "../../constants";
+
+export function getListRequest(
+ node: DependencyNode,
+ filterOptions: DependencyFilterOptions,
+ sortOptions: DependencySortOptions,
+): ListNodeDependentsRequest {
+ return {
+ id: node.id,
+ type: node.type,
+ dependent_types: getDependencyTypes(filterOptions.groupTypes),
+ dependent_card_types: getCardTypes(filterOptions.groupTypes),
+ broken: true,
+ include_personal_collections: filterOptions.includePersonalCollections,
+ sort_column: sortOptions.column,
+ sort_direction: sortOptions.direction,
+ };
+}
+
+export function getDefaultFilterOptions(): DependencyFilterOptions {
+ return {
+ groupTypes: BROKEN_DEPENDENTS_GROUP_TYPES,
+ includePersonalCollections: DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
+ };
+}
+
+export function getDefaultSortOptions(): DependencySortOptions {
+ return { column: "view-count", direction: "desc" };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/index.ts
deleted file mode 100644
index 6883d40b59f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SidebarErrorInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/SidebarErrorInfo.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/SidebarErrorInfo.module.css
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/SidebarErrorInfo.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/SidebarErrorInfo.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx
index c1fce875a89..c5ebdb5b2b2 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorInfo/SidebarErrorInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx
@@ -20,14 +20,17 @@ import type { AnalysisFindingErrorType } from "metabase-types/api";
import type { DependencyError } from "../../../../types";
import { getErrorTypeLabel } from "../../../../utils";
-import S from "./SidebarErrorInfo.module.css";
+import S from "./SidebarErrorSection.module.css";
-type SidebarErrorInfoProps = {
+type SidebarErrorSectionProps = {
type: AnalysisFindingErrorType;
errors: DependencyError[];
};
-export function SidebarErrorInfo({ type, errors }: SidebarErrorInfoProps) {
+export function SidebarErrorSection({
+ type,
+ errors,
+}: SidebarErrorSectionProps) {
const count = errors.length;
const title = getErrorTypeLabel(type, count);
const details = errors
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/index.ts
new file mode 100644
index 00000000000..16319473f0e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/index.ts
@@ -0,0 +1 @@
+export * from "./SidebarErrorSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
index 92aed4b806e..40eef518221 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
@@ -34,6 +34,7 @@ export function SidebarHeader({ node, onClose }: SidebarHeaderProps) {
fw="bold"
lh="h3"
to={link?.url ?? ""}
+ target="_blank"
>
{getNodeLabel(node)}
</Anchor>
@@ -45,6 +46,7 @@ export function SidebarHeader({ node, onClose }: SidebarHeaderProps) {
<ActionIcon
component={ForwardRefLink}
to={Urls.dependencyGraph({ entry: node })}
+ target="_blank"
aria-label={t`View in dependency graph`}
>
<FixedSizeIcon name="dependencies" />
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationInfo/index.ts
deleted file mode 100644
index a2aa298fdc0..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SidebarLocationInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationInfo/SidebarLocationInfo.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationInfo/SidebarLocationInfo.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx
index ad44d00c4ce..4c42a06705c 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationInfo/SidebarLocationInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx
@@ -9,11 +9,11 @@ import type { DependencyNode } from "metabase-types/api";
import { getNodeLocationInfo } from "../../../../utils";
import S from "../ListSidebar.module.css";
-type SidebarLocationInfoProps = {
+type SidebarLocationSectionProps = {
node: DependencyNode;
};
-export function SidebarLocationInfo({ node }: SidebarLocationInfoProps) {
+export function SidebarLocationSection({ node }: SidebarLocationSectionProps) {
const locationInfo = getNodeLocationInfo(node);
if (locationInfo == null) {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/index.ts
new file mode 100644
index 00000000000..a1551331f29
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/index.ts
@@ -0,0 +1 @@
+export * from "./SidebarLocationSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformInfo/index.ts
deleted file mode 100644
index 2ff073ea83a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SidebarTransformInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformInfo/SidebarTransformInfo.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformSection/SidebarTransformSection.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformInfo/SidebarTransformInfo.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformSection/SidebarTransformSection.tsx
index 2bbd13c3a81..7e75d754f57 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformInfo/SidebarTransformInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformSection/SidebarTransformSection.tsx
@@ -10,11 +10,13 @@ import type { DependencyNode } from "metabase-types/api";
import { getNodeTransform } from "../../../../utils";
import S from "../ListSidebar.module.css";
-type SidebarTransformInfoProps = {
+type SidebarTransformSectionProps = {
node: DependencyNode;
};
-export function SidebarTransformInfo({ node }: SidebarTransformInfoProps) {
+export function SidebarTransformSection({
+ node,
+}: SidebarTransformSectionProps) {
const transform = getNodeTransform(node);
if (transform == null) {
@@ -38,6 +40,7 @@ export function SidebarTransformInfo({ node }: SidebarTransformInfoProps) {
component={Link}
className={cx(CS.textWrap, S.link)}
to={Urls.transform(transform.id)}
+ target="_blank"
>
<Group gap="sm" wrap="nowrap">
<FixedSizeIcon name="transform" />
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformSection/index.ts
new file mode 100644
index 00000000000..b1f23ea7a46
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarTransformSection/index.ts
@@ -0,0 +1 @@
+export * from "./SidebarTransformSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/constants.ts
index 45d559e788d..05445a6b52f 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/constants.ts
@@ -1 +1,37 @@
+import type {
+ DependencyGroupType,
+ DependencySortColumn,
+} from "metabase-types/api";
+
+export const BROKEN_GROUP_TYPES: DependencyGroupType[] = [
+ "table",
+ "question",
+ "model",
+];
+
+export const BROKEN_DEPENDENTS_GROUP_TYPES: DependencyGroupType[] = [
+ "question",
+ "model",
+ "metric",
+ "segment",
+ "measure",
+ "transform",
+];
+
+export const BROKEN_DEPENDENTS_SORT_COLUMNS: DependencySortColumn[] = [
+ "name",
+ "location",
+ "view-count",
+];
+
+export const UNREFERENCED_GROUP_TYPES: DependencyGroupType[] = [
+ "table",
+ "question",
+ "model",
+ "metric",
+ "segment",
+ "measure",
+ "snippet",
+];
+
export const PAGE_SIZE = 25;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts
index 941dd76c121..ed3a013db59 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts
@@ -1,23 +1,33 @@
-import type { DependencyGroupType } from "metabase-types/api";
+import type * as Urls from "metabase/lib/urls";
-import type { DependencyListMode } from "./types";
-
-const BROKEN_GROUP_TYPES: DependencyGroupType[] = [
- "table",
- "question",
- "model",
-];
+import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "../../constants";
+import type {
+ DependencyFilterOptions,
+ DependencySortOptions,
+} from "../../types";
-const UNREFERENCED_GROUP_TYPES: DependencyGroupType[] = [
- "table",
- "question",
- "model",
- "metric",
- "segment",
- "measure",
- "snippet",
-];
+import { BROKEN_GROUP_TYPES, UNREFERENCED_GROUP_TYPES } from "./constants";
+import type { DependencyListMode } from "./types";
export function getAvailableGroupTypes(mode: DependencyListMode) {
return mode === "broken" ? BROKEN_GROUP_TYPES : UNREFERENCED_GROUP_TYPES;
}
+
+export function getFilterOptions(
+ mode: DependencyListMode,
+ {
+ groupTypes = getAvailableGroupTypes(mode),
+ includePersonalCollections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
+ }: Urls.DependencyListParams,
+): DependencyFilterOptions {
+ return { groupTypes, includePersonalCollections };
+}
+
+export function getSortOptions({
+ sortColumn,
+ sortDirection,
+}: Urls.DependencyListParams): DependencySortOptions | undefined {
+ return sortColumn != null && sortDirection != null
+ ? { column: sortColumn, direction: sortDirection }
+ : undefined;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
new file mode 100644
index 00000000000..586bbba0bf4
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
@@ -0,0 +1,90 @@
+import { useDisclosure } from "@mantine/hooks";
+import { t } from "ttag";
+
+import {
+ ActionIcon,
+ Box,
+ Button,
+ FixedSizeIcon,
+ Popover,
+ Stack,
+} from "metabase/ui";
+import type { DependencyGroupType } from "metabase-types/api";
+
+import type { DependencyFilterOptions } from "../../types";
+
+import { LocationFilterPicker } from "./LocationFilterPicker";
+import { TypeFilterPicker } from "./TypeFilterPicker";
+
+type FilterOptionsPickerProps = {
+ filterOptions: DependencyFilterOptions;
+ availableGroupTypes?: DependencyGroupType[];
+ compact?: boolean;
+ onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
+};
+
+export function FilterOptionsPicker({
+ filterOptions,
+ availableGroupTypes = [],
+ compact = false,
+ onFilterOptionsChange,
+}: FilterOptionsPickerProps) {
+ const [isOpened, { toggle, close }] = useDisclosure();
+
+ return (
+ <Popover opened={isOpened} onDismiss={close}>
+ <Popover.Target>
+ {compact ? (
+ <ActionIcon aria-label={t`Filter`} onClick={toggle}>
+ <FixedSizeIcon c="text-primary" name="filter" />
+ </ActionIcon>
+ ) : (
+ <Button
+ leftSection={<FixedSizeIcon name="filter" aria-hidden />}
+ data-testid="dependency-filter-button"
+ onClick={toggle}
+ >
+ {t`Filter`}
+ </Button>
+ )}
+ </Popover.Target>
+ <Popover.Dropdown>
+ <FilterOptionsPopover
+ filterOptions={filterOptions}
+ availableGroupTypes={availableGroupTypes}
+ onFilterOptionsChange={onFilterOptionsChange}
+ />
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
+
+type FilterOptionsPopoverProps = {
+ filterOptions: DependencyFilterOptions;
+ availableGroupTypes: DependencyGroupType[];
+ onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
+};
+
+function FilterOptionsPopover({
+ filterOptions,
+ availableGroupTypes,
+ onFilterOptionsChange,
+}: FilterOptionsPopoverProps) {
+ return (
+ <Box w="20rem" p="md">
+ <Stack>
+ {availableGroupTypes.length > 0 && (
+ <TypeFilterPicker
+ filterOptions={filterOptions}
+ availableGroupTypes={availableGroupTypes}
+ onFilterOptionsChange={onFilterOptionsChange}
+ />
+ )}
+ <LocationFilterPicker
+ filterOptions={filterOptions}
+ onFilterOptionsChange={onFilterOptionsChange}
+ />
+ </Stack>
+ </Box>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/LocationFilterPicker/LocationFilterPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/LocationFilterPicker/LocationFilterPicker.tsx
similarity index 65%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/LocationFilterPicker/LocationFilterPicker.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/LocationFilterPicker/LocationFilterPicker.tsx
index 89f3eb181ed..dbc2eec093d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/LocationFilterPicker/LocationFilterPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/LocationFilterPicker/LocationFilterPicker.tsx
@@ -1,27 +1,28 @@
import type { ChangeEvent } from "react";
import { t } from "ttag";
-import type * as Urls from "metabase/lib/urls";
import { Checkbox, Input, Stack } from "metabase/ui";
+import type { DependencyFilterOptions } from "../../../types";
+
type LocationFilterPickerProps = {
- params: Urls.DependencyListParams;
- onParamsChange: (params: Urls.DependencyListParams) => void;
+ filterOptions: DependencyFilterOptions;
+ onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
};
export function LocationFilterPicker({
- params,
- onParamsChange,
+ filterOptions,
+ onFilterOptionsChange,
}: LocationFilterPickerProps) {
- const { includePersonalCollections = true } = params;
+ const { includePersonalCollections } = filterOptions;
const handleIncludeInPersonalCollectionsChange = (
event: ChangeEvent<HTMLInputElement>,
) => {
const newValue = event.target.checked;
- onParamsChange({
- ...params,
- includePersonalCollections: newValue ? undefined : false,
+ onFilterOptionsChange({
+ ...filterOptions,
+ includePersonalCollections: newValue,
});
};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/LocationFilterPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/LocationFilterPicker/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/LocationFilterPicker/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/LocationFilterPicker/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/TypeFilterPicker/TypeFilterPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/TypeFilterPicker/TypeFilterPicker.tsx
similarity index 51%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/TypeFilterPicker/TypeFilterPicker.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/TypeFilterPicker/TypeFilterPicker.tsx
index 87299ea6517..9bbf898ff24 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/TypeFilterPicker/TypeFilterPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/TypeFilterPicker/TypeFilterPicker.tsx
@@ -1,30 +1,25 @@
import { useState } from "react";
import { t } from "ttag";
-import type * as Urls from "metabase/lib/urls";
import { Checkbox, Stack } from "metabase/ui";
+import type { DependencyGroupType } from "metabase-types/api";
-import { getDependencyGroupTypeInfo } from "../../../../../utils";
-import type { DependencyListMode } from "../../../types";
-import { getAvailableGroupTypes } from "../../../utils";
+import type { DependencyFilterOptions } from "../../../types";
+import { getDependencyGroupTypeInfo } from "../../../utils";
type TypeFilterPickerProps = {
- mode: DependencyListMode;
- params: Urls.DependencyListParams;
- onParamsChange: (params: Urls.DependencyListParams) => void;
+ filterOptions: DependencyFilterOptions;
+ availableGroupTypes: DependencyGroupType[];
+ onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
};
export function TypeFilterPicker({
- mode,
- params,
- onParamsChange,
+ filterOptions,
+ availableGroupTypes,
+ onFilterOptionsChange,
}: TypeFilterPickerProps) {
- const availableGroupTypes = getAvailableGroupTypes(mode);
-
- // preserve selected options in state to allow to deselect all types
- // until the popover is closed
- const [groupTypes, setGroupTypes] = useState(
- params.groupTypes ?? availableGroupTypes,
+ const [selectedGroupTypes, setSelectedGroupTypes] = useState(
+ filterOptions.groupTypes ?? availableGroupTypes,
);
const groupOptions = availableGroupTypes.map((groupType) => ({
@@ -36,20 +31,19 @@ export function TypeFilterPicker({
const newGroupTypes = availableGroupTypes.filter((groupType) =>
newValue.includes(groupType),
);
- setGroupTypes(newGroupTypes);
- onParamsChange({
- ...params,
- groupTypes:
- newGroupTypes.length === availableGroupTypes.length
- ? undefined
- : newGroupTypes,
+ const isFullSelection = newGroupTypes.length === availableGroupTypes.length;
+
+ setSelectedGroupTypes(newGroupTypes);
+ onFilterOptionsChange({
+ ...filterOptions,
+ groupTypes: isFullSelection ? availableGroupTypes : newGroupTypes,
});
};
return (
<Checkbox.Group
label={t`Entity type`}
- value={groupTypes}
+ value={selectedGroupTypes}
onChange={handleChange}
>
<Stack gap="sm" mt="sm">
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/TypeFilterPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/TypeFilterPicker/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/FilterOptionsPicker/TypeFilterPicker/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/TypeFilterPicker/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/FilterOptionsPicker/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/SortOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
similarity index 59%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/SortOptionsPicker.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
index 5927d97fac5..c660aa8712b 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/SortOptionsPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
@@ -9,22 +9,24 @@ import {
SegmentedControl,
Stack,
} from "metabase/ui";
-import type { DependencyGroupType } from "metabase-types/api";
+import {
+ DEPENDENCY_SORT_DIRECTIONS,
+ type DependencySortColumn,
+} from "metabase-types/api";
-import type { SortColumn, SortDirection, SortOptions } from "../../types";
-import { canSortByColumn } from "../../utils";
+import type { DependencySortOptions } from "../../types";
import { getSortColumnItems, getSortDirectionItems } from "./utils";
type SortOptionsPickerProps = {
- groupType: DependencyGroupType;
- sortOptions: SortOptions;
- onSortOptionsChange: (sortOptions: SortOptions) => void;
+ sortOptions: DependencySortOptions;
+ availableSortColumns: DependencySortColumn[];
+ onSortOptionsChange: (sortOptions: DependencySortOptions) => void;
};
export function SortOptionsPicker({
- groupType,
sortOptions,
+ availableSortColumns,
onSortOptionsChange,
}: SortOptionsPickerProps) {
const [isOpened, { toggle, close }] = useDisclosure();
@@ -38,8 +40,8 @@ export function SortOptionsPicker({
</Popover.Target>
<Popover.Dropdown>
<SortOptionsPopover
- groupType={groupType}
sortOptions={sortOptions}
+ availableSortColumns={availableSortColumns}
onSortOptionsChange={onSortOptionsChange}
/>
</Popover.Dropdown>
@@ -48,29 +50,34 @@ export function SortOptionsPicker({
}
type SortOptionsPopoverProps = {
- groupType: DependencyGroupType;
- sortOptions: SortOptions;
- onSortOptionsChange: (sortOptions: SortOptions) => void;
+ sortOptions: DependencySortOptions;
+ availableSortColumns: DependencySortColumn[];
+ onSortOptionsChange: (sortOptions: DependencySortOptions) => void;
};
function SortOptionsPopover({
- groupType,
sortOptions,
+ availableSortColumns,
onSortOptionsChange,
}: SortOptionsPopoverProps) {
- const columnItems = getSortColumnItems().filter((option) =>
- canSortByColumn(groupType, option.value),
- );
+ const columnItems = getSortColumnItems(availableSortColumns);
- const handleColumnChange = (column: string) => {
- onSortOptionsChange({ ...sortOptions, column: column as SortColumn });
+ const handleColumnChange = (newValue: string) => {
+ const newColumn = availableSortColumns.find(
+ (column) => column === newValue,
+ );
+ if (newColumn != null) {
+ onSortOptionsChange({ ...sortOptions, column: newColumn });
+ }
};
- const handleDirectionChange = (direction: string) => {
- onSortOptionsChange({
- ...sortOptions,
- direction: direction as SortDirection,
- });
+ const handleDirectionChange = (newValue: string) => {
+ const newDirection = DEPENDENCY_SORT_DIRECTIONS.find(
+ (direction) => direction === newValue,
+ );
+ if (newDirection != null) {
+ onSortOptionsChange({ ...sortOptions, direction: newDirection });
+ }
};
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts
new file mode 100644
index 00000000000..1b27be857c1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts
@@ -0,0 +1,16 @@
+import type { ReactNode } from "react";
+
+import type {
+ DependencySortColumn,
+ DependencySortDirection,
+} from "metabase-types/api";
+
+export type SortColumnItem = {
+ value: DependencySortColumn;
+ label: string;
+};
+
+export type SortDirectionItem = {
+ value: DependencySortDirection;
+ 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/SortOptionsPicker/utils.tsx
similarity index 61%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/utils.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/utils.tsx
index 524f84d7b1f..1bb56d55d6d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/SortOptionsPicker/utils.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/utils.tsx
@@ -1,20 +1,22 @@
import { t } from "ttag";
import { FixedSizeIcon } from "metabase/ui";
-
-import { SORT_COLUMNS } from "../../constants";
-import type { SortColumn } from "../../types";
+import type { DependencySortColumn } from "metabase-types/api";
import type { SortColumnItem, SortDirectionItem } from "./types";
-export function getSortColumnItems(): SortColumnItem[] {
- const allLabels: Record<SortColumn, string> = {
+export function getSortColumnItems(
+ availableSortColumns: DependencySortColumn[],
+): SortColumnItem[] {
+ const allLabels: Record<DependencySortColumn, string> = {
name: t`Name`,
location: t`Location`,
"view-count": t`View count`,
+ "dependents-errors": t`Problems`,
+ "dependents-with-errors": t`Broken dependents`,
};
- return SORT_COLUMNS.map((column) => ({
+ return availableSortColumns.map((column) => ({
value: column,
label: allLabels[column],
}));
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/constants.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/constants.ts
index 2de436790d7..f66562beeb0 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/constants.ts
@@ -1 +1,3 @@
+export const DEPENDENTS_SEARCH_THRESHOLD = 5;
+export const DEFAULT_INCLUDE_PERSONAL_COLLECTIONS = true;
export const TOOLTIP_OPEN_DELAY_MS = 700;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts
index cfee14f0851..e2bbb05331f 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts
@@ -1,13 +1,8 @@
-import type {
- DependencySortColumn,
- DependencySortDirection,
-} from "metabase-types/api";
-
export type DependencyListQueryParams = {
- page?: string;
- query?: string;
- "group-types"?: string | string[];
- "include-personal-collections"?: string;
- "sort-column"?: DependencySortColumn;
- "sort-direction"?: DependencySortDirection;
+ page?: unknown;
+ group_types?: unknown;
+ query?: unknown;
+ include_personal_collections?: unknown;
+ sort_column?: unknown;
+ sort_direction?: unknown;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts
index d2709536bd5..fc657ae11ea 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts
@@ -18,24 +18,16 @@ import type { DependencyListQueryParams } from "./types";
export function parseParams(
params: DependencyListQueryParams,
): Urls.DependencyListParams {
- const sortColumn = parseEnum(params["sort-column"], DEPENDENCY_SORT_COLUMNS);
- const sortDirection = parseEnum(
- params["sort-direction"],
- DEPENDENCY_SORT_DIRECTIONS,
- );
-
return {
+ page: parseNumber(params.page),
query: parseString(params.query),
- groupTypes: parseList(params["group-types"], (item) =>
+ groupTypes: parseList(params.group_types, (item) =>
parseEnum(item, DEPENDENCY_GROUP_TYPES),
),
includePersonalCollections: parseBoolean(
- params["include-personal-collections"],
+ params.include_personal_collections,
),
- sorting:
- sortColumn != null && sortDirection != null
- ? { column: sortColumn, direction: sortDirection }
- : undefined,
- page: parseNumber(params.page),
+ sortColumn: parseEnum(params.sort_column, DEPENDENCY_SORT_COLUMNS),
+ sortDirection: parseEnum(params.sort_direction, DEPENDENCY_SORT_DIRECTIONS),
};
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts
index af29f072b64..ee4efdd813c 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts
@@ -3,6 +3,8 @@ import type { IconName } from "metabase/ui";
import type {
AnalysisFindingErrorType,
DependencyGroupType,
+ DependencySortColumn,
+ DependencySortDirection,
} from "metabase-types/api";
export type NodeId = string;
@@ -41,3 +43,13 @@ export type DependencyErrorInfo = {
label: string;
detail?: string | null;
};
+
+export type DependencyFilterOptions = {
+ groupTypes: DependencyGroupType[];
+ includePersonalCollections: boolean;
+};
+
+export type DependencySortOptions = {
+ column: DependencySortColumn;
+ direction: DependencySortDirection;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
index f934c066fde..6204d1d8e82 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
@@ -396,6 +396,26 @@ export function getNodeLastEditedBy(node: DependencyNode): LastEditInfo | null {
}
}
+export function canHaveViewCount(groupType: DependencyGroupType): boolean {
+ switch (groupType) {
+ case "question":
+ case "dashboard":
+ case "document":
+ return true;
+ // view_count is not calculated property for models and metrics since
+ // they are typically not run directly
+ case "table":
+ case "model":
+ case "metric":
+ case "transform":
+ case "snippet":
+ case "sandbox":
+ case "segment":
+ case "measure":
+ return false;
+ }
+}
+
export function getNodeViewCount(node: DependencyNode): number | null {
switch (node.type) {
case "card":
@@ -573,6 +593,16 @@ export function getDependentGroups(node: DependencyNode): DependentGroup[] {
return groups.filter(({ count }) => count !== 0);
}
+export function getDependentsCount(node: DependencyNode): number {
+ if (node.dependents_count == null) {
+ return 0;
+ }
+ return Object.values(node.dependents_count).reduce(
+ (total, count) => total + count,
+ 0,
+ );
+}
+
export function getDependencyGroupTitle(
node: DependencyNode,
groups: DependentGroup[],
diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.ts
index a36952f6d5e..a305d5b8e6a 100644
--- a/frontend/src/metabase-types/api/card.ts
+++ b/frontend/src/metabase-types/api/card.ts
@@ -32,7 +32,9 @@ import type { UserInfo } from "./user";
import type { CardDisplayType, VisualizationDisplay } from "./visualization";
import type { SmartScalarComparison } from "./visualization-settings";
-export type CardType = "model" | "question" | "metric";
+export const CARD_TYPES = ["model", "question", "metric"] as const;
+export type CardType = (typeof CARD_TYPES)[number];
+
export type CardDashboardInfo = Pick<Dashboard, "id" | "name">;
export type CardDocumentInfo = Pick<Document, "id" | "name">;
diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.ts
index 76e5d26f81b..96ca5ff39f6 100644
--- a/frontend/src/metabase-types/api/dependencies.ts
+++ b/frontend/src/metabase-types/api/dependencies.ts
@@ -250,8 +250,12 @@ export type ListNodeDependentsRequest = {
type: DependencyType;
dependent_types?: DependencyType[];
dependent_card_types?: CardType[];
+ query?: string;
broken?: boolean;
+ include_personal_collections?: boolean;
archived?: boolean;
+ sort_column?: DependencySortColumn;
+ sort_direction?: DependencySortDirection;
};
export type CheckDependenciesResponse = {
@@ -272,6 +276,7 @@ export type CheckTransformDependenciesRequest = Pick<Transform, "id"> &
export const DEPENDENCY_SORT_COLUMNS = [
"name",
"location",
+ "view-count",
"dependents-errors",
"dependents-with-errors",
] as const;
@@ -281,18 +286,6 @@ export const DEPENDENCY_SORT_DIRECTIONS = ["asc", "desc"] as const;
export type DependencySortDirection =
(typeof DEPENDENCY_SORT_DIRECTIONS)[number];
-export type DependencySortingOptions = {
- column: DependencySortColumn;
- direction: DependencySortDirection;
-};
-
-/**
- * Entity types that can be the source of validation errors (breaking other entities).
- * Only tables and cards can be sources of errors in analysis_finding_error.
- */
-export const BREAKING_ENTITY_TYPES = ["card", "table"] as const;
-export type BreakingEntityType = (typeof BREAKING_ENTITY_TYPES)[number];
-
export type ListBrokenGraphNodesRequest = PaginationRequest & {
types?: DependencyType[];
card_types?: CardType[];
diff --git a/frontend/src/metabase/lib/urls/dependencies.ts b/frontend/src/metabase/lib/urls/dependencies.ts
index e6c7f716b1a..6b807c98d61 100644
--- a/frontend/src/metabase/lib/urls/dependencies.ts
+++ b/frontend/src/metabase/lib/urls/dependencies.ts
@@ -1,7 +1,8 @@
import type {
DependencyEntry,
DependencyGroupType,
- DependencySortingOptions,
+ DependencySortColumn,
+ DependencySortDirection,
} from "metabase-types/api";
const BASE_URL = `/data-studio`;
@@ -31,42 +32,46 @@ export function dependencyTasks() {
}
export type DependencyListParams = {
+ page?: number;
query?: string;
groupTypes?: DependencyGroupType[];
includePersonalCollections?: boolean;
- sorting?: DependencySortingOptions;
- page?: number;
+ sortColumn?: DependencySortColumn;
+ sortDirection?: DependencySortDirection;
};
function dependencyListQueryString({
+ page,
query,
groupTypes,
includePersonalCollections,
- sorting,
- page,
+ sortColumn,
+ sortDirection,
}: DependencyListParams = {}) {
const searchParams = new URLSearchParams();
+ if (page != null) {
+ searchParams.set("page", String(page));
+ }
if (query != null) {
searchParams.set("query", query);
}
if (groupTypes != null) {
groupTypes.forEach((groupType) => {
- searchParams.append("group-types", groupType);
+ searchParams.append("group_types", groupType);
});
}
if (includePersonalCollections != null) {
searchParams.set(
- "include-personal-collections",
+ "include_personal_collections",
String(includePersonalCollections),
);
}
- if (sorting != null) {
- searchParams.set("sort-column", sorting.column);
- searchParams.set("sort-direction", sorting.direction);
+ if (sortColumn != null) {
+ searchParams.set("sort_column", sortColumn);
}
- if (page != null) {
- searchParams.set("page", String(page));
+ if (sortDirection != null) {
+ searchParams.set("sort_direction", sortDirection);
}
const queryString = searchParams.toString();
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index c6696ec68a3..f32771b12f6 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -402,6 +402,8 @@ import schema_component from "./schema.svg?component";
import schema_source from "./schema.svg?source";
import search_component from "./search.svg?component";
import search_source from "./search.svg?source";
+import search_check_component from "./search_check.svg?component";
+import search_check_source from "./search_check.svg?source";
import section_component from "./section.svg?component";
import section_source from "./section.svg?source";
import segment_component from "./segment.svg?component";
@@ -1379,6 +1381,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: search_component,
source: search_source,
},
+ search_check: {
+ component: search_check_component,
+ source: search_check_source,
+ },
section: {
component: section_component,
source: section_source,
@@ -1866,6 +1872,7 @@ export type IconName =
| "ruler"
| "schema"
| "search"
+ | "search_check"
| "section"
| "segment"
| "segment2"
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/search_check.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/search_check.svg
new file mode 100644
index 00000000000..4efb7602be9
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/search_check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#071722" fill-opacity=".74" d="M7.333 1.25a6.084 6.084 0 0 1 6.084 6.083c0 1.41-.481 2.706-1.286 3.737l2.4 2.4a.752.752 0 0 1-1.061 1.061l-2.4-2.4a6.06 6.06 0 0 1-3.737 1.286 6.084 6.084 0 0 1 0-12.167m0 1.5a4.583 4.583 0 1 0 0 9.167 4.583 4.583 0 0 0 0-9.167m1.47 2.72a.75.75 0 0 1 1.06 1.06L7.196 9.197a.75.75 0 0 1-1.06 0L4.803 7.863a.75.75 0 0 1 1.06-1.06l.803.802z"/></svg>