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
GDGT-1315 actualize a branch (#66571)
Egor Grushinf720766374f9
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.tsindex b4d2f65c9b4..4f0af2a0c50 100644--- a/e2e/support/helpers/e2e-datamodel-helpers.ts+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts@@ -13,9 +13,11 @@ export const DataModel = {TablePicker: {get: getTablePicker,getDatabase: getTablePickerDatabase,+ getDatabaseToggle: getTablePickerDatabaseToggle,getDatabases: getTablePickerDatabases,getSchemas: getTablePickerSchemas,getSchema: getTablePickerSchema,+ getSchemaToggle: getTablePickerSchemaToggle,getTables: getTablePickerTables,getTable: getTablePickerTable,getSearchInput: getTablePickerSearchInput,@@ -216,6 +218,10 @@ function getTablePickerDatabase(name: string) {.filter(`:contains("${name}")`);}+function getTablePickerDatabaseToggle(name: string) {+ return getTablePickerDatabase(name).find("[aria-expanded]");+}+function getTablePickerDatabases() {return cy.findAllByTestId("tree-item").filter('[data-type="database"]');}@@ -227,6 +233,10 @@ function getTablePickerSchema(name: string) {.filter(`:contains("${name}")`);}+function getTablePickerSchemaToggle(name: string) {+ return getTablePickerSchema(name).find("[aria-expanded]");+}+function getTablePickerSchemas() {return cy.findAllByTestId("tree-item").filter('[data-type="schema"]');}diff --git a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio-search.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio-search.cy.spec.tsindex 56c2527dc8b..3da6a6d90a1 100644--- a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio-search.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio-search.cy.spec.ts@@ -144,19 +144,16 @@ describe("Search", () => {TablePicker.getTable(table).should("be.visible");});- TablePicker.getDatabase(sampleDatabaseName).click();- TablePicker.getDatabase(sampleDatabaseName).click();+ TablePicker.getDatabaseToggle(sampleDatabaseName).click();sampleDbTables.forEach((table) => {TablePicker.getTable(table).should("not.exist");});TablePicker.getTable("Animals").should("have.length", 2);- TablePicker.getSchema(domesticSchema).click();- TablePicker.getSchema(domesticSchema).click();+ TablePicker.getSchemaToggle(domesticSchema).click();TablePicker.getTable("Animals").should("have.length", 1);- TablePicker.getDatabase(postgres).click();- TablePicker.getDatabase(postgres).click();+ TablePicker.getDatabaseToggle(postgres).click();TablePicker.getTables().should("have.length", 0);TablePicker.getDatabases().should("have.length", 2);});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.cssindex d5c1bb7bbdc..eaea45accbe 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css@@ -101,6 +101,10 @@display: flex;align-items: center;justify-content: center;++ &.hasChildren {+ cursor: pointer;+ }}.chevron {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsxindex c7d0fdad69f..04cc8c16b85 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx@@ -1,6 +1,12 @@import { useVirtualizer } from "@tanstack/react-virtual";import cx from "classnames";-import { type KeyboardEvent, useEffect, useMemo, useRef } from "react";+import {+ type KeyboardEvent,+ type MouseEvent,+ useEffect,+ useMemo,+ useRef,+} from "react";import { Link } from "react-router";import { useLatest } from "react-use";import { t } from "ttag";@@ -475,6 +481,17 @@ const ResultsItem = ({}};+ // Dedicated toggle target: always toggles expansion without navigating+ // regardless of whether the item is currently active.+ const handleChevronClick = (e: MouseEvent<HTMLDivElement>) => {+ if (disabled || !itemHasChildren) {+ return;+ }+ e.preventDefault();+ e.stopPropagation();+ toggle?.(key);+ };+return (<Flexcomponent={Link}@@ -524,7 +541,14 @@ const ResultsItem = ({<Flex align="center" py="xs" w="100%" pl={indent} gap="sm"><Flex align="flex-start" gap="xs" className={S.content}><Flex align="center" gap="xs">- <Box className={S.chevronSlot} w={INDENT_OFFSET}>+ <Box+ className={cx(S.chevronSlot, {+ [S.hasChildren]: itemHasChildren,+ })}+ w={INDENT_OFFSET}+ aria-expanded={Boolean(isExpanded)}+ onClick={handleChevronClick}+ >{itemHasChildren && (<Iconname="chevronright"