The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Make filtering in the deps graph consistent with the task lists (#68373)
Alexander Polyankine3ced91a436b
diff --git a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.tsindex a21f7e97fa6..62652e534d0 100644--- a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts@@ -611,25 +611,25 @@ describe("scenarios > dependencies > dependency graph", () => {});describe("dependent filtering", () => {- function verifyFilter({- filterName,- visibleItems,- hiddenItems,- }: {- filterName: string;- visibleItems: string[];- hiddenItems: string[];- }) {+ function toggleFilter({ filterName }: { filterName: string }) {H.DependencyGraph.dependencyPanel().icon("filter").click();H.popover().findByText(filterName).click();+ H.DependencyGraph.dependencyPanel().icon("filter").click();+ }++ function verifyItems({+ visibleItems = [],+ hiddenItems = [],+ }: {+ visibleItems?: string[];+ hiddenItems?: string[];+ }) {H.DependencyGraph.dependencyPanel().within(() => {visibleItems.forEach((item) =>cy.findByText(item).should("be.visible"),);hiddenItems.forEach((item) => cy.findByText(item).should("not.exist"));});- H.popover().findByText(filterName).click();- H.DependencyGraph.dependencyPanel().icon("filter").click();}it("should be able to filter questions", () => {@@ -666,16 +666,20 @@ describe("scenarios > dependencies > dependency graph", () => {.findByLabelText(TABLE_DISPLAY_NAME).findByText("5 questions").click();- verifyFilter({- filterName: "In a dashboard",- visibleItems: ["Question in dashboard"],- hiddenItems: [++ verifyItems({+ visibleItems: [+ "Question in dashboard",+ "Question in root collection","Question in first collection","Question in second collection",+ "Question in personal collection",],});- verifyFilter({- filterName: "Not in personal collection",+ toggleFilter({+ filterName: "Include items in personal collections",+ });+ verifyItems({visibleItems: ["Question in dashboard","Question in root collection",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.tsxindex 207edcd26fa..4687cf7d909 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@@ -17,10 +17,10 @@ import { DEPENDENTS_SEARCH_THRESHOLD } from "../constants";import S from "./GraphDependencyPanel.module.css";import { PanelBody } from "./PanelBody";import { PanelHeader } from "./PanelHeader";-import type { FilterOption } from "./types";import {canFilterByOption,canSortByColumn,+ getDefaultFilterOptions,getDefaultSortOptions,getListRequest,getVisibleNodes,@@ -49,7 +49,9 @@ export function GraphDependencyPanel({searchText.trim(),SEARCH_DEBOUNCE_DURATION,);- const [filterOptions, setFilterOptions] = useState<FilterOption[]>([]);+ const [filterOptions, setFilterOptions] = useState(() =>+ getDefaultFilterOptions(groupType),+ );const [sortOptions, setSortOptions] = useState(() =>getDefaultSortOptions(groupType),);@@ -60,7 +62,7 @@ export function GraphDependencyPanel({useLayoutEffect(() => {if (filterOptions.some((option) => !canFilterByOption(groupType, option))) {- setFilterOptions([]);+ setFilterOptions(getDefaultFilterOptions(groupType));}if (!canSortByColumn(groupType, sortOptions.column)) {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.tsxindex cefee9789fd..84f4377e079 100644--- 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@@ -67,12 +67,13 @@ function FilterOptionsPopover({};return (- <Box w="15rem" p="md">+ <Box w="20rem" p="md"><Checkbox.Group+ label={t`Location`}value={filterOptions}onChange={handleFilterOptionsChange}>- <Stack gap="0.75rem">+ <Stack gap="sm" mt="sm">{filterItems.map((item) => (<Checkbox key={item.value} value={item.value} label={item.label} />))}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.tsindex 81210acc15a..1853885891c 100644--- 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@@ -7,8 +7,7 @@ import type { FilterItem } from "./types";export function getFilterItems(): FilterItem[] {const allLabels: Record<FilterOption, string> = {- "in-dashboard": t`In a dashboard`,- "not-in-personal-collection": t`Not in personal collection`,+ "include-in-personal-collections": t`Include items in personal collections`,};return FILTER_OPTIONS.map((option) => ({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.tsindex 90921bb0981..78972e5dbc1 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/constants.ts@@ -1,8 +1,5 @@// defines the order of options in the UI-export const FILTER_OPTIONS = [- "in-dashboard",- "not-in-personal-collection",-] as const;+export const FILTER_OPTIONS = ["include-in-personal-collections"] as const;// defines the order of options in the UIexport 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.tsindex 30e07f326cf..78629ff4ebf 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/types.ts@@ -19,7 +19,10 @@ export type SearchOptions = {sortOptions: SortOptions;};-export type FilterCallback = (node: DependencyNode) => boolean;+export type FilterCallback = (+ node: DependencyNode,+ isEnabled: boolean,+) => boolean;export type SortCallback = (node1: DependencyNode,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.tsindex b27d9f19fd0..9bd7f325731 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@@ -42,17 +42,10 @@ function isMatchingSearchQuery(}const FILTERS: Record<FilterOption, FilterCallback> = {- "in-dashboard": (node) => {- switch (node.type) {- case "card": {- const dashboard = node.data.dashboard;- return dashboard != null;- }- default:- return false;+ "include-in-personal-collections": (node, isEnabled) => {+ if (isEnabled) {+ return true;}- },- "not-in-personal-collection": (node) => {switch (node.type) {case "card":case "dashboard":@@ -61,7 +54,7 @@ const FILTERS: Record<FilterOption, FilterCallback> = {return collection != null && !collection.is_personal;}default:- return false;+ return true;}},};@@ -72,14 +65,7 @@ export function canFilterByOption(): boolean {const type = getDependencyType(groupType);switch (option) {- case "in-dashboard":- switch (type) {- case "card":- return true;- default:- return false;- }- case "not-in-personal-collection":+ case "include-in-personal-collections":switch (type) {case "card":case "dashboard":@@ -95,15 +81,21 @@ export function canFilter(groupType: DependencyGroupType): boolean {return FILTER_OPTIONS.some((option) => canFilterByOption(groupType, option));}+export function getDefaultFilterOptions(+ groupType: DependencyGroupType,+): FilterOption[] {+ return FILTER_OPTIONS.filter((option) =>+ canFilterByOption(groupType, option),+ );+}+function isMatchingFilters(node: DependencyNode,filterOptions: FilterOption[],): boolean {- if (filterOptions.length === 0) {- return true;- }-- return filterOptions.every((option) => FILTERS[option](node));+ return FILTER_OPTIONS.every((option) =>+ FILTERS[option](node, filterOptions.includes(option)),+ );}const COMPARATORS: Record<SortColumn, SortCallback> = {