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
Do not pick unsupported databases automatically in transforms (#64406)
Romeo Van Snick2a6741df9cf5
diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.tsindex e23251abb2e..43e2f739a49 100644--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts@@ -1568,12 +1568,6 @@ LIMITgetQueryEditor().findByLabelText("Import common library").click();H.PythonEditor.value().should("contain", "import common");- cy.findByTestId("python-data-picker")- .findByText("Select a database")- .click();-- H.popover().findByText(DB_NAME).click();-cy.findByTestId("python-data-picker").findByText("Select a table…").click();@@ -2317,6 +2311,39 @@ describe("scenarios > admin > transforms > runs", () => {});});+describe("scenarios > admin > transforms", () => {+ beforeEach(() => {+ H.restore();+ H.resetSnowplow();+ cy.signInAsAdmin();+ H.activateToken("bleeding-edge");+ });++ afterEach(() => {+ H.expectNoBadSnowplowEvents();+ });++ it("should not pick the only database when it is disabled in SQL editor", () => {+ cy.log("create a new transform");+ visitTransformListPage();+ cy.button("Create a transform").click();+ H.popover().findByText("SQL query").click();++ cy.findByTestId("gui-builder-data")+ .findByText("Select a database")+ .should("be.visible");+ });++ it("should not pick the only database when it is disabled in Python editor", () => {+ cy.log("create a new transform");+ visitTransformListPage();+ cy.button("Create a transform").click();+ H.popover().findByText("Python script").click();++ getPythonDataPicker().findByText("Select a database").should("be.visible");+ });+});+function getTransformsNavLink() {return H.DataStudio.nav().findByRole("link", { name: "Transforms" });}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsxindex 53f6ef31094..be5db6e174e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx@@ -10,6 +10,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { DatabaseDataSelector } from "metabase/query_builder/components/DataSelector";import { Box, Button, Icon, Stack, Text } from "metabase/ui";+import { doesDatabaseSupportTransforms } from "metabase-enterprise/transforms/utils";import type {Database,DatabaseId,@@ -162,6 +163,7 @@ export function PythonDataPicker({setDatabaseFn={handleDatabaseChange}databases={databases?.data ?? []}databaseIsDisabled={(database: Database) =>+ !doesDatabaseSupportTransforms(database) ||!hasFeature(database, "transforms/python")}/>diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsxindex 2c696817298..bf1073c5cb6 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx@@ -537,7 +537,7 @@ export class UnconnectedDataSelector extends Component {// for steps where there's a single option sometimes we want to automatically select it// if `useOnlyAvailable*` prop is providedskipSteps() {- const { readOnly } = this.props;+ const { readOnly, databaseIsDisabled } = this.props;const { activeStep } = this.state;if (readOnly) {@@ -550,8 +550,11 @@ export class UnconnectedDataSelector extends Component {this.props.selectedDatabaseId == null) {const databases = this.getDatabases();- if (databases && databases.length === 1) {- this.onChangeDatabase(databases[0]);+ const enabledDatabases = databases.filter(+ (db) => !databaseIsDisabled?.(db),+ );+ if (enabledDatabases.length >= 1) {+ this.onChangeDatabase(enabledDatabases[0]);}}if (@@ -620,7 +623,7 @@ export class UnconnectedDataSelector extends Component {if (!nextStep) {await this.setStateWithComputedState({...stateChange,- isPopoverOpen: !this.state.isPopoverOpen,+ isPopoverOpen: false,});} else {await this.switchToStep(nextStep, stateChange, skipSteps);