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
UXW-2623 Update dependency graph labels and icons for sql questions (#67870)
Gabriel Moreno2847a18d60e0
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj b/enterprise/backend/src/metabase_enterprise/dependencies/api.cljindex 4317177d7bf..f816416aa6d 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj@@ -152,7 +152,7 @@(def ^:private entity-keys{:table [:name :description :display_name :db_id :db :schema :fields]- :card [:name :type :display :database_id :view_count+ :card [:name :type :display :database_id :view_count :query_type:created_at :creator :creator_id :description:result_metadata :last-edit-info:collection :collection_id :dashboard :dashboard_id :document :document_id]@@ -292,7 +292,7 @@;; and others (like :last-edit-info, :view_count) are computed/added separately.;; This map only lists the base database columns to SELECT.(def ^:private entity-select-fields- {:card [:id :name :description :type :display :database_id :collection_id :dashboard_id :document_id :result_metadata+ {:card [:id :name :description :type :display :database_id :query_type :collection_id :dashboard_id :document_id :result_metadata:created_at :creator_id;; :card_schema always has to be selected:card_schema]diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsxindex b55e630ecfa..82ca8070032 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx@@ -20,10 +20,9 @@ import {import type { DependencyNode } from "metabase-types/api";import {- getDependencyGroupType,- getDependencyGroupTypeInfo,getNodeIcon,getNodeLabel,+ getNodeTypeInfo,isSameNode,} from "../../../utils";import { GraphContext } from "../GraphContext";@@ -44,7 +43,7 @@ export const GraphNode = memo(function ItemNode({}: GraphNodeProps) {const { selection, setSelection } = useContext(GraphContext);const label = getNodeLabel(node);- const typeInfo = getDependencyGroupTypeInfo(getDependencyGroupType(node));+ const typeInfo = getNodeTypeInfo(node);const groups = getDependentGroups(node);const sources = useNodeConnections({ handleType: "source" });const targets = useNodeConnections({ handleType: "target" });diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.tsindex dcf5d91c9b5..b6e7de16230 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts@@ -62,6 +62,7 @@ export function getNodeIcon(node: DependencyNode): IconName {node.type,node.type === "card" ? node.data.type : undefined,node.type === "card" ? node.data.display : undefined,+ node.type === "card" ? node.data.query_type : undefined,);}@@ -69,11 +70,15 @@ export function getNodeIconWithType(type: DependencyType,cardType?: CardType,cardDisplay?: VisualizationDisplay,+ queryType?: "native" | "query",): IconName {switch (type) {case "card":switch (cardType) {case "question":+ if (queryType === "native") {+ return "sql";+ }return cardDisplay != null? (visualizations.get(cardDisplay)?.iconName ?? "table2"): "table2";@@ -89,7 +94,7 @@ export function getNodeIconWithType(case "transform":return "transform";case "snippet":- return "sql";+ return "snippet";case "dashboard":return "dashboard";case "document":@@ -497,6 +502,20 @@ export function getDependencyGroupTypeInfo(}}+export function getNodeTypeInfo(node: DependencyNode): DependencyGroupTypeInfo {+ // For SQL questions, return a special label+ if (+ node.type === "card" &&+ node.data.type === "question" &&+ node.data.query_type === "native"+ ) {+ return { label: t`SQL question`, color: "text-secondary" };+ }++ // For all other cases, use the standard group type info+ return getDependencyGroupTypeInfo(getDependencyGroupType(node));+}+export function getDependencyTypes(groupTypes: DependencyGroupType[],): DependencyType[] {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.tsindex b2e46b3106f..f55da5c4441 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts@@ -13,8 +13,8 @@ import {createMockTransformDependencyNode,} from "metabase-types/api/mocks";-import type { NodeLink } from "./types";-import { getNodeIcon, getNodeLink } from "./utils";+import type { DependencyGroupTypeInfo, NodeLink } from "./types";+import { getNodeIcon, getNodeLink, getNodeTypeInfo } from "./utils";registerVisualizations();@@ -28,10 +28,21 @@ describe("getNodeIcon", () => {data: createMockCardDependencyNodeData({type: "question",display: "pie",+ query_type: "query",}),}),expectedIcon: "pie",},+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "question",+ display: "table",+ query_type: "native",+ }),+ }),+ expectedIcon: "sql",+ },{node: createMockCardDependencyNode({data: createMockCardDependencyNodeData({@@ -60,7 +71,7 @@ describe("getNodeIcon", () => {},{node: createMockSnippetDependencyNode(),- expectedIcon: "sql",+ expectedIcon: "snippet",},])("should get the $node.type node icon", ({ node, expectedIcon }) => {expect(getNodeIcon(node)).toBe(expectedIcon);@@ -143,3 +154,58 @@ describe("getNodeLink", () => {expect(getNodeLink(node)).toEqual(expectedLink);});});++describe("getNodeTypeInfo", () => {+ it.each<{+ node: DependencyNode;+ expectedTypeInfo: DependencyGroupTypeInfo;+ }>([+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "question",+ query_type: "native",+ }),+ }),+ expectedTypeInfo: { label: "SQL question", color: "text-secondary" },+ },+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "question",+ query_type: "query",+ }),+ }),+ expectedTypeInfo: { label: "Question", color: "text-secondary" },+ },+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "model",+ }),+ }),+ expectedTypeInfo: { label: "Model", color: "brand" },+ },+ {+ node: createMockCardDependencyNode({+ data: createMockCardDependencyNodeData({+ type: "metric",+ }),+ }),+ expectedTypeInfo: { label: "Metric", color: "summarize" },+ },+ {+ node: createMockTableDependencyNode(),+ expectedTypeInfo: { label: "Table", color: "brand" },+ },+ {+ node: createMockSnippetDependencyNode(),+ expectedTypeInfo: { label: "Snippet", color: "text-secondary" },+ },+ ])(+ "should get the $node.type node type info",+ ({ node, expectedTypeInfo }) => {+ expect(getNodeTypeInfo(node)).toEqual(expectedTypeInfo);+ },+ );+});diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.tsindex a73f88d7d18..5c2a76ad54f 100644--- a/frontend/src/metabase-types/api/dependencies.ts+++ b/frontend/src/metabase-types/api/dependencies.ts@@ -84,8 +84,10 @@ export type CardDependencyNodeData = Pick<| "creator"| "created_at"| "last-edit-info"- | "view_count"->;+> & {+ view_count?: number | null;+ query_type?: "native" | "query";+};export type SnippetDependencyNodeData = Pick<NativeQuerySnippet,diff --git a/frontend/src/metabase-types/api/mocks/dependencies.ts b/frontend/src/metabase-types/api/mocks/dependencies.tsindex a62acdd026f..a07776ea09c 100644--- a/frontend/src/metabase-types/api/mocks/dependencies.ts+++ b/frontend/src/metabase-types/api/mocks/dependencies.ts@@ -60,6 +60,7 @@ export function createMockCardDependencyNodeData(description: null,type: "question",display: "table",+ query_type: "query",dashboard_id: 1,collection_id: null,result_metadata: [],diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsxindex 999168f0d73..e3072ac4db4 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx@@ -40,7 +40,6 @@ export const SearchInputContainer = styled.div<{}return css`background-color: var(--mb-color-background-primary);-&:hover {background-color: var(--mb-color-background-secondary);}