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
Fix library tree auto-expand race leaving Data/Metrics collapsed (#76167)
Nick Fitzpatricke809dd2715e4
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.tsindex 920d7e0516b..c20a2a1ddeb 100644--- a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts@@ -125,6 +125,8 @@ describe("bulk table operations", { viewportWidth: 1600 }, () => {cy.log("select multiple tables");TablePicker.getDatabase("Writable Postgres12").click();+ // wait for the database's tables to load before selecting them+ cy.wait("@getSchema");TablePicker.getTable("Orders").findByRole("checkbox").check();TablePicker.getTable("Products").findByRole("checkbox").check();TablePicker.getTable("Reviews").findByRole("checkbox").check();diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsxindex 0e5235846b8..9f558c17d57 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx@@ -51,6 +51,7 @@ function LibraryPageContent() {const { treeTableInstance, isChildrenLoading, isLoading, emptyMessage } =useLibraryTreeTableInstance({collections,+ isLoadingCollections,searchQuery,onPublishTableClick: openPublishTableModal,});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsxindex e24288e6a07..7ead86d87f6 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsx@@ -31,12 +31,14 @@ import { useLibrarySearch } from "./useLibrarySearch";type Params = {collections: Collection[];+ isLoadingCollections: boolean;searchQuery: string;onPublishTableClick: VoidFunction;};export function useLibraryTreeTableInstance({collections,+ isLoadingCollections,searchQuery,onPublishTableClick,}: Params) {@@ -99,7 +101,11 @@ export function useLibraryTreeTableInstance({);const isLoading =- loadingTables || loadingMetrics || loadingSnippets || isSearchLoading;+ isLoadingCollections ||+ loadingTables ||+ loadingMetrics ||+ loadingSnippets ||+ isSearchLoading;useErrorHandling(tablesError || metricsError || snippetsError);const libraryHasContent = useMemo(@@ -226,8 +232,8 @@ export function useLibraryTreeTableInstance({null,);- // Initialize browseExpanded from defaultExpanded once collections are loaded,- // so we stop falling through to a recalculated defaultExpanded on every render.+ // Lock browseExpanded once loading settles. isLoading now includes the collections fetch, so it+ // no longer fires early (section item queries are skipped until collections resolve).useEffect(() => {if (browseExpanded === null &&