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
Block database routing when transforms already exist (#71931)
Eric Normandcbc40606efe4
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex b769d9fbedc..63c8b80850e 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -2821,7 +2821,8 @@warehouse-schemawarehouses}:model-exports #{:model/DatabaseRouter}- :model-imports #{:model/Database}}+ :model-imports #{:model/Database+ :model/Transform}}enterprise/dependencies{:team "Graphy"@@ -2948,7 +2949,6 @@premium-features}:model-imports #{:model/Card :model/Collection :model/Table}}-enterprise/metabot{:team "Metabot":api #{}@@ -2966,7 +2966,6 @@enterprise/transforms-python}:model-imports #{:model/Card :model/Transform}}-enterprise/permission-debug{:team "UX West":api #{metabase-enterprise.permission-debug.api}diff --git a/enterprise/backend/src/metabase_enterprise/database_routing/api.clj b/enterprise/backend/src/metabase_enterprise/database_routing/api.cljindex 0d5e08afead..457f5e2b6f4 100644--- a/enterprise/backend/src/metabase_enterprise/database_routing/api.clj+++ b/enterprise/backend/src/metabase_enterprise/database_routing/api.clj@@ -110,6 +110,7 @@(api/check-400 (not (:router_database_id db)) "Cannot make a destination database a router database")(api/check-400 (not (:uploads_enabled db)) "Cannot enable database routing for a database with uploads enabled")(api/check-400 (not (:write_data_details db)) "Cannot enable database routing for a database with a write connection configured")+ (api/check-400 (not (t2/exists? :model/Transform :source_database_id id)) "Cannot enable database routing for a database with transforms")(setting/with-database db(api/check-400 (not (setting/get :persist-models-enabled)) "Cannot enable database routing for a database with model persistence enabled")(api/check-400 (not (setting/get :database-enable-actions)) "Cannot enable database routing for a database with actions enabled")))diff --git a/enterprise/backend/test/metabase_enterprise/database_routing/api_test.clj b/enterprise/backend/test/metabase_enterprise/database_routing/api_test.cljindex 3a566509a91..f88ab6dec51 100644--- a/enterprise/backend/test/metabase_enterprise/database_routing/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/database_routing/api_test.clj@@ -133,6 +133,12 @@(mt/with-temp [:model/Database {router-db-id :id} {}:model/Database {db-id :id} {:router_database_id router-db-id}](is (= "Cannot make a destination database a router database"+ (mt/user-http-request :crowberto :put 400 (str "ee/database-routing/router-database/" db-id)+ {:user_attribute "db_name"}))))+ (mt/with-temp [:model/Database {db-id :id} {}+ :model/Transform _ {:source_database_id db-id+ :name "Test Transform"}]+ (is (= "Cannot enable database routing for a database with transforms"(mt/user-http-request :crowberto :put 400 (str "ee/database-routing/router-database/" db-id){:user_attribute "db_name"})))))diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsxindex 8e461456d8f..5f7a3e0ed3b 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx@@ -11,7 +11,11 @@ import {DatabaseInfoSectionDivider,} from "metabase/admin/databases/components/DatabaseInfoSection";import { hasDbRoutingEnabled } from "metabase/admin/databases/utils";-import { skipToken, useListUserAttributesQuery } from "metabase/api";+import {+ skipToken,+ useListTransformsQuery,+ useListUserAttributesQuery,+} from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { useSetting } from "metabase/common/hooks";import { useToast } from "metabase/common/hooks/use-toast";@@ -81,7 +85,15 @@ export const DatabaseRoutingSection = ({const userAttributeOptions =userAttrsReq.data ?? (userAttribute ? [userAttribute] : []);- const disabledFeatMsg = getDisabledFeatureMessage(database);+ const transformsQuery = useListTransformsQuery(+ shouldHideSection ? skipToken : { "database-id": database.id },+ );+ const transforms = transformsQuery.data ?? [];+ const hasTransforms = transforms.length > 0;++ const disabledFeatMsg = getDisabledFeatureMessage(database, {+ hasTransforms,+ });const errMsg = getSelectErrorMessage({userAttribute,disabledFeatureMessage: disabledFeatMsg,diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsxindex 66f3110b7ff..52e7673318d 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx@@ -1,5 +1,6 @@import {setupDatabasesEndpoints,+ setupListTransformsEndpoint,setupUserAttributesEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";@@ -22,6 +23,7 @@ interface SetupOpts {const setup = ({ database = createMockDatabase() }: SetupOpts = {}) => {setupUserAttributesEndpoint(["cool_guy", "boss_gal"]);setupDatabasesEndpoints([database]);+ setupListTransformsEndpoint([]);renderWithProviders(<DatabaseRoutingSection database={database} />, {storeInitialState: {diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsxindex dd29e4f966b..f44bb66cc43 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx@@ -12,7 +12,10 @@ import {import { Text } from "metabase/ui";import type { Database } from "metabase-types/api";-export const getDisabledFeatureMessage = (database: Database) => {+export const getDisabledFeatureMessage = (+ database: Database,+ { hasTransforms = false }: { hasTransforms?: boolean } = {},+) => {return match({hasActionsEnabled: hasActionsEnabled(database),hasWorkspacesEnabled: hasWorkspacesEnabled(database),@@ -21,6 +24,7 @@ export const getDisabledFeatureMessage = (database: Database) => {isUploadDb: database.uploads_enabled,supportsRouting: !!database.features?.includes("database-routing"),hasWritableConnection: hasWritableConnectionDetails(database),+ hasTransforms,}).with({ supportsRouting: false },@@ -58,6 +62,10 @@ export const getDisabledFeatureMessage = (database: Database) => {{ hasTableEditingEnabled: true },() => t`Database routing can't be enabled when table editing is enabled.`,)+ .with(+ { hasTransforms: true },+ () => t`Database routing can't be enabled when transforms exist.`,+ ).otherwise(() => undefined);};diff --git a/frontend/src/metabase-types/api/transform.ts b/frontend/src/metabase-types/api/transform.tsindex 3c5ab4c2300..d52ae1c1b54 100644--- a/frontend/src/metabase-types/api/transform.ts+++ b/frontend/src/metabase-types/api/transform.ts@@ -253,6 +253,7 @@ export type ListTransformsRequest = {"last-run-start-time"?: string;"last-run-statuses"?: TransformRunStatus[];"tag-ids"?: TransformTagId[];+ "database-id"?: DatabaseId;};export type ListTransformJobsRequest = {diff --git a/src/metabase/transforms/crud.clj b/src/metabase/transforms/crud.cljindex c4ffd1468f7..374be5a9cd5 100644--- a/src/metabase/transforms/crud.clj+++ b/src/metabase/transforms/crud.clj@@ -66,10 +66,12 @@(defn get-transforms"Get a list of transforms."- [& {:keys [last-run-start-time last-run-statuses tag-ids]}]+ [& {:keys [last-run-start-time last-run-statuses tag-ids database-id]}](let [enabled-types (transforms.u/enabled-source-types-for-user)](api/check-403 (seq enabled-types))- (let [transforms (t2/select :model/Transform {:where [:in :source_type enabled-types]+ (let [transforms (t2/select :model/Transform {:where (into [:and [:in :source_type enabled-types]]+ (when database-id+ [[:= :source_database_id database-id]])):order-by [[:id :asc]]})](->> (t2/hydrate transforms :last_run :transform_tag_ids :creator :owner)(into []