Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Add enable/disable setting for Transforms in Data Studio (#75710)

Kevin Kelleher7a20b77fbd9a
diff --git a/docs/developers-guide/api-changelog.md b/docs/developers-guide/api-changelog.md
index f9eee87e2d8..e45fc0f8094 100644
--- a/docs/developers-guide/api-changelog.md
+++ b/docs/developers-guide/api-changelog.md
@@ -4,6 +4,10 @@ title: API changelog
# Breaking changes to the API interface
+## Metabase 0.64.0
+
+- Self-hosted environments must now explicitly enable transforms before beginning to use them via the API. Admins can enable transforms in Data Studio or by setting the MB_TRANSFORMS_ENABLED environment variable to true.
+
## Metabase 0.61.0
- `POST /api/metabot/describe/card` and `POST /api/metabot/describe/dashboard/:id` have been removed. These endpoints
@@ -23,13 +27,16 @@ title: API changelog
between group ids and collection id indicate that the group provides no permissions for the collection. For
example, what was returned in versions before 0.56.13:
```json
- {"revision": 2, "groups": {"1": {"root": "write", "1": "read", "2": "none"}}}
+ {
+ "revision": 2,
+ "groups": { "1": { "root": "write", "1": "read", "2": "none" } }
+ }
```
becomes:
```json
- {"revision": 2, "groups": {"1": {"root": "write", "1": "read"}}}
+ { "revision": 2, "groups": { "1": { "root": "write", "1": "read" } } }
```
- in versions 0.56.13 and up.
+ in versions 0.56.13 and up.
## Metabase 0.55.0
diff --git a/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts b/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
index c7d4b2fb644..1074dbde5b9 100644
--- a/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
+++ b/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
@@ -34,6 +34,7 @@ describe("scenarios > admin > databases > writable connection", () => {
H.restore("mysql-writable");
cy.signInAsAdmin();
H.activateToken("pro-self-hosted");
+ H.updateSetting("transforms-enabled", true);
createUser(READ_ONLY_USER);
setupTableData();
});
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
index e5bbd79ceb7..50e8b9875a5 100644
--- a/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
@@ -178,6 +178,7 @@ describe("Table editing", () => {
() => {
H.restore("postgres-writable");
H.activateToken("pro-self-hosted");
+ H.updateSetting("transforms-enabled", true);
H.resetTestTable({ type: "postgres", table: "many_schemas" });
const SOURCE_TABLE = "Animals";
diff --git a/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj b/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
index 2c3a08ec9ab..dbffba0f410 100644
--- a/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
@@ -19,7 +19,7 @@
(deftest table-metadata-survives-deleted-transform-test
(testing "a table whose creating transform has since been deleted (metabase#69904)"
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-temp [:model/Transform transform {}
:model/Table {table-id :id} {:transform_id (:id transform)}]
(t2/delete! :model/Transform (:id transform))
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
index a7c32277e65..f19e0753bd8 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj
@@ -192,7 +192,7 @@
(deftest graph-transform-hydrates-creator-test
(testing "GET /api/ee/dependencies/graph hydrates creator for transforms"
- (mt/with-premium-features #{:dependencies :transforms-basic}
+ (mt/with-premium-features #{:dependencies :transforms-basic :hosting}
(mt/with-temp [:model/Transform {transform-id :id} {:name "Test Transform"
:creator_id (mt/user->id :crowberto)}]
(let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"
@@ -2721,7 +2721,7 @@
response)))))))))
(deftest data-analyst-can-access-dependency-graph-test
- (mt/with-premium-features #{:data-studio :dependencies}
+ (mt/with-premium-features #{:data-studio :dependencies :transforms-basic :hosting}
(testing "Data analysts can access dependency diagnostics endpoints"
(let [data-analyst-group-id (:id (perms-group/data-analyst))]
(mt/with-temp [:model/User {analyst-id :id} {:first_name "Data"
diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.clj
index e64e016d8e2..d5dc56ccdef 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.clj
@@ -47,7 +47,7 @@
~@body)))
(deftest check-transform-dependencies-test
- (mt/with-premium-features [:transforms]
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "removing total field from transform1 breaks transform2"
(mt/as-admin
(with-dependent-transforms! [transform1-id transform2-id]
@@ -65,7 +65,7 @@
(deftest check-transform-dependencies-limit-test
(testing "max-reported-broken-transforms limit"
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/as-admin
(with-dependent-transforms! [transform1-id _]
(mt/with-temp
@@ -98,7 +98,7 @@
(deftest check-transform-dependencies-with-cards-test
(testing "removing field from transform breaks dependent card"
- (mt/with-premium-features [:transforms]
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/as-admin
(with-dependent-transforms! [transform1-id _]
(mt/with-temp
@@ -126,7 +126,7 @@
(is (some? (:errors (first bad-questions))))))))))))
(deftest check-transform-dependencies-card-limit-test
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "max-reported-broken-transforms limit applies to cards"
(mt/as-admin
(with-dependent-transforms! [transform1-id _]
@@ -181,7 +181,7 @@
(deftest check-transform-dependencies-permission-filtering-test
(testing "Broken cards in inaccessible collections are filtered from results"
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(with-dependent-transforms! [transform1-id _]
(mt/with-temp
[:model/Collection {restricted-collection-id :id} {:name "Restricted Collection"}
@@ -244,7 +244,7 @@
(is (not (contains? broken-question-ids restricted-card-id)))))))))))))
(deftest check-transform-dependencies-python-bypass-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(testing "Python transforms bypass dependency checking"
(mt/with-test-user :crowberto
(mt/with-temp [:model/Transform {python-transform-id :id}
diff --git a/enterprise/backend/test/metabase_enterprise/remote_sync/permissions_test.clj b/enterprise/backend/test/metabase_enterprise/remote_sync/permissions_test.clj
index ac3229765a4..26477e61f08 100644
--- a/enterprise/backend/test/metabase_enterprise/remote_sync/permissions_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/remote_sync/permissions_test.clj
@@ -553,7 +553,7 @@
(deftest transform-superuser-can-read-test
(testing "can_read should be true for superusers"
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-current-user (mt/user->id :crowberto)
(mt/with-temp [:model/Collection {coll-id :id} {:name "Transforms Collection"
:namespace :transforms}
@@ -612,7 +612,7 @@
(deftest transform-writable-when-remote-sync-read-write-test
(testing "can_write should be true for transforms when remote-sync-type is read-write"
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-current-user (mt/user->id :crowberto)
(mt/with-temporary-setting-values [settings/remote-sync-url "https://github.com/test/repo.git"
settings/remote-sync-type :read-write]
@@ -633,7 +633,7 @@
(deftest transform-writable-when-remote-sync-disabled-test
(testing "can_write should be true for transforms when remote-sync is not enabled"
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-current-user (mt/user->id :crowberto)
;; remote-sync-url is not set, so remote-sync-enabled returns false
(mt/with-temporary-setting-values [settings/remote-sync-url nil
@@ -675,7 +675,7 @@
(deftest transform-creation-allowed-in-read-write-mode-test
(testing "can_create should be true for transforms when remote-sync-type is read-write"
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-current-user (mt/user->id :crowberto)
(mt/with-temporary-setting-values [settings/remote-sync-url "https://github.com/test/repo.git"
settings/remote-sync-type :read-write]
diff --git a/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj b/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj
index de1276e861b..2fa48a864dc 100644
--- a/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj
@@ -188,7 +188,7 @@
(appdb.scoring-test/search-results* "card")))))))
(deftest transforms-user-recency-test
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(let [user-id (mt/user->id :crowberto)
now (Instant/now)
recent-view (fn [model-id timestamp]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
index 9dd4a395975..d9d7cfd7534 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
@@ -89,7 +89,7 @@
(deftest list-transforms-excludes-python-without-python-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/dataset transforms-dataset/transforms-test
(mt/with-temp [:model/Transform {query-id :id} {}
:model/Transform {python-id :id} (python-transform-map (str "python_transform_" (u/generate-nano-id)))]
@@ -107,7 +107,7 @@
(deftest get-python-transform-200-with-python-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(mt/with-temp [:model/Transform {python-id :id} (python-transform-map (str "python_transform_" (u/generate-nano-id)))]
(let [response (mt/user-http-request :crowberto :get 200 (format "transform/%d" python-id))]
@@ -115,7 +115,7 @@
(deftest create-transform-with-routing-fails-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms-basic :database-routing}
+ (mt/with-premium-features #{:transforms-basic :database-routing :hosting}
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -131,7 +131,7 @@
(deftest update-transform-with-routing-fails-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms-basic :database-routing}
+ (mt/with-premium-features #{:transforms-basic :database-routing :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "gadget_products"]
(mt/with-temp [:model/Database _destination {:engine driver/*driver*
@@ -155,11 +155,8 @@
:model/Transform {python-id :id} (assoc (python-transform-map (str "target_" (u/generate-nano-id)))
:name python-name)]
(search.tu/with-new-search-and-legacy-search
- (testing "no hosting feature"
- (mt/with-premium-features #{}
- (is (= #{query-id} (search-transform-ids search-term)))))
(testing "no transforms feature"
- (mt/with-premium-features #{:hosting}
+ (mt/with-premium-features #{}
(is (empty? (search-transform-ids search-term)))))
(testing "transforms only"
(mt/with-premium-features #{:transforms-basic :hosting}
@@ -183,10 +180,8 @@
(is (= #{query-id python-id} (search-transform-ids search-term))))
(mt/with-premium-features #{:transforms-basic :hosting}
(is (= #{query-id} (search-transform-ids search-term))))
- (mt/with-premium-features #{:hosting}
- (is (empty? (search-transform-ids search-term))))
(mt/with-premium-features #{}
- (is (= #{query-id} (search-transform-ids search-term))))))))))
+ (is (empty? (search-transform-ids search-term))))))))))
(deftest search-api-transform-models-empty-without-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
@@ -346,45 +341,34 @@
;; Translated names alphabetically: "daily" < "hourly" < "monthly" < "weekly"
(mt/with-temp [:model/TransformTag {tag-daily-id :id}
{:name "daily" :built_in_type "daily"}
-
:model/TransformTag {tag-hourly-id :id}
{:name "hourly" :built_in_type "hourly"}
-
:model/TransformTag {tag-monthly-id :id}
{:name "monthly" :built_in_type "monthly"}
-
:model/TransformTag {tag-weekly-id :id}
{:name "weekly" :built_in_type "weekly"}
-
:model/Transform {transform-daily-id :id} {}
:model/TransformTransformTag _ {:transform_id transform-daily-id
:tag_id tag-daily-id
:position 0}
-
:model/Transform {transform-hourly-id :id} {}
:model/TransformTransformTag _ {:transform_id transform-hourly-id
:tag_id tag-hourly-id
:position 0}
-
:model/Transform {transform-monthly-id :id} {}
:model/TransformTransformTag _ {:transform_id transform-monthly-id
:tag_id tag-monthly-id
:position 0}
-
:model/Transform {transform-weekly-id :id} {}
:model/TransformTransformTag _ {:transform_id transform-weekly-id
:tag_id tag-weekly-id
:position 0}
-
:model/TransformRun {daily-run-id :id}
{:transform_id transform-daily-id}
-
:model/TransformRun {hourly-run-id :id}
{:transform_id transform-hourly-id}
-
:model/TransformRun {monthly-run-id :id}
{:transform_id transform-monthly-id}
-
:model/TransformRun {weekly-run-id :id}
{:transform_id transform-weekly-id}]
(doseq [sort-direction [:asc :desc]]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
index 8402827af25..df9231b3355 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
@@ -231,7 +231,7 @@
:let [transform-type :native]]
(testing (format "with %s checkpoint on %s transform" (name checkpoint-type) (name transform-type))
(mt/test-drivers (test-drivers)
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [target-table (target-table-gen "incremental_test")]
(let [checkpoint-config (get checkpoint-configs checkpoint-type)
@@ -315,7 +315,7 @@
(deftest reset-checkpoint-endpoint-test
(testing "POST /api/transform/:id/reset-checkpoint clears the checkpoint and forces a full reprocess"
(mt/test-drivers (test-drivers)
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [target-table (target-table-gen "reset_checkpoint")]
(let [checkpoint-config (get checkpoint-configs :integer)
@@ -344,7 +344,7 @@
:when (valid-checkpoint-transform-combo? checkpoint-type transform-type)]
(testing (format "with %s checkpoint on %s transform" (name checkpoint-type) (name transform-type))
(mt/test-drivers (test-drivers)
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [target-table (target-table-gen "switch_incr_to_non_incr")]
(let [checkpoint-config (get checkpoint-configs checkpoint-type)
@@ -397,7 +397,7 @@
:when (valid-checkpoint-transform-combo? checkpoint-type transform-type)]
(testing (format "with %s checkpoint on %s transform" (name checkpoint-type) (name transform-type))
(mt/test-drivers (test-drivers)
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [target-table (target-table-gen "switch_non_incr_to_incr")]
(let [checkpoint-config (get checkpoint-configs checkpoint-type)
@@ -461,7 +461,7 @@
(deftest unsupported-checkpoint-column-type-test
(testing "Transform fails at runtime with unsupported checkpoint column type"
(mt/test-drivers #{:postgres}
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [target-table "unsupported_type_test"]
(let [name-field-id (mt/id :transforms_products :name)
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj
index e2741043d0f..d43032951c2 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj
@@ -11,12 +11,9 @@
(testing "tables with schema"
(let [table-with-schema {:name (name (driver.u/temp-table-name :postgres :schema/orders))}
table-without-schema {:name (name (driver.u/temp-table-name :postgres :orders))}]
- (mt/with-premium-features #{:hosting}
+ (mt/with-premium-features #{}
(is (false? (transforms.u/is-temp-transform-table? table-with-schema)))
(is (false? (transforms.u/is-temp-transform-table? table-without-schema))))
- (mt/with-premium-features #{}
- (is (transforms.u/is-temp-transform-table? table-without-schema))
- (is (transforms.u/is-temp-transform-table? table-with-schema)))
(mt/with-premium-features #{:hosting :transforms-basic}
(is (transforms.u/is-temp-transform-table? table-without-schema))
(is (transforms.u/is-temp-transform-table? table-with-schema)))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_inspector/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_inspector/api_test.clj
index 5bc0a338529..5246f368c60 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_inspector/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_inspector/api_test.clj
@@ -12,7 +12,7 @@
(set! *warn-on-reflection* true)
(deftest inspect-lens-not-found-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(testing "GET /api/ee/transforms/:id/inspect/:lens-id returns 404 for a nonexistent lens"
(mt/with-temp [:model/Transform {transform-id :id} {}]
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -24,7 +24,7 @@
;;; -------------------------------------------------- Inspector Query API --------------------------------------------------
(deftest inspect-query-execute-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(testing "POST /api/ee/transforms/:id/inspect/:lens-id/query executes a query with inspector context"
(mt/with-temp [:model/Transform {transform-id :id} {}]
@@ -43,7 +43,7 @@
(is (= "transform-inspector" (:context result))))))))))))
(deftest inspect-query-with-lens-params-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(testing "POST /api/ee/transforms/:id/inspect/:lens-id/query passes lens_params through to query execution"
(mt/with-temp [:model/Transform {transform-id :id} {}]
@@ -59,7 +59,7 @@
(is (= "transform-inspector" (:context result)))))))))))
(deftest inspect-query-permissions-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(testing "POST /api/ee/transforms/:id/inspect/:lens-id/query requires transforms permission"
(mt/with-temp [:model/Transform {transform-id :id} {}]
(let [mp (mt/metadata-provider)]
@@ -100,7 +100,7 @@
;; Each `testing` block uses a distinct (metric, labels) combo, so no `prometheus/clear!` is
;; needed to flush the metrics.
(deftest inspect-metrics-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/with-prometheus-system! [_ system]
(mt/with-temp [:model/Transform {transform-id :id} {}]
(testing "Permission-denied failures do NOT bump inspector counters"
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/e2e_test.clj
index c2eb82d1dfd..6d6dcb8ff62 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/e2e_test.clj
@@ -15,7 +15,7 @@
(deftest transforms-python-with-library-test
(testing "Python transform execution with common library"
(mt/test-drivers #{:postgres}
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(mt.util/with-discard-model-updates! [:model/PythonLibrary]
;; Create or update the python library
@@ -61,7 +61,7 @@
(deftest execute-transforms-python-test
(testing "transform execution with :transforms/table target"
(mt/test-drivers #{:postgres}
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(let [schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))]
(with-transform-cleanup! [{table-name :name :as target} {:type "table"
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
index 087693c1866..0e42e850901 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
@@ -19,7 +19,7 @@
(mt/with-temp-scheduler!
(task/init! ::transforms.schedule/RunTransform)
(mt/test-drivers #{:postgres}
- (mt/with-premium-features #{:transforms-python :transforms-basic}
+ (mt/with-premium-features #{:transforms-python :transforms-basic :hosting}
(mt/dataset transforms-dataset/transforms-test
(transforms.tu/with-transform-cleanup! [target {:type "table"
:schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj
index d40fde55e33..ffa2048616c 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj
@@ -69,7 +69,7 @@
:name "gadget_products"
:database (mt/id)}}))))))
(testing "with transforms-python feature flag"
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(with-transform-cleanup! [table-name "gadget_products"]
(let [transform (create-transform!)]
(is (= "print('hello chris')"
@@ -107,10 +107,10 @@
"Should return 403 without any features"))))))))
(deftest run-python-transform-feature-flag-test
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(testing "Running a python transform requires both :transforms-basic and :transforms-python features"
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "test_run_python"]
(let [schema (get-test-schema)
@@ -137,7 +137,7 @@
(deftest execute-python-transform-test
(testing "transform execution with :transforms/table target"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(let [schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))]
(with-transform-cleanup! [{table-name :name :as target} {:type "table"
@@ -205,7 +205,7 @@
(assert (not= :timeout (try (deref fut 1000 :timeout) (catch Throwable _))) "Observation thread did not exit!")))))
(deftest python-transform-logging-test
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(letfn [(program->source [program]
(->> (concat ["import pandas as pd"
"def transform():"]
@@ -284,7 +284,7 @@
(mt/test-drivers (-> (mt/normal-drivers-with-feature :transforms/table)
;; certain drivers are slow/unpredictable enough that the generous timings in this test are not enough
(disj :snowflake :redshift :bigquery-cloud-sdk))
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(let [schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))]
(doseq [{:keys [expected
@@ -313,7 +313,7 @@
(deftest get-python-transform-with-different-target-database-test
(testing "GET /api/transform/:id correctly fetches target table from different database"
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/with-temp [:model/Database target-db {:engine :h2
:details {:db "mem:target-db"}}
:model/Table target-table {:db_id (:id target-db)
@@ -456,7 +456,7 @@
(mt/test-drivers (-> (mt/normal-drivers-with-feature :transforms/python)
; these drivers cause timing issues, could be fixed if we change timeout / time variables in test
(disj :snowflake :bigquery-cloud-sdk :redshift :mongo))
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(let [schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))]
(with-redefs [transforms-python.execute/python-message-loop-sleep-duration (Duration/ofMillis fast-log-polling-ms)]
@@ -501,7 +501,7 @@
(mt/test-drivers (disj (mt/normal-drivers-with-feature :transforms/python)
;; takes too long on CI
:bigquery-cloud-sdk)
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(let [schema (get-test-schema)]
(with-transform-cleanup! [{table-name :name :as target} {:type "table"
@@ -549,7 +549,7 @@
(deftest create-python-transform-with-table-ref-source-test
(testing "Creating a Python transform with name-based source table refs is allowed"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms-basic :transforms-python}
+ (mt/with-premium-features #{:transforms-basic :transforms-python :hosting}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [target {:type "table"
:schema (get-test-schema)
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
index 3149abc6fed..d0223604eed 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
@@ -276,7 +276,7 @@
#_{:clj-kondo/ignore [:metabase/i-like-making-cams-eyes-bleed-with-horrifically-long-tests]}
(deftest ^:synchronized workspace-full-e2e-test
(mt/test-drivers workspaces-supported-drivers
- (mt/with-premium-features #{:workspaces :config-text-file}
+ (mt/with-premium-features #{:workspaces :config-text-file :transforms-basic :hosting}
;; The default test-time `db-connection-timeout-ms` is 5s. BigQuery's
;; first call through a freshly-built impersonated client (cold gRPC
;; handshake + impersonation token mint + `listDatasets`) regularly
diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.ts
index eaeb2beafc1..3000cb6adb7 100644
--- a/frontend/src/metabase-types/api/mocks/settings.ts
+++ b/frontend/src/metabase-types/api/mocks/settings.ts
@@ -414,6 +414,7 @@ export const createMockSettings = (
"token-status": null,
"tracing-enabled": false,
"transforms-enabled": false,
+ "transforms-setup-complete": false,
version: createMockVersion(),
"version-info": createMockVersionInfo(),
"version-info-last-checked": null,
diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.ts
index 2c21f950f5e..703ec7b60cc 100644
--- a/frontend/src/metabase-types/api/settings.ts
+++ b/frontend/src/metabase-types/api/settings.ts
@@ -651,6 +651,7 @@ interface PublicSettings {
"token-features": TokenFeatures;
"tracing-enabled": boolean;
"transforms-enabled": boolean;
+ "transforms-setup-complete": boolean;
version: Version;
"version-info-last-checked": string | null;
"airgap-enabled": boolean;
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
index 7767e61e054..f9af78f868f 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -5,8 +5,9 @@ import { t } from "ttag";
import DataStudioLogo from "assets/img/data-studio-logo.svg";
import { ForwardRefLink } from "metabase/common/components/Link";
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
-import { useHasTokenFeature } from "metabase/common/hooks";
+import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";
+import { useDataStudioSettings } from "metabase/data-studio/settings/hooks";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import {
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
@@ -101,6 +102,15 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
const hasSchemaViewerFeature = useHasTokenFeature("schema-viewer");
const hasRemoteSyncFeature = useHasTokenFeature("remote_sync");
+ const isTransformsSetupComplete = useSetting("transforms-setup-complete");
+ const areTransformsEnabled = useSetting("transforms-enabled");
+
+ const canUseTransforms = canAccessTransforms && areTransformsEnabled;
+ // if transform setup isn't complete, we still show transforms - that's where the upsell/enable pages are
+ const shouldShowTransforms = canUseTransforms || !isTransformsSetupComplete;
+
+ const settings = useDataStudioSettings();
+
const currentTab = getCurrentTab(pathname);
return (
@@ -165,7 +175,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
showLabel={isNavbarOpened}
isGated={!hasDependenciesFeature}
/>
- {canAccessTransforms && (
+ {shouldShowTransforms && (
<DataStudioTab
label={t`Transforms`}
icon="transform"
@@ -213,7 +223,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
showLabel={isNavbarOpened}
/>
)}
- {canAccessTransforms && (
+ {canUseTransforms && (
<DataStudioTab
label={t`Jobs`}
icon="clock"
@@ -222,7 +232,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
showLabel={isNavbarOpened}
/>
)}
- {canAccessTransforms && (
+ {canUseTransforms && (
<DataStudioTab
label={t`Runs`}
icon="play_outlined"
@@ -231,6 +241,15 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
showLabel={isNavbarOpened}
/>
)}
+ {settings.length > 0 && (
+ <DataStudioTab
+ label={t`Settings`}
+ icon="gear"
+ to={Urls.dataStudioSettings()}
+ isSelected={currentTab === "settings"}
+ showLabel={isNavbarOpened}
+ />
+ )}
</Stack>
<PLUGIN_REMOTE_SYNC.GitSettingsModal
isOpen={isGitSettingsOpen}
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
index f68687f2ecc..1333cf3f69d 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
@@ -1,6 +1,7 @@
import fetchMock from "fetch-mock";
import { screen, waitFor } from "__support__/ui";
+import * as Urls from "metabase/urls";
import { setup } from "./setup";
@@ -45,4 +46,101 @@ describe("DataStudioLayout", () => {
expect(screen.queryByLabelText("Workspaces")).not.toBeInTheDocument();
});
});
+
+ describe("transforms nav tabs", () => {
+ it("shows Transforms but not Jobs or Runs when setup is incomplete", async () => {
+ setup({ transformsSetupComplete: false, transformsEnabled: false });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.getByLabelText("Transforms")).toBeInTheDocument();
+ expect(screen.queryByLabelText("Jobs")).not.toBeInTheDocument();
+ expect(screen.queryByLabelText("Runs")).not.toBeInTheDocument();
+ });
+
+ it("hides Transforms, Jobs, and Runs when setup is complete but transforms are disabled", async () => {
+ setup({ transformsSetupComplete: true, transformsEnabled: false });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.queryByLabelText("Transforms")).not.toBeInTheDocument();
+ expect(screen.queryByLabelText("Jobs")).not.toBeInTheDocument();
+ expect(screen.queryByLabelText("Runs")).not.toBeInTheDocument();
+ });
+
+ it("shows Transforms, Jobs, and Runs when setup is complete and transforms are enabled", async () => {
+ setup({ transformsSetupComplete: true, transformsEnabled: true });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.getByLabelText("Transforms")).toBeInTheDocument();
+ expect(screen.getByLabelText("Jobs")).toBeInTheDocument();
+ expect(screen.getByLabelText("Runs")).toBeInTheDocument();
+ });
+
+ it("shows Transforms for non-admins when setup is incomplete", async () => {
+ setup({
+ isAdmin: false,
+ transformsSetupComplete: false,
+ transformsEnabled: false,
+ });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.getByLabelText("Transforms")).toBeInTheDocument();
+ expect(screen.queryByLabelText("Jobs")).not.toBeInTheDocument();
+ });
+
+ it("hides transform tabs for non-admins without access when setup is complete", async () => {
+ setup({
+ isAdmin: false,
+ canAccessTransforms: false,
+ transformsSetupComplete: true,
+ transformsEnabled: true,
+ });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.queryByLabelText("Transforms")).not.toBeInTheDocument();
+ expect(screen.queryByLabelText("Jobs")).not.toBeInTheDocument();
+ expect(screen.queryByLabelText("Runs")).not.toBeInTheDocument();
+ });
+
+ it("shows Jobs and Runs for non-admins with transform access when enabled", async () => {
+ setup({
+ isAdmin: false,
+ canAccessTransforms: true,
+ transformsSetupComplete: true,
+ transformsEnabled: true,
+ });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.getByLabelText("Transforms")).toBeInTheDocument();
+ expect(screen.getByLabelText("Jobs")).toBeInTheDocument();
+ expect(screen.getByLabelText("Runs")).toBeInTheDocument();
+ });
+ });
+
+ describe("settings tab", () => {
+ it("shows Settings for admins after transform setup is complete", async () => {
+ setup({ isAdmin: true, transformsSetupComplete: true });
+
+ const tab = await screen.findByLabelText("Settings");
+ expect(tab).toHaveAttribute("href", Urls.dataStudioSettings());
+ });
+
+ it("hides Settings before transform setup is complete", async () => {
+ setup({ isAdmin: true, transformsSetupComplete: false });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.queryByLabelText("Settings")).not.toBeInTheDocument();
+ });
+
+ it("hides Settings for non-admins even after transform setup is complete", async () => {
+ setup({
+ isAdmin: false,
+ canAccessTransforms: true,
+ transformsSetupComplete: true,
+ transformsEnabled: true,
+ });
+
+ expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
+ expect(screen.queryByLabelText("Settings")).not.toBeInTheDocument();
+ });
+ });
});
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
index 99f14b0cb1e..f8f5b365208 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
@@ -207,8 +207,17 @@ describe("DataStudioLayout", () => {
});
describe("transforms tab visibility", () => {
+ const transformsReadySettings = {
+ transformsSetupComplete: true,
+ transformsEnabled: true,
+ };
+
it("should show Transforms tab for admins", async () => {
- setup({ ...DEFAULT_EE_SETTINGS, isAdmin: true });
+ setup({
+ ...DEFAULT_EE_SETTINGS,
+ ...transformsReadySettings,
+ isAdmin: true,
+ });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -220,6 +229,7 @@ describe("DataStudioLayout", () => {
it("should show Transforms tab for a non-admin with transforms permission", async () => {
setup({
...DEFAULT_EE_SETTINGS,
+ ...transformsReadySettings,
isAdmin: false,
canAccessTransforms: true,
});
@@ -234,6 +244,7 @@ describe("DataStudioLayout", () => {
it("should hide Transforms tab for a non-admin without transforms permission", async () => {
setup({
...DEFAULT_EE_SETTINGS,
+ ...transformsReadySettings,
isAdmin: false,
canAccessTransforms: false,
});
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
index 5e4c120bab7..0333d164bd5 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
@@ -51,13 +51,21 @@ const createRemoteSyncSettings = ({
const setupRemoteSyncSettingsEndpoints = (
settings: Partial<RemoteSyncSettings> = {},
- tokenFeatures?: Partial<TokenFeatures>,
+ {
+ tokenFeatures,
+ transformsEnabled = false,
+ transformsSetupComplete = false,
+ }: Pick<
+ StoreStateOptions,
+ "tokenFeatures" | "transformsEnabled" | "transformsSetupComplete"
+ > = {},
) => {
- const remoteSyncSettings = createRemoteSyncSettings(settings);
setupPropertiesEndpoints(
- createMockSettings({
- ...remoteSyncSettings,
- "token-features": createMockTokenFeatures(tokenFeatures),
+ createSettingsValues({
+ remoteSyncSettings: settings,
+ tokenFeatures,
+ transformsEnabled,
+ transformsSetupComplete,
}),
);
};
@@ -102,16 +110,37 @@ interface StoreStateOptions {
canAccessTransforms?: boolean;
remoteSyncSettings?: Partial<RemoteSyncSettings>;
tokenFeatures?: Partial<TokenFeatures>;
+ transformsEnabled?: boolean;
+ transformsSetupComplete?: boolean;
}
+const createSettingsValues = ({
+ remoteSyncSettings = {},
+ tokenFeatures,
+ transformsEnabled = false,
+ transformsSetupComplete = false,
+}: Pick<
+ StoreStateOptions,
+ | "remoteSyncSettings"
+ | "tokenFeatures"
+ | "transformsEnabled"
+ | "transformsSetupComplete"
+> = {}) =>
+ createMockSettings({
+ ...createRemoteSyncSettings(remoteSyncSettings),
+ "transforms-enabled": transformsEnabled,
+ "transforms-setup-complete": transformsSetupComplete,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+
const createStoreState = ({
isAdmin = true,
canAccessTransforms = false,
remoteSyncSettings = {},
tokenFeatures,
+ transformsEnabled = false,
+ transformsSetupComplete = false,
}: StoreStateOptions = {}) => {
- const settings = createRemoteSyncSettings(remoteSyncSettings);
-
return createMockState({
currentUser: createMockUser({
is_superuser: isAdmin,
@@ -121,10 +150,14 @@ const createStoreState = ({
can_access_transforms: canAccessTransforms,
},
}),
- settings: mockSettings({
- ...settings,
- "token-features": createMockTokenFeatures(tokenFeatures),
- }),
+ settings: mockSettings(
+ createSettingsValues({
+ remoteSyncSettings,
+ tokenFeatures,
+ transformsEnabled,
+ transformsSetupComplete,
+ }),
+ ),
});
};
@@ -140,6 +173,8 @@ interface SetupOpts {
isNavbarOpened?: boolean;
enterprisePlugins?: Parameters<typeof setupEnterpriseOnlyPlugin>[0][];
tokenFeatures?: Partial<TokenFeatures>;
+ transformsEnabled?: boolean;
+ transformsSetupComplete?: boolean;
}
export const setup = ({
@@ -154,6 +189,8 @@ export const setup = ({
isNavbarOpened = true,
enterprisePlugins,
tokenFeatures,
+ transformsEnabled = false,
+ transformsSetupComplete = false,
}: SetupOpts = {}) => {
// Build collections list
const collections: Collection[] = [];
@@ -181,7 +218,11 @@ export const setup = ({
};
setupSettingsEndpoints([]);
- setupRemoteSyncSettingsEndpoints(remoteSyncSettings, tokenFeatures);
+ setupRemoteSyncSettingsEndpoints(remoteSyncSettings, {
+ tokenFeatures,
+ transformsEnabled,
+ transformsSetupComplete,
+ });
setupDirtyEndpoints({ dirty, collections });
setupNavbarEndpoints(isNavbarOpened);
setupLibraryEndpoints(false);
@@ -197,6 +238,8 @@ export const setup = ({
canAccessTransforms,
remoteSyncSettings,
tokenFeatures,
+ transformsEnabled,
+ transformsSetupComplete,
});
if (enterprisePlugins) {
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
index e68872e116b..d0cb7ce5c1d 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
@@ -11,7 +11,8 @@ type TabName =
| "schema-viewer"
| "glossary"
| "git-sync"
- | "workspaces";
+ | "workspaces"
+ | "settings";
export const getCurrentTab = (pathname: string): TabName => {
switch (true) {
@@ -35,6 +36,8 @@ export const getCurrentTab = (pathname: string): TabName => {
return "runs";
case pathname.startsWith(Urls.transformList()):
return "transforms";
+ case pathname.startsWith(Urls.dataStudioSettings()):
+ return "settings";
default:
return "data";
}
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
index 57a893469bb..fdec0a2ea3a 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
@@ -23,6 +23,7 @@ describe("getCurrentTab", () => {
${"/data-studio/transforms/new/query"} | ${"transforms"}
${"/data-studio/data"} | ${"data"}
${"/data-studio/data/database/1"} | ${"data"}
+ ${"/data-studio/settings"} | ${"settings"}
${"/data-studio"} | ${"data"}
`(
"should return '$expectedTab' for pathname '$pathname'",
diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
index 7d30aa1a4a4..8ce189e3a39 100644
--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
@@ -24,14 +24,14 @@ export function TransformsSectionLayout({
}: TransformsSectionLayoutProps) {
usePageTitle(t`Transforms`, { titleIndex: 1 });
const shouldShowUpsell = useSelector(getShouldShowTransformsUpsell);
- const isTransformsEnabled = useSetting("transforms-enabled");
+ const isTransformsSetupComplete = useSetting("transforms-setup-complete");
const isHosted = useSetting("is-hosted?");
const { transformsDatabases, isLoadingDatabases, databasesError } =
useTransformSupportedDbs();
if (shouldShowUpsell) {
return <PLUGIN_TRANSFORMS.TransformsUpsellPage />;
- } else if (!isTransformsEnabled && !isHosted) {
+ } else if (!isTransformsSetupComplete && !isHosted) {
return <EnableTransformsPage />;
}
diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx
index 7c8ee9cb8f0..88e8f5be18f 100644
--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx
@@ -37,6 +37,7 @@ const setup = ({
isHosted = false,
hasTransformFeature = false,
transformsEnabled = false,
+ transformsSetupComplete = false,
isAdmin = false,
isStoreUser = false,
canAccessDbDetails = false,
@@ -46,6 +47,7 @@ const setup = ({
isHosted?: boolean;
hasTransformFeature?: boolean;
transformsEnabled?: boolean;
+ transformsSetupComplete?: boolean;
isAdmin?: boolean;
isStoreUser?: boolean;
canAccessDbDetails?: boolean;
@@ -71,6 +73,7 @@ const setup = ({
hosting: isHosted,
}),
"transforms-enabled": transformsEnabled,
+ "transforms-setup-complete": transformsSetupComplete,
"is-hosted?": isHosted,
"token-status": {
status: "valid",
@@ -129,6 +132,7 @@ describe("TransformSectionLayout", () => {
it("should show allow you into transforms if transforms are enabled and writable databases exist", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
databases: [
createTransformSupportedDatabase({ transforms_permissions: "write" }),
],
@@ -148,6 +152,7 @@ describe("TransformSectionLayout", () => {
setup({
hasTransformFeature: true,
transformsEnabled: true,
+ transformsSetupComplete: true,
databases: [
createTransformSupportedDatabase({ transforms_permissions: "write" }),
],
@@ -188,6 +193,7 @@ describe("TransformSectionLayout", () => {
it("should show empty state when no databases are writable or supported", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
databases: [
createMockDatabase({ id: 1, transforms_permissions: "none" }),
createMockDatabase({
@@ -214,6 +220,7 @@ describe("TransformSectionLayout", () => {
it("should show empty state when transforms are enabled and the database list is empty", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
databases: [],
});
@@ -223,6 +230,7 @@ describe("TransformSectionLayout", () => {
it("should show the 'View your database connections' button linking to admin databases for admin users", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
isAdmin: true,
databases: [],
});
@@ -237,6 +245,7 @@ describe("TransformSectionLayout", () => {
it("should show the 'View your database connections' button for users with manage database permission", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
isAdmin: false,
canAccessDbDetails: true,
databases: [],
@@ -253,6 +262,7 @@ describe("TransformSectionLayout", () => {
it("should not show the 'View your database connections' button for non-admin users without manage database permission", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
isAdmin: false,
databases: [],
});
@@ -268,6 +278,7 @@ describe("TransformSectionLayout", () => {
it("should show an error UI (not the empty state) when the databases request fails", async () => {
setup({
transformsEnabled: true,
+ transformsSetupComplete: true,
databasesError: true,
});
diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsx
index 8bf3f3ea7f2..64d14eb31c3 100644
--- a/frontend/src/metabase/data-studio/routes.tsx
+++ b/frontend/src/metabase/data-studio/routes.tsx
@@ -23,6 +23,7 @@ import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";
import { WorkspacesSectionLayout } from "./app/pages/WorkspacesSectionLayout";
import { getDataStudioMetadataRoutes } from "./data-model/routes";
import { getDataStudioGlossaryRoutes } from "./glossary/routes";
+import { getDataStudioSettingsRoutes } from "./settings/routes";
import {
DependenciesUpsellPage,
LibraryUpsellPage,
@@ -33,7 +34,6 @@ export function getDataStudioRoutes(
store: Store<State>,
CanAccessDataStudio: RouteComponent,
CanAccessDataModel: RouteComponent,
- _CanAccessTransforms: RouteComponent,
IsAdmin: RouteComponent,
) {
return (
@@ -56,6 +56,7 @@ export function getDataStudioRoutes(
{PLUGIN_WORKSPACES.getDataStudioRoutes()}
</Route>
{getDataStudioGlossaryRoutes()}
+ {getDataStudioSettingsRoutes()}
{PLUGIN_LIBRARY.isEnabled ? (
PLUGIN_LIBRARY.getDataStudioLibraryRoutes(IsAdmin)
) : (
diff --git a/frontend/src/metabase/data-studio/settings/hooks/index.ts b/frontend/src/metabase/data-studio/settings/hooks/index.ts
new file mode 100644
index 00000000000..86e38e902a5
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/hooks/index.ts
@@ -0,0 +1,2 @@
+export { useDataStudioSettings } from "./use-data-studio-settings";
+export { useLocalSetting } from "./use-local-setting";
diff --git a/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts
new file mode 100644
index 00000000000..f7114362fd6
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts
@@ -0,0 +1,27 @@
+import { t } from "ttag";
+
+import { useSetting } from "metabase/common/hooks";
+import { useSelector } from "metabase/redux";
+import { getUserIsAdmin } from "metabase/selectors/user";
+
+import type { DataStudioSetting } from "../types";
+
+export function useDataStudioSettings(): DataStudioSetting[] {
+ const isAdmin = useSelector(getUserIsAdmin);
+ const isTransformsSetupComplete = useSetting("transforms-setup-complete");
+ const areTransformsEnabled = useSetting("transforms-enabled");
+
+ const settings: DataStudioSetting[] = [];
+
+ if (isAdmin && isTransformsSetupComplete) {
+ settings.push({
+ key: "transforms-enabled",
+ value: areTransformsEnabled,
+ name: t`Transforms`,
+ description: t`When enabled, data analysts and admins can write, schedule and run transforms.
+Disabling this feature will hide all transform features, prevent transform editing or creation, and prevent any new runs.`,
+ });
+ }
+
+ return settings;
+}
diff --git a/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts b/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts
new file mode 100644
index 00000000000..1e54eaf4ee0
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts
@@ -0,0 +1,43 @@
+import { useCallback, useRef, useState } from "react";
+import { t } from "ttag";
+
+import { useUpdateSettingMutation } from "metabase/api";
+import { useToast } from "metabase/common/hooks";
+import type {
+ EnterpriseSettingKey,
+ EnterpriseSettingValue,
+} from "metabase-types/api";
+
+export function useLocalSetting<
+ K extends EnterpriseSettingKey,
+ V extends EnterpriseSettingValue<K>,
+>(key: K, value: V) {
+ const [localValue, setLocalValue] = useState<V>(value);
+ const previousValueRef = useRef<V>(value);
+ const [updateSetting, { isLoading: isUpdating }] = useUpdateSettingMutation();
+ const [sendToast] = useToast();
+
+ const handleChange = useCallback(
+ async (value: V) => {
+ setLocalValue(value);
+ const { error } = await updateSetting({ key, value });
+ if (error) {
+ sendToast({
+ message: t`Failed to update setting`,
+ icon: "warning_triangle_filled",
+ iconColor: "warning",
+ });
+ setLocalValue(previousValueRef.current);
+ return;
+ }
+ previousValueRef.current = value;
+ },
+ [updateSetting, sendToast, key],
+ );
+
+ return {
+ value: localValue,
+ handleChange,
+ isUpdating,
+ };
+}
diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx
new file mode 100644
index 00000000000..b31de93397b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx
@@ -0,0 +1,88 @@
+import { t } from "ttag";
+
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import { Card, Center, Flex, Stack, Switch, Text, Title } from "metabase/ui";
+
+import { useDataStudioSettings, useLocalSetting } from "../../hooks";
+import type { DataStudioSetting } from "../../types";
+
+export function SettingsPage() {
+ usePageTitle(t`Settings`);
+ const settings = useDataStudioSettings();
+
+ return (
+ <PageContainer gap={0}>
+ <PaneHeader
+ breadcrumbs={
+ <DataStudioBreadcrumbs role="heading">{t`Settings`}</DataStudioBreadcrumbs>
+ }
+ />
+ <Stack flex={1} align="center">
+ {settings.length > 0 ? (
+ settings.map((setting) => (
+ <Setting key={setting.key} setting={setting} />
+ ))
+ ) : (
+ <SettingsEmptyState />
+ )}
+ </Stack>
+ </PageContainer>
+ );
+}
+
+function Setting({ setting }: { setting: DataStudioSetting }) {
+ const { value, handleChange, isUpdating } = useLocalSetting(
+ setting.key,
+ setting.value,
+ );
+
+ const descriptionLines = setting.description.split("\n");
+
+ return (
+ <Card p="xl" withBorder shadow="none" maw="40rem" w="100%">
+ <Stack>
+ <Flex justify="space-between" align="center">
+ <Text fz="lg" lh="md" fw={700}>
+ {setting.name}
+ </Text>
+ {typeof value === "boolean" && (
+ <Switch
+ checked={value}
+ onChange={(e) => handleChange(e.target.checked)}
+ disabled={isUpdating}
+ aria-label={setting.name}
+ size="sm"
+ />
+ )}
+ </Flex>
+ <Stack gap="sm">
+ {descriptionLines.map((line, index) => (
+ <Text key={index} c="text-secondary" lh="sm">
+ {line}
+ </Text>
+ ))}
+ </Stack>
+ </Stack>
+ </Card>
+ );
+}
+
+// DataStudioLayout gates on settings.length > 0, so a user shouldn't ever see this
+// but show them something just in case they navigate directly to settings somehow
+function SettingsEmptyState() {
+ return (
+ <Center flex={1}>
+ <Stack align="center" maw="30rem" gap="md">
+ <Title order={3} ta="center">
+ {t`Nothing to configure yet`}
+ </Title>
+ <Text ta="center" c="text-secondary">
+ {t`There aren't any settings for you to change right now.`}
+ </Text>
+ </Stack>
+ </Center>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx
new file mode 100644
index 00000000000..aaae1b20265
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx
@@ -0,0 +1,135 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ findRequests,
+ setupPropertiesEndpoints,
+ setupSettingsEndpoints,
+ setupUpdateSettingEndpoint,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import { createMockState } from "metabase/redux/store/mocks";
+import { Route } from "metabase/router";
+import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
+
+import { SettingsPage } from "./SettingsPage";
+
+const TRANSFORMS_ENABLED_PATH = "path:/api/setting/transforms-enabled";
+
+interface SetupOpts {
+ isAdmin?: boolean;
+ transformsEnabled?: boolean;
+ transformsSetupComplete?: boolean;
+}
+
+const setup = ({
+ isAdmin = true,
+ transformsEnabled = false,
+ transformsSetupComplete = true,
+}: SetupOpts = {}) => {
+ const settingsValues = createMockSettings({
+ "transforms-enabled": transformsEnabled,
+ "transforms-setup-complete": transformsSetupComplete,
+ });
+
+ setupSettingsEndpoints([]);
+ setupPropertiesEndpoints(settingsValues);
+
+ renderWithProviders(
+ <Route
+ path="/"
+ component={() => (
+ <div>
+ <SettingsPage />
+ <UndoListing />
+ </div>
+ )}
+ />,
+ {
+ storeInitialState: createMockState({
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ settings: mockSettings(settingsValues),
+ }),
+ withRouter: true,
+ },
+ );
+};
+
+describe("SettingsPage", () => {
+ beforeEach(() => {
+ fetchMock.removeRoutes();
+ fetchMock.clearHistory();
+ });
+
+ it("should show an empty state when there are no settings to configure", () => {
+ setup({ isAdmin: false });
+
+ expect(screen.getByText("Nothing to configure yet")).toBeInTheDocument();
+ expect(
+ screen.getByText(
+ "There aren't any settings for you to change right now.",
+ ),
+ ).toBeInTheDocument();
+ });
+
+ it("should show an empty state when transforms setup is incomplete", () => {
+ setup({ transformsSetupComplete: false });
+
+ expect(screen.getByText("Nothing to configure yet")).toBeInTheDocument();
+ });
+
+ it("should render the transforms setting for admins after setup is complete", () => {
+ setup();
+
+ expect(screen.getByText("Settings")).toBeInTheDocument();
+ expect(screen.getByText("Transforms")).toBeInTheDocument();
+ expect(
+ screen.getByText(/When enabled, data analysts and admins can write/),
+ ).toBeInTheDocument();
+ expect(screen.getByRole("switch")).not.toBeChecked();
+ });
+
+ it("should optimistically update the switch and persist on success", async () => {
+ setup();
+ setupUpdateSettingEndpoint({ status: 204 });
+
+ const toggle = screen.getByRole("switch");
+ expect(toggle).not.toBeChecked();
+
+ await userEvent.click(toggle);
+
+ expect(toggle).toBeChecked();
+
+ await waitFor(async () => {
+ const puts = await findRequests("PUT");
+ expect(puts).toHaveLength(1);
+ expect(puts[0].url).toContain("/api/setting/transforms-enabled");
+ expect(puts[0].body).toEqual({ value: true });
+ });
+
+ expect(toggle).toBeChecked();
+ });
+
+ it("should revert the switch and show a toast when the backend update fails", async () => {
+ setup({ transformsEnabled: true });
+ fetchMock.put(TRANSFORMS_ENABLED_PATH, 400);
+
+ const toggle = screen.getByRole("switch");
+ expect(toggle).toBeChecked();
+
+ await userEvent.click(toggle);
+
+ await waitFor(async () => {
+ const puts = await findRequests("PUT");
+ expect(puts).toHaveLength(1);
+ expect(puts[0].body).toEqual({ value: false });
+ });
+
+ expect(toggle).toBeChecked();
+ expect(
+ await screen.findByText("Failed to update setting"),
+ ).toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/index.ts b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/index.ts
new file mode 100644
index 00000000000..af5c64f6e5e
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/index.ts
@@ -0,0 +1 @@
+export { SettingsPage } from "./SettingsPage";
diff --git a/frontend/src/metabase/data-studio/settings/routes.tsx b/frontend/src/metabase/data-studio/settings/routes.tsx
new file mode 100644
index 00000000000..87644da689a
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/routes.tsx
@@ -0,0 +1,7 @@
+import { Route } from "metabase/router";
+
+import { SettingsPage } from "./pages/SettingsPage";
+
+export function getDataStudioSettingsRoutes() {
+ return <Route path="settings" component={SettingsPage} />;
+}
diff --git a/frontend/src/metabase/data-studio/settings/types.ts b/frontend/src/metabase/data-studio/settings/types.ts
new file mode 100644
index 00000000000..cfce22f8c97
--- /dev/null
+++ b/frontend/src/metabase/data-studio/settings/types.ts
@@ -0,0 +1,13 @@
+import type {
+ EnterpriseSettingKey,
+ EnterpriseSettings,
+} from "metabase-types/api";
+
+export type DataStudioSetting = {
+ [K in EnterpriseSettingKey]: {
+ key: K;
+ value: EnterpriseSettings[K];
+ name: string;
+ description: string;
+ };
+}[EnterpriseSettingKey];
diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsx
index 7f11a6151ea..5e5e27de959 100644
--- a/frontend/src/metabase/route-guards.tsx
+++ b/frontend/src/metabase/route-guards.tsx
@@ -11,7 +11,6 @@ import { getSetting } from "metabase/selectors/settings";
import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
import { getIsEmbeddingIframe } from "./selectors/embed";
-import { canAccessTransforms } from "./transforms/selectors";
type Props = { children: React.ReactElement };
@@ -127,15 +126,6 @@ const UserCanAccessDataStudio = connectedReduxRedirect<Props, State>({
context: metabaseReduxContext,
});
-const UserCanAccessTransforms = connectedReduxRedirect<Props, State>({
- wrapperDisplayName: "UserCanAccessTransforms",
- redirectPath: "/unauthorized",
- allowRedirectBack: false,
- authenticatedSelector: (state) => canAccessTransforms(state),
- redirectAction: routerActions.replace,
- context: metabaseReduxContext,
-});
-
export const IsAuthenticated = MetabaseIsSetup(
UserIsAuthenticated(({ children }) => children),
);
@@ -165,7 +155,3 @@ export const CanAccessDataStudio = MetabaseIsSetup(
export const CanAccessDataModel = UserCanAccessDataModel(
({ children }) => children,
);
-
-export const CanAccessTransforms = UserCanAccessTransforms(
- ({ children }) => children,
-);
diff --git a/frontend/src/metabase/routes.tsx b/frontend/src/metabase/routes.tsx
index c6aa485bd98..721a3226b5f 100644
--- a/frontend/src/metabase/routes.tsx
+++ b/frontend/src/metabase/routes.tsx
@@ -76,7 +76,6 @@ import {
CanAccessDataStudio,
CanAccessOnboarding,
CanAccessSettings,
- CanAccessTransforms,
IsAdmin,
IsAuthenticated,
IsNotAuthenticated,
@@ -396,7 +395,6 @@ export const getRoutes = (store: AppStore) => {
store,
CanAccessDataStudio,
CanAccessDataModel,
- CanAccessTransforms,
IsAdmin,
)}
</Route>
diff --git a/frontend/src/metabase/transforms/route-guards.tsx b/frontend/src/metabase/transforms/route-guards.tsx
new file mode 100644
index 00000000000..57bc093a539
--- /dev/null
+++ b/frontend/src/metabase/transforms/route-guards.tsx
@@ -0,0 +1,24 @@
+import { routerActions } from "react-router-redux";
+import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
+
+import { metabaseReduxContext } from "metabase/redux";
+import type { State } from "metabase/redux/store";
+import { getSetting } from "metabase/selectors/settings";
+import * as Urls from "metabase/urls";
+
+type Props = { children: React.ReactElement };
+
+const TransformsNotDisabledGuard = connectedReduxRedirect<Props, State>({
+ wrapperDisplayName: "TransformsNotDisabled",
+ redirectPath: Urls.dataStudioSettings(),
+ allowRedirectBack: false,
+ authenticatedSelector: (state) =>
+ !getSetting(state, "transforms-setup-complete") ||
+ getSetting(state, "transforms-enabled"),
+ redirectAction: routerActions.replace,
+ context: metabaseReduxContext,
+});
+
+export const TransformsNotDisabled = TransformsNotDisabledGuard(
+ ({ children }) => children,
+);
diff --git a/frontend/src/metabase/transforms/routes.tsx b/frontend/src/metabase/transforms/routes.tsx
index db041cc0698..b1a425de392 100644
--- a/frontend/src/metabase/transforms/routes.tsx
+++ b/frontend/src/metabase/transforms/routes.tsx
@@ -21,39 +21,38 @@ import { TransformListPage } from "./pages/TransformListPage";
import { TransformQueryPage } from "./pages/TransformQueryPage";
import { TransformRunPage } from "./pages/TransformRunPage";
import { TransformSettingsPage } from "./pages/TransformSettingsPage";
+import { TransformsNotDisabled } from "./route-guards";
export function getDataStudioTransformRoutes() {
return (
- <>
+ <Route component={TransformsNotDisabled}>
+ <IndexRoute component={TransformListPage} />
<Route path="runs" component={RunListPage} />
- <Route>
- <IndexRoute component={TransformListPage} />
- <Route path="jobs" component={JobSectionLayout}>
- <IndexRoute component={JobListPage} />
- <Route path="new" component={NewJobPage} />
- <Route path=":jobId" component={JobPage} />
- <Route path=":jobId/runs" component={JobRunListPage} />
- </Route>
-
- <Route path="new/query" component={NewQueryTransformPage} />
- <Route path="new/native" component={NewNativeTransformPage} />
- <Route path="new/card/:cardId" component={NewCardTransformPage} />
- <Route path=":transformId" component={TransformQueryPage} />
- <Route path=":transformId/edit" component={TransformQueryPage} />
- <Route path=":transformId/run" component={TransformRunPage} />
- <Route path=":transformId/settings" component={TransformSettingsPage} />
- {PLUGIN_TRANSFORMS_PYTHON.getInspectorRoutes()}
- {PLUGIN_DEPENDENCIES.isEnabled && (
- <Route
- path=":transformId/dependencies"
- component={TransformDependenciesPage}
- >
- <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
- </Route>
- )}
- {PLUGIN_TRANSFORMS_PYTHON.getPythonTransformsRoutes()}
- {PLUGIN_REPLACEMENT.getTransformToolsRoutes()}
+ <Route path="jobs" component={JobSectionLayout}>
+ <IndexRoute component={JobListPage} />
+ <Route path="new" component={NewJobPage} />
+ <Route path=":jobId" component={JobPage} />
+ <Route path=":jobId/runs" component={JobRunListPage} />
</Route>
- </>
+
+ <Route path="new/query" component={NewQueryTransformPage} />
+ <Route path="new/native" component={NewNativeTransformPage} />
+ <Route path="new/card/:cardId" component={NewCardTransformPage} />
+ <Route path=":transformId" component={TransformQueryPage} />
+ <Route path=":transformId/edit" component={TransformQueryPage} />
+ <Route path=":transformId/run" component={TransformRunPage} />
+ <Route path=":transformId/settings" component={TransformSettingsPage} />
+ {PLUGIN_TRANSFORMS_PYTHON.getInspectorRoutes()}
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route
+ path=":transformId/dependencies"
+ component={TransformDependenciesPage}
+ >
+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
+ </Route>
+ )}
+ {PLUGIN_TRANSFORMS_PYTHON.getPythonTransformsRoutes()}
+ {PLUGIN_REPLACEMENT.getTransformToolsRoutes()}
+ </Route>
);
}
diff --git a/frontend/src/metabase/urls/data-studio.ts b/frontend/src/metabase/urls/data-studio.ts
index 5376ff89630..03086c44d54 100644
--- a/frontend/src/metabase/urls/data-studio.ts
+++ b/frontend/src/metabase/urls/data-studio.ts
@@ -339,3 +339,7 @@ export function dataStudioArchivedSnippets() {
export function dataStudioSegment(segmentId: SegmentId) {
return `${dataStudioLibrary()}/segments/${segmentId}`;
}
+
+export function dataStudioSettings() {
+ return `${dataStudio()}/settings`;
+}
diff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.clj
index 33a1d48d73a..e9b18c2ae54 100644
--- a/src/metabase/premium_features/token_check.clj
+++ b/src/metabase/premium_features/token_check.clj
@@ -715,16 +715,18 @@
(defn query-transforms-enabled?
"Whether query (native/MBQL) transforms are available on this instance. Available on any non-hosted
instance (OSS intentionally gets query transforms without a license), or on hosted instances with the
- `:transforms-basic` feature."
+ `:transforms-basic` feature. Also requires the :transforms-enabled setting to be true."
[]
- (or (not (premium-features.settings/is-hosted?))
- (has-feature? :transforms-basic)))
+ (and (setting/get :transforms-enabled)
+ (or (not (premium-features.settings/is-hosted?))
+ (has-feature? :transforms-basic))))
(defn python-transforms-enabled?
"Whether Python transforms are available on this instance. EE only; requires both `:transforms-basic`
- and `:transforms-python`."
+ and `:transforms-python`. Also requires the :transforms-enabled setting to be true."
[]
- (and (has-feature? :transforms-basic)
+ (and (setting/get :transforms-enabled)
+ (has-feature? :transforms-basic)
(has-feature? :transforms-python)))
(defn any-transforms-enabled?
diff --git a/src/metabase/transforms/schedule.clj b/src/metabase/transforms/schedule.clj
index 881ab1d7f28..53af55e8b49 100644
--- a/src/metabase/transforms/schedule.clj
+++ b/src/metabase/transforms/schedule.clj
@@ -9,6 +9,7 @@
[metabase.task-history.core :as task-history]
[metabase.task.core :as task]
[metabase.transforms.jobs :as transforms.jobs]
+ [metabase.transforms.settings :as transforms.settings]
[metabase.util.log :as log]
[toucan2.core :as t2])
(:import
@@ -83,13 +84,24 @@
org.quartz.DisallowConcurrentExecution true}
RunTransforms
[context]
- (let [job-id (-> (conversion/from-job-data context)
- (get "job-id"))]
- (log/info "Executing scheduled run of transform job" job-id)
+ (let [job-id (-> (conversion/from-job-data context)
+ (get "job-id"))
+ ;; Read the kill switch at fire time rather than trying to keep Quartz triggers in sync
+ ;; with the setting: it is global, env-overridable, and falls back to the token feature
+ ;; when unset, so there is no reliable toggle event to hook trigger deletion to.
+ enabled? (transforms.settings/transforms-enabled)]
(task-history/with-task-history {:task "run-transforms"
- :task_details {:job-id job-id
- :run-method :cron}}
- (transforms.jobs/run-job! job-id {:run-method :cron}))))
+ :task_details (cond-> {:job-id job-id
+ :run-method :cron}
+ (not enabled?) (assoc :skipped-reason "transforms-disabled"))}
+ (if enabled?
+ (do
+ (log/info "Executing scheduled run of transform job" job-id)
+ (transforms.jobs/run-job! job-id {:run-method :cron}))
+ ;; Skip before run-job! creates a transform_job_run row: every transform would be
+ ;; skipped by the feature check anyway and the run would be recorded as "successful",
+ ;; which is misleading. The task_history row above still records the skipped firing.
+ (log/info "Skipping scheduled run of transform job" job-id "because transforms are disabled")))))
(defn initialize-job!
"Initialize a schedule for a transform job."
diff --git a/src/metabase/transforms/settings.clj b/src/metabase/transforms/settings.clj
index 3ab587732aa..ac0f3e5b8c6 100644
--- a/src/metabase/transforms/settings.clj
+++ b/src/metabase/transforms/settings.clj
@@ -1,5 +1,6 @@
(ns metabase.transforms.settings
(:require
+ [metabase.premium-features.core :as premium-features]
[metabase.settings.core :as setting]
[metabase.transforms.usage :as transforms.usage]
[metabase.util.i18n :refer [deferred-tru]]))
@@ -36,13 +37,44 @@
:encryption :no
:audit :getter)
+(defn- explicit-transforms-enabled
+ "Returns the :transforms-enabled setting if explicitly set, otherwise nil."
+ []
+ (setting/get-value-of-type :boolean :transforms-enabled))
+
+(defn- cloud-enabled-transforms?
+ "Whether a cloud instance has enabled transforms.
+ If a cloud instance has the transforms token feature, then they've gone through the upsell and enabled transforms.
+ Self-hosted instances don't go through the upsell, so we require that they explicitly enable transforms via the setting."
+ []
+ (and (premium-features/is-hosted?)
+ (premium-features/has-feature? :transforms-basic)))
+
(setting/defsetting transforms-enabled
- (deferred-tru "Enable transforms for instances that have not explicitly purchased the transform add-on.")
+ (deferred-tru "Whether transforms are enabled.")
+ :doc "When enabled, data analysts and admins can write, schedule and run transforms.
+ Disabling this feature will hide all transform features, prevent transform editing or creation, and prevent any new runs."
+ :type :boolean
+ :visibility :authenticated
+ :export? true
+ :audit :getter
+ :getter (fn []
+ ;; if the setting is set (whether true or false), use it, otherwise use the token feature for cloud
+ (if-some [v (explicit-transforms-enabled)]
+ v
+ (cloud-enabled-transforms?))))
+
+(setting/defsetting transforms-setup-complete
+ (deferred-tru "Whether transforms setup is complete.")
:type :boolean
:visibility :authenticated
- :default false
:export? false
- :audit :getter)
+ :audit :getter
+ :can-read-from-env? false
+ :getter (fn []
+ ;; if the setting is set (whether true or false), then setup is complete. otherwise, check the token feature for cloud
+ (or (some? (explicit-transforms-enabled))
+ (cloud-enabled-transforms?))))
(setting/defsetting transforms-meter-locked
(deferred-tru "True when the customer''s active transforms meter is locked (trial quota exhausted).")
diff --git a/test/metabase/metabot/tools/resources_test.clj b/test/metabase/metabot/tools/resources_test.clj
index e7e605e1066..c7da8dc9119 100644
--- a/test/metabase/metabot/tools/resources_test.clj
+++ b/test/metabase/metabot/tools/resources_test.clj
@@ -236,7 +236,7 @@
(read-resource/read-resource {:uris ["metabase://dashboard/99999"]})))))))
(deftest read-transform-resource-test
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-current-user (mt/user->id :crowberto)
(mt/with-temp [:model/Transform {transform-id :id transform-name :name}
{:name "Gadget Products"
diff --git a/test/metabase/sync/sync_metadata/tables_test.clj b/test/metabase/sync/sync_metadata/tables_test.clj
index 9718fae2090..8bdd0dd33f1 100644
--- a/test/metabase/sync/sync_metadata/tables_test.clj
+++ b/test/metabase/sync/sync_metadata/tables_test.clj
@@ -48,10 +48,6 @@
normal-table {:name "orders"
:schema "public"}
db-metadata {:tables #{temp-table normal-table}}]
- (testing "with no premium features, sync excludes transform temporary tables"
- (mt/with-premium-features #{}
- (is (= #{normal-table}
- (into #{} (remove #'sync-tables/ignore-table?) (:tables db-metadata))))))
(testing "when hosted, includes transform temporary tables"
(mt/with-premium-features #{:hosting}
(is (= #{normal-table temp-table}
diff --git a/test/metabase/transforms/jobs_test.clj b/test/metabase/transforms/jobs_test.clj
index ab217e69e5f..92e2c29ad45 100644
--- a/test/metabase/transforms/jobs_test.clj
+++ b/test/metabase/transforms/jobs_test.clj
@@ -128,8 +128,8 @@
(def ^:private query-source {:type "query"})
-(deftest run-transform-feature-flag-test
- (testing "Query transforms run without any features"
+(deftest run-query-transform-without-features-test
+ (mt/with-temporary-raw-setting-values [transforms-enabled "true"]
(mt/with-premium-features #{}
(let [query-transform {:id 3
:source query-source
@@ -147,31 +147,54 @@
(is (empty? (filter (comp #{:warn} :level) @logged-messages))
"Should not log warnings when feature is enabled")
(is @run-called?
- "Should call run-mbql-transform! when feature is enabled")))))
- (testing "Query transforms are skipped when hosted without :transforms-basic feature"
- (mt/with-premium-features #{:hosting}
- (let [query-transform {:id 1
- :source query-source
- :name "Test Query Transform"}
- run-id 100
- logged-messages (atom [])]
- (mt/with-dynamic-fn-redefs [log/log* (fn [_ level _ message]
- (swap! logged-messages conj {:level level :message message}))
- transform-run/running-run-for-transform-id (constantly nil)]
- (#'jobs/run-transform! run-id :scheduled nil (promise) query-transform)
- (is (= 1 (count @logged-messages))
- "Should log exactly one warning")
- (is (= :warn (:level (first @logged-messages)))
- "Should log at warn level")
- (is (re-matches #".*Skip running transform 1 due to lacking premium features.*"
- (:message (first @logged-messages)))
- "Warning message should indicate transform was skipped due to missing features")))))
- (testing "Query transforms run with :transforms-basic feature"
+ "Should call run-mbql-transform! when feature is enabled"))))))
+
+(deftest run-query-transform-skipped-hosted-without-basic-feature-test
+ (mt/with-premium-features #{:hosting}
+ (let [query-transform {:id 1
+ :source query-source
+ :name "Test Query Transform"}
+ run-id 100
+ logged-messages (atom [])]
+ (mt/with-dynamic-fn-redefs [log/log* (fn [_ level _ message]
+ (swap! logged-messages conj {:level level :message message}))
+ transform-run/running-run-for-transform-id (constantly nil)]
+ (#'jobs/run-transform! run-id :scheduled nil (promise) query-transform)
+ (is (= 1 (count @logged-messages))
+ "Should log exactly one warning")
+ (is (= :warn (:level (first @logged-messages)))
+ "Should log at warn level")
+ (is (re-matches #".*Skip running transform 1 due to lacking premium features.*"
+ (:message (first @logged-messages)))
+ "Warning message should indicate transform was skipped due to missing features")))))
+
+(deftest run-query-transform-with-transforms-basic-feature-test
+ (mt/with-premium-features #{:hosting :transforms-basic}
+ (let [query-transform {:id 3
+ :source query-source
+ :name "Test Query Transform"}
+ run-id 102
+ logged-messages (atom [])
+ run-called? (atom false)]
+ (mt/with-dynamic-fn-redefs [log/log* (fn [_ level _ message]
+ (swap! logged-messages conj {:level level :message message}))
+ transform-run/running-run-for-transform-id (constantly nil)
+ transforms.execute/execute! (fn [_ _]
+ (reset! run-called? true))
+ transforms.job-run/add-run-activity! (constantly nil)]
+ (#'jobs/run-transform! run-id :scheduled nil (promise) query-transform)
+ (is (empty? (filter (comp #{:warn} :level) @logged-messages))
+ "Should not log warnings when feature is enabled")
+ (is @run-called?
+ "Should call run-mbql-transform! when feature is enabled")))))
+
+(deftest run-query-transform-skipped-when-transforms-enabled-false-test
+ (mt/with-temporary-raw-setting-values [transforms-enabled "false"]
(mt/with-premium-features #{:hosting :transforms-basic}
- (let [query-transform {:id 3
+ (let [query-transform {:id 4
:source query-source
- :name "Test Query Transform"}
- run-id 102
+ :name "Disabled Transform"}
+ run-id 103
logged-messages (atom [])
run-called? (atom false)]
(mt/with-dynamic-fn-redefs [log/log* (fn [_ level _ message]
@@ -181,10 +204,15 @@
(reset! run-called? true))
transforms.job-run/add-run-activity! (constantly nil)]
(#'jobs/run-transform! run-id :scheduled nil (promise) query-transform)
- (is (empty? (filter (comp #{:warn} :level) @logged-messages))
- "Should not log warnings when feature is enabled")
- (is @run-called?
- "Should call run-mbql-transform! when feature is enabled"))))))
+ (is (= 1 (count @logged-messages))
+ "Should log exactly one warning")
+ (is (= :warn (:level (first @logged-messages)))
+ "Should log at warn level")
+ (is (re-matches #".*Skip running transform 4 due to lacking premium features.*"
+ (:message (first @logged-messages)))
+ "Warning message should indicate transform was skipped")
+ (is (false? @run-called?)
+ "Should not execute when transforms-enabled is explicitly false"))))))
(deftest run-transform-locked-meter-test
;; `transform-metered-as` is `defenterprise`; the OSS impl returns nil for everything,
@@ -230,16 +258,17 @@
(testing "non-metered transform (transform-metered-as → nil) is never blocked by lock state"
;; Override the outer mock with one that returns nil for every source-type.
(with-redefs [premium-features/transform-metered-as (constantly nil)]
- (mt/with-temporary-setting-values [locked-meters {:transform-basic-runs true
- :transform-advanced-runs true}]
- (let [transform {:id 9 :source_type :native :source query-source :name "Non-metered"}
- run-called? (atom false)]
- (mt/with-dynamic-fn-redefs [transform-run/running-run-for-transform-id (constantly nil)
- transforms.execute/execute! (fn [_ _] (reset! run-called? true))
- transforms.job-run/add-run-activity! (constantly nil)]
- (#'jobs/run-transform! 202 :scheduled nil (promise) transform)
- (is (true? @run-called?)
- "Non-metered transforms are not gated by lock state"))))))))
+ (mt/with-premium-features #{:hosting :transforms-basic}
+ (mt/with-temporary-setting-values [locked-meters {:transform-basic-runs true
+ :transform-advanced-runs true}]
+ (let [transform {:id 9 :source_type :native :source query-source :name "Non-metered"}
+ run-called? (atom false)]
+ (mt/with-dynamic-fn-redefs [transform-run/running-run-for-transform-id (constantly nil)
+ transforms.execute/execute! (fn [_ _] (reset! run-called? true))
+ transforms.job-run/add-run-activity! (constantly nil)]
+ (#'jobs/run-transform! 202 :scheduled nil (promise) transform)
+ (is (true? @run-called?)
+ "Non-metered transforms are not gated by lock state")))))))))
(deftest job-run-boom-test
(mt/with-premium-features #{:transforms-basic}
@@ -308,7 +337,7 @@
(t2/select-one :model/TransformJobRun :id (:id run)))))))))
(deftest job-run-with-tranform-run-failure-test
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-model-cleanup [:model/Notification]
@@ -403,7 +432,7 @@
(deftest run-mbql-transform-anonymous-user-routing-error-test
(mt/when-ee-evailable
- (mt/with-premium-features #{:database-routing :transforms-basic}
+ (mt/with-premium-features #{:database-routing :transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-model-cleanup [:model/Notification]
diff --git a/test/metabase/transforms/models/transform_test.clj b/test/metabase/transforms/models/transform_test.clj
index ce778794a1c..20a00a1beb1 100644
--- a/test/metabase/transforms/models/transform_test.clj
+++ b/test/metabase/transforms/models/transform_test.clj
@@ -51,7 +51,7 @@
(deftest can-read-write-on-orphaned-transform-test
(testing "superusers can read/write a transform whose source database has been deleted, data analysts cannot"
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-temp [:model/Database {db-id :id} {}
:model/Transform transform
{:name "Orphan Transform"
diff --git a/test/metabase/transforms/schedule_test.clj b/test/metabase/transforms/schedule_test.clj
new file mode 100644
index 00000000000..0baa067a846
--- /dev/null
+++ b/test/metabase/transforms/schedule_test.clj
@@ -0,0 +1,49 @@
+(ns metabase.transforms.schedule-test
+ (:require
+ [clojure.test :refer :all]
+ [clojurewerkz.quartzite.conversion :as qc]
+ [metabase.test :as mt]
+ [metabase.transforms.jobs :as transforms.jobs]
+ [metabase.transforms.schedule])
+ (:import
+ (metabase.transforms.schedule RunTransforms)
+ (org.quartz JobDataMap)))
+
+(set! *warn-on-reflection* true)
+
+(deftype MockJobExecutionContext [job-data-map]
+ org.quartz.JobExecutionContext
+ (getMergedJobDataMap [_] (JobDataMap. job-data-map))
+
+ qc/JobDataMapConversion
+ (from-job-data [this]
+ (.getMergedJobDataMap this)))
+
+(defn- run-transforms-job! [job-id]
+ (.execute (RunTransforms.) (MockJobExecutionContext. {"job-id" job-id})))
+
+(deftest run-transforms-skips-when-disabled-test
+ (testing "RunTransforms skips scheduled job runs when transforms-enabled is explicitly false"
+ (mt/with-temp [:model/TransformJob {job-id :id} {:active true :schedule "0 0 * * * ?"}]
+ (mt/with-temporary-raw-setting-values [transforms-enabled "false"]
+ (let [run-called? (atom false)]
+ (mt/with-dynamic-fn-redefs [transforms.jobs/run-job! (fn [& _] (reset! run-called? true))]
+ (run-transforms-job! job-id)
+ (is (false? @run-called?)
+ "Should not call run-job! when transforms are disabled")))))))
+
+(deftest run-transforms-proceeds-when-enabled-test
+ (testing "RunTransforms runs scheduled jobs when transforms-enabled is explicitly true"
+ (mt/with-temp [:model/TransformJob {job-id :id} {:active true :schedule "0 0 * * * ?"}]
+ (mt/with-temporary-raw-setting-values [transforms-enabled "true"]
+ (let [run-called? (atom false)
+ run-args (atom nil)]
+ (mt/with-dynamic-fn-redefs [transforms.jobs/run-job! (fn [& args]
+ (reset! run-called? true)
+ (reset! run-args args))]
+ (run-transforms-job! job-id)
+ (is (true? @run-called?)
+ "Should call run-job! when transforms are enabled")
+ (is (= [job-id {:run-method :cron}]
+ @run-args)
+ "Should pass the job id and cron run method")))))))
diff --git a/test/metabase/transforms/search_test.clj b/test/metabase/transforms/search_test.clj
index 294f69a7a6c..2225f87cf8f 100644
--- a/test/metabase/transforms/search_test.clj
+++ b/test/metabase/transforms/search_test.clj
@@ -148,7 +148,7 @@
"Transform should be removed from the search index after deletion"))))))
(deftest transform-search-test
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(search.tu/with-temp-index-table
(mt/as-admin
(testing "Transforms can be indexed and subsequently searched for"
diff --git a/test/metabase/transforms/util_test.clj b/test/metabase/transforms/util_test.clj
index e088632fc74..266912b3a81 100644
--- a/test/metabase/transforms/util_test.clj
+++ b/test/metabase/transforms/util_test.clj
@@ -71,7 +71,7 @@
nil)))))))))
(deftest is-temp-transform-tables-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:hosting :transforms-basic}
(testing "tables with schema"
(let [table-with-schema {:name (name (driver.u/temp-table-name :postgres :schema/orders))}
table-without-schema {:name (name (driver.u/temp-table-name :postgres :orders))}]
diff --git a/test/metabase/transforms_rest/api/transform_job_test.clj b/test/metabase/transforms_rest/api/transform_job_test.clj
index 86d2131b561..ea96ed1f71f 100644
--- a/test/metabase/transforms_rest/api/transform_job_test.clj
+++ b/test/metabase/transforms_rest/api/transform_job_test.clj
@@ -66,7 +66,7 @@
(deftest get-job-transforms-test
(testing "GET /api/transform-job/:id/transforms"
(mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-premium-features #{:transforms-basic}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(let [lucky-id (mt/user->id :lucky)]
(mt/with-temp [:model/Transform {transform1-id :id} {:name "tr1" :creator_id lucky-id}
:model/Transform {transform2-id :id} {:name "tr2" :creator_id lucky-id}
diff --git a/test/metabase/transforms_rest/api/transform_test.clj b/test/metabase/transforms_rest/api/transform_test.clj
index 6855803f8f0..a2bd6b2a911 100644
--- a/test/metabase/transforms_rest/api/transform_test.clj
+++ b/test/metabase/transforms_rest/api/transform_test.clj
@@ -69,7 +69,7 @@
:filter-values [category]})))
(deftest create-transform-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -102,7 +102,7 @@
(deftest update-transform-without-schema-test
(testing "Updating a transform to clear its schema is rejected on schemas-supporting databases"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(when (driver.u/supports? driver/*driver* :schemas (mt/db))
@@ -131,7 +131,7 @@
(deftest create-transform-without-schema-test
(testing "Creating a transform without a schema is rejected on databases that support schemas, and allowed on those that don't"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -154,7 +154,7 @@
(is (some? (:id response)))))))))))))))
(deftest create-transform-with-param-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -174,7 +174,7 @@
(is (some? transform-id)))))))))))
(deftest create-transform-with-required-param-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -199,7 +199,7 @@
(:message response))))))))))))
(deftest create-transform-with-unofficial-required-param-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -221,7 +221,7 @@
(:message response))))))))))))
(deftest create-transform-with-owner-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(testing "Creating a transform with explicit owner_user_id"
@@ -245,7 +245,7 @@
"Hydrated owner should match the specified user"))))))))
(deftest create-transform-with-external-email-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(testing "Creating a transform with external owner_email"
@@ -268,7 +268,7 @@
"Hydrated owner should be email-only map"))))))))
(deftest update-transform-owner-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "update_owner_test"]
@@ -311,7 +311,7 @@
(is (nil? (:owner updated)))))))))))
(deftest update-transform-query-with-param-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "update_owner_test"]
@@ -333,7 +333,7 @@
:query new-query}}))))))))
(deftest update-transform-query-with-required-param-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "update_owner_test"]
@@ -360,7 +360,7 @@
(:message response))))))))))
(deftest update-transform-query-with-unofficial-required-param-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "update_owner_test"]
@@ -384,7 +384,7 @@
(:message response))))))))))
(deftest transform-type-detection-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Transform type is automatically detected and set based on source"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -415,7 +415,7 @@
(is (= "native" (:source_type response)))))))))))))
(deftest transform-type-updates-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Transform type is automatically updated when source changes"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -441,69 +441,98 @@
(is (= "mbql" (:source_type updated))))))))))))))
(deftest create-transform-feature-flag-test
- (mt/with-premium-features #{}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (testing "Creating a query transform succeeds when not hosted"
- (mt/dataset transforms-dataset/transforms-test
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (with-transform-cleanup! [table-name "test_transform"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- response (mt/user-http-request :lucky :post 200 "transform"
- {:name "Test Transform"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}})]
- (is (some? (:id response))))))))))))
+ (mt/with-temporary-raw-setting-values [transforms-enabled "true"]
+ (mt/with-premium-features #{}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (testing "Creating a query transform succeeds when not hosted"
+ (mt/dataset transforms-dataset/transforms-test
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (with-transform-cleanup! [table-name "test_transform"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ response (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Test Transform"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})]
+ (is (some? (:id response)))))))))))))
(deftest update-transform-feature-flag-test
- (mt/with-premium-features #{}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/dataset transforms-dataset/transforms-test
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (testing "Updating a query transform works when not hosted"
- (with-transform-cleanup! [table-name "test_update"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- transform-payload {:name "Original Transform"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}}
- created (mt/user-http-request :lucky :post 200 "transform" transform-payload)
- response (mt/user-http-request :lucky :put 200
- (format "transform/%d" (:id created))
- (assoc transform-payload :name "Updated Transform"))]
- (is (= "Updated Transform" (:name response))))))))))))
+ (mt/with-temporary-raw-setting-values [transforms-enabled "true"]
+ (mt/with-premium-features #{}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (testing "Updating a query transform works when not hosted"
+ (with-transform-cleanup! [table-name "test_update"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ transform-payload {:name "Original Transform"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}}
+ created (mt/user-http-request :lucky :post 200 "transform" transform-payload)
+ response (mt/user-http-request :lucky :put 200
+ (format "transform/%d" (:id created))
+ (assoc transform-payload :name "Updated Transform"))]
+ (is (= "Updated Transform" (:name response)))))))))))))
(deftest run-transform-feature-flag-test
- (mt/with-premium-features #{}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (testing "Running a query transform works when not hosted"
- (mt/dataset transforms-dataset/transforms-test
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (with-transform-cleanup! [table-name "test_run"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- transform-payload {:name "Test Run Transform"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}}
- created (mt/user-http-request :lucky :post 200 "transform" transform-payload)
- response (mt/user-http-request :lucky :post 202
- (format "transform/%d/run" (:id created)))]
- (is (= "Transform run started" (:message response))))))))))))
+ (mt/with-temporary-raw-setting-values [transforms-enabled "true"]
+ (mt/with-premium-features #{}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (testing "Running a query transform works when not hosted"
+ (mt/dataset transforms-dataset/transforms-test
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (with-transform-cleanup! [table-name "test_run"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ transform-payload {:name "Test Run Transform"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}}
+ created (mt/user-http-request :lucky :post 200 "transform" transform-payload)
+ response (mt/user-http-request :lucky :post 202
+ (format "transform/%d/run" (:id created)))]
+ (is (= "Transform run started" (:message response)))))))))))))
+
+(deftest transforms-disabled-blocks-api-operations-test
+ (doseq [[features label] [[#{:transforms-basic :hosting} "hosted with transforms features"]
+ [#{} "self-hosted"]]]
+ (testing label
+ (mt/with-temporary-raw-setting-values [transforms-enabled "false"]
+ (mt/with-premium-features features
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (testing "POST /api/transform returns 402"
+ (let [table-name (str "disabled_transform_" (u/generate-nano-id))
+ response (mt/user-http-request :crowberto :post 402 "transform"
+ {:name "Disabled Transform"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}})]
+ (is (= "Premium features required for this transform type are not enabled."
+ response))))
+ (testing "GET /api/transform returns 403"
+ (mt/user-http-request :crowberto :get 403 "transform"))
+ (testing "POST /api/transform/:id/run returns 403"
+ (mt/with-temp [:model/Transform {transform-id :id} {}]
+ (mt/user-http-request :crowberto :post 403
+ (format "transform/%d/run" transform-id)))))))))))
(deftest run-transform-permission-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(testing "POST /transform/:id/run requires only read permission, not write"
(mt/dataset transforms-dataset/transforms-test
@@ -524,7 +553,7 @@
(format "transform/%d/run" (:id transform)))))))))))))))
(deftest list-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-data-analyst-role! (mt/user->id :lucky)
(testing "Can list without query parameters"
@@ -554,7 +583,7 @@
"At least one transform should have readable sources")))))))))))
(deftest filter-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "should be able to filter transforms"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -584,7 +613,7 @@
(mt/user-http-request :lucky :get 200 "transform" :tag-ids [tag2-id]))))))))))
(deftest get-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -607,7 +636,7 @@
(is (= lucky-id (get-in get-resp [:creator :id]))))))))))))
(deftest source-readable-field-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Transforms API includes source_readable field"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -648,7 +677,7 @@
:type "table"}})
(deftest get-transform-dependencies-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-temp [:model/Table {table :id} {:schema "public", :name "orders_2"}
@@ -671,7 +700,7 @@
(is (every? #(map? (:creator %)) deps-resp)))))))))
(deftest put-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -702,7 +731,7 @@
(is (= lucky-id (get-in put-resp [:creator :id]))))))))))))
(deftest change-target-table-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -732,7 +761,7 @@
(is (false? (transforms-base.u/target-table-exists? original)))))))))))
(deftest delete-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -749,7 +778,7 @@
(mt/user-http-request :lucky :get 404 (format "transform/%s" (:id resp)))))))))))
(deftest delete-table-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -822,7 +851,7 @@
" in table " table-name ", but got " actual-count)))))
(deftest execute-transform-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "transform execution with :transforms/table target"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -1197,7 +1226,7 @@
(assert-transform-ids response #{(:id transform1)})))))))
(deftest transform-revisions-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "transform_revisions_test"]
@@ -1236,7 +1265,7 @@
(test-transform-revisions :put (str "transform/" transform-id) widget-req 2)))))))
(deftest permissions-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Transform endpoints require transforms permission"
(mt/with-temp [:model/Transform transform {}]
(testing "Regular users without transform permission get 403"
@@ -1263,7 +1292,7 @@
;;; ------------------------------------------------------------
(deftest manual-run-user-attribution-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Manual runs are attributed to the triggering user, not the owner"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -1299,7 +1328,7 @@
;;; ------------------------------------------------------------
(deftest collection-items-include-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "GET /api/collection/:id/items"
(testing "Includes transforms in collection items"
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -1339,7 +1368,7 @@
(is (= "Test Transform" (:name (first items)))))))))))
(deftest create-transform-with-tags-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "POST /api/transform with tag_ids"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1376,7 +1405,7 @@
(t2/delete! :model/Transform :id (:id transform-response)))))))))))))
(deftest update-transform-tags-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "PUT /api/transform/:id with tag_ids"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1405,7 +1434,7 @@
(is (= [] (:tag_ids updated))))))))))))
(deftest get-transform-with-tags-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "GET /api/transform/:id returns tag_ids"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1436,7 +1465,7 @@
(is (= [] (:tag_ids fetched)))))))))))))
(deftest list-transforms-with-tags-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "GET /api/transform returns transforms with tag_ids"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-data-analyst-role! (mt/user->id :lucky)
@@ -1467,7 +1496,7 @@
(is (= [(:id tag1) (:id tag2)] (sort (:tag_ids t2))))))))))))
(deftest delete-tag-removes-associations-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Deleting a tag removes it from all transforms"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1498,7 +1527,7 @@
(t2/delete! :model/TransformTag :id (:id tag1))))))))))))
(deftest preserve-tag-order-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "Tag order is preserved when adding/updating transform tags"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1542,7 +1571,7 @@
(t2/delete! :model/Transform :id (:id transform))))))))))))))
(deftest root-collection-items-include-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "GET /api/collection/root/items"
(testing "Includes transforms in root collection items"
(mt/with-temp [:model/Transform {transform-id :id}
@@ -1577,7 +1606,7 @@
(is (empty? items)))))))))
(deftest transforms-appear-in-here-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "GET /api/collection/:id/items"
(testing "Transforms in a collection appear in its :here field"
(mt/with-temp [:model/Collection {parent-id :id} {:name "Parent"
@@ -1593,7 +1622,7 @@
(is (= ["transform"] (:here child-coll)))))))))
(deftest transforms-appear-in-below-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "GET /api/collection/:id/items"
(testing "Transforms in descendant collections appear in :below field"
(mt/with-temp [:model/Collection {parent-id :id} {:name "Parent"
@@ -1613,7 +1642,7 @@
(is (= ["transform"] (:below child-coll)))))))))
(deftest incremental-column-type-validated-on-create-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "POST /api/transform column type validation with checkpoint-filter-field-id"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -1635,7 +1664,7 @@
(is (re-find #"unsupported type" response))))))))))
(deftest incremental-column-type-validated-on-update-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "PUT /api/transform column type validation with checkpoint-filter-field-id"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -1668,7 +1697,7 @@
(deftest update-tag-ids-with-stale-checkpoint-field-test
(testing "Updating only tag_ids succeeds even when the checkpoint field has since been deleted (GDGT-2410)"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(let [schema (get-test-schema)]
@@ -1711,7 +1740,7 @@
:required true}}}})
(deftest incremental-table-tag-validated-on-create-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "POST /api/transform rejects a table-incremental native query with no table template tag (GDGT-2524)"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -1745,7 +1774,7 @@
(is (re-find #"requires a table variable" response))))))))))
(deftest incremental-table-tag-validated-on-update-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(testing "PUT /api/transform rejects removing the table tag from an incremental transform (GDGT-2524)"
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
@@ -1797,7 +1826,7 @@
(is (re-find #"requires a table variable" response))))))))))))
(deftest search-filters-transform-source-types-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(let [search-term (str "transform-search-" (u/generate-nano-id))
@@ -1826,7 +1855,7 @@
(is (not (contains? transform-ids python-id)))))))))))
(deftest search-hides-transforms-for-non-superusers-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(let [search-term (str "transform-search-" (u/generate-nano-id))
@@ -1845,7 +1874,7 @@
(is (not (contains? ids transform-id)))))))))))
(deftest search-includes-native-and-mbql-query-transforms-test
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(let [search-term (str "transform-search-" (u/generate-nano-id))
@@ -1915,7 +1944,7 @@
(deftest execute-transform-with-field-filter-template-tag-test
(testing "a required field-filter (:dimension) template tag resolves via its default value at unattended execution"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1948,7 +1977,7 @@
(deftest execute-transform-with-table-template-tag-test
(testing "a table (table-variable) template tag substitutes a schema-qualified identifier at unattended execution"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -1972,7 +2001,7 @@
(deftest reject-target-name-collision-test
(testing "target-name collision with a pre-existing, non-transform table is rejected"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
@@ -2002,7 +2031,7 @@
(deftest delete-target-then-recreate-same-name-test
(testing "re-running after DELETE /api/transform/:id/table recreates the same target name"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "gadget_products_recreate"]
@@ -2020,18 +2049,19 @@
(deftest get-transform-with-deleted-database-test
(testing "GET /api/transform/:id degrades gracefully when its source database has been deleted"
- (mt/with-temp [:model/Database db {}]
- (let [mp (lib.metadata.jvm/application-database-metadata-provider (:id db))
- query (lib/native-query mp "select 1")]
- (mt/with-temp [:model/Transform transform {:source {:type "query" :query query}
- :target {:type "table" :name (mt/random-name)}}]
- (t2/delete! :model/Database (:id db))
- (is (=? {:id (:id transform)}
- (mt/user-http-request :crowberto :get 200 (str "transform/" (:id transform))))))))))
+ (mt/with-premium-features #{:transforms-basic :hosting}
+ (mt/with-temp [:model/Database db {}]
+ (let [mp (lib.metadata.jvm/application-database-metadata-provider (:id db))
+ query (lib/native-query mp "select 1")]
+ (mt/with-temp [:model/Transform transform {:source {:type "query" :query query}
+ :target {:type "table" :name (mt/random-name)}}]
+ (t2/delete! :model/Database (:id db))
+ (is (=? {:id (:id transform)}
+ (mt/user-http-request :crowberto :get 200 (str "transform/" (:id transform)))))))))))
(deftest cancel-transform-run-endpoint-test
(testing "POST /api/transform/:id/cancel"
- (mt/with-premium-features #{}
+ (mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-driver :postgres
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "cancel_endpoint_output"]
diff --git a/test/metabase/warehouse_schema_rest/api/table_test.clj b/test/metabase/warehouse_schema_rest/api/table_test.clj
index fa727118b2e..a60d61d9d7b 100644
--- a/test/metabase/warehouse_schema_rest/api/table_test.clj
+++ b/test/metabase/warehouse_schema_rest/api/table_test.clj
@@ -242,15 +242,12 @@
(testing "returns 404 for tables that don't exist"
(mt/user-http-request :rasta :get 404 (format "table/%d/data" 133713371337)))))))
-(defn- query-metadata-defaults []
- (assoc (table-defaults) :transform nil))
-
(deftest ^:parallel sensitive-fields-included-test
(mt/with-premium-features #{}
(testing "GET api/table/:id/query_metadata?include_sensitive_fields"
(testing "Sensitive fields are included"
(is (= (merge
- (query-metadata-defaults)
+ (table-defaults)
(t2/hydrate (t2/select-one [:model/Table :created_at :updated_at :initial_sync_status :view_count]
:id (mt/id :users))
:collection)
@@ -333,7 +330,7 @@
(testing "GET api/table/:id/query_metadata"
(testing "Sensitive fields should not be included"
(is (= (merge
- (query-metadata-defaults)
+ (table-defaults)
(t2/hydrate (t2/select-one [:model/Table :created_at :updated_at :initial_sync_status :view_count]
:id (mt/id :users))
:collection)
@@ -402,9 +399,10 @@
:model/Table {table-id :id} {:db_id (mt/id)
:transform_id (:id transform)}]
(testing "self-hosted (not hosted) without :transforms-basic still hydrates the source transform"
- (mt/with-premium-features #{}
- (is (=? {:transform {:id (:id transform)}}
- (mt/user-http-request :crowberto :get 200 (format "table/%d/query_metadata" table-id))))))
+ (mt/with-temporary-raw-setting-values [transforms-enabled "true"]
+ (mt/with-premium-features #{}
+ (is (=? {:transform {:id (:id transform)}}
+ (mt/user-http-request :crowberto :get 200 (format "table/%d/query_metadata" table-id)))))))
(testing "hosted instance without :transforms-basic does not hydrate the source transform"
(mt/with-premium-features #{:hosting}
(is (nil? (:transform (mt/user-http-request :crowberto :get 200 (format "table/%d/query_metadata" table-id))))))))))
@@ -662,7 +660,7 @@
(mt/with-premium-features #{}
(testing "GET /api/table/:id/query_metadata"
(is (= (merge
- (query-metadata-defaults)
+ (table-defaults)
(t2/hydrate (t2/select-one [:model/Table :created_at :updated_at :initial_sync_status] :id (mt/id :categories))
:collection)
{:schema "PUBLIC"
diff --git a/test_resources/serialization_baseline/settings.yaml b/test_resources/serialization_baseline/settings.yaml
index 687cda0d804..be0e15b075f 100644
--- a/test_resources/serialization_baseline/settings.yaml
+++ b/test_resources/serialization_baseline/settings.yaml
@@ -87,4 +87,5 @@ start-of-week: null
subscription-allowed-domains: null
synchronous-batch-updates: null
system-timezone: null
+transforms-enabled: null
unaggregated-query-row-limit: null