Skip to content

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

Move Data Studio common stuff to OSS (#68571)

Denis Berezin9585b7a06597
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index d8d3719f43b..e78d758d619 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -426,13 +426,10 @@
metabase-enterprise.content-translation.routes-test/with-new-secret-key! clojure.core/fn
metabase-enterprise.serialization.test-util/with-dbs clojure.core/fn
metabase-enterprise.serialization.test-util/with-random-dump-dir clojure.core/let
- metabase-enterprise.transforms.api-test/with-transform-tags clojure.core/let
- metabase-enterprise.transforms.api-test/with-worker-runs clojure.core/let
- metabase-enterprise.transforms.test-util/with-transform-cleanup! clojure.core/let
- metabase-enterprise.transforms.execute/with-transform-lifecycle clojure.core/let
metabase-enterprise.workspaces.test-util/with-resources! clojure.core/let
metabase-enterprise.workspaces.test-util/with-workspaces! clojure.core/let
metabase.actions.test-util/with-actions clojure.core/let
+ metabase.transforms.test-util/with-transform-cleanup! clojure.core/let
metabase.api.common/let-404 clojure.core/let
metabase.app-db.custom-migrations.util/with-temp-scheduler! clojure.core/fn
metabase.app-db.custom-migrations/define-migration clj-kondo.lint-as/def-catch-all
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 3cbad054890..8d7a7fd6c4e 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -395,6 +395,7 @@
request
revisions
settings
+ transforms
upload
util}}
@@ -501,6 +502,18 @@
util
xrays}}
+ data-studio
+ {:team "Gadget"
+ :api #{metabase.data-studio.api}
+ :uses #{api
+ database-routing
+ driver
+ events
+ request
+ sync
+ util
+ warehouse-schema}}
+
database-routing
{:team "UX West"
:api #{metabase.database-routing.core}
@@ -869,10 +882,19 @@
:uses #{api
app-db
classloader
+ collections
+ events
legacy-mbql
lib
+ lib-be
+ permissions
+ query-processor
+ remote-sync
+ search
settings
- util}}
+ transforms
+ util}
+ :friends #{transforms}}
native-query-snippets
{:team "Querying"
@@ -1291,6 +1313,7 @@
settings
startup
task
+ transforms
util
warehouses}}
@@ -1531,6 +1554,40 @@
models
util}}
+ transforms
+ {:team "Querying"
+ :api #{metabase.transforms.api.transform
+ metabase.transforms.api.transform-job
+ metabase.transforms.api.transform-tag
+ metabase.transforms.core
+ metabase.transforms.feature-gating
+ metabase.transforms.init
+ metabase.transforms.schema
+ metabase.transforms.util}
+ :uses #{analytics
+ api
+ channel
+ database-routing
+ driver
+ events
+ lib
+ lib-be
+ models
+ premium-features
+ queries
+ query-processor
+ request
+ revisions
+ settings
+ sync
+ task
+ task-history
+ util}
+ :friends #{models
+ enterprise/transforms-python
+ enterprise/workspaces}}
+
+
types
{:team "Querying"
:api #{metabase.types.core
@@ -1541,6 +1598,7 @@
{:team "Querying"
:api #{metabase.upload.api
metabase.upload.core
+ metabase.upload.db
metabase.upload.init}
:uses #{analytics
api
@@ -1973,20 +2031,15 @@
:uses #{premium-features}}
enterprise/data-studio
- {:team "Gadget"
+ {:team "UX West"
:api #{metabase-enterprise.data-studio.api}
:uses #{api
collections
- database-routing
- driver
events
models
permissions
premium-features
- request
- sync
- util
- warehouse-schema}}
+ util}}
enterprise/database-replication
{:team "Cloud"
@@ -2042,8 +2095,8 @@
revisions
settings
task
- util
- enterprise/transforms}}
+ transforms
+ util}}
enterprise/email
{:team "UX West"
@@ -2157,12 +2210,12 @@
sync
system
task
+ transforms
users-rest
util
warehouse-schema
warehouses-rest
enterprise/dependencies
- enterprise/transforms
enterprise/transforms-python}}
enterprise/permission-debug
@@ -2360,37 +2413,8 @@
enterprise/transforms
{:team "Querying"
- :api #{metabase-enterprise.transforms.api
- metabase-enterprise.transforms.core
- metabase-enterprise.transforms.execute
- metabase-enterprise.transforms.init
- metabase-enterprise.transforms.instrumentation
- metabase-enterprise.transforms.interface
- metabase-enterprise.transforms.schema
- metabase-enterprise.transforms.util}
- :uses #{analytics
- api
- app-db
- channel
- collections
- driver
- events
- lib
- lib-be
- models
- permissions
- premium-features
- queries
- query-processor
- remote-sync
- request
- revisions
- search
- settings
- sync
- task
- task-history
- util}}
+ :api #{}
+ :uses #{}}
enterprise/transforms-python
{:team "Querying"
@@ -2409,8 +2433,8 @@
permissions
query-processor
settings
- util
- enterprise/transforms}}
+ transforms
+ util}}
enterprise/upload-management
{:team "UX West"
@@ -2428,6 +2452,7 @@
:uses #{api
api-keys
config
+ database-routing
driver
events
lib
@@ -2439,8 +2464,8 @@
request
settings
system
+ transforms
util
- enterprise/transforms
enterprise/transforms-python}}}
;; namespaces matching these patterns (with `re-find`) are excluded from the module linter. Since regex literals
diff --git a/docs/api.json b/docs/api.json
index d88479ff58e..bd0048cbe73 100644
--- a/docs/api.json
+++ b/docs/api.json
@@ -29462,9 +29462,9 @@
"tags" : [ "/api/ee/tenant" ]
}
},
- "/api/ee/transform-job/" : {
+ "/api/transform-job/" : {
"post" : {
- "summary" : "POST /api/ee/transform-job/",
+ "summary" : "POST /api/transform-job/",
"description" : "Create a new transform job.",
"parameters" : [ ],
"responses" : {
@@ -29519,10 +29519,10 @@
}
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
},
"get" : {
- "summary" : "GET /api/ee/transform-job/",
+ "summary" : "GET /api/transform-job/",
"description" : "Get all transform jobs.",
"parameters" : [ {
"in" : "query",
@@ -29591,12 +29591,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
}
},
- "/api/ee/transform-job/{job-id}" : {
+ "/api/transform-job/{job-id}" : {
"put" : {
- "summary" : "PUT /api/ee/transform-job/{job-id}",
+ "summary" : "PUT /api/transform-job/{job-id}",
"description" : "Update a transform job.",
"parameters" : [ {
"in" : "path",
@@ -29658,10 +29658,10 @@
}
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
},
"delete" : {
- "summary" : "DELETE /api/ee/transform-job/{job-id}",
+ "summary" : "DELETE /api/transform-job/{job-id}",
"description" : "Delete a transform job.",
"parameters" : [ {
"in" : "path",
@@ -29684,10 +29684,10 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
},
"get" : {
- "summary" : "GET /api/ee/transform-job/{job-id}",
+ "summary" : "GET /api/transform-job/{job-id}",
"description" : "Get a transform job by ID.",
"parameters" : [ {
"in" : "path",
@@ -29710,12 +29710,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
}
},
- "/api/ee/transform-job/{job-id}/run" : {
+ "/api/transform-job/{job-id}/run" : {
"post" : {
- "summary" : "POST /api/ee/transform-job/{job-id}/run",
+ "summary" : "POST /api/transform-job/{job-id}/run",
"description" : "Run a transform job manually.",
"parameters" : [ {
"in" : "path",
@@ -29738,12 +29738,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
}
},
- "/api/ee/transform-job/{job-id}/transforms" : {
+ "/api/transform-job/{job-id}/transforms" : {
"get" : {
- "summary" : "GET /api/ee/transform-job/{job-id}/transforms",
+ "summary" : "GET /api/transform-job/{job-id}/transforms",
"description" : "Get the transforms of job specified by the job's ID.",
"parameters" : [ {
"in" : "path",
@@ -29766,12 +29766,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-job" ]
+ "tags" : [ "/api/transform-job" ]
}
},
- "/api/ee/transform-tag/" : {
+ "/api/transform-tag/" : {
"post" : {
- "summary" : "POST /api/ee/transform-tag/",
+ "summary" : "POST /api/transform-tag/",
"description" : "Create a new transform tag.",
"parameters" : [ ],
"responses" : {
@@ -29801,10 +29801,10 @@
}
}
},
- "tags" : [ "/api/ee/transform-tag" ]
+ "tags" : [ "/api/transform-tag" ]
},
"get" : {
- "summary" : "GET /api/ee/transform-tag/",
+ "summary" : "GET /api/transform-tag/",
"description" : "Get a list of all transform tags.",
"parameters" : [ ],
"responses" : {
@@ -29818,12 +29818,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-tag" ]
+ "tags" : [ "/api/transform-tag" ]
}
},
- "/api/ee/transform-tag/{tag-id}" : {
+ "/api/transform-tag/{tag-id}" : {
"put" : {
- "summary" : "PUT /api/ee/transform-tag/{tag-id}",
+ "summary" : "PUT /api/transform-tag/{tag-id}",
"description" : "Update a transform tag.",
"parameters" : [ {
"in" : "path",
@@ -29862,10 +29862,10 @@
}
}
},
- "tags" : [ "/api/ee/transform-tag" ]
+ "tags" : [ "/api/transform-tag" ]
},
"delete" : {
- "summary" : "DELETE /api/ee/transform-tag/{tag-id}",
+ "summary" : "DELETE /api/transform-tag/{tag-id}",
"description" : "Delete a transform tag. Removes it from all transforms and jobs.",
"parameters" : [ {
"in" : "path",
@@ -29888,12 +29888,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform-tag" ]
+ "tags" : [ "/api/transform-tag" ]
}
},
- "/api/ee/transform/" : {
+ "/api/transform/" : {
"get" : {
- "summary" : "GET /api/ee/transform/",
+ "summary" : "GET /api/transform/",
"description" : "Get a list of transforms.",
"parameters" : [ {
"in" : "query",
@@ -29963,10 +29963,10 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
},
"post" : {
- "summary" : "POST /api/ee/transform/",
+ "summary" : "POST /api/transform/",
"description" : "Create a new transform.",
"parameters" : [ ],
"responses" : {
@@ -30044,12 +30044,12 @@
}
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/extract-columns" : {
+ "/api/transform/extract-columns" : {
"post" : {
- "summary" : "POST /api/ee/transform/extract-columns",
+ "summary" : "POST /api/transform/extract-columns",
"description" : "Extract column names suitable for incremental transform checkpoint filtering.\n\n This endpoint is specifically for populating the checkpoint column dropdown in\n incremental transforms. It only returns columns with types supported for checkpoint\n filtering: temporal (timestamp/tz) and numeric (int/float) types.\n\n Text, boolean, and other unsupported column types are filtered out.\n\n The query is compiled to native SQL using [[qp.compile/compile-with-inline-parameters]],\n which handles parameterized queries with template tags. Then extracts column names\n and types using PreparedStatement metadata.\n\n Returns a map with a :columns key containing a vector of column names (strings).\n If extraction fails, returns nil for :columns.",
"parameters" : [ ],
"responses" : {
@@ -30098,12 +30098,12 @@
}
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/is-simple-query" : {
+ "/api/transform/is-simple-query" : {
"post" : {
- "summary" : "POST /api/ee/transform/is-simple-query",
+ "summary" : "POST /api/transform/is-simple-query",
"description" : "Checks if a native SQL query string is simple enough for automatic checkpoint insertion",
"parameters" : [ ],
"responses" : {
@@ -30132,12 +30132,12 @@
}
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/run" : {
+ "/api/transform/run" : {
"get" : {
- "summary" : "GET /api/ee/transform/run",
+ "summary" : "GET /api/transform/run",
"description" : "Get transform runs based on a set of filter params.",
"parameters" : [ {
"in" : "query",
@@ -30253,12 +30253,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/{id}" : {
+ "/api/transform/{id}" : {
"get" : {
- "summary" : "GET /api/ee/transform/{id}",
+ "summary" : "GET /api/transform/{id}",
"description" : "Get a specific transform.",
"parameters" : [ {
"in" : "path",
@@ -30281,10 +30281,10 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
},
"put" : {
- "summary" : "PUT /api/ee/transform/{id}",
+ "summary" : "PUT /api/transform/{id}",
"description" : "Update a transform.",
"parameters" : [ {
"in" : "path",
@@ -30370,10 +30370,10 @@
}
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
},
"delete" : {
- "summary" : "DELETE /api/ee/transform/{id}",
+ "summary" : "DELETE /api/transform/{id}",
"description" : "Delete a transform.",
"parameters" : [ {
"in" : "path",
@@ -30396,12 +30396,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/{id}/cancel" : {
+ "/api/transform/{id}/cancel" : {
"post" : {
- "summary" : "POST /api/ee/transform/{id}/cancel",
+ "summary" : "POST /api/transform/{id}/cancel",
"description" : "Cancel the current run for a given transform.",
"parameters" : [ {
"in" : "path",
@@ -30424,12 +30424,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/{id}/dependencies" : {
+ "/api/transform/{id}/dependencies" : {
"get" : {
- "summary" : "GET /api/ee/transform/{id}/dependencies",
+ "summary" : "GET /api/transform/{id}/dependencies",
"description" : "Get the dependencies of a specific transform.",
"parameters" : [ {
"in" : "path",
@@ -30452,10 +30452,10 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/{id}/merge-history" : {
+ "/api/transform/{id}/merge-history" : {
"get" : {
"summary" : "GET /api/ee/transform/{id}/merge-history",
"description" : "Get merge history for a transform. Returns all merge events that affected this transform,\n ordered by created_at descending (newest first).",
@@ -30527,9 +30527,9 @@
"tags" : [ "/api/ee/transform" ]
}
},
- "/api/ee/transform/{id}/run" : {
+ "/api/transform/{id}/run" : {
"post" : {
- "summary" : "POST /api/ee/transform/{id}/run",
+ "summary" : "POST /api/transform/{id}/run",
"description" : "Run a transform.",
"parameters" : [ {
"in" : "path",
@@ -30552,12 +30552,12 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
- "/api/ee/transform/{id}/table" : {
+ "/api/transform/{id}/table" : {
"delete" : {
- "summary" : "DELETE /api/ee/transform/{id}/table",
+ "summary" : "DELETE /api/transform/{id}/table",
"description" : "Delete a transform's output table.",
"parameters" : [ {
"in" : "path",
@@ -30580,7 +30580,7 @@
"description" : "Server error response"
}
},
- "tags" : [ "/api/ee/transform" ]
+ "tags" : [ "/api/transform" ]
}
},
"/api/ee/transforms-python/library/{path}" : {
@@ -43383,4 +43383,4 @@
"url" : "http://localhost:3000",
"description" : "Localhost"
} ]
-}
\ No newline at end of file
+}
diff --git a/e2e/support/helpers/api/createTransform.ts b/e2e/support/helpers/api/createTransform.ts
index fb5130d6e8d..c3e723a81f6 100644
--- a/e2e/support/helpers/api/createTransform.ts
+++ b/e2e/support/helpers/api/createTransform.ts
@@ -31,7 +31,7 @@ export function createTransform(
}: CreateTransformOptions = {},
): Cypress.Chainable<Cypress.Response<Transform>> {
return cy
- .request<Transform>("POST", "/api/ee/transform", {
+ .request<Transform>("POST", "/api/transform", {
name,
description,
source,
diff --git a/e2e/support/helpers/api/createTransformJob.ts b/e2e/support/helpers/api/createTransformJob.ts
index cccc978abd9..52c0d9b0d72 100644
--- a/e2e/support/helpers/api/createTransformJob.ts
+++ b/e2e/support/helpers/api/createTransformJob.ts
@@ -28,7 +28,7 @@ export function createTransformJob(
}: CreateTransformJobOptions = {},
): Cypress.Chainable<Cypress.Response<TransformJob>> {
return cy
- .request<TransformJob>("POST", "/api/ee/transform-job", {
+ .request<TransformJob>("POST", "/api/transform-job", {
name,
description,
schedule,
diff --git a/e2e/support/helpers/api/createTransformTag.ts b/e2e/support/helpers/api/createTransformTag.ts
index 9db5485f0e4..1e6198d4b93 100644
--- a/e2e/support/helpers/api/createTransformTag.ts
+++ b/e2e/support/helpers/api/createTransformTag.ts
@@ -17,7 +17,7 @@ export function createTransformTag(
}: CreateTransformTagOptions = {},
): Cypress.Chainable<Cypress.Response<TransformTag>> {
return cy
- .request<TransformTag>("POST", "/api/ee/transform-tag", {
+ .request<TransformTag>("POST", "/api/transform-tag", {
name,
})
.then(({ body }) => {
diff --git a/e2e/support/helpers/e2e-transform-helpers.ts b/e2e/support/helpers/e2e-transform-helpers.ts
index 5ada007c03c..d78dc4d0230 100644
--- a/e2e/support/helpers/e2e-transform-helpers.ts
+++ b/e2e/support/helpers/e2e-transform-helpers.ts
@@ -33,7 +33,7 @@ export function visitTransform(transformId: TransformId) {
}
export function runTransform(transformId: TransformId) {
- cy.request("POST", `/api/ee/transform/${transformId}/run`);
+ cy.request("POST", `/api/transform/${transformId}/run`);
}
const WAIT_TIMEOUT = 10000;
@@ -44,7 +44,7 @@ export function waitForTransformRuns(
timeout = WAIT_TIMEOUT,
): Cypress.Chainable {
return cy
- .request<ListTransformRunsResponse>("GET", "/api/ee/transform/run")
+ .request<ListTransformRunsResponse>("GET", "/api/transform/run")
.then((response) => {
if (filter(response.body.data)) {
return cy.wrap(response);
@@ -220,7 +220,7 @@ export function createAndRunMbqlTransform({
visitTransform: false,
}).then(({ body: transform }) => {
// Run the transform
- cy.request("POST", `/api/ee/transform/${transform.id}/run`);
+ cy.request("POST", `/api/transform/${transform.id}/run`);
// Wait for it to complete successfully
waitForSucceededTransformRuns();
diff --git a/e2e/test/scenarios/data-model/data-model.shared.cy.spec.ts b/e2e/test/scenarios/data-model/data-model.shared.cy.spec.ts
index 2fbe692333a..6e4dc707227 100644
--- a/e2e/test/scenarios/data-model/data-model.shared.cy.spec.ts
+++ b/e2e/test/scenarios/data-model/data-model.shared.cy.spec.ts
@@ -2395,9 +2395,9 @@ describe.each<Area>(areas)("data model > %s", (area: Area) => {
cy.intercept("POST", "/api/table/*/rescan_values", error);
cy.intercept("POST", "/api/table/*/discard_values", error);
} else {
- cy.intercept("POST", "/api/ee/data-studio/table/sync-schema", error);
- cy.intercept("POST", "/api/ee/data-studio/table/rescan-values", error);
- cy.intercept("POST", "/api/ee/data-studio/table/discard-values", error);
+ cy.intercept("POST", "/api/data-studio/table/sync-schema", error);
+ cy.intercept("POST", "/api/data-studio/table/rescan-values", error);
+ cy.intercept("POST", "/api/data-studio/table/discard-values", error);
}
});
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
index 0218036f3c4..edd88040712 100644
--- a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
@@ -25,13 +25,11 @@ describe("bulk table operations", () => {
H.resetSnowplow();
cy.signInAsAdmin();
H.activateToken("bleeding-edge");
- cy.intercept("POST", "/api/ee/data-studio/table/sync-schema").as(
- "syncSchema",
- );
- cy.intercept("POST", "/api/ee/data-studio/table/rescan-values").as(
+ cy.intercept("POST", "/api/data-studio/table/sync-schema").as("syncSchema");
+ cy.intercept("POST", "/api/data-studio/table/rescan-values").as(
"rescanValues",
);
- cy.intercept("POST", "/api/ee/data-studio/table/discard-values").as(
+ cy.intercept("POST", "/api/data-studio/table/discard-values").as(
"discardValues",
);
cy.intercept(
diff --git a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
index 2a5f78fa9b1..55861a6d81b 100644
--- a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
@@ -1468,7 +1468,7 @@ function updateTableAttributes({
}): Cypress.Chainable<TableId> {
return getTableId({ databaseId, displayName, name }).then((tableId) => {
return cy
- .request("POST", "/api/ee/data-studio/table/edit", {
+ .request("POST", "/api/data-studio/table/edit", {
table_ids: [tableId],
...attributes,
})
diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
index fe74a0a08df..c6436a0cf8f 100644
--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
@@ -40,15 +40,13 @@ describe("scenarios > admin > transforms", () => {
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
cy.intercept("PUT", "/api/field/*").as("updateField");
- cy.intercept("POST", "/api/ee/transform").as("createTransform");
- cy.intercept("PUT", "/api/ee/transform/*").as("updateTransform");
- cy.intercept("DELETE", "/api/ee/transform/*").as("deleteTransform");
- cy.intercept("DELETE", "/api/ee/transform/*/table").as(
- "deleteTransformTable",
- );
- cy.intercept("POST", "/api/ee/transform-tag").as("createTag");
- cy.intercept("PUT", "/api/ee/transform-tag/*").as("updateTag");
- cy.intercept("DELETE", "/api/ee/transform-tag/*").as("deleteTag");
+ cy.intercept("POST", "/api/transform").as("createTransform");
+ cy.intercept("PUT", "/api/transform/*").as("updateTransform");
+ cy.intercept("DELETE", "/api/transform/*").as("deleteTransform");
+ cy.intercept("DELETE", "/api/transform/*/table").as("deleteTransformTable");
+ cy.intercept("POST", "/api/transform-tag").as("createTag");
+ cy.intercept("PUT", "/api/transform-tag/*").as("updateTag");
+ cy.intercept("DELETE", "/api/transform-tag/*").as("deleteTag");
cy.intercept("POST", "/api/ee/dependencies/check_transform").as(
"checkTransformDependencies",
);
@@ -936,7 +934,7 @@ LIMIT
// Stub the updateTransform call to track how many times it's called
let updateCallCount = 0;
- cy.intercept("PUT", "/api/ee/transform/*", (req) => {
+ cy.intercept("PUT", "/api/transform/*", (req) => {
updateCallCount++;
req.continue();
}).as("updateTransformCounted");
@@ -969,7 +967,7 @@ LIMIT
let requestCount = 0;
// Intercept and delay the first request using a Promise
- cy.intercept("PUT", "/api/ee/transform/*", (req) => {
+ cy.intercept("PUT", "/api/transform/*", (req) => {
requestCount++;
if (requestCount === 1) {
// Delay the first request by 1 second
@@ -1054,7 +1052,7 @@ LIMIT
isIncrementalSwitchDisabled();
cy.log("Intercept and force the update to fail");
- cy.intercept("PUT", "/api/ee/transform/*", {
+ cy.intercept("PUT", "/api/transform/*", {
statusCode: 500,
body: { message: "Internal server error" },
}).as("updateTransformError");
@@ -1083,7 +1081,7 @@ LIMIT
isIncrementalSwitchDisabled();
cy.log("Intercept and simulate network failure");
- cy.intercept("PUT", "/api/ee/transform/*", {
+ cy.intercept("PUT", "/api/transform/*", {
forceNetworkError: true,
}).as("updateTransformNetworkError");
@@ -1112,7 +1110,7 @@ LIMIT
let requestCount = 0;
cy.log("Intercept and fail the first request after a delay");
- cy.intercept("PUT", "/api/ee/transform/*", (req) => {
+ cy.intercept("PUT", "/api/transform/*", (req) => {
requestCount++;
if (requestCount === 1) {
// First request fails after a delay to ensure second change happens while it's in progress
@@ -1589,7 +1587,7 @@ LIMIT
cy.get<TransformId>("@transformId").then((transformId) => {
cy.log("run the transform to create the output table");
- cy.request("POST", `/api/ee/transform/${transformId}/run`);
+ cy.request("POST", `/api/transform/${transformId}/run`);
H.waitForSucceededTransformRuns();
H.resyncDatabase({
dbId: WRITABLE_DB_ID,
@@ -2796,7 +2794,7 @@ LIMIT
.should("be.visible");
cy.log("Revert to an earlier revision");
- cy.intercept("GET", "/api/ee/transform/*").as("transformReload");
+ cy.intercept("GET", "/api/transform/*").as("transformReload");
cy.findByTestId("transform-history-list")
.findByText(/created this/)
.parent()
@@ -2906,15 +2904,13 @@ describe("scenarios > admin > transforms > databases without :schemas", () => {
H.activateToken("bleeding-edge");
cy.intercept("PUT", "/api/field/*").as("updateField");
- cy.intercept("POST", "/api/ee/transform").as("createTransform");
- cy.intercept("PUT", "/api/ee/transform/*").as("updateTransform");
- cy.intercept("DELETE", "/api/ee/transform/*").as("deleteTransform");
- cy.intercept("DELETE", "/api/ee/transform/*/table").as(
- "deleteTransformTable",
- );
- cy.intercept("POST", "/api/ee/transform-tag").as("createTag");
- cy.intercept("PUT", "/api/ee/transform-tag/*").as("updateTag");
- cy.intercept("DELETE", "/api/ee/transform-tag/*").as("deleteTag");
+ cy.intercept("POST", "/api/transform").as("createTransform");
+ cy.intercept("PUT", "/api/transform/*").as("updateTransform");
+ cy.intercept("DELETE", "/api/transform/*").as("deleteTransform");
+ cy.intercept("DELETE", "/api/transform/*/table").as("deleteTransformTable");
+ cy.intercept("POST", "/api/transform-tag").as("createTag");
+ cy.intercept("PUT", "/api/transform-tag/*").as("updateTag");
+ cy.intercept("DELETE", "/api/transform-tag/*").as("deleteTag");
});
it("should be not be possible to create a new schema when updating a transform target", () => {
@@ -2954,9 +2950,9 @@ describe("scenarios > admin > transforms > jobs", () => {
H.activateToken("bleeding-edge");
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
- cy.intercept("POST", "/api/ee/transform-job").as("createJob");
- cy.intercept("PUT", "/api/ee/transform-job/*").as("updateJob");
- cy.intercept("DELETE", "/api/ee/transform-job/*").as("deleteJob");
+ cy.intercept("POST", "/api/transform-job").as("createJob");
+ cy.intercept("PUT", "/api/transform-job/*").as("updateJob");
+ cy.intercept("DELETE", "/api/transform-job/*").as("deleteJob");
});
describe("creation", () => {
@@ -4094,7 +4090,7 @@ describe("scenarios > data studio > transforms > permissions", () => {
H.activateToken("bleeding-edge");
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
- cy.intercept("POST", "/api/ee/transform").as("createTransform");
+ cy.intercept("POST", "/api/transform").as("createTransform");
});
it("should allow non-admin users with data-studio permission to create transforms", () => {
@@ -4147,3 +4143,112 @@ function checkSortingOrder(transformNames: string[]) {
});
});
}
+
+describe("scenarios > data studio > transforms > permissions > oss", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ });
+
+ it(
+ "should have transforms available by default in OSS without upsell gem icon",
+ { tags: "@OSS" },
+ () => {
+ cy.log("Visit data studio page");
+ cy.visit("/data-studio");
+ H.DataStudio.nav().should("be.visible");
+
+ cy.log("Verify Transforms menu item is visible");
+ H.DataStudio.nav().findByText("Transforms").should("be.visible");
+
+ cy.log("Verify no upsell gem icon is displayed in Transforms menu item");
+ H.DataStudio.nav()
+ .findByText("Transforms")
+ .closest("a")
+ .within(() => {
+ cy.findByTestId("upsell-gem").should("not.exist");
+ });
+
+ cy.log("Verify transforms page is accessible");
+ H.DataStudio.nav().findByText("Transforms").click();
+ H.DataStudio.Transforms.list().should("be.visible");
+
+ cy.log("Verify can create transforms in OSS");
+ cy.button("Create a transform").should("be.visible").click();
+
+ cy.log("Verify Python transforms are not available in OSS");
+ H.popover()
+ .findByText(/Python/i)
+ .should("not.exist");
+ },
+ );
+});
+
+describe("scenarios > data studio > transforms > permissions > pro-self-hosted", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ });
+
+ // TODO [OSS]: fix this test. It works in isolation and local setup, but fails consistently on CI
+ it.skip("should have transforms available in self-hosted pro without upsell gem icon", () => {
+ H.activateToken("pro-self-hosted").then(() => {
+ cy.log("Visit data studio page");
+ cy.visit("/data-studio");
+ H.DataStudio.nav().should("be.visible");
+
+ cy.log("Verify Transforms menu item is visible");
+ H.DataStudio.nav().findByText("Transforms").should("be.visible");
+
+ cy.log("Verify no upsell gem icon is displayed in Transforms menu item");
+ H.DataStudio.nav()
+ .findByText("Transforms")
+ .closest("a")
+ .within(() => {
+ cy.findByTestId("upsell-gem").should("not.exist");
+ });
+
+ cy.log("Verify transforms page is accessible");
+ H.DataStudio.nav().findByText("Transforms").click();
+ H.DataStudio.Transforms.list().should("be.visible");
+
+ cy.log("Verify can create transforms in pro-self-hosted");
+ cy.button("Create a transform").should("be.visible");
+ });
+ });
+});
+
+describe("scenarios > data studio > transforms > permissions > starter", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ });
+
+ it("should have transforms upsell", () => {
+ H.activateToken("starter").then(() => {
+ cy.log("Visit data studio page");
+ cy.visit("/data-studio");
+ H.DataStudio.nav().should("be.visible");
+
+ cy.log("Verify Transforms menu item is visible");
+ H.DataStudio.nav().findByText("Transforms").should("be.visible");
+
+ cy.log(
+ "Verify there is an upsell gem icon is displayed in Transforms menu item",
+ );
+ H.DataStudio.nav()
+ .findByText("Transforms")
+ .closest("a")
+ .within(() => {
+ cy.findByTestId("upsell-gem").should("be.visible");
+ });
+
+ cy.log("Verify transforms page is accessible");
+ H.DataStudio.nav().findByText("Transforms").click();
+
+ cy.findByText("Tidy up your data right from Metabase").should(
+ "be.visible",
+ );
+ });
+ });
+});
diff --git a/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts
index 11a29243eb7..a6596a1495e 100644
--- a/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-broken-list.cy.spec.ts
@@ -294,7 +294,7 @@ function createContent() {
function dropTransformTable() {
cy.get<TransformId>("@transformId").then((transformId) => {
- cy.request("DELETE", `/api/ee/transform/${transformId}/table`);
+ cy.request("DELETE", `/api/transform/${transformId}/table`);
});
}
@@ -333,7 +333,7 @@ function createTransform() {
function breakTransform() {
cy.get<TransformId>("@transformId").then((transformId) => {
- cy.request("PUT", `/api/ee/transform/${transformId}`, {
+ cy.request("PUT", `/api/transform/${transformId}`, {
source: {
type: "query",
query: {
diff --git a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
index 2f195578032..3c27e1dc894 100644
--- a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
@@ -17,7 +17,7 @@ describe("scenarios > dependencies > dependency checks", () => {
cy.intercept("PUT", "/api/card/*").as("updateCard");
cy.intercept("PUT", "/api/native-query-snippet/*").as("updateSnippet");
- cy.intercept("PUT", "/api/ee/transform/*").as("updateTransform");
+ cy.intercept("PUT", "/api/transform/*").as("updateTransform");
});
afterEach(() => {
@@ -361,7 +361,7 @@ function createSqlTransformWithDependentMbqlQuestions() {
},
}).then(({ body: transform }) => {
cy.wrap(transform.id).as("transformId");
- cy.request("POST", `/api/ee/transform/${transform.id}/run`);
+ cy.request("POST", `/api/transform/${transform.id}/run`);
H.waitForSucceededTransformRuns();
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: transformTableName });
diff --git a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts
index 1f0d5197217..9c134fad2d8 100644
--- a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts
@@ -1066,7 +1066,7 @@ function createSnippetBasedTransform({
}
function runTransformAndWaitForSuccess(transformId: TransformId) {
- cy.request("POST", `/api/ee/transform/${transformId}/run`);
+ cy.request("POST", `/api/transform/${transformId}/run`);
H.waitForSucceededTransformRuns();
}
diff --git a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
index 6bbfd49ddd3..716c0366746 100644
--- a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
+++ b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
@@ -86,8 +86,8 @@ describe(
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");
- cy.intercept("POST", "/api/ee/transform").as("createTransform");
- cy.intercept("PUT", "/api/ee/transform/*").as("updateTransform");
+ cy.intercept("POST", "/api/transform").as("createTransform");
+ cy.intercept("PUT", "/api/transform/*").as("updateTransform");
});
describe("Native SQL transform tests", () => {
diff --git a/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts b/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts
index a9d3f11c16e..4e4fbe039a6 100644
--- a/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts
+++ b/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts
@@ -27,8 +27,8 @@ describe(
H.activateToken("bleeding-edge");
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
- cy.intercept("POST", "/api/ee/transform").as("createTransform");
- cy.intercept("POST", "/api/ee/transform/*/run").as("runTransform");
+ cy.intercept("POST", "/api/transform").as("createTransform");
+ cy.intercept("POST", "/api/transform/*/run").as("runTransform");
});
describe("permission editor UI", () => {
@@ -283,7 +283,7 @@ describe(
(tableId) => {
cy.request({
method: "POST",
- url: "/api/ee/transform",
+ url: "/api/transform",
failOnStatusCode: false,
body: {
name: "Unauthorized Transform",
@@ -321,7 +321,7 @@ describe(
cy.request({
method: "POST",
- url: `/api/ee/transform/${transform.id}/run`,
+ url: `/api/transform/${transform.id}/run`,
failOnStatusCode: false,
}).then((response) => {
expect(response.status).to.eq(403);
diff --git a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
index 08fe29fc651..772bbcb463e 100644
--- a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
+++ b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
@@ -40,7 +40,6 @@
[metabase-enterprise.support-access-grants.api]
[metabase-enterprise.tenants.api]
[metabase-enterprise.transforms-python.api]
- [metabase-enterprise.transforms.api]
[metabase-enterprise.upload-management.api]
[metabase-enterprise.workspaces.api]
[metabase.api.macros :as api.macros]
@@ -73,7 +72,6 @@
:semantic-search (deferred-tru "Semantic Search")
:serialization (deferred-tru "Serialization")
:table-data-editing (deferred-tru "Table Data Editing")
- :transforms (deferred-tru "Transforms")
:tenants (deferred-tru "Tenants")
:upload-management (deferred-tru "Upload Management")
:database-routing (deferred-tru "Database Routing")
@@ -138,9 +136,6 @@
"/serialization" (premium-handler metabase-enterprise.serialization.api/routes :serialization)
"/stale" (premium-handler metabase-enterprise.stale.api/routes :collection-cleanup)
"/support-access-grant" (premium-handler metabase-enterprise.support-access-grants.api/routes :support-users)
- "/transform" (premium-handler metabase-enterprise.transforms.api/routes :transforms)
- "/transform-job" (premium-handler metabase-enterprise.transforms.api/transform-job-routes :transforms)
- "/transform-tag" (premium-handler metabase-enterprise.transforms.api/transform-tag-routes :transforms)
"/tenant" (premium-handler metabase-enterprise.tenants.api/routes :tenants)
"/upload-management" (premium-handler metabase-enterprise.upload-management.api/routes :upload-management)
"/workspace" (premium-handler metabase-enterprise.workspaces.api/routes :workspaces)})
diff --git a/enterprise/backend/src/metabase_enterprise/core/init.clj b/enterprise/backend/src/metabase_enterprise/core/init.clj
index 41b616c3439..b1c6cae391b 100644
--- a/enterprise/backend/src/metabase_enterprise/core/init.clj
+++ b/enterprise/backend/src/metabase_enterprise/core/init.clj
@@ -22,5 +22,4 @@
[metabase-enterprise.stale.init]
[metabase-enterprise.support-access-grants.init]
[metabase-enterprise.transforms-python.init]
- [metabase-enterprise.transforms.init]
[metabase-enterprise.workspaces.init]))
diff --git a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
index 46ec1f61285..ce1b645e336 100644
--- a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
@@ -1,5 +1,5 @@
(ns metabase-enterprise.data-studio.api.table
- "/api/ee/data-studio/table endpoints for bulk table operations."
+ "/api/ee/data-studio/table endpoints for bulk table operations (enterprise-only endpoints)."
(:require
[clojure.set :as set]
[clojure.string :as str]
@@ -7,21 +7,11 @@
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
[metabase.collections.core :as collection]
- [metabase.database-routing.core :as database-routing]
- [metabase.driver.settings :as driver.settings]
- [metabase.driver.util :as driver.u]
[metabase.events.core :as events]
- [metabase.request.core :as request]
- [metabase.sync.core :as sync]
- [metabase.util :as u]
[metabase.util.i18n :refer [tru]]
- [metabase.util.jvm :as u.jvm]
- [metabase.util.log :as log]
[metabase.util.malli :as mu]
[metabase.util.malli.registry :as mr]
[metabase.util.malli.schema :as ms]
- [metabase.util.quick-task :as quick-task]
- [metabase.warehouse-schema.models.table :as table]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -43,9 +33,6 @@
(seq table_ids) (conj [:in :id (sort table_ids)])
(seq schema_ids) (conj (into [:or] (map schema-expr) (sort schema_ids))))))
-(mr/def ::data-layers
- (into [:enum {:decode/string keyword}] table/data-layers))
-
;;; ------------------------------------------------ Remapping Graph Traversal ------------------------------------------------
(defn- remapped-table-ids
@@ -119,117 +106,13 @@
#{}
(traverse-graph downstream-table-ids initial-ids))))
-(mr/def ::data-sources
- (into [:enum {:decode/string keyword}] table/data-sources))
-
-(mr/def ::data-authorities
- (into [:enum {:decode/string keyword}] table/writable-data-authority-types))
-
;;; ------------------------------------------------ Response Schemas ------------------------------------------------
-(mr/def ::bulk-table-info
- "Schema for table info in bulk operations. Matches frontend BulkTableInfo type."
- [:map
- [:id ms/PositiveInt]
- [:db_id ms/PositiveInt]
- [:name :string]
- [:display_name :string]
- [:schema [:maybe :string]]
- [:is_published :boolean]])
-
-(mr/def ::bulk-table-selection-info
- "Schema for /selection endpoint response. Matches frontend BulkTableSelectionInfo type."
- [:map
- [:selected_table [:maybe ::bulk-table-info]]
- [:published_downstream_tables [:sequential ::bulk-table-info]]
- [:unpublished_upstream_tables [:sequential ::bulk-table-info]]])
-
(mr/def ::publish-tables-response
"Schema for /publish-tables endpoint response. Matches frontend PublishTablesResponse type."
[:map
[:target_collection [:maybe (ms/InstanceOf :model/Collection)]]])
-(defn- sync-unhidden-tables
- "Function to call on newly unhidden tables. Starts a thread to sync all tables. Groups tables by database to
- efficiently sync tables from different databases."
- [newly-unhidden]
- (when (seq newly-unhidden)
- (u.jvm/in-virtual-thread*
- (fn []
- (doseq [[db-id tables] (group-by :db_id newly-unhidden)]
- (let [database (t2/select-one :model/Database db-id)]
- ;; it's okay to allow testing H2 connections during sync. We only want to disallow you from testing them for the
- ;; purposes of creating a new H2 database.
- (if (binding [driver.settings/*allow-testing-h2-connections* true]
- (driver.u/can-connect-with-details? (:engine database) (:details database)))
- (doseq [table tables]
- (log/info (u/format-color :green "Table '%s' is now visible. Resyncing." (:name table)))
- (sync/sync-table! table))
- (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync unhidden tables"
- (:name database))))))))))
-
-(defn- maybe-sync-unhidden-tables!
- [existing-tables {:keys [data_layer] :as body}]
- ;; sync any tables that are changed from hidden to something else
- (sync-unhidden-tables (when (and (contains? body :data_layer) (not= :hidden data_layer))
- (filter #(= :hidden (:data_layer %)) existing-tables))))
-
-(api.macros/defendpoint :post "/edit" :- [:map {:closed true}]
- "Bulk updating tables."
- [_route-params
- _query-params
- body
- :- [:merge
- ::table-selectors
- [:map {:closed true}
- [:data_authority {:optional true} [:maybe ::data-authorities]]
- [:data_source {:optional true} [:maybe ::data-sources]]
- [:data_layer {:optional true} [:maybe ::data-layers]]
- [:entity_type {:optional true} [:maybe :string]]
- [:owner_email {:optional true} [:maybe :string]]
- [:owner_user_id {:optional true} [:maybe :int]]]]]
- (api/check-data-analyst)
- (let [where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
- set-ks [:data_authority
- :data_source
- :data_layer
- :owner_email
- :owner_user_id
- :entity_type]
- existing-tables (t2/select :model/Table {:where where})
- table-ids (set (map :id existing-tables))
- set-map (select-keys body set-ks)]
- (when (seq set-map)
- (t2/update! :model/Table [:in table-ids] set-map)
- (maybe-sync-unhidden-tables! existing-tables set-map)
- ;; Publish update events for remote sync tracking
- (let [updated-tables (t2/select :model/Table :id [:in table-ids])]
- (doseq [table updated-tables]
- (events/publish-event! :event/table-update {:object table
- :user-id api/*current-user-id*}))))
- {}))
-
-(api.macros/defendpoint :post "/selection" :- ::bulk-table-selection-info
- "Gets information about selected tables"
- [_route-params
- _query-params
- body :- ::table-selectors]
- (api/check-data-analyst)
- (let [fields [:model/Table :id :db_id :name :display_name :schema :is_published]
- where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
- selected-tables (t2/select fields {:where where :limit 2})
- selected-table (when-not (next selected-tables)
- (first selected-tables))
- upstream-ids (all-upstream-table-ids where)
- downstream-ids (all-downstream-table-ids where)
- upstream-tables (when (seq upstream-ids)
- (t2/select fields :id [:in upstream-ids]))
- downstream-tables (when (seq downstream-ids)
- (t2/select fields :id [:in downstream-ids]))]
- {:selected_table selected-table
- :published_downstream_tables (filterv :is_published downstream-tables)
- :unpublished_upstream_tables (filterv (complement :is_published) upstream-tables)}))
-
(api.macros/defendpoint :post "/publish-tables" :- ::publish-tables-response
"Set collection for each of selected tables and all upstream dependencies recursively."
[_route-params
@@ -287,58 +170,6 @@
:user-id api/*current-user-id*}))))
nil))
-(defn- sync-schema-async!
- [table user-id]
- (events/publish-event! :event/table-manual-sync {:object table :user-id user-id})
- (quick-task/submit-task! #(database-routing/with-database-routing-off (sync/sync-table! table))))
-
-(api.macros/defendpoint :post "/sync-schema" :- :nil
- "Batch version of /table/:id/sync_schema. Takes an abstract table selection as /table/edit does.
- - Currently checks policy before returning (so you might receive a 4xx on e.g. AuthZ policy failure)
- - The sync itself is however, asynchronous. This call may return before all tables synced."
- [_
- _
- body :- ::table-selectors]
- (api/check-data-analyst)
- (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})
- db-ids (sort (set (map :db_id tables)))]
- (doseq [database (t2/select :model/Database :id [:in db-ids])]
- (try
- (binding [driver.settings/*allow-testing-h2-connections* true]
- (driver.u/can-connect-with-details? (:engine database) (:details database) :throw-exceptions))
- nil
- (catch Throwable e
- (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync tables" (:name database)))
- (throw (ex-info (ex-message e) {:status-code 422})))))
- (doseq [table tables]
- (sync-schema-async! table api/*current-user-id*))))
-
-(api.macros/defendpoint :post "/rescan-values" :- :nil
- "Batch version of /table/:id/rescan_values. Takes an abstract table selection as /table/edit does."
- [_
- _
- body :- ::table-selectors]
- (api/check-data-analyst)
- (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})]
- ;; same permission skip as the single-table api, see comment in /:id/rescan_values
- (doseq [table tables]
- (events/publish-event! :event/table-manual-scan {:object table :user-id api/*current-user-id*})
- (request/as-admin
- (quick-task/submit-task! #(sync/update-field-values-for-table! table))))))
-
-(api.macros/defendpoint :post "/discard-values" :- :nil
- "Batch version of /table/:id/discard_values. Takes an abstract table selection as /table/edit does."
- [_
- _
- body :- ::table-selectors]
- (api/check-data-analyst)
- (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})]
- (let [field-ids-to-delete-q {:select [:id]
- :from [(t2/table-name :model/Field)]
- :where [:in :table_id (map :id tables)]}]
- (t2/delete! (t2/table-name :model/FieldValues) :field_id [:in field-ids-to-delete-q]))
- nil))
-
(def ^{:arglists '([request respond raise])} routes
"`/api/ee/data-studio/table` routes."
(api.macros/ns-handler *ns* +auth))
diff --git a/enterprise/backend/src/metabase_enterprise/database_routing/model.clj b/enterprise/backend/src/metabase_enterprise/database_routing/model.clj
index fe33f161cdc..6eea6771c9e 100644
--- a/enterprise/backend/src/metabase_enterprise/database_routing/model.clj
+++ b/enterprise/backend/src/metabase_enterprise/database_routing/model.clj
@@ -36,3 +36,12 @@
:feature :database-routing
[db-id]
(t2/delete! :model/DatabaseRouter :database_id db-id))
+
+(defenterprise db-routing-enabled?
+ "Returns whether or not the given database is either a router or destination database."
+ :feature :database-routing
+ :fallback :oss
+ [db-or-id]
+ (or (t2/exists? :model/DatabaseRouter :database_id (u/the-id db-or-id))
+ (some->> (:router-database-id db-or-id)
+ (t2/exists? :model/DatabaseRouter :database_id))))
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj
index 42ed83281c5..f5a25c2309d 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj
@@ -6,7 +6,6 @@
[metabase-enterprise.dependencies.dependency-types :as deps.dependency-types]
[metabase-enterprise.dependencies.models.analysis-finding-error :as analysis-finding-error]
[metabase-enterprise.dependencies.models.dependency :as dependency]
- [metabase-enterprise.transforms.schema :as transforms.schema]
[metabase.analyze.core :as analyze]
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
@@ -27,6 +26,7 @@
[metabase.queries.schema :as queries.schema]
[metabase.request.core :as request]
[metabase.revisions.core :as revisions]
+ [metabase.transforms.schema :as transforms.schema]
[metabase.util :as u]
[metabase.util.i18n :refer [tru]]
[metabase.util.malli :as mu]
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj b/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj
index 6b2e7473f01..e89f8e6d18e 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj
@@ -2,12 +2,12 @@
(:require
[metabase-enterprise.dependencies.native-validation :as deps.native]
[metabase-enterprise.dependencies.schema :as deps.schema]
- [metabase-enterprise.transforms.core :as transforms]
[metabase.documents.prose-mirror :as prose-mirror]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.schema :as lib.schema]
[metabase.queries.schema :as queries.schema]
+ [metabase.transforms.core :as transforms]
[metabase.util :as u]
[metabase.util.log :as log]
[metabase.util.malli :as mu]))
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj b/enterprise/backend/src/metabase_enterprise/dependencies/events.clj
index d0ed06af376..819ff9645d5 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/events.clj
@@ -4,10 +4,10 @@
[metabase-enterprise.dependencies.findings :as deps.findings]
[metabase-enterprise.dependencies.models.dependency :as models.dependency]
[metabase-enterprise.dependencies.task.entity-check :as task.entity-check]
- [metabase-enterprise.transforms.core :as transforms]
[metabase.events.core :as events]
[metabase.lib-be.core :as lib-be]
[metabase.premium-features.core :as premium-features]
+ [metabase.transforms.core :as transforms]
[metabase.util.log :as log]
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj
index de316650872..d0be3f46e2e 100644
--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj
+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj
@@ -3,12 +3,12 @@
[clojure.java.io :as io]
[medley.core :as m]
[metabase-enterprise.metabot-v3.table-utils :as table-utils]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.activity-feed.core :as activity-feed]
[metabase.api.common :as api]
[metabase.config.core :as config]
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
+ [metabase.transforms.util :as transforms.util]
[metabase.util.json :as json]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.clj
index 314430b0eb0..30432035940 100644
--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.clj
+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.clj
@@ -2,8 +2,8 @@
(:require
[metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u]
[metabase-enterprise.transforms-python.api :as transforms-python.api]
- [metabase-enterprise.transforms.api :as api.transforms]
- [metabase-enterprise.transforms.core :as transforms]
+ [metabase.transforms.api.transform :as api.transforms]
+ [metabase.transforms.core :as transforms]
[metabase.util.malli.registry :as mr]))
(mr/def ::transform-source ::api.transforms/transform-source)
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/core.clj b/enterprise/backend/src/metabase_enterprise/transforms/core.clj
index 23d86551884..4522dddfb89 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/core.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms/core.clj
@@ -1,50 +1,9 @@
(ns metabase-enterprise.transforms.core
- "API namespace for the `metabase-enterprise.transform` module."
- (:require
- [java-time.api :as t]
- [metabase-enterprise.transforms.models.transform]
- [metabase-enterprise.transforms.models.transform-run]
- [metabase-enterprise.transforms.settings]
- [metabase-enterprise.transforms.util]
- [metabase.premium-features.core :refer [defenterprise]]
- [potemkin :as p]
- [toucan2.core :as t2]))
+ "Enterprise module placeholder for transforms.
-(p/import-vars
- [metabase-enterprise.transforms.settings
- transform-timeout]
- [metabase-enterprise.transforms.util
- native-query-transform?
- python-transform?
- query-transform?
- transform-source-database
- transform-source-type
- transform-type
- has-db-transforms-permission?]
- [metabase-enterprise.transforms.models.transform-run
- timeout-run!]
- [metabase-enterprise.transforms.models.transform
- update-transform-tags!])
+ Transforms are weird: they have different behavior on OSS vs EE. We need to test this, so we need tests
+ in `enterprise/backend/test/metabase_enterprise/transforms/api_test.clj`.
-(defenterprise transform-stats
- "Calculate successful transform runs over a window of the previous UTC day 00:00-23:59.
- Rolling stats are included under :transform-rolling (up to date totals for today)"
- :feature :none
- []
- (let [today-utc (t/offset-date-time (t/zone-offset "+00"))
- yesterday-utc (t/minus today-utc (t/days 1))
- count-runs (fn [source-types date]
- (or (:cnt (t2/query-one {:select [[[:count :r.id] :cnt]]
- :from [[:transform_run :r]]
- :join [[:transform :t] [:= :t.id :r.transform_id]]
- :where [:and
- [:= :r.status "succeeded"]
- [:in :t.source_type source-types]
- [:= [:cast :r.end_time :date] [:cast date :date]]]}))
- 0))]
- {:transform-native-runs (count-runs ["native" "mbql"] yesterday-utc)
- :transform-python-runs (count-runs ["python"] yesterday-utc)
- :transform-usage-date (str (t/local-date yesterday-utc))
- :transform-rolling-native-runs (count-runs ["native" "mbql"] today-utc)
- :transform-rolling-python-runs (count-runs ["python"] today-utc)
- :transform-rolling-usage-date (str (t/local-date today-utc))}))
+ But we need a 'real' module, because all tests must belong to a module.
+
+ Hence, this placeholder.")
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/init.clj b/enterprise/backend/src/metabase_enterprise/transforms/init.clj
deleted file mode 100644
index c0ca2cd1de7..00000000000
--- a/enterprise/backend/src/metabase_enterprise/transforms/init.clj
+++ /dev/null
@@ -1,16 +0,0 @@
-(ns metabase-enterprise.transforms.init
- (:require
- [metabase-enterprise.transforms.canceling]
- [metabase-enterprise.transforms.jobs]
- [metabase-enterprise.transforms.models.job-run]
- [metabase-enterprise.transforms.models.transform]
- [metabase-enterprise.transforms.models.transform-job]
- [metabase-enterprise.transforms.models.transform-job-transform-tag]
- [metabase-enterprise.transforms.models.transform-run]
- [metabase-enterprise.transforms.models.transform-run-cancelation]
- [metabase-enterprise.transforms.models.transform-tag]
- [metabase-enterprise.transforms.models.transform-transform-tag]
- [metabase-enterprise.transforms.query-impl]
- [metabase-enterprise.transforms.schedule]
- [metabase-enterprise.transforms.settings]
- [metabase-enterprise.transforms.timeout]))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj b/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj
index d4acf0bfc59..a32696eff53 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj
@@ -6,13 +6,13 @@
[metabase-enterprise.transforms-python.python-runner :as python-runner]
[metabase-enterprise.transforms-python.s3 :as s3]
[metabase-enterprise.transforms-python.settings :as transforms-python.settings]
- [metabase-enterprise.transforms.core :as transforms]
- [metabase-enterprise.transforms.instrumentation :as transforms.instrumentation]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.app-db.core :as app-db]
[metabase.driver :as driver]
[metabase.driver.util :as driver.u]
+ [metabase.transforms.core :as transforms]
+ [metabase.transforms.instrumentation :as transforms.instrumentation]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.format :as u.format]
[metabase.util.i18n :as i18n]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_python/impl.clj b/enterprise/backend/src/metabase_enterprise/transforms_python/impl.clj
index 42ec3e6757c..64cf330c203 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_python/impl.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_python/impl.clj
@@ -1,7 +1,7 @@
(ns metabase-enterprise.transforms-python.impl
(:require
[metabase-enterprise.transforms-python.execute :as transforms-python.execute]
- [metabase-enterprise.transforms.interface :as transforms.i]))
+ [metabase.transforms.interface :as transforms.i]))
(defmethod transforms.i/target-db-id :python
[transform]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj b/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj
index 94c85f76d31..91df2a51615 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj
@@ -7,8 +7,6 @@
[medley.core :as m]
[metabase-enterprise.transforms-python.s3 :as s3]
[metabase-enterprise.transforms-python.settings :as transforms-python.settings]
- [metabase-enterprise.transforms.instrumentation :as transforms.instrumentation]
- [metabase-enterprise.transforms.util :as transforms.u]
[metabase.analytics.prometheus :as prometheus]
[metabase.config.core :as config]
[metabase.lib-be.core :as lib-be]
@@ -16,6 +14,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.query-processor :as qp]
[metabase.query-processor.pipeline :as qp.pipeline]
+ [metabase.transforms.instrumentation :as transforms.instrumentation]
+ [metabase.transforms.util :as transforms.u]
[metabase.util :as u]
[metabase.util.i18n :as i18n]
[metabase.util.json :as json]
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/api.clj b/enterprise/backend/src/metabase_enterprise/workspaces/api.clj
index be90bcb1203..42a4be44979 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/api.clj
@@ -6,8 +6,6 @@
[clojure.walk :as walk]
[honey.sql.helpers :as sql.helpers]
[medley.core :as m]
- [metabase-enterprise.transforms.core :as transforms]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase-enterprise.workspaces.common :as ws.common]
[metabase-enterprise.workspaces.impl :as ws.impl]
[metabase-enterprise.workspaces.merge :as ws.merge]
@@ -21,12 +19,16 @@
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :as routes.common :refer [+auth]]
[metabase.config.core :as config]
+ [metabase.database-routing.core :as database-routing]
^{:clj-kondo/ignore [:metabase/modules]}
[metabase.driver.sql.normalize :as sql.normalize]
[metabase.driver.util :as driver.u]
[metabase.lib.core :as lib]
[metabase.queries.schema :as queries.schema]
[metabase.request.core :as request]
+ [metabase.transforms.core :as transforms]
+ [metabase.transforms.feature-gating :as transforms.gating]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.i18n :as i18n :refer [deferred-tru tru]]
[metabase.util.malli.registry :as mr]
@@ -85,7 +87,7 @@
[db-id]
(let [database (api/check-400 (t2/select-one :model/Database db-id)
(deferred-tru "The target database cannot be found."))]
- (api/check (transforms.util/check-feature-enabled nil)
+ (api/check (transforms.gating/any-transforms-enabled?)
[402 (deferred-tru "Premium features required for transforms are not enabled.")])
(api/check-400 (not (:is_sample database))
(deferred-tru "Cannot run transforms on the sample database."))
@@ -93,7 +95,7 @@
(deferred-tru "Cannot run transforms on audit databases."))
(api/check-400 (driver.u/supports? (:engine database) :transforms/table database)
(deferred-tru "The database does not support the requested transform target type."))
- (api/check-400 (not (transforms.util/db-routing-enabled? database))
+ (api/check-400 (not (database-routing/db-routing-enabled? database))
(deferred-tru "Transforms are not supported on databases with DB routing enabled."))))
(def ^:private ws-prefix "/api/ee/workspace/\\d+")
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/common.clj b/enterprise/backend/src/metabase_enterprise/workspaces/common.clj
index 9a9bb280922..6fc1150c240 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/common.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/common.clj
@@ -1,12 +1,12 @@
(ns metabase-enterprise.workspaces.common
(:require
[clojure.string :as str]
- [metabase-enterprise.transforms.interface :as transforms.i]
[metabase-enterprise.workspaces.isolation :as ws.isolation]
[metabase-enterprise.workspaces.models.workspace-log :as ws.log]
[metabase-enterprise.workspaces.util :as ws.u]
[metabase.api-keys.core :as api-key]
[metabase.api.common :as api]
+ [metabase.transforms.interface :as transforms.i]
[metabase.util.log :as log]
[metabase.util.quick-task :as quick-task]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/events.clj b/enterprise/backend/src/metabase_enterprise/workspaces/events.clj
index f674d60af07..679ee989e68 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/events.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/events.clj
@@ -18,7 +18,7 @@
(when (pos? (:next.jdbc/update-count result 0))
(log/debug "Incremented graph_version for all workspaces due to global transform change"))))
-;; These events are published by metabase-enterprise.transforms.api when transforms are
+;; These events are published by metabase.transforms.api when transforms are
;; created, updated, or deleted. We subscribe to increment graph versions.
(derive ::workspace-staleness :metabase/event)
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj b/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj
index 1a712cd0f14..7f68e176cfe 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj
@@ -11,11 +11,11 @@
[clojure.string :as str]
[macaw.core :as macaw]
[metabase-enterprise.transforms-python.python-runner :as python-runner]
- [metabase-enterprise.transforms.core :as transforms]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.api.common :as api]
[metabase.query-processor :as qp]
+ [metabase.transforms.core :as transforms]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.log :as log]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/merge.clj b/enterprise/backend/src/metabase_enterprise/workspaces/merge.clj
index e9dac5d23cd..288a806daa7 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/merge.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/merge.clj
@@ -2,10 +2,10 @@
"Update global entities based on the definitions within a workspace.
All functions assumes that validation of the dependencies AFTER merge is done BEFORE calling any of these methods."
(:require
- [metabase-enterprise.transforms.api :as transforms.api]
[metabase-enterprise.workspaces.models.workspace-merge]
[metabase-enterprise.workspaces.models.workspace-merge-transform]
[metabase-enterprise.workspaces.types :as ws.types]
+ [metabase.transforms.api.transform :as transforms.api]
[metabase.util.malli :as mu]
[toucan2.core :as t2])
(:import (java.sql Connection)))
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 ce7356b7c65..e9b45488657 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
@@ -1,16 +1,13 @@
(ns ^:mb/driver-tests metabase-enterprise.data-studio.api.table-test
- "Tests for /api/ee/data-studio/table endpoints."
+ "Tests for /api/ee/data-studio/table endpoints (enterprise-only: publish-tables, unpublish-tables)."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.data-studio.api.table :as api.table]
[metabase.collections.models.collection :as collection]
[metabase.collections.test-utils :refer [without-library]]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
- [toucan2.core :as t2])
- (:import (java.util.concurrent CountDownLatch TimeUnit)))
+ [toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -70,43 +67,11 @@
(mt/user-http-request :crowberto :post 409 "ee/data-studio/table/publish-tables"
{:table_ids [(mt/id :users)]}))))))))
-(deftest bulk-edit-visibility-sync-test
- (mt/with-premium-features #{:data-studio}
- (testing "POST /api/ee/data-studio/table/edit visibility field synchronization"
- (mt/with-temp [:model/Database {db-id :id} {}
- :model/Table {table-1-id :id} {:db_id db-id}
- :model/Table {table-2-id :id} {:db_id db-id}]
-
- (testing "updating data_layer syncs to visibility_type for all tables"
- ;; Update two tables to internal, which should sync to nil visibility_type
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [table-1-id table-2-id]
- :data_layer "internal"})
- (is (= :internal (t2/select-one-fn :data_layer :model/Table :id table-1-id)))
- (is (= nil (t2/select-one-fn :visibility_type :model/Table :id table-1-id)))
- (is (= :internal (t2/select-one-fn :data_layer :model/Table :id table-2-id)))
- (is (= nil (t2/select-one-fn :visibility_type :model/Table :id table-2-id))))
-
- (testing "updating data_layer to hidden syncs to hidden visibility_type"
- ;; Update one table back to hidden, which should sync to :hidden
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [table-1-id]
- :data_layer "hidden"})
- (is (= :hidden (t2/select-one-fn :data_layer :model/Table :id table-1-id)))
- (is (= :hidden (t2/select-one-fn :visibility_type :model/Table :id table-1-id))))
-
- (testing "cannot update both visibility_type and data_layer at once"
- (mt/user-http-request :crowberto :post 400 "ee/data-studio/table/edit"
- {:table_ids [table-1-id]
- :visibility_type "hidden"
- :data_layer "hidden"}))))))
-
(deftest requests-data-studio-feature-flag-test
(mt/with-premium-features #{}
(is (= "Data Studio is a paid feature not currently available to your instance. Please upgrade to use it. Learn more at metabase.com/upgrade/"
- (:message (mt/user-http-request :crowberto :post 402 "ee/data-studio/table/edit"
- {:table_ids [(mt/id :users)]
- :data_layer "final"}))))))
+ (:message (mt/user-http-request :crowberto :post 402 "ee/data-studio/table/publish-tables"
+ {:table_ids [(mt/id :users)]}))))))
(deftest data-analyst-can-access-endpoints-test
(mt/with-premium-features #{:data-studio}
@@ -120,13 +85,6 @@
:model/Database {db-id :id} {}
:model/Table {table-id :id} {:db_id db-id}
:model/Collection _ {:type collection/library-data-collection-type}]
- (testing "data analyst can edit tables"
- (is (= {} (mt/user-http-request analyst-id :post 200 "ee/data-studio/table/edit"
- {:table_ids [table-id]
- :data_layer "final"}))))
- (testing "data analyst can get selection info"
- (is (map? (mt/user-http-request analyst-id :post 200 "ee/data-studio/table/selection"
- {:table_ids [table-id]}))))
(testing "data analyst can publish tables"
(is (map? (mt/user-http-request analyst-id :post 200 "ee/data-studio/table/publish-tables"
{:table_ids [table-id]}))))
@@ -143,15 +101,6 @@
:model/Database {db-id :id} {}
:model/Table {table-id :id} {:db_id db-id}
:model/Collection _ {:type collection/library-data-collection-type}]
- (testing "regular user cannot edit tables"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request user-id :post 403 "ee/data-studio/table/edit"
- {:table_ids [table-id]
- :data_layer "final"}))))
- (testing "regular user cannot get selection info"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request user-id :post 403 "ee/data-studio/table/selection"
- {:table_ids [table-id]}))))
(testing "regular user cannot publish tables"
(is (= "You don't have permissions to do that."
(mt/user-http-request user-id :post 403 "ee/data-studio/table/publish-tables"
@@ -161,487 +110,6 @@
(mt/user-http-request user-id :post 403 "ee/data-studio/table/unpublish-tables"
{:table_ids [table-id]}))))))))
-(deftest ^:parallel non-admins-cant-trigger-bulk-sync-test
- (mt/with-premium-features #{:data-studio}
- (testing "Non-admins should not be allowed to trigger sync"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request :rasta :post 403 "ee/data-studio/table/sync-schema" {:database_ids [(mt/id)]}))))))
-
-(deftest trigger-bulk-metadata-sync-for-table-test
- (mt/with-premium-features #{:data-studio}
- ;; lot more to test here but will wait for firmer ground
- (testing "Can we trigger a metadata sync for a filtered set of tables"
- (let [tables (atom [])
- latch (CountDownLatch. 4)]
- (mt/with-temp [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
- :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
- :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
- :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
- :model/Table {_ :id} {:db_id d2, :schema "PUBLIC"}
- :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
- :model/Table {t5 :id} {:db_id d2, :schema "FOO"}]
- (with-redefs [sync/sync-table! (fn [table]
- (swap! tables conj table)
- (.countDown latch)
- nil)]
- (mt/user-http-request :crowberto :post 204 "ee/data-studio/table/sync-schema" {:database_ids [d1],
- :schema_ids [(format "%d:FOO" d2)]
- :table_ids [t4]}))
- (testing "sync called?"
- (is (true? (.await latch 4 TimeUnit/SECONDS)))
- (is (= [t1 t2 t4 t5] (map :id @tables)))))))))
-
-(deftest ^:parallel non-admins-cant-trigger-bulk-rescan-values-test
- (mt/with-premium-features #{:data-studio}
- (testing "Non-admins should not be allowed to trigger rescan values"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request :rasta :post 403 "ee/data-studio/table/rescan-values" {:database_ids [(mt/id)]}))))))
-
-(deftest trigger-rescan-values-for-tables-test
- (mt/with-premium-features #{:data-studio}
- ;; lot more to test here but will wait for firmer ground
- (testing "Can we trigger a field values sync for a filtered set of tables"
- (let [tables (atom [])
- latch (CountDownLatch. 4)]
- (mt/with-temp [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
- :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
- :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
- :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
- :model/Table {_ :id} {:db_id d2, :schema "PUBLIC"}
- :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
- :model/Table {t5 :id} {:db_id d2, :schema "FOO"}]
- (with-redefs [sync/update-field-values-for-table! (fn [table]
- (swap! tables conj table)
- (.countDown latch)
- nil)]
- (mt/user-http-request :crowberto :post 204 "ee/data-studio/table/rescan-values" {:database_ids [d1],
- :schema_ids [(format "%d:FOO" d2)]
- :table_ids [t4]}))
- (testing "rescanned?"
- (is (true? (.await latch 4 TimeUnit/SECONDS)))
- (is (= [t1 t2 t4 t5] (map :id @tables)))))))))
-
-(deftest ^:parallel non-admins-cant-trigger-bulk-discard-values-test
- (mt/with-premium-features #{:data-studio}
- (testing "Non-admins should not be allowed to trigger discard values"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request :rasta :post 403 "ee/data-studio/table/discard-values" {:database_ids [(mt/id)]}))))))
-
-(deftest ^:parallel bulk-discard-values-test
- (mt/with-premium-features #{:data-studio}
- (testing "POST /api/ee/data-studio/table/discard-values"
- (mt/with-temp
- [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
- :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
- :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
- :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
- :model/Table {t3 :id} {:db_id d2, :schema "PUBLIC"}
- :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
- :model/Table {t5 :id} {:db_id d2, :schema "FOO"}
- :model/Field {f1 :id} {:table_id t1}
- :model/FieldValues {v1 :id} {:field_id f1, :values ["T1"]}
- :model/Field {f2 :id} {:table_id t2}
- :model/FieldValues {v2 :id} {:field_id f2, :values ["T2"]}
- :model/Field {f3 :id} {:table_id t3}
- :model/FieldValues {v3 :id} {:field_id f3, :values ["T3"]}
- :model/Field {f4 :id} {:table_id t4}
- :model/FieldValues {v4 :id} {:field_id f4, :values ["T4-1"]}
- :model/Field {f5 :id} {:table_id t4}
- :model/FieldValues {v5 :id} {:field_id f5, :values ["T4-2"]}
- :model/Field {f6 :id} {:table_id t5}
- :model/FieldValues {v6 :id} {:field_id f6, :values ["T5-1"]}
- :model/Field {f7 :id} {:table_id t5}
- :model/FieldValues {v7 :id} {:field_id f7, :values ["T5-2"]}]
- (let [url "ee/data-studio/table/discard-values"
- remaining-field-values-q {:select [:fv.id]
- :from [[(t2/table-name :model/FieldValues) :fv]
- [(t2/table-name :model/Field) :f]]
- :where [:and [:= :fv.field_id :f.id]
- [:in :f.table_id [t1 t2 t3 t4 t5]]]
- :order-by [[:fv.id :asc]]}
- get-field-values #(mapv :id (t2/query remaining-field-values-q))]
- (testing "Non-admin toucans should not be allowed to discard values"
- (is (= "You don't have permissions to do that." (mt/user-http-request :rasta :post 403 url {:table_ids [t1]})))
- (testing "FieldValues should still exist"
- (is (= [v1 v2 v3 v4 v5 v6 v7] (get-field-values)))))
- (testing "Admins should be able to successfully delete them"
- (is (nil? (mt/user-http-request :crowberto :post 204 url {:database_ids [d1],
- :schema_ids [(format "%d:FOO" d2)]
- :table_ids [t4]})))
- (testing "Selected FieldValues should be gone"
- (is (= [v3] (get-field-values))))))))))
-
-(deftest ^:parallel table-selectors->filter-test
- (testing "table-selectors->filter function generates correct WHERE clauses"
- (let [selectors->table-ids (fn [selectors]
- (let [where (#'api.table/table-selectors->filter selectors)]
- (t2/select-pks-set :model/Table {:where where})))]
- (mt/with-temp [:model/Database {db-1 :id} {}
- :model/Database {db-2 :id} {}
- :model/Table {table-1 :id} {:db_id db-1}
- :model/Table {table-2 :id} {:db_id db-1, :schema "schema-a"}
- :model/Table {table-3 :id} {:db_id db-2, :schema "schema-a"}
- :model/Table {table-4 :id} {:db_id db-2, :schema "schema-b"}
- :model/Table {table-5 :id} {:db_id db-2}]
-
- (testing "filter by database_ids"
- (is (= #{table-1 table-2}
- (selectors->table-ids {:database_ids [db-1]}))))
-
- (testing "filter by table_ids"
- (is (= #{table-3 table-4}
- (selectors->table-ids {:table_ids [table-3 table-4]}))))
-
- (testing "filter by schema_ids"
- (is (= #{table-2}
- (selectors->table-ids {:schema_ids [(format "%d:schema-a" db-1)]}))))
-
- (testing "filter by multiple schema_ids"
- (is (= #{table-3 table-4}
- (selectors->table-ids {:schema_ids [(format "%d:schema-a" db-2)
- (format "%d:schema-b" db-2)]}))))
-
- (testing "combine database_ids and table_ids (OR logic)"
- (is (= #{table-1 table-2 table-3}
- (selectors->table-ids {:database_ids [db-1]
- :table_ids [table-3]}))))
-
- (testing "combine all selectors (OR logic)"
- (is (= #{table-1 table-2 table-4 table-5}
- (selectors->table-ids {:database_ids [db-1]
- :table_ids [table-5]
- :schema_ids [(format "%d:schema-b" db-2)]}))))
-
- (testing "empty selectors returns no tables"
- (is (= nil (selectors->table-ids {}))))))))
-
-(deftest trigger-sync-on-data-layer-change-from-hidden-test
- (mt/with-premium-features #{:data-studio}
- (testing "Changing data_layer from hidden to another value triggers sync"
- (mt/with-temp [:model/Database {db-id :id} {}
- :model/Table {hidden-1 :id} {:db_id db-id, :data_layer :hidden}
- :model/Table {hidden-2 :id} {:db_id db-id, :data_layer :hidden}
- :model/Table {hidden-3 :id} {:db_id db-id, :data_layer :hidden}
- :model/Table {internal-1 :id} {:db_id db-id, :data_layer :internal}
- :model/Table {final-1 :id} {:db_id db-id, :data_layer :final}]
- (let [synced-ids (atom #{})]
- (mt/with-dynamic-fn-redefs [api.table/sync-unhidden-tables (fn [tables] (reset! synced-ids (set (map :id tables))))]
- (testing "Changing from hidden to final triggers sync"
- (reset! synced-ids #{})
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [hidden-1 hidden-2]
- :data_layer "final"})
- (is (= #{hidden-1 hidden-2} @synced-ids)))
-
- (testing "Changing from hidden to internal triggers sync"
- (reset! synced-ids #{})
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [hidden-3]
- :data_layer "internal"})
- (is (= #{hidden-3} @synced-ids)))
-
- (testing "Not changing from hidden does not trigger sync"
- (reset! synced-ids #{})
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [internal-1]
- :data_layer "final"})
- (is (= #{} @synced-ids)))
-
- (testing "Changing to hidden does not trigger sync"
- (reset! synced-ids #{})
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [final-1]
- :data_layer "hidden"})
- (is (= #{} @synced-ids)))))))))
-
-(deftest bulk-edit-test
- (mt/with-premium-features #{:data-studio}
- (testing "can edit a bunch of things at once"
- (mt/with-temp [:model/Database {clojure :id} {}
- :model/Database {jvm :id} {}
- :model/Table {vars :id} {:db_id clojure}
- :model/Table {namespaces :id} {:db_id clojure}
- :model/Table {beans :id} {:db_id jvm}
- :model/Table {classes :id} {:db_id jvm}
- :model/Table {gc :id} {:db_id jvm, :schema "jre"}
- :model/Table {jit :id} {:db_id jvm, :schema "jre"}]
-
- (testing "only admin can edit"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request :rasta :post 403 "ee/data-studio/table/edit"
- {:database_ids [clojure jvm]
- :data_layer "hidden"}))))
-
- (testing "simple happy path updating with db ids"
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:database_ids [clojure jvm]
- :data_layer "hidden"
- :data_authority "authoritative"
- :data_source "ingested"})
- (is (= #{:hidden} (t2/select-fn-set :data_layer :model/Table :db_id [:in [clojure jvm]])))
- (is (= #{:authoritative} (t2/select-fn-set :data_authority :model/Table :db_id [:in [clojure jvm]])))
- (is (= #{:ingested} (t2/select-fn-set :data_source :model/Table :db_id [:in [clojure jvm]]))))
-
- (testing "updating with all selectors"
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:database_ids [clojure]
- :table_ids [classes]
- :schema_ids [(format "%d:jre" jvm)]
- :data_layer "internal"})
- (is (= {vars :internal
- namespaces :internal
- beans :hidden
- classes :internal
- gc :internal
- jit :internal}
- (t2/select-pk->fn :data_layer :model/Table :db_id [:in [clojure jvm]]))))
-
- (testing "can update owner_email"
- (is (= #{nil} (t2/select-fn-set :owner_email :model/Table :db_id [:in [clojure jvm]])))
-
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:database_ids [clojure]
- :owner_email "[email protected]"})
-
- (is (= {vars "[email protected]"
- namespaces "[email protected]"
- beans nil
- classes nil
- gc nil
- jit nil}
- (t2/select-pk->fn :owner_email :model/Table :db_id [:in [clojure jvm]]))))
-
- (testing "can update owner_user_id"
- (is (= #{nil} (t2/select-fn-set :owner_user_id :model/Table :db_id [:in [clojure jvm]])))
-
- (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
- {:table_ids [beans classes]
- :owner_user_id (mt/user->id :rasta)})
-
- (is (= {vars nil
- namespaces nil
- beans (mt/user->id :rasta)
- classes (mt/user->id :rasta)
- gc nil
- jit nil}
- (t2/select-pk->fn :owner_user_id :model/Table :db_id [:in [clojure jvm]]))))))))
-
-;;; ------------------------------------------------- Selection Tests -------------------------------------------------
-
-(deftest selection-basic-test
- (mt/with-premium-features #{:data-studio}
- (testing "POST /api/ee/data-studio/table/selection"
- (mt/with-temp [:model/Database {db-id :id} {}
- :model/Table {t1 :id} {:db_id db-id :name "orders" :schema "PUBLIC" :is_published false}
- :model/Table {t2 :id} {:db_id db-id :name "products" :schema "PUBLIC" :is_published true}
- :model/Table _ {:db_id db-id :name "people" :schema "PUBLIC" :is_published false}]
- (testing "returns a published table in selection with all required fields"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [t2]})]
- (is (=? {:selected_table {:id t2
- :db_id db-id
- :name "products"
- :display_name "Products"
- :schema "PUBLIC"
- :is_published true}}
- response))))
- (testing "returns an unpublished table in selection with all required fields"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [t1]})]
- (is (=? {:selected_table {:id t1
- :db_id db-id
- :name "orders"
- :display_name "Orders"
- :schema "PUBLIC"
- :is_published false}}
- response))))
- (testing "returns nil for :selected_table when there are multiple selected tables"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [t1 t2]})]
- (is (=? {:selected_table nil}
- response))))
- (testing "tables with no remapping should have empty upstream/downstream"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [t2]})]
- (is (=? {:published_downstream_tables []
- :unpublished_upstream_tables []}
- response))))))))
-
-(deftest selection-with-remapping-test
- (mt/with-premium-features #{:data-studio}
- (testing "POST /api/ee/data-studio/table/selection with remapping dependencies"
- (mt/with-temp [:model/Database {db-id :id} {}
- ;; Orders table with FK to Products
- :model/Table {orders-id :id} {:db_id db-id :name "orders" :schema "PUBLIC" :is_published false}
- :model/Field _ {:table_id orders-id :name "id" :semantic_type :type/PK
- :base_type :type/Integer}
- :model/Field {product-fk :id} {:table_id orders-id :name "product_id" :semantic_type :type/FK
- :base_type :type/Integer}
- ;; Products table
- :model/Table {products-id :id} {:db_id db-id :name "products" :schema "PUBLIC" :is_published false}
- :model/Field _ {:table_id products-id :name "id" :semantic_type :type/PK
- :base_type :type/Integer}
- :model/Field {prod-name-f :id} {:table_id products-id :name "name" :semantic_type :type/Name
- :base_type :type/Text}
- ;; Dimension for FK remapping: product_id -> products.name
- :model/Dimension _ {:field_id product-fk
- :human_readable_field_id prod-name-f
- :type :external}]
- (testing "selecting orders returns products as upstream dependency"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [orders-id]})]
- (is (=? {:selected_table {:id orders-id
- :db_id db-id
- :name "orders"
- :display_name "Orders"
- :schema "PUBLIC"}
- :unpublished_upstream_tables [{:id products-id
- :db_id db-id
- :name "products"
- :display_name "Products"
- :schema "PUBLIC"}]}
- response))))
-
- (testing "if products is already published, it appears in published_downstream when selecting it"
- (t2/update! :model/Table products-id {:is_published true})
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [products-id]})]
- (is (=? {:selected_table {:id products-id
- :db_id db-id
- :name "products"
- :display_name "Products"
- :schema "PUBLIC"}
- :unpublished_upstream_tables []}
- response))
- ;; orders is unpublished and depends on products
- ;; when we want to unpublish products, orders would need to be unpublished too
- ;; but orders is already unpublished, so published_downstream_tables should be empty
- (is (= [] (:published_downstream_tables response)))))
-
- (testing "when orders is published and we select products, orders appears in published_downstream"
- (t2/update! :model/Table orders-id {:is_published true})
- (t2/update! :model/Table products-id {:is_published true})
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [products-id]})]
- (is (=? {:selected_table {:id products-id
- :db_id db-id
- :name "products"
- :display_name "Products"
- :schema "PUBLIC"}
- :published_downstream_tables [{:id orders-id
- :db_id db-id
- :name "orders"
- :display_name "Orders"
- :schema "PUBLIC"}]}
- response))))))))
-
-(deftest selection-recursive-upstream-test
- (mt/with-premium-features #{:data-studio}
- (testing "POST /api/ee/data-studio/table/selection with recursive upstream dependencies"
- ;; Chain: order_items -> orders -> customers
- ;; order_items.order_id remaps to orders.name
- ;; orders.customer_id remaps to customers.name
- (mt/with-temp [:model/Database {db-id :id} {}
- ;; Customers table
- :model/Table {customers-id :id} {:db_id db-id :name "customers" :schema "PUBLIC"
- :is_published false}
- :model/Field _ {:table_id customers-id :name "id"
- :semantic_type :type/PK :base_type :type/Integer}
- :model/Field {cust-name-f :id} {:table_id customers-id :name "name"
- :semantic_type :type/Name :base_type :type/Text}
- ;; Orders table
- :model/Table {orders-id :id} {:db_id db-id :name "orders" :schema "PUBLIC"
- :is_published false}
- :model/Field _ {:table_id orders-id :name "id"
- :semantic_type :type/PK :base_type :type/Integer}
- :model/Field {order-name-f :id} {:table_id orders-id :name "name"
- :semantic_type :type/Name :base_type :type/Text}
- :model/Field {customer-fk :id} {:table_id orders-id :name "customer_id"
- :semantic_type :type/FK :base_type :type/Integer}
- ;; Order items table
- :model/Table {items-id :id} {:db_id db-id :name "order_items" :schema "PUBLIC"
- :is_published false}
- :model/Field _ {:table_id items-id :name "id"
- :semantic_type :type/PK :base_type :type/Integer}
- :model/Field {order-fk :id} {:table_id items-id :name "order_id"
- :semantic_type :type/FK :base_type :type/Integer}
- ;; Dimensions for FK remapping
- :model/Dimension _ {:field_id customer-fk
- :human_readable_field_id cust-name-f
- :type :external}
- :model/Dimension _ {:field_id order-fk
- :human_readable_field_id order-name-f
- :type :external}]
- (testing "selecting order_items returns orders and customers as upstream (recursive)"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [items-id]})]
- (is (=? {:selected_table {:id items-id
- :db_id db-id
- :name "order_items"
- :display_name "Order Items"
- :schema "PUBLIC"}
- :unpublished_upstream_tables (mt/malli=? [:sequential {:min 2 :max 2} :map])}
- response))
- (is (= #{orders-id customers-id}
- (set (map :id (:unpublished_upstream_tables response)))))
- ;; Verify upstream tables have all required fields
- (doseq [table (:unpublished_upstream_tables response)]
- (are [k] (contains? table k)
- :id :db_id :name :display_name :schema))))))))
-
-(deftest selection-recursive-downstream-test
- (mt/with-premium-features #{:data-studio}
- (testing "POST /api/ee/data-studio/table/selection with recursive downstream dependencies"
- ;; Same chain: order_items -> orders -> customers
- ;; If we unpublish customers, we need to unpublish orders and order_items too
- (mt/with-temp [:model/Database {db-id :id} {}
- ;; Customers table (published)
- :model/Table {customers-id :id} {:db_id db-id :name "customers" :schema "PUBLIC"
- :is_published true}
- :model/Field _ {:table_id customers-id :name "id"
- :semantic_type :type/PK :base_type :type/Integer}
- :model/Field {cust-name-f :id} {:table_id customers-id :name "name"
- :semantic_type :type/Name :base_type :type/Text}
- ;; Orders table (published)
- :model/Table {orders-id :id} {:db_id db-id :name "orders" :schema "PUBLIC"
- :is_published true}
- :model/Field _ {:table_id orders-id :name "id"
- :semantic_type :type/PK :base_type :type/Integer}
- :model/Field {order-name-f :id} {:table_id orders-id :name "name"
- :semantic_type :type/Name :base_type :type/Text}
- :model/Field {customer-fk :id} {:table_id orders-id :name "customer_id"
- :semantic_type :type/FK :base_type :type/Integer}
- ;; Order items table (published)
- :model/Table {items-id :id} {:db_id db-id :name "order_items" :schema "PUBLIC"
- :is_published true}
- :model/Field _ {:table_id items-id :name "id"
- :semantic_type :type/PK :base_type :type/Integer}
- :model/Field {order-fk :id} {:table_id items-id :name "order_id"
- :semantic_type :type/FK :base_type :type/Integer}
- ;; Dimensions for FK remapping
- :model/Dimension _ {:field_id customer-fk
- :human_readable_field_id cust-name-f
- :type :external}
- :model/Dimension _ {:field_id order-fk
- :human_readable_field_id order-name-f
- :type :external}]
- (testing "selecting customers returns orders and order_items as downstream (recursive)"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/selection"
- {:table_ids [customers-id]})]
- (is (=? {:selected_table {:id customers-id
- :db_id db-id
- :name "customers"
- :display_name "Customers"
- :schema "PUBLIC"}
- :published_downstream_tables (mt/malli=? [:sequential {:min 2 :max 2} :map])}
- response))
- (is (= #{orders-id items-id}
- (set (map :id (:published_downstream_tables response)))))
- ;; Verify downstream tables have all required fields
- (doseq [table (:published_downstream_tables response)]
- (are [k] (contains? table k)
- :id :db_id :name :display_name :schema))))))))
-
;;; ------------------------------------------ Publish/Unpublish with Dependencies ------------------------------------------
(deftest publish-tables-with-upstream-dependencies-test
diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.clj
index d9e5f07bb82..0d6043351f5 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.clj
@@ -1271,7 +1271,7 @@
(is (= "PRODUCT_ID" (:related_by products-table))))))))
(deftest get-transforms-test
- (mt/with-premium-features #{:metabot-v3 :transforms}
+ (mt/with-premium-features #{:metabot-v3 :transforms :transforms-python}
(let [conversation-id (str (random-uuid))
rasta-ai-token (ai-session-token)
crowberto-ai-token (ai-session-token :crowberto (str (random-uuid)))]
@@ -1314,7 +1314,7 @@
(sort-by :id))))))))))))
(deftest get-transform-test
- (mt/with-premium-features #{:metabot-v3 :transforms}
+ (mt/with-premium-features #{:metabot-v3 :transforms :transforms-python}
(let [conversation-id (str (random-uuid))
rasta-ai-token (ai-session-token)
crowberto-ai-token (ai-session-token :crowberto (str (random-uuid)))]
@@ -1471,7 +1471,7 @@
(deftest check-transform-dependencies-test
;; This is just a quick sanity check for the API endpoint. The function powering this endpoint is tested more
;; thoroughly in metabase-enterprise.metabot-v3.tools.dependencies-test.
- (mt/with-premium-features #{:metabot-v3 :transforms :dependencies}
+ (mt/with-premium-features #{:metabot-v3 :transforms :dependencies :transforms-python}
(let [conversation-id (str (random-uuid))
rasta-ai-token (ai-session-token)
crowberto-ai-token (ai-session-token :crowberto (str (random-uuid)))
diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.clj
index 96bd5ae7f58..2dd412475dc 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.clj
@@ -243,7 +243,7 @@
(is (not (contains? broken-question-ids restricted-card-id)))))))))))))
(deftest check-transform-dependencies-python-bypass-test
- (mt/with-premium-features [:transforms]
+ (mt/with-premium-features #{:transforms :transforms-python}
(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/search/scoring_test.clj b/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj
index be86283f066..5768d922e79 100644
--- a/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/scoring_test.clj
@@ -204,7 +204,7 @@
(appdb.scoring-test/with-index-contents
[{:model "card" :id c1 :name "test card recent"}
{:model "card" :id c2 :name "test card unseen"}
- {:model "transform" :id t1 :name "test transform"}]
+ {:model "transform" :id t1 :name "test transform" :source_type "mbql"}]
(testing "Transforms get a hardcoded 1-day recency (between recently viewed card and never viewed card)"
(is (= [["card" c1 "test card recent"]
["transform" t1 "test transform"]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api/search_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api/search_test.clj
deleted file mode 100644
index bfb4e450a56..00000000000
--- a/enterprise/backend/test/metabase_enterprise/transforms/api/search_test.clj
+++ /dev/null
@@ -1,45 +0,0 @@
-(ns metabase-enterprise.transforms.api.search-test
- (:require
- [clojure.test :refer :all]
- [metabase.search.ingestion :as search.ingestion]
- [metabase.search.test-util :as search.tu]
- [metabase.test :as mt]
- [metabase.test.fixtures :as fixtures]))
-
-(use-fixtures :once (fixtures/initialize :db))
-
-(use-fixtures :each (fn [thunk]
- (binding [search.ingestion/*force-sync* true]
- (search.tu/with-new-search-if-available-otherwise-legacy (thunk)))))
-
-(deftest basic-search-test
- (testing "Transform can be found with search"
- (mt/with-premium-features #{:transforms}
- (search.tu/with-temp-index-table
- (mt/with-temp [:model/Transform {transform1-id :id} {:name "transform1"}
- :model/Transform {_transform2-id :id} {:name "tr2"}]
- (testing "Admin user can see transforms"
- (let [results (mt/user-http-request :crowberto :get 200 "search" :q "trans" :models "transform")]
- (is (= #{transform1-id}
- (set (map :id (:data results)))))))
-
- (testing "Regular user can see no transforms"
- (let [results (mt/user-http-request :rasta :get 200 "search" :q "trans" :models "transform")]
- (is (empty? (:data results))))))))))
-
-(deftest available-models-visibility-test
- (testing "Transform model visibility in available_models respects superuser restriction"
- (mt/with-premium-features #{:transforms}
- (search.tu/with-temp-index-table
- (mt/with-temp [:model/Transform {_transform-id :id} {:name "test transform"}]
- (testing "Superuser sees 'transform' in available_models"
- (let [response (mt/user-http-request :crowberto :get 200 "search"
- :q "test"
- :calculate_available_models true)]
- (is (contains? (set (:available_models response)) "transform"))))
-
- (testing "Regular user does not see 'transform' in available_models"
- (let [response (mt/user-http-request :rasta :get 200 "search"
- :q "test"
- :calculate_available_models true)]
- (is (not (contains? (set (:available_models response)) "transform"))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
index ae3c447bfb9..a5a5b645f57 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
@@ -1,1014 +1,116 @@
(ns ^:mb/driver-tests metabase-enterprise.transforms.api-test
- "Tests for /api/transform endpoints."
+ "EE-only tests for /api/transform feature gating."
(:require
[clojure.test :refer :all]
[medley.core :as m]
- [metabase-enterprise.transforms.api]
- [metabase-enterprise.transforms.models.transform :as transform.model]
- [metabase-enterprise.transforms.query-test-util :as query-test-util]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :refer [get-test-schema
- parse-instant
- utc-timestamp
- with-transform-cleanup!]]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.driver :as driver]
[metabase.lib.core :as lib]
- [metabase.lib.metadata :as lib.metadata]
- [metabase.permissions.core :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
+ [metabase.search.test-util :as search.tu]
[metabase.test :as mt]
- [metabase.util :as u]
- [toucan2.core :as t2]))
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :refer [get-test-schema
+ parse-instant
+ with-transform-cleanup!]]
+ [metabase.util :as u]))
(set! *warn-on-reflection* true)
-;;; ------------------------------------------------------------
-;;; Assertion Helpers
-;;; ------------------------------------------------------------
-
-(defn assert-run-count
- "Assert that the response contains the expected number of runs."
- [response expected-count]
- (is (= expected-count (count (:data response)))
- (str "Expected " expected-count " runs, got " (count (:data response)))))
-
-(defn assert-transform-ids
- "Assert that the response contains runs for exactly the expected transform IDs."
- [response expected-ids]
- (let [actual-ids (set (map :transform_id (:data response)))]
- (is (= expected-ids actual-ids)
- (str "Expected transform IDs " expected-ids ", got " actual-ids))))
-
-(defn- make-query
- "Create a query filtering products by category, using shared utility.
- Returns a legacy MBQL query structure for API compatibility."
- [category]
- (let [table-name (t2/select-one-fn :name :model/Table (mt/id :transforms_products))]
- (query-test-util/make-query
- {:source-table table-name
- :source-column "category"
- :filter-fn lib/=
- :filter-values [category]})))
-
-(deftest create-transform-test
+(defn- query-transform-payload
+ [table-name]
+ {:name "Test Transform"
+ :source {:type "query"
+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}})
+
+(defn- python-transform-map
+ [table-name]
+ {:name "Python Transform"
+ :source {:type "python"
+ :body "print('hello world')"
+ :source-tables {}
+ :source-database (mt/id)}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name
+ :database (mt/id)}})
+
+(defn- search-transform-ids
+ [search-term]
+ (into #{}
+ (comp (filter #(= "transform" (name (:model %))))
+ (map :id))
+ (search.tu/search-results search-term)))
+
+(defn- search-api-transform-ids
+ [user search-term]
+ (let [response (mt/user-http-request user :get 200 "search" :q search-term :models "transform")]
+ (set (map :id (:data response)))))
+
+(deftest create-query-transform-requires-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:hosting}
(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 "gadget_products"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- response (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "Gadget Products"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}})
- transform-id (:id response)
- lucky-id (mt/user->id :lucky)
- creator-id (t2/select-one-fn :creator_id :model/Transform transform-id)]
- (testing "Response includes creator_id"
- (is (= lucky-id (:creator_id response))))
- (testing "Database record has creator_id set correctly"
- (is (= lucky-id creator-id)))
- (testing "Response hydrates creator"
- (is (map? (:creator response)))
- (is (= lucky-id (get-in response [:creator :id]))))
- (testing "Response includes owner_user_id defaulting to creator"
- (is (= lucky-id (:owner_user_id response))))
- (testing "Response hydrates owner"
- (is (map? (:owner response)))
- (is (= lucky-id (get-in response [:owner :id]))))))))))))
+ (let [table-name (str "test_transform_" (u/generate-nano-id))
+ response (mt/user-http-request :crowberto :post 402 "transform"
+ (query-transform-payload table-name))]
+ (is (= "Premium features required for this transform type are not enabled." response)))))))
-(deftest create-transform-with-owner-test
+(deftest update-query-transform-requires-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:hosting}
(mt/dataset transforms-dataset/transforms-test
- (testing "Creating a transform with explicit owner_user_id"
- (with-transform-cleanup! [table-name "owner_user_id_test"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- rasta-id (mt/user->id :rasta)
- response (mt/user-http-request :crowberto :post 200 "ee/transform"
- {:name "Transform with explicit owner"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}
- :owner_user_id rasta-id})]
- (is (= rasta-id (:owner_user_id response))
- "owner_user_id should match the specified user")
- (is (nil? (:owner_email response))
- "owner_email should be nil when owner_user_id is set")
- (is (= rasta-id (get-in response [:owner :id]))
- "Hydrated owner should match the specified user"))))
+ (mt/with-temp [:model/Transform {transform-id :id} {}]
+ (mt/user-http-request :crowberto :put 403
+ (format "transform/%d" transform-id)
+ {:name "Updated Transform"}))))))
- (testing "Creating a transform with external owner_email"
- (with-transform-cleanup! [table-name "owner_email_test"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- response (mt/user-http-request :crowberto :post 200 "ee/transform"
- {:name "Transform with external owner"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}
- :owner_email "[email protected]"})]
- (is (nil? (:owner_user_id response))
- "owner_user_id should be nil when owner_email is set")
- (is (= "[email protected]" (:owner_email response))
- "owner_email should match the specified email")
- (is (= {:email "[email protected]"} (:owner response))
- "Hydrated owner should be email-only map"))))))))
-
-(deftest update-transform-owner-test
+(deftest run-query-transform-requires-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:hosting}
(mt/dataset transforms-dataset/transforms-test
- (with-transform-cleanup! [table-name "update_owner_test"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- created (mt/user-http-request :crowberto :post 200 "ee/transform"
- {:name "Transform for owner update"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name table-name}})
- transform-id (:id created)
- crowberto-id (mt/user->id :crowberto)
- rasta-id (mt/user->id :rasta)]
-
- (testing "Initial owner is the creator"
- (is (= crowberto-id (:owner_user_id created))))
-
- (testing "Update owner to a different user"
- (let [updated (mt/user-http-request :crowberto :put 200
- (format "ee/transform/%s" transform-id)
- {:owner_user_id rasta-id})]
- (is (= rasta-id (:owner_user_id updated)))
- (is (nil? (:owner_email updated)))
- (is (= rasta-id (get-in updated [:owner :id])))))
-
- (testing "Update owner to external email"
- (let [updated (mt/user-http-request :crowberto :put 200
- (format "ee/transform/%s" transform-id)
- {:owner_email "[email protected]"
- :owner_user_id nil})]
- (is (nil? (:owner_user_id updated)))
- (is (= "[email protected]" (:owner_email updated)))
- (is (= {:email "[email protected]"} (:owner updated)))))
-
- (testing "Clear owner by setting both to nil"
- (let [updated (mt/user-http-request :crowberto :put 200
- (format "ee/transform/%s" transform-id)
- {:owner_user_id nil
- :owner_email nil})]
- (is (nil? (:owner_user_id updated)))
- (is (nil? (:owner_email updated)))
- (is (nil? (:owner updated)))))))))))
-
-(deftest transform-type-detection-test
- (testing "Transform type is automatically detected and set based on source"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms :transforms-python}
- (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
- (testing "MBQL query transforms are detected as :mbql"
- (with-transform-cleanup! [table-name "mbql_transform"]
- (let [mbql-query (mt/mbql-query transforms_products)
- schema (get-test-schema)
- response (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "MBQL Transform"
- :source {:type "query"
- :query mbql-query}
- :target {:type "table"
- :schema schema
- :name table-name}})]
- (is (= "mbql" (:source_type response))))))
-
- (testing "Native query transforms are detected as :native"
- (with-transform-cleanup! [table-name "native_transform"]
- (let [schema (get-test-schema)
- response (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "Native Transform"
- :source {:type "query"
- :query (lib/native-query (mt/metadata-provider) "SELECT 1")}
- :target {:type "table"
- :schema schema
- :name table-name}})]
- (is (= "native" (:source_type response))))))
-
- (testing "Python transforms are detected as :python"
- (with-transform-cleanup! [table-name "python_transform"]
- (let [schema (get-test-schema)
- response (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "My beautiful python runner"
- :source {:type "python"
- :body "print('hello world')"
- :source-tables {}
- :source-database (mt/id)}
- :target {:type "table"
- :schema schema
- :name table-name
- :database (mt/id)}})]
- (is (= "python" (:source_type response)))))))))))))
-
-(deftest transform-type-updates-test
- (testing "Transform type is automatically updated when source changes"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (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 "type_update_transform"]
- (let [native-query (lib/native-query (mt/metadata-provider) "SELECT 1")
- mbql-query (mt/mbql-query transforms_products)
- schema (get-test-schema)
- created (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "Native Transform"
- :source {:type "query"
- :query native-query}
- :target {:type "table"
- :schema schema
- :name table-name}})]
- (is (= "native" (:source_type created)))
+ (mt/with-temp [:model/Transform {transform-id :id} {}]
+ (mt/user-http-request :crowberto :post 403
+ (format "transform/%d/run" transform-id)))))))
- (testing "Type automatically changes to mbql when updating to an MBQL query"
- (let [updated (mt/user-http-request :lucky :put 200
- (format "ee/transform/%s" (:id created))
- {:source {:type "query"
- :query mbql-query}})]
- (is (= "mbql" (:source_type updated))))))))))))))
+(deftest list-transforms-404-without-feature-test
+ (mt/with-premium-features #{:hosting}
+ (mt/user-http-request :crowberto :get 403 "transform")))
-(deftest create-transform-feature-flag-test
+(deftest get-transform-404-without-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (testing "Creating a query transform without :transforms feature returns 403"
- (mt/with-premium-features #{}
- (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
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- response (mt/user-http-request :lucky :post 402 "ee/transform"
- {:name "Test Transform"
- :source {:type "query"
- :query query}
- :target {:type "table"
- :schema schema
- :name "test_transform"}})]
- (is (= "error-premium-feature-not-available" (:status response))))))))
-
- (testing "Creating a query transform with :transforms feature succeeds"
- (mt/with-premium-features #{:transforms}
- (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)
- (with-transform-cleanup! [table-name "test_query_transform"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)
- response (mt/user-http-request :lucky :post 200 "ee/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/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{: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)
- (testing "Updating a query transform requires :transforms feature"
- (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 "ee/transform" transform-payload)]
- ;; Now test update without feature flag
- (mt/with-premium-features #{}
- (let [response (mt/user-http-request :lucky :put
- (format "ee/transform/%d" (:id created))
- (assoc transform-payload :name "Updated Transform"))]
- (is (= "error-premium-feature-not-available" (:status response))))))))))))))
+ (mt/with-temp [:model/Transform {transform-id :id} {}]
+ (mt/user-http-request :crowberto :get 403 (format "transform/%d" transform-id)))))))
-(deftest run-transform-feature-flag-test
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (testing "Running a query transform requires :transforms feature"
- (mt/with-premium-features #{:transforms}
- (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 "ee/transform" transform-payload)]
- ;; Now test run without feature flag
- (mt/with-premium-features #{}
- (let [response (mt/user-http-request :lucky :post
- (format "ee/transform/%d/run" (:id created)))]
- (is (= "error-premium-feature-not-available" (:status response))))))))))))))
-
-(deftest list-transforms-test
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (testing "Can list without query parameters"
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/user-http-request :lucky :get 200 "ee/transform")))
- (testing "Can list with query parameters"
- (mt/dataset transforms-dataset/transforms-test
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (with-transform-cleanup! [table-name "gadget_products"]
- (let [body {:name "Gadget Products"
- :description "Desc"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}}
- _ (mt/user-http-request :lucky :post 200 "ee/transform" body)
- list-resp (mt/user-http-request :lucky :get 200 "ee/transform")
- lucky-id (mt/user->id :lucky)]
- (is (seq list-resp))
- (testing "List response hydrates creator"
- (is (every? #(map? (:creator %)) list-resp))
- (is (some #(= lucky-id (get-in % [:creator :id])) list-resp)))
- (testing "List response includes source_readable field"
- (is (every? #(contains? % :source_readable) list-resp))
- (is (some #(true? (:source_readable %)) list-resp)
- "At least one transform should have readable sources")))))))))))
-
-(deftest filter-transforms-test
- (testing "should be able to filter transforms"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-temp [:model/Transform {t1-id :id} {}
- :model/Transform {t2-id :id} {}
- :model/TransformTag {tag1-id :id} {:name "tag1"}
- :model/TransformTag {tag2-id :id} {:name "tag2"}
- :model/TransformTransformTag _ {:transform_id t1-id :tag_id tag1-id :position 1}
- :model/TransformTransformTag _ {:transform_id t2-id :tag_id tag2-id :position 1}
- :model/TransformRun _ {:transform_id t1-id :status "started" :run_method "manual"
- :start_time (parse-instant "2025-08-26T10:12:11")
- :end_time nil
- :is_active true}]
- (testing "no filters"
- (is (=? [{:id t1-id} {:id t2-id}]
- (mt/user-http-request :lucky :get 200 "ee/transform"))))
- (testing "last_run_start_time filter"
- (is (=? [{:id t1-id}]
- (mt/user-http-request :lucky :get 200 "ee/transform" :last_run_start_time "2025-08-26T10:12:11"))))
- (testing "last_run_statuses filter"
- (is (=? [{:id t1-id}]
- (mt/user-http-request :lucky :get 200 "ee/transform" :last_run_statuses ["started" "succeeded"]))))
- (testing "tag_ids filter"
- (is (=? [{:id t1-id}]
- (mt/user-http-request :lucky :get 200 "ee/transform" :tag_ids [tag1-id])))
- (is (=? [{:id t2-id}]
- (mt/user-http-request :lucky :get 200 "ee/transform" :tag_ids [tag2-id]))))))))))
-
-(deftest get-transforms-test
+(deftest list-transforms-excludes-python-without-python-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-premium-features #{:transforms}
(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 "gadget_products"]
- (let [body {:name "Gadget Products"
- :description "Desc"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}}
- resp (mt/user-http-request :lucky :post 200 "ee/transform" body)
- get-resp (mt/user-http-request :lucky :get 200 (format "ee/transform/%s" (:id resp)))
- lucky-id (mt/user->id :lucky)]
- (is (=? (m/dissoc-in body [:source :query :lib/metadata])
- (update-in get-resp [:source :query] lib/normalize)))
- (testing "GET response hydrates creator"
- (is (map? (:creator get-resp)))
- (is (= lucky-id (get-in get-resp [:creator :id]))))))))))))
-
-(deftest source-readable-field-test
- (testing "Transforms API includes source_readable field"
- (mt/with-premium-features #{:transforms}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/dataset transforms-dataset/transforms-test
- (with-transform-cleanup! [table-name "test_readable"]
- (let [body {:name "Test Transform"
- :description "Test"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}}]
- (testing "Users with transforms permission can see source_readable field"
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (let [created (mt/user-http-request :lucky :post 200 "ee/transform" body)]
- (testing "in POST /ee/transform response"
- (is (contains? created :source_readable))
- (is (boolean? (:source_readable created))))
-
- (testing "in GET /ee/transform response"
- (let [list-resp (mt/user-http-request :lucky :get 200 "ee/transform")]
- (is (every? #(contains? % :source_readable) list-resp))
- (is (every? #(boolean? (:source_readable %)) list-resp))))
-
- (testing "in GET /ee/transform/:id response"
- (let [get-resp (mt/user-http-request :lucky :get 200 (format "ee/transform/%s" (:id created)))]
- (is (contains? get-resp :source_readable))
- (is (boolean? (:source_readable get-resp)))))
-
- (testing "source_readable is true when user has database read permission"
- (let [get-resp (mt/user-http-request :lucky :get 200 (format "ee/transform/%s" (:id created)))]
- (is (true? (:source_readable get-resp))
- "User with transforms permission should be able to read the source database"))))))))))))))
-
-(defn- ->transform [transform-name query]
- {:source {:type "query",
- :query query}
- :name transform-name
- :target {:schema "public"
- :name "orders_2"
- :type "table"}})
-
-(deftest get-transform-dependencies-test
- (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"}
- :model/Field _ {:table_id table, :name "foo"}
- :model/Transform parent (->transform "transform1" (mt/mbql-query orders))
- :model/Transform child (-> (->transform "transform2" (mt/mbql-query nil {:source-table table}))
- (assoc-in [:target :name] "orders_3"))]
- (mt/with-premium-features #{:transforms}
- (let [deps-resp (mt/user-http-request :lucky :get 200 (format "ee/transform/%s/dependencies" (:id child)))]
- (is (=? [{:name "transform1"
- :source {:type "query"
- :query {:database (mt/id)
- :lib/type "mbql/query"
- :stages [{:source-table (mt/id :orders)}]}}
- :id (:id parent)
- :entity_id (:entity_id parent)
- :target {:schema "public", :name "orders_2", :type "table"}}]
- deps-resp))
- (testing "Dependencies response hydrates creator"
- (is (every? #(map? (:creator %)) deps-resp)))))))))
-
-(deftest put-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)))]
+ (let [response (mt/user-http-request :crowberto :get 200 "transform")
+ ids (set (map :id response))]
+ (is (contains? ids query-id))
+ (is (not (contains? ids python-id)))))))))
+
+(deftest get-python-transform-403-without-python-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-premium-features #{:transforms}
(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)
- (with-transform-cleanup! [table-name "gadget_products"]
- (let [query2 (make-query "None")
- resp (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "Gadget Products"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}})
- transform {:name "Gadget Products 2"
- :description "Desc"
- :source {:type "query"
- :query query2}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}}
- put-resp (mt/user-http-request :lucky :put 200 (format "ee/transform/%s" (:id resp))
- transform)
- lucky-id (mt/user->id :lucky)]
- (is (=? (m/dissoc-in transform [:source :query :lib/metadata])
- (update-in put-resp [:source :query] lib/normalize)))
- (testing "PUT response hydrates creator"
- (is (map? (:creator put-resp)))
- (is (= lucky-id (get-in put-resp [:creator :id]))))))))))))
+ (mt/with-temp [:model/Transform {python-id :id} (python-transform-map (str "python_transform_" (u/generate-nano-id)))]
+ (mt/user-http-request :crowberto :get 403 (format "transform/%d" python-id)))))))
-(deftest change-target-table-test
+(deftest get-python-transform-200-with-python-feature-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms :transforms-python}
(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)
- (with-transform-cleanup! [table1-name "dookey_products"
- table2-name "doohickey_products"]
- (let [query2 (make-query "Doohickey")
- original {:name "Gadget Products"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table1-name}}
- resp (mt/user-http-request :lucky :post 200 "ee/transform"
- original)
- updated {:name "Doohickey Products"
- :description "Desc"
- :source {:type "query"
- :query query2}
- :target {:type "table"
- :schema (get-test-schema)
- :name table2-name}}]
- (is (=? (-> updated
- (m/dissoc-in [:source :query :lib/metadata]))
- (-> (mt/user-http-request :lucky :put 200 (format "ee/transform/%s" (:id resp)) updated)
- (update-in [:source :query] lib/normalize))))
- (is (false? (transforms.util/target-table-exists? original)))))))))))
-
-(deftest delete-transforms-test
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (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)
- (with-transform-cleanup! [table-name "gadget_products"]
- (let [resp (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "Gadget Products"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}})]
- (mt/user-http-request :lucky :delete 204 (format "ee/transform/%s" (:id resp)))
- (mt/user-http-request :lucky :get 404 (format "ee/transform/%s" (:id resp)))))))))))
-
-(deftest delete-table-transforms-test
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (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)
- (with-transform-cleanup! [table-name "gadget_products"]
- (let [resp (mt/user-http-request :lucky :post 200 "ee/transform"
- {:name "Gadget Products"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}})]
- (mt/user-http-request :lucky :delete 204 (format "ee/transform/%s/table" (:id resp)))))))))))
-
-(defn- test-run!
- [transform-id]
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (let [resp (mt/user-http-request :lucky :post 202 (format "ee/transform/%s/run" transform-id))
- timeout-s 10 ; 10 seconds is our timeout to finish execution and sync
- limit (+ (System/currentTimeMillis) (* timeout-s 1000))]
- (is (=? {:message "Transform run started"}
- resp))
- (loop []
- (when (> (System/currentTimeMillis) limit)
- (throw (ex-info (str "Transform run timed out after " timeout-s " seconds") {})))
- (let [resp (mt/user-http-request :lucky :get 200 (format "ee/transform/%s" transform-id))
- status (some-> resp :last_run :status keyword)]
- (when-not (contains? #{:started :succeeded} status)
- (throw (ex-info (str "Transform run failed with status " status) {:resp resp})))
- (when-not (some? (:table resp))
- (Thread/sleep 100)
- (recur))))))))
-
-(defn- check-query-results
- "Verifies that a transform successfully created a table with expected data.
-
- Uses a simple count-based approach that works reliably across all drivers
- without depending on field metadata being synced.
-
- Args:
- table-name - Name of the table created by the transform
- ids - Vector of expected product IDs (for count validation)
- category - The category filter used (e.g., \"Gadget\" or \"Doohickey\")"
- [table-name ids category]
- ;; Use the metadata provider to find the table
- (let [mp (mt/metadata-provider)
- ;; Find the table by name
- table (m/find-first (comp #{table-name} :name)
- (lib.metadata/tables mp))]
- (when-not table
- (throw (ex-info (str "Table not found in metadata: " table-name)
- {:table-name table-name})))
-
- ;; Build a query for the table
- (let [base-query (lib/query mp table)
- ;; Find the category column
- category-column (m/find-first
- (comp #{"category"} u/lower-case-en :name)
- (lib/visible-columns base-query))
- ;; Filter by category and count rows
- filtered-query (if category-column
- (lib/filter base-query (lib/= category-column category))
- base-query)
- count-query (lib/aggregate filtered-query (lib/count))
- result (qp/process-query count-query)
- actual-count (-> (mt/formatted-rows [int] result) first first)]
- ;; Verify we got the expected number of rows
- (is (= (count ids) actual-count)
- (str "Expected " (count ids) " rows with category " category
- " in table " table-name ", but got " actual-count)))))
-
-(defn- wait-for-table
- "Wait for a table to appear in metadata, with timeout.
- Copied from execute_test.clj - will consolidate later."
- [table-name timeout-ms]
- (let [mp (mt/metadata-provider)
- limit (+ (System/currentTimeMillis) timeout-ms)]
- (loop []
- (Thread/sleep 200)
- (when (> (System/currentTimeMillis) limit)
- (throw (ex-info "table has not been created" {:table-name table-name, :timeout-ms timeout-ms})))
- (or (m/find-first (comp #{table-name} :name) (lib.metadata/tables mp))
- (recur)))))
-
-(deftest execute-transform-test
- (testing "transform execution with :transforms/table target"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (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)
- (let [schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))]
- (with-transform-cleanup! [{table1-name :name :as target1} {:type "table"
- :schema schema
- :name "gadget_products"}
- {table2-name :name :as target2} {:type "table"
- :schema schema
- :name "doohickey_products"}]
- (let [query2 (make-query "Doohickey")
- original {:name "Gadget Products"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target target1}
- {transform-id :id} (mt/user-http-request :lucky :post 200 "ee/transform"
- original)
- _ (do (test-run! transform-id)
- (wait-for-table table1-name 5000))
- _ (is (true? (transforms.util/target-table-exists? original)))
- _ (check-query-results table1-name [5 11 16] "Gadget")
- updated {:name "Doohickey Products"
- :description "Desc"
- :source {:type "query"
- :query query2}
- :target target2}]
- (is (=? (-> updated
- (m/dissoc-in [:source :query :lib/metadata]))
- (->
- (mt/user-http-request :lucky :put 200 (format "ee/transform/%s" transform-id) updated)
- (update-in [:source :query] lib/normalize))))
- (test-run! transform-id)
- (wait-for-table table2-name 5000)
- (is (true? (transforms.util/target-table-exists? original)))
- (is (true? (transforms.util/target-table-exists? updated)))
- (check-query-results table2-name [2 3 4 13] "Doohickey")))))))))))
-
-(deftest get-runs-filter-by-single-transform-id-test
- (testing "GET /api/ee/transform/run - filter by single transform ID"
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {}
- :model/Transform transform2 {}
- :model/TransformRun run1 {:transform_id (:id transform1)}
- :model/TransformRun run2 {:transform_id (:id transform2)}]
- (testing "Filter by transform1 ID only returns transform1 runs"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform/run"
- :transform_ids [(:id transform1)])]
- (assert-run-count response 1)
- (assert-transform-ids response #{(:id transform1)})
- (is (= (:id run1) (-> response :data first :id)))))
-
- (testing "Filter by transform2 ID only returns transform2 runs"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform/run"
- :transform_ids [(:id transform2)])]
- (assert-run-count response 1)
- (assert-transform-ids response #{(:id transform2)})
- (is (= (:id run2) (-> response :data first :id))))))))))
-
-(deftest get-runs-filter-by-multiple-transform-ids-test
- (testing "GET /api/ee/transform/run - filter by multiple transform IDs"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {}
- :model/Transform transform2 {}
- :model/Transform transform3 {}
- :model/TransformRun _run1 {:transform_id (:id transform1)}
- :model/TransformRun _run2 {:transform_id (:id transform2)}
- :model/TransformRun _run3 {:transform_id (:id transform3)}]
- (testing "Filter by transform1 and transform2 IDs returns only those runs"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_ids [(:id transform1) (:id transform2)])]
- (assert-run-count response 2)
- (assert-transform-ids response #{(:id transform1) (:id transform2)})))))))
-
-(deftest get-runs-filter-by-single-status-test
- (testing "GET /api/ee/transform/run - filter by single status"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform {}
- :model/TransformRun _run1 {:transform_id (:id transform) :status "succeeded"}
- :model/TransformRun _run2 {:transform_id (:id transform) :status "failed"}
- :model/TransformRun _run3 {:transform_id (:id transform) :status "failed"}]
- (testing "Filter by 'failed' status returns only failed runs"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :statuses ["failed"])]
- (is (>= (count (:data response)) 2))
- (is (every? #(= "failed" (:status %))
- (filter #(= (:id transform) (:transform_id %)) (:data response))))))
-
- (testing "Filter by 'succeeded' status returns only succeeded runs"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :statuses ["succeeded"])]
- (is (>= (count (:data response)) 1))
- (is (some #(and (= "succeeded" (:status %))
- (= (:id transform) (:transform_id %)))
- (:data response)))))))))
-
-(defn- transform-runs
- [our-pred & filters]
- (let [response (apply mt/user-http-request :crowberto :get 200 "ee/transform/run" filters)]
- (filter our-pred (:data response))))
-
-(deftest get-runs-filter-by-multiple-statuses-test
- (testing "GET /api/ee/transform/run - filter by multiple statuses"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform {t0-id :id} {}
- :model/Transform {t1-id :id} {}
- :model/TransformRun {r0-id :id} {:transform_id t0-id :status "timeout" :run_method "cron"
- :start_time (parse-instant "2025-08-25T10:12:11")
- :end_time (parse-instant "2025-08-26T10:52:17")}
- :model/TransformRun {r1-id :id} {:transform_id t0-id :status "succeeded" :run_method "manual"
- :start_time (parse-instant "2025-08-26T10:12:11")
- :end_time (parse-instant "2025-08-27T10:52:17")}
- :model/TransformRun {r2-id :id} {:transform_id t1-id :status "succeeded" :run_method "cron"
- :start_time (parse-instant "2025-08-22T10:12:11")
- :end_time (parse-instant "2025-08-22T10:12:17")}
- :model/TransformRun {r3-id :id} {:transform_id t1-id :status "succeeded" :run_method "manual"
- :start_time (parse-instant "2025-08-22T23:57:34")
- :end_time (parse-instant "2025-08-23T00:17:41")}
- :model/TransformRun {_r4-id :id} {:transform_id t1-id :status "failed" :run_method "cron"
- :start_time (parse-instant "2025-08-25T15:22:18")
- :end_time (parse-instant "2025-08-25T19:12:17")}
- :model/TransformRun {_r5-id :id} {:transform_id t1-id :status "timeout" :run_method "manual"
- :start_time (parse-instant "2025-08-25T20:29:58")
- :end_time (parse-instant "2025-08-25T22:12:17")}
- :model/TransformRun {_r6-id :id} {:transform_id t1-id :status "started" :run_method "cron"
- :start_time (parse-instant "2025-08-25T23:56:04")
- :end_time nil :is_active true}]
- (let [our-run-pred (comp #{t0-id t1-id} :transform_id)
- t0-runs [{:id r1-id
- :start_time (utc-timestamp "2025-08-26T10:12:11")
- :end_time (utc-timestamp "2025-08-27T10:52:17")
- :run_method "manual"
- :status "succeeded"
- :transform {:id t0-id}
- :transform_id t0-id}
- {:id r0-id
- :start_time (utc-timestamp "2025-08-25T10:12:11")
- :end_time (utc-timestamp "2025-08-26T10:52:17")
- :run_method "cron"
- :status "timeout"
- :transform {:id t0-id}
- :transform_id t0-id}]]
- (testing "Filter by 'succeeded' and 'failed' returns both types"
- (let [statuses #{"succeeded" "failed" "started"}
- our-runs (transform-runs our-run-pred :statuses (vec statuses))]
- (is (= 5 (count our-runs)))
- (is (every? #(contains? statuses (:status %)) our-runs))))
- (testing "Filter by 'start_time'"
- (is (=? [{:id r1-id
- :start_time (utc-timestamp "2025-08-26T10:12:11")
- :end_time (utc-timestamp "2025-08-27T10:52:17")
- :run_method "manual"
- :status "succeeded"
- :transform {:id t0-id}
- :transform_id t0-id}]
- (transform-runs our-run-pred :start_time "2025-08-26~")))
- (let [our-runs (transform-runs our-run-pred :start_time "~2025-08-25")]
- (is (= 6 (count our-runs))))
- (let [our-runs (transform-runs our-run-pred :start_time "2025-08-22~2025-08-23")]
- (is (=? [{:transform {:id t1-id}
- :run_method "manual"
- :is_active nil
- :start_time (utc-timestamp "2025-08-22T23:57:34")
- :end_time (utc-timestamp "2025-08-23T00:17:41")
- :transform_id t1-id
- :status "succeeded"
- :id r3-id}
- {:transform {:id t1-id}
- :run_method "cron"
- :is_active nil
- :start_time (utc-timestamp "2025-08-22T10:12:11")
- :end_time (utc-timestamp "2025-08-22T10:12:17")
- :transform_id t1-id
- :status "succeeded"
- :id r2-id}]
- our-runs))))
- (testing "Filter by 'end_time'"
- (is (=? t0-runs
- (transform-runs our-run-pred :end_time "2025-08-26~")))
- (is (empty? (transform-runs our-run-pred :end_time "~2025-08-21"))))
- (testing "Filter by 'run_methods'"
- (let [our-runs (transform-runs our-run-pred :run_methods ["manual"])]
- (is (= 3 (count our-runs)))
- (is (every? (comp #{"manual"} :run_method) our-runs)))
- (let [our-runs (transform-runs our-run-pred :run_methods ["cron"])]
- (is (= 4 (count our-runs)))
- (is (every? (comp #{"cron"} :run_method) our-runs)))
- (let [our-runs (transform-runs our-run-pred :run_methods ["cron" "manual"])]
- (is (= 7 (count our-runs)))))
- (testing "Filter by a combination"
- (is (=? [{:id r3-id
- :status "succeeded"
- :run_method "manual"
- :start_time (utc-timestamp "2025-08-22T23:57:34")
- :end_time (utc-timestamp "2025-08-23T00:17:41")
- :transform {:id t1-id}
- :transform_id t1-id}]
- (transform-runs our-run-pred :run_methods ["manual"] :start_time "~2025-08-25" :end_time "~2025-08-23")))))))))
-
-(deftest get-runs-filter-by-single-tag-test
- (testing "GET /api/ee/transform/run - filter by single tag"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {}
- :model/Transform transform2 {}
- :model/Transform transform3 {}
- :model/TransformTag tag1 {}
- :model/TransformTag _tag2 {}
- :model/TransformTag _tag3 {}
- :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
- :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag1) :position 0}
- :model/TransformRun _run1 {:transform_id (:id transform1)}
- :model/TransformRun _run2 {:transform_id (:id transform2)}
- :model/TransformRun _run3 {:transform_id (:id transform3)}]
- (testing "Filter by tag1 returns only tagged transforms' runs"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_tag_ids [(:id tag1)])]
- (assert-run-count response 2)
- (assert-transform-ids response #{(:id transform1) (:id transform2)})
- (is (not (contains? (set (map :transform_id (:data response)))
- (:id transform3))))))))))
-
-(deftest get-runs-filter-by-multiple-tags-test
- (testing "GET /api/ee/transform/run - filter by multiple tags (union)"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {:name "Transform with tag1"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"
- :template-tags {}}}}
- :target {:type "table"
- :name (str "test_table_1_" (u/generate-nano-id))}}
- :model/Transform transform2 {:name "Transform with both tags"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 2"
- :template-tags {}}}}
- :target {:type "table"
- :name (str "test_table_2_" (u/generate-nano-id))}}
- :model/Transform transform3 {:name "Transform with tag2"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 3"
- :template-tags {}}}}
- :target {:type "table"
- :name (str "test_table_3_" (u/generate-nano-id))}}
- :model/Transform transform4 {:name "Untagged Transform"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 4"
- :template-tags {}}}}
- :target {:type "table"
- :name (str "test_table_4_" (u/generate-nano-id))}}
- :model/TransformTag tag1 {}
- :model/TransformTag tag2 {}
- :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
- :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag1) :position 0}
- :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag2) :position 1}
- :model/TransformTransformTag _ {:transform_id (:id transform3) :tag_id (:id tag2) :position 0}
-
- :model/TransformRun _run1 {:transform_id (:id transform1)}
- :model/TransformRun _run2 {:transform_id (:id transform2)}
- :model/TransformRun _run3 {:transform_id (:id transform3)}
- :model/TransformRun _run4 {:transform_id (:id transform4)}]
- ;; Associate tags with transforms
- (testing "Filter by tag1 and tag2 returns union (transforms with either tag)"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_tag_ids [(:id tag1) (:id tag2)])
- returned-transform-ids (set (map :transform_id (:data response)))]
- (assert-run-count response 3)
- (assert-transform-ids response #{(:id transform1) (:id transform2) (:id transform3)})
- (is (not (contains? returned-transform-ids (:id transform4))))))))))
-
-(deftest get-runs-combine-transform-id-and-status-test
- (testing "GET /api/ee/transform/run - combine transform ID and status filters"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {:name "Transform 1"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"
- :template-tags {}}}}
- :target {:type "table"
- :name (str "test_table_1_" (u/generate-nano-id))}}
- :model/Transform transform2 {:name "Transform 2"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 2"
- :template-tags {}}}}
- :target {:type "table"
- :name (str "test_table_2_" (u/generate-nano-id))}}
- :model/TransformRun _run1 {:transform_id (:id transform1) :status "succeeded"}
- :model/TransformRun _run1 {:transform_id (:id transform1) :status "failed"}
- :model/TransformRun _run1 {:transform_id (:id transform1) :status "failed"}
- :model/TransformRun _run1 {:transform_id (:id transform2) :status "failed"}]
- ;; Create multiple runs with different statuses for transform1
- (testing "Filter by transform1 ID and failed status"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_ids [(:id transform1)]
- :statuses ["failed"])]
- (assert-run-count response 2)
- (is (every? #(and (= (:id transform1) (:transform_id %))
- (= "failed" (:status %)))
- (:data response)))))))))
-
-(deftest get-runs-combine-tag-and-status-test
- (testing "GET /api/ee/transform/run - combine tag and status filters"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {}
- :model/Transform transform2 {}
- :model/Transform transform3 {}
- :model/TransformTag tag1 {}
- :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
- :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag1) :position 0}
- :model/TransformRun _run1 {:transform_id (:id transform1) :status "succeeded"}
- :model/TransformRun _run1 {:transform_id (:id transform2) :status "failed"}
- :model/TransformRun _run1 {:transform_id (:id transform3) :status "failed"}
- :model/TransformRun _run1 {:transform_id (:id transform2) :status "succeeded"}]
- ;; Associate tag1 with transform1 and transform2
- (testing "Filter by tag1 and failed status returns only failed runs of tagged transforms"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_tag_ids [(:id tag1)]
- :statuses ["failed"])]
- (assert-run-count response 1)
- (is (= (:id transform2) (-> response :data first :transform_id)))
- (is (= "failed" (-> response :data first :status)))))))))
-
-(deftest get-runs-intersect-transform-id-and-tag-test
- (testing "GET /api/ee/transform/run - intersection of transform IDs and tags"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform1 {}
- :model/Transform transform2 {}
- :model/TransformTag tag1 {}
- :model/TransformTag tag2 {}
- :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
- :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag2) :position 0}
- :model/TransformRun _run1 {:transform_id (:id transform1)}
- :model/TransformRun _run1 {:transform_id (:id transform2)}]
- (testing "Filter by transform1 ID and tag1 returns transform1 (has both)"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_ids [(:id transform1)]
- :transform_tag_ids [(:id tag1)])]
- (assert-run-count response 1)
- (assert-transform-ids response #{(:id transform1)})))
-
- (testing "Filter by transform1 ID and tag2 returns empty (transform1 doesn't have tag2)"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_ids [(:id transform1)]
- :transform_tag_ids [(:id tag2)])]
- (assert-run-count response 0)))
-
- (testing "Filter by both transform IDs and tag1 returns only transform1"
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
- :transform_ids [(:id transform1) (:id transform2)]
- :transform_tag_ids [(:id tag1)])]
- (assert-run-count response 1)
- (assert-transform-ids response #{(:id transform1)})))))))
+ (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))]
+ (is (= "python" (:source_type response)))))))))
(deftest create-transform-with-routing-fails-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
@@ -1017,675 +119,93 @@
(mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
(mt/with-data-analyst-role! (mt/user->id :lucky)
(with-transform-cleanup! [table-name "gadget_products"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)]
- (mt/with-temp [:model/Database _destination {:engine driver/*driver*
- :router_database_id (mt/id)
- :details {:destination_database true}}
- :model/DatabaseRouter _ {:database_id (mt/id)
- :user_attribute "db_name"}]
- (is (= "Transforms are not supported on databases with DB routing enabled."
- (mt/user-http-request :crowberto :post 400 "ee/transform"
- {:name "Gadget Products"
- :source {:type "query" :query query}
- :target {:type "table" :schema schema :name table-name}}))))))))))))
+ (mt/with-temp [:model/Database _destination {:engine driver/*driver*
+ :router_database_id (mt/id)
+ :details {:destination_database true}}
+ :model/DatabaseRouter _ {:database_id (mt/id)
+ :user_attribute "db_name"}]
+ (is (= "Transforms are not supported on databases with DB routing enabled."
+ (mt/user-http-request :crowberto :post 400 "transform"
+ (query-transform-payload table-name))))))))))))
(deftest update-transform-with-routing-fails-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/with-premium-features #{:transforms :database-routing}
(mt/dataset transforms-dataset/transforms-test
(with-transform-cleanup! [table-name "gadget_products"]
- (let [query (make-query "Gadget")
- schema (get-test-schema)]
- (mt/with-temp [:model/Database _destination {:engine driver/*driver*
- :router_database_id (mt/id)
- :details {:destination_database true}}
- :model/DatabaseRouter _ {:database_id (mt/id)
- :user_attribute "db_name"}
- :model/Transform transform {:name "Gadget Products"
- :source {:type "query" :query query}
- :target {:type "table" :schema schema :name table-name}}]
- (is (= "Transforms are not supported on databases with DB routing enabled."
- (mt/user-http-request :crowberto :put 400 (format "ee/transform/%s" (:id transform))
- (assoc transform :name "Gadget Products 2")))))))))))
-
-(deftest transform-revisions-test
+ (mt/with-temp [:model/Database _destination {:engine driver/*driver*
+ :router_database_id (mt/id)
+ :details {:destination_database true}}
+ :model/DatabaseRouter _ {:database_id (mt/id)
+ :user_attribute "db_name"}
+ :model/Transform transform (query-transform-payload table-name)]
+ (is (= "Transforms are not supported on databases with DB routing enabled."
+ (mt/user-http-request :crowberto :put 400 (format "transform/%s" (:id transform))
+ (assoc transform :name "Gadget Products 2"))))))))))
+
+(deftest search-filters-transform-source-types-test
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
+ (mt/dataset transforms-dataset/transforms-test
+ (let [search-term (str "transform-search-" (u/generate-nano-id))
+ query-name (str search-term "-query")
+ python-name (str search-term "-python")]
+ (mt/with-temp [:model/Transform {query-id :id} (assoc (query-transform-payload (str "target_" (u/generate-nano-id)))
+ :name query-name)
+ :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}
+ (is (empty? (search-transform-ids search-term)))))
+ (testing "transforms only"
+ (mt/with-premium-features #{:transforms :hosting}
+ (is (= #{query-id} (search-transform-ids search-term)))))
+ (testing "transforms and transforms-python"
+ (mt/with-premium-features #{:transforms :transforms-python :hosting}
+ (is (= #{query-id python-id} (search-transform-ids search-term)))))))))))
+
+(deftest search-filtering-updates-with-feature-flips-without-reindex-test
+ (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))
+ query-name (str search-term "-query")
+ python-name (str search-term "-python")]
+ (mt/with-temp [:model/Transform {query-id :id} (assoc (query-transform-payload (str "target_" (u/generate-nano-id)))
+ :name query-name)
+ :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
+ (mt/with-premium-features #{:transforms :transforms-python :hosting}
+ (is (= #{query-id python-id} (search-transform-ids search-term))))
+ (mt/with-premium-features #{:transforms :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))))))))))
+
+(deftest search-api-transform-models-empty-without-feature-test
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/with-premium-features #{:hosting}
(mt/dataset transforms-dataset/transforms-test
- (with-transform-cleanup! [table-name "transform_revisions_test"]
- (let [test-transform-revisions (fn [action url req exp-revisions]
- (let [response (mt/user-http-request :crowberto action 200 url req)
- transform-id (:id response)
- ;; Read the updated transform from the DB for accurate comparison
- transform (-> (t2/select-one :model/Transform transform-id)
- (t2/hydrate :transform_tag_ids))]
- (is (= exp-revisions (t2/count :model/Revision :model "Transform"
- :model_id transform-id)))
- (let [revision (t2/select-one :model/Revision :model "Transform"
- :model_id transform-id :most_recent true)
- rev-transform (:object revision)
- removed #{:id :entity_id :created_at :updated_at}]
- (is (every? #(not (contains? rev-transform %)) removed))
- ;; Compare revision with DB transform (both have in-memory representation)
- (is (=? (dissoc rev-transform :source :owner) transform)))
- transform-id))
- gadget-req {:name "Gadget Products"
- :description "The gadget products"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}}
- transform-id (test-transform-revisions :post "ee/transform" gadget-req 1)
- widget-req {:name "Widget Products"
- :description "The widget products"
- :source {:type "query"
- :query (make-query "Widget")}
- :tag_ids [4]
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}}]
- (test-transform-revisions :put (str "ee/transform/" transform-id) widget-req 2)))))))
-
-(deftest permissions-test
- (testing "Transform endpoints require transforms permission"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform {}]
- (testing "Regular users without transform permission get 403"
- (mt/user-http-request :rasta :get 403 "ee/transform")
- (mt/user-http-request :rasta :get 403 (str "ee/transform/" (:id transform)))
- (mt/user-http-request :rasta :post 403 "ee/transform"
- {:name "Test"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"}}}
- :target {:type "table" :name "test_table"}})
- (mt/user-http-request :rasta :put 403 (str "ee/transform/" (:id transform))
- {:name "Updated"})
- (mt/user-http-request :rasta :delete 403 (str "ee/transform/" (:id transform))))
-
- (testing "Data analysts can read transforms"
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/user-http-request :lucky :get 200 "ee/transform")
- (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform)))))))))
-
-(defmethod driver/database-supports? [::driver/driver ::extract-columns-from-query]
- [_driver _feature _database]
- true)
-
-(doseq [driver [:clickhouse :redshift :bigquery-cloud-sdk :snowflake]]
- (defmethod driver/database-supports? [driver ::extract-columns-from-query]
- [_driver _feature _database]
- false))
-
-(deftest ^:parallel extract-columns-from-query-test
- (testing "POST /api/ee/transform/extract-columns"
- (mt/test-drivers (mt/normal-driver-select {:+features [:transforms/table
- ::extract-columns-from-query]})
- (mt/with-premium-features #{:transforms}
- (mt/dataset transforms-dataset/transforms-test
- (letfn [(make-native-query [sql]
- {:lib/type :mbql/query
- :database (mt/id)
- :stages [{:lib/type :mbql.stage/native
- :native sql}]})]
- (testing "Successfully extracts columns from a simple SELECT query"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/extract-columns"
- {:query (make-native-query "SELECT id, name, category, price FROM transforms_products")})]
- (is (= ["id" "price"] (:columns response))
- "Should only return numeric (id, price) columns, filtering out text columns (name, category)")))
-
- (testing "Returns nil for invalid SQL"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/extract-columns"
- {:query (make-native-query "SELECT * FORM invalid_table")})]
- (is (nil? (:columns response)))))
-
- (testing "Extracts columns from query with aliases"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/extract-columns"
- {:query (make-native-query "SELECT id AS product_id, name AS product_name FROM transforms_products")})]
- (is (= ["product_id"] (:columns response))
- "Should only return numeric column (id), filtering out text column (name)")))
-
- (testing "Filters columns by type - only returns numeric and temporal columns"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/extract-columns"
- {:query (make-native-query "SELECT id, name, category, price, created_at FROM transforms_products")})]
- (is (= ["id" "price" "created_at"] (:columns response))
- "Should return numeric (id, price) and temporal (created_at) columns, filtering out text columns (name, category)")))
-
- (testing "Requires superuser permissions"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request :rasta :post 403 "ee/transform/extract-columns"
- {:query (make-native-query "SELECT * FROM transforms_products")}))))
-
- (testing "Returns 404 for non-existent database"
- (is (= "Not found."
- (mt/user-http-request :crowberto :post 404 "ee/transform/extract-columns"
- {:query {:lib/type :mbql/query
- :database 999999
- :stages [{:lib/type :mbql.stage/native
- :native "SELECT * FROM transforms_products"}]}}))))))))))
-
-(deftest ^:parallel is-simple-query-test
- (testing "POST /api/ee/transform/is-simple-query"
- (mt/with-premium-features #{:transforms}
- (testing "Returns true for simple SELECT queries"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "SELECT id, name FROM products"})]
- (is (true? (:is_simple response)))
- (is (nil? (:reason response)))))
-
- (testing "Returns true for simple SELECT with WHERE clause"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "SELECT id, name FROM products WHERE category = 'Electronics'"})]
- (is (true? (:is_simple response)))))
-
- (testing "Returns true for simple SELECT with JOIN"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "SELECT p.id, p.name, c.name FROM products p JOIN categories c ON p.category_id = c.id"})]
- (is (true? (:is_simple response)))))
-
- (testing "Returns false for query with LIMIT"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "SELECT id, name FROM products LIMIT 10"})]
- (is (false? (:is_simple response)))
- (is (= "Contains a LIMIT" (:reason response)))))
-
- (testing "Returns false for query with OFFSET"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "SELECT id, name FROM products OFFSET 5"})]
- (is (false? (:is_simple response)))
- (is (= "Contains an OFFSET" (:reason response)))))
-
- (testing "Returns false for query with LIMIT and OFFSET"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "SELECT id, name FROM products LIMIT 10 OFFSET 5"})]
- (is (false? (:is_simple response)))
- (is (= "Contains a LIMIT" (:reason response)))))
-
- (testing "Returns false for query with CTE"
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform/is-simple-query"
- {:query "WITH category_counts AS (SELECT category, COUNT(*) as cnt FROM products GROUP BY category) SELECT * FROM category_counts"})]
- (is (false? (:is_simple response)))
- (is (= "Contains a CTE" (:reason response))))))))
-
-;;; ------------------------------------------------------------
-;;; User Attribution Tests
-;;; ------------------------------------------------------------
-
-(deftest manual-run-user-attribution-test
- (testing "Manual runs are attributed to the triggering user, not the owner"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/dataset transforms-dataset/transforms-test
- (with-transform-cleanup! [table-name "user_attribution_test"]
- (let [rasta-id (mt/user->id :rasta)
- crowberto-id (mt/user->id :crowberto)
- ;; Create transform owned by rasta, but run by crowberto
- transform (mt/user-http-request :crowberto :post 200 "ee/transform"
- {:name "Attribution Test"
- :source {:type "query"
- :query (make-query "Gadget")}
- :target {:type "table"
- :schema (get-test-schema)
- :name table-name}
- :owner_user_id rasta-id})
- transform-id (:id transform)]
- ;; Verify owner is rasta
- (is (= rasta-id (:owner_user_id transform))
- "Owner should be rasta")
- ;; Run as crowberto (different from owner)
- (mt/user-http-request :crowberto :post 202
- (format "ee/transform/%d/run" transform-id))
- ;; Wait for run to start and check attribution
- (let [run (u/poll {:thunk #(t2/select-one :model/TransformRun :transform_id transform-id)
- :done? some?
- :timeout-ms 5000})]
- (is (some? run) "Run should exist")
- (is (= crowberto-id (:user_id run))
- "Run should be attributed to the triggering user (crowberto), not the owner (rasta)")))))))))
-
-;;; ------------------------------------------------------------
-;;; Collection Items Integration Tests
-;;; ------------------------------------------------------------
-
-(deftest collection-items-include-transforms-test
- (testing "GET /api/collection/:id/items"
- (testing "Includes transforms in collection items"
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Collection {collection-id :id} {:name "Transforms Collection"
- :namespace :transforms}
- :model/Transform {transform-id :id}
- {:name "Test Transform"
- :description "A test transform"
- :collection_id collection-id}]
- ;; Test 1: Transform appears in unfiltered results
- (let [items (:data (mt/user-http-request :lucky :get 200
- (format "collection/%d/items" collection-id)))]
- (is (= 1 (count items)))
- (is (= "transform" (:model (first items))))
- (is (= "Test Transform" (:name (first items)))))
-
- ;; Test 2: Transform appears when filtered by models=transform
- (let [items (:data (mt/user-http-request :lucky :get 200
- (format "collection/%d/items" collection-id)
- :models "transform"))]
- (is (= 1 (count items)))
- (is (= transform-id (:id (first items)))))
-
- ;; Test 3: Transform NOT returned when filtering for other models only
- (let [items (:data (mt/user-http-request :lucky :get 200
- (format "collection/%d/items" collection-id)
- :models "card"))]
- (is (empty? items)))
-
- ;; Test 4: Non-analysts users don't see transforms
- (perms/grant-collection-read-permissions! (perms/all-users-group) collection-id)
- (let [items (:data (mt/user-http-request :rasta :get 200
- (format "collection/%d/items" collection-id)))]
- (is (empty? items)))
-
- ;; Test 5: Admins see transforms
- (let [items (:data (mt/user-http-request :crowberto :get 200
- (format "collection/%d/items" collection-id)))]
- (is (= 1 (count items)))
- (is (= "transform" (:model (first items))))
- (is (= "Test Transform" (:name (first items)))))))))))
-
-(deftest create-transform-with-tags-test
- (testing "POST /api/ee/transform with tag_ids"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (let [schema (t2/select-one-fn :schema :model/Table :db_id (mt/id) :active true)]
- (testing "Can create transform with tags"
- ;; Create tags via API since we're testing transform creation with existing tags
- (let [tag1 (mt/user-http-request :lucky :post 200 "ee/transform-tag"
- {:name (str "test-tag-1-" (random-uuid))})
- tag2 (mt/user-http-request :lucky :post 200 "ee/transform-tag"
- {:name (str "test-tag-2-" (random-uuid))})]
- (try
- (let [transform-request (-> (merge (mt/with-temp-defaults :model/Transform)
- {:tag_ids [(:id tag1) (:id tag2)]})
- (assoc-in [:target :schema] schema))
- transform-response (mt/user-http-request :lucky :post 200 "ee/transform"
- transform-request)]
- (try
- (is (= (:name transform-request) (:name transform-response)))
- (is (= (:tag_ids transform-request) (sort (:tag_ids transform-response))))
- (finally
- (t2/delete! :model/Transform :id (:id transform-response)))))
- (finally
- (t2/delete! :model/TransformTag :id [:in [(:id tag1) (:id tag2)]])))))
- (testing "Can create transform without tags"
- (let [transform-request (assoc-in (mt/with-temp-defaults :model/Transform)
- [:target :schema] schema)
- transform-response (mt/user-http-request :lucky :post 200 "ee/transform"
- transform-request)]
- (try
- (is (= (:name transform-request) (:name transform-response)))
- (is (= [] (:tag_ids transform-response)))
- (finally
- (t2/delete! :model/Transform :id (:id transform-response)))))))))))))
-
-(deftest update-transform-tags-test
- (testing "PUT /api/ee/transform/:id with tag_ids"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-temp [:model/Transform transform {:name "Test Transform"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"}}}
- :target {:type "table"
- :name "test_table"}}
- :model/TransformTag tag1 {:name "update-tag-1"}
- :model/TransformTag tag2 {:name "update-tag-2"}
- :model/TransformTag tag3 {:name "update-tag-3"}]
-
- (testing "Can add tags to transform"
- (let [updated (mt/user-http-request :lucky :put 200 (str "ee/transform/" (:id transform))
- {:tag_ids [(:id tag1) (:id tag2)]})]
- (is (= [(:id tag1) (:id tag2)] (sort (:tag_ids updated))))))
-
- (testing "Can update tags on transform"
- (let [updated (mt/user-http-request :lucky :put 200 (str "ee/transform/" (:id transform))
- {:tag_ids [(:id tag2) (:id tag3)]})]
- (is (= [(:id tag2) (:id tag3)] (sort (:tag_ids updated))))))
-
- (testing "Can remove all tags from transform"
- (let [updated (mt/user-http-request :lucky :put 200 (str "ee/transform/" (:id transform))
- {:tag_ids []})]
- (is (= [] (:tag_ids updated))))))))))))
-
-(deftest get-transform-with-tags-test
- (testing "GET /api/ee/transform/:id returns tag_ids"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-temp [:model/Transform transform {:name "Transform With Tags"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"}}}
- :target {:type "table"
- :name "tagged_table"}}
- :model/TransformTag tag1 {:name "get-tag-1"}
- :model/TransformTag tag2 {:name "get-tag-2"}]
- ;; Add tags to transform
- (transform.model/update-transform-tags! (:id transform) [(:id tag1) (:id tag2)])
-
- (testing "Single transform returns tag_ids"
- (let [fetched (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform)))]
- (is (= [(:id tag1) (:id tag2)] (sort (:tag_ids fetched))))))
-
- (testing "Transform without tags returns empty array"
- (mt/with-temp [:model/Transform transform2 {:name "Transform Without Tags"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"}}}
- :target {:type "table"
- :name "untagged_table"}}]
- (let [fetched (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform2)))]
- (is (= [] (:tag_ids fetched)))))))))))))
-
-(deftest list-transforms-with-tags-test
- (testing "GET /api/ee/transform returns transforms with tag_ids"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-temp [:model/Transform transform1 {:name "Transform 1"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"}}}
- :target {:type "table"
- :name "list_table_1"}}
- :model/Transform transform2 {:name "Transform 2"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 2"}}}
- :target {:type "table"
- :name "list_table_2"}}
- :model/TransformTag tag1 {:name "list-tag-1"}
- :model/TransformTag tag2 {:name "list-tag-2"}]
- ;; Add tags to transforms
- (transform.model/update-transform-tags! (:id transform1) [(:id tag1)])
- (transform.model/update-transform-tags! (:id transform2) [(:id tag1) (:id tag2)])
-
- (testing "List endpoint returns all transforms with their tag_ids"
- (let [transforms (mt/user-http-request :lucky :get 200 "ee/transform")
- t1 (some #(when (= (:id %) (:id transform1)) %) transforms)
- t2 (some #(when (= (:id %) (:id transform2)) %) transforms)]
- (is (= [(:id tag1)] (:tag_ids t1)))
- (is (= [(:id tag1) (:id tag2)] (sort (:tag_ids t2))))))))))))
-
-(deftest delete-tag-removes-associations-test
- (testing "Deleting a tag removes it from all transforms"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-temp [:model/Transform transform {:name "Transform for Delete Test"
- :source {:type "query"
- :query {:database (mt/id)
- :type "native"
- :native {:query "SELECT 1"}}}
- :target {:type "table"
- :name "delete_test_table"}}
- :model/TransformTag tag2 {:name "tag-to-keep"}]
- ;; Create tag1 via API since we're testing its deletion
- (let [tag1 (mt/user-http-request :lucky :post 200 "ee/transform-tag"
- {:name "tag-to-delete"})]
- (try
- ;; Add both tags to transform
- (transform.model/update-transform-tags! (:id transform) [(:id tag1) (:id tag2)])
-
- ;; Verify tags are associated
- (let [fetched (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform)))]
- (is (= (set [(:id tag1) (:id tag2)]) (set (:tag_ids fetched)))))
-
- ;; Delete tag1
- (mt/user-http-request :lucky :delete 204 (str "ee/transform-tag/" (:id tag1)))
-
- ;; Verify tag1 is removed but tag2 remains
- (let [fetched (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform)))]
- (is (= [(:id tag2)] (vec (:tag_ids fetched)))))
- (finally
- (t2/delete! :model/TransformTag :id (:id tag1))))))))))))
-
-(deftest preserve-tag-order-test
- (testing "Tag order is preserved when adding/updating transform tags"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-premium-features #{:transforms}
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
- (mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-temp [:model/TransformTag tag1 {:name "order-tag-1"}
- :model/TransformTag tag2 {:name "order-tag-2"}
- :model/TransformTag tag3 {:name "order-tag-3"}]
-
- (let [schema (t2/select-one-fn :schema :model/Table :db_id (mt/id) :active true)]
- (testing "Creating transform with specific tag order preserves that order"
- (let [transform-request (-> (merge (mt/with-temp-defaults :model/Transform)
- {:tag_ids [(:id tag3) (:id tag1) (:id tag2)]})
- (assoc-in [:target :schema] schema))
- transform (mt/user-http-request :lucky :post 200 "ee/transform"
- transform-request)]
- (try
- ;; Should preserve the exact order: tag3, tag1, tag2
- (is (= [(:id tag3) (:id tag1) (:id tag2)] (:tag_ids transform)))
- ;; Verify order is preserved when fetching
- (let [fetched (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform)))]
- (is (= [(:id tag3) (:id tag1) (:id tag2)] (:tag_ids fetched))))
- ;; Update with different order
- (let [updated (mt/user-http-request :lucky :put 200 (str "ee/transform/" (:id transform))
- {:tag_ids [(:id tag2) (:id tag3) (:id tag1)]})]
- ;; Should now have the new order: tag2, tag3, tag1
- (is (= [(:id tag2) (:id tag3) (:id tag1)] (:tag_ids updated))))
- ;; Verify new order persists
- (let [fetched-again (mt/user-http-request :lucky :get 200 (str "ee/transform/" (:id transform)))]
- (is (= [(:id tag2) (:id tag3) (:id tag1)] (:tag_ids fetched-again))))
- (finally
- (t2/delete! :model/Transform :id (:id transform))))))
- (testing "Duplicate tag IDs are handled correctly"
- (let [transform-request (-> (merge (mt/with-temp-defaults :model/Transform)
- {:tag_ids [(:id tag1) (:id tag2) (:id tag1)]})
- (assoc-in [:target :schema] schema))
- transform (mt/user-http-request :lucky :post 200 "ee/transform"
- transform-request)]
- (try
- ;; Should only have each tag once, but preserve relative order
- (is (= [(:id tag1) (:id tag2)] (:tag_ids transform)))
- (finally
- (t2/delete! :model/Transform :id (:id transform))))))))))))))
-
-(deftest root-collection-items-include-transforms-test
- (testing "GET /api/collection/root/items"
- (testing "Includes transforms in root collection items"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform {transform-id :id}
- {:name "Root Transform"
- :description "A transform at root"}]
- (testing "Transform appears in unfiltered results"
- (let [items (->> (:data (mt/user-http-request :crowberto :get 200
- "collection/root/items"
- :namespace "transforms"))
- (filter #(= "transform" (:model %))))]
- (is (= 1 (count items)))
- (is (= "transform" (:model (first items))))
- (is (= "Root Transform" (:name (first items))))))
- (testing "Transform appears when filtered by models=trans form"
-
- (let [items (:data (mt/user-http-request :crowberto :get 200
- "collection/root/items"
- :namespace "transforms"
- :models "transform"))]
- (is (= 1 (count items)))
- (is (= transform-id (:id (first items))))))
-
- (testing "Transform NOT returned when filtering for other models only"
- (let [items (:data (mt/user-http-request :crowberto :get 200
- "collection/root/items"
- :namespace "transforms"
- :models "card"))]
- (is (empty? items))))
-
- (testing "Non-admin users don't see transforms"
- (let [items (->> (:data (mt/user-http-request :rasta :get 200
- "collection/root/items"
- :namespace "transforms"))
- (filter #(= "transform" (:model %))))]
- (is (empty? items)))))))))
-
-(deftest transforms-appear-in-here-test
- (testing "GET /api/collection/:id/items"
- (testing "Transforms in a collection appear in its :here field"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Collection {parent-id :id} {:name "Parent"
- :namespace :transforms}
- :model/Collection {child-id :id} {:name "Child"
- :location (format "/%d/" parent-id)
- :namespace :transforms}
- :model/Transform _ {:name "Test Transform"
- :collection_id child-id}]
- ;; Check child collection shows transform in :here
- (let [child-coll (first (:data (mt/user-http-request :crowberto :get 200
- (format "collection/%d/items" parent-id))))]
- (is (= ["transform"] (:here child-coll)))))))))
-
-(deftest transforms-appear-in-below-test
- (testing "GET /api/collection/:id/items"
- (testing "Transforms in descendant collections appear in :below field"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Collection {parent-id :id} {:name "Parent"
- :namespace :transforms}
- :model/Collection {child-id :id} {:name "Child"
- :location (format "/%d/" parent-id)
- :namespace :transforms}
- :model/Collection {grandchild-id :id} {:name "Grandchild"
- :location (format "/%d/%d/" parent-id child-id)
- :namespace :transforms}
- :model/Transform _ {:name "Nested Transform"
- :collection_id grandchild-id}]
- ;; Check child collection shows transform in :below
- (let [child-coll (first (:data (mt/user-http-request :crowberto :get 200
- (format "collection/%d/items" parent-id))))]
- (is (= ["collection"] (:here child-coll)))
- (is (= ["transform"] (:below child-coll)))))))))
-
-(deftest native-incremental-column-type-validated-on-create-test
- (testing "POST /api/ee/transform column type validation"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
- (mt/with-premium-features #{:transforms}
- (mt/dataset transforms-dataset/transforms-test
- (let [schema (get-test-schema)]
- (testing "Rejects unsupported checkpoint column type (text)"
- (let [response (mt/user-http-request :crowberto :post 400 "ee/transform"
- {:name "Invalid Incremental Transform"
- :source {:type "query"
- :query (lib/native-query (mt/metadata-provider)
- "SELECT id, name, category, price FROM transforms_products")
- :source-incremental-strategy {:type "checkpoint"
- :checkpoint-filter "name"}}
- :target {:type "table-incremental"
- :schema schema
- :name "invalid_incremental"
- :target-incremental-strategy {:type "append"}}})]
- (is (string? response))
- (is (re-find #"Only numeric and temporal" response))))))))))
-
-(deftest native-incremental-column-type-validated-on-update-test
- (testing "PUT /api/ee/transform column type validation"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
- (mt/with-premium-features #{:transforms}
- (mt/dataset transforms-dataset/transforms-test
- (let [schema (get-test-schema)]
- (with-transform-cleanup! [table-name "update_incremental_test"]
- (let [;; Create a non-incremental transform first
- created (mt/user-http-request :crowberto :post 200 "ee/transform"
- {:name "Test Transform"
- :source {:type "query"
- :query (lib/native-query (mt/metadata-provider)
- "SELECT id, name, category FROM transforms_products")}
- :target {:type "table"
- :schema schema
- :name table-name}})]
- (testing "Rejects update to unsupported checkpoint column type (text)"
- (let [response (mt/user-http-request :crowberto :put 400
- (format "ee/transform/%d" (:id created))
- {:source {:type "query"
- :query (lib/native-query (mt/metadata-provider)
- "SELECT id, name, category FROM transforms_products")
- :source-incremental-strategy {:type "checkpoint"
- :checkpoint-filter "category"}}
- :target {:type "table-incremental"
- :schema schema
- :name table-name
- :target-incremental-strategy {:type "append"}}})]
- (is (string? response))
- (is (re-find #"Only numeric and temporal" response))))))))))))
-
-(deftest mbql-incremental-column-type-validated-on-create-test
- (testing "MBQL query with checkpoint-filter-unique-key - checkpoint column type validation"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
- (mt/with-premium-features #{:transforms}
- (mt/dataset transforms-dataset/transforms-test
- (let [schema (get-test-schema)]
- (testing "Rejects unsupported checkpoint column type (text)"
- (let [query (mt/mbql-query transforms_products)
- response (mt/user-http-request :crowberto :post 400 "ee/transform"
- {:name "Invalid MBQL Incremental"
- :source {:type "query"
- :query query
- :source-incremental-strategy {:type "checkpoint"
- :checkpoint-filter-unique-key "column-unique-key-v1$name"}}
- :target {:type "table-incremental"
- :schema schema
- :name "invalid_mbql_incremental"
- :target-incremental-strategy {:type "append"}}})]
- (is (string? response))
- (is (re-find #"not supported" response))))))))))
-
-(deftest native-incremental-column-validation-when-not-extractable-test
- (testing "Native query checkpoint column validation with text input fallback"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
- (mt/with-premium-features #{:transforms}
- (mt/dataset transforms-dataset/transforms-test
- (let [schema (get-test-schema)]
- (testing "Accepts any column if they were not extractable"
- (with-transform-cleanup! [table-name "fallback_test_unextracted"]
- (with-redefs [metabase-enterprise.transforms.api/extract-all-columns-from-query
- ;; simulate lack of driver support for extraction
- (fn [_driver _database-id _query] nil)]
- (let [response (mt/user-http-request :crowberto :post 200 "ee/transform"
- {:name "Unextracted Column - Text Input Fallback"
- :source {:type "query"
- :query (lib/native-query (mt/metadata-provider)
- "SELECT id, name, created_at FROM transforms_products")
- :source-incremental-strategy {:type "checkpoint"
- ;; created_at is in the query but not in our stubbed extraction
- :checkpoint-filter "created_at"}}
- :target {:type "table-incremental"
- :schema schema
- :name table-name
- :target-incremental-strategy {:type "append"}}})]
- (is (some? (:id response))
- "Should accept column not in extracted metadata, allowing text input fallback")))))))))))
+ (let [search-term (str "transform-search-" (u/generate-nano-id))
+ query-name (str search-term "-query")]
+ (mt/with-temp [:model/Transform {query-id :id} (assoc (query-transform-payload (str "target_" (u/generate-nano-id)))
+ :name query-name)]
+ (search.tu/with-new-search-and-legacy-search
+ (let [ids (search-api-transform-ids :crowberto search-term)]
+ (is (empty? ids))
+ (is (not (contains? ids query-id)))))))))))
;;; ------------------------------------------------------------
-;;; Run List Sorting
+;;; Run List Sorting - TODO [OSS] - move this to OSS
;;; ------------------------------------------------------------
(deftest get-runs-sort-by-transform-name-test
- (testing "GET /api/ee/transform/run - sort by transform-name"
+ (testing "GET /api/transform/run - sort by transform-name"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Transform {transform-b-id :id} {:name "Transform B"}
:model/Transform {transform-a-id :id} {:name "Transform A"}
@@ -1693,7 +213,7 @@
:model/TransformRun {run-a-id :id} {:transform_id transform-a-id}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "transform-name"
:sort_direction sort-direction
:transform_ids [transform-a-id transform-b-id])]
@@ -1702,7 +222,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-stable-test
- (testing "GET /api/ee/transform/run - sorting is stable when values are equal (tiebreaker by :id)"
+ (testing "GET /api/transform/run - sorting is stable when values are equal (tiebreaker by :id)"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Transform {transform-1-id :id} {:name "Same Name"}
:model/Transform {transform-2-id :id} {:name "Same Name"}
@@ -1710,7 +230,7 @@
:model/TransformRun {run-2-id :id} {:transform_id transform-2-id}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "transform-name"
:sort_direction sort-direction
:transform_ids [transform-1-id transform-2-id])]
@@ -1719,7 +239,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-by-start-time-test
- (testing "GET /api/ee/transform/run - sort by start-time"
+ (testing "GET /api/transform/run - sort by start-time"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Transform {transform-id :id} {}
:model/TransformRun {earlier-run-id :id} {:transform_id transform-id
@@ -1728,7 +248,7 @@
:start_time (parse-instant "2025-01-02T00:00:00")}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "start-time"
:sort_direction sort-direction
:transform_ids [transform-id])]
@@ -1737,7 +257,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-by-end-time-test
- (testing "GET /api/ee/transform/run - sort by end-time"
+ (testing "GET /api/transform/run - sort by end-time"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Transform {transform-id :id} {}
:model/TransformRun {earlier-run-id :id} {:transform_id transform-id
@@ -1746,7 +266,7 @@
:end_time (parse-instant "2025-01-02T00:00:00")}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "end-time"
:sort_direction sort-direction
:transform_ids [transform-id])]
@@ -1755,7 +275,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-by-run-method-test
- (testing "GET /api/ee/transform/run - sort by run-method (translated names)"
+ (testing "GET /api/transform/run - sort by run-method (translated names)"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Transform {transform-id :id} {}
;; "Manual" < "Schedule"
@@ -1763,7 +283,7 @@
:model/TransformRun {schedule-run-id :id} {:transform_id transform-id :run_method "cron"}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "run-method"
:sort_direction sort-direction
:transform_ids [transform-id])]
@@ -1772,7 +292,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-by-status-test
- (testing "GET /api/ee/transform/run - sort by status (translated names)"
+ (testing "GET /api/transform/run - sort by status (translated names)"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Transform {transform-id :id} {}
;; Sorted by translated name: "Canceled" < "Canceling" < "Failed" < "In progress" < "Success" < "Timeout"
@@ -1785,7 +305,7 @@
:model/TransformRun {timeout-run-id :id} {:transform_id transform-id :status "timeout"}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "status"
:sort_direction sort-direction
:transform_ids [transform-id])]
@@ -1795,7 +315,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-by-transform-tags-test
- (testing "GET /api/ee/transform/run - sort by transform-tags (first tag name)"
+ (testing "GET /api/transform/run - sort by transform-tags (first tag name)"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformTag {tag-a-id :id} {:name "Tag A"}
:model/TransformTag {tag-b-id :id} {:name "Tag B"}
@@ -1811,7 +331,7 @@
:model/TransformRun {run-b-id :id} {:transform_id transform-b-id}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "transform-tags"
:sort_direction sort-direction
:transform_ids [transform-a-id transform-b-id])]
@@ -1820,7 +340,7 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-sort-by-built-in-transform-tags-test
- (testing "GET /api/ee/transform/run - sort by built-in transform-tags (translated names)"
+ (testing "GET /api/transform/run - sort by built-in transform-tags (translated names)"
(mt/with-premium-features #{:transforms}
;; Translated names alphabetically: "daily" < "hourly" < "monthly" < "weekly"
(mt/with-temp [:model/TransformTag {tag-daily-id :id}
@@ -1868,7 +388,7 @@
{:transform_id transform-weekly-id}]
(doseq [sort-direction [:asc :desc]]
(testing (str sort-direction)
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:sort_column "transform-tags"
:sort_direction sort-direction
:transform_ids [transform-daily-id transform-hourly-id
@@ -1878,14 +398,14 @@
(->> response :data (map :id)))))))))))
(deftest get-runs-hydrate-collection-test
- (testing "GET /api/ee/transform/run - hydrates collection on transform"
+ (testing "GET /api/transform/run - hydrates collection on transform"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/Collection {collection-id :id} {:name "Subfolder" :namespace :transforms}
:model/Transform {transform-in-collection-id :id} {:collection_id collection-id}
:model/Transform {transform-in-root-id :id} {:collection_id nil}
:model/TransformRun {run-in-collection-id :id} {:transform_id transform-in-collection-id}
:model/TransformRun {run-in-root-id :id} {:transform_id transform-in-root-id}]
- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
:transform_ids [transform-in-collection-id
transform-in-root-id])
runs-by-id (m/index-by :id (:data response))]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
index 1aac4a2cf51..75c1d64e84d 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
@@ -6,10 +6,6 @@
[clojure.test :refer :all]
[honey.sql :as sql]
[metabase-enterprise.transforms-python.python-runner :as python-runner]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
- [metabase-enterprise.transforms.util :as transforms.u]
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql.query-processor :as sql.qp]
@@ -19,6 +15,10 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.query-processor :as qp]
[metabase.test :as mt]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
+ [metabase.transforms.util :as transforms.u]
[next.jdbc :as next.jdbc]
[next.jdbc.result-set :as jdbc.rs]
[toucan2.core :as t2]))
@@ -262,12 +262,12 @@
(is (nil? (get-checkpoint-value transform))))
(testing "Can retrieve transform via API"
- (let [retrieved (mt/user-http-request :crowberto :get 200 (format "ee/transform/%d" (:id transform)))]
+ (let [retrieved (mt/user-http-request :crowberto :get 200 (format "transform/%d" (:id transform)))]
(is (= (:id transform) (:id retrieved)))
(is (= "Test Incremental Transform" (:name retrieved)))))
(testing "Transform appears in list endpoint"
- (let [transforms (mt/user-http-request :crowberto :get 200 "ee/transform")
+ (let [transforms (mt/user-http-request :crowberto :get 200 "transform")
our-transform (first (filter #(= (:id transform) (:id %)) transforms))]
(is (some? our-transform))
(is (= "Test Incremental Transform" (:name our-transform))))))))))))))))
@@ -345,7 +345,7 @@
(update :source dissoc :source-incremental-strategy)
(update :target dissoc :source-incremental-strategy)
(update :target assoc :type "table"))
- updated (mt/user-http-request :crowberto :put 200 (format "ee/transform/%d" (:id transform))
+ updated (mt/user-http-request :crowberto :put 200 (format "transform/%d" (:id transform))
non-incremental-payload)]
(is (= "table" (-> updated :target :type)))
(is (nil? (-> updated :source :source-incremental-strategy)))))
@@ -396,7 +396,7 @@
(is (nil? checkpoint) "No checkpoint for non-incremental transform")))))
(testing "Switch to incremental via PUT API"
- (let [updated (mt/user-http-request :crowberto :put 200 (format "ee/transform/%d" (:id transform))
+ (let [updated (mt/user-http-request :crowberto :put 200 (format "transform/%d" (:id transform))
incremental-payload)]
(is (= "table-incremental" (-> updated :target :type)))
(is (= "checkpoint" (-> updated :source :source-incremental-strategy :type)))))
@@ -501,7 +501,7 @@
:database (mt/id)
:target-incremental-strategy {:type "append"}}}]
(testing "API validation rejects unsupported checkpoint column type"
- (let [response (mt/user-http-request :crowberto :post 400 "ee/transform" transform-payload)]
+ (let [response (mt/user-http-request :crowberto :post 400 "transform" transform-payload)]
(is (string? response))
(is (re-find #"unsupported type" response)))))))))))
@@ -730,7 +730,7 @@
(testing "Switch to non-incremental via API"
(let [non-incremental-payload (-> incremental-payload
(update :source dissoc :source-incremental-strategy))
- updated (mt/user-http-request :crowberto :put 200 (format "ee/transform/%d" (:id transform))
+ updated (mt/user-http-request :crowberto :put 200 (format "transform/%d" (:id transform))
non-incremental-payload)]
(is (nil? (:source-incremental-strategy (:source updated))))))
(testing "Non-incremental run removes automatic indexes indexes"
@@ -761,7 +761,7 @@
(is (=? {:value initial-field :index-name #"^mb_transform_idx_.*$"} (first indexes)))))
(testing "Switch checkpoint column via API"
(let [new-payload (make-incremental-transform-payload "Column Change Transform" target-table transform-type float-config)
- updated (mt/user-http-request :crowberto :put 200 (format "ee/transform/%d" (:id transform))
+ updated (mt/user-http-request :crowberto :put 200 (format "transform/%d" (:id transform))
new-payload)]
(is (= new-field (-> updated :source :source-incremental-strategy :checkpoint-filter)))))
(testing "Run with new checkpoint column updates indexes"
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/models_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/models_test.clj
index 98ee11f0b8c..f7ffcac24e2 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/models_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/models_test.clj
@@ -1,279 +1,9 @@
(ns metabase-enterprise.transforms.models-test
- "Tests for transform jobs and tags database tables and basic CRUD operations."
(:require
- [clojure.test :refer :all]
- [metabase-enterprise.transforms.models.transform :as transform.model]
- [metabase-enterprise.transforms.models.transform-job :as transform-job]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.models.transform-tag :as transform-tag]
- [metabase.collections.models.collection :as collection]
- [metabase.config.core :as config]
+ [clojure.test :refer [deftest testing is]]
[metabase.test :as mt]
- [metabase.test.fixtures :as fixtures]
- [metabase.util :as u]
[toucan2.core :as t2]))
-;; Use the default test fixture which sets up the test database
-(use-fixtures :once (fixtures/initialize :db :test-users))
-
-(deftest job-tags-association-test
- (testing "Job-tag associations via join table"
- (mt/with-temp [:model/TransformJob job {}
- :model/TransformTag tag1 {}
- :model/TransformTag tag2 {}
- :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag1) :position 0}
- :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag2) :position 1}]
- (testing "Can retrieve tags for job"
- (let [tag-ids (t2/select-fn-set :tag_id :model/TransformJobTransformTag :job_id (:id job))]
- (is (contains? tag-ids (:id tag1)) "Should include first tag")
- (is (contains? tag-ids (:id tag2)) "Should include second tag")
- (is (= 2 (count tag-ids)) "Should have exactly 2 tags")))
-
- (testing "Can retrieve jobs for tag"
- (let [job-ids (t2/select-fn-set :job_id :model/TransformJobTransformTag :tag_id (:id tag1))]
- (is (contains? job-ids (:id job)) "Should include the job"))))))
-
-(deftest cascade-delete-tag-test
- (testing "Deleting a tag cascades to associations"
- (mt/with-temp [:model/TransformTag tag {}
- :model/TransformJob job {}
- :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag) :position 0}]
- ;; Delete the tag
- (t2/delete! :model/TransformTag :id (:id tag))
-
- ;; Verify cascade deletion
- (testing "Tag associations are deleted"
- (is (not (t2/exists? :model/TransformJobTransformTag :tag_id (:id tag)))
- "Job-tag association should be deleted"))
-
- ;; Verify job still exists
- (is (t2/exists? :model/TransformJob :id (:id job))
- "Job should still exist after tag deletion"))))
-
-(deftest cascade-delete-job-test
- (testing "Deleting a job cascades to associations"
- (mt/with-temp [:model/TransformTag tag {}
- :model/TransformJob job {}
- :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag) :position 0}]
- ;; Delete the job (not the tag)
- (t2/delete! :model/TransformJob :id (:id job))
-
- ;; Verify cascade deletion
- (testing "Tag associations are deleted"
- (is (not (t2/exists? :model/TransformJobTransformTag :job_id (:id job)))
- "Job-tag association should be deleted"))
-
- ;; Verify tag still exists
- (is (t2/exists? :model/TransformTag :id (:id tag))
- "Tag should still exist after job deletion"))))
-
-(deftest transform-tag-helper-functions-test
- (testing "TransformTag helper functions"
- (mt/with-temp [:model/TransformTag tag {}]
- (testing "tag-name-exists?"
- (is (transform-tag/tag-name-exists? (:name tag))
- "Should return true for existing tag name")
- (is (not (transform-tag/tag-name-exists? (str "nonexistent-" (u/generate-nano-id))))
- "Should return false for non-existing tag name"))
-
- (testing "tag-name-exists-excluding?"
- (is (not (transform-tag/tag-name-exists-excluding? (:name tag) (:id tag)))
- "Should return false when checking same tag's name")
- (is (transform-tag/tag-name-exists-excluding? (:name tag) (inc (:id tag)))
- "Should return true when name exists but with different ID")))))
-
-(deftest hydrate-tag-ids-test
- (testing "TransformJob tag_ids hydration preserves position order"
- (mt/with-temp [:model/TransformJob job1 {:name "job1" :schedule "0 0 * * * ?"}
- :model/TransformJob job2 {:name "job2" :schedule "0 0 * * * ?"}
- :model/TransformTag tag1 {:name "tag1"}
- :model/TransformTag tag2 {:name "tag2"}
- :model/TransformJobTransformTag _ {:job_id (:id job1) :tag_id (:id tag1) :position 0}
- :model/TransformJobTransformTag _ {:job_id (:id job1) :tag_id (:id tag2) :position 1}
- :model/TransformJobTransformTag _ {:job_id (:id job2) :tag_id (:id tag2) :position 0}]
-
- (testing "Hydration adds tag_ids to jobs in position order"
- (let [[hjob1 hjob2] (t2/hydrate [job1 job2] :tag_ids)]
- (is (= [(:id tag1) (:id tag2)] (:tag_ids hjob1))
- "Job1 should have both tags in position order")
- (is (= [(:id tag2)] (:tag_ids hjob2))
- "Job2 should have only tag2")))
-
- (testing "Jobs with no tags have empty tag_ids"
- (mt/with-temp [:model/TransformJob job3 {}]
- (let [[hydrated-job] (t2/hydrate [job3] :tag_ids)]
- (is (= [] (:tag_ids hydrated-job))
- "Job with no tags should have empty tag_ids array")))))))
-
-(deftest transform-tags-ordering-test
- (testing "Transform tags maintain specified order through updates"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform transform {}
- :model/TransformTag tag1 {:name "tag1"}
- :model/TransformTag tag2 {:name "tag2"}
- :model/TransformTag tag3 {:name "tag3"}
- :model/TransformTag tag4 {:name "tag4"}]
- (let [transform-id (:id transform)]
-
- (testing "Transform created without creator_id defaults to internal user"
- (is (= config/internal-mb-user-id (:creator_id transform))))
-
- (testing "Initial tag order is preserved"
- (transform.model/update-transform-tags! transform-id [(:id tag2) (:id tag1) (:id tag3)])
- (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
- (is (= [(:id tag2) (:id tag1) (:id tag3)] (:tag_ids hydrated))
- "Tags should be in the order specified")))
-
- (testing "Reordering tags preserves new order"
- (transform.model/update-transform-tags! transform-id [(:id tag3) (:id tag1) (:id tag2)])
- (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
- (is (= [(:id tag3) (:id tag1) (:id tag2)] (:tag_ids hydrated))
- "Tags should be reordered correctly")))
-
- (testing "Adding and removing tags preserves order"
- (transform.model/update-transform-tags! transform-id [(:id tag1) (:id tag4)])
- (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
- (is (= [(:id tag1) (:id tag4)] (:tag_ids hydrated))
- "Should have only the specified tags in order")))
-
- (testing "Duplicate tags are deduplicated while preserving order"
- (transform.model/update-transform-tags! transform-id [(:id tag2) (:id tag3) (:id tag2) (:id tag1)])
- (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
- (is (= [(:id tag2) (:id tag3) (:id tag1)] (:tag_ids hydrated))
- "Duplicates removed, order preserved"))))))))
-
-(deftest job-tags-ordering-test
- (testing "Job tags maintain specified order through updates"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/TransformJob job {:name "test job" :schedule "0 0 * * *"}
- :model/TransformTag tag1 {:name "tag1"}
- :model/TransformTag tag2 {:name "tag2"}
- :model/TransformTag tag3 {:name "tag3"}]
- (let [job-id (:id job)]
-
- (testing "Initial tag order is preserved"
- (transform-job/update-job-tags! job-id [(:id tag2) (:id tag1)])
- (let [hydrated (t2/hydrate (t2/select-one :model/TransformJob :id job-id) :tag_ids)]
- (is (= [(:id tag2) (:id tag1)] (:tag_ids hydrated))
- "Tags should be in the order specified")))
-
- (testing "Reordering and adding tags preserves order"
- (transform-job/update-job-tags! job-id [(:id tag1) (:id tag3) (:id tag2)])
- (let [hydrated (t2/hydrate (t2/select-one :model/TransformJob :id job-id) :tag_ids)]
- (is (= [(:id tag1) (:id tag3) (:id tag2)] (:tag_ids hydrated))
- "Tags should be reordered with new tag added"))))))))
-
-(deftest table-with-db-and-fields-hydration-test
- (testing "table-with-db-and-fields hydration handles NULL schemas correctly"
- (mt/with-temp [:model/Database {db-id :id} {}
- ;; Create tables with different schema values
- :model/Table {table-with-schema-id :id} {:db_id db-id
- :schema "public"
- :name "test_table_with_schema"}
- :model/Table {table-null-schema-id :id} {:db_id db-id
- :schema nil
- :name "test_table_null_schema"}
- :model/Table {other-table-id :id} {:db_id db-id
- :schema "other"
- :name "other_table"}
- ;; Create transforms targeting these tables
- :model/Transform transform1 {:name "Transform with schema"
- :source {:type "query"
- :query {:database db-id
- :type "native"
- :native {:query "SELECT 1"
- :template-tags {}}}}
- :target {:type "table"
- :schema "public"
- :name "test_table_with_schema"
- :db_id db-id}}
- :model/Transform transform2 {:name "Transform with NULL schema"
- :source {:type "query"
- :query {:database db-id
- :type "native"
- :native {:query "SELECT 2"
- :template-tags {}}}}
- :target {:type "table"
- :schema nil
- :name "test_table_null_schema"
- :db_id db-id}}]
-
- (testing "Hydrates table with non-NULL schema"
- (let [hydrated (t2/hydrate transform1 :table-with-db-and-fields)]
- (is (some? (:table hydrated))
- "Transform should have hydrated table")
- (is (= table-with-schema-id (-> hydrated :table :id))
- "Should hydrate correct table with schema")))
-
- (testing "Hydrates table with NULL schema"
- (let [hydrated (t2/hydrate transform2 :table-with-db-and-fields)]
- (is (some? (:table hydrated))
- "Transform with NULL schema should have hydrated table")
- (is (= table-null-schema-id (-> hydrated :table :id))
- "Should hydrate correct table with NULL schema")))
-
- (testing "Hydrates multiple transforms with mixed schemas in single batch"
- (let [hydrated (t2/hydrate [transform1 transform2] :table-with-db-and-fields)]
- (is (= 2 (count hydrated))
- "Should hydrate both transforms")
- (is (every? (comp some? :table) hydrated)
- "Both transforms should have hydrated tables")
- (is (= #{table-with-schema-id table-null-schema-id}
- (set (map (comp :id :table) hydrated)))
- "Should hydrate both tables correctly")))
-
- (testing "Does not hydrate unrelated tables"
- (let [hydrated (t2/hydrate transform1 :table-with-db-and-fields)]
- (is (not= other-table-id (-> hydrated :table :id))
- "Should not hydrate unrelated table"))))))
-
-(deftest creator-hydration-test
- (testing "Transform creator hydration returns user details"
- (let [user1-data {:first_name "Test"
- :last_name "Creator"
- :email "[email protected]"}
- user2-data {:first_name "Second"
- :last_name "User"
- :email "[email protected]"}]
- (mt/with-temp [:model/User {user1-id :id} user1-data
- :model/Database {db-id :id} {}
- :model/Transform transform1 {:name "Transform with creator"
- :creator_id user1-id
- :source {:type "query"
- :query {:database db-id
- :type "native"
- :native {:query "SELECT 1"
- :template-tags {}}}}
- :target {:type "table"
- :schema "public"
- :name "test_table"
- :db_id db-id}}
- :model/User {user2-id :id} user2-data
- :model/Transform transform2 {:name "Second transform"
- :creator_id user2-id
- :source {:type "query"
- :query {:database db-id
- :type "native"
- :native {:query "SELECT 2"
- :template-tags {}}}}
- :target {:type "table"
- :schema "public"
- :name "test_table2"
- :db_id db-id}}]
- (testing "Hydrates creator with user details"
- (is (=? (assoc user1-data :id user1-id)
- (:creator (t2/hydrate transform1 :creator)))))
- (testing "Hydrates multiple transforms with creators in batch"
- (let [hydrated (t2/hydrate [transform1 transform2] :creator)]
- (is (= 2 (count hydrated))
- "Should hydrate both transforms")
- (is (=? (assoc user1-data :id user1-id)
- (:creator (first hydrated)))
- "First hydrated should match the first user's data")
- (is (=? (assoc user2-data :id user2-id)
- (:creator (second hydrated)))
- "Second hydrated should match the second user's data")))))))
-
(deftest python-transform-source-table-resolution-on-save-test
(testing "Python transform source-tables with name refs get table_id resolved on save"
(mt/with-temp [:model/Database {db-id :id} {}
@@ -331,55 +61,3 @@
source-table (get-in saved [:source :source-tables "input"])]
(is (= 999 (:table_id source-table))
"explicit table_id should be preserved")))))))
-
-(deftest check-allowed-content-transforms
- (mt/with-premium-features #{:data-studio}
- (mt/with-temp [:model/Collection transforms {:name "Test Transforms" :namespace collection/transforms-ns}
- :model/Collection regular-col {:name "Test Regular"}]
- (mt/with-model-cleanup [:model/Transform :model/Card]
- (testing "Can only add allowed content types"
- (is (some? (t2/insert! :model/Transform (assoc (mt/with-temp-defaults :model/Transform) :collection_id (:id transforms)))))
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A Card can only go in Collections in the.*"
- (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model :collection_id (:id transforms)}))))
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A Transform can only go in Collections in the :transforms namespace."
- (t2/insert! :model/Transform (assoc (mt/with-temp-defaults :model/Transform) :collection_id (:id regular-col))))))))))
-
-(deftest deleted-transform-preserves-runs-test
- (testing "Deleting a transform sets transform_id to NULL but preserves the run"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform {transform-id :id
- transform-name :name
- entity-id :entity_id} {}
- :model/TransformRun {run-id :id} {:transform_id transform-id
- :transform_name transform-name
- :transform_entity_id entity-id
- :status "succeeded"
- :run_method "manual"}]
- (t2/delete! :model/Transform :id transform-id)
-
- (let [run (t2/select-one :model/TransformRun :id run-id)]
- (is (some? run))
- (is (nil? (:transform_id run)))
- (is (= transform-name (:transform_name run)))
- (is (= entity-id (:transform_entity_id run))))))))
-
-(deftest orphaned-run-hydration-test
- (testing "Hydrating :transform on orphaned runs returns {:name ... :deleted true}"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/TransformRun run {:transform_id nil
- :transform_name "Deleted Transform"
- :transform_entity_id "test-entity-id-123"
- :status "succeeded"
- :run_method "manual"}]
- (let [hydrated (t2/hydrate run :transform)]
- (is (= {:name "Deleted Transform" :deleted true} (:transform hydrated))))))))
-
-(deftest start-run-captures-transform-info-test
- (testing "start-run! captures transform_name and transform_entity_id"
- (mt/with-premium-features #{:transforms}
- (mt/with-temp [:model/Transform {transform-id :id
- transform-name :name
- entity-id :entity_id} {}]
- (let [run (transform-run/start-run! transform-id {:run_method "manual"})]
- (is (= transform-name (:transform_name run)))
- (is (= entity-id (:transform_entity_id run))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/ordering_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/ordering_test.clj
index 709e907fcfd..2fc119cbb36 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/ordering_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/ordering_test.clj
@@ -1,368 +1,16 @@
-(ns ^:mb/driver-tests metabase-enterprise.transforms.ordering-test
+(ns metabase-enterprise.transforms.ordering-test
(:require
- [clojure.test :refer :all]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.ordering :as ordering]
- [metabase.driver :as driver]
- [metabase.driver.sql :as driver.sql]
- [metabase.query-processor.compile :as qp.compile]
+ [clojure.test :refer [deftest testing is]]
[metabase.test :as mt]
- [metabase.test.data.sql :as sql.tx]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.ordering :as ordering]
[toucan2.core :as t2]))
-(defn- default-schema-or-public [& [fallback-driver]]
- (let [driver (or driver/*driver* fallback-driver)]
- (or (and driver (driver.sql/default-schema driver)) "public")))
-
-(defn- make-transform [query & [name schema]]
- (let [name (or name (mt/random-name))
- schema (or schema (default-schema-or-public))]
- {:source {:type :query
- :query query}
- :name (str "transform_" name)
- :target {:schema schema
- :name name
- :type :table}}))
-
-(use-fixtures :once (fn [thunk]
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (thunk))))
-
-(deftest basic-ordering-test
- (mt/with-temp [:model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders)}})]
- (is (= {t1 #{}}
- (ordering/transform-ordering (t2/select :model/Transform :id t1))))))
-
-(deftest dependency-ordering-test
- (mt/with-temp [:model/Table {table :id} {:schema (default-schema-or-public)
- :name "orders_2"}
- :model/Field _ {:table_id table
- :name "foo"}
- :model/Transform {parent :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders)}}
- "orders_2")
- :model/Transform {child :id} (make-transform
- {:database (mt/id)
- :type "query"
- :query {:source-table table}}
- "orders_3")]
- (is (= {parent #{}
- child #{parent}}
- (ordering/transform-ordering (t2/select :model/Transform :id [:in [parent child]]))))))
-
-(defn- transform-deps-for-db [transform]
- (mt/with-metadata-provider (mt/id)
- (#'transforms.i/table-dependencies transform)))
-
-(deftest not-run-transform-dependency-ordering-test
- (mt/test-driver (mt/normal-driver-select {:+parent :sql-jdbc})
- (testing "dependencies are correctly identified when no transforms have been run yet"
- (mt/with-temp [:model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM orders LIMIT 100"}}
- "orders_transform")
- :model/Transform {t2 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM products LIMIT 100"}}
- "products_transform")
- :model/Transform {t3 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM orders_transform ot
- LEFT JOIN products p
- ON ot.product_id = p.id
- LIMIT 100"}}
- "orders_transform_products")
- :model/Transform {t4 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM orders_transform ot
- LEFT JOIN products_transform pt
- ON ot.product_id = pt.id
- LIMIT 100"}}
- "orders_transform_products_transform")]
- (is (= #{{:transform t1} {:transform t2}}
- (transform-deps-for-db (t2/select-one :model/Transform t4))))
- (is (= {t1 #{}
- t2 #{}
- t3 #{t1}
- t4 #{t1 t2}}
- (ordering/transform-ordering (t2/select :model/Transform :id [:in [t1 t2 t3 t4]]))))))
- (testing "dependencies are correctly identified when some transform have been run and some haven't"
- (mt/with-temp [:model/Transform {t1 :id :as transform1} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM checkins LIMIT 100"}}
- "checkins_transform")
- :model/Transform {t2 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM venues LIMIT 100"}}
- "venues_transform")
- :model/Transform {t3 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query "SELECT * FROM venues_transform vt
- LEFT JOIN checkins_transform ct
- ON vt.id = ct.venue_id
- LIMIT 100"}}
- "venues_transform_2")]
- (try
- (transforms.execute/execute! transform1 {:run-method :manual})
- (let [table1 (t2/select-one-pk :model/Table :name "checkins_transform")]
- (is (= #{{:table table1} {:transform t2}}
- (transform-deps-for-db (t2/select-one :model/Transform t3)))))
- (is (= {t1 #{}
- t2 #{}
- t3 #{t1 t2}}
- (ordering/transform-ordering (t2/select :model/Transform :id [:in [t1 t2 t3]]))))
- (finally
- (t2/delete! :model/Table :name "checkins_transform")))))))
-
-(deftest bigquery-native-transform-dependency-ordering-test
- (mt/test-driver :biquery-cloud-sdk
- (let [[dataset] (sql.tx/qualified-name-components :bigquery-cloud-sdk nil)]
- (testing "dependencies are correctly identified when some transform have been run and some haven't"
- (mt/with-temp [:model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query (format "SELECT * FROM `%s.checkins` LIMIT 100" dataset)}}
- "checkins_transform" dataset)
- :model/Table {table1 :id} {:schema dataset
- :name "checkins_transform"}
- :model/Transform {t2 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query (format "SELECT * FROM `%s.venues` LIMIT 100" dataset)}}
- "venues_transform" dataset)
- :model/Transform {t3 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query (format "SELECT * FROM `%s.venues_transform` vt
- LEFT JOIN `%s.checkins_transform` ct
- ON vt.id = ct.venue_id
- LIMIT 100" dataset dataset)}}
- "venues_transform_2" dataset)]
- (is (= #{{:table table1} {:transform t2}}
- (transform-deps-for-db (t2/select-one :model/Transform t3))))
- (is (= {t1 #{}
- t2 #{}
- t3 #{t1 t2}}
- (ordering/transform-ordering (t2/select :model/Transform :id [:in [t1 t2 t3]])))))))))
-
-(deftest ^:parallel basic-dependencies-test
- (mt/with-temp [:model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders)}})]
- (is (= #{{:table (mt/id :orders)}}
- (transform-deps-for-db (t2/select-one :model/Transform :id t1))))))
-
-(deftest ^:parallel joined-dependencies-test
- (mt/test-drivers (mt/normal-drivers-with-feature :left-join)
- (mt/with-temp [:model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders),
- :joins
- [{:fields "all",
- :strategy "left-join",
- :alias "Products",
- :condition
- [:=
- [:field
- (mt/id :orders :product_id)
- {:base-type "type/Integer"}]
- [:field
- (mt/id :products :id)
- {:base-type "type/Integer",
- :join-alias "Products"}]],
- :source-table (mt/id :products)}]},
- :parameters []})]
- (is (= #{{:table (mt/id :orders)}
- {:table (mt/id :products)}}
- (transform-deps-for-db (t2/select-one :model/Transform :id t1)))))))
-
-(deftest card-dependencies-test
- (mt/test-drivers (mt/normal-driver-select {:+features [:transforms/table :left-join]})
- (mt/with-temp [:model/Card {card :id} {:dataset_query {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders),
- :joins
- [{:fields "all",
- :strategy "left-join",
- :alias "Products",
- :condition
- [:=
- [:field
- (mt/id :orders :product_id)
- {:base-type "type/Integer"}]
- [:field
- (mt/id :products :id)
- {:base-type "type/Integer",
- :join-alias "Products"}]],
- :source-table (mt/id :products)}]},
- :parameters []}}
- :model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query
- {:aggregation [["count"]],
- :breakout [["field" "Products__category" {:base-type "type/Text"}]],
- :source-table (str "card__" card)},
- :parameters []})]
- (is (= #{{:table (mt/id :orders)}
- {:table (mt/id :products)}}
- (transform-deps-for-db (t2/select-one :model/Transform :id t1)))))))
-
-(deftest native-dependencies-test
- (mt/with-temp [:model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type :native
- :native (qp.compile/compile
- {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders)}})})]
- (is (= #{{:table (mt/id :orders)}}
- (transform-deps-for-db (t2/select-one :model/Transform :id t1))))))
-
-(deftest native-card-dependencies-test
- (mt/test-drivers (mt/normal-driver-select {:+features [:transforms/table
- :native-parameter-card-reference
- :left-join]})
- (mt/with-temp [:model/Card {card :id} {:dataset_query {:database (mt/id),
- :type "query",
- :query {:source-table (mt/id :orders),
- :joins
- [{:fields "all",
- :strategy "left-join",
- :alias "Products",
- :condition
- [:=
- [:field
- (mt/id :orders :product_id)
- {:base-type "type/Integer"}]
- [:field
- (mt/id :products :id)
- {:base-type "type/Integer",
- :join-alias "Products"}]],
- :source-table (mt/id :products)}]},
- :parameters []}}
- :model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type :native,
- :native {:query
- (mt/native-query-with-card-template-tag
- (:engine (mt/db))
- (str "#" card)),
- :template-tags
- {(keyword (str "#" card))
- {:type "card"
- :name "card"
- :display-name "card"
- :card-id card}}}})]
- (is (= #{{:table (mt/id :orders)}
- {:table (mt/id :products)}}
- (transform-deps-for-db (t2/select-one :model/Transform :id t1)))))))
-
-(defn- rotations
- [v]
- (let [n (count v)
- elements (cycle v)]
- (into #{} (map #(take n (drop % elements)))
- (range n))))
-
-(deftest find-cycle-test
- (let [test-graph
- {1 #{2}
- 2 #{3 5}
- 3 #{4}
- 4 #{6}
- 5 #{6}
- 6 #{7}
- 7 #{3}}
- cycles (rotations [3 4 6 7])]
- (is (contains? cycles
- (ordering/find-cycle test-graph)))))
-
-(deftest get-transform-cycle-test
- (testing "cycle is detected in transform referencing itself"
- (mt/with-temp [:model/Table {table1 :id} {:schema (default-schema-or-public)
- :name "table_1"}
- :model/Field _ {:table_id table1
- :name "foo"}
- :model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table table1}}
- "table_1")]
- (is (= {:cycle-str "transform_table_1"
- :cycle [t1]}
- (ordering/get-transform-cycle (t2/select-one :model/Transform :id t1))))))
- (testing "cycle is caught in 2 transforms referencing each other"
- (mt/with-temp [:model/Table {table1 :id} {:schema (default-schema-or-public), :name "table_1"}
- :model/Field _ {:table_id table1
- :name "foo"}
- :model/Table {table2 :id} {:schema (default-schema-or-public), :name "table_2"}
- :model/Field _ {:table_id table2
- :name "foo"}
- :model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table table1}}
- "table_2")
- :model/Transform {t2 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table table2}}
- "table_1")]
- (is (= {:cycle-str "transform_table_2 -> transform_table_1",
- :cycle [t1 t2]}
- (ordering/get-transform-cycle (t2/select-one :model/Transform :id t1))))))
- (testing "cycle is detected in 3 transforms referencing each other"
- (mt/with-temp [:model/Table {table1 :id} {:schema (default-schema-or-public)
- :name "table_1"}
- :model/Field _ {:table_id table1
- :name "foo"}
- :model/Table {table2 :id} {:schema (default-schema-or-public)
- :name "table_2"}
- :model/Field _ {:table_id table2
- :name "foo"}
- :model/Table {table3 :id} {:schema (default-schema-or-public)
- :name "table_3"}
- :model/Field _ {:table_id table3
- :name "foo"}
- :model/Transform {t1 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table table1}}
- "table_2")
- :model/Transform {t2 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table table2}}
- "table_3")
- :model/Transform {t3 :id} (make-transform
- {:database (mt/id),
- :type "query",
- :query {:source-table table3}}
- "table_1")]
- (is (= {:cycle-str "transform_table_2 -> transform_table_1 -> transform_table_3",
- :cycle [t1 t3 t2]}
- (ordering/get-transform-cycle (t2/select-one :model/Transform :id t1)))))))
-
(defn- make-python-transform
"Create a python transform definition with the given source-tables and target name."
[source-tables target-name & [target-schema]]
- (let [schema (or target-schema (default-schema-or-public (:engine (mt/db))))]
+ (let [default-schema "public"
+ schema (or target-schema default-schema)]
{:source {:type "python"
:source-database (mt/id)
:source-tables source-tables
@@ -375,50 +23,48 @@
(deftest python-transform-table-ref-ordering-test
(testing "Python transform with name-based source table ref resolves to producing transform"
- (let [default-schema (default-schema-or-public)]
- (mt/with-temp [;; Transform A produces table "intermediate_output"
- :model/Transform {t-a :id} (make-python-transform
- {"input" (mt/id :orders)}
- "intermediate_output")
- ;; Transform B references intermediate_output by name (table doesn't exist yet)
- :model/Transform {t-b :id} (make-python-transform
- {"source" {:database_id (mt/id)
- :schema default-schema
- :table "intermediate_output"}}
- "final_output")]
- (testing "table-dependencies returns table-ref for unresolved name reference"
- (let [deps (transforms.i/table-dependencies (t2/select-one :model/Transform :id t-b))]
- (is (contains? deps {:table-ref {:database_id (mt/id)
- :schema default-schema
- :table "intermediate_output"}}))))
-
- (testing "transform-ordering correctly resolves the dependency"
- (is (= {t-a #{}
- t-b #{t-a}}
- (ordering/transform-ordering (t2/select :model/Transform :id [:in [t-a t-b]])))))))))
+ (mt/with-temp [;; Transform A produces table "intermediate_output"
+ :model/Transform {t-a :id} (make-python-transform
+ {"input" (mt/id :orders)}
+ "intermediate_output")
+ ;; Transform B references intermediate_output by name (table doesn't exist yet)
+ :model/Transform {t-b :id} (make-python-transform
+ {"source" {:database_id (mt/id)
+ :schema "public"
+ :table "intermediate_output"}}
+ "final_output")]
+ (testing "table-dependencies returns table-ref for unresolved name reference"
+ (let [deps (transforms.i/table-dependencies (t2/select-one :model/Transform :id t-b))]
+ (is (contains? deps {:table-ref {:database_id (mt/id)
+ :schema "public"
+ :table "intermediate_output"}}))))
+
+ (testing "transform-ordering correctly resolves the dependency"
+ (is (= {t-a #{}
+ t-b #{t-a}}
+ (ordering/transform-ordering (t2/select :model/Transform :id [:in [t-a t-b]]))))))))
(deftest python-transform-mixed-source-tables-test
(testing "Python transform with mixed int and name-based refs"
- (let [default-schema (default-schema-or-public)]
- (mt/with-temp [:model/Transform {t-a :id} (make-python-transform
- {"input" (mt/id :orders)}
- "output_a")
- :model/Transform {t-b :id} (make-python-transform
- {;; Direct table reference (existing table)
- "existing" (mt/id :products)
- ;; Name-based reference (table doesn't exist yet)
- "from_transform" {:database_id (mt/id)
- :schema default-schema
- :table "output_a"}}
- "output_b")]
- (testing "table-dependencies includes both types"
- (let [deps (transforms.i/table-dependencies (t2/select-one :model/Transform :id t-b))]
- (is (contains? deps {:table (mt/id :products)}))
- (is (contains? deps {:table-ref {:database_id (mt/id)
- :schema default-schema
- :table "output_a"}}))))
-
- (testing "transform-ordering resolves both dependencies"
- (is (= {t-a #{}
- t-b #{t-a}}
- (ordering/transform-ordering (t2/select :model/Transform :id [:in [t-a t-b]])))))))))
+ (mt/with-temp [:model/Transform {t-a :id} (make-python-transform
+ {"input" (mt/id :orders)}
+ "output_a")
+ :model/Transform {t-b :id} (make-python-transform
+ {;; Direct table reference (existing table)
+ "existing" (mt/id :products)
+ ;; Name-based reference (table doesn't exist yet)
+ "from_transform" {:database_id (mt/id)
+ :schema "public"
+ :table "output_a"}}
+ "output_b")]
+ (testing "table-dependencies includes both types"
+ (let [deps (transforms.i/table-dependencies (t2/select-one :model/Transform :id t-b))]
+ (is (contains? deps {:table (mt/id :products)}))
+ (is (contains? deps {:table-ref {:database_id (mt/id)
+ :schema "public"
+ :table "output_a"}}))))
+
+ (testing "transform-ordering resolves both dependencies"
+ (is (= {t-a #{}
+ t-b #{t-a}}
+ (ordering/transform-ordering (t2/select :model/Transform :id [:in [t-a t-b]]))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/search_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/search_test.clj
index 53771da7a05..c1d4b4600cf 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/search_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/search_test.clj
@@ -1,81 +1,18 @@
(ns metabase-enterprise.transforms.search-test
(:require
- [clojure.test :refer :all]
+ [clojure.test :refer [deftest testing is]]
[java-time.api :as t]
[metabase.app-db.core :as mdb]
- [metabase.lib.core :as lib]
- [metabase.search.appdb.index :as search.index]
- [metabase.search.engine :as search.engine]
- [metabase.search.ingestion :as search.ingestion]
[metabase.search.test-util :as search.tu]
[metabase.test :as mt]
- [metabase.test.fixtures :as fixtures]
- [toucan2.core :as t2])
+ [metabase.transforms.search-test :as search-test])
(:import
(org.postgresql.util PGobject)))
(set! *warn-on-reflection* true)
-(use-fixtures :once (fixtures/initialize :db :test-users))
-
-(defn- ingest!
- [model where-clause]
- (#'search.engine/update!
- :search.engine/appdb
- (#'search.ingestion/query->documents
- (#'search.ingestion/spec-index-reducible model where-clause))))
-
-(defn- fetch-one [model & clauses]
- (apply t2/select-one (search.index/active-table) :model model clauses))
-
-(defn- ingest-then-fetch!
- [model entity-name]
- (ingest! model [:= :this.name entity-name])
- (fetch-one model :name entity-name))
-
-(def ^:private default-index-entity
- {:model nil
- :model_id nil
- :name nil
- :official_collection nil
- :database_id nil
- :pinned nil
- :view_count nil
- :collection_id nil
- :last_viewed_at nil
- :model_created_at nil
- :model_updated_at nil
- :dashboardcard_count nil
- :last_edited_at nil
- :last_editor_id nil
- :verified nil})
-
-(defn- index-entity
- [entity]
- (merge default-index-entity entity))
-
(deftest transform-ingestion-test
(search.tu/with-temp-index-table
- (testing "A simple SQL transform gets properly ingested & indexed for search"
- (let [now (t/truncate-to (t/offset-date-time) :millis)]
- (mt/with-temp [:model/Transform {transform-id :id} {:name "Test transform"
- :description "A test transform"
- :source {:type "query"
- :query (mt/native-query {:query "SELECT 1"})}
- :target {:database (mt/id)
- :table "test_table"}
- :created_at now
- :updated_at now}]
- (let [ingested-transform (ingest-then-fetch! "transform" "Test transform")]
- (is (=? (index-entity
- {:model "transform"
- :model_id (str transform-id)
- :name "Test transform"
- :database_id (mt/id)
- :model_created_at now
- :model_updated_at now})
- ingested-transform))))))
-
(testing "A simple Python transform gets properly ingested & indexed for search"
(let [now (t/truncate-to (t/offset-date-time) :millis)]
(mt/with-temp [:model/Transform {transform-id :id} {:name "Test Python transform"
@@ -86,121 +23,26 @@
:target {:database (mt/id)}
:created_at now
:updated_at now}]
- (let [ingested-transform (ingest-then-fetch! "transform" "Test Python transform")]
- (is (=? (index-entity
+ (let [ingested-transform (search-test/ingest-then-fetch! "transform" "Test Python transform")]
+ (is (=? (search-test/index-entity
{:model "transform"
:model_id (str transform-id)
:name "Test Python transform"
:database_id (mt/id)
:model_created_at now
:model_updated_at now})
- ingested-transform))))))
-
- (testing "A simple MBQL transform gets properly ingested & indexed for search"
- (let [now (t/truncate-to (t/offset-date-time) :millis)]
- (mt/with-temp [:model/Transform {transform-id :id} {:name "Test MBQL transform"
- :description "An MBQL test transform"
- :source {:type "query"
- :query (mt/mbql-query venues {:limit 10})}
- :target {:database (mt/id)
- :table "test_mbql_table"}
- :created_at now
- :updated_at now}]
- (let [ingested-transform (ingest-then-fetch! "transform" "Test MBQL transform")]
- (is (=? (index-entity
- {:model "transform"
- :model_id (str transform-id)
- :name "Test MBQL transform"
- :database_id (mt/id)
- :model_created_at now
- :model_updated_at now})
ingested-transform))))))))
(deftest transform-query-ingestion-test
- (testing "Contents of SQL and Python transform sources are extracted and indexed for full-text search"
+ (testing "Contents of Python transform sources are extracted and indexed for full-text search"
(when (= (mdb/db-type) :postgres)
- (mt/with-temp [:model/Transform _ {:target {:database (mt/id)
- :table "test_table"}
- :name "Test SQL transform"
- :source {:type "query"
- :query (lib/native-query (mt/metadata-provider) "SELECT 1")}}]
- (let [ingested-transform (ingest-then-fetch! "transform" "Test SQL transform")
- vector-value (.getValue ^PGobject (:with_native_query_vector ingested-transform))]
- (is (string? vector-value))
- (is (re-find #"select" vector-value))
- (is (re-find #"sql" vector-value))))
-
(mt/with-temp [:model/Transform _ {:target {:database (mt/id)}
:source {:type "python"
:source-database (mt/id)
:body "import pandas as pd\n"}
:name "Test python transform"}]
- (let [ingested-transform (ingest-then-fetch! "transform" "Test python transform")
+ (let [ingested-transform (search-test/ingest-then-fetch! "transform" "Test python transform")
vector-value (.getValue ^PGobject (:with_native_query_vector ingested-transform))]
(is (string? vector-value))
(is (re-find #"import" vector-value))
- (is (re-find #"panda" vector-value))))
-
- (testing "MBQL queries are not indexed in with_native_query_vector"
- (mt/with-temp [:model/Transform _ {:target {:database (mt/id)
- :table "test_mbql_table"}
- :name "Test MBQL transform"
- :source {:type "query"
- :query (mt/mbql-query venues {:limit 10})}}]
- (let [ingested-transform (ingest-then-fetch! "transform" "Test MBQL transform")
- vector-value (.getValue ^PGobject (:with_native_query_vector ingested-transform))]
- (is (string? vector-value))
- (is (re-find #"test" vector-value))
- (is (re-find #"mbql" vector-value))
- ;; Ensure that the actual MQBL query isn't indexed
- (is (not (re-find #"source" vector-value)))
- (is (not (re-find #"table" vector-value)))))))))
-
-(deftest transform-deletion-test
- (search.tu/with-temp-index-table
- (testing "Transform is removed from search index when deleted"
- (binding [search.ingestion/*force-sync* true]
- (mt/with-temp [:model/Transform {transform-id :id} {:name "Transform to delete"}]
- (ingest! "transform" [:= :this.id transform-id])
- (is (some? (fetch-one "transform" :model_id (str transform-id)))
- "Transform should be in the search index after ingestion")
- (t2/delete! :model/Transform :id transform-id)
- (is (nil? (fetch-one "transform" :model_id (str transform-id)))
- "Transform should be removed from the search index after deletion"))))))
-
-(deftest transform-search-test
- (mt/with-premium-features #{:transforms}
- (search.tu/with-temp-index-table
- (mt/as-admin
- (testing "Transforms can be indexed and subsequently searched for"
- (binding [search.ingestion/*force-sync* true]
- (mt/with-temp [:model/Transform {transform-id :id}
- {:name "Customer Revenue Analysis"
- :description "Analyzes revenue by customer segment"
- :source {:type "query"
- :query (mt/native-query {:query "SELECT customer_id, SUM(revenue) FROM orders GROUP BY customer_id"})}
- :target {:database (mt/id)
- :table "customer_revenue"}}]
- (ingest! "transform" [:= :this.id transform-id])
- (testing "Can search by transform name"
- (let [results (search.tu/search-results "Customer Revenue")]
- (is (seq results) "Search should return results")
- (is (some #(and (= "transform" (:model %))
- (= transform-id (:id %)))
- results)
- "Results should include the transform")))
- (testing "Can search by transform description"
- (let [results (search.tu/search-results "customer segment")]
- (is (some #(and (= "transform" (:model %))
- (= transform-id (:id %)))
- results)
- "Should find transform by description text")))
- (testing "Can filter search results to transforms only"
- (mt/with-temp [:model/Card _ {:name "Customer Revenue Card"
- :database_id (mt/id)
- :table_id (mt/id :orders)
- :dataset_query (mt/native-query {:query "SELECT 1"})}]
- (ingest! "card" [:like :this.name "%Customer Revenue%"])
- (let [transform-only-results (search.tu/search-results "Customer Revenue" {:models #{"transform"}})]
- (is (every? #(= "transform" (:model %)) transform-only-results)
- "All results should be transforms when filtered")))))))))))
+ (is (re-find #"panda" vector-value)))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj
index 2baab485aca..dde770706d3 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/util_test.clj
@@ -1,69 +1,23 @@
-(ns ^:mb/driver-tests metabase-enterprise.transforms.util-test
- "Tests for transform utility functions."
+(ns metabase-enterprise.transforms.util-test
(:require
- [clojure.test :refer :all]
- [metabase-enterprise.transforms.util :as transforms.util]
- [metabase.api.common :as api]
- [metabase.driver :as driver]
+ [clojure.test :refer [deftest testing is]]
[metabase.driver.util :as driver.u]
- [metabase.permissions.models.data-permissions :as data-perms]
- [metabase.permissions.models.permissions-group :as perms-group]
[metabase.test :as mt]
- [metabase.test.data.sql :as sql.tx]))
+ [metabase.transforms.util :as transforms.util]))
(set! *warn-on-reflection* true)
-(deftest temp-table-name-test
- (testing "temp-table-name generates valid table names respecting driver limits"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (let [driver driver/*driver*]
-
- (testing "Basic table name generation"
- (let [result (driver.u/temp-table-name driver nil)
- table-name (name result)]
- (is (keyword? result))
- (is (nil? (namespace result)))
- (is (re-matches #"mb_transform_temp_table_[a-f0-9]{8}" table-name))))
-
- (testing "Table name preserves namespace when present"
- (let [result (driver.u/temp-table-name driver :schema/orders)]
- (is (= "schema" (namespace result)))
- (is (re-matches #"mb_transform_temp_table_[a-f0-9]{8}" (name result)))))))))
-
-(deftest temp-table-name-creates-table-test
- (testing "temp-table-name produces names that can actually create tables"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/python)
- (let [driver driver/*driver*
- db-id (mt/id)
-
- table-name (driver.u/temp-table-name driver :test_table)
- schema-name (when (get-method sql.tx/session-schema driver)
- (sql.tx/session-schema driver))
- qualified-table-name (if schema-name
- (keyword schema-name (name table-name))
- table-name)
- column-definitions {"id" (driver/type->database-type driver :type/Integer)}]
- (mt/as-admin
- (try
- (testing "Can create table with generated temp name"
- (driver/create-table! driver db-id qualified-table-name column-definitions {})
- (when-not (= driver :mongo) ;; mongo doesn't actually create tables
- (is (driver/table-exists? driver (mt/db) {:schema schema-name :name (name table-name)}))))
- (finally
- (try
- (driver/drop-table! driver db-id qualified-table-name)
- (catch Exception _e
- ;; Ignore cleanup errors
- nil)))))))))
-
-(deftest is-temp-transform-tables-test
+(deftest is-temp-transform-tables-ee-test
(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 #{}
+ (mt/with-premium-features #{:hosting}
(is (false? (transforms.util/is-temp-transform-table? table-with-schema)))
(is (false? (transforms.util/is-temp-transform-table? table-without-schema))))
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{}
+ (is (transforms.util/is-temp-transform-table? table-without-schema))
+ (is (transforms.util/is-temp-transform-table? table-with-schema)))
+ (mt/with-premium-features #{:hosting :transforms}
(is (transforms.util/is-temp-transform-table? table-without-schema))
(is (transforms.util/is-temp-transform-table? table-with-schema)))))
@@ -71,256 +25,3 @@
(mt/with-premium-features #{:transforms}
(is (false? (transforms.util/is-temp-transform-table? {:name :orders})))
(is (false? (transforms.util/is-temp-transform-table? {:name :public/orders}))))))
-
-(deftest create-table-from-schema!-test
- (testing "create-table-from-schema! preserves column order from schema definition"
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (let [driver driver/*driver*
- db-id (mt/id)
- schema-name (when (get-method sql.tx/session-schema driver)
- (sql.tx/session-schema driver))
- table-name (keyword "test_column_order")
- qualified-table-name (if schema-name
- (keyword schema-name (name table-name))
- table-name)
- table-schema {:name qualified-table-name
- :columns [{:name "zebra_col" :type :type/Text}
- {:name "apple_col" :type :type/Integer}
- {:name "mango_col" :type :type/Boolean}]}]
- (mt/as-admin
- (try
- (testing "Creating table with ordered columns"
- (transforms.util/create-table-from-schema! driver db-id table-schema)
- (is (driver/table-exists? driver (mt/db) {:schema schema-name :name (name table-name)})))
-
- (when (get-method driver/describe-table driver)
- (testing "Column order matches schema definition order (not alphabetical)"
- (let [table-metadata {:schema schema-name :name (name table-name)}
- described-fields (:fields (driver/describe-table driver (mt/db) table-metadata))
- sorted-fields (sort-by :database-position described-fields)
- column-names (mapv :name sorted-fields)
- expected-names ["zebra_col" "apple_col" "mango_col"]]
- (is (= expected-names column-names)
- (str "Expected column order " expected-names
- " but got " column-names)))))
-
- (finally
- (try
- (driver/drop-table! driver db-id qualified-table-name)
- (catch Exception _e
- ;; Ignore cleanup errors
- nil)))))))))
-
-;;; ------------------------------------------------------------
-;;; Filter xf tests
-;;; ------------------------------------------------------------
-
-(deftest ^:parallel matching-timestamp?-test
- (testing "matching-timestamp? checks if a timestamp falls within a date range [start, end)"
- (let [matching-timestamp? #'transforms.util/matching-timestamp?
- field-path [:start_time]
- range-jan-feb {:start "2024-01-01T00:00:00Z" :end "2024-02-01T00:00:00Z"}
- range-start-only {:start "2024-01-01T00:00:00Z" :end nil}
- range-end-only {:start nil :end "2024-02-01T00:00:00Z"}]
-
- (testing "with both start and end bounds"
- (are [expected timestamp]
- (= expected (matching-timestamp? {:start_time timestamp} field-path range-jan-feb))
- nil nil ; missing field returns nil
- true "2024-01-15T12:00:00Z" ; timestamp in middle of range
- false "2023-12-15T12:00:00Z" ; timestamp before range
- false "2024-02-15T12:00:00Z" ; timestamp after range
- true "2024-01-01T00:00:00Z" ; start boundary is inclusive
- true "2024-02-01T00:00:00Z")) ; end boundary is inclusive too 🤷
-
- (testing "with only start bound"
- (are [expected timestamp]
- (= expected (matching-timestamp? {:start_time timestamp} field-path range-start-only))
- true "2024-01-15T12:00:00Z" ; timestamp after start
- true "2024-02-15T12:00:00Z" ; any timestamp after start
- false "2023-12-15T12:00:00Z")) ; timestamp before start
-
- (testing "with only end bound"
- (are [expected timestamp]
- (= expected (matching-timestamp? {:start_time timestamp} field-path range-end-only))
- true "2024-01-15T12:00:00Z" ; timestamp before end
- true "2023-12-15T12:00:00Z" ; any timestamp before end
- false "2024-02-15T12:00:00Z")) ; timestamp after end
-
- (testing "returns nil when field value is missing"
- (are [job] (nil? (matching-timestamp? job field-path range-jan-feb))
- {}
- {:other "value"})))))
-
-;;; ------------------------------------------------- Source Table Resolution Tests ----------------------------------
-
-(deftest batch-lookup-table-ids-test
- (testing "batch-lookup-table-ids looks up table IDs from ref maps"
- (mt/with-temp [:model/Database db {}
- :model/Table t1 {:db_id (:id db) :name "table_one" :schema nil}
- :model/Table t2 {:db_id (:id db) :name "table_two" :schema "my_schema"}]
- (testing "returns nil for empty input"
- (is (nil? (transforms.util/batch-lookup-table-ids [])))
- (is (nil? (transforms.util/batch-lookup-table-ids nil))))
-
- (testing "looks up table without schema"
- (let [refs [{:database_id (:id db) :schema nil :table "table_one"}]
- result (transforms.util/batch-lookup-table-ids refs)]
- (is (= {[(:id db) nil "table_one"] (:id t1)} result))))
-
- (testing "looks up table with schema"
- (let [refs [{:database_id (:id db) :schema "my_schema" :table "table_two"}]
- result (transforms.util/batch-lookup-table-ids refs)]
- (is (= {[(:id db) "my_schema" "table_two"] (:id t2)} result))))
-
- (testing "handles mixed refs with and without schema"
- (let [refs [{:database_id (:id db) :schema nil :table "table_one"}
- {:database_id (:id db) :schema "my_schema" :table "table_two"}]
- result (transforms.util/batch-lookup-table-ids refs)]
- (is (= {[(:id db) nil "table_one"] (:id t1)
- [(:id db) "my_schema" "table_two"] (:id t2)}
- result))))
-
- (testing "returns empty for non-existent table"
- (let [refs [{:database_id (:id db) :schema nil :table "nonexistent"}]
- result (transforms.util/batch-lookup-table-ids refs)]
- (is (= {} result)))))))
-
-(deftest normalize-source-tables-test
- (testing "normalize-source-tables converts all entries to map format"
- (mt/with-temp [:model/Database db {}
- :model/Table t1 {:db_id (:id db) :name "existing_table" :schema nil}]
- (testing "converts integer table ID to map format"
- (let [result (transforms.util/normalize-source-tables {"t" (:id t1)})]
- (is (map? (get result "t")))
- (is (= (:id db) (get-in result ["t" :database_id])))
- (is (= "existing_table" (get-in result ["t" :table])))
- (is (= (:id t1) (get-in result ["t" :table_id])))))
-
- (testing "throws for non-existent integer table ID"
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Tables not found for ids: 999999"
- (transforms.util/normalize-source-tables {"t" 999999}))))
-
- (testing "populates table_id for existing table"
- (let [source-tables {"t" {:database_id (:id db) :schema nil :table "existing_table"}}
- result (transforms.util/normalize-source-tables source-tables)]
- (is (= (:id t1) (get-in result ["t" :table_id])))))
-
- (testing "preserves existing table_id"
- (let [source-tables {"t" {:database_id (:id db) :schema nil :table "existing_table" :table_id 999}}
- result (transforms.util/normalize-source-tables source-tables)]
- (is (= 999 (get-in result ["t" :table_id])))))
-
- (testing "leaves table_id nil for non-existent table ref"
- (let [source-tables {"t" {:database_id (:id db) :schema nil :table "nonexistent"}}
- result (transforms.util/normalize-source-tables source-tables)]
- (is (nil? (get-in result ["t" :table_id])))))
-
- (testing "handles mixed int and map entries"
- (let [source-tables {"t1" (:id t1)
- "t2" {:database_id (:id db) :schema nil :table "existing_table"}}
- result (transforms.util/normalize-source-tables source-tables)]
- (is (map? (get result "t1")))
- (is (= (:id t1) (get-in result ["t1" :table_id])))
- (is (= (:id t1) (get-in result ["t2" :table_id]))))))))
-
-(deftest resolve-source-tables-test
- (testing "resolve-source-tables returns {alias -> table_id} map"
- (mt/with-temp [:model/Database db {}
- :model/Table t1 {:db_id (:id db) :name "table_one" :schema nil}
- :model/Table t2 {:db_id (:id db) :name "table_two" :schema nil}]
- (testing "passes through integer entries (old format)"
- (is (= {"t" 123} (transforms.util/resolve-source-tables {"t" 123}))))
-
- (testing "resolves map with table_id"
- (let [source-tables {"t" {:database_id (:id db) :schema nil :table "table_one" :table_id (:id t1)}}]
- (is (= {"t" (:id t1)} (transforms.util/resolve-source-tables source-tables)))))
-
- (testing "looks up table_id for map without it"
- (let [source-tables {"t" {:database_id (:id db) :schema nil :table "table_one"}}]
- (is (= {"t" (:id t1)} (transforms.util/resolve-source-tables source-tables)))))
-
- (testing "throws for non-existent table"
- (let [source-tables {"t" {:database_id (:id db) :schema nil :table "nonexistent"}}]
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Tables not found: nonexistent"
- (transforms.util/resolve-source-tables source-tables)))))
-
- (testing "throws with schema in error message"
- (let [source-tables {"t" {:database_id (:id db) :schema "my_schema" :table "nonexistent"}}]
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Tables not found: my_schema\.nonexistent"
- (transforms.util/resolve-source-tables source-tables)))))
-
- (testing "handles mixed entries (old and new format)"
- (let [source-tables {"t1" (:id t1)
- "t2" {:database_id (:id db) :schema nil :table "table_two"}}]
- (is (= {"t1" (:id t1) "t2" (:id t2)}
- (transforms.util/resolve-source-tables source-tables))))))))
-
-(deftest source-tables-readable?-test
- (testing "source-tables-readable? function"
- (mt/with-premium-features #{:transforms :transforms-python}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-temp [:model/Database {db-id :id} {:engine driver/*driver*}
- :model/Table {table-id :id} {:db_id db-id :name "test_table"}]
- (binding [api/*current-user-id* (mt/user->id :lucky)]
- (mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/view-data :unrestricted
- (testing "returns true for query transform when user can read database"
- (let [transform {:source {:type :query
- :query {:database db-id}}}]
- (is (true? (transforms.util/source-tables-readable? transform)))))
-
- (testing "returns true for python transform when user can read all source tables"
- (let [transform {:source {:type :python
- :source-tables {"t1" table-id}}}]
- (is (true? (transforms.util/source-tables-readable? transform)))))
-
- (testing "handles source tables with table_id in map format"
- (let [transform {:source {:type :python
- :source-tables {"t1" {:table_id table-id}}}}]
- (is (true? (transforms.util/source-tables-readable? transform))))))))))))
-
-(deftest source-tables-readable-permissions-test
- (testing "source-tables-readable? with various permission levels"
- (mt/with-premium-features #{:transforms :transforms-python}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/with-temp [:model/Database {db-id :id} {:engine driver/*driver*}
- :model/Table {table1-id :id} {:db_id db-id :name "test_table_1"}
- :model/Table {table2-id :id} {:db_id db-id :name "test_table_2"}]
-
- (testing "Query transforms - blocked database access"
- (let [transform {:source {:type :query
- :query {:database db-id}}}]
- (mt/with-user-in-groups [group {:name "Blocked Group"}
- user [group]]
- (mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/view-data :blocked
- (mt/with-db-perm-for-group! group db-id :perms/view-data :blocked
- (binding [api/*current-user-id* (:id user)]
- (is (false? (transforms.util/source-tables-readable? transform))
- "User with blocked database access should not be able to read source database")))))))
-
- (testing "Python transforms - blocked database access"
- (let [transform {:source {:type :python
- :source-tables {"t1" table1-id}}}]
- (mt/with-user-in-groups [group {:name "Blocked Group"}
- user [group]]
- (mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/view-data :blocked
- (mt/with-db-perm-for-group! group db-id :perms/view-data :blocked
- (binding [api/*current-user-id* (:id user)]
- (is (false? (transforms.util/source-tables-readable? transform))
- "User with blocked database access should not be able to read source tables")))))))
-
- (testing "Python transforms - granular access but missing some tables"
- (let [transform {:source {:type :python
- :source-tables {"t1" table1-id
- "t2" table2-id}}}]
- (mt/with-user-in-groups [group {:name "Limited Granular Group"}
- user [group]]
- ;; Block all-users from viewing data at database level, then grant specific access via test group
- (mt/with-no-data-perms-for-all-users!
- (mt/with-db-perm-for-group! group db-id :perms/view-data :unrestricted
- (mt/with-db-perm-for-group! group db-id :perms/create-queries :query-builder-and-native
- ;; Block table2 for the test group only
- (data-perms/set-table-permission! (:id group) table2-id :perms/view-data :blocked)
- (binding [api/*current-user-id* (:id user)]
- (is (false? (transforms.util/source-tables-readable? transform))
- "User who cannot read all source tables should have source_readable=false")))))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/api_test.clj
index 9de230b578e..b700f8b94fb 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/api_test.clj
@@ -4,9 +4,9 @@
[clojure.string :as str]
[clojure.test :refer :all]
[metabase-enterprise.transforms-python.models.python-library :as python-library]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
[metabase.permissions.models.permissions-group :as perms-group]
[metabase.test :as mt]
+ [metabase.transforms.test-dataset :as transforms-dataset]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/drivers_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/drivers_test.clj
index dda16b6bb5f..a4a2c104fd6 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/drivers_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/drivers_test.clj
@@ -6,14 +6,14 @@
[metabase-enterprise.transforms-python.execute :as transforms-python.execute]
[metabase-enterprise.transforms-python.python-runner :as python-runner]
[metabase-enterprise.transforms-python.python-runner-test :as python-runner-test]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.driver :as driver]
[metabase.driver.mysql :as mysql]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
+ [metabase.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
[metabase.util.json :as json]
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 55a55151371..17eb49b1e3c 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/e2e_test.clj
@@ -3,11 +3,11 @@
(:require
[clojure.test :refer :all]
[metabase-enterprise.transforms-python.models.python-library :as python-library]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
[metabase.driver :as driver]
[metabase.test :as mt]
[metabase.test.util :as mt.util]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -47,7 +47,7 @@
:source-tables {}
:body transform-body}
:target (assoc target :database (mt/id))}
- {transform-id :id} (mt/user-http-request :crowberto :post 200 "ee/transform"
+ {transform-id :id} (mt/user-http-request :crowberto :post 200 "transform"
transform-payload)]
(transforms.tu/test-run transform-id)
(transforms.tu/wait-for-table table-name 5000)
@@ -77,7 +77,7 @@
"def transform():\n"
" return pd.DataFrame({'name': ['Alice', 'Bob'], 'age': [25, 30]})")}
:target (assoc target :database (mt/id))}
- {transform-id :id} (mt/user-http-request :crowberto :post 200 "ee/transform"
+ {transform-id :id} (mt/user-http-request :crowberto :post 200 "transform"
original)]
(transforms.tu/test-run transform-id)
(transforms.tu/wait-for-table table-name 5000)
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/execute_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/execute_test.clj
index 417413ef8fe..fd97387be84 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/execute_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/execute_test.clj
@@ -2,11 +2,11 @@
(:require
[clojure.test :refer :all]
[metabase-enterprise.transforms-python.execute :as transforms-python.execute]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.test :as mt]
[metabase.test.util :as test.util]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
+ [metabase.transforms.util :as transforms.util]
[toucan2.core :as t2])
(:import
(java.util.concurrent CountDownLatch)))
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 6bca42e7ddd..177bc41dee5 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
@@ -1,12 +1,16 @@
(ns ^:mb/driver-tests ^:mb/transforms-python-test metabase-enterprise.transforms-python.job-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.transforms.schedule :as transforms.schedule]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu]
+ ^{:clj-kondo/ignore [:discouraged-namespace]}
+ [clojure.tools.logging :as log]
[metabase.driver :as driver]
+ [metabase.models.transforms.transform-run :as transform-run]
[metabase.task.core :as task]
[metabase.test :as mt]
+ [metabase.transforms.jobs :as jobs]
+ [metabase.transforms.schedule :as transforms.schedule]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu]
[metabase.util :as u]
[toucan2.core :as t2]))
@@ -44,3 +48,25 @@
:done? true?
:timeout-ms 10000
:interval-ms 1000})))))))))))
+
+(def ^:private python-source {:type "python"})
+
+(deftest run-transform-feature-flag-test
+ (testing "Python transforms are skipped without :transforms-python feature"
+ (mt/with-premium-features #{:transforms}
+ (let [python-transform {:id 2
+ :source python-source
+ :name "Test Python Transform"}
+ run-id 101
+ logged-messages (atom [])]
+ (with-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 python-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 2 due to lacking premium features.*"
+ (:message (first @logged-messages)))
+ "Warning message should indicate transform was skipped due to missing features"))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/ordering_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/ordering_test.clj
index 6c8da98f71e..785d3639815 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/ordering_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/ordering_test.clj
@@ -1,10 +1,10 @@
(ns ^:mb/driver-tests ^:mb/transforms-python-test metabase-enterprise.transforms-python.ordering-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.ordering :as ordering]
- [metabase-enterprise.transforms.test-util :as transforms.tu]
[metabase.test :as mt]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.ordering :as ordering]
+ [metabase.transforms.test-util :as transforms.tu]
[toucan2.core :as t2]))
(defn- make-transform [query & [name schema]]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/python_runner_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/python_runner_test.clj
index c59cad69e80..5f6fe9d5d61 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/python_runner_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/python_runner_test.clj
@@ -8,7 +8,6 @@
[metabase-enterprise.transforms-python.python-runner :as python-runner]
[metabase-enterprise.transforms-python.s3 :as s3]
[metabase-enterprise.transforms-python.settings :as transforms-python.settings]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.sync.core :as sync]
@@ -16,6 +15,7 @@
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
[metabase.test.util :as tu]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.json :as json]
[toucan2.core :as t2]))
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 61fce049588..fdf9b6bfe99 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
@@ -5,11 +5,11 @@
[metabase-enterprise.transforms-python.execute :as transforms-python.execute]
[metabase-enterprise.transforms-python.init]
[metabase-enterprise.transforms-python.python-runner :as transforms-python.python-runner]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup! get-test-schema]]
[metabase.driver :as driver]
[metabase.permissions.models.permissions-group :as perms-group]
[metabase.test :as mt]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu :refer [with-transform-cleanup! get-test-schema]]
[metabase.util :as u]
[toucan2.core :as t2])
(:import
@@ -37,29 +37,29 @@
:schema schema
:name "gadget_products"
:database (mt/id)}}]
- (mt/user-http-request :lucky :post "ee/transform"
+ (mt/user-http-request :lucky :post "transform"
transform-payload)))]
(testing "without any feature flags"
(mt/with-premium-features #{}
(testing "creating python transform without any features fails"
- (is (= "error-premium-feature-not-available"
- (:status (mt/user-http-request :lucky :post 402 "ee/transform"
- {:name "My beautiful python runner"
- :source {:type "python"
- :body "print('hello world')"
- :source-tables {}
- :source-database (mt/id)}
- :target {:type "table"
- :schema (get-test-schema)
- :name "gadget_products"
- :database (mt/id)}})))))))
+ (is (= "Premium features required for this transform type are not enabled."
+ (mt/user-http-request :lucky :post 402 "transform"
+ {:name "My beautiful python runner"
+ :source {:type "python"
+ :body "print('hello world')"
+ :source-tables {}
+ :source-database (mt/id)}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name "gadget_products"
+ :database (mt/id)}}))))))
(testing "with only transforms feature flag (no transforms-python)"
(mt/with-premium-features #{:transforms}
(testing "creating python transform without transforms-python feature fails"
(is (= "Premium features required for this transform type are not enabled."
- (mt/user-http-request :lucky :post 402 "ee/transform"
+ (mt/user-http-request :lucky :post 402 "transform"
{:name "My beautiful python runner"
:source {:type "python"
:body "print('hello world')"
@@ -75,7 +75,7 @@
(with-transform-cleanup! [table-name "gadget_products"]
(let [transform (create-transform!)]
(is (= "print('hello chris')"
- (-> (mt/user-http-request :lucky :put 200 (format "ee/transform/%s" (:id transform))
+ (-> (mt/user-http-request :lucky :put 200 (format "transform/%s" (:id transform))
{:name "My beautiful python runner"
:source {:type "python"
:body "print('hello chris')"
@@ -88,7 +88,7 @@
:source :body)))))))))))))
(deftest update-python-transform-feature-flag-test
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms :transforms-python}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(testing "Updating a python transform requires both :transforms and :transforms-python features"
(mt/with-temp [:model/Transform {id :id
@@ -103,13 +103,13 @@
:database (mt/id)}}]
(mt/with-premium-features #{}
(let [response (mt/user-http-request :crowberto :put
- (format "ee/transform/%d" id)
+ (format "transform/%d" id)
(assoc-in transform [:source :body] "print('no features')"))]
- (is (= "error-premium-feature-not-available" (:status response))
+ (is (= "You don't have permissions to do that." response)
"Should return 403 without any features"))))))))
(deftest run-python-transform-feature-flag-test
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:transforms :transforms-python}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(testing "Running a python transform requires both :transforms and :transforms-python features"
(mt/with-premium-features #{:transforms :transforms-python}
@@ -125,15 +125,15 @@
:schema schema
:name table-name
:database (mt/id)}}
- created (mt/user-http-request :crowberto :post 200 "ee/transform" transform-payload)]
+ created (mt/user-http-request :crowberto :post 200 "transform" transform-payload)]
(mt/with-premium-features #{}
- (let [response (mt/user-http-request :crowberto :post 402
- (format "ee/transform/%d/run" (:id created)))]
- (is (= "error-premium-feature-not-available" (:status response)))))
+ (let [response (mt/user-http-request :crowberto :post 403
+ (format "transform/%d/run" (:id created)))]
+ (is (= "You don't have permissions to do that." response))))
(mt/with-premium-features #{:transforms}
(let [response (mt/user-http-request :crowberto :post
- (format "ee/transform/%d/run" (:id created)))]
- (is (= "Premium features required for this transform type are not enabled." response)
+ (format "transform/%d/run" (:id created)))]
+ (is (= "You don't have permissions to do that." response)
"Should return 403 without :transforms-python feature")))))))))))
(deftest execute-python-transform-test
@@ -154,7 +154,7 @@
"def transform():\n"
" return pd.DataFrame({'name': ['Alice', 'Bob'], 'age': [25, 30]})")}
:target (assoc target :database (mt/id))}
- {transform-id :id} (mt/user-http-request :crowberto :post 200 "ee/transform" original)]
+ {transform-id :id} (mt/user-http-request :crowberto :post 200 "transform" original)]
(transforms.tu/test-run transform-id)
(transforms.tu/wait-for-table table-name 10000)
(is (true? (driver/table-exists? driver/*driver* (mt/db) target)))
@@ -173,7 +173,7 @@
:else (recur (rest xs) ys)))
(defn- get-last-run [transform-id]
- (:last_run (mt/user-http-request :crowberto :get 200 (format "ee/transform/%d" transform-id))))
+ (:last_run (mt/user-http-request :crowberto :get 200 (format "transform/%d" transform-id))))
(defn- open-message-value-observer
"Polls the `:message` state of the last run and stores the value every time it is different to the last observation.
@@ -218,7 +218,7 @@
(create-transform [{:keys [program]} target]
{:post [(integer? %)]}
- (:id (mt/user-http-request :crowberto :post 200 "ee/transform"
+ (:id (mt/user-http-request :crowberto :post 200 "transform"
{:name "Python logging test"
:source {:type "python"
:body (program->source program)
@@ -318,7 +318,7 @@
(is (subsequence? (str/split-lines message) expected)))))))))))))))
(deftest get-python-transform-with-different-target-database-test
- (testing "GET /api/ee/transform/:id correctly fetches target table from different database"
+ (testing "GET /api/transform/:id correctly fetches target table from different database"
(mt/with-premium-features #{:transforms :transforms-python}
(mt/with-temp [:model/Database target-db {:engine :h2
:details {:db "mem:target-db"}}
@@ -335,7 +335,7 @@
:schema "PUBLIC"
:name "python_target_table"
:database (:id target-db)}}]
- (let [response (mt/user-http-request :crowberto :get 200 (format "ee/transform/%s" (:id transform)))]
+ (let [response (mt/user-http-request :crowberto :get 200 (format "transform/%s" (:id transform)))]
(is (=? {:id (:id target-table)
:name "python_target_table"
:schema "PUBLIC"
@@ -348,7 +348,7 @@
#_{:clj-kondo/ignore [:metabase/i-like-making-cams-eyes-bleed-with-horrifically-long-tests]} ; todo factor to maybe some private helpers or share test impl for multiple top-level tests
(deftest python-cancellation-test
(letfn [(create-transform [{:keys [desc program]} target]
- (mt/user-http-request :crowberto :post 200 "ee/transform"
+ (mt/user-http-request :crowberto :post 200 "transform"
{:name (format "Python cancellation test: %s" desc)
:source {:type "python"
:body (str/join "\n" program)
@@ -411,7 +411,7 @@
(fn []
(let [{transform-id :id} (create-transform scenario target)]
(with-open [message-observer (open-message-value-observer transform-id)]
- (let [_ (mt/user-http-request :crowberto :post 202 (format "ee/transform/%d/run" transform-id))
+ (let [_ (mt/user-http-request :crowberto :post 202 (format "transform/%d/run" transform-id))
;; Cancellation currently overwrites the message, so we should wait for some log output if we expect it
;; Ideally we would not use the message field for log output, or otherwise avoid having logs being lost on cancellation.
_ (when expect-script
@@ -421,7 +421,7 @@
:timeout-ms 5000}))
_ (when redefs (await-signal ready-signal))
_ (get-last-run transform-id)
- _ (mt/user-http-request :crowberto :post 204 (format "ee/transform/%d/cancel" transform-id))
+ _ (mt/user-http-request :crowberto :post 204 (format "transform/%d/cancel" transform-id))
_ (deliver wait-signal true)
_ (await-signal finished-signal)
last-run (get-last-run transform-id)]
@@ -533,7 +533,7 @@
" return pd.DataFrame({'name': ['Alice', 'Bob'], 'age': [25, 30]})")}
:target (assoc target :database (mt/id))}
;; Create initial transform via API
- {transform-id :id} (mt/user-http-request :crowberto :post 200 "ee/transform" initial-transform)]
+ {transform-id :id} (mt/user-http-request :crowberto :post 200 "transform" initial-transform)]
;; Run initial transform and validate
(transforms.tu/test-run transform-id)
@@ -550,7 +550,7 @@
"\n"
"def transform():\n"
" return pd.DataFrame({'name': ['Alice', 'Bob'], 'friend': ['Bob', 'Alice']})")})
- update-response (mt/user-http-request :crowberto :put 200 (format "ee/transform/%d" transform-id)
+ update-response (mt/user-http-request :crowberto :put 200 (format "transform/%d" transform-id)
updated-transform)]
(is (some? update-response) "Transform update should succeed"))
@@ -582,7 +582,7 @@
:source-database (mt/id)
:source-tables source-tables}
:target (assoc target :database (mt/id))}
- response (mt/user-http-request :crowberto :post 200 "ee/transform" transform-payload)]
+ response (mt/user-http-request :crowberto :post 200 "transform" transform-payload)]
(testing "Transform is created successfully"
(is (integer? (:id response)))
(is (= "python" (:source_type response))))
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj
index 7c0daa9660c..2d5c792ae65 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj
@@ -4,10 +4,6 @@
[clojure.test :refer :all]
[java-time.api :as t]
[medley.core :as m]
- [metabase-enterprise.transforms.api :as transforms.api]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
[metabase-enterprise.workspaces.common :as ws.common]
[metabase-enterprise.workspaces.impl :as ws.impl]
[metabase-enterprise.workspaces.isolation :as ws.isolation]
@@ -22,6 +18,10 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.query-processor.compile :as qp.compile]
[metabase.test :as mt]
+ [metabase.transforms.api.transform :as transforms.api]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu :refer [with-transform-cleanup!]]
[metabase.util :as u]
[toucan2.core :as t2]))
@@ -505,47 +505,48 @@
(is (not= :archived (:status ws-after))))))))))
(deftest merge-history-endpoint-test
- (testing "GET /api/ee/transform/:id/merge-history"
- (mt/with-temp [:model/Table _table {:schema "public" :name "merge_history_test_table"}
- :model/Transform x1 {:name "Transform for history"
- :description "Test transform"
- :target {:type "table"
- :database (mt/id)
- :schema "public"
- :name "merge_history_test_table"}}]
- (let [{ws-id :id ws-name :name} (mt/user-http-request :crowberto :post 200 "ee/workspace"
- {:name (mt/random-name)
- :database_id (mt/id)})
- {ws-tx-ref-id :ref_id} (mt/user-http-request :crowberto :post 200 (ws-url ws-id "/transform")
- (merge {:global_id (:id x1)}
- (select-keys x1 [:name :description :source :target])))
- commit-msg "Test merge for history endpoint"]
- ;; Modify and merge the transform
- (t2/update! :model/WorkspaceTransform {:workspace_id ws-id :ref_id ws-tx-ref-id} {:description "Modified for history test"})
- (mt/user-http-request :crowberto :post 200 (ws-url ws-id "/merge")
- {:commit-message commit-msg})
-
- (testing "returns merge history for a transform"
- ;; workspace_id is preserved since workspace is archived (not deleted) after merge
- (is (=? [{:id pos-int?
- :workspace_merge_id pos-int?
- :commit_message commit-msg
- :workspace_id ws-id
- :workspace_name ws-name
- :merging_user_id (mt/user->id :crowberto)
- :created_at some?}]
- (mt/user-http-request :crowberto :get 200
- (str "ee/transform/" (:id x1) "/merge-history")))))
-
- (testing "returns 404 for non-existent transform"
- (is (= "Not found."
- (mt/user-http-request :crowberto :get 404
- "ee/transform/999999/merge-history"))))
+ (mt/with-premium-features #{:transforms :transforms-python :workspaces}
+ (testing "GET /api/transform/:id/merge-history"
+ (mt/with-temp [:model/Table _table {:schema "public" :name "merge_history_test_table"}
+ :model/Transform x1 {:name "Transform for history"
+ :description "Test transform"
+ :target {:type "table"
+ :database (mt/id)
+ :schema "public"
+ :name "merge_history_test_table"}}]
+ (let [{ws-id :id ws-name :name} (mt/user-http-request :crowberto :post 200 "ee/workspace"
+ {:name (mt/random-name)
+ :database_id (mt/id)})
+ {ws-tx-ref-id :ref_id} (mt/user-http-request :crowberto :post 200 (ws-url ws-id "/transform")
+ (merge {:global_id (:id x1)}
+ (select-keys x1 [:name :description :source :target])))
+ commit-msg "Test merge for history endpoint"]
+ ;; Modify and merge the transform
+ (t2/update! :model/WorkspaceTransform {:workspace_id ws-id :ref_id ws-tx-ref-id} {:description "Modified for history test"})
+ (mt/user-http-request :crowberto :post 200 (ws-url ws-id "/merge")
+ {:commit-message commit-msg})
+
+ (testing "returns merge history for a transform"
+ ;; workspace_id is preserved since workspace is archived (not deleted) after merge
+ (is (=? [{:id pos-int?
+ :workspace_merge_id pos-int?
+ :commit_message commit-msg
+ :workspace_id ws-id
+ :workspace_name ws-name
+ :merging_user_id (mt/user->id :crowberto)
+ :created_at some?}]
+ (mt/user-http-request :crowberto :get 200
+ (str "transform/" (:id x1) "/merge-history")))))
+
+ (testing "returns 404 for non-existent transform"
+ (is (= "Not found."
+ (mt/user-http-request :crowberto :get 404
+ "transform/999999/merge-history"))))
- (testing "requires superuser"
- (is (= "You don't have permissions to do that."
- (mt/user-http-request :rasta :get 403
- (str "ee/transform/" (:id x1) "/merge-history")))))))))
+ (testing "requires superuser"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :get 403
+ (str "transform/" (:id x1) "/merge-history"))))))))))
(deftest merge-single-transform-failure-test
(mt/with-temp [:model/Table _table {:schema "public" :name "merge_test_table"}
@@ -1133,7 +1134,7 @@
(mt/user-http-request :crowberto :post 200 (ws-url (:id ws) "/transform") bad-transform))
ws (ws.tu/ws-done! (:id ws))]
(testing "returns failed status with error message and isolated table info"
- (let [result (mt/with-log-level [metabase-enterprise.transforms.query-impl :fatal]
+ (let [result (mt/with-log-level [metabase.transforms.query-impl :fatal]
(mt/user-http-request :crowberto :post 200 (ws-url (:id ws) "transform" ref-id "run")))]
(is (=? {:status "failed"
:message some?
@@ -1169,7 +1170,7 @@
ws (ws.tu/ws-done! (:id ws))]
(testing "returns failed status with error message mentioning the bad column"
- (let [result (mt/with-log-level [metabase-enterprise.transforms.query-impl :fatal]
+ (let [result (mt/with-log-level [metabase.transforms.query-impl :fatal]
(mt/user-http-request :crowberto :post 200 (ws-url (:id ws) "transform" ref-id "run")))]
(is (=? {:status "failed"
:message #"(?si).*nocolumn.*"
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
index 8e1100a6594..69f89d5e4be 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
@@ -2,12 +2,12 @@
(:require
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.transforms.test-util :as transforms.tu]
[metabase-enterprise.workspaces.common :as ws.common]
[metabase-enterprise.workspaces.impl :as ws.impl]
[metabase-enterprise.workspaces.test-util :as ws.tu]
[metabase.sync.core :as sync]
[metabase.test :as mt]
+ [metabase.transforms.test-util :as transforms.tu]
[metabase.util :as u]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/execute_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/execute_test.clj
index 3c634d16fe4..84737af84ae 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/execute_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/execute_test.clj
@@ -2,12 +2,12 @@
(:require
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.transforms.test-util :as transforms.tu]
[metabase-enterprise.workspaces.common :as ws.common]
[metabase-enterprise.workspaces.execute :as ws.execute]
[metabase-enterprise.workspaces.impl :as ws.impl]
[metabase-enterprise.workspaces.test-util :as ws.tu]
[metabase.test :as mt]
+ [metabase.transforms.test-util :as transforms.tu]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
diff --git a/enterprise/frontend/src/metabase-enterprise/api/index.ts b/enterprise/frontend/src/metabase-enterprise/api/index.ts
index 84f72603397..6f8e0ce4579 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/index.ts
@@ -16,8 +16,5 @@ export * from "./support-access-grants";
export * from "./table";
export * from "./tags";
export * from "./tenants";
-export * from "./transform";
-export * from "./transform-job";
-export * from "./transform-tag";
export * from "./upload-management";
export * from "./workspace";
diff --git a/enterprise/frontend/src/metabase-enterprise/api/table.ts b/enterprise/frontend/src/metabase-enterprise/api/table.ts
index fbd78f46ab6..649f4e6d2d1 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/table.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/table.ts
@@ -1,80 +1,13 @@
import type {
BulkTableSelection,
- BulkTableSelectionInfo,
- DiscardTablesValuesRequest,
- EditTablesRequest,
PublishTablesResponse,
- RescanTablesValuesRequest,
- SyncTablesSchemaRequest as SyncTablesSchemasRequest,
} from "metabase-types/api";
import { EnterpriseApi } from "./api";
-import {
- invalidateTags,
- listTag,
- provideBulkTableSelectionInfoTags,
- tag,
-} from "./tags";
+import { invalidateTags, tag } from "./tags";
export const tableApi = EnterpriseApi.injectEndpoints({
endpoints: (builder) => ({
- getTableSelectionInfo: builder.query<
- BulkTableSelectionInfo,
- BulkTableSelection
- >({
- query: (body) => ({
- method: "POST",
- url: "/api/ee/data-studio/table/selection",
- body,
- }),
- providesTags: (response) =>
- response ? provideBulkTableSelectionInfoTags(response) : [],
- }),
- editTables: builder.mutation<Record<string, never>, EditTablesRequest>({
- query: (body) => ({
- method: "POST",
- url: "/api/ee/data-studio/table/edit",
- body,
- }),
- invalidatesTags: (_, error) =>
- invalidateTags(error, [tag("table"), tag("database"), tag("card")]),
- }),
- rescanTablesFieldValues: builder.mutation<void, RescanTablesValuesRequest>({
- query: (body) => ({
- method: "POST",
- url: `/api/ee/data-studio/table/rescan-values`,
- body,
- }),
- invalidatesTags: (_, error) =>
- invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
- }),
- syncTablesSchemas: builder.mutation<void, SyncTablesSchemasRequest>({
- query: (body) => ({
- method: "POST",
- url: `/api/ee/data-studio/table/sync-schema`,
- body,
- }),
- invalidatesTags: (_, error) =>
- invalidateTags(error, [
- tag("table"),
- listTag("field"),
- listTag("field-values"),
- listTag("parameter-values"),
- tag("card"),
- ]),
- }),
- discardTablesFieldValues: builder.mutation<
- void,
- DiscardTablesValuesRequest
- >({
- query: (body) => ({
- method: "POST",
- url: `/api/ee/data-studio/table/discard-values`,
- body,
- }),
- invalidatesTags: (_, error) =>
- invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
- }),
publishTables: builder.mutation<PublishTablesResponse, BulkTableSelection>({
query: (body) => ({
method: "POST",
@@ -96,13 +29,5 @@ export const tableApi = EnterpriseApi.injectEndpoints({
}),
});
-export const {
- useGetTableSelectionInfoQuery,
- useLazyGetTableSelectionInfoQuery,
- useEditTablesMutation,
- useRescanTablesFieldValuesMutation,
- useSyncTablesSchemasMutation,
- useDiscardTablesFieldValuesMutation,
- usePublishTablesMutation,
- useUnpublishTablesMutation,
-} = tableApi;
+export const { usePublishTablesMutation, useUnpublishTablesMutation } =
+ tableApi;
diff --git a/enterprise/frontend/src/metabase-enterprise/api/tags.ts b/enterprise/frontend/src/metabase-enterprise/api/tags.ts
index 9c8b808d340..1f32715f5e2 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/tags.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/tags.ts
@@ -10,8 +10,6 @@ import {
provideUserTags,
} from "metabase/api/tags";
import {
- type BulkTableInfo,
- type BulkTableSelectionInfo,
type CardDependencyNode,
DEPENDENCY_TYPES,
type DashboardDependencyNode,
@@ -26,11 +24,7 @@ import {
type SnippetDependencyNode,
type SupportAccessGrant,
type TableDependencyNode,
- type Transform,
type TransformDependencyNode,
- type TransformJob,
- type TransformRun,
- type TransformTag,
type Workspace,
type WorkspaceAllowedDatabase,
type WorkspaceItem,
@@ -44,14 +38,9 @@ export const ENTERPRISE_TAG_TYPES = [
"metabot-prompt-suggestions",
"gsheets-status",
"sandbox",
- "transform-tag",
- "transform-job",
- "transform-job-via-tag",
- "transform-run",
"workspace-transforms",
"workspace-transform",
"workspace-tables",
- "external-transform",
"git-tree",
"git-file-content",
"collection-dirty-entities",
@@ -106,48 +95,6 @@ export function provideWorkspaceTags(
return [idTag("workspace", workspace.id)];
}
-export function provideTransformTags(
- transform: Transform,
-): TagDescription<EnterpriseTagType>[] {
- return [
- idTag("transform", transform.id),
- ...(transform.tag_ids?.flatMap((tag) => idTag("transform-tag", tag)) ?? []),
- ];
-}
-
-export function provideTransformListTags(
- transforms: Transform[],
-): TagDescription<EnterpriseTagType>[] {
- return [listTag("transform"), ...transforms.flatMap(provideTransformTags)];
-}
-
-export function provideTransformRunTags(
- run: TransformRun,
-): TagDescription<EnterpriseTagType>[] {
- return [
- idTag("transform-run", run.id),
- ...(run.transform ? provideTransformTags(run.transform) : []),
- ];
-}
-
-export function provideTransformRunListTags(
- runs: TransformRun[],
-): TagDescription<EnterpriseTagType>[] {
- return [listTag("transform-run"), ...runs.flatMap(provideTransformRunTags)];
-}
-
-export function provideTransformTagTags(
- tag: TransformTag,
-): TagDescription<EnterpriseTagType>[] {
- return [idTag("transform-tag", tag.id)];
-}
-
-export function provideTransformTagListTags(
- tags: TransformTag[],
-): TagDescription<EnterpriseTagType>[] {
- return [listTag("transform-tag"), ...tags.flatMap(provideTransformTagTags)];
-}
-
export function provideExternalTransformTags(
transform: ExternalTransform,
): TagDescription<EnterpriseTagType>[] {
@@ -163,22 +110,6 @@ export function provideExternalTransformListTags(
];
}
-export function provideTransformJobTags(
- job: TransformJob,
-): TagDescription<EnterpriseTagType>[] {
- return [
- idTag("transform-job", job.id),
- ...(job.tag_ids?.map((tagId) => idTag("transform-job-via-tag", tagId)) ??
- []),
- ];
-}
-
-export function provideTransformJobListTags(
- jobs: TransformJob[],
-): TagDescription<EnterpriseTagType>[] {
- return [listTag("transform-job"), ...jobs.flatMap(provideTransformJobTags)];
-}
-
export function providePythonLibraryTags(
library: PythonLibrary,
): TagDescription<EnterpriseTagType>[] {
@@ -339,25 +270,6 @@ export function provideSupportAccessGrantListTags(
];
}
-export function provideBulkTableInfoTags(
- table: BulkTableInfo,
-): TagDescription<EnterpriseTagType>[] {
- return [idTag("table", table.id)];
-}
-
-export function provideBulkTableSelectionInfoTags({
- selected_table,
- published_downstream_tables,
- unpublished_upstream_tables,
-}: BulkTableSelectionInfo): TagDescription<EnterpriseTagType>[] {
- return [
- listTag("table"),
- ...(selected_table != null ? provideBulkTableInfoTags(selected_table) : []),
- ...published_downstream_tables.flatMap(provideBulkTableInfoTags),
- ...unpublished_upstream_tables.flatMap(provideBulkTableInfoTags),
- ];
-}
-
export function provideWorkspaceAllowedDatabaseTags(
databases: WorkspaceAllowedDatabase[],
) {
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/index.tsx b/enterprise/frontend/src/metabase-enterprise/caching/index.tsx
index 7fc6dbdc954..a86482f2904 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/index.tsx
@@ -1,5 +1,4 @@
import { PLUGIN_CACHING } from "metabase/plugins";
-import { MetricCachingPage } from "metabase-enterprise/data-studio/metrics/pages/MetricCachingPage";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { DashboardAndQuestionCachingTab } from "./components/DashboardAndQuestionCachingTab";
@@ -14,6 +13,7 @@ import {
enterpriseOnlyCachingStrategies,
getEnterprisePerformanceTabMetadata,
} from "./constants";
+import { MetricCachingPage } from "./pages/MetricCachingPage";
import { hasQuestionCacheSection } from "./utils";
/**
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricCachingPage/MetricCachingPage.tsx b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricCachingPage/MetricCachingPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
index c94dc298c0f..246d8d992b7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricCachingPage/MetricCachingPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
@@ -8,17 +8,16 @@ import { useConfirmIfFormIsDirty } from "metabase/admin/performance/hooks/useCon
import { useSaveStrategy } from "metabase/admin/performance/hooks/useSaveStrategy";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
import * as Urls from "metabase/lib/urls";
import type { MetricSettingsPageProps } from "metabase/plugins/oss/caching";
import { Card, Center } from "metabase/ui";
import { getItemName } from "metabase-enterprise/caching/components/utils";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+import { MetricHeader } from "metabase-enterprise/data-studio/library/metrics/components/MetricHeader";
import Question from "metabase-lib/v1/Question";
import type { CacheableModel } from "metabase-types/api";
-import { MetricHeader } from "../../components/MetricHeader";
-
const model: CacheableModel[] = ["question"];
export function MetricCachingPage({ params }: MetricSettingsPageProps) {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricCachingPage/index.ts b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricCachingPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts b/enterprise/frontend/src/metabase-enterprise/collections/utils.ts
index 298cbe12380..a3626a61098 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/collections/utils.ts
@@ -1,7 +1,7 @@
+import { getLibraryCollectionType } from "metabase/data-studio/utils";
import type { IconData, ObjectWithModel } from "metabase/lib/icon";
import { getIconBase } from "metabase/lib/icon";
import type { ItemWithCollection } from "metabase/plugins";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import type {
Bookmark,
Collection,
@@ -70,7 +70,7 @@ export const getIcon = (
if (item.model === "collection") {
// Library collections keep their special icon regardless of sync status
- const libraryCollectionType = PLUGIN_DATA_STUDIO.getLibraryCollectionType(
+ const libraryCollectionType = getLibraryCollectionType(
item.type as CollectionType,
);
if (libraryCollectionType != null) {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/index.ts
deleted file mode 100644
index e07baaef43d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DependencyDiagnosticsSectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx
deleted file mode 100644
index e2d338fcdca..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import { Route } from "react-router";
-
-import {
- setupUserKeyValueEndpoints,
- setupUsersEndpoints,
-} from "__support__/server-mocks";
-import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { DataStudioTableMetadataTab } from "metabase/lib/urls/data-studio";
-import type { EnterpriseSettings, Segment, Table } from "metabase-types/api";
-import {
- createMockSegment,
- createMockTable,
- createMockUser,
-} from "metabase-types/api/mocks";
-
-import type { RouteParams } from "../../pages/DataModel/types";
-
-import { TableSection } from "./TableSection";
-
-type SetupOpts = {
- table?: Table;
- params?: RouteParams;
- activeTab?: DataStudioTableMetadataTab;
- segments?: Segment[];
- isAdmin?: boolean;
- isDataAnalyst?: boolean;
- remoteSyncType?: EnterpriseSettings["remote-sync-type"];
-};
-
-function setup({
- table = createMockTable(),
- activeTab = "field",
- segments,
- isAdmin = false,
- isDataAnalyst = false,
- remoteSyncType,
-}: SetupOpts = {}) {
- const onSyncOptionsClick = jest.fn();
- const tableWithSegments = segments ? { ...table, segments } : table;
- const settings = mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- });
-
- setupUsersEndpoints([createMockUser()]);
- setupUserKeyValueEndpoints({
- namespace: "user_acknowledgement",
- key: "seen-publish-tables-info",
- value: true,
- });
-
- renderWithProviders(
- <Route
- path="/"
- component={() => (
- <TableSection
- table={tableWithSegments}
- activeTab={activeTab}
- hasLibrary
- canPublish
- onSyncOptionsClick={onSyncOptionsClick}
- />
- )}
- />,
- {
- withRouter: true,
- storeInitialState: {
- currentUser: createMockUser({
- is_superuser: isAdmin,
- is_data_analyst: isDataAnalyst,
- }),
- settings,
- },
- },
- );
-
- return { onSyncOptionsClick };
-}
-
-describe("TableSection", () => {
- it("should render the link to explore this table in the query builder", () => {
- const table = createMockTable();
- setup({ table });
-
- const tableLink = screen.getByLabelText("Go to this table");
- expect(tableLink).toBeInTheDocument();
- expect(tableLink).toHaveAttribute(
- "href",
- `/question#?db=${table.db_id}&table=${table.id}`,
- );
- });
-
- it("should render publish button for admins", () => {
- setup({ isAdmin: true });
-
- expect(screen.getByText("Publish")).toBeInTheDocument();
- });
-
- it("should render publish button for data analysts", () => {
- setup({ isDataAnalyst: true });
-
- expect(screen.getByText("Publish")).toBeInTheDocument();
- });
-
- it("should not render publish button when remote sync is set to read-only", () => {
- setup({ remoteSyncType: "read-only" });
-
- expect(screen.queryByText("Publish")).not.toBeInTheDocument();
- expect(screen.queryByText("Unpublish")).not.toBeInTheDocument();
- });
-
- describe("tabs", () => {
- it("should render Fields and Segments tabs", () => {
- setup({ activeTab: "field" });
-
- expect(screen.getByRole("tab", { name: /Fields/i })).toBeInTheDocument();
- expect(
- screen.getByRole("tab", { name: /Segments/i }),
- ).toBeInTheDocument();
- });
-
- it("should show Fields tab as selected when activeTab is field", () => {
- setup({ activeTab: "field" });
-
- expect(screen.getByRole("tab", { name: /Fields/i })).toHaveAttribute(
- "aria-selected",
- "true",
- );
- expect(screen.getByRole("tab", { name: /Segments/i })).toHaveAttribute(
- "aria-selected",
- "false",
- );
- });
-
- it("should show Segments tab as selected when activeTab is segments", () => {
- setup({ activeTab: "segments" });
-
- expect(screen.getByRole("tab", { name: /Segments/i })).toHaveAttribute(
- "aria-selected",
- "true",
- );
- expect(screen.getByRole("tab", { name: /Fields/i })).toHaveAttribute(
- "aria-selected",
- "false",
- );
- });
-
- it("should show segment list content in segments tab", () => {
- const segments = [createMockSegment({ id: 1, name: "Test Segment" })];
- setup({ activeTab: "segments", segments });
-
- expect(screen.getByText("Test Segment")).toBeInTheDocument();
- });
-
- it("should show empty state when no segments exist in segments tab", () => {
- setup({ activeTab: "segments", segments: [] });
-
- expect(screen.getByText("No segments yet")).toBeInTheDocument();
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
deleted file mode 100644
index f501e5d0acc..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
-import { NavbarLibrarySection } from "metabase-enterprise/data-studio/nav/components/NavbarLibrarySection";
-import { hasPremiumFeature } from "metabase-enterprise/settings";
-
-import { DataStudioToolbarButton } from "./query-builder/components/DataStudioToolbarButton";
-import { getDataStudioRoutes } from "./routes";
-import { canAccessDataStudio } from "./selectors";
-import {
- canPlaceEntityInCollection,
- canPlaceEntityInCollectionOrDescendants,
- getLibraryCollectionType,
- useGetLibraryChildCollectionByType,
- useGetLibraryCollection,
- useGetResolvedLibraryCollection,
-} from "./utils";
-
-export function initializePlugin() {
- // Always enable Data Studio access for admins/analysts on enterprise builds
- // This allows them to see upsells even without the data_studio feature token
- // TODO: when moving to OSS move out of plugin
- PLUGIN_DATA_STUDIO.canAccessDataStudio = canAccessDataStudio;
- PLUGIN_DATA_STUDIO.getDataStudioRoutes = getDataStudioRoutes;
-
- // Only enable full Data Studio functionality when the feature is present
- if (hasPremiumFeature("data_studio")) {
- PLUGIN_DATA_STUDIO.isEnabled = true;
- PLUGIN_DATA_STUDIO.DataStudioToolbarButton = DataStudioToolbarButton;
- PLUGIN_DATA_STUDIO.NavbarLibrarySection = NavbarLibrarySection;
- PLUGIN_DATA_STUDIO.getLibraryCollectionType = getLibraryCollectionType;
- PLUGIN_DATA_STUDIO.canPlaceEntityInCollection = canPlaceEntityInCollection;
- PLUGIN_DATA_STUDIO.canPlaceEntityInCollectionOrDescendants =
- canPlaceEntityInCollectionOrDescendants;
- PLUGIN_DATA_STUDIO.useGetLibraryCollection = useGetLibraryCollection;
- PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType =
- useGetLibraryChildCollectionByType;
- PLUGIN_DATA_STUDIO.useGetResolvedLibraryCollection =
- useGetResolvedLibraryCollection;
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx
index 59f0a32da08..87066e50c94 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx
@@ -7,10 +7,16 @@ import { isLibraryCollection } from "metabase/collections/utils";
import { DateTime } from "metabase/common/components/DateTime";
import { ForwardRefLink } from "metabase/common/components/Link";
import { useHasTokenFeature } from "metabase/common/hooks";
+import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import type { ExpandedState } from "metabase/data-studio/data-model/components/TablePicker/types";
+import { LibraryUpsellPage } from "metabase/data-studio/upsells";
import { usePageTitle } from "metabase/hooks/use-page-title";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { useRouter } from "metabase/router";
+import { ListEmptyState } from "metabase/transforms/components/ListEmptyState";
import {
Anchor,
Card,
@@ -25,15 +31,9 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { LibraryEmptyState } from "metabase-enterprise/data-studio/common/components/LibraryEmptyState";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import type { ExpandedState } from "metabase-enterprise/data-studio/data-model/components/TablePicker/types";
-import { LibraryUpsellPage } from "metabase-enterprise/data-studio/upsells";
-import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";
import type { Collection, CollectionId } from "metabase-types/api";
-import { SectionLayout } from "../../components/SectionLayout";
+import { LibraryEmptyState } from "../components/LibraryEmptyState";
import { CreateMenu } from "./CreateMenu";
import { PublishTableModal } from "./PublishTableModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/PublishTableModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/PublishTableModal.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/PublishTableModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/PublishTableModal.tsx
index 0d5347e57cd..f6c8dbfdbeb 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/PublishTableModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/PublishTableModal.tsx
@@ -5,9 +5,9 @@ import {
type OmniPickerItem,
type OmniPickerTableItem,
} from "metabase/common/components/Pickers";
+import { trackDataStudioTablePublished } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks/useMetadataToasts";
import { usePublishTablesMutation } from "metabase-enterprise/api/table";
-import { trackDataStudioTablePublished } from "metabase-enterprise/data-studio/analytics";
import { isConcreteTableId } from "metabase-types/api";
interface PublishTableModalProps {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/hooks.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/types.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.unit.spec.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
index cfa837ac4a0..4dac682e635 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
@@ -1,5 +1,6 @@
import { t } from "ttag";
+import { trackDataStudioLibraryCreated } from "metabase/data-studio/analytics";
import {
Form,
FormErrorMessage,
@@ -7,6 +8,7 @@ import {
FormSubmitButton,
} from "metabase/forms";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import type { CreateLibraryModalProps } from "metabase/plugins";
import {
Box,
Button,
@@ -21,17 +23,8 @@ import {
Title,
} from "metabase/ui";
import { useCreateLibraryMutation } from "metabase-enterprise/api";
-import { trackDataStudioLibraryCreated } from "metabase-enterprise/data-studio/analytics";
import type { Collection } from "metabase-types/api";
-type CreateLibraryModalProps = {
- title?: string;
- explanatorySentence?: string;
- isOpened: boolean;
- onCreate?: (collection: Collection) => void;
- onClose: () => void;
-};
-
export function CreateLibraryModal({
title = t`Create your Library`,
explanatorySentence,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/LibraryEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/LibraryEmptyState.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
index 9938397f640..182dd1cedf2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/LibraryEmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
@@ -2,6 +2,7 @@ import { useState } from "react";
import { t } from "ttag";
import { getErrorMessage } from "metabase/api/utils";
+import { trackDataStudioLibraryCreated } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
Button,
@@ -16,7 +17,6 @@ import {
Title,
} from "metabase/ui";
import { useCreateLibraryMutation } from "metabase-enterprise/api";
-import { trackDataStudioLibraryCreated } from "metabase-enterprise/data-studio/analytics";
export function LibraryEmptyState() {
const [createLibrary, { isLoading, isSuccess }] = useCreateLibraryMutation();
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/LibraryEmptyState/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
index 539f1b0d2b7..f989964831e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
@@ -1,7 +1,9 @@
import { push } from "react-router-redux";
import { jt, t } from "ttag";
+import { useGetTableSelectionInfoQuery } from "metabase/api";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
+import { trackDataStudioTablePublished } from "metabase/data-studio/analytics";
import {
Form,
FormErrorMessage,
@@ -11,6 +13,7 @@ import {
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import type { PublishTablesModalProps } from "metabase/plugins";
import {
Box,
Button,
@@ -21,11 +24,7 @@ import {
Stack,
Text,
} from "metabase/ui";
-import {
- useGetTableSelectionInfoQuery,
- usePublishTablesMutation,
-} from "metabase-enterprise/api";
-import { trackDataStudioTablePublished } from "metabase-enterprise/data-studio/analytics";
+import { usePublishTablesMutation } from "metabase-enterprise/api";
import type {
BulkTableInfo,
DatabaseId,
@@ -33,15 +32,6 @@ import type {
TableId,
} from "metabase-types/api";
-type PublishTablesModalProps = {
- databaseIds?: DatabaseId[];
- schemaIds?: SchemaId[];
- tableIds?: TableId[];
- isOpened: boolean;
- onPublish: () => void;
- onClose: () => void;
-};
-
export function PublishTablesModal({
databaseIds,
schemaIds,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/UnpublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/UnpublishTablesModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
index c3d70281bf3..07ac38365c4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/UnpublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
@@ -1,6 +1,8 @@
import { jt, t } from "ttag";
+import { useGetTableSelectionInfoQuery } from "metabase/api";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
+import { trackDataStudioTableUnpublished } from "metabase/data-studio/analytics";
import {
Form,
FormErrorMessage,
@@ -8,6 +10,7 @@ import {
FormSubmitButton,
} from "metabase/forms";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import type { UnpublishTablesModalProps } from "metabase/plugins";
import {
Box,
Button,
@@ -18,11 +21,7 @@ import {
Stack,
Text,
} from "metabase/ui";
-import {
- useGetTableSelectionInfoQuery,
- useUnpublishTablesMutation,
-} from "metabase-enterprise/api";
-import { trackDataStudioTableUnpublished } from "metabase-enterprise/data-studio/analytics";
+import { useUnpublishTablesMutation } from "metabase-enterprise/api";
import type {
BulkTableInfo,
DatabaseId,
@@ -30,15 +29,6 @@ import type {
TableId,
} from "metabase-types/api";
-type UnpublishTablesModalProps = {
- databaseIds?: DatabaseId[];
- schemaIds?: SchemaId[];
- tableIds?: TableId[];
- isOpened: boolean;
- onUnpublish: () => void;
- onClose: () => void;
-};
-
export function UnpublishTablesModal({
databaseIds,
schemaIds,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/UnpublishTablesModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/UnpublishTablesModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/UnpublishTablesModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts
new file mode 100644
index 00000000000..c72b05e4104
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts
@@ -0,0 +1,30 @@
+import { PLUGIN_LIBRARY } from "metabase/plugins";
+import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
+import { hasPremiumFeature } from "metabase-enterprise/settings";
+
+import { CreateLibraryModal } from "./components/CreateLibraryModal";
+import { PublishTablesModal } from "./components/PublishTablesModal";
+import { UnpublishTablesModal } from "./components/UnpublishTablesModal";
+import { getDataStudioLibraryRoutes } from "./routes";
+import {
+ useGetLibraryChildCollectionByType,
+ useGetLibraryCollection,
+ useGetResolvedLibraryCollection,
+} from "./utils";
+
+export function initializePlugin() {
+ if (hasPremiumFeature("data_studio")) {
+ // TODO [OSS]: this should be "library" token
+ PLUGIN_LIBRARY.isEnabled = true;
+ PLUGIN_LIBRARY.getDataStudioLibraryRoutes = getDataStudioLibraryRoutes;
+ PLUGIN_LIBRARY.useGetLibraryCollection = useGetLibraryCollection;
+ PLUGIN_LIBRARY.useGetLibraryChildCollectionByType =
+ useGetLibraryChildCollectionByType;
+ PLUGIN_LIBRARY.useGetResolvedLibraryCollection =
+ useGetResolvedLibraryCollection;
+ PLUGIN_LIBRARY.CreateLibraryModal = CreateLibraryModal;
+ PLUGIN_LIBRARY.PublishTablesModal = PublishTablesModal;
+ PLUGIN_LIBRARY.UnpublishTablesModal = UnpublishTablesModal;
+ PLUGIN_LIBRARY.useGetLibraryCollectionQuery = useGetLibraryCollectionQuery;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricHeader.tsx
similarity index 81%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricHeader.tsx
index 207fe3085fd..97b1f17b2c7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricHeader.tsx
@@ -1,13 +1,13 @@
import type { ReactNode } from "react";
import { Link } from "metabase/common/components/Link";
-import * as Urls from "metabase/lib/urls";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
import {
PaneHeader,
PanelHeaderTitle,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
+} from "metabase/data-studio/common/components/PaneHeader";
+import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import * as Urls from "metabase/lib/urls";
import type { Card } from "metabase-types/api";
import { MetricMoreMenu } from "./MetricMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
index 0ccae7ce395..62ce5a9582f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { useUpdateCardMutation } from "metabase/api";
+import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { PaneHeaderInput } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import type { Card } from "metabase-types/api";
import { NAME_MAX_LENGTH } from "../../../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
index 2bd236cf4ff..0cf1735bf73 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
@@ -1,13 +1,13 @@
import { t } from "ttag";
+import {
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+} from "metabase/data-studio/common/components/PaneHeader";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
-import {
- type PaneHeaderTab,
- PaneHeaderTabs,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/constants.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/constants.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
index 03b2fee0091..26e5553e318 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
@@ -1,11 +1,11 @@
import type { ReactNode } from "react";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
import { MetricHeader } from "../../components/MetricHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
index 4e4b28b89d8..ee1cfa68a27 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
@@ -1,6 +1,6 @@
import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";
+import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
import { Flex, Stack } from "metabase/ui";
-import { OverviewVisualization } from "metabase-enterprise/data-studio/common/components/OverviewVisualization";
import type { Card } from "metabase-types/api";
import { DescriptionSection } from "./DescriptionSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceInfo.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceInfo.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceInfo.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceInfo.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
index 4e171f4678f..f81ebffe6f4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
import { MetricHeader } from "../../components/MetricHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
index b43e65c7413..a4aeb12fab5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
@@ -6,6 +6,10 @@ import { t } from "ttag";
import { useUpdateCardMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
+import { getResultMetadata } from "metabase/data-studio/common/utils";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
@@ -13,14 +17,10 @@ import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
import { Card, Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
-import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { Card as CardType } from "metabase-types/api";
-import { PaneHeaderActions } from "../../../common/components/PaneHeader";
import { MetricHeader } from "../../components/MetricHeader";
import { MetricQueryEditor } from "../../components/MetricQueryEditor";
import { getValidationResult } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
index 7112f3bcd53..69822a251b1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -7,22 +7,22 @@ import { t } from "ttag";
import { useGetDefaultCollectionId } from "metabase/collections/hooks";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "metabase/data-studio/common/components/PaneHeader";
+import { getResultMetadata } from "metabase/data-studio/common/utils";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
import { Card } from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
import * as Lib from "metabase-lib";
import type { Card as CardType } from "metabase-types/api";
-import {
- PaneHeader,
- PaneHeaderActions,
- PaneHeaderInput,
-} from "../../../common/components/PaneHeader";
import { MetricQueryEditor } from "../../components/MetricQueryEditor";
import { NAME_MAX_LENGTH } from "../../constants";
import { getValidationResult } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/types.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/routes.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/metrics/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
new file mode 100644
index 00000000000..2d4a51bb4bb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
@@ -0,0 +1,20 @@
+import { IndexRoute, Route } from "react-router";
+
+import { getDataStudioSegmentRoutes } from "metabase/data-studio/segments/routes";
+
+import { LibrarySectionLayout } from "./LibrarySectionLayout";
+import { getDataStudioMetricRoutes } from "./metrics/routes";
+import { getDataStudioSnippetRoutes } from "./snippets/routes";
+import { getDataStudioTableRoutes } from "./tables/routes";
+
+export const getDataStudioLibraryRoutes = () => {
+ return (
+ <Route path="library">
+ <IndexRoute component={LibrarySectionLayout} />
+ {getDataStudioTableRoutes()}
+ {getDataStudioMetricRoutes()}
+ {getDataStudioSegmentRoutes()}
+ {getDataStudioSnippetRoutes()}
+ </Route>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
similarity index 87%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
index 001b690c818..dfbe83a24d9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
@@ -6,21 +6,20 @@ import { t } from "ttag";
import { useUpdateSnippetMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { useToast } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import type { NativeQuerySnippet } from "metabase-types/api";
-
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import {
PaneHeader,
PaneHeaderInput,
type PaneHeaderProps,
type PaneHeaderTab,
PaneHeaderTabs,
-} from "../../../common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import type { NativeQuerySnippet } from "metabase-types/api";
+
import { SnippetMoreMenu } from "../SnippetMoreMenu";
const SNIPPET_NAME_MAX_LENGTH = 254;
@@ -36,7 +35,9 @@ export function SnippetHeader({
...rest
}: SnippetHeaderProps & Omit<PaneHeaderProps, "breadcrumbs">) {
const dispatch = useDispatch();
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const handleDelete = () => {
dispatch(push(Urls.dataStudioLibrary()));
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
similarity index 70%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
index a33e781a3a9..b54231a3ba7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
@@ -1,12 +1,18 @@
import { Route } from "react-router";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
import type {
EnterpriseSettings,
NativeQuerySnippet,
+ TokenFeatures,
} from "metabase-types/api";
-import { createMockNativeQuerySnippet } from "metabase-types/api/mocks";
+import {
+ createMockNativeQuerySnippet,
+ createMockTokenFeatures,
+} from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
import { SnippetHeader } from "./SnippetHeader";
@@ -19,6 +25,21 @@ type SetupOps = {
const setup = ({ snippet = {}, remoteSyncType }: SetupOps) => {
const mockSnippet = createMockNativeQuerySnippet(snippet);
+ const tokenFeatures: Partial<TokenFeatures> = {
+ remote_sync: !!remoteSyncType,
+ };
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["remote_sync"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+
renderWithProviders(
<Route
path="/"
@@ -30,12 +51,7 @@ const setup = ({ snippet = {}, remoteSyncType }: SetupOps) => {
)}
/>,
{
- storeInitialState: createMockState({
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- }),
+ storeInitialState: state,
withRouter: true,
},
);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
index ba9a8b3e450..71b062dd070 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
@@ -15,13 +15,13 @@ import { EntityCreationInfo } from "metabase/common/components/EntityCreationInf
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useToast } from "metabase/common/hooks";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { Card, Center, Flex, Stack } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { PaneHeaderActions } from "../../../common/components/PaneHeader";
import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";
import { SnippetHeader } from "../../components/SnippetHeader";
@@ -39,7 +39,9 @@ type EditSnippetPageProps = {
export function EditSnippetPage({ params, route }: EditSnippetPageProps) {
const snippetId = Urls.extractEntityId(params.snippetId);
const [sendToast] = useToast();
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const {
data: snippet,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx
new file mode 100644
index 00000000000..472cf762664
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx
@@ -0,0 +1,40 @@
+import userEvent from "@testing-library/user-event";
+
+import { screen, within } from "__support__/ui";
+
+import { setup } from "./setup";
+
+describe("EditSnippetPage", () => {
+ it("renders the snippet header", async () => {
+ await setup({ snippet: { name: "Batman's snippet" } });
+
+ expect(screen.getByTestId("snippet-header")).toBeInTheDocument();
+ expect(
+ within(screen.getByTestId("snippet-header")).getByRole("textbox"),
+ ).toHaveValue("Batman's snippet");
+ });
+
+ it("renders the code editor", async () => {
+ await setup({ snippet: { name: "Batman's snippet" } });
+ expect(await screen.findByTestId("snippet-editor")).toBeInTheDocument();
+ expect(screen.getByTestId("snippet-editor")).toBeEnabled();
+ });
+
+ it("renders the description input", async () => {
+ await setup({
+ snippet: {
+ name: "Batman's snippet",
+ description: "My snippet description",
+ },
+ });
+ await userEvent.click(
+ within(screen.getByTestId("edit-snippet-page")).getByText(
+ "My snippet description",
+ ),
+ );
+ expect(screen.getByPlaceholderText("No description")).toHaveValue(
+ "My snippet description",
+ );
+ expect(screen.getByPlaceholderText("No description")).toBeEnabled();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx
new file mode 100644
index 00000000000..fdf0fe5d14e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx
@@ -0,0 +1,39 @@
+import userEvent from "@testing-library/user-event";
+
+import { screen, within } from "__support__/ui";
+
+import { DEFAULT_EE_SETTINGS, setup } from "./setup";
+
+describe("EditSnippetPage", () => {
+ describe("when remote sync is set to read-only", () => {
+ beforeEach(async () => {
+ await setup({
+ ...DEFAULT_EE_SETTINGS,
+ snippet: {
+ name: "Batman's snippet",
+ description: "My snippet description",
+ },
+ remoteSyncType: "read-only",
+ });
+ });
+
+ it("renders a disabled header name input", () => {
+ expect(
+ within(screen.getByTestId("snippet-header")).getByRole("textbox"),
+ ).toBeDisabled();
+ });
+
+ it("renders a disabled code editor", () => {
+ expect(screen.getByTestId("snippet-editor")).toBeDisabled();
+ });
+
+ it("renders a disabled description input", async () => {
+ await userEvent.click(
+ within(screen.getByTestId("edit-snippet-page")).getByText(
+ "My snippet description",
+ ),
+ );
+ expect(screen.getByPlaceholderText("No description")).toBeDisabled();
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
new file mode 100644
index 00000000000..50d9ad320e3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
@@ -0,0 +1,68 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import { setupNativeQuerySnippetEndpoints } from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders, screen } from "__support__/ui";
+import type {
+ EnterpriseSettings,
+ NativeQuerySnippet,
+ TokenFeatures,
+} from "metabase-types/api";
+import {
+ createMockNativeQuerySnippet,
+ createMockTokenFeatures,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
+
+import { EditSnippetPage } from "../EditSnippetPage";
+
+type SetupOps = {
+ snippet?: Partial<NativeQuerySnippet>;
+ remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ enterprisePlugins?: ENTERPRISE_PLUGIN_NAME[];
+ tokenFeatures?: Partial<TokenFeatures>;
+};
+
+export const setup = async ({
+ snippet = {},
+ remoteSyncType,
+ enterprisePlugins,
+ tokenFeatures,
+}: SetupOps) => {
+ const mockSnippet = createMockNativeQuerySnippet(snippet);
+ setupNativeQuerySnippetEndpoints({ snippets: [mockSnippet] });
+
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ settings,
+ });
+
+ if (enterprisePlugins) {
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+ }
+
+ renderWithProviders(
+ <Route component={EditSnippetPage} path="/snippets/:snippetId" />,
+ {
+ initialRoute: `/snippets/${mockSnippet.id}`,
+ storeInitialState: state,
+ withRouter: true,
+ },
+ );
+
+ expect(await screen.findByTestId("edit-snippet-page")).toBeInTheDocument();
+};
+
+export const DEFAULT_EE_SETTINGS: Partial<SetupOps> = {
+ enterprisePlugins: ["library", "remote_sync"],
+ tokenFeatures: {
+ data_studio: true,
+ remote_sync: true,
+ },
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
index 288cc43b11b..935242c6a3f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
@@ -11,23 +11,22 @@ import { EditableText } from "metabase/common/components/EditableText";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { Link } from "metabase/common/components/Link";
import { useToast } from "metabase/common/hooks";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "metabase/data-studio/common/components/PaneHeader";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { Card, Flex, Stack } from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
import type {
NativeQuerySnippet,
RegularCollectionId,
} from "metabase-types/api";
-import {
- PaneHeader,
- PaneHeaderActions,
- PaneHeaderInput,
-} from "../../../common/components/PaneHeader";
-
import S from "./NewSnippetPage.module.css";
const SNIPPET_NAME_MAX_LENGTH = 254;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
index 46d1d465b3d..b776a91f1d7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
@@ -2,10 +2,10 @@ import type { ReactNode } from "react";
import { skipToken, useGetSnippetQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
import { SnippetHeader } from "../../components/SnippetHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/snippets/routes.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/analytics.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/analytics.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
index a2141bab219..99fd5b2f48e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
@@ -1,13 +1,12 @@
import { Link } from "metabase/common/components/Link/Link";
-import * as Urls from "metabase/lib/urls";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import type { Table } from "metabase-types/api";
-
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import {
PaneHeader,
type PaneHeaderProps,
-} from "../../../common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import * as Urls from "metabase/lib/urls";
+import type { Table } from "metabase-types/api";
import { TableMoreMenu } from "./TableMoreMenu";
import { TableNameInput } from "./TableNameInput";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
index d8faceb4e31..4ed0536efd7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
@@ -5,9 +5,8 @@ import { c, t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { ActionIcon, Icon, Menu } from "metabase/ui";
-import { UnpublishTablesModal } from "metabase-enterprise/data-studio/common/components/UnpublishTablesModal";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { Table } from "metabase-types/api";
type TableModalType = "unpublish";
@@ -19,7 +18,9 @@ type TableMoreMenuProps = {
export function TableMoreMenu({ table }: TableMoreMenuProps) {
const dispatch = useDispatch();
const [modalType, setModalType] = useState<TableModalType>();
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const handleUnpublish = () => {
setModalType(undefined);
@@ -53,7 +54,7 @@ export function TableMoreMenu({ table }: TableMoreMenuProps) {
)}
</Menu.Dropdown>
</Menu>
- <UnpublishTablesModal
+ <PLUGIN_LIBRARY.UnpublishTablesModal
isOpened={modalType === "unpublish"}
tableIds={[table.id]}
onUnpublish={handleUnpublish}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
similarity index 62%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
index 217a878fef7..258c9d810d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
@@ -1,10 +1,16 @@
import userEvent from "@testing-library/user-event";
import { Route } from "react-router";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings } from "metabase-types/api";
-import { createMockTable } from "metabase-types/api/mocks";
+import type { EnterpriseSettings, TokenFeatures } from "metabase-types/api";
+import {
+ createMockTable,
+ createMockTokenFeatures,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
import { TableMoreMenu } from "./TableMoreMenu";
@@ -19,16 +25,26 @@ const setup = ({ remoteSyncType }: SetupOpts = {}) => {
schema: "PUBLIC",
});
+ const tokenFeatures: Partial<TokenFeatures> = {
+ remote_sync: !!remoteSyncType,
+ };
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["remote_sync"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+
renderWithProviders(
<Route path="/" component={() => <TableMoreMenu table={mockTable} />} />,
{
withRouter: true,
- storeInitialState: {
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- },
+ storeInitialState: state,
},
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableNameInput/TableNameInput.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
index 6ef04fcef42..92e7cea9d09 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { useUpdateTableMutation } from "metabase/api";
+import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { PaneHeaderInput } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import type { Table } from "metabase-types/api";
import { NAME_MAX_LENGTH } from "../../../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableNameInput/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableNameInput/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
index 04e14dfa81f..76ed6361023 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
@@ -1,14 +1,14 @@
import type { Location } from "history";
import { t } from "ttag";
+import {
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+} from "metabase/data-studio/common/components/PaneHeader";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getLocation } from "metabase/selectors/routing";
-import {
- type PaneHeaderTab,
- PaneHeaderTabs,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
import type { Table } from "metabase-types/api";
type TableTabsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/constants.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/constants.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
index 328198470d3..366c8f054e1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
@@ -1,11 +1,11 @@
import type { ReactNode } from "react";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
index c792a4dc6c0..47b744adaca 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
@@ -4,6 +4,8 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import {
FieldEmptyState,
@@ -24,8 +26,6 @@ import {
Stack,
Text,
} from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer/PageContainer";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { trackMetadataChange } from "../../analytics";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
index 994fae30209..5c8e9367f91 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
@@ -1,16 +1,15 @@
import { t } from "ttag";
+import {
+ EntityList,
+ EntityListItem,
+} from "metabase/data-studio/common/components/EntityList";
+import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
-import { getUserCanWriteMeasures } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
-import {
- EntityList,
- EntityListItem,
-} from "../../../common/components/EntityList";
-
type TableMeasuresProps = {
table: Table;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
similarity index 64%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
index 2d0aa4f19dc..a6116f3002c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
@@ -1,9 +1,20 @@
import { Route } from "react-router";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings, Table } from "metabase-types/api";
-import { createMockTable, createMockUser } from "metabase-types/api/mocks";
+import type {
+ EnterpriseSettings,
+ Table,
+ TokenFeatures,
+} from "metabase-types/api";
+import {
+ createMockTable,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
import { TableMeasures } from "./TableMeasures";
@@ -22,17 +33,27 @@ const setup = ({ isAdmin = true, remoteSyncType, table }: SetupOpts = {}) => {
...table,
});
+ const tokenFeatures: Partial<TokenFeatures> = {
+ remote_sync: !!remoteSyncType,
+ };
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["remote_sync"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+
renderWithProviders(
<Route path="/" component={() => <TableMeasures table={mockTable} />} />,
{
withRouter: true,
- storeInitialState: {
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- currentUser: createMockUser({ is_superuser: isAdmin }),
- },
+ storeInitialState: state,
},
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
similarity index 81%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
index 7de88d4fcfc..07fd7e1c1d9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
index 343a32bc990..b6bb35293a6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
@@ -1,9 +1,9 @@
import { useMemo } from "react";
+import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Flex, Stack } from "metabase/ui";
-import { OverviewVisualization } from "metabase-enterprise/data-studio/common/components/OverviewVisualization";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
similarity index 81%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
index aa54a0666a4..7276be0d998 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
index bdbaf143e74..3a8298aaeaa 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
@@ -1,16 +1,15 @@
import { t } from "ttag";
+import {
+ EntityList,
+ EntityListItem,
+} from "metabase/data-studio/common/components/EntityList";
+import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
-import { getUserCanWriteSegments } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
-import {
- EntityList,
- EntityListItem,
-} from "../../../common/components/EntityList";
-
type TableSegmentsProps = {
table: Table;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
similarity index 65%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
index abf224c6f78..a7b2455975d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
@@ -1,9 +1,20 @@
import { Route } from "react-router";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings, Table } from "metabase-types/api";
-import { createMockTable, createMockUser } from "metabase-types/api/mocks";
+import type {
+ EnterpriseSettings,
+ Table,
+ TokenFeatures,
+} from "metabase-types/api";
+import {
+ createMockTable,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
import { TableSegments } from "./TableSegments";
@@ -26,17 +37,27 @@ const setup = ({
...table,
});
+ const tokenFeatures: Partial<TokenFeatures> = {
+ remote_sync: !!remoteSyncType,
+ };
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["remote_sync"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+
renderWithProviders(
<Route path="/" component={() => <TableSegments table={mockTable} />} />,
{
+ storeInitialState: state,
withRouter: true,
- storeInitialState: {
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- currentUser: createMockUser({ is_superuser: isAdmin }),
- },
},
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
similarity index 81%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
index c719e4df25d..3c6f18e9179 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx
similarity index 73%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx
index 5c588f7b3bd..6c7805fd407 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx
@@ -1,15 +1,15 @@
import { IndexRoute, Route } from "react-router";
+import { PublishedTableMeasureDependenciesPage } from "metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage";
+import { PublishedTableMeasureDetailPage } from "metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage";
+import { PublishedTableMeasureRevisionHistoryPage } from "metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage";
+import { PublishedTableNewMeasurePage } from "metabase/data-studio/measures/pages/PublishedTableNewMeasurePage";
+import { PublishedTableNewSegmentPage } from "metabase/data-studio/segments/pages/PublishedTableNewSegmentPage";
+import { PublishedTableSegmentDependenciesPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage";
+import { PublishedTableSegmentDetailPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage";
+import { PublishedTableSegmentRevisionHistoryPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { IsAdmin } from "metabase/route-guards";
-import { PublishedTableMeasureDependenciesPage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage";
-import { PublishedTableMeasureDetailPage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage";
-import { PublishedTableMeasureRevisionHistoryPage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage";
-import { PublishedTableNewMeasurePage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage";
-import { PublishedTableNewSegmentPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage";
-import { PublishedTableSegmentDependenciesPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDependenciesPage";
-import { PublishedTableSegmentDetailPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDetailPage";
-import { PublishedTableSegmentRevisionHistoryPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage";
import { TableDependenciesPage } from "./pages/TableDependenciesPage";
import { TableFieldsPage } from "./pages/TableFieldsPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts
similarity index 63%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts
index 8d918a1b5e7..6a38bdef15e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts
@@ -2,73 +2,8 @@ import { useMemo } from "react";
import { match } from "ts-pattern";
import { skipToken, useListCollectionItemsQuery } from "metabase/api";
-import type { LibraryCollectionType } from "metabase/plugins";
import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
-import type {
- CollectionItem,
- CollectionItemModel,
- CollectionType,
-} from "metabase-types/api";
-
-export function getLibraryCollectionType(
- type: CollectionType | null | undefined,
-): LibraryCollectionType | undefined {
- switch (type) {
- case "library":
- return "root";
- case "library-data":
- return "data";
- case "library-metrics":
- return "metrics";
- }
-}
-
-export function canPlaceEntityInCollection(
- entityType: CollectionItemModel,
- collectionType: CollectionType | null | undefined,
-): boolean {
- if (getLibraryCollectionType(collectionType) == null) {
- return true;
- }
-
- // Can't create subcollections in any of special collections
- if (entityType === "collection") {
- return false;
- }
-
- // Can't create anything in the root Library collection
- if (collectionType === "library") {
- return false;
- }
-
- if (collectionType === "library-data") {
- return entityType === "table";
- }
-
- if (collectionType === "library-metrics") {
- return entityType === "metric";
- }
-
- return false;
-}
-
-export function canPlaceEntityInCollectionOrDescendants(
- entityType: CollectionItemModel,
- collectionType: CollectionType | null | undefined,
-): boolean {
- if (canPlaceEntityInCollection(entityType, collectionType)) {
- return true;
- }
-
- if (collectionType === "library") {
- return (
- canPlaceEntityInCollection(entityType, "library-data") ||
- canPlaceEntityInCollection(entityType, "library-metrics")
- );
- }
-
- return false;
-}
+import type { CollectionItem, CollectionType } from "metabase-types/api";
const isLibrary = (
collection: CollectionItem | { data: null } | undefined,
@@ -92,7 +27,6 @@ export const useGetLibraryCollection = ({
data: maybeLibrary,
};
};
-
export const useGetLibraryChildCollectionByType = ({
skip,
type,
@@ -112,7 +46,6 @@ export const useGetLibraryChildCollectionByType = ({
[libraryCollections, type],
);
};
-
// This hook will return the library collection if there are both metrics and models in the library,
// the library-metrics collection if the library has no models, or the library-data collection
// if the library has no metrics
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx
deleted file mode 100644
index f0eee7a6465..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { renderWithProviders, screen } from "__support__/ui";
-import Question from "metabase-lib/v1/Question";
-import type { CardType } from "metabase-types/api";
-import { createMockCard, createMockUser } from "metabase-types/api/mocks";
-
-import { DataStudioToolbarButton } from "./DataStudioToolbarButton";
-
-const setup = ({
- type = "metric",
- is_superuser = false,
- is_data_analyst = true,
-}: {
- type?: CardType;
- is_data_analyst?: boolean;
- is_superuser?: boolean;
-} = {}) => {
- const question = new Question(
- createMockCard({
- type,
- }),
- );
-
- renderWithProviders(<DataStudioToolbarButton question={question} />, {
- storeInitialState: {
- currentUser: createMockUser({
- is_data_analyst,
- is_superuser,
- }),
- },
- });
-};
-
-it("should render a button if the card is a metric and the user has data studio access", async () => {
- setup();
-
- expect(
- await screen.findByRole("button", { name: "Open in Data Studio" }),
- ).toBeInTheDocument();
-});
-
-it("should render a button if the card is a metric and the user is an admin", async () => {
- setup({ is_superuser: true, is_data_analyst: false });
-
- expect(
- await screen.findByRole("button", { name: "Open in Data Studio" }),
- ).toBeInTheDocument();
-});
-
-it("should not render a button if the card is a metric and the user is not a data analyst", async () => {
- setup({ is_data_analyst: false });
-
- expect(
- screen.queryByRole("button", { name: "Open in Data Studio" }),
- ).not.toBeInTheDocument();
-});
-
-it("should not render a button if the card is a model", async () => {
- setup({ type: "model" });
-
- expect(
- screen.queryByRole("button", { name: "Open in Data Studio" }),
- ).not.toBeInTheDocument();
-});
-
-it("should not render a button if the card is a question", async () => {
- setup({ type: "question" });
-
- expect(
- screen.queryByRole("button", { name: "Open in Data Studio" }),
- ).not.toBeInTheDocument();
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.unit.spec.tsx
deleted file mode 100644
index 8e42cd42c77..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.unit.spec.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import { setupNativeQuerySnippetEndpoints } from "__support__/server-mocks";
-import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen, within } from "__support__/ui";
-import type {
- EnterpriseSettings,
- NativeQuerySnippet,
-} from "metabase-types/api";
-import { createMockNativeQuerySnippet } from "metabase-types/api/mocks";
-import { createMockState } from "metabase-types/store/mocks";
-
-import { EditSnippetPage } from "./EditSnippetPage";
-
-type SetupOps = {
- snippet?: Partial<NativeQuerySnippet>;
- remoteSyncType?: EnterpriseSettings["remote-sync-type"];
-};
-
-const setup = async ({ snippet = {}, remoteSyncType }: SetupOps) => {
- const mockSnippet = createMockNativeQuerySnippet(snippet);
- setupNativeQuerySnippetEndpoints({ snippets: [mockSnippet] });
-
- renderWithProviders(
- <Route component={EditSnippetPage} path="/snippets/:snippetId" />,
- {
- initialRoute: `/snippets/${mockSnippet.id}`,
- storeInitialState: createMockState({
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- }),
- withRouter: true,
- },
- );
- expect(await screen.findByTestId("edit-snippet-page")).toBeInTheDocument();
-};
-
-describe("EditSnippetPage", () => {
- it("renders the snippet header", async () => {
- await setup({ snippet: { name: "Batman's snippet" } });
-
- expect(screen.getByTestId("snippet-header")).toBeInTheDocument();
- expect(
- within(screen.getByTestId("snippet-header")).getByRole("textbox"),
- ).toHaveValue("Batman's snippet");
- });
-
- it("renders the code editor", async () => {
- await setup({ snippet: { name: "Batman's snippet" } });
- expect(await screen.findByTestId("snippet-editor")).toBeInTheDocument();
- expect(screen.getByTestId("snippet-editor")).toBeEnabled();
- });
-
- it("renders the description input", async () => {
- await setup({
- snippet: {
- name: "Batman's snippet",
- description: "My snippet description",
- },
- });
- await userEvent.click(
- within(screen.getByTestId("edit-snippet-page")).getByText(
- "My snippet description",
- ),
- );
- expect(screen.getByPlaceholderText("No description")).toHaveValue(
- "My snippet description",
- );
- expect(screen.getByPlaceholderText("No description")).toBeEnabled();
- });
-
- describe("when remote sync is set to read-only", () => {
- beforeEach(async () => {
- await setup({
- snippet: {
- name: "Batman's snippet",
- description: "My snippet description",
- },
- remoteSyncType: "read-only",
- });
- });
-
- it("renders a disabled header name input", () => {
- expect(
- within(screen.getByTestId("snippet-header")).getByRole("textbox"),
- ).toBeDisabled();
- });
-
- it("renders a disabled code editor", () => {
- expect(screen.getByTestId("snippet-editor")).toBeDisabled();
- });
-
- it("renders a disabled description input", async () => {
- await userEvent.click(
- within(screen.getByTestId("edit-snippet-page")).getByText(
- "My snippet description",
- ),
- );
- expect(screen.getByPlaceholderText("No description")).toBeDisabled();
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/index.ts
deleted file mode 100644
index 7fad9f2cc73..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export { DataStudioUpsellPage } from "./DataStudioUpsellPage";
-export type { DataStudioUpsellPageProps } from "./DataStudioUpsellPage";
-export { DependenciesUpsellPage } from "./DependenciesUpsellPage";
-export { GitSyncUpsellPage } from "./GitSyncUpsellPage";
-export { LibraryUpsellPage } from "./LibraryUpsellPage";
-export { PythonTransformsUpsellModal } from "./PythonTransformsUpsellModal";
-export { TransformsPurchasePage } from "./TransformsPurchasePage";
-export { TransformsSettingUpModal } from "./TransformsSettingUpModal";
-export { TransformsUpsellPage } from "./TransformsUpsellPage";
-export { useTransformsBilling } from "./useTransformsBilling";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/EditTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/EditTransformMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx
index 58dbcfb7540..1049e672a43 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/EditTransformMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx
@@ -4,9 +4,10 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { useDispatch } from "metabase/lib/redux";
-import { transformEdit } from "metabase/lib/urls";
import * as Urls from "metabase/lib/urls";
+import { transformEdit } from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import type { EditTransformMenuProps } from "metabase/plugins/oss/database";
import {
Box,
Button,
@@ -27,10 +28,6 @@ import {
import { getCheckoutDisabledMessage } from "metabase-enterprise/data-studio/workspaces/utils";
import type { DatabaseId, Transform } from "metabase-types/api";
-type EditTransformMenuProps = {
- transform: Transform;
-};
-
export function EditTransformMenu({ transform }: EditTransformMenuProps) {
const dispatch = useDispatch();
const { sendErrorToast } = useMetadataToasts();
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/EditTransformMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/EditTransformMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts
index abed3ee2cbf..020affdbe2a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts
@@ -1,11 +1,9 @@
import { useMemo } from "react";
+import { useGetTransformQuery } from "metabase/api";
import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
-import {
- useGetTransformQuery,
- useGetWorkspaceTransformQuery,
-} from "metabase-enterprise/api";
+import { useGetWorkspaceTransformQuery } from "metabase-enterprise/api";
import type {
PythonTransformSource,
PythonTransformTableAliases,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceRunButton/WorkspaceRunButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceRunButton/WorkspaceRunButton.tsx
index 6a7fbd775bb..002f71dd71e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceRunButton/WorkspaceRunButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceRunButton/WorkspaceRunButton.tsx
@@ -1,4 +1,4 @@
-import { RunButton } from "metabase-enterprise/transforms/components/RunButton";
+import { RunButton } from "metabase/transforms/components/RunButton";
import type {
TransformId,
TransformJobId,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/WorkspaceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/WorkspaceSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx
index 540960cb4db..d51574a32ee 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/WorkspaceSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx
@@ -7,10 +7,12 @@ import { t } from "ttag";
import { ConfirmModal } from "metabase/common/components/ConfirmModal/ConfirmModal";
import { ForwardRefLink } from "metabase/common/components/Link";
+import S from "metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css";
import type { MetabaseColorKey } from "metabase/lib/colors/types";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import type { WorkspacesSectionProps } from "metabase/plugins/oss/database";
import { getLocation } from "metabase/selectors/routing";
import {
ActionIcon,
@@ -40,15 +42,9 @@ import type {
WorkspaceItem as WorkspaceItemType,
} from "metabase-types/api";
-import S from "./DataStudioLayout.module.css";
-
const TOOLTIP_OPEN_DELAY = 700;
-type WorkspacesSectionProps = {
- showLabel: boolean;
-};
-
-function WorkspacesSection({ showLabel }: WorkspacesSectionProps) {
+export function WorkspacesSection({ showLabel }: WorkspacesSectionProps) {
const dispatch = useDispatch();
const [isWorkspacesExpanded, setIsWorkspacesExpanded] = useState(true);
const { pathname } = useSelector(getLocation);
@@ -213,8 +209,6 @@ function WorkspacesSection({ showLabel }: WorkspacesSectionProps) {
);
}
-export { WorkspacesSection };
-
interface WorkspaceItemProps {
workspace: Workspace;
isSelected: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/index.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/index.tsx
index e2483819f32..73d60aad0db 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/index.tsx
@@ -2,10 +2,18 @@ import { PLUGIN_WORKSPACES } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { AdminDatabaseWorkspacesSection } from "./admin/AdminDatabaseWorkspacesSection";
+import { EditTransformMenu } from "./components/EditTransformMenu";
+import { WorkspacesSection } from "./components/WorkspaceSection";
+import { getDataStudioWorkspaceRoutes } from "./routes";
export function initializePlugin() {
if (hasPremiumFeature("workspaces")) {
+ PLUGIN_WORKSPACES.isEnabled = true;
PLUGIN_WORKSPACES.AdminDatabaseWorkspacesSection =
AdminDatabaseWorkspacesSection;
+ PLUGIN_WORKSPACES.WorkspacesSection = WorkspacesSection;
+ PLUGIN_WORKSPACES.getDataStudioWorkspaceRoutes =
+ getDataStudioWorkspaceRoutes;
+ PLUGIN_WORKSPACES.EditTransformMenu = EditTransformMenu;
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/AddTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/AddTransformMenu.tsx
index e29f39e1c3f..23857544b64 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/AddTransformMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/AddTransformMenu.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
-import { ActionIcon, Icon, Menu, Tooltip } from "metabase/ui";
import {
getInitialNativeSource,
getInitialPythonSource,
-} from "metabase-enterprise/transforms/pages/NewTransformPage/utils";
+} from "metabase/transforms/pages/NewTransformPage/utils";
+import { ActionIcon, Icon, Menu, Tooltip } from "metabase/ui";
import type { DatabaseId, TransformSource } from "metabase-types/api";
import { createMockTransform } from "metabase-types/api/mocks/transform";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx
index d09e68c7293..ce51c4a4b0a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx
@@ -1,13 +1,12 @@
import { useCallback } from "react";
import { t } from "ttag";
-import { skipToken } from "metabase/api";
+import { skipToken, useLazyGetTransformQuery } from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Stack, Text } from "metabase/ui";
import {
useGetExternalTransformsQuery,
- useLazyGetTransformQuery,
useLazyGetWorkspaceTransformQuery,
} from "metabase-enterprise/api";
import { getCheckoutDisabledMessage } from "metabase-enterprise/data-studio/workspaces/utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/DataTab/DataTabSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/DataTab/DataTabSidebar.tsx
index 336ff9aac8a..4af6cd210cd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/DataTab/DataTabSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/DataTab/DataTabSidebar.tsx
@@ -1,12 +1,12 @@
import { useMemo } from "react";
import { t } from "ttag";
+import { useListTransformsQuery } from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
import { Stack, Text } from "metabase/ui";
import {
DEFAULT_WORKSPACE_TABLES_QUERY_RESPONSE,
useGetWorkspaceTablesQuery,
- useListTransformsQuery,
} from "metabase-enterprise/api";
import type {
DatabaseId,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx
index c7344248c8c..b76f7f55891 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx
@@ -1,7 +1,7 @@
import { PLUGIN_METABOT } from "metabase/plugins";
+import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";
import type { MetabotSuggestionActions } from "metabase-enterprise/metabot/context";
import { useRegisterMetabotSuggestionActions } from "metabase-enterprise/metabot/context";
-import { useRegisterMetabotTransformContext } from "metabase-enterprise/transforms/hooks/use-register-transform-metabot-context";
import type {
DraftTransformSource,
TaggedTransform,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.tsx
index a2c41e8ccba..10f3e31dd72 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.tsx
@@ -4,7 +4,7 @@ import _ from "underscore";
import {
TransformQueryPageEditor,
type TransformQueryPageEditorUiState,
-} from "metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage";
+} from "metabase/transforms/pages/TransformQueryPage/TransformQueryPage";
import type { DatasetQuery, DraftTransformSource } from "metabase-types/api";
type TransformEditorProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.unit.spec.tsx
index 94caf230a85..2eaa32f43ec 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformEditor.unit.spec.tsx
@@ -31,7 +31,7 @@ const mockTransformQueryPageEditor = jest.fn((_props: MockProps) => (
));
jest.mock(
- "metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage",
+ "metabase/transforms/pages/TransformQueryPage/TransformQueryPage",
() => ({
TransformQueryPageEditor: (props: MockProps) =>
mockTransformQueryPageEditor(props),
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx
index da24eafb6e9..169a178f8f5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx
@@ -4,6 +4,9 @@ import { t } from "ttag";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
+import { CreateTransformModal } from "metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal";
+import type { NewTransformValues } from "metabase/transforms/pages/NewTransformPage/CreateTransformModal/form";
+import { isSourceEmpty } from "metabase/transforms/utils";
import { Button } from "metabase/ui";
import {
useCreateWorkspaceTransformMutation,
@@ -11,9 +14,6 @@ import {
workspaceApi,
} from "metabase-enterprise/api";
import { idTag, listTag } from "metabase-enterprise/api/tags";
-import { CreateTransformModal } from "metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal";
-import type { NewTransformValues } from "metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/form";
-import { isSourceEmpty } from "metabase-enterprise/transforms/utils";
import type {
CreateWorkspaceTransformRequest,
DatabaseId,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTab.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTab.tsx
index 9fc0a2828d6..cddb7da85f5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTab.tsx
@@ -5,6 +5,11 @@ import { t } from "ttag";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
+import { RunStatus } from "metabase/transforms/components/RunStatus";
+import {
+ getInitialNativeSource,
+ getInitialPythonSource,
+} from "metabase/transforms/pages/NewTransformPage/utils";
import { Box, Button, Group, Icon, Stack } from "metabase/ui";
import { useDryRunWorkspaceTransformMutation } from "metabase-enterprise/api";
import { useWorkspaceTransformRun } from "metabase-enterprise/data-studio/workspaces/hooks";
@@ -12,11 +17,6 @@ import {
deactivateSuggestedTransform,
getMetabotSuggestedTransform,
} from "metabase-enterprise/metabot/state";
-import { RunStatus } from "metabase-enterprise/transforms/components/RunStatus";
-import {
- getInitialNativeSource,
- getInitialPythonSource,
-} from "metabase-enterprise/transforms/pages/NewTransformPage/utils";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx
index 888166c66ad..6c0080e48ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx
@@ -18,10 +18,10 @@ import {
} from "metabase/forms";
import * as Errors from "metabase/lib/errors";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { SchemaFormSelect } from "metabase/transforms/components/SchemaFormSelect";
+import { sourceDatabaseId } from "metabase/transforms/utils";
import { Box, Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
import { useUpdateWorkspaceTransformMutation } from "metabase-enterprise/api";
-import { SchemaFormSelect } from "metabase-enterprise/transforms/components/SchemaFormSelect";
-import { sourceDatabaseId } from "metabase-enterprise/transforms/utils";
import type {
UpdateWorkspaceTransformRequest,
WorkspaceTransform,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/useEditedTransform.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/useEditedTransform.ts
index 71b841a7374..10008c94798 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/useEditedTransform.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/useEditedTransform.ts
@@ -1,4 +1,4 @@
-import { isSameSource } from "metabase-enterprise/transforms/utils";
+import { isSameSource } from "metabase/transforms/utils";
import type {
AnyWorkspaceTransform,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx
index 22913cbdce1..005c63f93df 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx
@@ -22,9 +22,11 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { ResizeHandle } from "metabase/common/components/ResizeHandle";
import { Sortable } from "metabase/common/components/Sortable";
+import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
import { useDispatch } from "metabase/lib/redux";
import { checkNotNull } from "metabase/lib/types";
import * as Urls from "metabase/lib/urls";
+import { NAME_MAX_LENGTH } from "metabase/transforms/constants";
import {
ActionIcon,
Box,
@@ -36,10 +38,8 @@ import {
Tabs,
Text,
} from "metabase/ui";
-import { PaneHeaderInput } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import { MergeWorkspaceModal } from "metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/MergeWorkspaceModal";
import { RunWorkspaceMenu } from "metabase-enterprise/data-studio/workspaces/components/RunWorkspaceMenu/RunWorkspaceMenu";
-import { NAME_MAX_LENGTH } from "metabase-enterprise/transforms/constants";
import { isWorkspaceUninitialized } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspaceProvider.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspaceProvider.tsx
index b163eabb7fd..0c4a16da21b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspaceProvider.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspaceProvider.tsx
@@ -8,7 +8,7 @@ import {
} from "react";
import { checkNotNull } from "metabase/lib/types";
-import { isSameSource } from "metabase-enterprise/transforms/utils";
+import { isSameSource } from "metabase/transforms/utils";
import type {
DatasetQuery,
DraftTransformSource,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts
index e76c0d74373..db6af2905e4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts
@@ -2,11 +2,11 @@ import { useCallback, useState } from "react";
import { replace } from "react-router-redux";
import { t } from "ttag";
+import { useLazyGetTransformQuery } from "metabase/api";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
- useLazyGetTransformQuery,
useLazyGetWorkspaceTablesQuery,
useLazyGetWorkspaceTransformQuery,
useMergeWorkspaceMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts
index 0847eff87af..c1a47d05d71 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts
@@ -2,12 +2,12 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
+import { useLazyGetTransformQuery } from "metabase/api";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useRegisterMetabotContextProvider } from "metabase/metabot";
import { PLUGIN_METABOT } from "metabase/plugins";
import { getIsWorkspace } from "metabase/selectors/routing";
-import { useLazyGetTransformQuery } from "metabase-enterprise/api";
import { METABOT_PROFILE_OVERRIDES } from "metabase-enterprise/metabot/constants";
import type {
ApplySuggestionPayload,
@@ -19,7 +19,6 @@ import { useMetabotReactions } from "metabase-enterprise/metabot/hooks/use-metab
import type {
MetabotConverstationState,
MetabotState,
- MetabotSuggestedTransform,
} from "metabase-enterprise/metabot/state";
import {
activateSuggestedTransform,
@@ -31,6 +30,7 @@ import { useEnterpriseSelector } from "metabase-enterprise/redux";
import type {
DatabaseId,
DraftTransformSource,
+ MetabotSuggestedTransform,
TaggedTransform,
Transform,
UnsavedTransform,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/utils/guards.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/utils/guards.ts
index 33b6df17cd2..7a435dbcfda 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/utils/guards.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/utils/guards.ts
@@ -1,5 +1,8 @@
-import type { MetabotSuggestedTransform } from "metabase-enterprise/metabot/state";
-import type { MetabotTransformInfo, Transform } from "metabase-types/api";
+import type {
+ MetabotSuggestedTransform,
+ MetabotTransformInfo,
+ Transform,
+} from "metabase-types/api";
export const isSavedTransformInfo = (
transform: MetabotTransformInfo | MetabotSuggestedTransform | undefined,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.ts
index af3296994ea..879e13bee4e 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/utils.ts
@@ -5,7 +5,7 @@ import type {
OmniPickerTableItem,
OmniPickerValue,
} from "metabase/common/components/Pickers";
-import type { TransformPickerItem } from "metabase/plugins";
+import type { TransformPickerItem } from "metabase/plugins/oss/transforms";
import type {
CardType,
DependencyEntry,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx
index 2342d3d8e2d..6986354a84f 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx
@@ -1,13 +1,13 @@
import { memo } from "react";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import {
PaneHeader,
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import * as Urls from "metabase/lib/urls";
export const DependencyHeader = memo(function DependencyHeader() {
const tabs: PaneHeaderTab[] = [
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
index 8d5160ebf1d..78dffb4c440 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
@@ -9,6 +9,7 @@ import { P, match } from "ts-pattern";
import { t } from "ttag";
import _ from "underscore";
+import { useLazyGetTransformQuery } from "metabase/api";
import { CodeMirror } from "metabase/common/components/CodeMirror";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
@@ -26,7 +27,6 @@ import {
Paper,
Text,
} from "metabase/ui";
-import { useLazyGetTransformQuery } from "metabase-enterprise/api";
import { useMetabotSuggestionActions } from "metabase-enterprise/metabot/context";
import {
type MetabotAgentEditSuggestionChatMessage,
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx
index ea15f614ca9..7ad5d2ffa30 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx
@@ -4,7 +4,10 @@ import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
import { renderWithProviders } from "__support__/ui";
-import type { MetabotTransformInfo } from "metabase-types/api";
+import type {
+ MetabotSuggestedTransform,
+ MetabotTransformInfo,
+} from "metabase-types/api";
import {
createMockNativeDatasetQuery,
createMockUser,
@@ -15,10 +18,7 @@ import {
} from "metabase-types/api/mocks/transform";
import { createMockState } from "metabase-types/store/mocks";
-import type {
- MetabotAgentEditSuggestionChatMessage,
- MetabotSuggestedTransform,
-} from "../../state/types";
+import type { MetabotAgentEditSuggestionChatMessage } from "../../state/types";
import { AgentSuggestionMessage } from "./MetabotAgentSuggestionMessage";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/context.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/context.tsx
index 9f0a37b8b55..e5e4d595765 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/context.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/context.tsx
@@ -23,12 +23,11 @@ import {
} from "metabase/selectors/user";
import type {
MetabotChatContext,
+ MetabotSuggestedTransform,
MetabotTransformInfo,
TaggedTransform,
} from "metabase-types/api";
-import type { MetabotSuggestedTransform } from "./state";
-
export type ApplySuggestionPayload = {
editorTransform: MetabotTransformInfo | undefined;
suggestedTransform: MetabotSuggestedTransform;
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx
index c3c8177f961..36d5b2faee5 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx
@@ -3,22 +3,28 @@ import { Route } from "react-router";
import type { MetabotContext as MetabotContextType } from "metabase/metabot";
import { PLUGIN_METABOT, PLUGIN_REDUCERS } from "metabase/plugins";
import { useLazyMetabotGenerateContentQuery } from "metabase-enterprise/api";
-import { getAdminRoutes as getAdminUpsellRoutes } from "metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage";
-import { MetabotDataStudioSidebar } from "metabase-enterprise/metabot/components/MetabotDataStudioSidebar";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { Metabot } from "./components/Metabot";
import { getAdminRoutes } from "./components/MetabotAdmin/MetabotAdminPage";
+import { getAdminRoutes as getAdminUpsellRoutes } from "./components/MetabotAdmin/MetabotPurchasePage";
import { MetabotAppBarButton } from "./components/MetabotAppBarButton";
import { MetabotChat } from "./components/MetabotChat";
import MetabotThinkingStyles from "./components/MetabotChat/MetabotThinking.module.css";
import { MetabotDataStudioButton } from "./components/MetabotDataStudioButton";
+import { MetabotDataStudioSidebar } from "./components/MetabotDataStudioSidebar";
import { MetabotQueryBuilder } from "./components/MetabotQueryBuilder";
import { getMetabotQuickLinks } from "./components/MetabotQuickLinks";
import { getNewMenuItemAIExploration } from "./components/NewMenuItemAIExploration";
import { MetabotContext, MetabotProvider, defaultContext } from "./context";
import { useMetabotSQLSuggestion as useMetabotSQLSuggestionEE } from "./hooks";
-import { getMetabotVisible, metabotReducer } from "./state";
+import {
+ deactivateSuggestedTransform,
+ getMetabotSuggestedTransform,
+ getMetabotVisible,
+ metabotReducer,
+} from "./state";
+
/**
* This is for Metabot in embedding
*
@@ -59,6 +65,8 @@ export function initializePlugin() {
// hooks
useMetabotSQLSuggestion: useMetabotSQLSuggestionEE,
useLazyMetabotGenerateContentQuery,
+ getMetabotSuggestedTransform,
+ deactivateSuggestedTransform,
});
} else if (hasPremiumFeature("hosting")) {
Object.assign(PLUGIN_METABOT, {
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.ts b/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.ts
index a02b21972e4..57d0adde81e 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.ts
@@ -7,6 +7,7 @@ import { uuid } from "metabase/lib/uuid";
import type {
MetabotCodeEdit,
MetabotHistory,
+ MetabotSuggestedTransform,
SuggestedTransform,
} from "metabase-types/api";
@@ -25,7 +26,6 @@ import type {
MetabotAgentChatMessage,
MetabotChatMessage,
MetabotErrorMessage,
- MetabotSuggestedTransform,
MetabotToolCall,
MetabotUserChatMessage,
} from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/types.ts b/enterprise/frontend/src/metabase-enterprise/metabot/state/types.ts
index 930b8ec7158..a0db8d9a607 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/state/types.ts
@@ -3,9 +3,9 @@ import type { EnterpriseState } from "metabase-enterprise/shared/types";
import type {
MetabotCodeEdit,
MetabotHistory,
+ MetabotSuggestedTransform,
MetabotTodoItem,
MetabotTransformInfo,
- SuggestedTransform,
} from "metabase-types/api";
export type MetabotUserTextChatMessage = {
@@ -88,11 +88,6 @@ export type MetabotToolCall = {
status: "started" | "ended";
};
-export type MetabotSuggestedTransform = SuggestedTransform & {
- active: boolean;
- suggestionId: string; // internal unique identifier for marking active/inactive
-};
-
export type MetabotReactionsState = {
navigateToPath: string | null;
suggestedCodeEdits: Partial<
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.ts
index ec72b0e5d1a..b5fb229b220 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.ts
@@ -3,12 +3,12 @@ import { createDraft } from "immer";
import {
type MetabotState,
- type MetabotSuggestedTransform,
activateSuggestedTransform,
addSuggestedTransform,
deactivateSuggestedTransform,
metabotReducer,
} from "metabase-enterprise/metabot/state";
+import type { MetabotSuggestedTransform } from "metabase-types/api";
import { createMockTransform } from "metabase-types/api/mocks/transform";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/plugins.ts b/enterprise/frontend/src/metabase-enterprise/plugins.ts
index 955111e3e72..767f723effe 100644
--- a/enterprise/frontend/src/metabase-enterprise/plugins.ts
+++ b/enterprise/frontend/src/metabase-enterprise/plugins.ts
@@ -20,7 +20,7 @@ import { initializePlugin as initializeCleanUp } from "./clean_up";
import { initializePlugin as initializeCollections } from "./collections";
import { initializePlugin as initializeContentTranslation } from "./content_translation";
import { initializePlugin as initializeContentVerification } from "./content_verification";
-import { initializePlugin as initializeDataStudio } from "./data-studio";
+import { initializePlugin as initializeLibrary } from "./data-studio/library";
import { initializePlugin as initializeWorkspaces } from "./data-studio/workspaces";
import { initializePlugin as initializeDatabaseReplication } from "./database_replication";
import { initializePlugin as initializeDatabaseRouting } from "./database_routing";
@@ -64,7 +64,6 @@ export function initializePlugins() {
initializeContentTranslation();
initializeContentVerification();
initializeDatabaseRouting();
- initializeDataStudio();
initializeRemoteSync();
initializeWhitelabel();
initializeEmbedding();
@@ -83,6 +82,7 @@ export function initializePlugins() {
initializeFeatureLevelPermissions();
initializeApplicationPermissions();
initializeGroupManagers();
+ initializeLibrary();
initializeUploadManagement();
initializeResourceDownloads();
initializeUserProvisioning();
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx
index a961133cb3e..a90cb5437eb 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx
@@ -1,10 +1,17 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { Form, FormProvider, FormSubmitButton } from "metabase/forms";
import type { CollectionSyncPreferences } from "metabase-types/api";
-import { createMockCollectionItem } from "metabase-types/api/mocks";
+import {
+ createMockCollectionItem,
+ createMockTokenFeatures,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
import { COLLECTIONS_KEY, TYPE_KEY } from "../../constants";
@@ -73,6 +80,16 @@ const setup = ({
const onSubmit = jest.fn();
+ const settings = mockSettings({
+ "token-features": createMockTokenFeatures(),
+ });
+ const state = createMockState({
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["transforms"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+
renderWithProviders(
<FormProvider
initialValues={{
@@ -86,6 +103,9 @@ const setup = ({
<FormSubmitButton label="Save" />
</Form>
</FormProvider>,
+ {
+ storeInitialState: state,
+ },
);
return { onSubmit };
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts
index 8b0a520bdb0..2ac4624fa47 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts
@@ -1,34 +1,11 @@
import { useCallback, useMemo } from "react";
-import type { RemoteSyncEntity } from "metabase-types/api";
+import type { RemoteSyncDirtyState } from "metabase/plugins/oss/remote-sync";
import { useGetRemoteSyncChangesQuery } from "../../api";
import { useGitSyncVisible } from "./use-git-sync-visible";
-export interface RemoteSyncDirtyState {
- /** Array of all dirty entities */
- dirty: RemoteSyncEntity[];
- /** Map of collection IDs that have dirty child entities */
- changedCollections: Record<number, boolean>;
- /** Whether any dirty changes exist globally */
- isDirty: boolean;
- /** Whether any entities have "removed" status */
- hasRemovedItems: boolean;
- /** Whether data is loading */
- isLoading: boolean;
- /** Check if a specific collection has dirty items */
- isCollectionDirty: (collectionId: number | string | undefined) => boolean;
- /** Check if any collection in a set has dirty items */
- hasAnyCollectionDirty: (collectionIds: Set<number> | number[]) => boolean;
- /** Check if any dirty entity (including collections) is in the given set of IDs */
- hasDirtyInCollectionTree: (collectionIds: Set<number>) => boolean;
- /** Refetch the dirty state data */
- refetch: () => ReturnType<
- ReturnType<typeof useGetRemoteSyncChangesQuery>["refetch"]
- >;
-}
-
export function useRemoteSyncDirtyState(): RemoteSyncDirtyState {
const { isVisible: isGitSyncVisible } = useGitSyncVisible();
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts
index 96c065c993d..23543656fbd 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts
@@ -3,7 +3,6 @@ import {
PLUGIN_REDUX_MIDDLEWARES,
PLUGIN_REMOTE_SYNC,
} from "metabase/plugins";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { LibraryNav } from "./LibraryNav";
@@ -20,8 +19,10 @@ import { REMOTE_SYNC_INVALIDATION_TAGS } from "./constants";
import { useGitSyncVisible } from "./hooks/use-git-sync-visible";
import { useHasLibraryDirtyChanges } from "./hooks/use-has-library-dirty-changes";
import { useHasTransformDirtyChanges } from "./hooks/use-has-transform-dirty-changes";
+import { useRemoteSyncDirtyState } from "./hooks/use-remote-sync-dirty-state";
import { useSyncStatus } from "./hooks/use-sync-status";
import { remoteSyncListenerMiddleware } from "./middleware/remote-sync-listener-middleware";
+import { getIsRemoteSyncReadOnly } from "./selectors";
import { remoteSyncReducer } from "./sync-task-slice";
/**
@@ -29,6 +30,7 @@ import { remoteSyncReducer } from "./sync-task-slice";
*/
export function initializePlugin() {
if (hasPremiumFeature("remote_sync")) {
+ PLUGIN_REMOTE_SYNC.isEnabled = true;
PLUGIN_REMOTE_SYNC.RemoteSyncSettings = RemoteSyncAdminSettings;
PLUGIN_REMOTE_SYNC.LibraryNav = LibraryNav;
PLUGIN_REMOTE_SYNC.SyncedCollectionsSidebarSection =
@@ -46,6 +48,7 @@ export function initializePlugin() {
PLUGIN_REMOTE_SYNC.useHasTransformDirtyChanges =
useHasTransformDirtyChanges;
PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly = getIsRemoteSyncReadOnly;
+ PLUGIN_REMOTE_SYNC.useRemoteSyncDirtyState = useRemoteSyncDirtyState;
PLUGIN_REDUX_MIDDLEWARES.push(remoteSyncListenerMiddleware.middleware);
PLUGIN_REDUCERS.remoteSyncPlugin = remoteSyncReducer;
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts
index 559165e3390..ceede3ee183 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts
@@ -11,11 +11,11 @@ import { snippetApi } from "metabase/api/snippet";
import { tableApi as coreTableApi } from "metabase/api/table";
import { timelineApi } from "metabase/api/timeline";
import { timelineEventApi } from "metabase/api/timeline-event";
+import { transformApi } from "metabase/api/transform";
+import { transformTagApi } from "metabase/api/transform-tag";
import { getCollectionFromCollectionsTree } from "metabase/selectors/collection";
import { pythonLibraryApi } from "metabase-enterprise/api/python-transform-library";
import { tableApi as enterpriseTableApi } from "metabase-enterprise/api/table";
-import { transformApi } from "metabase-enterprise/api/transform";
-import { transformTagApi } from "metabase-enterprise/api/transform-tag";
import type { CardId, CollectionId, DashboardId } from "metabase-types/api";
import type { State } from "metabase-types/store";
@@ -148,7 +148,7 @@ export const MODEL_MUTATION_CONFIGS: ModelMutationConfig[] = [
createEndpoints: [
enterpriseTableApi.endpoints.publishTables.matchFulfilled,
],
- updateEndpoints: [enterpriseTableApi.endpoints.editTables.matchFulfilled],
+ updateEndpoints: [coreTableApi.endpoints.editTables.matchFulfilled],
deleteEndpoints: [
enterpriseTableApi.endpoints.unpublishTables.matchFulfilled,
],
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
index 3367eaede98..2f0c235298d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
@@ -9,8 +9,8 @@ import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { RunButtonWithTooltip } from "metabase/query_builder/components/RunButtonWithTooltip";
import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";
-import { SHARED_LIB_IMPORT_PATH } from "metabase-enterprise/transforms-python/constants";
+import { SHARED_LIB_IMPORT_PATH } from "../../../constants";
import { PythonEditor } from "../../PythonEditor";
import { ResizableBoxHandle } from "./ResizableBoxHandle";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
index dfb99d0e772..006f394e0ad 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
@@ -6,12 +6,12 @@ import {
} from "metabase/api";
import { useSelector } from "metabase/lib/redux";
import { DatabaseDataSelector } from "metabase/query_builder/components/DataSelector";
+import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";
+import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";
import { Flex } from "metabase/ui";
+import { EditTransformMenu } from "metabase-enterprise/data-studio/workspaces/components/EditTransformMenu";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import { hasPremiumFeature } from "metabase-enterprise/settings";
-import { EditDefinitionButton } from "metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton";
-import { EditTransformMenu } from "metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu";
-import { doesDatabaseSupportTransforms } from "metabase-enterprise/transforms/utils";
import type { Database, DatabaseId, Transform } from "metabase-types/api";
import S from "./PythonTransformTopBar.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformsUpsellModal.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/PythonTransformsUpsellModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformsUpsellModal.tsx
index 5b075a5ba9f..4b1a32792d6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/PythonTransformsUpsellModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformsUpsellModal.tsx
@@ -12,21 +12,17 @@ import { useUpsellLink } from "metabase/admin/upsells/components/use-upsell-link
import { UPGRADE_URL } from "metabase/admin/upsells/constants";
import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
+import type { PythonTransformsUpsellModalProps } from "metabase/plugins/oss/transforms";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getIsHosted } from "metabase/setup/selectors";
import { Button, Flex, Modal, Stack, Text, Title } from "metabase/ui";
import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";
-import { TransformsSettingUpModal } from "./TransformsSettingUpModal";
+import { TransformsSettingUpModal } from "../../transforms/upsells/TransformsSettingUpModal";
const CAMPAIGN = "data-studio-python-transforms";
const LOCATION = "data-studio-transforms";
-type PythonTransformsUpsellModalProps = {
- isOpen: boolean;
- onClose: () => void;
-};
-
export function PythonTransformsUpsellModal({
isOpen,
onClose,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
index 2d37e8104b5..b2b437926fe 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
@@ -2,6 +2,8 @@ import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { PythonTransformEditor } from "./components/PythonTransformEditor";
+import { PythonTransformsUpsellModal } from "./components/PythonTransformsUpsellModal";
+import { SHARED_LIB_IMPORT_PATH } from "./constants";
import { PythonRunnerSettingsPage } from "./pages/PythonRunnerSettingsPage";
import { getPythonLibraryRoutes } from "./routes";
import { getPythonSourceValidationResult } from "./utils";
@@ -18,5 +20,9 @@ export function initializePlugin() {
PLUGIN_TRANSFORMS_PYTHON.TransformEditor = PythonTransformEditor;
PLUGIN_TRANSFORMS_PYTHON.PythonRunnerSettingsPage =
PythonRunnerSettingsPage;
+ PLUGIN_TRANSFORMS_PYTHON.sharedLibImportPath = SHARED_LIB_IMPORT_PATH;
+ } else {
+ PLUGIN_TRANSFORMS_PYTHON.PythonTransformsUpsellModal =
+ PythonTransformsUpsellModal;
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
index addcb06e08b..65a511a730f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
@@ -1,13 +1,13 @@
import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
-import * as Urls from "metabase/lib/urls";
-import { Button, Group } from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import {
PaneHeader,
PanelHeaderTitle,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import * as Urls from "metabase/lib/urls";
+import { Button, Group } from "metabase/ui";
type PythonLibraryEditorHeaderProps = {
isDirty?: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
index 7a07419597b..54c438e16cd 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
@@ -4,6 +4,7 @@ import { t } from "ttag";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { isResourceNotFoundError } from "metabase/lib/errors";
import { useSelector } from "metabase/lib/redux";
import type * as Urls from "metabase/lib/urls";
@@ -13,7 +14,6 @@ import {
useGetPythonLibraryQuery,
useUpdatePythonLibraryMutation,
} from "metabase-enterprise/api/python-transform-library";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import { PythonEditor } from "../../components/PythonEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/index.ts
new file mode 100644
index 00000000000..bc7dd9a1bd1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/index.ts
@@ -0,0 +1,15 @@
+import { PLUGIN_TRANSFORMS } from "metabase/plugins";
+import { hasPremiumFeature } from "metabase-enterprise/settings";
+
+import { TransformsUpsellPage } from "./upsells/TransformsUpsellPage";
+
+// transforms is not a regular plugin, but a set of addons - basic transforms + python transforms
+export function initializePlugin() {
+ PLUGIN_TRANSFORMS.TransformsUpsellPage = TransformsUpsellPage;
+
+ if (hasPremiumFeature("transforms")) {
+ PLUGIN_TRANSFORMS.isEnabled = true;
+ } else {
+ PLUGIN_TRANSFORMS.isEnabled = false;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
deleted file mode 100644
index e5c368d0173..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PLUGIN_ENTITIES, PLUGIN_TRANSFORMS } from "metabase/plugins";
-import { getUser, getUserIsAdmin } from "metabase/selectors/user";
-import { transformApi, useGetTransformQuery } from "metabase-enterprise/api";
-import { Transforms } from "metabase-enterprise/entities/transforms";
-import { hasPremiumFeature } from "metabase-enterprise/settings";
-import type { State } from "metabase-types/store";
-
-import { getDataStudioTransformRoutes } from "./routes";
-import { getRootCollectionItem } from "./utils";
-
-const canAccessTransforms = (state: State): boolean => {
- if (getUserIsAdmin(state)) {
- return true;
- }
- const user = getUser(state);
- return user?.permissions?.can_access_transforms ?? false;
-};
-
-/**
- * Initialize transforms plugin features.
- * Transforms are available:
- * - On self-hosted: always (no license required)
- * - On hosted: only with transforms add-on
- */
-export function initializePlugin() {
- const isHosted = hasPremiumFeature("hosting");
- const hasTransformsFeature = hasPremiumFeature("transforms");
- const shouldEnable = !isHosted || hasTransformsFeature;
-
- if (shouldEnable) {
- PLUGIN_TRANSFORMS.isEnabled = true;
- PLUGIN_ENTITIES.entities["transforms"] = Transforms;
- PLUGIN_TRANSFORMS.canAccessTransforms = canAccessTransforms;
- PLUGIN_TRANSFORMS.getDataStudioTransformRoutes =
- getDataStudioTransformRoutes;
- PLUGIN_TRANSFORMS.useGetTransformQuery = useGetTransformQuery;
- PLUGIN_TRANSFORMS.getRootCollectionItem = getRootCollectionItem;
- // @ts-expect-error - FIXME: this is a nightmare to type, and it's moving to OSS anyway
- PLUGIN_TRANSFORMS.transformApi = transformApi;
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsPurchasePage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsPurchasePage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsPurchasePage.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsPurchasePage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsSettingUpModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsSettingUpModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsSettingUpModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsSettingUpModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsUpsellPage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsUpsellPage.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsUpsellPage.tsx
index 97ca89557f0..92722d259c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/TransformsUpsellPage.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
+import { DataStudioUpsellPage } from "metabase/data-studio/upsells";
import { useSelector } from "metabase/lib/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
-import { DataStudioUpsellPage } from "./DataStudioUpsellPage";
import { TransformsPurchasePage } from "./TransformsPurchasePage";
export function TransformsUpsellPage() {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/useTransformsBilling.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/useTransformsBilling.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/upsells/useTransformsBilling.ts
diff --git a/frontend/src/metabase-types/api/transform.ts b/frontend/src/metabase-types/api/transform.ts
index 7751abc7418..75f05b64f2d 100644
--- a/frontend/src/metabase-types/api/transform.ts
+++ b/frontend/src/metabase-types/api/transform.ts
@@ -302,3 +302,8 @@ export type QueryComplexity = {
is_simple: boolean;
reason: string;
};
+
+export type MetabotSuggestedTransform = SuggestedTransform & {
+ active: boolean;
+ suggestionId: string; // internal unique identifier for marking active/inactive
+};
diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.ts
index 39bccefe8b8..af76ea8a9de 100644
--- a/frontend/src/metabase/api/index.ts
+++ b/frontend/src/metabase/api/index.ts
@@ -41,6 +41,9 @@ export * from "./table";
export * from "./task";
export * from "./timeline";
export * from "./timeline-event";
+export * from "./transform";
+export * from "./transform-job";
+export * from "./transform-tag";
export * from "./user-key-value";
export * from "./user";
export * from "./analytics";
diff --git a/frontend/src/metabase/api/table.ts b/frontend/src/metabase/api/table.ts
index f9713931960..22bf6c337be 100644
--- a/frontend/src/metabase/api/table.ts
+++ b/frontend/src/metabase/api/table.ts
@@ -1,10 +1,16 @@
import { updateMetadata } from "metabase/lib/redux/metadata";
import { ForeignKeySchema, TableSchema } from "metabase/schema";
import type {
+ BulkTableSelection,
+ BulkTableSelectionInfo,
+ DiscardTablesValuesRequest,
+ EditTablesRequest,
ForeignKey,
GetTableDataRequest,
GetTableQueryMetadataRequest,
GetTableRequest,
+ RescanTablesValuesRequest,
+ SyncTablesSchemaRequest,
Table,
TableData,
TableId,
@@ -19,6 +25,7 @@ import {
idTag,
invalidateTags,
listTag,
+ provideBulkTableSelectionInfoTags,
provideTableListTags,
provideTableTags,
tag,
@@ -155,6 +162,65 @@ export const tableApi = Api.injectEndpoints({
invalidatesTags: (_, error) =>
invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
}),
+
+ /// DATA STUDIO
+ getTableSelectionInfo: builder.query<
+ BulkTableSelectionInfo,
+ BulkTableSelection
+ >({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/data-studio/table/selection",
+ body,
+ }),
+ providesTags: (response) =>
+ response ? provideBulkTableSelectionInfoTags(response) : [],
+ }),
+ editTables: builder.mutation<Record<string, never>, EditTablesRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/data-studio/table/edit",
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("table"), tag("database"), tag("card")]),
+ }),
+ rescanTablesFieldValues: builder.mutation<void, RescanTablesValuesRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: `/api/data-studio/table/rescan-values`,
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
+ }),
+ syncTablesSchemas: builder.mutation<void, SyncTablesSchemaRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: `/api/data-studio/table/sync-schema`,
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [
+ tag("table"),
+ listTag("field"),
+ listTag("field-values"),
+ listTag("parameter-values"),
+ tag("card"),
+ ]),
+ }),
+ discardTablesFieldValues: builder.mutation<
+ void,
+ DiscardTablesValuesRequest
+ >({
+ query: (body) => ({
+ method: "POST",
+ url: `/api/data-studio/table/discard-values`,
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
+ }),
}),
});
@@ -172,6 +238,13 @@ export const {
useRescanTableFieldValuesMutation,
useSyncTableSchemaMutation,
useDiscardTableFieldValuesMutation,
+
+ useGetTableSelectionInfoQuery,
+ useLazyGetTableSelectionInfoQuery,
+ useEditTablesMutation,
+ useRescanTablesFieldValuesMutation,
+ useSyncTablesSchemasMutation,
+ useDiscardTablesFieldValuesMutation,
} = tableApi;
/**
diff --git a/frontend/src/metabase/api/tags/constants.ts b/frontend/src/metabase/api/tags/constants.ts
index 15bb0568a83..47f94e01d7f 100644
--- a/frontend/src/metabase/api/tags/constants.ts
+++ b/frontend/src/metabase/api/tags/constants.ts
@@ -17,6 +17,7 @@ export const TAG_TYPES = [
"database",
"dataset",
"document",
+ "external-transform",
"public-document",
"comment",
"embedding-hub-checklist",
@@ -40,13 +41,16 @@ export const TAG_TYPES = [
"snippet",
"subscription",
"subscription-channel",
- "transform",
"table",
"task",
"task-run",
"timeline",
"timeline-event",
"transform",
+ "transform-tag",
+ "transform-job",
+ "transform-job-via-tag",
+ "transform-run",
"user",
"public-dashboard",
"embed-dashboard",
diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.ts
index 36592d29071..39f85644c38 100644
--- a/frontend/src/metabase/api/tags/utils.ts
+++ b/frontend/src/metabase/api/tags/utils.ts
@@ -5,6 +5,8 @@ import type {
Alert,
ApiKey,
Bookmark,
+ BulkTableInfo,
+ BulkTableSelectionInfo,
Card,
CardId,
CardQueryMetadata,
@@ -42,6 +44,10 @@ import type {
TaskRun,
Timeline,
TimelineEvent,
+ Transform,
+ TransformJob,
+ TransformRun,
+ TransformTag,
UserInfo,
WritebackAction,
} from "metabase-types/api";
@@ -702,3 +708,80 @@ export function provideCommentTags(
return [idTag("comment", comment.id)];
}
+
+export function provideBulkTableInfoTags(
+ table: BulkTableInfo,
+): TagDescription<TagType>[] {
+ return [idTag("table", table.id)];
+}
+
+export function provideBulkTableSelectionInfoTags({
+ selected_table,
+ published_downstream_tables,
+ unpublished_upstream_tables,
+}: BulkTableSelectionInfo): TagDescription<TagType>[] {
+ return [
+ listTag("table"),
+ ...(selected_table != null ? provideBulkTableInfoTags(selected_table) : []),
+ ...published_downstream_tables.flatMap(provideBulkTableInfoTags),
+ ...unpublished_upstream_tables.flatMap(provideBulkTableInfoTags),
+ ];
+}
+
+export function provideTransformTags(
+ transform: Transform,
+): TagDescription<TagType>[] {
+ return [
+ idTag("transform", transform.id),
+ ...(transform.tag_ids?.flatMap((tag) => idTag("transform-tag", tag)) ?? []),
+ ];
+}
+
+export function provideTransformListTags(
+ transforms: Transform[],
+): TagDescription<TagType>[] {
+ return [listTag("transform"), ...transforms.flatMap(provideTransformTags)];
+}
+
+export function provideTransformRunTags(
+ run: TransformRun,
+): TagDescription<TagType>[] {
+ return [
+ idTag("transform-run", run.id),
+ ...(run.transform ? provideTransformTags(run.transform) : []),
+ ];
+}
+
+export function provideTransformRunListTags(
+ runs: TransformRun[],
+): TagDescription<TagType>[] {
+ return [listTag("transform-run"), ...runs.flatMap(provideTransformRunTags)];
+}
+
+export function provideTransformTagTags(
+ tag: TransformTag,
+): TagDescription<TagType>[] {
+ return [idTag("transform-tag", tag.id)];
+}
+
+export function provideTransformTagListTags(
+ tags: TransformTag[],
+): TagDescription<TagType>[] {
+ return [listTag("transform-tag"), ...tags.flatMap(provideTransformTagTags)];
+}
+
+export function provideTransformJobTags(
+ job: TransformJob,
+): TagDescription<TagType>[] {
+ return [
+ idTag("transform-job", job.id),
+ ...(job.tag_ids?.map((tagId) => idTag("transform-job-via-tag", tagId)) ??
+ []),
+ ];
+}
+
+export function provideTransformJobListTags(
+ jobs: TransformJob[],
+): TagDescription<TagType>[] {
+ return [listTag("transform-job"), ...jobs.flatMap(provideTransformJobTags)];
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform-job.ts b/frontend/src/metabase/api/transform-job.ts
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/api/transform-job.ts
rename to frontend/src/metabase/api/transform-job.ts
index c50c8f14741..9a3d39e4ab5 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/transform-job.ts
+++ b/frontend/src/metabase/api/transform-job.ts
@@ -7,7 +7,7 @@ import type {
UpdateTransformJobRequest,
} from "metabase-types/api";
-import { EnterpriseApi } from "./api";
+import { Api } from "./api";
import {
idTag,
invalidateTags,
@@ -18,12 +18,12 @@ import {
tag,
} from "./tags";
-export const transformJobApi = EnterpriseApi.injectEndpoints({
+export const transformJobApi = Api.injectEndpoints({
endpoints: (builder) => ({
listTransformJobs: builder.query<TransformJob[], ListTransformJobsRequest>({
query: (params) => ({
method: "GET",
- url: "/api/ee/transform-job",
+ url: "/api/transform-job",
params,
}),
providesTags: (jobs = []) => provideTransformJobListTags(jobs),
@@ -31,14 +31,14 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
getTransformJob: builder.query<TransformJob, TransformJobId>({
query: (id) => ({
method: "GET",
- url: `/api/ee/transform-job/${id}`,
+ url: `/api/transform-job/${id}`,
}),
providesTags: (job) => (job ? provideTransformJobTags(job) : []),
}),
listTransformJobTransforms: builder.query<Transform[], TransformJobId>({
query: (id) => ({
method: "GET",
- url: `/api/ee/transform-job/${id}/transforms`,
+ url: `/api/transform-job/${id}/transforms`,
}),
providesTags: (transforms = [], _error, id) => [
idTag("transform-job", id),
@@ -48,7 +48,7 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
runTransformJob: builder.mutation<void, TransformJobId>({
query: (id) => ({
method: "POST",
- url: `/api/ee/transform-job/${id}/run`,
+ url: `/api/transform-job/${id}/run`,
}),
invalidatesTags: (_, error, id) =>
invalidateTags(error, [
@@ -86,7 +86,7 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
>({
query: (body) => ({
method: "POST",
- url: "/api/ee/transform-job",
+ url: "/api/transform-job",
body,
}),
invalidatesTags: (_, error) =>
@@ -98,7 +98,7 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
>({
query: ({ id, ...body }) => ({
method: "PUT",
- url: `/api/ee/transform-job/${id}`,
+ url: `/api/transform-job/${id}`,
body,
}),
invalidatesTags: (_, error, { id, tag_ids = [] }) =>
@@ -130,7 +130,7 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
deleteTransformJob: builder.mutation<void, TransformJobId>({
query: (id) => ({
method: "DELETE",
- url: `/api/ee/transform-job/${id}`,
+ url: `/api/transform-job/${id}`,
}),
invalidatesTags: (_, error) =>
invalidateTags(error, [listTag("transform-job")]),
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts b/frontend/src/metabase/api/transform-tag.ts
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts
rename to frontend/src/metabase/api/transform-tag.ts
index 1d182c89a7d..50c86cfef8e 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts
+++ b/frontend/src/metabase/api/transform-tag.ts
@@ -5,7 +5,7 @@ import type {
UpdateTransformTagRequest,
} from "metabase-types/api";
-import { EnterpriseApi } from "./api";
+import { Api } from "./api";
import {
idTag,
invalidateTags,
@@ -13,12 +13,12 @@ import {
provideTransformTagListTags,
} from "./tags";
-export const transformTagApi = EnterpriseApi.injectEndpoints({
+export const transformTagApi = Api.injectEndpoints({
endpoints: (builder) => ({
listTransformTags: builder.query<TransformTag[], void>({
query: (params) => ({
method: "GET",
- url: "/api/ee/transform-tag",
+ url: "/api/transform-tag",
params,
}),
providesTags: (tags = []) => provideTransformTagListTags(tags),
@@ -29,7 +29,7 @@ export const transformTagApi = EnterpriseApi.injectEndpoints({
>({
query: (body) => ({
method: "POST",
- url: "/api/ee/transform-tag",
+ url: "/api/transform-tag",
body,
}),
invalidatesTags: (_, error) =>
@@ -41,7 +41,7 @@ export const transformTagApi = EnterpriseApi.injectEndpoints({
>({
query: ({ id, ...body }) => ({
method: "PUT",
- url: `/api/ee/transform-tag/${id}`,
+ url: `/api/transform-tag/${id}`,
body,
}),
invalidatesTags: (_, error, { id }) =>
@@ -53,7 +53,7 @@ export const transformTagApi = EnterpriseApi.injectEndpoints({
deleteTransformTag: builder.mutation<void, TransformTagId>({
query: (id) => ({
method: "DELETE",
- url: `/api/ee/transform-tag/${id}`,
+ url: `/api/transform-tag/${id}`,
}),
invalidatesTags: (_, error, id) =>
invalidateTags(error, [
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform.ts b/frontend/src/metabase/api/transform.ts
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/api/transform.ts
rename to frontend/src/metabase/api/transform.ts
index 74bdd141957..3cee0c36d61 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/transform.ts
+++ b/frontend/src/metabase/api/transform.ts
@@ -14,7 +14,7 @@ import type {
UpdateTransformRequest,
} from "metabase-types/api";
-import { EnterpriseApi } from "./api";
+import { Api } from "./api";
import {
idTag,
invalidateTags,
@@ -25,12 +25,12 @@ import {
tag,
} from "./tags";
-export const transformApi = EnterpriseApi.injectEndpoints({
+export const transformApi = Api.injectEndpoints({
endpoints: (builder) => ({
listTransforms: builder.query<Transform[], ListTransformsRequest>({
query: (params) => ({
method: "GET",
- url: "/api/ee/transform",
+ url: "/api/transform",
params,
}),
providesTags: (transforms = []) => provideTransformListTags(transforms),
@@ -41,7 +41,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
>({
query: (params) => ({
method: "GET",
- url: "/api/ee/transform/run",
+ url: "/api/transform/run",
params,
}),
providesTags: (response) =>
@@ -50,26 +50,15 @@ export const transformApi = EnterpriseApi.injectEndpoints({
getTransform: builder.query<Transform, TransformId>({
query: (id) => ({
method: "GET",
- url: `/api/ee/transform/${id}`,
+ url: `/api/transform/${id}`,
}),
providesTags: (transform) =>
transform ? provideTransformTags(transform) : [],
}),
- listTransformDependencies: builder.query<Transform[], TransformId>({
- query: (id) => ({
- method: "GET",
- url: `/api/ee/transform/${id}/dependencies`,
- }),
- providesTags: (transforms, error, id) =>
- invalidateTags(error, [
- idTag("transform", id),
- ...(transforms?.flatMap(provideTransformTags) ?? []),
- ]),
- }),
runTransform: builder.mutation<RunTransformResponse, TransformId>({
query: (id) => ({
method: "POST",
- url: `/api/ee/transform/${id}/run`,
+ url: `/api/transform/${id}/run`,
}),
invalidatesTags: (_, error, id) =>
invalidateTags(error, [
@@ -110,7 +99,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
cancelCurrentTransformRun: builder.mutation<void, TransformId>({
query: (id) => ({
method: "POST",
- url: `/api/ee/transform/${id}/cancel`,
+ url: `/api/transform/${id}/cancel`,
}),
invalidatesTags: (_, error, id) =>
invalidateTags(error, [idTag("transform", id), tag("table")]),
@@ -141,9 +130,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
// completed (in either succeeded, failed, timeout or canceled state).
// We just don't know which state it is, so we leave it in canceling
// state and trigger a re-fetch of the transform to get the latest state.
- dispatch(
- EnterpriseApi.util.invalidateTags([idTag("transform", id)]),
- );
+ dispatch(Api.util.invalidateTags([idTag("transform", id)]));
}
}
},
@@ -151,7 +138,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
createTransform: builder.mutation<Transform, CreateTransformRequest>({
query: (body) => ({
method: "POST",
- url: "/api/ee/transform",
+ url: "/api/transform",
body,
}),
invalidatesTags: (_, error) =>
@@ -163,7 +150,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
updateTransform: builder.mutation<Transform, UpdateTransformRequest>({
query: ({ id, ...body }) => ({
method: "PUT",
- url: `/api/ee/transform/${id}`,
+ url: `/api/transform/${id}`,
body,
}),
invalidatesTags: (_, error, { id, collection_id }) => {
@@ -196,7 +183,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
deleteTransform: builder.mutation<void, TransformId>({
query: (id) => ({
method: "DELETE",
- url: `/api/ee/transform/${id}`,
+ url: `/api/transform/${id}`,
}),
invalidatesTags: (_, error, id) =>
invalidateTags(error, [listTag("transform"), idTag("transform", id)]),
@@ -204,7 +191,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
deleteTransformTarget: builder.mutation<void, TransformId>({
query: (id) => ({
method: "DELETE",
- url: `/api/ee/transform/${id}/table`,
+ url: `/api/transform/${id}/table`,
}),
invalidatesTags: (_, error) =>
invalidateTags(error, [listTag("transform"), listTag("table")]),
@@ -215,7 +202,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
>({
query: (body) => ({
method: "POST",
- url: "/api/ee/transform/extract-columns",
+ url: "/api/transform/extract-columns",
body,
}),
}),
@@ -225,7 +212,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
>({
query: (queryString) => ({
method: "POST",
- url: "/api/ee/transform/is-simple-query",
+ url: "/api/transform/is-simple-query",
body: { query: queryString },
}),
}),
@@ -235,7 +222,6 @@ export const transformApi = EnterpriseApi.injectEndpoints({
export const {
useListTransformsQuery,
useListTransformRunsQuery,
- useListTransformDependenciesQuery,
useGetTransformQuery,
useLazyGetTransformQuery,
useRunTransformMutation,
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index eac6d9b98e0..38b025952e5 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -11,10 +11,7 @@ import { useDocsUrl } from "metabase/common/hooks";
import { useFetchMetrics } from "metabase/common/hooks/use-fetch-metrics";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import {
- PLUGIN_CONTENT_VERIFICATION,
- PLUGIN_DATA_STUDIO,
-} from "metabase/plugins";
+import { PLUGIN_CONTENT_VERIFICATION, PLUGIN_LIBRARY } from "metabase/plugins";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { canUserCreateQueries } from "metabase/selectors/user";
import {
@@ -56,7 +53,7 @@ export function BrowseMetrics() {
const titleId = useMemo(() => _.uniqueId("browse-metrics"), []);
const libraryMetricCollection =
- PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType({
+ PLUGIN_LIBRARY.useGetLibraryChildCollectionByType({
type: "library-metrics",
});
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
index fb59bd484ae..dc50aa0bc3f 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
@@ -7,7 +7,7 @@ import {
isRootTrashCollection,
} from "metabase/collections/utils";
import { NewItemMenu } from "metabase/common/components/NewItemMenu";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { getLibraryCollectionType } from "metabase/data-studio/utils";
import { Box, Button, Icon, Stack, Text, useMantineTheme } from "metabase/ui";
import type { Collection } from "metabase-types/api";
@@ -84,7 +84,7 @@ const DefaultCollectionEmptyState = ({
};
function getDefaultEmptyStateMessages(collection: Collection | undefined) {
- switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection?.type)) {
+ switch (getLibraryCollectionType(collection?.type)) {
case "data":
return {
title: t`No published tables yet`,
diff --git a/frontend/src/metabase/collections/utils.ts b/frontend/src/metabase/collections/utils.ts
index e1ed5201ea3..158c63461a1 100644
--- a/frontend/src/metabase/collections/utils.ts
+++ b/frontend/src/metabase/collections/utils.ts
@@ -1,6 +1,11 @@
import { t } from "ttag";
-import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import {
+ canPlaceEntityInCollection as canPlaceEntityInCollectionImpl,
+ canPlaceEntityInCollectionOrDescendants as canPlaceEntityInCollectionOrDescendantsImpl,
+ getLibraryCollectionType,
+} from "metabase/data-studio/utils";
+import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import {
type CardType,
type Collection,
@@ -122,7 +127,7 @@ export function isSyncedCollection(collection: Partial<Collection>): boolean {
export function isLibraryCollection(
collection: Pick<Collection, "type">,
): boolean {
- return PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type) != null;
+ return getLibraryCollectionType(collection.type) != null;
}
export function isExamplesCollection(collection: Collection): boolean {
@@ -263,17 +268,14 @@ export function canPlaceEntityInCollection(
entityType: EntityType,
collectionType: CollectionType | null | undefined,
): boolean {
- return PLUGIN_DATA_STUDIO.canPlaceEntityInCollection(
- entityType,
- collectionType,
- );
+ return canPlaceEntityInCollectionImpl(entityType, collectionType);
}
export function canPlaceEntityInCollectionOrDescendants(
entityType: EntityType,
collectionType: CollectionType | null | undefined,
): boolean {
- return PLUGIN_DATA_STUDIO.canPlaceEntityInCollectionOrDescendants(
+ return canPlaceEntityInCollectionOrDescendantsImpl(
entityType,
collectionType,
);
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
index c55ec71b135..41c7df6a784 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
@@ -6,8 +6,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { VirtualizedList } from "metabase/common/components/VirtualizedList";
import { NoObjectError } from "metabase/common/components/errors/NoObjectError";
import { getIcon } from "metabase/lib/icon";
-import { PLUGIN_DATA_STUDIO, PLUGIN_MODERATION } from "metabase/plugins";
-// import { trackSearchClick } from "metabase/search/analytics";
+import { PLUGIN_LIBRARY, PLUGIN_MODERATION } from "metabase/plugins";
import { Box, Flex, Icon, NavLink, SegmentedControl, Text } from "metabase/ui";
import type { OmniPickerItem, OmniPickerTableItem, SearchScope } from "../..";
@@ -193,8 +192,7 @@ export function SearchScopeSelector() {
const { setSearchScope } = useOmniPickerContext();
const searchScope = useCurrentSearchScope();
- const { data: libraryCollection } =
- PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+ const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection();
const lastCollection = useGetLastCollection();
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx
index 82ce3e614bb..23ff79ba3f3 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx
@@ -4,6 +4,7 @@ import { t } from "ttag";
import { useCreateDashboardMutation } from "metabase/api";
import { FormFooter } from "metabase/common/components/FormFooter";
import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";
+import { canPlaceEntityInCollection } from "metabase/data-studio/utils";
import {
Form,
FormErrorMessage,
@@ -11,7 +12,7 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import { PLUGIN_DATA_STUDIO, PLUGIN_TENANTS } from "metabase/plugins";
+import { PLUGIN_TENANTS } from "metabase/plugins";
import { Button, Flex, Modal } from "metabase/ui";
import { useOmniPickerContext } from "../../context";
@@ -60,10 +61,7 @@ export const NewDashboardDialog = () => {
entityType: "dashboard",
collection: lastCollection,
}) &&
- PLUGIN_DATA_STUDIO.canPlaceEntityInCollection(
- "dashboard",
- getCollectionType(lastCollection),
- );
+ canPlaceEntityInCollection("dashboard", getCollectionType(lastCollection));
const onCreateNewDashboard = async ({ name }: { name: string }) => {
if (!canCreateHere) {
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts
index 92d2e6cc365..fb249d63428 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins/oss/data-studio";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
import { useOmniPickerContext } from "../context";
import type { OmniPickerCollectionItem, SearchScope } from "../types";
@@ -12,8 +12,7 @@ export const useGetLastCollection = ():
| null => {
const { previousPath } = useOmniPickerContext();
- const { data: libraryCollection } =
- PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+ const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection();
const lastCollection = useMemo(() => {
const lastCollectionIndex = previousPath.findLastIndex(
@@ -33,8 +32,7 @@ export const useGetLastCollection = ():
* gets the narrowed search scope for the currently selected collection, if it is selectable */
export const useCurrentSearchScope = (): SearchScope => {
const { searchScope } = useOmniPickerContext();
- const { data: libraryCollection } =
- PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+ const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection();
const lastCollection = useGetLastCollection();
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts
index f7f71c603c4..f86e9cccad1 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts
@@ -10,10 +10,11 @@ import {
documentApi,
snippetApi,
tableApi,
+ transformApi,
} from "metabase/api";
import { useGetPersonalCollection } from "metabase/common/hooks/use-get-personal-collection";
import { type DispatchFn, useDispatch } from "metabase/lib/redux";
-import { PLUGIN_DATA_STUDIO, PLUGIN_TRANSFORMS } from "metabase/plugins";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
import type {
Collection,
CollectionNamespace,
@@ -98,7 +99,7 @@ export function useGetPathFromValue({
const dispatch = useDispatch();
const { data: libraryCollection, isLoading: isLoadingLibraryCollection } =
- PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+ PLUGIN_LIBRARY.useGetLibraryCollection();
const { data: personalCollection, isLoading: isLoadingPersonalCollection } =
useGetPersonalCollection();
@@ -546,10 +547,7 @@ function getItemByModel(value: OmniPickerValue, dispatch: DispatchFn) {
).unwrap();
case "transform":
return dispatch(
- // @ts-expect-error - FIXME: this is a nightmare to type, and it's moving to OSS anyway
- PLUGIN_TRANSFORMS.transformApi.endpoints.getTransform.initiate(
- Number(value.id),
- ),
+ transformApi.endpoints.getTransform.initiate(Number(value.id)),
).unwrap();
default:
return Promise.resolve(null);
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx
index 656cd6fdcd3..766978a42c6 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx
@@ -120,7 +120,7 @@ const setup = ({
});
if (enterprise) {
- setupEnterpriseOnlyPlugin("data-studio");
+ setupEnterpriseOnlyPlugin("library");
setupEnterpriseOnlyPlugin("tenants");
setupEnterpriseOnlyPlugin("transforms");
} else {
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
index f47d408daf3..97a86744e10 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
@@ -14,7 +14,7 @@ import {
} from "metabase/common/hooks";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
import { type DispatchFn, useDispatch, useSelector } from "metabase/lib/redux";
-import { PLUGIN_DATA_STUDIO, PLUGIN_TENANTS } from "metabase/plugins";
+import { PLUGIN_LIBRARY, PLUGIN_TENANTS } from "metabase/plugins";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import type {
Collection,
@@ -63,10 +63,9 @@ export const useRootItems = () => {
const { data: personalCollection, isLoading: isLoadingPersonalCollection } =
useGetPersonalCollection();
- const { data: libraryCollection } =
- PLUGIN_DATA_STUDIO.useGetLibraryCollection({
- skip: !options.hasLibrary,
- });
+ const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection({
+ skip: !options.hasLibrary,
+ });
const {
data: personalCollectionItems,
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
index 2cf1fff25f2..a703eb8e312 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { collectionApi } from "metabase/api";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
import type { DispatchFn } from "metabase/lib/redux";
-import { PLUGIN_TRANSFORMS } from "metabase/plugins";
-import { PLUGIN_TENANTS } from "metabase/plugins/oss/tenants";
+import { PLUGIN_TENANTS } from "metabase/plugins";
+import { getRootCollectionItem as getTransformsRootCollectionItem } from "metabase/transforms/utils";
import type { CollectionNamespace } from "metabase-types/api";
import type { OmniPickerCollectionItem } from "../types";
@@ -47,7 +47,7 @@ export const getRootCollectionItem = async ({
};
}
- const transformRootItem = PLUGIN_TRANSFORMS.getRootCollectionItem({
+ const transformRootItem = getTransformsRootCollectionItem({
namespace,
});
if (transformRootItem) {
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx
index 41081d44153..c44b2e13f21 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useMemo } from "react";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
import { Box, Menu } from "metabase/ui";
import type { DataPickerValue } from "../../../DataPicker";
@@ -40,8 +40,7 @@ export function MiniPicker({
shouldHide,
shouldShowLibrary = true,
}: MiniPickerProps) {
- const { data: libraryCollection } =
- PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+ const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection();
const [path, setPath, { isLoadingPath }] = useGetPathFromValue({
value,
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
index 13ab9da0773..7a4db89d54a 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
@@ -19,7 +19,7 @@ import { useSetting } from "metabase/common/hooks";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { getIcon } from "metabase/lib/icon";
import { useSelector } from "metabase/lib/redux";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
import { Box, Flex, Icon, Repeat, Skeleton, Stack, Text } from "metabase/ui";
import type {
SchemaName,
@@ -69,7 +69,7 @@ function RootItemList() {
const { isLoading: isLoadingRootCollection, error: rootCollectionError } =
useGetCollectionQuery({ id: "root" });
const { data: libraryCollection, isLoading } =
- PLUGIN_DATA_STUDIO.useGetResolvedLibraryCollection();
+ PLUGIN_LIBRARY.useGetResolvedLibraryCollection();
const enableNestedQueries = useSetting("enable-nested-queries");
if (isLoading || isLoadingRootCollection) {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/analytics.ts b/frontend/src/metabase/data-studio/analytics.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/analytics.ts
rename to frontend/src/metabase/data-studio/analytics.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx b/frontend/src/metabase/data-studio/app/components/SectionLayout/SectionLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/components/SectionLayout/SectionLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/index.ts b/frontend/src/metabase/data-studio/app/components/SectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/index.ts
rename to frontend/src/metabase/data-studio/app/components/SectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/index.ts
rename to frontend/src/metabase/data-studio/app/pages/DataSectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
index 72fb5e9b55f..3cd19a174bc 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -1,6 +1,5 @@
import cx from "classnames";
-import type { ReactNode } from "react";
-import { useState } from "react";
+import { type ReactNode, useState } from "react";
import { t } from "ttag";
import DataStudioLogo from "assets/img/data-studio-logo.svg";
@@ -15,10 +14,14 @@ import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut"
import {
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
PLUGIN_REMOTE_SYNC,
- PLUGIN_TRANSFORMS,
+ PLUGIN_WORKSPACES,
} from "metabase/plugins";
import { getLocation } from "metabase/selectors/routing";
import { getUserIsAdmin } from "metabase/selectors/user";
+import {
+ canAccessTransforms as canAccessTransformsSelector,
+ getTransformsFeatureAvailable,
+} from "metabase/transforms/selectors";
import {
ActionIcon,
Box,
@@ -32,10 +35,8 @@ import {
Text,
Tooltip,
} from "metabase/ui";
-import { hasPremiumFeature } from "metabase-enterprise/settings";
import S from "./DataStudioLayout.module.css";
-import { WorkspacesSection } from "./WorkspaceSection";
import { getCurrentTab } from "./utils";
type DataStudioLayoutProps = {
@@ -91,9 +92,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
const canAccessDataModel = useSelector(
PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel,
);
- const canAccessTransforms = useSelector(
- PLUGIN_TRANSFORMS.canAccessTransforms,
- );
+ const canAccessTransforms = useSelector(canAccessTransformsSelector);
const hasDirtyChanges = PLUGIN_REMOTE_SYNC.useHasLibraryDirtyChanges();
const hasTransformDirtyChanges =
PLUGIN_REMOTE_SYNC.useHasTransformDirtyChanges();
@@ -102,7 +101,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
const hasLibraryFeature = useHasTokenFeature("data_studio");
const hasDependenciesFeature = useHasTokenFeature("dependencies");
const hasRemoteSyncFeature = useHasTokenFeature("remote_sync");
- const hasTransformsFeature = useHasTokenFeature("transforms");
+ const hasTransformsFeature = useSelector(getTransformsFeatureAvailable);
const currentTab = getCurrentTab(pathname);
@@ -167,7 +166,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
showLabel={isNavbarOpened}
isGated={!hasDependenciesFeature}
/>
- {(canAccessTransforms || isAdmin) && (
+ {canAccessTransforms && (
<DataStudioTab
label={t`Transforms`}
icon="transform"
@@ -183,10 +182,9 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
}
/>
)}
- {(canAccessTransforms || isAdmin) &&
- hasPremiumFeature("workspaces") && (
- <WorkspacesSection showLabel={isNavbarOpened} />
- )}
+ {(canAccessTransforms || isAdmin) && (
+ <PLUGIN_WORKSPACES.WorkspacesSection showLabel={isNavbarOpened} />
+ )}
</Stack>
<Stack gap="0.75rem">
{hasRemoteSyncFeature ? (
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/index.ts
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/index.ts
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
new file mode 100644
index 00000000000..afce8c1e33b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
@@ -0,0 +1,126 @@
+import fetchMock from "fetch-mock";
+
+import { screen, waitFor } from "__support__/ui";
+
+import { setup } from "./setup";
+
+describe("DataStudioLayout", () => {
+ beforeEach(() => {
+ fetchMock.removeRoutes();
+ fetchMock.clearHistory();
+ jest.clearAllMocks();
+ });
+
+ afterEach(() => {
+ jest.restoreAllMocks();
+ });
+
+ describe("sidebar rendering", () => {
+ it("should render the sidebar with navigation tabs", async () => {
+ setup({ remoteSyncBranch: "main" });
+
+ await waitFor(() => {
+ expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
+ });
+
+ expect(screen.getByText("Data structure")).toBeInTheDocument();
+ expect(screen.getByText("Exit")).toBeInTheDocument();
+ });
+
+ it("should render content area", async () => {
+ setup({ remoteSyncBranch: null });
+
+ await waitFor(() => {
+ expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
+ });
+
+ expect(screen.getByTestId("content")).toBeInTheDocument();
+ });
+ });
+
+ describe("transforms menu item upsell icon", () => {
+ it("should not display upsell icon when plan is OSS", async () => {
+ // OSS plan is determined by having no token features or basic features only
+ setup({
+ remoteSyncBranch: "main",
+ tokenFeatures: {},
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
+ });
+
+ // Transforms menu item should be present
+ expect(screen.getByText("Transforms")).toBeInTheDocument();
+
+ // Upsell gem should not be displayed within the transforms link
+ const transformsLink = screen.getByText("Transforms").closest("a");
+ expect(transformsLink).toBeInTheDocument();
+
+ const upsellGems = screen.queryAllByTestId("upsell-gem");
+ // Filter to only upsell gems within transforms link
+ const transformsUpsellGems = upsellGems.filter((gem) =>
+ transformsLink?.contains(gem),
+ );
+ expect(transformsUpsellGems).toHaveLength(0);
+ });
+
+ it("should display upsell icon when plan is not OSS and transforms feature is not available", async () => {
+ // Non-OSS plan with some features but transforms not enabled
+ setup({
+ remoteSyncBranch: "main",
+ tokenFeatures: {
+ hosting: true, // Makes it a starter plan
+ transforms: false, // Transforms feature not available
+ },
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
+ });
+
+ // Transforms menu item should be present
+ expect(screen.getByText("Transforms")).toBeInTheDocument();
+
+ // Upsell gem should be displayed within the transforms link
+ const transformsLink = screen.getByText("Transforms").closest("a");
+ expect(transformsLink).toBeInTheDocument();
+
+ const upsellGems = screen.queryAllByTestId("upsell-gem");
+ // Filter to only upsell gems within transforms link
+ const transformsUpsellGems = upsellGems.filter((gem) =>
+ transformsLink?.contains(gem),
+ );
+ expect(transformsUpsellGems.length).toBeGreaterThan(0);
+ });
+
+ it("should not display upsell icon when plan is not OSS and transforms feature is available", async () => {
+ // Non-OSS plan with transforms feature enabled
+ setup({
+ remoteSyncBranch: "main",
+ tokenFeatures: {
+ hosting: true, // Makes it a starter plan
+ transforms: true, // Transforms feature available
+ },
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
+ });
+
+ // Transforms menu item should be present
+ expect(screen.getByText("Transforms")).toBeInTheDocument();
+
+ // Upsell gem should not be displayed within the transforms link
+ const transformsLink = screen.getByText("Transforms").closest("a");
+ expect(transformsLink).toBeInTheDocument();
+
+ const upsellGems = screen.queryAllByTestId("upsell-gem");
+ // Filter to only upsell gems within transforms link
+ const transformsUpsellGems = upsellGems.filter((gem) =>
+ transformsLink?.contains(gem),
+ );
+ expect(transformsUpsellGems).toHaveLength(0);
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
similarity index 84%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsx
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
index 29b0318074e..16498cf94fc 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
@@ -3,24 +3,11 @@ import fetchMock from "fetch-mock";
import { screen, waitFor, within } from "__support__/ui";
-import { mockHasPremiumFeature, setup } from "./DataStudioLayout.setup.spec";
-
-// Mock useHasTokenFeature to return true for required features
-jest.mock(
- "metabase/common/hooks/use-has-token-feature/use-has-token-feature",
- () => ({
- useHasTokenFeature: (feature: string) => {
- const enabledFeatures = [
- "remote_sync",
- "transforms",
- "data_studio",
- "dependencies",
- "advanced_permissions",
- ];
- return enabledFeatures.includes(feature);
- },
- }),
-);
+import {
+ DEFAULT_EE_SETTINGS,
+ DEFAULT_EE_SETTINGS_WITH_WORKSPACES,
+ setup,
+} from "./setup";
describe("DataStudioLayout", () => {
beforeEach(() => {
@@ -45,7 +32,7 @@ describe("DataStudioLayout", () => {
});
it("should hide Set up git sync button when git settings is not visible", async () => {
- setup({ remoteSyncEnabled: true });
+ setup({ ...DEFAULT_EE_SETTINGS, remoteSyncEnabled: true });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -57,7 +44,7 @@ describe("DataStudioLayout", () => {
});
it("should open modal when Set up git sync button is clicked", async () => {
- setup({ remoteSyncEnabled: false });
+ setup({ ...DEFAULT_EE_SETTINGS, remoteSyncEnabled: false });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -74,7 +61,7 @@ describe("DataStudioLayout", () => {
});
it("should close modal when onClose is called", async () => {
- setup({ remoteSyncEnabled: false });
+ setup({ ...DEFAULT_EE_SETTINGS, remoteSyncEnabled: false });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -101,7 +88,11 @@ describe("DataStudioLayout", () => {
});
it("should show Set up git sync text when sidebar is expanded", async () => {
- setup({ remoteSyncEnabled: false, isNavbarOpened: true });
+ setup({
+ ...DEFAULT_EE_SETTINGS,
+ remoteSyncEnabled: false,
+ isNavbarOpened: true,
+ });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -113,7 +104,7 @@ describe("DataStudioLayout", () => {
describe("sidebar rendering", () => {
it("should render the sidebar with navigation tabs", async () => {
- setup({ remoteSyncBranch: "main" });
+ setup({ ...DEFAULT_EE_SETTINGS, remoteSyncBranch: "main" });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -123,7 +114,11 @@ describe("DataStudioLayout", () => {
});
it("should render GitSyncAppBarControls when sidebar is expanded", async () => {
- setup({ remoteSyncBranch: "main", isNavbarOpened: true });
+ setup({
+ ...DEFAULT_EE_SETTINGS,
+ remoteSyncBranch: "main",
+ isNavbarOpened: true,
+ });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -133,7 +128,11 @@ describe("DataStudioLayout", () => {
});
it("should not render GitSyncAppBarControls when sidebar is collapsed", async () => {
- setup({ remoteSyncBranch: "main", isNavbarOpened: false });
+ setup({
+ ...DEFAULT_EE_SETTINGS,
+ remoteSyncBranch: "main",
+ isNavbarOpened: false,
+ });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -143,7 +142,7 @@ describe("DataStudioLayout", () => {
});
it("should render content area", async () => {
- setup({ remoteSyncBranch: null });
+ setup({ ...DEFAULT_EE_SETTINGS, remoteSyncBranch: null });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -156,6 +155,7 @@ describe("DataStudioLayout", () => {
describe("transform dirty indicator", () => {
it("should show dirty indicator on Exit tab when transforms have dirty changes", async () => {
setup({
+ ...DEFAULT_EE_SETTINGS,
remoteSyncBranch: "main",
isNavbarOpened: true,
hasTransformDirtyChanges: true,
@@ -175,6 +175,7 @@ describe("DataStudioLayout", () => {
it("should not show dirty indicator on Exit tab when no dirty changes", async () => {
setup({
+ ...DEFAULT_EE_SETTINGS,
remoteSyncBranch: "main",
isNavbarOpened: true,
hasTransformDirtyChanges: false,
@@ -193,6 +194,7 @@ describe("DataStudioLayout", () => {
it("should not show dirty indicator when remote-sync-transforms setting is disabled", async () => {
setup({
+ ...DEFAULT_EE_SETTINGS,
remoteSyncBranch: "main",
isNavbarOpened: true,
hasTransformDirtyChanges: true,
@@ -211,12 +213,8 @@ describe("DataStudioLayout", () => {
});
describe("workspaces feature", () => {
- afterEach(() => {
- mockHasPremiumFeature.mockReset();
- });
-
it("should not render WorkspacesSection when workspaces feature is not available", async () => {
- setup({ hasWorkspacesFeature: false, isNavbarOpened: true });
+ setup({ isNavbarOpened: true });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
@@ -229,7 +227,7 @@ describe("DataStudioLayout", () => {
});
it("should render WorkspacesSection when workspaces feature is available", async () => {
- setup({ hasWorkspacesFeature: true, isNavbarOpened: true });
+ setup({ ...DEFAULT_EE_SETTINGS_WITH_WORKSPACES, isNavbarOpened: true });
await waitFor(() => {
expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
similarity index 60%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsx
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
index df4241937b7..00766561fd8 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
@@ -1,4 +1,6 @@
-import { setupEnterprisePlugins } from "__support__/enterprise";
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import {
setupCollectionsEndpoints,
setupLibraryEndpoints,
@@ -10,9 +12,11 @@ import {
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders } from "__support__/ui";
-import { reinitialize } from "metabase/plugins";
-import { hasPremiumFeature } from "metabase-enterprise/settings";
-import type { Collection, RemoteSyncEntity } from "metabase-types/api";
+import type {
+ Collection,
+ RemoteSyncEntity,
+ TokenFeatures,
+} from "metabase-types/api";
import {
createMockDirtyCardEntity,
createMockDirtyTransformEntity,
@@ -24,19 +28,7 @@ import {
} from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
-import { DataStudioLayout } from "./DataStudioLayout";
-
-// ============================================================================
-// Settings Helpers
-// ============================================================================
-
-const DEFAULT_TOKEN_FEATURES = createMockTokenFeatures({
- remote_sync: true,
- advanced_permissions: true,
- transforms: true,
- data_studio: true,
- dependencies: true,
-});
+import { DataStudioLayout } from "../DataStudioLayout";
interface RemoteSyncSettings {
enabled: boolean;
@@ -57,33 +49,27 @@ const createRemoteSyncSettings = ({
"remote-sync-transforms": transforms,
});
-jest.mock("metabase-enterprise/settings", () => ({
- hasPremiumFeature: jest.fn(),
-}));
-
-export const mockHasPremiumFeature = hasPremiumFeature as jest.MockedFunction<
- typeof hasPremiumFeature
->;
-
-// ============================================================================
-// Endpoint Setup Functions
-// ============================================================================
-
const setupRemoteSyncSettingsEndpoints = (
settings: Partial<RemoteSyncSettings> = {},
+ tokenFeatures?: Partial<TokenFeatures>,
) => {
const remoteSyncSettings = createRemoteSyncSettings(settings);
- setupPropertiesEndpoints(createMockSettings(remoteSyncSettings));
+ setupPropertiesEndpoints(
+ createMockSettings({
+ ...remoteSyncSettings,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ }),
+ );
};
const setupDirtyEndpoints = ({
dirty = [],
collections = [],
- hasWorkspacesFeature = false,
+ tokenFeatures = {},
}: {
dirty?: RemoteSyncEntity[];
collections?: Collection[];
- hasWorkspacesFeature?: boolean;
+ tokenFeatures?: Partial<TokenFeatures>;
} = {}) => {
const changedCollections: Record<number, boolean> = {};
for (const entity of dirty) {
@@ -100,15 +86,7 @@ const setupDirtyEndpoints = ({
setupCollectionsEndpoints({ collections });
- mockHasPremiumFeature.mockImplementation((feature) => {
- if (feature === "workspaces") {
- return hasWorkspacesFeature;
- }
- // Allow other features to pass (e.g., remote_sync for git sync tests)
- return true;
- });
-
- if (hasWorkspacesFeature) {
+ if (tokenFeatures.workspaces) {
setupWorkspacesEndpoint([]);
}
};
@@ -128,11 +106,13 @@ const setupNavbarEndpoints = (isOpened = true) => {
interface StoreStateOptions {
isAdmin?: boolean;
remoteSyncSettings?: Partial<RemoteSyncSettings>;
+ tokenFeatures?: Partial<TokenFeatures>;
}
const createStoreState = ({
isAdmin = true,
remoteSyncSettings = {},
+ tokenFeatures,
}: StoreStateOptions = {}) => {
const settings = createRemoteSyncSettings(remoteSyncSettings);
@@ -146,38 +126,11 @@ const createStoreState = ({
}),
settings: mockSettings({
...settings,
- "token-features": DEFAULT_TOKEN_FEATURES,
+ "token-features": createMockTokenFeatures(tokenFeatures),
}),
});
};
-// ============================================================================
-// Render Helper
-// ============================================================================
-
-const renderDataStudioLayout = (storeOptions: StoreStateOptions = {}) => {
- // Create store state first - this calls mockSettings() which sets up MetabaseSettings
- const storeInitialState = createStoreState(storeOptions);
-
- // Reinitialize plugins to default state, then setup enterprise plugins
- reinitialize();
- setupEnterprisePlugins();
-
- renderWithProviders(
- <DataStudioLayout>
- <div data-testid="content">{"Content"}</div>
- </DataStudioLayout>,
- {
- storeInitialState,
- withRouter: false,
- },
- );
-};
-
-// ============================================================================
-// Setup function
-// ============================================================================
-
interface SetupOpts {
remoteSyncEnabled?: boolean;
remoteSyncBranch?: string | null;
@@ -186,7 +139,8 @@ interface SetupOpts {
hasTransformDirtyChanges?: boolean;
remoteSyncTransforms?: boolean;
isNavbarOpened?: boolean;
- hasWorkspacesFeature?: boolean;
+ enterprisePlugins?: Parameters<typeof setupEnterpriseOnlyPlugin>[0][];
+ tokenFeatures?: Partial<TokenFeatures>;
}
export const setup = ({
@@ -197,7 +151,8 @@ export const setup = ({
hasTransformDirtyChanges = false,
remoteSyncTransforms = false,
isNavbarOpened = true,
- hasWorkspacesFeature = false,
+ enterprisePlugins,
+ tokenFeatures,
}: SetupOpts = {}) => {
// Build collections list
const collections: Collection[] = [];
@@ -225,13 +180,79 @@ export const setup = ({
};
setupSettingsEndpoints([]);
- setupRemoteSyncSettingsEndpoints(remoteSyncSettings);
- setupDirtyEndpoints({ dirty, collections, hasWorkspacesFeature });
+ setupRemoteSyncSettingsEndpoints(remoteSyncSettings, tokenFeatures);
+ setupDirtyEndpoints({ dirty, collections, tokenFeatures });
setupNavbarEndpoints(isNavbarOpened);
setupLibraryEndpoints(false);
- renderDataStudioLayout({
+ const state = createStoreState({
isAdmin,
remoteSyncSettings,
+ tokenFeatures,
});
+
+ if (enterprisePlugins) {
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+ }
+
+ const hasUpsell = !remoteSyncEnabled;
+
+ if (hasUpsell) {
+ renderWithProviders(
+ <Route
+ path="/"
+ component={() => (
+ <DataStudioLayout>
+ <div data-testid="content">{"Content"}</div>
+ </DataStudioLayout>
+ )}
+ />,
+ {
+ storeInitialState: state,
+ withRouter: true,
+ },
+ );
+ } else {
+ renderWithProviders(
+ <DataStudioLayout>
+ <div data-testid="content">{"Content"}</div>
+ </DataStudioLayout>,
+ {
+ storeInitialState: state,
+ withRouter: false,
+ },
+ );
+ }
+};
+
+export const DEFAULT_EE_SETTINGS: Partial<SetupOpts> = {
+ enterprisePlugins: [
+ "library",
+ "remote_sync",
+ "dependencies",
+ "feature_level_permissions",
+ ],
+ tokenFeatures: {
+ remote_sync: true,
+ advanced_permissions: true,
+ data_studio: true,
+ dependencies: true,
+ },
+};
+
+export const DEFAULT_EE_SETTINGS_WITH_WORKSPACES: Partial<SetupOpts> = {
+ enterprisePlugins: [
+ "library",
+ "remote_sync",
+ "dependencies",
+ "feature_level_permissions",
+ "workspaces",
+ ],
+ tokenFeatures: {
+ remote_sync: true,
+ advanced_permissions: true,
+ data_studio: true,
+ dependencies: true,
+ workspaces: true,
+ },
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/index.ts
rename to frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
index 77b677cf0dc..1d1d7b2a1c4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { useHasTokenFeature } from "metabase/common/hooks";
+import { GitSyncUpsellPage } from "metabase/data-studio/upsells";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { GitSyncUpsellPage } from "metabase-enterprise/data-studio/upsells";
export function GitSyncSectionLayout() {
usePageTitle(t`Git sync`);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/index.ts
rename to frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TasksSectionLayout/TasksSectionLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/TasksSectionLayout/TasksSectionLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
similarity index 60%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
index a1c831a2e34..7dfbc715351 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
@@ -2,12 +2,11 @@ import type { Location } from "history";
import type { ReactNode } from "react";
import { t } from "ttag";
-import { useHasTokenFeature } from "metabase/common/hooks";
import { usePageTitle } from "metabase/hooks/use-page-title";
import { useSelector } from "metabase/lib/redux";
-import { getIsHosted } from "metabase/setup/selectors";
+import { PLUGIN_TRANSFORMS } from "metabase/plugins";
+import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";
-import { TransformsUpsellPage } from "../../../upsells";
import { SectionLayout } from "../../components/SectionLayout";
type TransformsSectionLayoutProps = {
@@ -19,13 +18,10 @@ export function TransformsSectionLayout({
children,
}: TransformsSectionLayoutProps) {
usePageTitle(t`Transforms`);
- const isHosted = useSelector(getIsHosted);
- const hasTransformsFeature = useHasTokenFeature("transforms");
-
- const shouldShowUpsell = isHosted && !hasTransformsFeature;
+ const shouldShowUpsell = useSelector(getShouldShowTransformsUpsell);
if (shouldShowUpsell) {
- return <TransformsUpsellPage />;
+ return <PLUGIN_TRANSFORMS.TransformsUpsellPage />;
}
return <SectionLayout>{children}</SectionLayout>;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/index.ts
rename to frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx
rename to frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/WorkspacesSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/WorkspacesSectionLayout/index.ts
rename to frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css
rename to frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx
rename to frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/index.ts b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/index.ts
rename to frontend/src/metabase/data-studio/common/components/Breadcrumbs/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css b/frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
rename to frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/index.ts b/frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/index.ts
rename to frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
rename to frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
index 464059780d7..bc91e91a3e7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
@@ -1,12 +1,12 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { getLocation } from "metabase/selectors/routing";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import { useSelector } from "metabase/lib/redux";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { getLocation } from "metabase/selectors/routing";
export type EntityDetailTabUrls = {
definition: string;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityList.tsx b/frontend/src/metabase/data-studio/common/components/EntityList/EntityList.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityList.tsx
rename to frontend/src/metabase/data-studio/common/components/EntityList/EntityList.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.module.css b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.module.css
rename to frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.tsx b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.tsx
rename to frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/index.ts b/frontend/src/metabase/data-studio/common/components/EntityList/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/index.ts
rename to frontend/src/metabase/data-studio/common/components/EntityList/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu.tsx b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu.tsx
rename to frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css
rename to frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
rename to frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/index.ts b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/index.ts
rename to frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx b/frontend/src/metabase/data-studio/common/components/PageContainer/PageContainer.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx
rename to frontend/src/metabase/data-studio/common/components/PageContainer/PageContainer.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/index.ts b/frontend/src/metabase/data-studio/common/components/PageContainer/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/index.ts
rename to frontend/src/metabase/data-studio/common/components/PageContainer/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css
rename to frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx
rename to frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/index.ts b/frontend/src/metabase/data-studio/common/components/PaneHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/index.ts
rename to frontend/src/metabase/data-studio/common/components/PaneHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/types.ts b/frontend/src/metabase/data-studio/common/components/PaneHeader/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/types.ts
rename to frontend/src/metabase/data-studio/common/components/PaneHeader/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath.ts b/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/index.ts b/frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/index.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts b/frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/index.ts b/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/index.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts b/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts b/frontend/src/metabase/data-studio/common/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts
rename to frontend/src/metabase/data-studio/common/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url.ts b/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url.ts
rename to frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css b/frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css
rename to frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.tsx
rename to frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
rename to frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionDiff.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsx
rename to frontend/src/metabase/data-studio/components/RevisionHistory/RevisionDiff.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistory.module.css b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistory.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistory.module.css
rename to frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistory.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
rename to frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionItem.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionItem.tsx
rename to frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/index.ts b/frontend/src/metabase/data-studio/components/RevisionHistory/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/index.ts
rename to frontend/src/metabase/data-studio/components/RevisionHistory/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/types.ts b/frontend/src/metabase/data-studio/components/RevisionHistory/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/types.ts
rename to frontend/src/metabase/data-studio/components/RevisionHistory/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/analytics.ts b/frontend/src/metabase/data-studio/data-model/analytics.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/tables/analytics.ts
rename to frontend/src/metabase/data-studio/data-model/analytics.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
rename to frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
index f63b43bc690..899134dd31d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
+import { useDiscardTablesFieldValuesMutation } from "metabase/api";
import { useTemporaryState } from "metabase/common/hooks";
+import { trackDataStudioTableFieldValuesDiscardStarted } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
-import { useDiscardTablesFieldValuesMutation } from "metabase-enterprise/api";
-import { trackDataStudioTableFieldValuesDiscardStarted } from "metabase-enterprise/data-studio/analytics";
import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
interface Props {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
index a7efc952861..b6f8acd618d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
@@ -46,7 +46,7 @@ describe("DiscardTableFieldValuesButton", () => {
await userEvent.click(button);
const calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/discard-values`,
+ `path:/api/data-studio/table/discard-values`,
{
method: "POST",
},
@@ -73,7 +73,7 @@ describe("DiscardTableFieldValuesButton", () => {
await userEvent.click(button);
let calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/discard-values`,
+ `path:/api/data-studio/table/discard-values`,
{
method: "POST",
},
@@ -93,7 +93,7 @@ describe("DiscardTableFieldValuesButton", () => {
expect(button).toHaveTextContent("Discard triggered!");
await userEvent.click(button);
calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/discard-values`,
+ `path:/api/data-studio/table/discard-values`,
{
method: "POST",
},
@@ -128,7 +128,7 @@ describe("DiscardTableFieldValuesButton", () => {
await userEvent.click(button);
const calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/discard-values`,
+ `path:/api/data-studio/table/discard-values`,
{
method: "POST",
},
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
rename to frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
index 64712b81b40..a64ddb4e342 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
+import { useRescanTablesFieldValuesMutation } from "metabase/api";
import { useTemporaryState } from "metabase/common/hooks";
+import { trackDataStudioTableFieldsRescanStarted } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
-import { useRescanTablesFieldValuesMutation } from "metabase-enterprise/api";
-import { trackDataStudioTableFieldsRescanStarted } from "metabase-enterprise/data-studio/analytics";
import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
interface Props {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
index 72352839db2..12dd2ca9b5a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
@@ -46,7 +46,7 @@ describe("RescanTableFieldsButton", () => {
await userEvent.click(button);
const calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/rescan-values`,
+ `path:/api/data-studio/table/rescan-values`,
{
method: "POST",
},
@@ -73,7 +73,7 @@ describe("RescanTableFieldsButton", () => {
await userEvent.click(button);
let calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/rescan-values`,
+ `path:/api/data-studio/table/rescan-values`,
{
method: "POST",
},
@@ -93,7 +93,7 @@ describe("RescanTableFieldsButton", () => {
expect(button).toHaveTextContent("Scan triggered!");
await userEvent.click(button);
calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/rescan-values`,
+ `path:/api/data-studio/table/rescan-values`,
{
method: "POST",
},
@@ -128,7 +128,7 @@ describe("RescanTableFieldsButton", () => {
await userEvent.click(button);
const calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/rescan-values`,
+ `path:/api/data-studio/table/rescan-values`,
{
method: "POST",
},
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/index.ts b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncOptionsModal.tsx b/frontend/src/metabase/data-studio/data-model/components/SyncOptionsModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncOptionsModal.tsx
rename to frontend/src/metabase/data-studio/data-model/components/SyncOptionsModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
rename to frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
index 7b71d808583..d855d4d6b52 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
+import { useSyncTablesSchemasMutation } from "metabase/api";
import { useTemporaryState } from "metabase/common/hooks";
+import { trackDataStudioTableSchemaSyncStarted } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
-import { useSyncTablesSchemasMutation } from "metabase-enterprise/api";
-import { trackDataStudioTableSchemaSyncStarted } from "metabase-enterprise/data-studio/analytics";
import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
interface Props {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
index 4b6155e4716..89c5dff7d1c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
@@ -46,7 +46,7 @@ describe("SyncTableSchemaButton", () => {
await userEvent.click(button);
const calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/sync-schema`,
+ `path:/api/data-studio/table/sync-schema`,
{
method: "POST",
},
@@ -73,7 +73,7 @@ describe("SyncTableSchemaButton", () => {
await userEvent.click(button);
let calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/sync-schema`,
+ `path:/api/data-studio/table/sync-schema`,
{
method: "POST",
},
@@ -93,7 +93,7 @@ describe("SyncTableSchemaButton", () => {
expect(button).toHaveTextContent("Sync triggered!");
await userEvent.click(button);
calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/sync-schema`,
+ `path:/api/data-studio/table/sync-schema`,
{
method: "POST",
},
@@ -128,7 +128,7 @@ describe("SyncTableSchemaButton", () => {
await userEvent.click(button);
const calls = fetchMock.callHistory.calls(
- `path:/api/ee/data-studio/table/sync-schema`,
+ `path:/api/data-studio/table/sync-schema`,
{
method: "POST",
},
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/index.ts b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
index 8cdbf1652af..650aa193b47 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
@@ -1,16 +1,16 @@
import { useState } from "react";
import { t } from "ttag";
+import {
+ trackDataStudioTablePickerFiltersApplied,
+ trackDataStudioTablePickerFiltersCleared,
+} from "metabase/data-studio/analytics";
import {
DataSourceInput,
LayerInput,
UserInput,
} from "metabase/metadata/components";
import { Button, Checkbox, Group, Stack } from "metabase/ui";
-import {
- trackDataStudioTablePickerFiltersApplied,
- trackDataStudioTablePickerFiltersCleared,
-} from "metabase-enterprise/data-studio/analytics";
import type { FilterState } from "../types";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
index 307938b45bd..05b87062b88 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { useListDatabasesQuery } from "metabase/api";
import { useListTablesQuery } from "metabase/api/table";
+import { trackDataStudioTablePickerSearchPerformed } from "metabase/data-studio/analytics";
import { parseRouteParams } from "metabase/metadata/pages/shared/utils";
import { Box, Flex, Loader, Text } from "metabase/ui";
-import { trackDataStudioTablePickerSearchPerformed } from "metabase-enterprise/data-studio/analytics";
import type { Table } from "metabase-types/api";
import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
@@ -28,6 +28,7 @@ interface SearchNewProps {
query: string;
params: RouteParams;
filters: FilterState;
+ isLibraryEnabled: boolean;
onChange?: (path: TreePath) => void;
}
@@ -96,6 +97,7 @@ export function SearchNew({
query,
params,
filters,
+ isLibraryEnabled,
onChange,
}: SearchNewProps) {
const { resetSelection, filterSelectedTables } = useSelection();
@@ -188,6 +190,7 @@ export function SearchNew({
tree={resultTree}
path={routeParams}
isExpanded={isExpanded}
+ isLibraryEnabled={isLibraryEnabled}
onToggle={toggle}
onChange={onChange}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.module.css b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
index 55919b36cf5..a271be332f1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
@@ -5,6 +5,7 @@ import { t } from "ttag";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
import {
Badge,
Box,
@@ -58,6 +59,8 @@ export function TablePicker({
const [isOpen, { toggle, close }] = useDisclosure();
const filtersCount = getFiltersCount(filters);
+ const isLibraryEnabled = PLUGIN_LIBRARY.isEnabled;
+
useEffect(() => {
const togglingBetweenSearchAndTree =
(previousDebouncedQuery === "" && debouncedQuery !== "") ||
@@ -144,6 +147,7 @@ export function TablePicker({
{debouncedQuery === "" && filtersCount === 0 ? (
<Tree
path={path}
+ isLibraryEnabled={isLibraryEnabled}
onChange={onChange}
setOnUpdateCallback={setOnUpdateCallback}
/>
@@ -151,6 +155,7 @@ export function TablePicker({
<SearchNew
query={debouncedQuery}
params={params}
+ isLibraryEnabled={isLibraryEnabled}
filters={filters}
onChange={onChange}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
index bca5d4fdb01..fc29b29b8be 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
@@ -13,7 +13,7 @@ import {
screen,
waitFor,
} from "__support__/ui";
-import { SelectionProvider } from "metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
+import { SelectionProvider } from "metabase/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
import type { Database, User } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
index 2ecb16e7870..1dc27c1bf12 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
@@ -56,6 +56,7 @@ const NUMBER_FORMAT_OPTIONS = { maximumFractionDigits: 0 };
interface Props {
tree: RootNode;
path: TreePath;
+ isLibraryEnabled: boolean;
isExpanded: (key: string) => boolean;
onToggle: (key: string, value?: boolean) => void;
onChange?: (path: TreePath, options?: ChangeOptions) => void;
@@ -65,6 +66,7 @@ interface Props {
export function TablePickerTreeTable({
tree,
path,
+ isLibraryEnabled,
isExpanded,
onToggle,
onChange,
@@ -205,8 +207,8 @@ export function TablePickerTreeTable({
[handleCheckboxToggle],
);
- const columns: TreeTableColumnDef<TablePickerTreeNode>[] = useMemo(
- () => [
+ const columns: TreeTableColumnDef<TablePickerTreeNode>[] = useMemo(() => {
+ const columnDefs: TreeTableColumnDef<TablePickerTreeNode>[] = [
{
id: "name",
header: t`Name`,
@@ -251,7 +253,10 @@ export function TablePickerTreeTable({
) : null;
},
},
- {
+ ];
+
+ if (isLibraryEnabled) {
+ columnDefs.push({
id: "published",
header: t`Published`,
width: "auto",
@@ -269,10 +274,11 @@ export function TablePickerTreeTable({
</Box>
) : null;
},
- },
- ],
- [ownerNameById, formatNumber],
- );
+ });
+ }
+
+ return columnDefs;
+ }, [isLibraryEnabled, ownerNameById, formatNumber]);
const expandedState = useMemo(
() => Object.fromEntries([...expandedIds].map((id) => [id, true])),
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Tree.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/Tree.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Tree.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/Tree.tsx
index 8544ae3b2a0..1717099a40f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Tree.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/Tree.tsx
@@ -23,11 +23,17 @@ import { TablePickerTreeTable } from "./TablePickerTreeTable";
interface Props {
path: TreePath;
+ isLibraryEnabled: boolean;
onChange: (path: TreePath, options?: ChangeOptions) => void;
setOnUpdateCallback: (callback: (() => void) | null) => void;
}
-export function Tree({ path, onChange, setOnUpdateCallback }: Props) {
+export function Tree({
+ path,
+ isLibraryEnabled,
+ onChange,
+ setOnUpdateCallback,
+}: Props) {
const {
selectedTables,
setSelectedTables,
@@ -189,6 +195,7 @@ export function Tree({ path, onChange, setOnUpdateCallback }: Props) {
tree={tree}
path={path}
isExpanded={isExpanded}
+ isLibraryEnabled={isLibraryEnabled}
onToggle={toggle}
onChange={onChange}
reload={reload}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/index.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/components/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/constants.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/constants.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/constants.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/index.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useSearch.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/index.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/types.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/types.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/utils.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/utils.ts
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/wrappers.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/wrappers.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
index 062fc43dfdf..8288267afcc 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -21,6 +21,11 @@ import { TableFieldList } from "metabase/metadata/components/TableFieldList";
import { TableSortableFieldList } from "metabase/metadata/components/TableSortableFieldList";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import {
+ PLUGIN_DEPENDENCIES,
+ PLUGIN_LIBRARY,
+ PLUGIN_REMOTE_SYNC,
+} from "metabase/plugins";
import {
Box,
Button,
@@ -31,19 +36,15 @@ import {
Tabs,
Tooltip,
} from "metabase/ui";
-import { CreateLibraryModal } from "metabase-enterprise/data-studio/common/components/CreateLibraryModal";
-import { PublishTablesModal } from "metabase-enterprise/data-studio/common/components/PublishTablesModal";
-import { UnpublishTablesModal } from "metabase-enterprise/data-studio/common/components/UnpublishTablesModal";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { FieldId, Table, TableFieldOrder } from "metabase-types/api";
-import { MeasureList } from "./MeasureList";
-import { SegmentList } from "./SegmentList";
-import { TableAttributesEditSingle } from "./TableAttributesEditSingle";
-import { TableCollection } from "./TableCollection";
-import { TableMetadata } from "./TableMetadata";
import S from "./TableSection.module.css";
-import { TableSectionGroup } from "./TableSectionGroup";
+import { MeasureList } from "./components/MeasureList";
+import { SegmentList } from "./components/SegmentList";
+import { TableAttributesEditSingle } from "./components/TableAttributesEditSingle";
+import { TableCollection } from "./components/TableCollection";
+import { TableMetadata } from "./components/TableMetadata";
+import { TableSectionGroup } from "./components/TableSectionGroup";
interface Props {
table: Table;
@@ -73,7 +74,11 @@ const TableSectionBase = ({
useMetadataToasts();
const [isSorting, setIsSorting] = useState(false);
const hasFields = Boolean(table.fields && table.fields.length > 0);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isLibraryEnabled = PLUGIN_LIBRARY.isEnabled;
+ const isDependencyGraphEnabled = PLUGIN_DEPENDENCIES.isEnabled;
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const getFieldHref = (fieldId: FieldId) => {
return Urls.dataStudioData({
@@ -217,7 +222,7 @@ const TableSectionBase = ({
</Box>
<Group justify="stretch" gap="sm">
- {canPublish && !remoteSyncReadOnly && (
+ {canPublish && isLibraryEnabled && !remoteSyncReadOnly && (
<Button
flex="1"
p="sm"
@@ -236,21 +241,24 @@ const TableSectionBase = ({
>
{t`Sync settings`}
</Button>
- <Tooltip label={t`Dependency graph`}>
- <Button
- component={ForwardRefLink}
- to={dependencyGraph({
- entry: { id: Number(table.id), type: "table" },
- })}
- p="sm"
- leftSection={<Icon name="dependencies" />}
- style={{
- flexGrow: 0,
- width: 40,
- }}
- aria-label={t`Dependency graph`}
- />
- </Tooltip>
+ {isDependencyGraphEnabled && (
+ <Tooltip label={t`Dependency graph`}>
+ <Button
+ component={ForwardRefLink}
+ to={dependencyGraph({
+ entry: { id: Number(table.id), type: "table" },
+ })}
+ p="sm"
+ leftSection={<Icon name="dependencies" />}
+ style={{
+ flexGrow: 0,
+ width: 40,
+ }}
+ aria-label={t`Dependency graph`}
+ />
+ </Tooltip>
+ )}
+
<Box style={{ flexGrow: 0, width: 40 }}>
<TableLink table={table} />
</Box>
@@ -362,20 +370,20 @@ const TableSectionBase = ({
</Tabs>
</Box>
- <CreateLibraryModal
+ <PLUGIN_LIBRARY.CreateLibraryModal
title={t`First, let's create your Library`}
explanatorySentence={t`This is where published tables will go.`}
isOpened={modalType === "library"}
onCreate={() => setModalType("publish")}
onClose={handleCloseModal}
/>
- <PublishTablesModal
+ <PLUGIN_LIBRARY.PublishTablesModal
isOpened={modalType === "publish"}
tableIds={[table.id]}
onPublish={handleCloseModal}
onClose={handleCloseModal}
/>
- <UnpublishTablesModal
+ <PLUGIN_LIBRARY.UnpublishTablesModal
isOpened={modalType === "unpublish"}
tableIds={[table.id]}
onUnpublish={handleCloseModal}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.module.css b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
index 148d8347db5..7034a7f4304 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
@@ -2,14 +2,14 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Button, Group, Icon, Stack } from "metabase/ui";
-import { getUserCanWriteMeasures } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
-import { MeasureItem } from "./MeasureItem";
-import S from "./TableSection.module.css";
+import S from "../../TableSection.module.css";
+import { MeasureItem } from "../MeasureItem";
type MeasureListProps = {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/index.ts b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/index.ts
new file mode 100644
index 00000000000..17d9761be21
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/index.ts
@@ -0,0 +1 @@
+export { MeasureList } from "./MeasureList";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/enterprise.unit.spec.tsx
similarity index 59%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/enterprise.unit.spec.tsx
index 35f5d3d8903..dba6d771226 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/enterprise.unit.spec.tsx
@@ -1,56 +1,11 @@
-import { Route } from "react-router";
+import { screen } from "__support__/ui";
+import { createMockMeasure } from "metabase-types/api/mocks";
-import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings, Measure, Table } from "metabase-types/api";
-import {
- createMockMeasure,
- createMockTable,
- createMockUser,
-} from "metabase-types/api/mocks";
-
-import { MeasureList } from "./MeasureList";
-
-type SetupOpts = {
- measures?: Measure[];
- table?: Partial<Table>;
- isAdmin?: boolean;
- remoteSyncType?: EnterpriseSettings["remote-sync-type"];
-};
-
-function setup({
- measures = [],
- table = {},
- isAdmin = true,
- remoteSyncType,
-}: SetupOpts = {}) {
- const mockTable = createMockTable({
- id: 1,
- db_id: 1,
- schema: "PUBLIC",
- measures,
- is_published: true,
- ...table,
- });
-
- renderWithProviders(
- <Route path="/" component={() => <MeasureList table={mockTable} />} />,
- {
- withRouter: true,
- storeInitialState: {
- currentUser: createMockUser({ is_superuser: isAdmin }),
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- },
- },
- );
-}
+import { setup } from "./setup";
describe("MeasureList", () => {
it("should render empty state when no measures", () => {
- setup({ measures: [] });
+ setup({ isEnterprise: true, measures: [] });
expect(screen.getByText("No measures yet")).toBeInTheDocument();
expect(
@@ -72,7 +27,7 @@ describe("MeasureList", () => {
}),
createMockMeasure({ id: 2, name: "Order Count" }),
];
- setup({ measures });
+ setup({ isEnterprise: true, measures });
expect(screen.getByRole("list")).toBeInTheDocument();
expect(screen.getByText("Total Revenue")).toBeInTheDocument();
@@ -88,7 +43,7 @@ describe("MeasureList", () => {
describe("'new measure' link", () => {
it("is rendered when user is an admin", () => {
- setup({ measures: [], isAdmin: true });
+ setup({ isEnterprise: true, measures: [], isAdmin: true });
expect(
screen.getByRole("link", { name: /New measure/i }),
@@ -96,7 +51,7 @@ describe("MeasureList", () => {
});
it("is not rendered when user is not an admin", () => {
- setup({ measures: [], isAdmin: false });
+ setup({ isEnterprise: true, measures: [], isAdmin: false });
expect(
screen.queryByRole("link", { name: /New measure/i }),
@@ -104,7 +59,12 @@ describe("MeasureList", () => {
});
it("is not rendered when remote sync is set to read-only", () => {
- setup({ measures: [], isAdmin: true, remoteSyncType: "read-only" });
+ setup({
+ isEnterprise: true,
+ measures: [],
+ isAdmin: true,
+ remoteSyncType: "read-only",
+ });
expect(
screen.queryByRole("link", { name: /New measure/i }),
@@ -113,6 +73,7 @@ describe("MeasureList", () => {
it("is still rendered when remote sync is set to read-only but table is not published", () => {
setup({
+ isEnterprise: true,
measures: [],
isAdmin: true,
remoteSyncType: "read-only",
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx
new file mode 100644
index 00000000000..f64abc227e1
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx
@@ -0,0 +1,76 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders } from "__support__/ui";
+import type { EnterpriseSettings, Measure, Table } from "metabase-types/api";
+import {
+ createMockTable,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import type { State } from "metabase-types/store";
+import { createMockState } from "metabase-types/store/mocks";
+
+import { MeasureList } from "../MeasureList";
+
+type SetupOpts = {
+ measures?: Measure[];
+ table?: Partial<Table>;
+ isAdmin?: boolean;
+ remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ isEnterprise?: boolean;
+};
+
+export function setup({
+ measures = [],
+ table = {},
+ isAdmin = true,
+ remoteSyncType,
+ isEnterprise = false,
+}: SetupOpts = {}) {
+ const mockTable = createMockTable({
+ id: 1,
+ db_id: 1,
+ schema: "PUBLIC",
+ measures,
+ is_published: true,
+ ...table,
+ });
+
+ let state: State;
+
+ if (isEnterprise) {
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures({
+ data_studio: true,
+ remote_sync: true,
+ }),
+ });
+ state = createMockState({
+ settings,
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ });
+ const pluginNames: ENTERPRISE_PLUGIN_NAME[] = ["library", "remote_sync"];
+ pluginNames.forEach(setupEnterpriseOnlyPlugin);
+ } else {
+ state = createMockState({
+ settings: mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ }),
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ });
+ }
+
+ renderWithProviders(
+ <Route path="/" component={() => <MeasureList table={mockTable} />} />,
+ {
+ withRouter: true,
+ storeInitialState: state,
+ },
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.module.css b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
index aec62e4085c..37925cfa454 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
@@ -2,14 +2,14 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Button, Group, Icon, Stack } from "metabase/ui";
-import { getUserCanWriteSegments } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
-import { SegmentItem } from "./SegmentItem";
-import S from "./TableSection.module.css";
+import S from "../../TableSection.module.css";
+import { SegmentItem } from "../SegmentItem";
type SegmentListProps = {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/index.ts b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/index.ts
new file mode 100644
index 00000000000..20289d9e93b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/index.ts
@@ -0,0 +1 @@
+export { SegmentList } from "./SegmentList";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/enterprise.unit.spec.tsx
similarity index 59%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/enterprise.unit.spec.tsx
index 6cb91497d8c..b6fbb2ee20b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/enterprise.unit.spec.tsx
@@ -1,56 +1,11 @@
-import { Route } from "react-router";
+import { screen } from "__support__/ui";
+import { createMockSegment } from "metabase-types/api/mocks";
-import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings, Segment, Table } from "metabase-types/api";
-import {
- createMockSegment,
- createMockTable,
- createMockUser,
-} from "metabase-types/api/mocks";
-
-import { SegmentList } from "./SegmentList";
-
-type SetupOpts = {
- segments?: Segment[];
- table?: Partial<Table>;
- isAdmin?: boolean;
- remoteSyncType?: EnterpriseSettings["remote-sync-type"];
-};
-
-function setup({
- segments = [],
- table = {},
- isAdmin = true,
- remoteSyncType,
-}: SetupOpts = {}) {
- const mockTable = createMockTable({
- id: 1,
- db_id: 1,
- schema: "PUBLIC",
- segments,
- is_published: true,
- ...table,
- });
-
- renderWithProviders(
- <Route path="/" component={() => <SegmentList table={mockTable} />} />,
- {
- withRouter: true,
- storeInitialState: {
- currentUser: createMockUser({ is_superuser: isAdmin }),
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- },
- },
- );
-}
+import { setup } from "./setup";
describe("SegmentList", () => {
it("should render empty state when no segments", () => {
- setup({ segments: [] });
+ setup({ isEnterprise: true, segments: [] });
expect(screen.getByText("No segments yet")).toBeInTheDocument();
expect(
@@ -63,7 +18,7 @@ describe("SegmentList", () => {
describe("'new segment' link", () => {
it("is rendered when user is an admin", () => {
- setup({ segments: [], isAdmin: true });
+ setup({ isEnterprise: true, segments: [], isAdmin: true });
expect(
screen.getByRole("link", { name: /New segment/i }),
@@ -71,7 +26,7 @@ describe("SegmentList", () => {
});
it("is not rendered when user is not an admin", () => {
- setup({ segments: [], isAdmin: false });
+ setup({ isEnterprise: true, segments: [], isAdmin: false });
expect(
screen.queryByRole("link", { name: /New segment/i }),
@@ -79,7 +34,12 @@ describe("SegmentList", () => {
});
it("is not rendered when remote sync is set to read-only", () => {
- setup({ segments: [], isAdmin: true, remoteSyncType: "read-only" });
+ setup({
+ isEnterprise: true,
+ segments: [],
+ isAdmin: true,
+ remoteSyncType: "read-only",
+ });
expect(
screen.queryByRole("link", { name: /New segment/i }),
@@ -88,6 +48,7 @@ describe("SegmentList", () => {
it("is still rendered when remote sync is set to read-only but table is not published", () => {
setup({
+ isEnterprise: true,
segments: [],
isAdmin: true,
remoteSyncType: "read-only",
@@ -109,7 +70,7 @@ describe("SegmentList", () => {
}),
createMockSegment({ id: 2, name: "Active Users" }),
];
- setup({ segments });
+ setup({ isEnterprise: true, segments });
expect(screen.getByRole("list")).toBeInTheDocument();
expect(screen.getByText("High Value")).toBeInTheDocument();
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx
new file mode 100644
index 00000000000..39739664b1a
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx
@@ -0,0 +1,76 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders } from "__support__/ui";
+import type { EnterpriseSettings, Segment, Table } from "metabase-types/api";
+import {
+ createMockTable,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import type { State } from "metabase-types/store";
+import { createMockState } from "metabase-types/store/mocks";
+
+import { SegmentList } from "../SegmentList";
+
+type SetupOpts = {
+ segments?: Segment[];
+ table?: Partial<Table>;
+ isAdmin?: boolean;
+ remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ isEnterprise?: boolean;
+};
+
+export function setup({
+ segments = [],
+ table = {},
+ isAdmin = true,
+ remoteSyncType,
+ isEnterprise = false,
+}: SetupOpts = {}) {
+ const mockTable = createMockTable({
+ id: 1,
+ db_id: 1,
+ schema: "PUBLIC",
+ segments,
+ is_published: true,
+ ...table,
+ });
+
+ let state: State;
+
+ if (isEnterprise) {
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures({
+ data_studio: true,
+ remote_sync: true,
+ }),
+ });
+ state = createMockState({
+ settings,
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ });
+ const pluginNames: ENTERPRISE_PLUGIN_NAME[] = ["library", "remote_sync"];
+ pluginNames.forEach(setupEnterpriseOnlyPlugin);
+ } else {
+ state = createMockState({
+ settings: mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ }),
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ });
+ }
+
+ renderWithProviders(
+ <Route path="/" component={() => <SegmentList table={mockTable} />} />,
+ {
+ withRouter: true,
+ storeInitialState: state,
+ },
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributes.module.css b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributes.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributes.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributes.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
index 22b8466a11a..6b402b9c32c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
@@ -2,6 +2,11 @@ import { useEffect, useState } from "react";
import { usePrevious } from "react-use";
import { t } from "ttag";
+import { useEditTablesMutation } from "metabase/api";
+import {
+ trackDataStudioBulkAttributeUpdated,
+ trackDataStudioBulkSyncSettingsClicked,
+} from "metabase/data-studio/analytics";
import { useSelector } from "metabase/lib/redux";
import {
DataSourceInput,
@@ -10,24 +15,16 @@ import {
UserInput,
} from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";
-import { useEditTablesMutation } from "metabase-enterprise/api";
-import {
- trackDataStudioBulkAttributeUpdated,
- trackDataStudioBulkSyncSettingsClicked,
-} from "metabase-enterprise/data-studio/analytics";
-import { CreateLibraryModal } from "metabase-enterprise/data-studio/common/components/CreateLibraryModal";
-import { PublishTablesModal } from "metabase-enterprise/data-studio/common/components/PublishTablesModal";
-import { UnpublishTablesModal } from "metabase-enterprise/data-studio/common/components/UnpublishTablesModal";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type {
TableDataLayer,
TableDataSource,
UserId,
} from "metabase-types/api";
-import { useSelection } from "../../pages/DataModel/contexts/SelectionContext";
-import { SyncOptionsModal } from "../SyncOptionsModal";
+import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import { SyncOptionsModal } from "../../SyncOptionsModal";
import S from "./TableAttributes.module.css";
import { TableSectionGroup } from "./TableSectionGroup";
@@ -45,7 +42,9 @@ export function TableAttributesEditBulk({
hasLibrary,
onUpdate,
}: TableAttributesEditBulkProps) {
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const {
selectedDatabases,
selectedSchemas,
@@ -309,7 +308,7 @@ export function TableAttributesEditBulk({
</Box>
</Stack>
- <CreateLibraryModal
+ <PLUGIN_LIBRARY.CreateLibraryModal
title={t`First, let's create your Library`}
explanatorySentence={t`This is where published tables will go.`}
isOpened={modalType === "library"}
@@ -317,7 +316,7 @@ export function TableAttributesEditBulk({
onClose={handleCloseModal}
/>
- <PublishTablesModal
+ <PLUGIN_LIBRARY.PublishTablesModal
isOpened={modalType === "publish"}
databaseIds={Array.from(selectedDatabases)}
schemaIds={Array.from(selectedSchemas)}
@@ -326,7 +325,7 @@ export function TableAttributesEditBulk({
onClose={handleCloseModal}
/>
- <UnpublishTablesModal
+ <PLUGIN_LIBRARY.UnpublishTablesModal
isOpened={modalType === "unpublish"}
databaseIds={Array.from(selectedDatabases)}
schemaIds={Array.from(selectedSchemas)}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.unit.spec.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.unit.spec.tsx
index 9d618ee6615..e506e032374 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.unit.spec.tsx
@@ -12,7 +12,7 @@ import { renderWithProviders, screen, waitFor } from "__support__/ui";
import {
SelectionProvider,
useSelection,
-} from "metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
+} from "metabase/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
import type { TableId } from "metabase-types/api";
import { createMockTable, createMockUser } from "metabase-types/api/mocks";
@@ -91,7 +91,7 @@ function setup({
});
setupTableEndpoints(createMockTable());
- fetchMock.post("path:/api/ee/data-studio/table/edit", {
+ fetchMock.post("path:/api/data-studio/table/edit", {
status: 200,
body: {
data: {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditSingle.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditSingle.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableCollection.module.css b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableCollection.module.css
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableCollection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableCollection.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableMetadata.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableMetadata.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSectionGroup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableSectionGroup.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSectionGroup.tsx
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableSectionGroup.tsx
index 4f84e51292b..30e8b97bc8e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSectionGroup.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableSectionGroup.tsx
@@ -1,6 +1,6 @@
import { Stack, Title } from "metabase/ui";
-import S from "./TableSection.module.css";
+import S from "../TableSection.module.css";
export function TableSectionGroup({
title,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/hooks.ts b/frontend/src/metabase/data-studio/data-model/components/TableSection/hooks.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/hooks.ts
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/hooks.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/index.ts b/frontend/src/metabase/data-studio/data-model/components/TableSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/TableSection/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/common.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/common.unit.spec.tsx
new file mode 100644
index 00000000000..5c9ccaafa2b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/common.unit.spec.tsx
@@ -0,0 +1,68 @@
+import { screen } from "__support__/ui";
+import { createMockSegment, createMockTable } from "metabase-types/api/mocks";
+
+import { setup } from "./setup";
+
+describe("TableSection", () => {
+ it("should render the link to explore this table in the query builder", () => {
+ const table = createMockTable();
+ setup({ table });
+
+ const tableLink = screen.getByLabelText("Go to this table");
+ expect(tableLink).toBeInTheDocument();
+ expect(tableLink).toHaveAttribute(
+ "href",
+ `/question#?db=${table.db_id}&table=${table.id}`,
+ );
+ });
+
+ describe("tabs", () => {
+ it("should render Fields and Segments tabs", () => {
+ setup({ activeTab: "field" });
+
+ expect(screen.getByRole("tab", { name: /Fields/i })).toBeInTheDocument();
+ expect(
+ screen.getByRole("tab", { name: /Segments/i }),
+ ).toBeInTheDocument();
+ });
+
+ it("should show Fields tab as selected when activeTab is field", () => {
+ setup({ activeTab: "field" });
+
+ expect(screen.getByRole("tab", { name: /Fields/i })).toHaveAttribute(
+ "aria-selected",
+ "true",
+ );
+ expect(screen.getByRole("tab", { name: /Segments/i })).toHaveAttribute(
+ "aria-selected",
+ "false",
+ );
+ });
+
+ it("should show Segments tab as selected when activeTab is segments", () => {
+ setup({ activeTab: "segments" });
+
+ expect(screen.getByRole("tab", { name: /Segments/i })).toHaveAttribute(
+ "aria-selected",
+ "true",
+ );
+ expect(screen.getByRole("tab", { name: /Fields/i })).toHaveAttribute(
+ "aria-selected",
+ "false",
+ );
+ });
+
+ it("should show segment list content in segments tab", () => {
+ const segments = [createMockSegment({ id: 1, name: "Test Segment" })];
+ setup({ activeTab: "segments", segments });
+
+ expect(screen.getByText("Test Segment")).toBeInTheDocument();
+ });
+
+ it("should show empty state when no segments exist in segments tab", () => {
+ setup({ activeTab: "segments", segments: [] });
+
+ expect(screen.getByText("No segments yet")).toBeInTheDocument();
+ });
+ });
+});
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/enterprise.unit.spec.tsx
new file mode 100644
index 00000000000..5ef8a644a7a
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/enterprise.unit.spec.tsx
@@ -0,0 +1,32 @@
+import { screen } from "__support__/ui";
+
+import { type SetupOpts, setup } from "./setup";
+
+describe("TableSection", () => {
+ const commonSettings: Partial<SetupOpts> = {
+ enterprisePlugins: ["library", "remote_sync"],
+ tokenFeatures: { data_studio: true, remote_sync: true },
+ };
+
+ it("should render publish button for admins", () => {
+ setup({
+ ...commonSettings,
+ isAdmin: true,
+ });
+
+ expect(screen.getByText("Publish")).toBeInTheDocument();
+ });
+
+ it("should render publish button for data analysts", () => {
+ setup({ ...commonSettings, isDataAnalyst: true });
+
+ expect(screen.getByText("Publish")).toBeInTheDocument();
+ });
+
+ it("should not render publish button when remote sync is set to read-only", () => {
+ setup({ ...commonSettings, remoteSyncType: "read-only" });
+
+ expect(screen.queryByText("Publish")).not.toBeInTheDocument();
+ expect(screen.queryByText("Unpublish")).not.toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
new file mode 100644
index 00000000000..c651dcc2deb
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
@@ -0,0 +1,96 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import {
+ setupUserKeyValueEndpoints,
+ setupUsersEndpoints,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders } from "__support__/ui";
+import type { RouteParams } from "metabase/data-studio/data-model/pages/DataModel/types";
+import type { DataStudioTableMetadataTab } from "metabase/lib/urls";
+import type {
+ EnterpriseSettings,
+ Segment,
+ Table,
+ TokenFeatures,
+} from "metabase-types/api";
+import {
+ createMockTable,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
+
+import { TableSection } from "../TableSection";
+
+export type SetupOpts = {
+ table?: Table;
+ params?: RouteParams;
+ activeTab?: DataStudioTableMetadataTab;
+ segments?: Segment[];
+ isAdmin?: boolean;
+ isDataAnalyst?: boolean;
+ remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ enterprisePlugins?: Parameters<typeof setupEnterpriseOnlyPlugin>[0][];
+ tokenFeatures?: Partial<TokenFeatures>;
+};
+
+export function setup({
+ table = createMockTable(),
+ activeTab = "field",
+ segments,
+ isAdmin = false,
+ isDataAnalyst = false,
+ remoteSyncType,
+ enterprisePlugins,
+ tokenFeatures,
+}: SetupOpts = {}) {
+ const onSyncOptionsClick = jest.fn();
+ const tableWithSegments = segments ? { ...table, segments } : table;
+
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ currentUser: createMockUser({
+ is_superuser: isAdmin,
+ is_data_analyst: isDataAnalyst,
+ }),
+ settings,
+ });
+
+ if (enterprisePlugins) {
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+ }
+
+ setupUsersEndpoints([createMockUser()]);
+ setupUserKeyValueEndpoints({
+ namespace: "user_acknowledgement",
+ key: "seen-publish-tables-info",
+ value: true,
+ });
+
+ renderWithProviders(
+ <Route
+ path="/"
+ component={() => (
+ <TableSection
+ table={tableWithSegments}
+ activeTab={activeTab}
+ hasLibrary
+ canPublish
+ onSyncOptionsClick={onSyncOptionsClick}
+ />
+ )}
+ />,
+ {
+ withRouter: true,
+ storeInitialState: state,
+ },
+ );
+
+ return { onSyncOptionsClick };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/index.ts b/frontend/src/metabase/data-studio/data-model/components/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/index.ts
rename to frontend/src/metabase/data-studio/data-model/components/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
index 4f80ad928db..09a25ac3bb4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -10,6 +10,10 @@ import {
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useHasTokenFeature } from "metabase/common/hooks";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer/PageContainer";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { hasLibraryCollection } from "metabase/data-studio/common/utils";
import { isCypressActive } from "metabase/env";
import * as Urls from "metabase/lib/urls";
import {
@@ -21,6 +25,7 @@ import {
} from "metabase/metadata/components";
import { getTableMetadataQuery } from "metabase/metadata/pages/shared/utils";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
import {
Box,
Button,
@@ -31,11 +36,6 @@ import {
Stack,
rem,
} from "metabase/ui";
-import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer/PageContainer";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { hasLibraryCollection } from "metabase-enterprise/data-studio/common/utils";
import { trackMetadataChange } from "../../analytics";
import {
@@ -43,7 +43,7 @@ import {
SyncOptionsModal,
TableSection,
} from "../../components";
-import { TableAttributesEditBulk } from "../../components/TableSection/TableAttributesEditBulk";
+import { TableAttributesEditBulk } from "../../components/TableSection/components/TableAttributesEditBulk";
import S from "./DataModel.module.css";
import { COLUMN_CONFIG } from "./constants";
@@ -115,7 +115,9 @@ function DataModelContent({ params }: Props) {
const hasLibraryFeature = useHasTokenFeature("data_studio");
const { data: libraryCollection, isLoading: isLoadingLibrary } =
- useGetLibraryCollectionQuery(undefined, { skip: !hasLibraryFeature });
+ PLUGIN_LIBRARY.useGetLibraryCollectionQuery(undefined, {
+ skip: !hasLibraryFeature,
+ });
const [previewType, setPreviewType] = useState<PreviewType>("table");
const isLoading = isLoadingDatabases || isLoadingTables || isLoadingLibrary;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
index c02242b3fb4..c8a1c93f0ea 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
@@ -731,7 +731,7 @@ describe("DataModel", () => {
);
const calls = fetchMock.callHistory.calls(
- "path:/api/ee/data-studio/table/rescan-values",
+ "path:/api/data-studio/table/rescan-values",
{
method: "POST",
},
@@ -763,7 +763,7 @@ describe("DataModel", () => {
}),
);
const calls = fetchMock.callHistory.calls(
- "path:/api/ee/data-studio/table/discard-values",
+ "path:/api/data-studio/table/discard-values",
{
method: "POST",
},
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/constants.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/types.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/types.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.unit.spec.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx b/frontend/src/metabase/data-studio/data-model/routes.tsx
similarity index 77%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx
rename to frontend/src/metabase/data-studio/data-model/routes.tsx
index a69ce550a3b..65ef57867da 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx
+++ b/frontend/src/metabase/data-studio/data-model/routes.tsx
@@ -1,15 +1,15 @@
import { IndexRoute, Redirect, Route } from "react-router";
+import { DataModelMeasureDependenciesPage } from "metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage";
+import { DataModelMeasureDetailPage } from "metabase/data-studio/measures/pages/DataModelMeasureDetailPage";
+import { DataModelMeasureRevisionHistoryPage } from "metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage";
+import { DataModelNewMeasurePage } from "metabase/data-studio/measures/pages/DataModelNewMeasurePage";
+import { DataModelNewSegmentPage } from "metabase/data-studio/segments/pages/DataModelNewSegmentPage";
+import { DataModelSegmentDependenciesPage } from "metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage";
+import { DataModelSegmentDetailPage } from "metabase/data-studio/segments/pages/DataModelSegmentDetailPage";
+import { DataModelSegmentRevisionHistoryPage } from "metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { IsAdmin } from "metabase/route-guards";
-import { DataModelMeasureDependenciesPage } from "metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage";
-import { DataModelMeasureDetailPage } from "metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage";
-import { DataModelMeasureRevisionHistoryPage } from "metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage";
-import { DataModelNewMeasurePage } from "metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage";
-import { DataModelNewSegmentPage } from "metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage";
-import { DataModelSegmentDependenciesPage } from "metabase-enterprise/data-studio/segments/pages/DataModelSegmentDependenciesPage";
-import { DataModelSegmentDetailPage } from "metabase-enterprise/data-studio/segments/pages/DataModelSegmentDetailPage";
-import { DataModelSegmentRevisionHistoryPage } from "metabase-enterprise/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage";
import { DataModel } from "./pages/DataModel";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css
rename to frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
rename to frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
index c638667352f..8bec2866d19 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
+++ b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
@@ -6,16 +6,16 @@ import {
useListGlossaryQuery,
useUpdateGlossaryMutation,
} from "metabase/api";
-import { GlossaryTable } from "metabase/reference/glossary/GlossaryTable";
-import { Box, Card } from "metabase/ui";
import {
trackDataStudioGlossaryTermCreated,
trackDataStudioGlossaryTermDeleted,
trackDataStudioGlossaryTermUpdated,
-} from "metabase-enterprise/data-studio/analytics";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/analytics";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { GlossaryTable } from "metabase/reference/glossary/GlossaryTable";
+import { Box, Card } from "metabase/ui";
import S from "./GlossaryPage.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/index.ts b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/index.ts
rename to frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/routes.tsx b/frontend/src/metabase/data-studio/glossary/routes.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/glossary/routes.tsx
rename to frontend/src/metabase/data-studio/glossary/routes.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
index 8c74981e1db..3a82e6315b8 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import {
DataModelBreadcrumbs,
PublishedTableBreadcrumbs,
-} from "metabase-enterprise/data-studio/common/components/Breadcrumbs";
+} from "metabase/data-studio/common/components/Breadcrumbs";
+import * as Urls from "metabase/lib/urls";
import type { Measure, Table } from "metabase-types/api";
type MeasureBreadcrumbsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/index.ts b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/index.ts
rename to frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.module.css b/frontend/src/metabase/data-studio/measures/components/MeasureEditor/MeasureEditor.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.module.css
rename to frontend/src/metabase/data-studio/measures/components/MeasureEditor/MeasureEditor.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/index.ts b/frontend/src/metabase/data-studio/measures/components/MeasureEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/index.ts
rename to frontend/src/metabase/data-studio/measures/components/MeasureEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
index 7dc8ba18e5b..7662565f2c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
@@ -2,13 +2,13 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { useUpdateMeasureMutation } from "metabase/api";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Stack } from "metabase/ui";
-import { EntityDetailTabs } from "metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
+import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Stack } from "metabase/ui";
import type { Measure } from "metabase-types/api";
import type { MeasureTabUrls } from "../../types";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/index.ts b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/index.ts
rename to frontend/src/metabase/data-studio/measures/components/MeasureHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx
index 715356e7fae..374a531d1ba 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { MoreMenu } from "metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu";
+import { MoreMenu } from "metabase/data-studio/common/components/MoreMenu/MoreMenu";
type MeasureMoreMenuProps = {
previewUrl?: string;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/index.ts b/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/index.ts
rename to frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
rename to frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/index.ts b/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/index.ts
rename to frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx b/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
rename to frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
index 2ff454de53a..5591d387290 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { EditableText } from "metabase/common/components/EditableText";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { MeasureMoreMenu } from "../MeasureMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/index.ts b/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/index.ts
rename to frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/index.ts b/frontend/src/metabase/data-studio/measures/hooks/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/index.ts
rename to frontend/src/metabase/data-studio/measures/hooks/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-data-model-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-data-model-measure-page.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-measure-query.ts b/frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-measure-query.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-published-table-measure-page.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
index be7c0951271..517e57b7ab5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/index.ts b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
index 3611e52e589..55038b1a4cd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
@@ -1,9 +1,9 @@
import type { ReactNode } from "react";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
import type { Measure } from "metabase-types/api";
import { MeasureHeader } from "../../components/MeasureHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
index af8773acbe0..59848a89565 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
@@ -5,13 +5,13 @@ import { t } from "ttag";
import { useUpdateMeasureMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
+import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { Button, Group } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
-import { getUserCanWriteMeasures } from "metabase-enterprise/data-studio/selectors";
import * as Lib from "metabase-lib";
import type { Measure } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.css b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.css
rename to frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
index 0485688405d..30bdf823042 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { Stack } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
import type { Measure } from "metabase-types/api";
import { MeasureHeader } from "../../components/MeasureHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
index 8db29bd119b..4a1bc8a8f1f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
@@ -6,12 +6,12 @@ import { t } from "ttag";
import { useCreateMeasureMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { Button } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
import * as Lib from "metabase-lib";
import type { DatasetQuery, Measure, Table } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/index.ts b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.ts b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
index 79762ef382d..a94c2409eb4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
import { NewMeasurePage } from "../NewMeasurePage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/index.ts b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/routes.tsx b/frontend/src/metabase/data-studio/measures/routes.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/routes.tsx
rename to frontend/src/metabase/data-studio/measures/routes.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/types.ts b/frontend/src/metabase/data-studio/measures/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/types.ts
rename to frontend/src/metabase/data-studio/measures/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/utils/measure-query.ts b/frontend/src/metabase/data-studio/measures/utils/measure-query.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/measures/utils/measure-query.ts
rename to frontend/src/metabase/data-studio/measures/utils/measure-query.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
rename to frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
index 71e26c9d8f5..f381c91a4fa 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
+++ b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
@@ -12,9 +12,7 @@ import {
SidebarSection,
} from "metabase/nav/containers/MainNavbar/MainNavbar.styled";
import { SidebarCollectionLink } from "metabase/nav/containers/MainNavbar/SidebarItems";
-import { CollectionSyncStatusBadge } from "metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/CollectionSyncStatusBadge";
-import { useGitSyncVisible } from "metabase-enterprise/remote_sync/hooks/use-git-sync-visible";
-import { useRemoteSyncDirtyState } from "metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import type { Collection } from "metabase-types/api";
type LibraryCollectionSectionProps = {
@@ -32,8 +30,9 @@ export function NavbarLibrarySection({
"expand-library-in-nav",
);
- const { isVisible: isGitSyncVisible } = useGitSyncVisible();
- const { isCollectionDirty } = useRemoteSyncDirtyState();
+ const { isVisible: isGitSyncVisible } =
+ PLUGIN_REMOTE_SYNC.useGitSyncVisible();
+ const { isCollectionDirty } = PLUGIN_REMOTE_SYNC.useRemoteSyncDirtyState();
const libraryTree = useMemo(() => {
const libraryCollection = collections.find(isLibraryCollection);
@@ -83,7 +82,11 @@ export function NavbarLibrarySection({
role="tree"
aria-label="library-collection-tree"
rightSection={(item) =>
- showChangesBadge(item?.id) && <CollectionSyncStatusBadge />
+ isGitSyncVisible &&
+ showChangesBadge(item?.id) &&
+ PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge && (
+ <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />
+ )
}
/>
</CollapseSection>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/index.ts b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/index.ts
rename to frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.unit.spec.tsx b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/enterprise.unit.spec.tsx
similarity index 52%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.unit.spec.tsx
rename to frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/enterprise.unit.spec.tsx
index 7400b6b858f..9dc6cd6c826 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/enterprise.unit.spec.tsx
@@ -1,109 +1,9 @@
import fetchMock from "fetch-mock";
-import { Route } from "react-router";
-import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import type { Collection } from "metabase-types/api";
+import { screen, waitFor } from "__support__/ui";
import { createMockCollection } from "metabase-types/api/mocks";
-import { createMockState } from "metabase-types/store/mocks";
-
-// Mock isLibraryCollection to return true for collections with type "library"
-jest.mock("metabase/collections/utils", () => ({
- ...jest.requireActual("metabase/collections/utils"),
- isLibraryCollection: (collection: { type: string | null }) =>
- collection?.type === "library",
-}));
-
-// Mock useGitSyncVisible
-const mockUseGitSyncVisible = jest.fn(() => ({
- isVisible: true,
- currentBranch: "main",
-}));
-jest.mock("metabase-enterprise/remote_sync/hooks/use-git-sync-visible", () => ({
- useGitSyncVisible: () => mockUseGitSyncVisible(),
-}));
-
-// Mock useRemoteSyncDirtyState
-const mockIsCollectionDirty = jest.fn(
- (_id: number | string | undefined) => false,
-);
-jest.mock(
- "metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state",
- () => ({
- useRemoteSyncDirtyState: () => ({
- isCollectionDirty: mockIsCollectionDirty,
- }),
- }),
-);
-
-import { NavbarLibrarySection } from "./NavbarLibrarySection";
-
-const createChildCollection = (
- overrides: Partial<Collection> = {},
-): Collection =>
- createMockCollection({
- id: 10,
- name: "Metrics",
- type: null,
- location: "/1/",
- here: ["card"],
- below: ["card"],
- ...overrides,
- } as Partial<Collection>);
-
-const createLibraryCollection = (
- overrides: Partial<Collection> = {},
-): Collection =>
- createMockCollection({
- id: 1,
- name: "Library",
- type: "library",
- location: "/",
- here: ["card"],
- below: ["card"],
- ...overrides,
- } as Partial<Collection>);
-
-const setup = ({
- collections = [createLibraryCollection()],
- dirtyCollectionIds = [] as number[],
- isGitSyncVisible = true,
-}: {
- collections?: Collection[];
- dirtyCollectionIds?: number[];
- isGitSyncVisible?: boolean;
-} = {}) => {
- mockUseGitSyncVisible.mockReturnValue({
- isVisible: isGitSyncVisible,
- currentBranch: "main",
- });
- mockIsCollectionDirty.mockImplementation(
- (id: number | string | undefined) =>
- typeof id === "number" && dirtyCollectionIds.includes(id),
- );
-
- return renderWithProviders(
- <Route
- path="/"
- component={() => (
- <NavbarLibrarySection
- collections={collections}
- selectedId={undefined}
- onItemSelect={jest.fn()}
- />
- )}
- />,
- {
- storeInitialState: createMockState({
- settings: mockSettings({
- "expand-library-in-nav": true,
- }),
- }),
- withRouter: true,
- withDND: true,
- },
- );
-};
+
+import { createChildCollection, createLibraryCollection, setup } from "./setup";
describe("NavbarLibrarySection", () => {
beforeEach(() => {
@@ -143,8 +43,6 @@ describe("NavbarLibrarySection", () => {
});
setup({
collections: [libraryCollection],
- dirtyCollectionIds: [10],
- isGitSyncVisible: false,
});
await waitFor(() => {
@@ -162,8 +60,6 @@ describe("NavbarLibrarySection", () => {
});
setup({
collections: [libraryCollection],
- dirtyCollectionIds: [],
- isGitSyncVisible: true,
});
await waitFor(() => {
@@ -179,10 +75,18 @@ describe("NavbarLibrarySection", () => {
const libraryCollection = createLibraryCollection({
children: [createChildCollection({ id: 10, name: "Metrics" })],
});
+
+ fetchMock.get("path:/api/ee/remote-sync/dirty", {
+ dirty: [
+ {
+ collection_id: 10,
+ },
+ ],
+ });
+
setup({
+ isEnterprise: true,
collections: [libraryCollection],
- dirtyCollectionIds: [10],
- isGitSyncVisible: true,
});
await waitFor(() => {
@@ -201,15 +105,24 @@ describe("NavbarLibrarySection", () => {
createChildCollection({ id: 11, name: "Clean Collection" }),
],
});
+
+ fetchMock.get("path:/api/ee/remote-sync/dirty", {
+ dirty: [
+ {
+ collection_id: 10,
+ },
+ ],
+ });
+
setup({
+ isEnterprise: true,
collections: [libraryCollection],
- dirtyCollectionIds: [10],
- isGitSyncVisible: true,
});
await waitFor(() => {
expect(screen.getByText("Dirty Collection")).toBeInTheDocument();
});
+
expect(screen.getByText("Clean Collection")).toBeInTheDocument();
await waitFor(() => {
diff --git a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/setup.tsx b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/setup.tsx
new file mode 100644
index 00000000000..939cd3a4397
--- /dev/null
+++ b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/setup.tsx
@@ -0,0 +1,102 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import {
+ setupPropertiesEndpoints,
+ setupSettingsEndpoints,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders } from "__support__/ui";
+import type { Collection } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockSettings,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import type { State } from "metabase-types/store";
+import { createMockState } from "metabase-types/store/mocks";
+
+import { NavbarLibrarySection } from "../NavbarLibrarySection";
+
+export const createChildCollection = (
+ overrides: Partial<Collection> = {},
+): Collection =>
+ createMockCollection({
+ id: 10,
+ name: "Metrics",
+ type: null,
+ location: "/1/",
+ here: ["card"],
+ below: ["card"],
+ ...overrides,
+ } as Partial<Collection>);
+export const createLibraryCollection = (
+ overrides: Partial<Collection> = {},
+): Collection =>
+ createMockCollection({
+ id: 1,
+ name: "Library",
+ type: "library",
+ location: "/",
+ here: ["card"],
+ below: ["card"],
+ ...overrides,
+ } as Partial<Collection>);
+export const setup = ({
+ collections = [createLibraryCollection()],
+ isEnterprise = false,
+}: {
+ collections?: Collection[];
+ isEnterprise?: boolean;
+} = {}) => {
+ let state: State;
+ if (isEnterprise) {
+ const settings = createMockSettings({
+ "expand-library-in-nav": true,
+ "remote-sync-enabled": true,
+ "remote-sync-branch": "main",
+ "remote-sync-type": "read-write",
+ "token-features": createMockTokenFeatures({
+ data_studio: true,
+ remote_sync: true,
+ }),
+ });
+ setupPropertiesEndpoints(settings);
+ state = createMockState({
+ settings: mockSettings(settings),
+ currentUser: createMockUser({ is_superuser: true }),
+ });
+
+ const pluginNames: ENTERPRISE_PLUGIN_NAME[] = ["library", "remote_sync"];
+ pluginNames.forEach(setupEnterpriseOnlyPlugin);
+ } else {
+ state = createMockState({
+ settings: mockSettings({
+ "expand-library-in-nav": true,
+ }),
+ currentUser: createMockUser({ is_superuser: true }),
+ });
+ }
+
+ setupSettingsEndpoints([]);
+
+ return renderWithProviders(
+ <Route
+ path="/"
+ component={() => (
+ <NavbarLibrarySection
+ collections={collections}
+ selectedId={undefined}
+ onItemSelect={jest.fn()}
+ />
+ )}
+ />,
+ {
+ storeInitialState: state,
+ withRouter: true,
+ withDND: true,
+ },
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
similarity index 65%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
rename to frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
index 32db7e889a1..67a16a0ab0d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
+++ b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
@@ -2,24 +2,25 @@ import { useCallback } from "react";
import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import type { DataStudioToolbarButtonProps } from "metabase/plugins";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
import { openUrl } from "metabase/redux/app";
-import { canAccessDataStudio } from "metabase-enterprise/data-studio/selectors";
-import { Urls } from "metabase-enterprise/urls";
+import type Question from "metabase-lib/v1/Question";
+type DataStudioToolbarButtonProps = {
+ question: Question;
+};
export const DataStudioToolbarButton = ({
question,
}: DataStudioToolbarButtonProps) => {
const dispatch = useDispatch();
- const hasDataStuioAccess = useSelector(canAccessDataStudio);
const isMetric = question.type() === "metric";
const handleClick = useCallback(() => {
dispatch(openUrl(Urls.dataStudioMetric(question.id())));
}, [question, dispatch]);
- if (!isMetric || !hasDataStuioAccess) {
+ if (!isMetric) {
return null;
}
diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx
new file mode 100644
index 00000000000..c008ea011d6
--- /dev/null
+++ b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx
@@ -0,0 +1,65 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import Question from "metabase-lib/v1/Question";
+import type { CardType } from "metabase-types/api";
+import { createMockCard, createMockUser } from "metabase-types/api/mocks";
+
+import { DataStudioToolbarButton } from "./DataStudioToolbarButton";
+
+const setup = ({
+ type = "metric",
+ is_superuser = false,
+ is_data_analyst = true,
+}: {
+ type?: CardType;
+ is_data_analyst?: boolean;
+ is_superuser?: boolean;
+} = {}) => {
+ const question = new Question(
+ createMockCard({
+ type,
+ }),
+ );
+
+ renderWithProviders(<DataStudioToolbarButton question={question} />, {
+ storeInitialState: {
+ currentUser: createMockUser({
+ is_data_analyst,
+ is_superuser,
+ }),
+ },
+ });
+};
+
+describe("DataStudioToolbarButton", () => {
+ it("should render a button if the card is a metric and the user has data studio access", async () => {
+ setup();
+
+ expect(
+ await screen.findByRole("button", { name: "Open in Data Studio" }),
+ ).toBeInTheDocument();
+ });
+
+ it("should render a button if the card is a metric and the user is an admin", async () => {
+ setup({ is_superuser: true, is_data_analyst: false });
+
+ expect(
+ await screen.findByRole("button", { name: "Open in Data Studio" }),
+ ).toBeInTheDocument();
+ });
+
+ it("should not render a button if the card is a model", async () => {
+ setup({ type: "model" });
+
+ expect(
+ screen.queryByRole("button", { name: "Open in Data Studio" }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should not render a button if the card is a question", async () => {
+ setup({ type: "question" });
+
+ expect(
+ screen.queryByRole("button", { name: "Open in Data Studio" }),
+ ).not.toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/index.ts b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
rename to frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsx
similarity index 74%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
rename to frontend/src/metabase/data-studio/routes.tsx
index ad68904f78b..4c9b0fa6c9c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
+++ b/frontend/src/metabase/data-studio/routes.tsx
@@ -6,28 +6,24 @@ import * as Urls from "metabase/lib/urls";
import {
PLUGIN_DEPENDENCIES,
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
- PLUGIN_TRANSFORMS,
+ PLUGIN_LIBRARY,
+ PLUGIN_WORKSPACES,
} from "metabase/plugins";
-import { hasPremiumFeature } from "metabase-enterprise/settings";
+import { getDataStudioTransformRoutes } from "metabase/transforms/routes";
+import { canAccessTransforms } from "metabase/transforms/selectors";
import type { State } from "metabase-types/store";
import { DataSectionLayout } from "./app/pages/DataSectionLayout";
import { DataStudioLayout } from "./app/pages/DataStudioLayout";
import { DependenciesSectionLayout } from "./app/pages/DependenciesSectionLayout";
-import { DependencyDiagnosticsSectionLayout } from "./app/pages/DependencyDiagnosticsSectionLayout";
import { GitSyncSectionLayout } from "./app/pages/GitSyncSectionLayout";
-import { LibrarySectionLayout } from "./app/pages/LibrarySectionLayout";
+import { DependencyDiagnosticsSectionLayout } from "./app/pages/TasksSectionLayout/TasksSectionLayout";
import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";
import { WorkspacesSectionLayout } from "./app/pages/WorkspacesSectionLayout";
import { getDataStudioMetadataRoutes } from "./data-model/routes";
import { getDataStudioGlossaryRoutes } from "./glossary/routes";
-import { getDataStudioMetricRoutes } from "./metrics/routes";
-import { getDataStudioSegmentRoutes } from "./segments/routes";
-import { getDataStudioSnippetRoutes } from "./snippets/routes";
-import { getDataStudioTableRoutes } from "./tables/routes";
-import { DependenciesUpsellPage } from "./upsells";
+import { DependenciesUpsellPage, LibraryUpsellPage } from "./upsells";
import { DependencyDiagnosticsUpsellPage } from "./upsells/DependencyDiagnosticsUpsellPage";
-import { getDataStudioWorkspaceRoutes } from "./workspaces/routes";
export function getDataStudioRoutes(
store: Store<State>,
@@ -49,19 +45,17 @@ export function getDataStudioRoutes(
</Route>
</Route>
<Route path="transforms" component={TransformsSectionLayout}>
- {PLUGIN_TRANSFORMS.getDataStudioTransformRoutes()}
+ {getDataStudioTransformRoutes()}
</Route>
{getDataStudioGlossaryRoutes()}
- <Route path="library">
- <IndexRoute component={LibrarySectionLayout} />
- {getDataStudioTableRoutes()}
- {getDataStudioMetricRoutes()}
- {getDataStudioSegmentRoutes()}
- {getDataStudioSnippetRoutes()}
- </Route>
- {hasPremiumFeature("workspaces") && (
+ {PLUGIN_LIBRARY.isEnabled ? (
+ PLUGIN_LIBRARY.getDataStudioLibraryRoutes()
+ ) : (
+ <Route path="library" component={LibraryUpsellPage} />
+ )}
+ {PLUGIN_WORKSPACES.isEnabled && (
<Route path="workspaces" component={WorkspacesSectionLayout}>
- {getDataStudioWorkspaceRoutes()}
+ {PLUGIN_WORKSPACES.getDataStudioWorkspaceRoutes()}
</Route>
)}
{PLUGIN_DEPENDENCIES.isEnabled ? (
@@ -94,7 +88,7 @@ function getIndexPath(state: State) {
if (PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel(state)) {
return Urls.dataStudioData();
}
- if (PLUGIN_TRANSFORMS.canAccessTransforms(state)) {
+ if (canAccessTransforms(state)) {
return Urls.transformList();
}
return Urls.dataStudioLibrary();
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx b/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
rename to frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
index 7522a87575a..ea9293a5f21 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
import { SegmentMoreMenu } from "../SegmentMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/index.ts b/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/index.ts
rename to frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
index 14af2b60bf9..db4afc70b1f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import {
DataModelBreadcrumbs,
PublishedTableBreadcrumbs,
-} from "metabase-enterprise/data-studio/common/components/Breadcrumbs";
+} from "metabase/data-studio/common/components/Breadcrumbs";
+import * as Urls from "metabase/lib/urls";
import type { Segment, Table } from "metabase-types/api";
type SegmentBreadcrumbsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/index.ts b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/index.ts
rename to frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css b/frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css
rename to frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/index.ts b/frontend/src/metabase/data-studio/segments/components/SegmentEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/index.ts
rename to frontend/src/metabase/data-studio/segments/components/SegmentEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
index e6d08abd799..3775b7727ca 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
@@ -2,14 +2,14 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { useUpdateSegmentMutation } from "metabase/api";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Stack } from "metabase/ui";
-import { EntityDetailTabs } from "metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
+import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import type { SegmentTabUrls } from "metabase-enterprise/data-studio/segments/types";
+} from "metabase/data-studio/common/components/PaneHeader";
+import type { SegmentTabUrls } from "metabase/data-studio/segments/types";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Stack } from "metabase/ui";
import type { Segment } from "metabase-types/api";
import { SegmentMoreMenu } from "../SegmentMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/index.ts b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/index.ts
rename to frontend/src/metabase/data-studio/segments/components/SegmentHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx
index a0a7bb2c291..04a30a838fd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { MoreMenu } from "metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu";
+import { MoreMenu } from "metabase/data-studio/common/components/MoreMenu/MoreMenu";
type SegmentMoreMenuProps = {
previewUrl?: string;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/index.ts b/frontend/src/metabase/data-studio/segments/components/SegmentMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/index.ts
rename to frontend/src/metabase/data-studio/segments/components/SegmentMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
rename to frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/index.ts b/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/index.ts
rename to frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/index.ts b/frontend/src/metabase/data-studio/segments/hooks/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/index.ts
rename to frontend/src/metabase/data-studio/segments/hooks/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-data-model-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-data-model-segment-page.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-published-table-segment-page.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-segment-query.ts b/frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-segment-query.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
index 83a839fab21..bc0a19a8477 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDependenciesPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDetailPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentDetailPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
index a7b58bc5094..0c47a9e16cd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
@@ -6,12 +6,12 @@ import { t } from "ttag";
import { useCreateSegmentMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { Button } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
import * as Lib from "metabase-lib";
import type { DatasetQuery, Segment, Table } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx
rename to frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
index ef225bdc837..2fe55a6c0e7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
import { NewSegmentPage } from "../NewSegmentPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDetailPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDetailPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
index e702bdeea46..8724eabc6ab 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
@@ -1,9 +1,9 @@
import type { ReactNode } from "react";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
import type { Segment } from "metabase-types/api";
import { SegmentHeader } from "../../components/SegmentHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
index cbd66d08b2b..7f8310022a4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
@@ -5,13 +5,13 @@ import { t } from "ttag";
import { useUpdateSegmentMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
+import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { Button, Group } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
-import { getUserCanWriteSegments } from "metabase-enterprise/data-studio/selectors";
import * as Lib from "metabase-lib";
import type { Segment } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/common.unit.spec.tsx
similarity index 52%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx
rename to frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/common.unit.spec.tsx
index 6fbf3bf1d64..7815351f6f8 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/common.unit.spec.tsx
@@ -1,134 +1,10 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
-import { Route } from "react-router";
-
-import {
- setupSchemaEndpoints,
- setupSegmentEndpoint,
-} from "__support__/server-mocks";
-import { mockSettings } from "__support__/settings";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
-import type { EnterpriseSettings, Segment, Table } from "metabase-types/api";
-import {
- createMockDatabase,
- createMockField,
- createMockSegment,
- createMockStructuredDatasetQuery,
- createMockTable,
- createMockUser,
-} from "metabase-types/api/mocks";
-
-import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-
-import { SegmentDetailPage } from "./SegmentDetailPage";
-
-const TEST_TABLE = createMockTable({
- id: 42,
- display_name: "Orders",
- schema: "PUBLIC",
- fields: [
- createMockField({
- id: 1,
- table_id: 42,
- name: "ID",
- display_name: "ID",
- base_type: "type/Integer",
- semantic_type: "type/PK",
- }),
- createMockField({
- id: 2,
- table_id: 42,
- name: "TOTAL",
- display_name: "Total",
- base_type: "type/Float",
- semantic_type: null,
- }),
- ],
-});
-
-const TEST_DATABASE = createMockDatabase({
- id: 1,
- name: "Test Database",
-});
-TEST_TABLE.db_id = TEST_DATABASE.id;
-TEST_TABLE.db = TEST_DATABASE;
-
-const TEST_SEGMENT = createMockSegment({
- id: 1,
- name: "High Value Orders",
- description: "Orders with total > 100",
- table_id: TEST_TABLE.id,
- definition: createMockStructuredDatasetQuery({
- database: TEST_DATABASE.id,
- query: {
- "source-table": TEST_TABLE.id,
- filter: [">", ["field", 2, null], 100],
- },
- }),
-});
+import { screen, waitFor } from "__support__/ui";
+import { createMockSegment } from "metabase-types/api/mocks";
-type SetupOpts = {
- segment?: Segment;
- table?: Table;
- isAdmin?: boolean;
- remoteSyncType?: EnterpriseSettings["remote-sync-type"];
-};
-
-function setup({
- segment = TEST_SEGMENT,
- table = TEST_TABLE,
- isAdmin = true,
- remoteSyncType,
-}: SetupOpts = {}) {
- setupSegmentEndpoint(segment);
- setupSchemaEndpoints(checkNotNull(table.db));
-
- const baseUrl = `/data-studio/data/database/${TEST_DATABASE.id}/schema/${TEST_DATABASE.id}:PUBLIC/table/${table.id}/segments/${segment.id}`;
-
- const tabUrls = {
- definition: baseUrl,
- revisions: `${baseUrl}/revisions`,
- dependencies: `${baseUrl}/dependencies`,
- };
-
- const onRemove = jest.fn().mockResolvedValue(undefined);
-
- renderWithProviders(
- <Route
- path="/"
- component={() => (
- <SegmentDetailPage
- route={{ path: "/" } as never}
- segment={segment}
- tabUrls={tabUrls}
- breadcrumbs={
- <DataModelSegmentBreadcrumbs table={table} segment={segment} />
- }
- onRemove={onRemove}
- />
- )}
- />,
- {
- withRouter: true,
- storeInitialState: {
- currentUser: createMockUser({ is_superuser: isAdmin }),
- entities: createMockEntitiesState({
- databases: [TEST_DATABASE],
- tables: [table],
- }),
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- },
- },
- );
-
- return { onRemove };
-}
+import { TEST_SEGMENT, setup } from "./setup";
describe("SegmentDetailPage", () => {
it("renders page with segment data, tabs, and actions menu", async () => {
@@ -290,57 +166,4 @@ describe("SegmentDetailPage", () => {
).not.toBeInTheDocument();
});
});
-
- describe("readonly state", () => {
- describe("when remote sync is read-only and table is published", () => {
- beforeEach(() => {
- setup({
- remoteSyncType: "read-only",
- table: { ...TEST_TABLE, is_published: true },
- });
- });
-
- it("has readonly segment name input", async () => {
- const nameInput = screen.getByDisplayValue("High Value Orders");
- expect(nameInput).toBeDisabled();
- });
-
- it("shows description as plain text", async () => {
- expect(screen.getByText("Description")).toBeInTheDocument();
- expect(screen.getByText("Orders with total > 100")).toBeInTheDocument();
- expect(
- screen.queryByLabelText("Give it a description"),
- ).not.toBeInTheDocument();
- });
-
- it("does not show Remove segment option in actions menu", async () => {
- await userEvent.click(screen.getByLabelText("Segment actions"));
-
- expect(
- screen.getByRole("menuitem", { name: /Preview/ }),
- ).toBeInTheDocument();
- expect(
- screen.queryByRole("menuitem", { name: /Remove segment/ }),
- ).not.toBeInTheDocument();
- });
- });
-
- describe("when remote sync is read-only and table is not published", () => {
- it("does not show elements as read-only", async () => {
- setup({
- remoteSyncType: "read-only",
- table: { ...TEST_TABLE, is_published: false },
- });
-
- expect(screen.getByDisplayValue("High Value Orders")).toBeEnabled();
- expect(screen.getByLabelText("Give it a description")).toBeEnabled();
-
- await userEvent.click(screen.getByLabelText("Segment actions"));
-
- expect(
- screen.getByRole("menuitem", { name: /Remove segment/ }),
- ).toBeInTheDocument();
- });
- });
- });
});
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/enterprise.unit.spec.tsx
new file mode 100644
index 00000000000..72f77011e71
--- /dev/null
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/enterprise.unit.spec.tsx
@@ -0,0 +1,62 @@
+import userEvent from "@testing-library/user-event";
+
+import { screen } from "__support__/ui";
+
+import { TEST_TABLE, setup } from "./setup";
+
+describe("SegmentDetailPage", () => {
+ describe("readonly state", () => {
+ describe("when remote sync is read-only and table is published", () => {
+ beforeEach(() => {
+ setup({
+ remoteSyncType: "read-only",
+ enterprisePlugins: ["remote_sync"],
+ tokenFeatures: { remote_sync: true },
+ table: { ...TEST_TABLE, is_published: true },
+ });
+ });
+
+ it("has readonly segment name input", async () => {
+ const nameInput = screen.getByDisplayValue("High Value Orders");
+ expect(nameInput).toBeDisabled();
+ });
+
+ it("shows description as plain text", async () => {
+ expect(screen.getByText("Description")).toBeInTheDocument();
+ expect(screen.getByText("Orders with total > 100")).toBeInTheDocument();
+ expect(
+ screen.queryByLabelText("Give it a description"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("does not show Remove segment option in actions menu", async () => {
+ await userEvent.click(screen.getByLabelText("Segment actions"));
+
+ expect(
+ screen.getByRole("menuitem", { name: /Preview/ }),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByRole("menuitem", { name: /Remove segment/ }),
+ ).not.toBeInTheDocument();
+ });
+ });
+
+ describe("when remote sync is read-only and table is not published", () => {
+ it("does not show elements as read-only", async () => {
+ setup({
+ remoteSyncType: "read-only",
+ table: { ...TEST_TABLE, is_published: false },
+ });
+
+ expect(screen.getByDisplayValue("High Value Orders")).toBeEnabled();
+ expect(screen.getByLabelText("Give it a description")).toBeEnabled();
+
+ await userEvent.click(screen.getByLabelText("Segment actions"));
+
+ expect(
+ screen.getByRole("menuitem", { name: /Remove segment/ }),
+ ).toBeInTheDocument();
+ });
+ });
+ });
+});
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
new file mode 100644
index 00000000000..1103b938385
--- /dev/null
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
@@ -0,0 +1,147 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import {
+ setupSchemaEndpoints,
+ setupSegmentEndpoint,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders } from "__support__/ui";
+import { DataModelSegmentBreadcrumbs } from "metabase/data-studio/segments/components/SegmentBreadcrumbs";
+import { SegmentDetailPage } from "metabase/data-studio/segments/pages/SegmentDetailPage";
+import { checkNotNull } from "metabase/lib/types";
+import type {
+ EnterpriseSettings,
+ Segment,
+ Table,
+ TokenFeatures,
+} from "metabase-types/api";
+import {
+ createMockDatabase,
+ createMockField,
+ createMockSegment,
+ createMockStructuredDatasetQuery,
+ createMockTable,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
+
+export const TEST_TABLE = createMockTable({
+ id: 42,
+ display_name: "Orders",
+ schema: "PUBLIC",
+ fields: [
+ createMockField({
+ id: 1,
+ table_id: 42,
+ name: "ID",
+ display_name: "ID",
+ base_type: "type/Integer",
+ semantic_type: "type/PK",
+ }),
+ createMockField({
+ id: 2,
+ table_id: 42,
+ name: "TOTAL",
+ display_name: "Total",
+ base_type: "type/Float",
+ semantic_type: null,
+ }),
+ ],
+});
+
+export const TEST_DATABASE = createMockDatabase({
+ id: 1,
+ name: "Test Database",
+});
+
+TEST_TABLE.db_id = TEST_DATABASE.id;
+TEST_TABLE.db = TEST_DATABASE;
+
+export const TEST_SEGMENT = createMockSegment({
+ id: 1,
+ name: "High Value Orders",
+ description: "Orders with total > 100",
+ table_id: TEST_TABLE.id,
+ definition: createMockStructuredDatasetQuery({
+ database: TEST_DATABASE.id,
+ query: {
+ "source-table": TEST_TABLE.id,
+ filter: [">", ["field", 2, null], 100],
+ },
+ }),
+});
+
+type SetupOpts = {
+ segment?: Segment;
+ table?: Table;
+ isAdmin?: boolean;
+ remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ enterprisePlugins?: Parameters<typeof setupEnterpriseOnlyPlugin>[0][];
+ tokenFeatures?: Partial<TokenFeatures>;
+};
+
+export function setup({
+ segment = TEST_SEGMENT,
+ table = TEST_TABLE,
+ isAdmin = true,
+ enterprisePlugins,
+ tokenFeatures,
+ remoteSyncType,
+}: SetupOpts = {}) {
+ setupSegmentEndpoint(segment);
+ setupSchemaEndpoints(checkNotNull(table.db));
+
+ const baseUrl = `/data-studio/data/database/${TEST_DATABASE.id}/schema/${TEST_DATABASE.id}:PUBLIC/table/${table.id}/segments/${segment.id}`;
+
+ const tabUrls = {
+ definition: baseUrl,
+ revisions: `${baseUrl}/revisions`,
+ dependencies: `${baseUrl}/dependencies`,
+ };
+
+ const onRemove = jest.fn().mockResolvedValue(undefined);
+
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ const state = createMockState({
+ currentUser: createMockUser({ is_superuser: isAdmin }),
+ entities: createMockEntitiesState({
+ databases: [TEST_DATABASE],
+ tables: [table],
+ }),
+ settings,
+ });
+
+ if (enterprisePlugins) {
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+ }
+
+ renderWithProviders(
+ <Route
+ path="/"
+ component={() => (
+ <SegmentDetailPage
+ route={{ path: "/" } as never}
+ segment={segment}
+ tabUrls={tabUrls}
+ breadcrumbs={
+ <DataModelSegmentBreadcrumbs table={table} segment={segment} />
+ }
+ onRemove={onRemove}
+ />
+ )}
+ />,
+ {
+ withRouter: true,
+ storeInitialState: state,
+ },
+ );
+
+ return { onRemove };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.module.css b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.module.css
rename to frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
rename to frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
index c9bd7731231..15ceb79246e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { Stack } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
import type { Segment } from "metabase-types/api";
import { SegmentHeader } from "../../components/SegmentHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/index.ts b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/routes.tsx b/frontend/src/metabase/data-studio/segments/routes.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/routes.tsx
rename to frontend/src/metabase/data-studio/segments/routes.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/types.ts b/frontend/src/metabase/data-studio/segments/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/types.ts
rename to frontend/src/metabase/data-studio/segments/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/segment-query.ts b/frontend/src/metabase/data-studio/segments/utils/segment-query.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/segment-query.ts
rename to frontend/src/metabase/data-studio/segments/utils/segment-query.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts b/frontend/src/metabase/data-studio/selectors.ts
similarity index 80%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts
rename to frontend/src/metabase/data-studio/selectors.ts
index 33bc5bac642..78a4dc204a6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts
+++ b/frontend/src/metabase/data-studio/selectors.ts
@@ -1,6 +1,6 @@
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { getUserIsAdmin, getUserIsAnalyst } from "metabase/selectors/user";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { State } from "metabase-types/store";
// Must be in sync with CanAccessDataStudio in frontend/src/metabase/route-guards.tsx
@@ -21,7 +21,8 @@ export const getUserCanWriteSegments = (
return false;
}
- const isRemoteSyncReadOnly = getIsRemoteSyncReadOnly(state);
+ const isRemoteSyncReadOnly =
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly(state);
return !isRemoteSyncReadOnly || !isTablePublished;
};
@@ -36,7 +37,8 @@ export const getUserCanWriteMeasures = (
return false;
}
- const isRemoteSyncReadOnly = getIsRemoteSyncReadOnly(state);
+ const isRemoteSyncReadOnly =
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly(state);
return !isRemoteSyncReadOnly || !isTablePublished;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.unit.spec.ts b/frontend/src/metabase/data-studio/selectors.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/selectors.unit.spec.ts
rename to frontend/src/metabase/data-studio/selectors.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DataStudioUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/DataStudioUpsellPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DataStudioUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/DataStudioUpsellPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependenciesUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/DependenciesUpsellPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependenciesUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/DependenciesUpsellPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/GitSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/GitSyncUpsellPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/GitSyncUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/GitSyncUpsellPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/LibraryUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/LibraryUpsellPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/LibraryUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/LibraryUpsellPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/constants.ts b/frontend/src/metabase/data-studio/upsells/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/upsells/constants.ts
rename to frontend/src/metabase/data-studio/upsells/constants.ts
diff --git a/frontend/src/metabase/data-studio/upsells/index.ts b/frontend/src/metabase/data-studio/upsells/index.ts
new file mode 100644
index 00000000000..fe4cd122258
--- /dev/null
+++ b/frontend/src/metabase/data-studio/upsells/index.ts
@@ -0,0 +1,5 @@
+export { DataStudioUpsellPage } from "./DataStudioUpsellPage";
+export type { DataStudioUpsellPageProps } from "./DataStudioUpsellPage";
+export { DependenciesUpsellPage } from "./DependenciesUpsellPage";
+export { GitSyncUpsellPage } from "./GitSyncUpsellPage";
+export { LibraryUpsellPage } from "./LibraryUpsellPage";
diff --git a/frontend/src/metabase/data-studio/utils.ts b/frontend/src/metabase/data-studio/utils.ts
new file mode 100644
index 00000000000..6419502f9a7
--- /dev/null
+++ b/frontend/src/metabase/data-studio/utils.ts
@@ -0,0 +1,63 @@
+import type { CollectionItemModel, CollectionType } from "metabase-types/api";
+
+export type LibraryCollectionType = "root" | "data" | "metrics";
+
+export function getLibraryCollectionType(
+ type: CollectionType | null | undefined,
+): LibraryCollectionType | undefined {
+ switch (type) {
+ case "library":
+ return "root";
+ case "library-data":
+ return "data";
+ case "library-metrics":
+ return "metrics";
+ }
+}
+
+export function canPlaceEntityInCollection(
+ entityType: CollectionItemModel,
+ collectionType: CollectionType | null | undefined,
+): boolean {
+ if (getLibraryCollectionType(collectionType) == null) {
+ return true;
+ }
+
+ // Can't create subcollections in any of special collections
+ if (entityType === "collection") {
+ return false;
+ }
+
+ // Can't create anything in the root Library collection
+ if (collectionType === "library") {
+ return false;
+ }
+
+ if (collectionType === "library-data") {
+ return entityType === "table";
+ }
+
+ if (collectionType === "library-metrics") {
+ return entityType === "metric";
+ }
+
+ return false;
+}
+
+export function canPlaceEntityInCollectionOrDescendants(
+ entityType: CollectionItemModel,
+ collectionType: CollectionType | null | undefined,
+): boolean {
+ if (canPlaceEntityInCollection(entityType, collectionType)) {
+ return true;
+ }
+
+ if (collectionType === "library") {
+ return (
+ canPlaceEntityInCollection(entityType, "library-data") ||
+ canPlaceEntityInCollection(entityType, "library-metrics")
+ );
+ }
+
+ return false;
+}
diff --git a/frontend/src/metabase/entities/collections/utils.ts b/frontend/src/metabase/entities/collections/utils.ts
index d1a5b958298..4d5af8e5dd2 100644
--- a/frontend/src/metabase/entities/collections/utils.ts
+++ b/frontend/src/metabase/entities/collections/utils.ts
@@ -4,9 +4,10 @@ import {
isRootTrashCollection,
isSyncedCollection,
} from "metabase/collections/utils";
+import { getLibraryCollectionType } from "metabase/data-studio/utils";
import { color } from "metabase/lib/colors";
import type { ColorName } from "metabase/lib/colors/types";
-import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
import type { IconName, IconProps } from "metabase/ui";
import type { Collection, CollectionContentModel } from "metabase-types/api";
@@ -43,7 +44,7 @@ export function getCollectionIcon(
return { name: "synced_collection" };
}
- switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type)) {
+ switch (getLibraryCollectionType(collection.type)) {
case "root":
return { name: "repository" };
case "data":
diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.ts
index f9a05fe32b1..eb829a7209f 100644
--- a/frontend/src/metabase/entities/index.ts
+++ b/frontend/src/metabase/entities/index.ts
@@ -16,6 +16,7 @@ export { Tables as tables } from "./tables";
export { Fields as fields } from "./fields";
export { Segments as segments } from "./segments";
export { Measures as measures } from "./measures";
+export { Transforms as transforms } from "./transforms";
export { Groups as groups } from "./groups";
diff --git a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts b/frontend/src/metabase/entities/transforms.ts
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/entities/transforms.ts
rename to frontend/src/metabase/entities/transforms.ts
index d7f12471378..ccb6f8941a7 100644
--- a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts
+++ b/frontend/src/metabase/entities/transforms.ts
@@ -10,7 +10,7 @@ import type { Transform } from "metabase-types/api";
export const Transforms = createEntity({
name: "transforms",
nameOne: "transform",
- path: "/api/ee/transform",
+ path: "/api/transform",
schema: TransformSchema,
objectSelectors: {
diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/lib/icon.ts
index 440b7cb0fd8..1b18b84732c 100644
--- a/frontend/src/metabase/lib/icon.ts
+++ b/frontend/src/metabase/lib/icon.ts
@@ -1,5 +1,6 @@
+import { getLibraryCollectionType } from "metabase/data-studio/utils";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
-import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import type { IconName } from "metabase/ui";
import { getIconForVisualizationType } from "metabase/visualizations";
import type {
@@ -91,9 +92,7 @@ export const getIconBase = (item: ObjectWithModel): IconData => {
}
if (item.model === "collection") {
- switch (
- PLUGIN_DATA_STUDIO.getLibraryCollectionType(item.type as CollectionType)
- ) {
+ switch (getLibraryCollectionType(item.type as CollectionType)) {
case "root":
return { name: "repository" };
case "data":
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
index d5c585b8e92..6f373802777 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
@@ -8,6 +8,7 @@ import { trackErrorDiagnosticModalOpened } from "metabase/common/components/Erro
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ForwardRefLink } from "metabase/common/components/Link";
import { userInitials } from "metabase/common/utils/user";
+import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/data-studio/selectors";
import {
getCanAccessOnboardingPage,
getIsNewInstance,
@@ -15,7 +16,6 @@ import {
import type { ColorName } from "metabase/lib/colors/types";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { openDiagnostics } from "metabase/redux/app";
import { setOpenModal } from "metabase/redux/ui";
import { getUser } from "metabase/selectors/user";
@@ -56,9 +56,7 @@ export const AppSwitcher = ({ className }: { className?: string }) => {
// based on whether they're an admin or not
const adminItems = useSelector(getAdminPaths);
const canAccessOnboardingPage = useSelector(getCanAccessOnboardingPage);
- const canAccessDataStudio = useSelector(
- PLUGIN_DATA_STUDIO.canAccessDataStudio,
- );
+ const canAccessDataStudio = useSelector(canAccessDataStudioSelector);
const isNewInstance = useSelector(getIsNewInstance);
const helpLink = useHelpLink();
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
index d0f4a20c69a..27e45acc3b7 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
@@ -2,7 +2,6 @@ import userEvent from "@testing-library/user-event";
import dayjs from "dayjs";
import { Route } from "react-router";
-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupBugReportingDetailsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
@@ -43,7 +42,6 @@ async function setup({
isAdmin = false,
isHosted = false,
isPaidPlan = true,
- hasDataStudio = false,
helpLinkSetting = "metabase",
helpLinkCustomDestinationSetting = "https://custom-destination.com/help",
instanceCreationDate = dayjs().toISOString(),
@@ -51,7 +49,6 @@ async function setup({
isAdmin?: boolean;
isHosted?: boolean;
isPaidPlan?: boolean;
- hasDataStudio?: boolean;
helpLinkSetting?: HelpLinkSetting;
helpLinkCustomDestinationSetting?: string;
instanceCreationDate?: string;
@@ -64,15 +61,9 @@ async function setup({
"help-link": helpLinkSetting,
"help-link-custom-destination": helpLinkCustomDestinationSetting,
"instance-creation": instanceCreationDate,
- "token-features": createMockTokenFeatures({
- data_studio: hasDataStudio,
- }),
+ "token-features": createMockTokenFeatures(),
});
- if (hasDataStudio) {
- setupEnterpriseOnlyPlugin("data-studio");
- }
-
const admin = createMockAdminState({
app: createMockAdminAppState({
paths: isAdmin ? [adminNavItem] : [],
@@ -156,7 +147,7 @@ describe("ProfileLink", () => {
describe("current app", () => {
it("should update it's apps section as you navigate", async () => {
- await setup({ isAdmin: true, hasDataStudio: true });
+ await setup({ isAdmin: true });
await assertActiveApp("main");
@@ -195,7 +186,7 @@ describe("ProfileLink", () => {
describe("with data studio", () => {
it("should show data studio app when apropriate", async () => {
- await setup({ isAdmin: true, hasDataStudio: true });
+ await setup({ isAdmin: true });
WITH_DATA_STUDIO.forEach((title) => {
expect(screen.getByText(title)).toBeInTheDocument();
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
index 67d7f7b12f5..e51a8258535 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
@@ -15,6 +15,7 @@ import { Tree } from "metabase/common/components/tree";
import { useSetting, useUserSetting } from "metabase/common/hooks";
import { useIsAtHomepageDashboard } from "metabase/common/hooks/use-is-at-homepage-dashboard";
import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";
+import { NavbarLibrarySection } from "metabase/data-studio/nav/components/NavbarLibrarySection";
import type { CollectionTreeItem } from "metabase/entities/collections";
import {
getCanAccessOnboardingPage,
@@ -24,11 +25,7 @@ import { isSmallScreen } from "metabase/lib/dom";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { WhatsNewNotification } from "metabase/nav/components/WhatsNewNotification";
-import {
- PLUGIN_DATA_STUDIO,
- PLUGIN_REMOTE_SYNC,
- PLUGIN_TENANTS,
-} from "metabase/plugins";
+import { PLUGIN_REMOTE_SYNC, PLUGIN_TENANTS } from "metabase/plugins";
import {
getIsTenantUser,
getUser,
@@ -241,13 +238,11 @@ export function MainNavbarView({
/>
)}
- {PLUGIN_DATA_STUDIO.isEnabled && (
- <PLUGIN_DATA_STUDIO.NavbarLibrarySection
- collections={collections}
- selectedId={collectionItem?.id}
- onItemSelect={onItemSelect}
- />
- )}
+ <NavbarLibrarySection
+ collections={collections}
+ selectedId={collectionItem?.id}
+ onItemSelect={onItemSelect}
+ />
<SidebarSection>
<ErrorBoundary>
diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
index 2412d53e630..2384bccc96e 100644
--- a/frontend/src/metabase/plugins/index.ts
+++ b/frontend/src/metabase/plugins/index.ts
@@ -60,12 +60,6 @@ export {
PLUGIN_DASHCARD_MENU,
type PluginDashcardMenu,
} from "./oss/dashcard-menu";
-export {
- PLUGIN_DATA_STUDIO,
- type DataStudioToolbarButtonProps,
- type LibraryCollectionType,
- type NavbarLibrarySectionProps,
-} from "./oss/data-studio";
export {
PLUGIN_DB_ROUTING,
PLUGIN_DATABASE_REPLICATION,
@@ -81,6 +75,12 @@ export {
} from "./oss/embedding-iframe-sdk-setup";
export { PLUGIN_EMBEDDING_SDK } from "./oss/embedding-sdk";
export { PLUGIN_ENTITIES } from "./oss/entities";
+export {
+ PLUGIN_LIBRARY,
+ type CreateLibraryModalProps,
+ type PublishTablesModalProps,
+ type UnpublishTablesModalProps,
+} from "./oss/library";
export { PLUGIN_MODEL_PERSISTENCE } from "./oss/model-persistence";
export {
PLUGIN_MODERATION,
@@ -124,8 +124,6 @@ export {
PLUGIN_TRANSFORMS,
PLUGIN_TRANSFORMS_PYTHON,
PLUGIN_DEPENDENCIES,
- type TransformPickerItem,
- type TransformPickerProps,
type TransformsPlugin,
type PythonTransformEditorProps,
type PythonTransformSourceSectionProps,
@@ -163,13 +161,13 @@ import { reinitialize as reinitializeContentTranslation } from "./oss/content-tr
import { reinitialize as reinitializeContentVerification } from "./oss/content-verification";
import { reinitialize as reinitializeCore } from "./oss/core";
import { reinitialize as reinitializeDashcardMenu } from "./oss/dashcard-menu";
-import { reinitialize as reinitializeDatastudio } from "./oss/data-studio";
import { reinitialize as reinitializeDatabase } from "./oss/database";
import { reinitialize as reinitializeEmbedding } from "./oss/embedding";
import { reinitialize as reinitializeEmbeddingIframeSdk } from "./oss/embedding-iframe-sdk";
import { reinitialize as reinitializeEmbeddingIframeSdkSetup } from "./oss/embedding-iframe-sdk-setup";
import { reinitialize as reinitializeEmbeddingSdk } from "./oss/embedding-sdk";
import { reinitialize as reinitializeEntities } from "./oss/entities";
+import { reinitialize as reinitializeLibrary } from "./oss/library";
import { reinitialize as reinitializeModelPersistence } from "./oss/model-persistence";
import { reinitialize as reinitializeModeration } from "./oss/moderation";
import { reinitialize as reinitializePermissions } from "./oss/permissions";
@@ -204,12 +202,12 @@ export function reinitialize() {
reinitializeCore();
reinitializeDashcardMenu();
reinitializeDatabase();
- reinitializeDatastudio();
reinitializeEmbedding();
reinitializeEmbeddingIframeSdk();
reinitializeEmbeddingIframeSdkSetup();
reinitializeEmbeddingSdk();
reinitializeEntities();
+ reinitializeLibrary();
reinitializeModelPersistence();
reinitializeModeration();
reinitializePermissions();
diff --git a/frontend/src/metabase/plugins/oss/ai.ts b/frontend/src/metabase/plugins/oss/ai.ts
index 0ed7704eaba..29098852ac0 100644
--- a/frontend/src/metabase/plugins/oss/ai.ts
+++ b/frontend/src/metabase/plugins/oss/ai.ts
@@ -1,3 +1,4 @@
+import type { ActionCreatorWithOptionalPayload } from "@reduxjs/toolkit";
import type { BaseQueryFn } from "@reduxjs/toolkit/query";
import type { TypedUseLazyQuery } from "@reduxjs/toolkit/src/query/react/buildHooks";
import type { ComponentType } from "react";
@@ -14,10 +15,13 @@ import type {
GenerateSqlResponse,
MetabotGenerateContentRequest,
MetabotGenerateContentResponse,
+ MetabotSuggestedTransform,
ReferencedEntityId,
SearchModel,
+ SuggestedTransform,
Timeline,
TimelineEvent,
+ TransformId,
VisualizationDisplay,
} from "metabase-types/api";
import type { State } from "metabase-types/store";
@@ -108,6 +112,13 @@ type PluginMetabotType = {
reset: () => void;
suggestionModels: SuggestionModel[];
};
+ getMetabotSuggestedTransform: (
+ state: State,
+ transformId?: TransformId,
+ ) => MetabotSuggestedTransform | undefined;
+ deactivateSuggestedTransform: ActionCreatorWithOptionalPayload<
+ SuggestedTransform["id"] | undefined
+ >;
};
const getDefaultPluginAiSqlFixer = (): PluginAiSqlFixer => ({
@@ -175,6 +186,14 @@ const getDefaultPluginMetabot = (): PluginMetabotType => ({
} = require("metabase/metabot/hooks/use-metabot-sql-suggestion");
return useMetabotSQLSuggestion(options);
},
+ getMetabotSuggestedTransform: () => undefined,
+ deactivateSuggestedTransform: (() => ({
+ type: "",
+ payload: undefined,
+ match: () => false,
+ })) as unknown as ActionCreatorWithOptionalPayload<
+ SuggestedTransform["id"] | undefined
+ >,
});
export const PLUGIN_METABOT: PluginMetabotType = getDefaultPluginMetabot();
diff --git a/frontend/src/metabase/plugins/oss/data-studio.ts b/frontend/src/metabase/plugins/oss/data-studio.ts
deleted file mode 100644
index d4517e524bc..00000000000
--- a/frontend/src/metabase/plugins/oss/data-studio.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import type { Store } from "@reduxjs/toolkit";
-import type { ComponentType, ReactNode } from "react";
-
-import type Question from "metabase-lib/v1/Question";
-import type {
- Collection,
- CollectionItem,
- CollectionItemModel,
- CollectionType,
- LibraryCollection,
-} from "metabase-types/api";
-import type { State } from "metabase-types/store";
-
-import { PluginPlaceholder } from "../components/PluginPlaceholder";
-
-export type NavbarLibrarySectionProps = {
- collections: Collection[];
- selectedId?: string | number;
- onItemSelect: () => void;
-};
-
-export type LibraryCollectionType = "root" | "data" | "metrics";
-
-export type DataStudioToolbarButtonProps = {
- question: Question;
-};
-
-type DataStudioPlugin = {
- isEnabled: boolean;
- canAccessDataStudio: (state: State) => boolean;
- getDataStudioRoutes: (
- store: Store<State>,
- CanAccessDataStudio: ComponentType,
- CanAccessDataModel: ComponentType,
- CanAccessTransforms: ComponentType,
- ) => ReactNode;
- DataStudioToolbarButton: ComponentType<DataStudioToolbarButtonProps>;
- NavbarLibrarySection: ComponentType<NavbarLibrarySectionProps>;
- getLibraryCollectionType: (
- collectionType: CollectionType | null | undefined,
- ) => LibraryCollectionType | undefined;
- canPlaceEntityInCollection: (
- entityType: CollectionItemModel,
- collectionType: CollectionType | null | undefined,
- ) => boolean;
- canPlaceEntityInCollectionOrDescendants: (
- entityType: CollectionItemModel,
- collectionType: CollectionType | null | undefined,
- ) => boolean;
- useGetLibraryChildCollectionByType: ({
- skip,
- type,
- }: {
- skip?: boolean;
- type: CollectionType;
- }) => CollectionItem | undefined;
- useGetLibraryCollection: (props?: { skip?: boolean }) => {
- data: undefined | LibraryCollection;
- isLoading: boolean;
- };
- useGetResolvedLibraryCollection: (props?: { skip?: boolean }) => {
- data: undefined | LibraryCollection | CollectionItem;
- isLoading: boolean;
- };
-};
-
-const getDefaultPluginDataStudio = (): DataStudioPlugin => ({
- isEnabled: false,
- canAccessDataStudio: () => false,
- getDataStudioRoutes: () => null,
- DataStudioToolbarButton: PluginPlaceholder,
- NavbarLibrarySection: PluginPlaceholder,
- getLibraryCollectionType: () => undefined,
- canPlaceEntityInCollection: () => true,
- canPlaceEntityInCollectionOrDescendants: () => true,
- useGetLibraryChildCollectionByType: ({ skip: _skip, type: _type }) =>
- undefined,
- useGetLibraryCollection: (_props) => ({ data: undefined, isLoading: false }),
- useGetResolvedLibraryCollection: (_props) => ({
- data: undefined,
- isLoading: false,
- }),
-});
-
-export const PLUGIN_DATA_STUDIO = getDefaultPluginDataStudio();
-
-/**
- * @internal Do not call directly. Use the main reinitialize function from metabase/plugins instead.
- */
-export function reinitialize() {
- Object.assign(PLUGIN_DATA_STUDIO, getDefaultPluginDataStudio());
-}
diff --git a/frontend/src/metabase/plugins/oss/database.ts b/frontend/src/metabase/plugins/oss/database.ts
index 9f799579444..80bd296626e 100644
--- a/frontend/src/metabase/plugins/oss/database.ts
+++ b/frontend/src/metabase/plugins/oss/database.ts
@@ -8,6 +8,7 @@ import type {
DatabaseLocalSettingAvailability,
Database as DatabaseType,
TableId,
+ Transform,
} from "metabase-types/api";
const getDefaultPluginDbRouting = () => ({
@@ -52,7 +53,16 @@ const getDefaultPluginTableEditing = () => ({
export const PLUGIN_TABLE_EDITING = getDefaultPluginTableEditing();
+export type WorkspacesSectionProps = {
+ showLabel: boolean;
+};
+
+export type EditTransformMenuProps = {
+ transform: Transform;
+};
+
const getDefaultPluginWorkspaces = () => ({
+ isEnabled: false,
AdminDatabaseWorkspacesSection: PluginPlaceholder as ComponentType<{
database: DatabaseType;
settingsAvailable?: Record<string, DatabaseLocalSettingAvailability>;
@@ -60,6 +70,9 @@ const getDefaultPluginWorkspaces = () => ({
database: { id: DatabaseId } & Partial<DatabaseData>,
) => Promise<void>;
}>,
+ WorkspacesSection: PluginPlaceholder as ComponentType<WorkspacesSectionProps>,
+ getDataStudioWorkspaceRoutes: () => null as React.ReactElement | null,
+ EditTransformMenu: PluginPlaceholder as ComponentType<EditTransformMenuProps>,
});
export const PLUGIN_WORKSPACES = getDefaultPluginWorkspaces();
diff --git a/frontend/src/metabase/plugins/oss/library.ts b/frontend/src/metabase/plugins/oss/library.ts
new file mode 100644
index 00000000000..bf894f2ddf5
--- /dev/null
+++ b/frontend/src/metabase/plugins/oss/library.ts
@@ -0,0 +1,95 @@
+import type { BaseQueryFn, QueryDefinition } from "@reduxjs/toolkit/query";
+import type { ComponentType, ReactNode } from "react";
+
+import type { TagType } from "metabase/api/tags";
+import type { UseQuery } from "metabase/entities/containers/rtk-query/types/rtk";
+import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
+import type {
+ Collection,
+ CollectionItem,
+ CollectionType,
+ DatabaseId,
+ GetLibraryCollectionResponse,
+ LibraryCollection,
+ SchemaId,
+ TableId,
+} from "metabase-types/api";
+
+export type CreateLibraryModalProps = {
+ title?: string;
+ explanatorySentence?: string;
+ isOpened: boolean;
+ onCreate?: (collection: Collection) => void;
+ onClose: () => void;
+};
+
+export type PublishTablesModalProps = {
+ databaseIds?: DatabaseId[];
+ schemaIds?: SchemaId[];
+ tableIds?: TableId[];
+ isOpened: boolean;
+ onPublish: () => void;
+ onClose: () => void;
+};
+export type UnpublishTablesModalProps = {
+ databaseIds?: DatabaseId[];
+ schemaIds?: SchemaId[];
+ tableIds?: TableId[];
+ isOpened: boolean;
+ onUnpublish: () => void;
+ onClose: () => void;
+};
+
+type LibraryPlugin = {
+ isEnabled: boolean;
+ getDataStudioLibraryRoutes: () => ReactNode;
+ useGetLibraryCollection: (params?: { skip?: boolean }) => {
+ data: undefined | LibraryCollection;
+ isLoading: boolean;
+ };
+ useGetLibraryChildCollectionByType: ({
+ skip,
+ type,
+ }: {
+ skip?: boolean;
+ type: CollectionType;
+ }) => CollectionItem | undefined;
+ useGetResolvedLibraryCollection: (params?: { skip?: boolean }) => {
+ data: undefined | LibraryCollection | CollectionItem;
+ isLoading: boolean;
+ };
+ CreateLibraryModal: ComponentType<CreateLibraryModalProps>;
+ PublishTablesModal: ComponentType<PublishTablesModalProps>;
+ UnpublishTablesModal: ComponentType<UnpublishTablesModalProps>;
+ useGetLibraryCollectionQuery: UseQuery<
+ QueryDefinition<void, BaseQueryFn, TagType, GetLibraryCollectionResponse>
+ >;
+};
+
+const getDefaultPluginLibrary = (): LibraryPlugin => ({
+ isEnabled: false,
+ getDataStudioLibraryRoutes: () => null,
+ useGetLibraryCollection: () => ({ isLoading: false, data: undefined }),
+ useGetLibraryChildCollectionByType: () => undefined,
+ useGetResolvedLibraryCollection: () => ({
+ isLoading: false,
+ data: undefined,
+ }),
+ CreateLibraryModal:
+ PluginPlaceholder as ComponentType<CreateLibraryModalProps>,
+ PublishTablesModal:
+ PluginPlaceholder as ComponentType<PublishTablesModalProps>,
+ UnpublishTablesModal:
+ PluginPlaceholder as ComponentType<UnpublishTablesModalProps>,
+ useGetLibraryCollectionQuery:
+ (() => []) as unknown as LibraryPlugin["useGetLibraryCollectionQuery"],
+});
+
+export const PLUGIN_LIBRARY = getDefaultPluginLibrary();
+
+/**
+ * @internal Do not call directly. Use the main reinitialize function from metabase/plugins instead.
+ */
+export function reinitialize() {
+ Object.assign(PLUGIN_LIBRARY, getDefaultPluginLibrary());
+}
diff --git a/frontend/src/metabase/plugins/oss/remote-sync.ts b/frontend/src/metabase/plugins/oss/remote-sync.ts
index d94d28b35d0..f6c85442c0b 100644
--- a/frontend/src/metabase/plugins/oss/remote-sync.ts
+++ b/frontend/src/metabase/plugins/oss/remote-sync.ts
@@ -1,8 +1,14 @@
-import type { TagDescription } from "@reduxjs/toolkit/query";
+import type {
+ BaseQueryFn,
+ QueryDefinition,
+ TagDescription,
+} from "@reduxjs/toolkit/query";
import type { ComponentType, ReactNode } from "react";
+import type { TagType } from "metabase/api/tags";
import type { ITreeNodeItem } from "metabase/common/components/tree/types";
import type { CollectionTreeItem } from "metabase/entities/collections";
+import type { UseQuery } from "metabase/entities/containers/rtk-query/types/rtk";
import type {
GitSyncSetupMenuItemProps,
SyncedCollectionsSidebarSectionProps,
@@ -11,6 +17,10 @@ import {
NotFoundPlaceholder,
PluginPlaceholder,
} from "metabase/plugins/components/PluginPlaceholder";
+import type {
+ RemoteSyncChangesResponse,
+ RemoteSyncEntity,
+} from "metabase-types/api";
import type { State } from "metabase-types/store";
export type CollectionsNavTreeProps = {
@@ -24,7 +34,33 @@ export interface GitSettingsModalProps {
onClose: () => void;
}
+export interface RemoteSyncDirtyState {
+ /** Array of all dirty entities */
+ dirty: RemoteSyncEntity[];
+ /** Map of collection IDs that have dirty child entities */
+ changedCollections: Record<number, boolean>;
+ /** Whether any dirty changes exist globally */
+ isDirty: boolean;
+ /** Whether any entities have "removed" status */
+ hasRemovedItems: boolean;
+ /** Whether data is loading */
+ isLoading: boolean;
+ /** Check if a specific collection has dirty items */
+ isCollectionDirty: (collectionId: number | string | undefined) => boolean;
+ /** Check if any collection in a set has dirty items */
+ hasAnyCollectionDirty: (collectionIds: Set<number> | number[]) => boolean;
+ /** Check if any dirty entity (including collections) is in the given set of IDs */
+ hasDirtyInCollectionTree: (collectionIds: Set<number>) => boolean;
+ /** Refetch the dirty state data */
+ refetch: ReturnType<
+ UseQuery<
+ QueryDefinition<void, BaseQueryFn, TagType, RemoteSyncChangesResponse>
+ >
+ >["refetch"];
+}
+
const getDefaultPluginRemoteSync = () => ({
+ isEnabled: false,
LibraryNav: PluginPlaceholder,
RemoteSyncSettings: NotFoundPlaceholder,
SyncedCollectionsSidebarSection: PluginPlaceholder,
@@ -45,9 +81,14 @@ const getDefaultPluginRemoteSync = () => ({
useHasLibraryDirtyChanges: () => false,
useHasTransformDirtyChanges: () => false,
getIsRemoteSyncReadOnly: () => false,
+ useRemoteSyncDirtyState: () =>
+ ({
+ isCollectionDirty: false,
+ }) as unknown as RemoteSyncDirtyState,
});
export const PLUGIN_REMOTE_SYNC: {
+ isEnabled: boolean;
LibraryNav: ComponentType;
RemoteSyncSettings: ComponentType;
SyncedCollectionsSidebarSection: ComponentType<SyncedCollectionsSidebarSectionProps>;
@@ -71,6 +112,7 @@ export const PLUGIN_REMOTE_SYNC: {
useHasLibraryDirtyChanges: () => boolean;
useHasTransformDirtyChanges: () => boolean;
getIsRemoteSyncReadOnly: (state: State) => boolean;
+ useRemoteSyncDirtyState: () => RemoteSyncDirtyState;
} = getDefaultPluginRemoteSync();
/**
diff --git a/frontend/src/metabase/plugins/oss/transforms.ts b/frontend/src/metabase/plugins/oss/transforms.ts
index 505c5c97aeb..95fcc939dca 100644
--- a/frontend/src/metabase/plugins/oss/transforms.ts
+++ b/frontend/src/metabase/plugins/oss/transforms.ts
@@ -1,13 +1,7 @@
-import type { BaseQueryFn, QueryDefinition } from "@reduxjs/toolkit/query";
import type { ComponentType, Context, ReactNode } from "react";
import { createContext } from "react";
-import type { TagType } from "metabase/api/tags";
-import type {
- OmniPickerCollectionItem,
- OmniPickerItem,
-} from "metabase/common/components/Pickers";
-import type { UseQuery } from "metabase/entities/containers/rtk-query/types/rtk";
+import type { OmniPickerItem } from "metabase/common/components/Pickers";
import {
NotFoundPlaceholder,
PluginPlaceholder,
@@ -15,15 +9,12 @@ import {
import type Question from "metabase-lib/v1/Question";
import type {
CheckDependenciesResponse,
- CollectionNamespace,
GetDependencyGraphRequest,
PythonTransformSourceDraft,
Transform,
- TransformId,
UpdateSnippetRequest,
UpdateTransformRequest,
} from "metabase-types/api";
-import type { State } from "metabase-types/store";
// Types
export type TransformPickerItem = OmniPickerItem & {
@@ -37,14 +28,7 @@ export type TransformPickerProps = {
export type TransformsPlugin = {
isEnabled: boolean;
- canAccessTransforms: (state: State) => boolean;
- getDataStudioTransformRoutes(): ReactNode;
- getRootCollectionItem: (args: {
- namespace: CollectionNamespace;
- }) => OmniPickerCollectionItem | null;
- useGetTransformQuery: UseQuery<
- QueryDefinition<TransformId, BaseQueryFn, TagType, Transform>
- >;
+ TransformsUpsellPage: ComponentType;
};
export type PythonTransformEditorUiOptions = {
@@ -78,6 +62,11 @@ export type PythonTransformSourceValidationResult = {
errorMessage?: string;
};
+export type PythonTransformsUpsellModalProps = {
+ isOpen: boolean;
+ onClose: () => void;
+};
+
export type PythonTransformsPlugin = {
isEnabled: boolean;
getPythonLibraryRoutes: () => ReactNode;
@@ -89,6 +78,8 @@ export type PythonTransformsPlugin = {
PythonRunnerSettingsPage: ComponentType;
getAdminRoutes: () => ReactNode;
getTransformsNavLinks: () => ReactNode;
+ sharedLibImportPath: string;
+ PythonTransformsUpsellModal: ComponentType<PythonTransformsUpsellModalProps>;
};
type DependenciesPlugin = {
@@ -159,12 +150,8 @@ function useCheckDependencies<TChange>({
}
const getDefaultPluginTransforms = (): TransformsPlugin => ({
- isEnabled: false,
- canAccessTransforms: () => false,
- getDataStudioTransformRoutes: () => null,
- getRootCollectionItem: () => null,
- useGetTransformQuery:
- (() => []) as unknown as TransformsPlugin["useGetTransformQuery"],
+ isEnabled: true, // transforms are enabled by default in OSS
+ TransformsUpsellPage: PluginPlaceholder,
});
export const PLUGIN_TRANSFORMS = getDefaultPluginTransforms();
@@ -178,6 +165,8 @@ const getDefaultPluginTransformsPython = (): PythonTransformsPlugin => ({
PythonRunnerSettingsPage: NotFoundPlaceholder,
getAdminRoutes: () => null,
getTransformsNavLinks: () => null,
+ sharedLibImportPath: "",
+ PythonTransformsUpsellModal: PluginPlaceholder,
});
export const PLUGIN_TRANSFORMS_PYTHON = getDefaultPluginTransformsPython();
diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
index e716233da9e..ebe679629ab 100644
--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
@@ -8,10 +8,10 @@ import {
} from "metabase/common/components/Pickers";
import { DashboardPickerModal } from "metabase/common/components/Pickers/DashboardPicker";
import { getCollectionType } from "metabase/common/components/Pickers/EntityPicker/utils";
+import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utils";
import { ROOT_COLLECTION } from "metabase/entities/collections";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
import type { Card, Dashboard } from "metabase-types/api";
@@ -103,7 +103,7 @@ export const AddToDashSelectDashModal = ({
// if there can't be dashboards in the collection, you can't add a question to one there
if (
- !PLUGIN_DATA_STUDIO.canPlaceEntityInCollectionOrDescendants(
+ !canPlaceEntityInCollectionOrDescendants(
"dashboard",
getCollectionType(item),
)
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index 2b911418f10..0ae11817372 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -5,9 +5,10 @@ import { t } from "ttag";
import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { UploadInput } from "metabase/common/components/upload";
+import { DataStudioToolbarButton } from "metabase/data-studio/query-builder/components/DataStudioToolbarButton";
+import { getLibraryCollectionType } from "metabase/data-studio/utils";
import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";
import type { QueryModalType } from "metabase/query_builder/constants";
import { uploadFile } from "metabase/redux/uploads";
@@ -98,9 +99,7 @@ export const QuestionActions = ({
};
const shouldShowDataStudioLink =
- PLUGIN_DATA_STUDIO.isEnabled &&
- PLUGIN_DATA_STUDIO.getLibraryCollectionType(question.collection()?.type) !=
- null;
+ getLibraryCollectionType(question.collection()?.type) != null;
return (
<>
@@ -171,7 +170,7 @@ export const QuestionActions = ({
/>
)}
{shouldShowDataStudioLink && (
- <PLUGIN_DATA_STUDIO.DataStudioToolbarButton question={question} />
+ <DataStudioToolbarButton question={question} />
)}
</>
);
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
index 248e6acbd6a..427cff1bb7c 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
@@ -17,6 +17,7 @@ import {
useGetDocumentQuery,
useGetSegmentQuery,
useGetTableQuery,
+ useGetTransformQuery,
useListMentionsQuery,
} from "metabase/api";
import { Link } from "metabase/common/components/Link";
@@ -344,7 +345,7 @@ export const useEntityData = (
},
);
- const transformQuery = PLUGIN_TRANSFORMS.useGetTransformQuery(entityId!, {
+ const transformQuery = useGetTransformQuery(entityId!, {
skip: !PLUGIN_TRANSFORMS.isEnabled || !entityId || model !== "transform",
});
diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsx
index 0fc63ade81d..0022176df86 100644
--- a/frontend/src/metabase/route-guards.tsx
+++ b/frontend/src/metabase/route-guards.tsx
@@ -2,18 +2,16 @@ import { routerActions } from "react-router-redux";
import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
import { getAdminPaths } from "metabase/admin/app/selectors";
+import { canAccessDataStudio } from "metabase/data-studio/selectors";
import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";
import { MetabaseReduxContext } from "metabase/lib/redux";
-import {
- PLUGIN_DATA_STUDIO,
- PLUGIN_FEATURE_LEVEL_PERMISSIONS,
- PLUGIN_TRANSFORMS,
-} from "metabase/plugins";
+import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import type { State } from "metabase-types/store";
import { getCanAccessOnboardingPage } from "./home/selectors";
import { getIsEmbeddingIframe } from "./selectors/embed";
+import { canAccessTransforms } from "./transforms/selectors";
type Props = { children: React.ReactElement };
@@ -106,8 +104,7 @@ const UserCanAccessDataStudio = connectedReduxRedirect<Props, State>({
wrapperDisplayName: "UserCanAccessDataStudio",
redirectPath: "/unauthorized",
allowRedirectBack: false,
- authenticatedSelector: (state) =>
- PLUGIN_DATA_STUDIO.canAccessDataStudio(state),
+ authenticatedSelector: (state) => canAccessDataStudio(state),
redirectAction: routerActions.replace,
context: MetabaseReduxContext,
});
@@ -116,8 +113,7 @@ const UserCanAccessTransforms = connectedReduxRedirect<Props, State>({
wrapperDisplayName: "UserCanAccessTransforms",
redirectPath: "/unauthorized",
allowRedirectBack: false,
- authenticatedSelector: (state) =>
- PLUGIN_TRANSFORMS.canAccessTransforms(state),
+ authenticatedSelector: (state) => canAccessTransforms(state),
redirectAction: routerActions.replace,
context: MetabaseReduxContext,
});
@@ -141,7 +137,7 @@ export const CanAccessOnboarding = UserCanAccessOnboarding(
({ children }) => children,
);
-// Must be in sync with canAccessDataStudio in enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts
+// Must be in sync with canAccessDataStudio in frontend/src/metabase/data-studio/selectors.ts
export const CanAccessDataStudio = MetabaseIsSetup(
UserIsAuthenticated(
UserCanAccessDataStudio(AvailableInEmbedding(({ children }) => children)),
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index fbf7f48943c..5a5e0886fae 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -29,6 +29,7 @@ import { DashboardMoveModalConnected } from "metabase/dashboard/components/Dashb
import { ArchiveDashboardModalConnected } from "metabase/dashboard/containers/ArchiveDashboardModal";
import { AutomaticDashboardApp } from "metabase/dashboard/containers/AutomaticDashboardApp";
import { DashboardApp } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
+import { getDataStudioRoutes } from "metabase/data-studio/routes";
import { TableDetailPage } from "metabase/detail-view/pages/TableDetailPage";
import { CommentsSidesheet } from "metabase/documents/components/CommentsSidesheet";
import { DocumentPageOuter } from "metabase/documents/routes";
@@ -40,7 +41,6 @@ import NewModelOptions from "metabase/models/containers/NewModelOptions";
import { getRoutes as getModelRoutes } from "metabase/models/routes";
import {
PLUGIN_COLLECTIONS,
- PLUGIN_DATA_STUDIO,
PLUGIN_LANDING_PAGE,
PLUGIN_METABOT,
PLUGIN_TABLE_EDITING,
@@ -382,7 +382,7 @@ export const getRoutes = (store) => {
{getAdminRoutes(store, CanAccessSettings, IsAdmin)}
{/* DATA STUDIO */}
- {PLUGIN_DATA_STUDIO.getDataStudioRoutes(
+ {getDataStudioRoutes(
store,
CanAccessDataStudio,
CanAccessDataModel,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/analytics.ts b/frontend/src/metabase/transforms/analytics.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/analytics.ts
rename to frontend/src/metabase/transforms/analytics.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.module.css b/frontend/src/metabase/transforms/components/ColumnLayout/ColumnLayout.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.module.css
rename to frontend/src/metabase/transforms/components/ColumnLayout/ColumnLayout.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx b/frontend/src/metabase/transforms/components/ColumnLayout/ColumnLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx
rename to frontend/src/metabase/transforms/components/ColumnLayout/ColumnLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/index.ts b/frontend/src/metabase/transforms/components/ColumnLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/index.ts
rename to frontend/src/metabase/transforms/components/ColumnLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
rename to frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/index.ts b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/index.ts
rename to frontend/src/metabase/transforms/components/CreateTransformCollectionModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.module.css b/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.module.css
rename to frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
rename to frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
index 24128b966aa..9968b23c2e7 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
@@ -6,10 +6,11 @@ import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";
import { useListDatabasesQuery } from "metabase/api";
import { QuestionPickerModal } from "metabase/common/components/Pickers";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
+import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";
import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";
-import { PythonTransformsUpsellModal } from "metabase-enterprise/data-studio/upsells";
import { trackTransformCreate } from "../../analytics";
import { CreateTransformCollectionModal } from "../CreateTransformCollectionModal";
@@ -31,6 +32,10 @@ export const CreateTransformMenu = () => {
const hasPythonTransformsFeature = useHasTokenFeature("transforms-python");
+ const shouldShowPythonTransformsUpsell = useSelector(
+ getShouldShowPythonTransformsUpsell,
+ );
+
const { data: databases, isLoading } = useListDatabasesQuery({
include_analytics: true,
});
@@ -81,15 +86,20 @@ export const CreateTransformMenu = () => {
>
{t`SQL query`}
</Menu.Item>
- <Menu.Item
- leftSection={<Icon name="code_block" />}
- rightSection={
- !hasPythonTransformsFeature ? <UpsellGem size={14} /> : null
- }
- onClick={handlePythonClick}
- >
- {t`Python script`}
- </Menu.Item>
+
+ {(shouldShowPythonTransformsUpsell ||
+ hasPythonTransformsFeature) && (
+ <Menu.Item
+ leftSection={<Icon name="code_block" />}
+ rightSection={
+ !hasPythonTransformsFeature ? <UpsellGem size={14} /> : null
+ }
+ onClick={handlePythonClick}
+ >
+ {t`Python script`}
+ </Menu.Item>
+ )}
+
<Menu.Item
leftSection={<Icon name="insight" />}
onClick={() => {
@@ -128,7 +138,7 @@ export const CreateTransformMenu = () => {
<CreateTransformCollectionModal onClose={closeCollectionModal} />
)}
- <PythonTransformsUpsellModal
+ <PLUGIN_TRANSFORMS_PYTHON.PythonTransformsUpsellModal
isOpen={isPythonUpsellOpened}
onClose={closePythonUpsell}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/index.ts b/frontend/src/metabase/transforms/components/CreateTransformMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/index.ts
rename to frontend/src/metabase/transforms/components/CreateTransformMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/utils.ts b/frontend/src/metabase/transforms/components/CreateTransformMenu/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/utils.ts
rename to frontend/src/metabase/transforms/components/CreateTransformMenu/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsx b/frontend/src/metabase/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsx
rename to frontend/src/metabase/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/index.ts b/frontend/src/metabase/transforms/components/EditTransformCollectionModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/index.ts
rename to frontend/src/metabase/transforms/components/EditTransformCollectionModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
rename to frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
index 8ae660be892..a4460d035a9 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
@@ -4,8 +4,15 @@ import { t } from "ttag";
import { FormSelect } from "metabase/forms";
import { useSelector } from "metabase/lib/redux";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { TitleSection } from "metabase/transforms/components/TitleSection";
+import {
+ SOURCE_STRATEGY_OPTIONS,
+ TARGET_STRATEGY_OPTIONS,
+} from "metabase/transforms/constants";
+import { getLibQuery, isMbqlQuery } from "metabase/transforms/utils";
import {
Anchor,
Box,
@@ -16,13 +23,6 @@ import {
Text,
Tooltip,
} from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { TitleSection } from "metabase-enterprise/transforms/components/TitleSection";
-import {
- SOURCE_STRATEGY_OPTIONS,
- TARGET_STRATEGY_OPTIONS,
-} from "metabase-enterprise/transforms/constants";
-import { getLibQuery, isMbqlQuery } from "metabase-enterprise/transforms/utils";
import type * as Lib from "metabase-lib";
import type { TransformSource } from "metabase-types/api";
@@ -51,7 +51,9 @@ export const IncrementalTransformSettings = ({
const metadata = useSelector(getMetadata);
const libQuery = getLibQuery(source, metadata);
const showMetabaseLinks = useSelector(getShowMetabaseLinks);
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
// Check if this is a Python transform with exactly one source table
// Incremental transforms are only supported for single-table Python transforms
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/KeysetColumnSelect/KeysetColumnSelect.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/KeysetColumnSelect.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/KeysetColumnSelect/KeysetColumnSelect.tsx
rename to frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/KeysetColumnSelect.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx
rename to frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/KeysetColumnSelect/index.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/KeysetColumnSelect/index.ts
rename to frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/NativeQueryColumnSelect/NativeQueryColumnSelect.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/NativeQueryColumnSelect/NativeQueryColumnSelect.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/NativeQueryColumnSelect/NativeQueryColumnSelect.tsx
rename to frontend/src/metabase/transforms/components/IncrementalTransform/NativeQueryColumnSelect/NativeQueryColumnSelect.tsx
index 08eaf2a50ea..d4cd9772ad4 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/NativeQueryColumnSelect/NativeQueryColumnSelect.tsx
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/NativeQueryColumnSelect/NativeQueryColumnSelect.tsx
@@ -1,13 +1,13 @@
import { useEffect, useState } from "react";
import { useLatest } from "react-use";
+import { useExtractColumnsFromQueryMutation } from "metabase/api";
import { FormSelect, FormTextInput } from "metabase/forms";
import {
type DataAttributes,
type InputDescriptionProps,
Loader,
} from "metabase/ui";
-import { useExtractColumnsFromQueryMutation } from "metabase-enterprise/api";
import * as Lib from "metabase-lib";
type NativeQueryColumnSelectProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/NativeQueryColumnSelect/index.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/NativeQueryColumnSelect/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/NativeQueryColumnSelect/index.ts
rename to frontend/src/metabase/transforms/components/IncrementalTransform/NativeQueryColumnSelect/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/form.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/form.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/form.ts
rename to frontend/src/metabase/transforms/components/IncrementalTransform/form.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/hooks.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/hooks.ts
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/hooks.ts
rename to frontend/src/metabase/transforms/components/IncrementalTransform/hooks.ts
index 56db4d9db20..3c8ee1f1c3a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/hooks.ts
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/hooks.ts
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { useUpdateTransformMutation } from "metabase-enterprise/api";
+import { useUpdateTransformMutation } from "metabase/api";
import type { Transform } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/index.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/IncrementalTransform/index.ts
rename to frontend/src/metabase/transforms/components/IncrementalTransform/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
similarity index 87%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
index 87dd0656805..59e96fee661 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
@@ -2,14 +2,14 @@ import type { ReactNode } from "react";
import { Link } from "react-router";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
-import { Stack } from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import * as Urls from "metabase/lib/urls";
+import { Stack } from "metabase/ui";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
import { NAME_MAX_LENGTH } from "../../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
index 624672b22d4..1e655a17bc9 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
@@ -1,11 +1,11 @@
import { c, t } from "ttag";
+import { useRunTransformJobMutation } from "metabase/api";
import { Schedule } from "metabase/common/components/Schedule";
import { useSetting } from "metabase/common/hooks";
import { getScheduleExplanation } from "metabase/lib/cron";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Divider, Group, Tooltip } from "metabase/ui";
-import { useRunTransformJobMutation } from "metabase-enterprise/api";
import type {
ScheduleDisplayType,
ScheduleSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.unit.spec.tsx b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/index.ts b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/index.ts
rename to frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.unit.spec.tsx b/frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/index.ts b/frontend/src/metabase/transforms/components/JobEditor/TagSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/index.ts
rename to frontend/src/metabase/transforms/components/JobEditor/TagSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.module.css b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.module.css
rename to frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
index c2bf93d7e1f..6bd61a1758d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
@@ -3,12 +3,12 @@ import { useCallback, useMemo } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
+import { useListTransformJobTransformsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";
-import { useListTransformJobTransformsQuery } from "metabase-enterprise/api";
import type { Transform, TransformJobId } from "metabase-types/api";
import { ListEmptyState } from "../../ListEmptyState";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/index.ts b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/index.ts
rename to frontend/src/metabase/transforms/components/JobEditor/TransformsSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/utils.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/utils.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/utils.tsx
rename to frontend/src/metabase/transforms/components/JobEditor/TransformsSection/utils.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/index.ts b/frontend/src/metabase/transforms/components/JobEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/index.ts
rename to frontend/src/metabase/transforms/components/JobEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/types.ts b/frontend/src/metabase/transforms/components/JobEditor/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/types.ts
rename to frontend/src/metabase/transforms/components/JobEditor/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.tsx b/frontend/src/metabase/transforms/components/ListEmptyState/ListEmptyState.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.tsx
rename to frontend/src/metabase/transforms/components/ListEmptyState/ListEmptyState.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.unit.spec.tsx b/frontend/src/metabase/transforms/components/ListEmptyState/ListEmptyState.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/ListEmptyState/ListEmptyState.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/index.ts b/frontend/src/metabase/transforms/components/ListEmptyState/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/index.ts
rename to frontend/src/metabase/transforms/components/ListEmptyState/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.module.css b/frontend/src/metabase/transforms/components/ListLoadingState/ListLoadingState.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.module.css
rename to frontend/src/metabase/transforms/components/ListLoadingState/ListLoadingState.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.tsx b/frontend/src/metabase/transforms/components/ListLoadingState/ListLoadingState.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.tsx
rename to frontend/src/metabase/transforms/components/ListLoadingState/ListLoadingState.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/index.ts b/frontend/src/metabase/transforms/components/ListLoadingState/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/index.ts
rename to frontend/src/metabase/transforms/components/ListLoadingState/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/QueryComplexityWarning.module.css b/frontend/src/metabase/transforms/components/QueryComplexityWarning/QueryComplexityWarning.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/QueryComplexityWarning.module.css
rename to frontend/src/metabase/transforms/components/QueryComplexityWarning/QueryComplexityWarning.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/QueryComplexityWarning.tsx b/frontend/src/metabase/transforms/components/QueryComplexityWarning/QueryComplexityWarning.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/QueryComplexityWarning.tsx
rename to frontend/src/metabase/transforms/components/QueryComplexityWarning/QueryComplexityWarning.tsx
index ed5d7743ff4..566bb20d891 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/QueryComplexityWarning.tsx
+++ b/frontend/src/metabase/transforms/components/QueryComplexityWarning/QueryComplexityWarning.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import { c, t } from "ttag";
import { uncapitalize } from "metabase/lib/formatting/strings";
+import { CHECKPOINT_TEMPLATE_TAG } from "metabase/transforms/constants";
import { Stack, Text } from "metabase/ui";
-import { CHECKPOINT_TEMPLATE_TAG } from "metabase-enterprise/transforms/constants";
import type { QueryComplexity } from "metabase-types/api";
import S from "./QueryComplexityWarning.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/index.ts b/frontend/src/metabase/transforms/components/QueryComplexityWarning/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/index.ts
rename to frontend/src/metabase/transforms/components/QueryComplexityWarning/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/use-query-complexity-checks.tsx b/frontend/src/metabase/transforms/components/QueryComplexityWarning/use-query-complexity-checks.tsx
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/use-query-complexity-checks.tsx
rename to frontend/src/metabase/transforms/components/QueryComplexityWarning/use-query-complexity-checks.tsx
index e4dca972dd7..db706443428 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryComplexityWarning/use-query-complexity-checks.tsx
+++ b/frontend/src/metabase/transforms/components/QueryComplexityWarning/use-query-complexity-checks.tsx
@@ -1,12 +1,12 @@
import { useCallback } from "react";
import { t } from "ttag";
+import { useLazyCheckQueryComplexityQuery } from "metabase/api";
import { useConfirmation } from "metabase/common/hooks";
import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
-import { useLazyCheckQueryComplexityQuery } from "metabase-enterprise/api";
-import { CHECKPOINT_TEMPLATE_TAG } from "metabase-enterprise/transforms/constants";
-import { getLibQuery, isMbqlQuery } from "metabase-enterprise/transforms/utils";
+import { CHECKPOINT_TEMPLATE_TAG } from "metabase/transforms/constants";
+import { getLibQuery, isMbqlQuery } from "metabase/transforms/utils";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { DraftTransformSource } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx
rename to frontend/src/metabase/transforms/components/RunButton/RunButton.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/index.ts b/frontend/src/metabase/transforms/components/RunButton/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/index.ts
rename to frontend/src/metabase/transforms/components/RunButton/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/RunCancelButton.tsx b/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/RunCancelButton.tsx
rename to frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
index 7c3a7e9bbdc..81b042455ff 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/RunCancelButton.tsx
+++ b/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
@@ -1,14 +1,14 @@
import { useDisclosure } from "@mantine/hooks";
import { t } from "ttag";
+import {
+ useCancelCurrentTransformRunMutation,
+ useLazyGetTransformQuery,
+} from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { isResourceNotFoundError } from "metabase/lib/errors";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
-import {
- useCancelCurrentTransformRunMutation,
- useLazyGetTransformQuery,
-} from "metabase-enterprise/api";
import type { Transform, TransformRunStatus } from "metabase-types/api";
export function RunCancelButton({
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/RunInfo.module.css b/frontend/src/metabase/transforms/components/RunInfo/RunInfo.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/RunInfo.module.css
rename to frontend/src/metabase/transforms/components/RunInfo/RunInfo.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/RunInfo.tsx b/frontend/src/metabase/transforms/components/RunInfo/RunInfo.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/RunInfo.tsx
rename to frontend/src/metabase/transforms/components/RunInfo/RunInfo.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/RunInfo.unit.spec.tsx b/frontend/src/metabase/transforms/components/RunInfo/RunInfo.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/RunInfo.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/RunInfo/RunInfo.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/index.ts b/frontend/src/metabase/transforms/components/RunInfo/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunInfo/index.ts
rename to frontend/src/metabase/transforms/components/RunInfo/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/RunStatus.tsx b/frontend/src/metabase/transforms/components/RunStatus/RunStatus.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/RunStatus.tsx
rename to frontend/src/metabase/transforms/components/RunStatus/RunStatus.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/index.ts b/frontend/src/metabase/transforms/components/RunStatus/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/index.ts
rename to frontend/src/metabase/transforms/components/RunStatus/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx b/frontend/src/metabase/transforms/components/RunStatusInfo/RunStatusInfo.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx
rename to frontend/src/metabase/transforms/components/RunStatusInfo/RunStatusInfo.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx b/frontend/src/metabase/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx
rename to frontend/src/metabase/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.unit.spec.tsx b/frontend/src/metabase/transforms/components/SchemaFormSelect/SchemaFormSelect.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/SchemaFormSelect/SchemaFormSelect.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/index.ts b/frontend/src/metabase/transforms/components/SchemaFormSelect/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/index.ts
rename to frontend/src/metabase/transforms/components/SchemaFormSelect/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.tsx b/frontend/src/metabase/transforms/components/TagList/TagList.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.tsx
rename to frontend/src/metabase/transforms/components/TagList/TagList.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.unit.spec.tsx b/frontend/src/metabase/transforms/components/TagList/TagList.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/TagList/TagList.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/index.ts b/frontend/src/metabase/transforms/components/TagList/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/index.ts
rename to frontend/src/metabase/transforms/components/TagList/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
rename to frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
index ee1b1207d42..f5336078e86 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
+++ b/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx
@@ -1,5 +1,6 @@
import { t } from "ttag";
+import { useDeleteTransformTagMutation } from "metabase/api";
import {
Form,
FormErrorMessage,
@@ -7,7 +8,6 @@ import {
FormSubmitButton,
} from "metabase/forms";
import { Box, Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
-import { useDeleteTransformTagMutation } from "metabase-enterprise/api";
import type { TransformTag } from "metabase-types/api";
type DeleteTagModalProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/index.ts b/frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/index.ts
rename to frontend/src/metabase/transforms/components/TagMultiSelect/DeleteTagModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.module.css b/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.module.css
rename to frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsx
rename to frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx
index e3e09eb4889..2afd006ae7a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsx
+++ b/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx
@@ -2,6 +2,10 @@ import cx from "classnames";
import { type MouseEvent, useState } from "react";
import { jt, t } from "ttag";
+import {
+ useCreateTransformTagMutation,
+ useListTransformTagsQuery,
+} from "metabase/api/transform-tag";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
ActionIcon,
@@ -13,10 +17,6 @@ import {
Text,
Tooltip,
} from "metabase/ui";
-import {
- useCreateTransformTagMutation,
- useListTransformTagsQuery,
-} from "metabase-enterprise/api/transform-tag";
import type { TransformTag, TransformTagId } from "metabase-types/api";
import { DeleteTagModal } from "./DeleteTagModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
rename to frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
index 6bbd8b19a7f..79459e826ba 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
+++ b/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import * as Yup from "yup";
+import { useUpdateTransformTagMutation } from "metabase/api";
import {
Form,
FormErrorMessage,
@@ -11,7 +12,6 @@ import {
} from "metabase/forms";
import * as Errors from "metabase/lib/errors";
import { Box, Button, FocusTrap, Group, Modal, Stack } from "metabase/ui";
-import { useUpdateTransformTagMutation } from "metabase-enterprise/api";
import type { TransformTag } from "metabase-types/api";
type UpdateTagModalProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/index.ts b/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/index.ts
rename to frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/index.ts b/frontend/src/metabase/transforms/components/TagMultiSelect/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/index.ts
rename to frontend/src/metabase/transforms/components/TagMultiSelect/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.tsx b/frontend/src/metabase/transforms/components/TitleSection/TitleSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.tsx
rename to frontend/src/metabase/transforms/components/TitleSection/TitleSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.unit.spec.tsx b/frontend/src/metabase/transforms/components/TitleSection/TitleSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/TitleSection/TitleSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/index.ts b/frontend/src/metabase/transforms/components/TitleSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/index.ts
rename to frontend/src/metabase/transforms/components/TitleSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton.tsx b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton.tsx
rename to frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
rename to frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
index 45270a26dad..d7c4ce5b8fe 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
+++ b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
@@ -1,16 +1,13 @@
import { useMemo } from "react";
import { useSelector } from "metabase/lib/redux";
+import { PLUGIN_REMOTE_SYNC, PLUGIN_WORKSPACES } from "metabase/plugins";
import {
QueryEditor,
type QueryEditorUiOptions,
type QueryEditorUiState,
} from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { hasPremiumFeature } from "metabase-enterprise/settings";
-import { EditDefinitionButton } from "metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton";
-import { EditTransformMenu } from "metabase-enterprise/transforms/components/TransformHeader/EditTransformMenu";
import * as Lib from "metabase-lib";
import type {
Database,
@@ -19,6 +16,7 @@ import type {
Transform,
} from "metabase-types/api";
+import { EditDefinitionButton } from "./EditDefinitionButton";
import { getEditorOptions } from "./utils";
export type TransformEditorProps = {
@@ -71,7 +69,9 @@ export function TransformEditor({
[databases, isEditMode, uiOptions],
);
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const showEditButton =
!!transform && !readOnly && !isEditMode && !isRemoteSyncReadOnly;
@@ -100,8 +100,8 @@ export function TransformEditor({
onBlur={onBlur}
topBarInnerContent={
showEditButton &&
- (hasPremiumFeature("workspaces") && transform ? (
- <EditTransformMenu transform={transform} />
+ (PLUGIN_WORKSPACES.isEnabled && transform ? (
+ <PLUGIN_WORKSPACES.EditTransformMenu transform={transform} />
) : (
<EditDefinitionButton
bg="transparent"
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/index.ts b/frontend/src/metabase/transforms/components/TransformEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/index.ts
rename to frontend/src/metabase/transforms/components/TransformEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts b/frontend/src/metabase/transforms/components/TransformEditor/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts
rename to frontend/src/metabase/transforms/components/TransformEditor/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
similarity index 79%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
index 14b6b9a4836..e7085e4fb40 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
@@ -2,13 +2,13 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import type { StackProps } from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { Transform } from "metabase-types/api";
import { TransformMoreMenu } from "./TransformMoreMenu";
@@ -31,7 +31,9 @@ export function TransformHeader({
readOnly,
...restProps
}: TransformHeaderProps) {
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const { path, isLoadingPath } = useCollectionPath({
collectionId: transform.collection_id,
namespace: "transforms",
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
index 04aa14682d6..322f94786dd 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
@@ -1,6 +1,11 @@
import { useState } from "react";
import { jt, t } from "ttag";
+import {
+ useDeleteTransformMutation,
+ useDeleteTransformTargetMutation,
+ useGetTransformQuery,
+} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import {
Form,
@@ -18,11 +23,6 @@ import {
Stack,
Text,
} from "metabase/ui";
-import {
- useDeleteTransformMutation,
- useDeleteTransformTargetMutation,
- useGetTransformQuery,
-} from "metabase-enterprise/api";
import type { Transform } from "metabase-types/api";
type DeleteTransformModalProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx
index 074bf4da630..0c9a17eb34c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx
@@ -1,6 +1,7 @@
import { useCallback, useMemo } from "react";
import { c } from "ttag";
+import { useUpdateTransformMutation } from "metabase/api";
import { canonicalCollectionId } from "metabase/collections/utils";
import type {
EntityPickerOptions,
@@ -8,7 +9,6 @@ import type {
OmniPickerValue,
} from "metabase/common/components/Pickers";
import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";
-import { useUpdateTransformMutation } from "metabase-enterprise/api";
import type { Transform } from "metabase-types/api";
const TRANSFORM_COLLECTION_PICKER_OPTIONS: EntityPickerOptions = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/index.ts b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/index.ts
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/types.ts b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/types.ts
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformNameInput.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx
similarity index 79%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformNameInput.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx
index 1fcd7bffa6d..c7ddbae6bc3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformNameInput.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
+import { useUpdateTransformMutation } from "metabase/api";
+import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { useUpdateTransformMutation } from "metabase-enterprise/api";
-import { PaneHeaderInput } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { NAME_MAX_LENGTH } from "metabase-enterprise/transforms/constants";
+import { NAME_MAX_LENGTH } from "metabase/transforms/constants";
import type { Transform } from "metabase-types/api";
type TransformNameInputProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformTabs.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformTabs.tsx
rename to frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
index f043c0023d4..9d526be09bc 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformTabs.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+} from "metabase/data-studio/common/components/PaneHeader";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import type { Transform, TransformId } from "metabase-types/api";
type TransformTabsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/index.ts b/frontend/src/metabase/transforms/components/TransformHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/index.ts
rename to frontend/src/metabase/transforms/components/TransformHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx b/frontend/src/metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx
rename to frontend/src/metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
rename to frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx
rename to frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformRevisionHistorySidebar/index.ts b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformRevisionHistorySidebar/index.ts
rename to frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/constants.ts b/frontend/src/metabase/transforms/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/constants.ts
rename to frontend/src/metabase/transforms/constants.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-register-transform-metabot-context.ts b/frontend/src/metabase/transforms/hooks/use-register-transform-metabot-context.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-register-transform-metabot-context.ts
rename to frontend/src/metabase/transforms/hooks/use-register-transform-metabot-context.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts b/frontend/src/metabase/transforms/hooks/use-source-state.ts
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts
rename to frontend/src/metabase/transforms/hooks/use-source-state.ts
index 01070a8f959..7acdec9573b 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts
+++ b/frontend/src/metabase/transforms/hooks/use-source-state.ts
@@ -1,11 +1,8 @@
import { useMemo, useState } from "react";
import { useDispatch, useSelector } from "metabase/lib/redux";
+import { PLUGIN_METABOT } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
-import {
- deactivateSuggestedTransform,
- getMetabotSuggestedTransform,
-} from "metabase-enterprise/metabot/state";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
@@ -69,7 +66,7 @@ export function useSourceState({
const metadata = useSelector(getMetadata);
const suggestedTransform = useSelector((state) =>
- getMetabotSuggestedTransform(state, transformId),
+ PLUGIN_METABOT.getMetabotSuggestedTransform(state, transformId),
);
const [source, setSource] = useState(() => {
@@ -100,7 +97,9 @@ export function useSourceState({
const setSourceAndRejectProposed = (source: DraftTransformSource) => {
if (suggestedTransform != null) {
- dispatch(deactivateSuggestedTransform(suggestedTransform.id));
+ dispatch(
+ PLUGIN_METABOT.deactivateSuggestedTransform(suggestedTransform.id),
+ );
}
setSource(source);
};
@@ -108,13 +107,17 @@ export function useSourceState({
const acceptProposed = () => {
if (suggestedTransform != null) {
setSource(normalizeSource(suggestedTransform.source, metadata));
- dispatch(deactivateSuggestedTransform(suggestedTransform.id));
+ dispatch(
+ PLUGIN_METABOT.deactivateSuggestedTransform(suggestedTransform.id),
+ );
}
};
const rejectProposed = () => {
if (suggestedTransform != null) {
- dispatch(deactivateSuggestedTransform(suggestedTransform.id));
+ dispatch(
+ PLUGIN_METABOT.deactivateSuggestedTransform(suggestedTransform.id),
+ );
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-transform-permissions.ts b/frontend/src/metabase/transforms/hooks/use-transform-permissions.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-transform-permissions.ts
rename to frontend/src/metabase/transforms/hooks/use-transform-permissions.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx b/frontend/src/metabase/transforms/pages/JobEmptyPage/JobEmptyPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx
rename to frontend/src/metabase/transforms/pages/JobEmptyPage/JobEmptyPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/index.ts b/frontend/src/metabase/transforms/pages/JobEmptyPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/index.ts
rename to frontend/src/metabase/transforms/pages/JobEmptyPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx
rename to frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
index 75f8ad69b95..5f9babfdea7 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
@@ -2,12 +2,17 @@ import { useCallback, useMemo, useState } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
+import { useListTransformJobsQuery } from "metabase/api";
import { DateTime } from "metabase/common/components/DateTime";
import { Ellipsified } from "metabase/common/components/Ellipsified";
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { ListEmptyState } from "metabase/transforms/components/ListEmptyState";
import type { TreeTableColumnDef } from "metabase/ui";
import {
Button,
@@ -20,11 +25,6 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
-import { useListTransformJobsQuery } from "metabase-enterprise/api";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";
import type { TransformJob } from "metabase-types/api";
export const JobListPage = () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/index.ts b/frontend/src/metabase/transforms/pages/JobListPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/index.ts
rename to frontend/src/metabase/transforms/pages/JobListPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
rename to frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
index 04f6dee8547..f561ef72cfe 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
+++ b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
@@ -1,5 +1,6 @@
import { t } from "ttag";
+import { useDeleteTransformJobMutation } from "metabase/api";
import {
Form,
FormErrorMessage,
@@ -7,7 +8,6 @@ import {
FormSubmitButton,
} from "metabase/forms";
import { Box, Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
-import { useDeleteTransformJobMutation } from "metabase-enterprise/api";
import type { TransformJob } from "metabase-types/api";
type DeleteJobModalProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/index.ts b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/index.ts
rename to frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
rename to frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/index.ts b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/index.ts
rename to frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/types.ts b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/types.ts
rename to frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx
rename to frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
index c7c3111f45b..af3793fcbb4 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
@@ -1,20 +1,20 @@
import { useMemo, useState } from "react";
import { t } from "ttag";
-import { skipToken } from "metabase/api";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Center } from "metabase/ui";
import {
+ skipToken,
useGetTransformJobQuery,
useListTransformJobTransformsQuery,
useUpdateTransformJobMutation,
-} from "metabase-enterprise/api";
+} from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
import {
canEditTransform,
useTransformPermissions,
-} from "metabase-enterprise/transforms/hooks/use-transform-permissions";
+} from "metabase/transforms/hooks/use-transform-permissions";
+import { Center } from "metabase/ui";
import type {
ScheduleDisplayType,
TransformJob,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/index.ts b/frontend/src/metabase/transforms/pages/JobPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/index.ts
rename to frontend/src/metabase/transforms/pages/JobPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx
rename to frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
index 52c6acbf89e..2e6beac05c6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
@@ -4,15 +4,15 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import _ from "underscore";
+import {
+ useCreateTransformJobMutation,
+ useLazyGetTransformJobQuery,
+} from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import {
- useCreateTransformJobMutation,
- useLazyGetTransformJobQuery,
-} from "metabase-enterprise/api";
-import { PaneHeaderActions } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
import { JobEditor, type TransformJobInfo } from "../../components/JobEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/index.ts b/frontend/src/metabase/transforms/pages/NewJobPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/index.ts
rename to frontend/src/metabase/transforms/pages/NewJobPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
rename to frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
index 71ab6c39248..1f33c945d33 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
@@ -19,12 +19,12 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import { Box, Button, Group, Modal, Stack } from "metabase/ui";
-import { IncrementalTransformSettings } from "metabase-enterprise/transforms/components/IncrementalTransform/IncrementalTransformSettings";
+import { IncrementalTransformSettings } from "metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings";
import {
QueryComplexityWarning,
useQueryComplexityChecks,
-} from "metabase-enterprise/transforms/components/QueryComplexityWarning";
+} from "metabase/transforms/components/QueryComplexityWarning";
+import { Box, Button, Group, Modal, Stack } from "metabase/ui";
import type {
QueryComplexity,
SchemaName,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/TargetNameInput.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/TargetNameInput.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/TargetNameInput.tsx
rename to frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/TargetNameInput.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/form.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/form.ts
rename to frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/hooks.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/hooks.ts
similarity index 87%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/hooks.ts
rename to frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/hooks.ts
index 57ddc7e8857..1bbde70ef0b 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/hooks.ts
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/hooks.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
-import { useCreateTransformMutation } from "metabase-enterprise/api";
-import { trackTransformCreated } from "metabase-enterprise/transforms/analytics";
+import { useCreateTransformMutation } from "metabase/api";
+import { trackTransformCreated } from "metabase/transforms/analytics";
import type { Transform, TransformSource } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/index.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/index.ts
rename to frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
rename to frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
index 6423326ddc3..8f430787b52 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
@@ -7,20 +7,20 @@ import { t } from "ttag";
import { skipToken, useGetCardQuery } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "metabase/data-studio/common/components/PaneHeader";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
+import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Box, Center } from "metabase/ui";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import {
- PaneHeader,
- PaneHeaderActions,
- PaneHeaderInput,
-} from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { useTransformPermissions } from "metabase-enterprise/transforms/hooks/use-transform-permissions";
import * as Lib from "metabase-lib";
import type {
Database,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/index.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/index.ts
rename to frontend/src/metabase/transforms/pages/NewTransformPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/types.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/types.ts
rename to frontend/src/metabase/transforms/pages/NewTransformPage/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
rename to frontend/src/metabase/transforms/pages/NewTransformPage/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
index 2e3cb1951fc..1773a013ea7 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
@@ -2,6 +2,7 @@ import { useDisclosure } from "@mantine/hooks";
import { type FormEvent, useState } from "react";
import { t } from "ttag";
+import { formatRunMethod } from "metabase/transforms/utils";
import {
Box,
Button,
@@ -11,7 +12,6 @@ import {
Popover,
Stack,
} from "metabase/ui";
-import { formatRunMethod } from "metabase-enterprise/transforms/utils";
import type { TransformRunMethod } from "metabase-types/api";
import { FILTER_WIDGET_MIN_WIDTH } from "../../../../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/StatusFilterWidget.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/StatusFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/StatusFilterWidget.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/StatusFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/TagFilterWidget.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/TagFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/TagFilterWidget.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/TagFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/TransformFilterWidget.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/TransformFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/TransformFilterWidget.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/TransformFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunListPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
index f851e52da67..a30d0f7bd44 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
@@ -5,18 +5,18 @@ import { useCallback, useLayoutEffect, useMemo, useState } from "react";
import { replace } from "react-router-redux";
import { t } from "ttag";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { Center, Flex, Stack } from "metabase/ui";
import {
useListTransformRunsQuery,
useListTransformTagsQuery,
useListTransformsQuery,
-} from "metabase-enterprise/api";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";
+} from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { POLLING_INTERVAL } from "metabase/transforms/constants";
+import { Center, Flex, Stack } from "metabase/ui";
import type { TransformRun, TransformRunId } from "metabase-types/api";
import { RunFilterBar } from "./RunFilterBar";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/RunPagination.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunPagination/RunPagination.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/RunPagination.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunPagination/RunPagination.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunPagination/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunPagination/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
index 8411155d31c..a9fdf3640e6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
@@ -1,10 +1,10 @@
import { useDisclosure } from "@mantine/hooks";
import { t } from "ttag";
+import { useCancelCurrentTransformRunMutation } from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
-import { useCancelCurrentTransformRunMutation } from "metabase-enterprise/api";
import type { TransformRun } from "metabase-types/api";
type CancelationSectionProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/TimezoneIndicator.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TimezoneIndicator/TimezoneIndicator.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/TimezoneIndicator.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/TimezoneIndicator/TimezoneIndicator.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TimezoneIndicator/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/TimezoneIndicator/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/index.ts b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/index.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/utils.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/utils.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/utils.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/RunTable/utils.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/constants.ts b/frontend/src/metabase/transforms/pages/RunListPage/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/constants.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/constants.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/index.tsx b/frontend/src/metabase/transforms/pages/RunListPage/index.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/index.tsx
rename to frontend/src/metabase/transforms/pages/RunListPage/index.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/types.ts b/frontend/src/metabase/transforms/pages/RunListPage/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/types.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts b/frontend/src/metabase/transforms/pages/RunListPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts
rename to frontend/src/metabase/transforms/pages/RunListPage/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
rename to frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
index 5072ccfcab1..5cbb267cbad 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
@@ -1,13 +1,12 @@
import type { ReactNode } from "react";
-import { skipToken } from "metabase/api";
+import { skipToken, useGetTransformQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Card, Center } from "metabase/ui";
-import { useGetTransformQuery } from "metabase-enterprise/api";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useTransformPermissions } from "metabase-enterprise/transforms/hooks/use-transform-permissions";
import { TransformHeader } from "../../components/TransformHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/index.ts b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/index.ts
rename to frontend/src/metabase/transforms/pages/TransformDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx b/frontend/src/metabase/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx
rename to frontend/src/metabase/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/index.ts b/frontend/src/metabase/transforms/pages/TransformEmptyPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/index.ts
rename to frontend/src/metabase/transforms/pages/TransformEmptyPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CollectionRowMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CollectionRowMenu.tsx
rename to frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx
index 663dd5f134f..ce4d9e41902 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CollectionRowMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx
@@ -5,8 +5,8 @@ import { useUpdateCollectionMutation } from "metabase/api";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { EditTransformCollectionModal } from "metabase/transforms/components/EditTransformCollectionModal";
import { ActionIcon, Box, Icon, Menu } from "metabase/ui";
-import { EditTransformCollectionModal } from "metabase-enterprise/transforms/components/EditTransformCollectionModal";
type CollectionRowMenuProps = {
collectionId: number;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.module.css b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.module.css
rename to frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx
rename to frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
index b1c45f3e6af..332db7fe796 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
@@ -14,16 +14,23 @@ import {
skipToken,
useGetCollectionQuery,
useListCollectionsTreeQuery,
+ useListTransformsQuery,
} from "metabase/api";
import { DateTime } from "metabase/common/components/DateTime";
import { Ellipsified } from "metabase/common/components/Ellipsified";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import type { ColorName } from "metabase/lib/colors/types";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { type NamedUser, getUserName } from "metabase/lib/user";
-import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
+import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
+import { CreateTransformMenu } from "metabase/transforms/components/CreateTransformMenu";
+import { ListEmptyState } from "metabase/transforms/components/ListEmptyState";
+import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import {
Card,
EntityNameCell,
@@ -36,15 +43,6 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
-import { useListTransformsQuery } from "metabase-enterprise/api";
-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { CreateTransformMenu } from "metabase-enterprise/transforms/components/CreateTransformMenu";
-import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";
-import { useTransformPermissions } from "metabase-enterprise/transforms/hooks/use-transform-permissions";
-import { SHARED_LIB_IMPORT_PATH } from "metabase-enterprise/transforms-python/constants";
import { CollectionRowMenu } from "./CollectionRowMenu";
import S from "./TransformListPage.module.css";
@@ -96,7 +94,9 @@ const globalFilterFn = (
export const TransformListPage = ({ location }: WithRouterProps) => {
const { transformsDatabases = [], isLoadingDatabases } =
useTransformPermissions();
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const targetCollectionId =
Urls.extractEntityId(location.query?.collectionId) ?? null;
const hasScrolledRef = useRef(false);
@@ -135,7 +135,9 @@ export const TransformListPage = ({ location }: WithRouterProps) => {
name: t`Python library`,
nodeType: "library",
icon: "snippet",
- url: Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH }),
+ url: Urls.transformPythonLibrary({
+ path: PLUGIN_TRANSFORMS_PYTHON.sharedLibImportPath,
+ }),
source_readable: transformsDatabases.length > 0,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/index.ts b/frontend/src/metabase/transforms/pages/TransformListPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/index.ts
rename to frontend/src/metabase/transforms/pages/TransformListPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/types.ts b/frontend/src/metabase/transforms/pages/TransformListPage/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/types.ts
rename to frontend/src/metabase/transforms/pages/TransformListPage/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts b/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts
rename to frontend/src/metabase/transforms/pages/TransformListPage/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.unit.spec.ts b/frontend/src/metabase/transforms/pages/TransformListPage/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.unit.spec.ts
rename to frontend/src/metabase/transforms/pages/TransformListPage/utils.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
similarity index 78%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
rename to frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
index 9cc061a8e54..044677409d5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
@@ -1,12 +1,11 @@
import { useMemo } from "react";
+import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
import { useSelector } from "metabase/lib/redux";
-import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
+import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
-import { PaneHeaderActions } from "metabase-enterprise/data-studio/common/components/PaneHeader";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { EditDefinitionButton } from "metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton";
-import { getValidationResult } from "metabase-enterprise/transforms/utils";
+import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";
+import { getValidationResult } from "metabase/transforms/utils";
import * as Lib from "metabase-lib";
import type { DraftTransformSource, Transform } from "metabase-types/api";
@@ -33,7 +32,9 @@ export const TransformPaneHeaderActions = (props: Props) => {
readOnly,
} = props;
const metadata = useSelector(getMetadata);
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const { validationResult, isNative } = useMemo(() => {
if (source.type === "query") {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx
index 199b53cd9f0..c602054ebf0 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx
@@ -1,7 +1,7 @@
import { Route } from "react-router";
import { renderWithProviders, screen } from "__support__/ui";
-import * as transformsUtils from "metabase-enterprise/transforms/utils";
+import * as transformsUtils from "metabase/transforms/utils";
import type { DraftTransformSource } from "metabase-types/api";
import { createMockTransform } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
rename to frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
index 3450e291067..77de73778b3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
@@ -4,26 +4,26 @@ import { push } from "react-router-redux";
import { useLatest } from "react-use";
import { t } from "ttag";
-import { skipToken } from "metabase/api";
+import {
+ skipToken,
+ useGetTransformQuery,
+ useUpdateTransformMutation,
+} from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState/EmptyState";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
PLUGIN_DEPENDENCIES,
+ PLUGIN_REMOTE_SYNC,
PLUGIN_TRANSFORMS_PYTHON,
} from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Box, Center, Group, Icon } from "metabase/ui";
-import {
- useGetTransformQuery,
- useUpdateTransformMutation,
-} from "metabase-enterprise/api";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { useTransformPermissions } from "metabase-enterprise/transforms/hooks/use-transform-permissions";
import type {
Database,
DatasetQuery,
@@ -108,7 +108,9 @@ function TransformQueryPageBody({
initialSource: transform.source,
});
const dispatch = useDispatch();
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const [uiState, setUiState] = useState(getInitialUiState);
const [updateTransform, { isLoading: isSaving }] =
useUpdateTransformMutation();
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/index.ts b/frontend/src/metabase/transforms/pages/TransformQueryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/index.ts
rename to frontend/src/metabase/transforms/pages/TransformQueryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css
rename to frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx
rename to frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/index.ts b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/LogOutput/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/index.ts
rename to frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/LogOutput/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
rename to frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
index 0e8acc96f20..1aa3680f90c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
@@ -3,18 +3,18 @@ import { Link } from "react-router";
import { usePrevious } from "react-use";
import { t } from "ttag";
+import {
+ useCancelCurrentTransformRunMutation,
+ useRunTransformMutation,
+ useUpdateTransformMutation,
+} from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { isResourceNotFoundError } from "metabase/lib/errors";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { Anchor, Box, Divider, Group, Stack } from "metabase/ui";
-import {
- useCancelCurrentTransformRunMutation,
- useRunTransformMutation,
- useUpdateTransformMutation,
-} from "metabase-enterprise/api";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { Transform, TransformTagId } from "metabase-types/api";
import { trackTransformTriggerManualRun } from "../../../analytics";
@@ -31,7 +31,9 @@ type RunSectionProps = {
};
export function RunSection({ transform, readOnly }: RunSectionProps) {
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
return (
<TitleSection
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/index.ts b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/index.ts
rename to frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.module.css b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.module.css
rename to frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
rename to frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
index ae3dbcf045b..3573a084b66 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
@@ -1,12 +1,11 @@
import { useState } from "react";
-import { skipToken } from "metabase/api";
+import { skipToken, useGetTransformQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import * as Urls from "metabase/lib/urls";
+import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
-import { useGetTransformQuery } from "metabase-enterprise/api";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useTransformPermissions } from "metabase-enterprise/transforms/hooks/use-transform-permissions";
import type { Transform } from "metabase-types/api";
import { TransformHeader } from "../../components/TransformHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/index.ts b/frontend/src/metabase/transforms/pages/TransformRunPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/index.ts
rename to frontend/src/metabase/transforms/pages/TransformRunPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
index 6d1090fbaea..9cbe8e2c22c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
@@ -1,12 +1,11 @@
import { useState } from "react";
-import { skipToken } from "metabase/api";
+import { skipToken, useGetTransformQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import * as Urls from "metabase/lib/urls";
+import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
-import { useGetTransformQuery } from "metabase-enterprise/api";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
-import { useTransformPermissions } from "metabase-enterprise/transforms/hooks/use-transform-permissions";
import type { Transform } from "metabase-types/api";
import { TransformHeader } from "../../components/TransformHeader";
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx
new file mode 100644
index 00000000000..c80ae6db9f7
--- /dev/null
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx
@@ -0,0 +1,167 @@
+import { Route } from "react-router";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import {
+ setupDatabaseEndpoints,
+ setupUsersEndpoints,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders, screen } from "__support__/ui";
+import * as Urls from "metabase/lib/urls";
+import type {
+ EnterpriseSettings,
+ TokenFeatures,
+ Transform,
+} from "metabase-types/api";
+import {
+ createMockDatabase,
+ createMockTokenFeatures,
+ createMockTransform,
+ createMockTransformOwner,
+ createMockTransformRun,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import type { State } from "metabase-types/store";
+import { createMockState } from "metabase-types/store/mocks";
+
+import { TransformSettingsSection } from "./TransformSettingsSection";
+
+type SetupOpts = {
+ remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ transform?: Transform;
+};
+
+function setup({
+ transform = createMockTransform(),
+ remoteSyncType,
+}: SetupOpts) {
+ setupDatabaseEndpoints(createMockDatabase({ id: 1 }));
+ setupUsersEndpoints([
+ createMockUser({
+ id: 1,
+ common_name: "Test Owner",
+ email: "[email protected]",
+ }),
+ createMockUser({
+ id: 2,
+ common_name: "Another User",
+ email: "[email protected]",
+ }),
+ ]);
+
+ let state: State;
+ if (remoteSyncType) {
+ const tokenFeatures: Partial<TokenFeatures> = {
+ remote_sync: !!remoteSyncType,
+ };
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ state = createMockState({
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["remote_sync"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+ } else {
+ state = createMockState({
+ settings: mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ }),
+ });
+ }
+
+ renderWithProviders(
+ <Route
+ path={Urls.transform(transform.id)}
+ component={() => <TransformSettingsSection transform={transform} />}
+ />,
+ {
+ withRouter: true,
+ initialRoute: Urls.transform(transform.id),
+ storeInitialState: state,
+ },
+ );
+}
+
+describe("TransformSettingsSection", () => {
+ it("should disable the change target button when the transform is running", () => {
+ setup({
+ transform: createMockTransform({
+ last_run: createMockTransformRun({ status: "started" }),
+ }),
+ });
+ const button = screen.getByRole("button", { name: "Change target" });
+ expect(button).toBeDisabled();
+ });
+
+ it("should not disable the change target button when the transform is not running", () => {
+ setup({
+ transform: createMockTransform({
+ last_run: createMockTransformRun({ status: "failed" }),
+ }),
+ });
+ const button = screen.getByRole("button", { name: "Change target" });
+ expect(button).toBeEnabled();
+ });
+
+ describe("when remote sync is read-only", () => {
+ beforeEach(() => {
+ setup({ remoteSyncType: "read-only" });
+ });
+
+ it("does not show the change target button", () => {
+ expect(
+ screen.queryByRole("button", { name: "Change target" }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("makes Incremental transformation switch disabled", () => {
+ expect(
+ screen.getByRole("switch", {
+ name: /Only process new and changed data/,
+ }),
+ ).toBeDisabled();
+ });
+ });
+});
+
+describe("OwnerSection", () => {
+ it("should render the ownership section with title and description", () => {
+ setup({
+ transform: createMockTransform(),
+ });
+ expect(screen.getByText("Ownership")).toBeInTheDocument();
+ expect(
+ screen.getByText("Specify who is responsible for this transform."),
+ ).toBeInTheDocument();
+ });
+
+ it("should render the owner label", () => {
+ setup({
+ transform: createMockTransform({
+ owner_user_id: 1,
+ owner: createMockTransformOwner({
+ id: 1,
+ first_name: "Test",
+ last_name: "Owner",
+ }),
+ }),
+ });
+ expect(screen.getByText("Owner")).toBeInTheDocument();
+ });
+
+ it("should display external email when owner_email is set", () => {
+ setup({
+ transform: createMockTransform({
+ owner_email: "[email protected]",
+ owner: createMockTransformOwner({ email: "[email protected]" }),
+ }),
+ });
+ expect(screen.getByText("Ownership")).toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
index b9de6203857..cbe00a02502 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
@@ -5,6 +5,7 @@ import {
skipToken,
useGetDatabaseQuery,
useListDatabaseSchemasQuery,
+ useUpdateTransformMutation,
} from "metabase/api";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
@@ -12,6 +13,8 @@ import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { UserInput } from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { TransformOwnerAvatar } from "metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar";
import {
Button,
Divider,
@@ -22,9 +25,6 @@ import {
Stack,
Text,
} from "metabase/ui";
-import { useUpdateTransformMutation } from "metabase-enterprise/api";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { TransformOwnerAvatar } from "metabase-enterprise/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar";
import type { Transform, UserId } from "metabase-types/api";
import { TitleSection } from "../../../components/TitleSection";
@@ -42,7 +42,9 @@ export const TransformSettingsSection = ({
transform,
readOnly,
}: TransformSettingsSectionProps) => {
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
return (
<Stack gap="2.5rem">
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
similarity index 77%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
index c660ddeb1ff..c80ae6db9f7 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
@@ -1,5 +1,7 @@
import { Route } from "react-router";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import {
setupDatabaseEndpoints,
setupUsersEndpoints,
@@ -7,14 +9,20 @@ import {
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
import * as Urls from "metabase/lib/urls";
-import type { EnterpriseSettings, Transform } from "metabase-types/api";
+import type {
+ EnterpriseSettings,
+ TokenFeatures,
+ Transform,
+} from "metabase-types/api";
import {
createMockDatabase,
+ createMockTokenFeatures,
createMockTransform,
createMockTransformOwner,
createMockTransformRun,
createMockUser,
} from "metabase-types/api/mocks";
+import type { State } from "metabase-types/store";
import { createMockState } from "metabase-types/store/mocks";
import { TransformSettingsSection } from "./TransformSettingsSection";
@@ -42,6 +50,31 @@ function setup({
}),
]);
+ let state: State;
+ if (remoteSyncType) {
+ const tokenFeatures: Partial<TokenFeatures> = {
+ remote_sync: !!remoteSyncType,
+ };
+ const settings = mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures(tokenFeatures),
+ });
+ state = createMockState({
+ settings,
+ });
+
+ const enterprisePlugins: ENTERPRISE_PLUGIN_NAME[] = ["remote_sync"];
+ enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);
+ } else {
+ state = createMockState({
+ settings: mockSettings({
+ "remote-sync-type": remoteSyncType,
+ "remote-sync-enabled": !!remoteSyncType,
+ }),
+ });
+ }
+
renderWithProviders(
<Route
path={Urls.transform(transform.id)}
@@ -50,12 +83,7 @@ function setup({
{
withRouter: true,
initialRoute: Urls.transform(transform.id),
- storeInitialState: createMockState({
- settings: mockSettings({
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
- }),
- }),
+ storeInitialState: state,
},
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateIncrementalSettings.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateIncrementalSettings.tsx
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateIncrementalSettings.tsx
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateIncrementalSettings.tsx
index 68753a635af..f74c4c28d17 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateIncrementalSettings.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateIncrementalSettings.tsx
@@ -4,12 +4,12 @@ import _ from "underscore";
import { Form, FormInlineUpdater, FormProvider } from "metabase/forms";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import type { IncrementalSettingsFormValues } from "metabase-enterprise/transforms/components/IncrementalTransform";
+import type { IncrementalSettingsFormValues } from "metabase/transforms/components/IncrementalTransform";
import {
IncrementalTransformSettings,
useUpdateIncrementalSettings,
-} from "metabase-enterprise/transforms/components/IncrementalTransform";
-import { useQueryComplexityChecks } from "metabase-enterprise/transforms/components/QueryComplexityWarning";
+} from "metabase/transforms/components/IncrementalTransform";
+import { useQueryComplexityChecks } from "metabase/transforms/components/QueryComplexityWarning";
import type { Transform } from "metabase-types/api";
type UpdateIncrementalSettingsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
index 4d33c942c8b..f35c0560792 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
@@ -5,8 +5,10 @@ import * as Yup from "yup";
import { hasFeature } from "metabase/admin/databases/utils";
import {
skipToken,
+ useDeleteTransformTargetMutation,
useGetDatabaseQuery,
useListDatabaseSchemasQuery,
+ useUpdateTransformMutation,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import {
@@ -17,6 +19,8 @@ import {
FormTextInput,
} from "metabase/forms";
import * as Errors from "metabase/lib/errors";
+import { SchemaFormSelect } from "metabase/transforms/components/SchemaFormSelect";
+import { sourceDatabaseId } from "metabase/transforms/utils";
import {
Box,
Button,
@@ -26,12 +30,6 @@ import {
Radio,
Stack,
} from "metabase/ui";
-import {
- useDeleteTransformTargetMutation,
- useUpdateTransformMutation,
-} from "metabase-enterprise/api";
-import { SchemaFormSelect } from "metabase-enterprise/transforms/components/SchemaFormSelect";
-import { sourceDatabaseId } from "metabase-enterprise/transforms/utils";
import type { Transform, UpdateTransformRequest } from "metabase-types/api";
type UpdateTargetModalProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/index.ts b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/index.ts
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/index.ts b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/TransformSettingsSection/index.ts
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/index.ts b/frontend/src/metabase/transforms/pages/TransformSettingsPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSettingsPage/index.ts
rename to frontend/src/metabase/transforms/pages/TransformSettingsPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css b/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
rename to frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx b/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
rename to frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/index.ts b/frontend/src/metabase/transforms/pages/TransformTopNavLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/index.ts
rename to frontend/src/metabase/transforms/pages/TransformTopNavLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx b/frontend/src/metabase/transforms/routes.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx
rename to frontend/src/metabase/transforms/routes.tsx
diff --git a/frontend/src/metabase/transforms/selectors.ts b/frontend/src/metabase/transforms/selectors.ts
new file mode 100644
index 00000000000..a64d9d801b3
--- /dev/null
+++ b/frontend/src/metabase/transforms/selectors.ts
@@ -0,0 +1,40 @@
+import { createSelector } from "@reduxjs/toolkit";
+
+import { getPlan } from "metabase/common/utils/plan";
+import { getSetting } from "metabase/selectors/settings";
+import { getUser, getUserIsAdmin } from "metabase/selectors/user";
+import { getIsHosted, getTokenFeature } from "metabase/setup";
+import type { State } from "metabase-types/store";
+
+export const canAccessTransforms = (state: State): boolean => {
+ if (getUserIsAdmin(state)) {
+ return true;
+ }
+ const user = getUser(state);
+ return user?.permissions?.can_access_transforms ?? false;
+};
+
+export const getTransformsFeatureAvailable = createSelector(
+ (state: State) => getPlan(getSetting(state, "token-features")),
+ (state: State) => getTokenFeature(state, "transforms"),
+ (plan, feature) => {
+ if (plan === "oss") {
+ return true;
+ }
+
+ return feature;
+ },
+);
+
+export const getShouldShowTransformsUpsell = createSelector(
+ getIsHosted,
+ (state: State) => getTokenFeature(state, "transforms"),
+ (isHosted, hasTransformsFeature) => isHosted && !hasTransformsFeature,
+);
+
+export const getShouldShowPythonTransformsUpsell = createSelector(
+ getIsHosted,
+ (state: State) => getTokenFeature(state, "transforms-python"),
+ (isHosted, hasPythonTransformsFeature) =>
+ isHosted && !hasPythonTransformsFeature,
+);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts b/frontend/src/metabase/transforms/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
rename to frontend/src/metabase/transforms/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.unit.spec.ts b/frontend/src/metabase/transforms/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/utils.unit.spec.ts
rename to frontend/src/metabase/transforms/utils.unit.spec.ts
diff --git a/frontend/test/__support__/enterprise-typed.ts b/frontend/test/__support__/enterprise-typed.ts
index 50293f7ace6..98fb9a7e5ef 100644
--- a/frontend/test/__support__/enterprise-typed.ts
+++ b/frontend/test/__support__/enterprise-typed.ts
@@ -25,10 +25,10 @@ export const ENTERPRISE_PLUGIN_NAME_MAPPING = {
dependencies: "metabase-enterprise/dependencies",
feature_level_permissions: "metabase-enterprise/feature_level_permissions",
shared: "metabase-enterprise/shared",
+ transforms: "metabase-enterprise/transforms",
"transforms-python": "metabase-enterprise/transforms-python",
remote_sync: "metabase-enterprise/remote_sync",
public: "metabase-enterprise/public",
- transforms: "metabase-enterprise/transforms",
support: "metabase-enterprise/support",
upload_management: "metabase-enterprise/upload_management",
"public-sharing": "metabase-enterprise/public-sharing",
@@ -40,7 +40,7 @@ export const ENTERPRISE_PLUGIN_NAME_MAPPING = {
documents: "metabase-enterprise/documents",
semantic_search: "metabase-enterprise/semantic_search",
database_replication: "metabase-enterprise/database_replication",
- "data-studio": "metabase-enterprise/data-studio",
+ library: "metabase-enterprise/data-studio/library",
caching: "metabase-enterprise/caching",
group_managers: "metabase-enterprise/group_managers",
collections: "metabase-enterprise/collections",
@@ -52,6 +52,7 @@ export const ENTERPRISE_PLUGIN_NAME_MAPPING = {
content_verification: "metabase-enterprise/content_verification",
moderation: "metabase-enterprise/moderation",
tenants: "metabase-enterprise/tenants",
+ workspaces: "metabase-enterprise/data-studio/workspaces",
// Embedding SDK specific plugins
sdk_notifications: "embedding-sdk-ee/notifications",
diff --git a/frontend/test/__support__/server-mocks/data-studio.ts b/frontend/test/__support__/server-mocks/data-studio.ts
index f954cf03ae0..124a3155385 100644
--- a/frontend/test/__support__/server-mocks/data-studio.ts
+++ b/frontend/test/__support__/server-mocks/data-studio.ts
@@ -8,7 +8,7 @@ import {
export function setupTableSelectionInfoEndpoint(
response = createMockBulkTableSelectionInfo(),
) {
- fetchMock.post("path:/api/ee/data-studio/table/selection", response);
+ fetchMock.post("path:/api/data-studio/table/selection", response);
}
export function setupPublishTablesEndpoint(
diff --git a/frontend/test/__support__/server-mocks/table.ts b/frontend/test/__support__/server-mocks/table.ts
index 391a4f8393c..00a4512daca 100644
--- a/frontend/test/__support__/server-mocks/table.ts
+++ b/frontend/test/__support__/server-mocks/table.ts
@@ -80,17 +80,17 @@ export function setupTableSearchEndpoint(tables: Table[]) {
export function setupTablesBulkEndpoints() {
fetchMock.post(
- "path:/api/ee/data-studio/table/rescan-values",
+ "path:/api/data-studio/table/rescan-values",
{},
{ name: "tables-rescan-values" },
);
fetchMock.post(
- "path:/api/ee/data-studio/table/sync-schema",
+ "path:/api/data-studio/table/sync-schema",
{},
{ name: "tables-sync-schema" },
);
fetchMock.post(
- "path:/api/ee/data-studio/table/discard-values",
+ "path:/api/data-studio/table/discard-values",
{},
{ name: "tables-discard-values" },
);
diff --git a/frontend/test/__support__/server-mocks/transform.ts b/frontend/test/__support__/server-mocks/transform.ts
index cde9c825c13..98592b80f86 100644
--- a/frontend/test/__support__/server-mocks/transform.ts
+++ b/frontend/test/__support__/server-mocks/transform.ts
@@ -11,64 +11,64 @@ import type {
export function setupListTransformRunsEndpoint(
response: ListTransformRunsResponse,
) {
- fetchMock.get(`path:/api/ee/transform/run`, response);
+ fetchMock.get(`path:/api/transform/run`, response);
}
export function setupListTransformsEndpoint(transforms: Transform[]) {
- fetchMock.get(`path:/api/ee/transform`, transforms);
+ fetchMock.get(`path:/api/transform`, transforms);
}
export function setupListTransformTagsEndpoint(tags: TransformTag[]) {
- fetchMock.get(`path:/api/ee/transform-tag`, tags);
+ fetchMock.get(`path:/api/transform-tag`, tags);
}
export function setupCreateTransformTagEndpoint(tag: TransformTag) {
- fetchMock.post(`path:/api/ee/transform-tag`, tag);
+ fetchMock.post(`path:/api/transform-tag`, tag);
}
export function setupListTransformJobsEndpoint(jobs: TransformJob[]) {
- fetchMock.get(`path:/api/ee/transform-job`, jobs);
+ fetchMock.get(`path:/api/transform-job`, jobs);
}
export function setupListTransformJobTransformsEndpoint(
jobId: TransformJobId,
transforms: Transform[],
) {
- fetchMock.get(`path:/api/ee/transform-job/${jobId}/transforms`, transforms);
+ fetchMock.get(`path:/api/transform-job/${jobId}/transforms`, transforms);
}
export function setupListTransformJobTransformsEndpointWithError(
jobId: TransformJobId,
error?: unknown,
) {
- fetchMock.get(`path:/api/ee/transform-job/${jobId}/transforms`, {
+ fetchMock.get(`path:/api/transform-job/${jobId}/transforms`, {
status: 500,
body: error,
});
}
export function setupGetTransformJobEndpoint(job: TransformJob) {
- fetchMock.get(`path:/api/ee/transform-job/${job.id}`, job);
+ fetchMock.get(`path:/api/transform-job/${job.id}`, job);
}
export function setupCreateTransformJobEndpoint(job: TransformJob) {
- fetchMock.post("path:/api/ee/transform-job", job);
+ fetchMock.post("path:/api/transform-job", job);
}
export function setupUpdateTransformJobEndpoint(job: TransformJob) {
- fetchMock.put(`path:/api/ee/transform-job/${job.id}`, job);
+ fetchMock.put(`path:/api/transform-job/${job.id}`, job);
}
export function setupRunTransformJobEndpoint(jobId: TransformJobId) {
- fetchMock.post(`path:/api/ee/transform-job/${jobId}/run`, 200);
+ fetchMock.post(`path:/api/transform-job/${jobId}/run`, 200);
}
export function setupDeleteTransformJobEndpoint(jobId: TransformJobId) {
- fetchMock.delete(`path:/api/ee/transform-job/${jobId}`, 200);
+ fetchMock.delete(`path:/api/transform-job/${jobId}`, 200);
}
export function setupDeleteTransformJobEndpointWithError(
jobId: TransformJobId,
) {
- fetchMock.delete(`path:/api/ee/transform-job/${jobId}`, 500);
+ fetchMock.delete(`path:/api/transform-job/${jobId}`, 500);
}
diff --git a/mage/src/mage/modules.clj b/mage/src/mage/modules.clj
index 2854d6671f5..1b5f4a5f753 100644
--- a/mage/src/mage/modules.clj
+++ b/mage/src/mage/modules.clj
@@ -14,7 +14,7 @@
(def default-modules-which-trigger-drivers
"Modules that, when affected by changes, should trigger driver tests."
- ['driver 'enterprise/transforms])
+ ['driver 'transforms])
;;; TODO (Cam 2025-11-07) changes to test files should only cause us to run tests for that module as well, not
;;; everything that depends on that module directly or indirectly in `src`
diff --git a/mage/test/mage/modules_test.clj b/mage/test/mage/modules_test.clj
index aaeae12df9a..3235b6d4c81 100644
--- a/mage/test/mage/modules_test.clj
+++ b/mage/test/mage/modules_test.clj
@@ -217,12 +217,12 @@
mage.modules/cloud-drivers))))
;;; =============================================================================
-;;; Two roots trigger driver tests: driver and enterprise/transforms
+;;; Two roots trigger driver tests: driver and transforms
;;; =============================================================================
(deftest transforms-triggers-driver-tests
- (testing "enterprise/transforms triggers driver tests (it's a root)"
- (is (true? (mage.modules/driver-deps-affected? ['enterprise/transforms])))))
+ (testing "transforms triggers driver tests (it's a root)"
+ (is (true? (mage.modules/driver-deps-affected? ['transforms])))))
(deftest driver-triggers-driver-tests
(testing "driver triggers driver tests (it's a root)"
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj
index 71353e2a13b..42cfeb7b445 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj
@@ -3,7 +3,6 @@
[clojure.string :as str]
[java-time.api :as t]
[medley.core :as m]
- [metabase-enterprise.transforms.test-util :as transforms.test-util]
[metabase.driver :as driver]
[metabase.driver.bigquery-cloud-sdk :as bigquery]
[metabase.driver.ddl.interface :as ddl.i]
@@ -11,6 +10,7 @@
[metabase.test.data.impl :as data.impl]
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
+ [metabase.transforms.test-util :as transforms.test-util]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
[metabase.util.log :as log]
diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.clj
index a4741782927..e2c70ef9079 100644
--- a/src/metabase/api/common.clj
+++ b/src/metabase/api/common.clj
@@ -192,11 +192,16 @@
[]
(check-403 *is-superuser?*))
+(defn is-data-analyst?
+ "Returns a boolean representing whether the current user is a data analyst (or superuser)."
+ []
+ (or *is-superuser?* *is-data-analyst?*))
+
(defn check-data-analyst
"Check that `*current-user*` is a data analyst (or superuser) or throw a 403.
Superusers are automatically considered data analysts."
[]
- (check-403 (or *is-superuser?* *is-data-analyst?*)))
+ (check-403 (is-data-analyst?)))
;; checkp- functions: as in "check param". These functions expect that you pass a symbol so they can throw exceptions
;; w/ relevant error messages.
@@ -620,4 +625,5 @@
"pulse-card" {:db-model :model/PulseCard :alias :pulse-card}
"pulse-channel" {:db-model :model/PulseChannel :alias :pulse-channel}
"timeline" {:db-model :model/Timeline :alias :timeline}
+ "transform" {:db-model :model/Transform :alias :transform}
"user" {:db-model :model/User :alias :user}})
diff --git a/src/metabase/api_routes/routes.clj b/src/metabase/api_routes/routes.clj
index 3240b6d602c..bf497b73286 100644
--- a/src/metabase/api_routes/routes.clj
+++ b/src/metabase/api_routes/routes.clj
@@ -20,6 +20,7 @@
[metabase.comments.api]
[metabase.config.core :as config]
[metabase.dashboards-rest.api]
+ [metabase.data-studio.api]
[metabase.documents.api]
[metabase.eid-translation.api]
[metabase.embedding-rest.api]
@@ -53,6 +54,9 @@
[metabase.testing-api.core]
[metabase.tiles.api]
[metabase.timeline.api]
+ [metabase.transforms.api.transform]
+ [metabase.transforms.api.transform-job]
+ [metabase.transforms.api.transform-tag]
[metabase.upload.api]
[metabase.user-key-value.api]
[metabase.users-rest.api]
@@ -73,6 +77,7 @@
metabase.comments.api/keep-me
metabase.collections-rest.api/keep-me
metabase.dashboards-rest.api/keep-me
+ metabase.data-studio.api/keep-me
metabase.documents.api/keep-me
metabase.eid-translation.api/keep-me
metabase.geojson.api/keep-me
@@ -94,6 +99,9 @@
metabase.task-history.api/keep-me
metabase.testing-api.api/keep-me
metabase.tiles.api/keep-me
+ metabase.transforms.api.transform/keep-me
+ metabase.transforms.api.transform-job/keep-me
+ metabase.transforms.api.transform-tag/keep-me
metabase.upload.api/keep-me
metabase.user-key-value.api/keep-me
metabase.users-rest.api/keep-me
@@ -151,6 +159,7 @@
"/collection" (+auth 'metabase.collections-rest.api)
"/comment" (+auth metabase.comments.api/routes)
"/dashboard" (+auth 'metabase.dashboards-rest.api)
+ "/data-studio" (+auth metabase.data-studio.api/routes)
"/database" (+auth 'metabase.warehouses-rest.api)
"/dataset" (+auth 'metabase.query-processor.api)
"/docs" (metabase.api.docs/make-routes #'routes)
@@ -191,6 +200,9 @@
"/tiles" (+auth 'metabase.tiles.api)
"/timeline" (+auth metabase.timeline.api/timeline-routes)
"/timeline-event" (+auth metabase.timeline.api/timeline-event-routes)
+ "/transform" (+auth metabase.transforms.api.transform/routes)
+ "/transform-job" (+auth metabase.transforms.api.transform/transform-job-routes)
+ "/transform-tag" (+auth metabase.transforms.api.transform/transform-tag-routes)
"/upload" (+auth 'metabase.upload.api)
"/user" (+auth 'metabase.users-rest.api)
"/user-key-value" (+auth 'metabase.user-key-value.api)
diff --git a/src/metabase/collections_rest/api.clj b/src/metabase/collections_rest/api.clj
index d5f3f478d7a..d360ced688b 100644
--- a/src/metabase/collections_rest/api.clj
+++ b/src/metabase/collections_rest/api.clj
@@ -26,6 +26,8 @@
[metabase.queries.core :as queries]
[metabase.request.core :as request]
[metabase.revisions.core :as revisions]
+ [metabase.transforms.feature-gating :as transforms.gating]
+ [metabase.transforms.util :as transforms.util]
[metabase.upload.core :as upload]
[metabase.util :as u]
[metabase.util.honey-sql-2 :as h2x]
@@ -485,15 +487,17 @@
(defmethod collection-children-query :transform
[_model collection {:keys [pinned-state]}]
- {:select [:id :collection_id :name [(h2x/literal "transform") :model] :description :entity_id]
- :from [[:transform :transform]]
- :where [:and
- (poison-when-pinned-clause pinned-state)
- [:= :collection_id (:id collection)]
- (when-not (or api/*is-superuser?* api/*is-data-analyst?*)
- [:=
- [:inline 0]
- [:inline 1]])]})
+ (let [enabled-types (transforms.util/enabled-source-types-for-user)]
+ {:select [:id :collection_id :name [(h2x/literal "transform") :model] :description :entity_id]
+ :from [[:transform :transform]]
+ :where [:and
+ (poison-when-pinned-clause pinned-state)
+ [:= :collection_id (:id collection)]
+ (if (seq enabled-types)
+ [:in :source_type enabled-types]
+ [:=
+ [:inline 0]
+ [:inline 1]])]}))
(defmethod post-process-collection-children :timeline
[_ _options _collection rows]
@@ -825,11 +829,13 @@
#{})
collections-containing-transforms
- (if (premium-features/has-feature? :transforms)
+ (if (seq (transforms.gating/enabled-source-types))
(->> (when (seq descendant-collection-ids)
(t2/query {:select-distinct [:collection_id]
:from :transform
- :where [:in :collection_id descendant-collection-ids]}))
+ :where [:and
+ [:in :collection_id descendant-collection-ids]
+ [:in :source_type (transforms.gating/enabled-source-types)]]}))
(map :collection_id)
(into #{}))
#{})
diff --git a/src/metabase/core/init.clj b/src/metabase/core/init.clj
index e37d6a79995..87b588c5bb0 100644
--- a/src/metabase/core/init.clj
+++ b/src/metabase/core/init.clj
@@ -64,6 +64,7 @@
[metabase.task-history.init]
[metabase.testing-api.init]
[metabase.tiles.init]
+ [metabase.transforms.init]
[metabase.types.init]
[metabase.upload.init]
[metabase.user-key-value.init]
diff --git a/src/metabase/data_studio/api.clj b/src/metabase/data_studio/api.clj
new file mode 100644
index 00000000000..367ff651554
--- /dev/null
+++ b/src/metabase/data_studio/api.clj
@@ -0,0 +1,12 @@
+(ns metabase.data-studio.api
+ "`/api/data-studio/` routes"
+ (:require
+ [metabase.api.util.handlers :as handlers]
+ [metabase.data-studio.api.table]))
+
+(comment metabase.data-studio.api.table/keep-me)
+
+(def ^{:arglists '([request respond raise])} routes
+ "`/api/data-studio` routes."
+ (handlers/route-map-handler
+ {"/table" metabase.data-studio.api.table/routes}))
diff --git a/src/metabase/data_studio/api/table.clj b/src/metabase/data_studio/api/table.clj
new file mode 100644
index 00000000000..5db8af40a6d
--- /dev/null
+++ b/src/metabase/data_studio/api/table.clj
@@ -0,0 +1,280 @@
+(ns metabase.data-studio.api.table
+ "/api/data-studio/table endpoints for bulk table operations."
+ (:require
+ [clojure.set :as set]
+ [clojure.string :as str]
+ [metabase.api.common :as api]
+ [metabase.api.macros :as api.macros]
+ [metabase.api.routes.common :refer [+auth]]
+ [metabase.database-routing.core :as database-routing]
+ [metabase.driver.settings :as driver.settings]
+ [metabase.driver.util :as driver.u]
+ [metabase.events.core :as events]
+ [metabase.request.core :as request]
+ [metabase.sync.core :as sync]
+ [metabase.util :as u]
+ [metabase.util.jvm :as u.jvm]
+ [metabase.util.log :as log]
+ [metabase.util.malli :as mu]
+ [metabase.util.malli.registry :as mr]
+ [metabase.util.malli.schema :as ms]
+ [metabase.util.quick-task :as quick-task]
+ [metabase.warehouse-schema.models.table :as table]
+ [toucan2.core :as t2]))
+
+(set! *warn-on-reflection* true)
+
+(mr/def ::table-selectors
+ [:map
+ ;; disjunctive filters (e.g. db_id IN $database_ids OR id IN $table_ids)
+ [:database_ids {:optional true} [:sequential ms/PositiveInt]]
+ [:schema_ids {:optional true} [:sequential :string]]
+ [:table_ids {:optional true} [:sequential ms/PositiveInt]]])
+
+(mu/defn ^:private table-selectors->filter
+ [{:keys [database_ids table_ids schema_ids]}]
+ (let [schema-expr (fn [s]
+ (let [[schema-db-id schema-name] (str/split s #"\:")]
+ [:and [:= :db_id (parse-long schema-db-id)] [:= :schema schema-name]]))]
+ (cond-> [:or false]
+ (seq database_ids) (conj [:in :db_id (sort database_ids)])
+ (seq table_ids) (conj [:in :id (sort table_ids)])
+ (seq schema_ids) (conj (into [:or] (map schema-expr) (sort schema_ids))))))
+
+(mr/def ::data-layers
+ (into [:enum {:decode/string keyword}] table/data-layers))
+
+;;; ------------------------------------------------ Remapping Graph Traversal ------------------------------------------------
+
+(defn- remapped-table-ids
+ "Find tables connected via FK remapping (Dimensions).
+ `input-field` and `output-field` are field aliases (:source_field or :target_field).
+ Returns table IDs from `output-field` that are connected to `tables` via `input-field`.
+ `tables` can be a set of table IDs or a HoneySQL subquery map."
+ [input-field output-field tables]
+ (if (empty? tables)
+ #{}
+ (let [input-table-id (keyword (name input-field) "table_id")
+ output-table-id (keyword (name output-field) "table_id")]
+ (into #{} (map :table_id)
+ (t2/reducible-query {:select [[output-table-id :table_id]]
+ :from [[(t2/table-name :model/Dimension) :dim]]
+ :join [[(t2/table-name :model/Field) :source_field]
+ [:= :dim.field_id :source_field.id]
+ [(t2/table-name :model/Field) :target_field]
+ [:= :dim.human_readable_field_id :target_field.id]]
+ :where [:and
+ [:= :dim.type "external"]
+ [:in input-table-id tables]
+ [:not [:in output-table-id tables]]]})))))
+
+(defn- upstream-table-ids
+ "Given a table selector (set of IDs or subquery), find all tables that these tables depend on
+ via FK remapping (Dimensions)."
+ [source-tables]
+ (remapped-table-ids :source_field :target_field source-tables))
+
+(defn- downstream-table-ids
+ "Given a table selector (set of IDs or subquery), find all tables that depend on these tables
+ via FK remapping (Dimensions)."
+ [target-tables]
+ (remapped-table-ids :target_field :source_field target-tables))
+
+(defn- table-subquery
+ "Create a subquery that selects table IDs matching the given WHERE clause."
+ [where]
+ {:select [:id] :from [(t2/table-name :model/Table)] :where where})
+
+(defn- traverse-graph
+ "Recursively traverse the remapping graph starting from initial-ids.
+ Returns all reachable table IDs (including initial-ids)."
+ [neighbors-fn initial-ids]
+ (loop [visited initial-ids
+ frontier initial-ids]
+ (let [new-neighbors (set/difference (neighbors-fn frontier) visited)]
+ (if (empty? new-neighbors)
+ visited
+ (recur (set/union visited new-neighbors)
+ new-neighbors)))))
+
+(defn- all-upstream-table-ids
+ "Get all upstream table IDs recursively for tables matching the given WHERE clause.
+ The first hop uses a subquery to avoid materializing potentially millions of IDs;
+ subsequent hops use IDs since remappings are rare."
+ [source-table-where]
+ (let [initial-ids (upstream-table-ids (table-subquery source-table-where))]
+ (if (empty? initial-ids)
+ #{}
+ (traverse-graph upstream-table-ids initial-ids))))
+
+(defn- all-downstream-table-ids
+ "Get all downstream table IDs recursively for tables matching the given WHERE clause.
+ The first hop uses a subquery to avoid materializing potentially millions of IDs;
+ subsequent hops use IDs since remappings are rare."
+ [target-table-where]
+ (let [initial-ids (downstream-table-ids (table-subquery target-table-where))]
+ (if (empty? initial-ids)
+ #{}
+ (traverse-graph downstream-table-ids initial-ids))))
+
+(mr/def ::data-sources
+ (into [:enum {:decode/string keyword}] table/data-sources))
+
+(mr/def ::data-authorities
+ (into [:enum {:decode/string keyword}] table/writable-data-authority-types))
+
+;;; ------------------------------------------------ Response Schemas ------------------------------------------------
+
+(mr/def ::bulk-table-info
+ "Schema for table info in bulk operations. Matches frontend BulkTableInfo type."
+ [:map
+ [:id ms/PositiveInt]
+ [:db_id ms/PositiveInt]
+ [:name :string]
+ [:display_name :string]
+ [:schema [:maybe :string]]
+ [:is_published :boolean]])
+
+(mr/def ::bulk-table-selection-info
+ "Schema for /selection endpoint response. Matches frontend BulkTableSelectionInfo type."
+ [:map
+ [:selected_table [:maybe ::bulk-table-info]]
+ [:published_downstream_tables [:sequential ::bulk-table-info]]
+ [:unpublished_upstream_tables [:sequential ::bulk-table-info]]])
+
+(defn- sync-unhidden-tables
+ "Function to call on newly unhidden tables. Starts a thread to sync all tables. Groups tables by database to
+ efficiently sync tables from different databases."
+ [newly-unhidden]
+ (when (seq newly-unhidden)
+ (u.jvm/in-virtual-thread*
+ (fn []
+ (doseq [[db-id tables] (group-by :db_id newly-unhidden)]
+ (let [database (t2/select-one :model/Database db-id)]
+ ;; it's okay to allow testing H2 connections during sync. We only want to disallow you from testing them for the
+ ;; purposes of creating a new H2 database.
+ (if (binding [driver.settings/*allow-testing-h2-connections* true]
+ (driver.u/can-connect-with-details? (:engine database) (:details database)))
+ (doseq [table tables]
+ (log/info (u/format-color :green "Table '%s' is now visible. Resyncing." (:name table)))
+ (sync/sync-table! table))
+ (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync unhidden tables"
+ (:name database))))))))))
+
+(defn- maybe-sync-unhidden-tables!
+ [existing-tables {:keys [data_layer] :as body}]
+ ;; sync any tables that are changed from hidden to something else
+ (sync-unhidden-tables (when (and (contains? body :data_layer) (not= :hidden data_layer))
+ (filter #(= :hidden (:data_layer %)) existing-tables))))
+
+(api.macros/defendpoint :post "/edit" :- [:map {:closed true}]
+ "Bulk updating tables."
+ [_route-params
+ _query-params
+ body
+ :- [:merge
+ ::table-selectors
+ [:map {:closed true}
+ [:data_authority {:optional true} [:maybe ::data-authorities]]
+ [:data_source {:optional true} [:maybe ::data-sources]]
+ [:data_layer {:optional true} [:maybe ::data-layers]]
+ [:entity_type {:optional true} [:maybe :string]]
+ [:owner_email {:optional true} [:maybe :string]]
+ [:owner_user_id {:optional true} [:maybe :int]]]]]
+ (api/check-data-analyst)
+ (let [where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
+ set-ks [:data_authority
+ :data_source
+ :data_layer
+ :owner_email
+ :owner_user_id
+ :entity_type]
+ existing-tables (t2/select :model/Table {:where where})
+ table-ids (set (map :id existing-tables))
+ set-map (select-keys body set-ks)]
+ (when (seq set-map)
+ (t2/update! :model/Table [:in table-ids] set-map)
+ (maybe-sync-unhidden-tables! existing-tables set-map)
+ ;; Publish update events for remote sync tracking
+ (let [updated-tables (t2/select :model/Table :id [:in table-ids])]
+ (doseq [table updated-tables]
+ (events/publish-event! :event/table-update {:object table
+ :user-id api/*current-user-id*}))))
+ {}))
+
+(api.macros/defendpoint :post "/selection" :- ::bulk-table-selection-info
+ "Gets information about selected tables"
+ [_route-params
+ _query-params
+ body :- ::table-selectors]
+ (api/check-data-analyst)
+ (let [fields [:model/Table :id :db_id :name :display_name :schema :is_published]
+ where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
+ selected-tables (t2/select fields {:where where :limit 2})
+ selected-table (when-not (next selected-tables)
+ (first selected-tables))
+ upstream-ids (all-upstream-table-ids where)
+ downstream-ids (all-downstream-table-ids where)
+ upstream-tables (when (seq upstream-ids)
+ (t2/select fields :id [:in upstream-ids]))
+ downstream-tables (when (seq downstream-ids)
+ (t2/select fields :id [:in downstream-ids]))]
+ {:selected_table selected-table
+ :published_downstream_tables (filterv :is_published downstream-tables)
+ :unpublished_upstream_tables (filterv (complement :is_published) upstream-tables)}))
+
+(defn- sync-schema-async!
+ [table user-id]
+ (events/publish-event! :event/table-manual-sync {:object table :user-id user-id})
+ (quick-task/submit-task! #(database-routing/with-database-routing-off (sync/sync-table! table))))
+
+(api.macros/defendpoint :post "/sync-schema" :- :nil
+ "Batch version of /table/:id/sync_schema. Takes an abstract table selection as /table/edit does.
+ - Currently checks policy before returning (so you might receive a 4xx on e.g. AuthZ policy failure)
+ - The sync itself is however, asynchronous. This call may return before all tables synced."
+ [_
+ _
+ body :- ::table-selectors]
+ (api/check-data-analyst)
+ (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})
+ db-ids (sort (set (map :db_id tables)))]
+ (doseq [database (t2/select :model/Database :id [:in db-ids])]
+ (try
+ (binding [driver.settings/*allow-testing-h2-connections* true]
+ (driver.u/can-connect-with-details? (:engine database) (:details database) :throw-exceptions))
+ nil
+ (catch Throwable e
+ (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync tables" (:name database)))
+ (throw (ex-info (ex-message e) {:status-code 422})))))
+ (doseq [table tables]
+ (sync-schema-async! table api/*current-user-id*))))
+
+(api.macros/defendpoint :post "/rescan-values" :- :nil
+ "Batch version of /table/:id/rescan_values. Takes an abstract table selection as /table/edit does."
+ [_
+ _
+ body :- ::table-selectors]
+ (api/check-data-analyst)
+ (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})]
+ ;; same permission skip as the single-table api, see comment in /:id/rescan_values
+ (doseq [table tables]
+ (events/publish-event! :event/table-manual-scan {:object table :user-id api/*current-user-id*})
+ (request/as-admin
+ (quick-task/submit-task! #(sync/update-field-values-for-table! table))))))
+
+(api.macros/defendpoint :post "/discard-values" :- :nil
+ "Batch version of /table/:id/discard_values. Takes an abstract table selection as /table/edit does."
+ [_
+ _
+ body :- ::table-selectors]
+ (api/check-data-analyst)
+ (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})]
+ (let [field-ids-to-delete-q {:select [:id]
+ :from [(t2/table-name :model/Field)]
+ :where [:in :table_id (map :id tables)]}]
+ (t2/delete! (t2/table-name :model/FieldValues) :field_id [:in field-ids-to-delete-q]))
+ nil))
+
+(def ^{:arglists '([request respond raise])} routes
+ "`/api/data-studio/table` routes."
+ (api.macros/ns-handler *ns* +auth))
diff --git a/src/metabase/database_routing/core.clj b/src/metabase/database_routing/core.clj
index be7f21bf55c..6b0d9601279 100644
--- a/src/metabase/database_routing/core.clj
+++ b/src/metabase/database_routing/core.clj
@@ -41,3 +41,9 @@
metabase-enterprise.database-routing.model
[_db-id]
nil)
+
+(defenterprise db-routing-enabled?
+ "Returns whether or not the given database is either a router or destination database."
+ metabase-enterprise.database-routing.model
+ [_db-or-id]
+ false)
diff --git a/src/metabase/driver_api/core.clj b/src/metabase/driver_api/core.clj
index d16dd2ecf98..c51754fa646 100644
--- a/src/metabase/driver_api/core.clj
+++ b/src/metabase/driver_api/core.clj
@@ -56,7 +56,7 @@
[metabase.settings.core :as setting]
[metabase.sync.util :as sync-util]
[metabase.system.core :as system]
- [metabase.upload.core :as upload]
+ [metabase.upload.db :as upload.db]
[metabase.warehouse-schema.models.table :as table]
[potemkin :as p]))
@@ -177,7 +177,7 @@
setting/defsetting
sync-util/name-for-logging
system/site-uuid
- upload/current-database)
+ upload.db/current-database)
(defn ^:deprecated current-user
"Fetch the user making the request."
diff --git a/src/metabase/eid_translation/util.clj b/src/metabase/eid_translation/util.clj
index 5d9fe713f8e..8862dc1fdec 100644
--- a/src/metabase/eid_translation/util.clj
+++ b/src/metabase/eid_translation/util.clj
@@ -37,6 +37,7 @@
:segment :model/Segment
:snippet :model/NativeQuerySnippet
:timeline :model/Timeline
+ :transform :model/Transform
:user :model/User})
(defn- ->model
diff --git a/src/metabase/models/resolution.clj b/src/metabase/models/resolution.clj
index 170de0c8a25..d5e92c1d903 100644
--- a/src/metabase/models/resolution.clj
+++ b/src/metabase/models/resolution.clj
@@ -101,14 +101,14 @@
:model/Tenant metabase-enterprise.tenants.model
:model/Timeline metabase.timeline.models.timeline
:model/TimelineEvent metabase.timeline.models.timeline-event
- :model/Transform metabase-enterprise.transforms.models.transform
- :model/TransformJob metabase-enterprise.transforms.models.transform-job
- :model/TransformJobRun metabase-enterprise.transforms.models.job-run
- :model/TransformJobTransformTag metabase-enterprise.transforms.models.transform-job-transform-tag
- :model/TransformRun metabase-enterprise.transforms.models.transform-run
- :model/TransformRunCancelation metabase-enterprise.transforms.models.transform-run-cancelation
- :model/TransformTag metabase-enterprise.transforms.models.transform-tag
- :model/TransformTransformTag metabase-enterprise.transforms.models.transform-transform-tag
+ :model/Transform metabase.models.transforms.transform
+ :model/TransformJob metabase.models.transforms.transform-job
+ :model/TransformJobRun metabase.models.transforms.job-run
+ :model/TransformJobTransformTag metabase.models.transforms.transform-job-transform-tag
+ :model/TransformRun metabase.models.transforms.transform-run
+ :model/TransformRunCancelation metabase.models.transforms.transform-run-cancelation
+ :model/TransformTag metabase.models.transforms.transform-tag
+ :model/TransformTransformTag metabase.models.transforms.transform-transform-tag
:model/Undo metabase-enterprise.action-v2.models.undo
:model/User metabase.users.models.user
:model/UserKeyValue metabase.user-key-value.models.user-key-value
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/job_run.clj b/src/metabase/models/transforms/job_run.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/job_run.clj
rename to src/metabase/models/transforms/job_run.clj
index 777fc81e6f6..507f6062a42 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/job_run.clj
+++ b/src/metabase/models/transforms/job_run.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.models.job-run
+(ns metabase.models.transforms.job-run
(:require
[metabase.app-db.core :as mdb]
[metabase.models.interface :as mi]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj b/src/metabase/models/transforms/transform.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj
rename to src/metabase/models/transforms/transform.clj
index a67a5d948c6..531470506eb 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj
+++ b/src/metabase/models/transforms/transform.clj
@@ -1,10 +1,7 @@
-(ns metabase-enterprise.transforms.models.transform
+(ns metabase.models.transforms.transform
(:require
[clojure.set :as set]
[medley.core :as m]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.api.common :as api]
[metabase.collections.models.collection :as collection]
[metabase.events.core :as events]
@@ -12,10 +9,14 @@
[metabase.lib.core :as lib]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
+ [metabase.models.transforms.transform-run :as transform-run]
+ [metabase.permissions.core :as perms]
[metabase.remote-sync.core :as remote-sync]
[metabase.search.core :as search.core]
[metabase.search.ingestion :as search]
[metabase.search.spec :as search.spec]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.log :as log]
[methodical.core :as methodical]
@@ -31,9 +32,9 @@
(defmethod mi/can-read? :model/Transform
([instance]
- (or api/*is-superuser?*
- (and api/*is-data-analyst?*
- (transforms.util/source-tables-readable? instance))))
+ (and (api/is-data-analyst?)
+ (transforms.util/source-tables-readable? instance)
+ (transforms.util/check-feature-enabled instance)))
([_model pk]
(when-let [transform (t2/select-one :model/Transform :id pk)]
(mi/can-read? transform))))
@@ -41,7 +42,7 @@
(defmethod mi/can-write? :model/Transform
([instance]
(and (mi/can-read? instance)
- (transforms.util/has-db-transforms-permission? api/*current-user-id* (:source_database_id instance))
+ (perms/has-db-transforms-permission? api/*current-user-id* (:source_database_id instance))
(remote-sync/transforms-editable?)))
([_model pk]
(when-let [transform (t2/select-one :model/Transform :id pk)]
@@ -63,7 +64,7 @@
(and (or api/*is-superuser?*
(and api/*is-data-analyst?*
(transforms.util/source-tables-readable? instance)))
- (transforms.util/has-db-transforms-permission? api/*current-user-id* source-db-id)
+ (perms/has-db-transforms-permission? api/*current-user-id* source-db-id)
(remote-sync/transforms-editable?))))
(defn- keywordize-source-table-refs
@@ -394,7 +395,8 @@
:view-count false
:native-query {:fn maybe-extract-transform-query-text
:fields [:source :source_type]}
- :database-id :source_database_id}
+ :database-id :source_database_id
+ :source-type true}
:search-terms [:name :description]
:render-terms {:transform-name :name
:transform-id :id}})
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_job.clj b/src/metabase/models/transforms/transform_job.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform_job.clj
rename to src/metabase/models/transforms/transform_job.clj
index 883afe6e56c..44c1ea06ae6 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_job.clj
+++ b/src/metabase/models/transforms/transform_job.clj
@@ -1,12 +1,12 @@
-(ns metabase-enterprise.transforms.models.transform-job
+(ns metabase.models.transforms.transform-job
(:require
[clojure.set :as set]
[medley.core :as m]
- [metabase-enterprise.transforms.models.job-run :as transforms.job-run]
- [metabase-enterprise.transforms.models.transform :as transform]
[metabase.api.common :as api]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
+ [metabase.models.transforms.job-run :as transforms.job-run]
+ [metabase.models.transforms.transform :as transform]
[metabase.util :as u]
[metabase.util.i18n :as i18n]
[methodical.core :as methodical]
@@ -24,9 +24,9 @@
(defmethod mi/can-read? :model/TransformJob
([_instance]
- (or api/*is-superuser?* api/*is-data-analyst?*))
+ (api/is-data-analyst?))
([_model _pk]
- (or api/*is-superuser?* api/*is-data-analyst?*)))
+ (api/is-data-analyst?)))
(defmethod mi/can-write? :model/TransformJob
([instance]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_job_transform_tag.clj b/src/metabase/models/transforms/transform_job_transform_tag.clj
similarity index 90%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform_job_transform_tag.clj
rename to src/metabase/models/transforms/transform_job_transform_tag.clj
index 25a9784ee91..f4f901b7cc5 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_job_transform_tag.clj
+++ b/src/metabase/models/transforms/transform_job_transform_tag.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.models.transform-job-transform-tag
+(ns metabase.models.transforms.transform-job-transform-tag
(:require
[metabase.models.serialization :as serdes]
[methodical.core :as methodical]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj b/src/metabase/models/transforms/transform_run.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj
rename to src/metabase/models/transforms/transform_run.clj
index f2e29912f57..d4ba5c03ef5 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj
+++ b/src/metabase/models/transforms/transform_run.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.transforms.models.transform-run
+(ns metabase.models.transforms.transform-run
(:require
[medley.core :as m]
- [metabase-enterprise.transforms.models.transform-run-cancelation :as cancel]
[metabase.app-db.core :as mdb]
[metabase.collections.models.collection.root :as collection.root]
[metabase.events.core :as events]
[metabase.models.interface :as mi]
+ [metabase.models.transforms.transform-run-cancelation :as cancel]
[metabase.query-processor.parameters.dates :as params.dates]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run_cancelation.clj b/src/metabase/models/transforms/transform_run_cancelation.clj
similarity index 95%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform_run_cancelation.clj
rename to src/metabase/models/transforms/transform_run_cancelation.clj
index ea825cec870..815e5224741 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run_cancelation.clj
+++ b/src/metabase/models/transforms/transform_run_cancelation.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.models.transform-run-cancelation
+(ns metabase.models.transforms.transform-run-cancelation
(:require
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_tag.clj b/src/metabase/models/transforms/transform_tag.clj
similarity index 94%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform_tag.clj
rename to src/metabase/models/transforms/transform_tag.clj
index 6683be40c95..c2602b92e58 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_tag.clj
+++ b/src/metabase/models/transforms/transform_tag.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.transforms.models.transform-tag
+(ns metabase.models.transforms.transform-tag
(:require
- [metabase-enterprise.transforms.models.transform :as transform]
[metabase.api.common :as api]
[metabase.events.core :as events]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
+ [metabase.models.transforms.transform :as transform]
[metabase.util.i18n :as i18n]
[methodical.core :as methodical]
[toucan2.core :as t2]))
@@ -18,9 +18,9 @@
(defmethod mi/can-read? :model/TransformTag
([_instance]
- (or api/*is-superuser?* api/*is-data-analyst?*))
+ (api/is-data-analyst?))
([_model _pk]
- (or api/*is-superuser?* api/*is-data-analyst?*)))
+ (api/is-data-analyst?)))
(defmethod mi/can-write? :model/TransformTag
([instance]
@@ -34,7 +34,7 @@
(defmethod mi/can-create? :model/TransformTag
[_model _instance]
- (or api/*is-superuser?* api/*is-data-analyst?*))
+ (api/is-data-analyst?))
(defn tag-name-exists?
"Check if a tag with the given name already exists"
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_transform_tag.clj b/src/metabase/models/transforms/transform_transform_tag.clj
similarity index 91%
rename from enterprise/backend/src/metabase_enterprise/transforms/models/transform_transform_tag.clj
rename to src/metabase/models/transforms/transform_transform_tag.clj
index 0793d08265d..b9ecfc383e8 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_transform_tag.clj
+++ b/src/metabase/models/transforms/transform_transform_tag.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.models.transform-transform-tag
+(ns metabase.models.transforms.transform-transform-tag
(:require
[metabase.models.serialization :as serdes]
[methodical.core :as methodical]
diff --git a/src/metabase/permissions/core.clj b/src/metabase/permissions/core.clj
index aff82462b51..419bb240c96 100644
--- a/src/metabase/permissions/core.clj
+++ b/src/metabase/permissions/core.clj
@@ -64,7 +64,9 @@
user-has-permission-for-schema?
user-has-permission-for-table?
with-additional-table-permission
- with-relevant-permissions-for-user]
+ with-relevant-permissions-for-user
+ has-any-transforms-permission?
+ has-db-transforms-permission?]
[metabase.permissions.models.data-permissions.sql
UserInfo
PermissionMapping
@@ -108,9 +110,7 @@
collection-path?]
[metabase.permissions.user
user-permissions-set
- user->tenant-collection-and-descendant-ids
- has-any-transforms-permission?
- has-db-transforms-permission?]
+ user->tenant-collection-and-descendant-ids]
[metabase.permissions.util
PathSchema
check-revision-numbers
diff --git a/src/metabase/permissions/models/data_permissions.clj b/src/metabase/permissions/models/data_permissions.clj
index e92b05d5116..2bae71eacdd 100644
--- a/src/metabase/permissions/models/data_permissions.clj
+++ b/src/metabase/permissions/models/data_permissions.clj
@@ -5,6 +5,7 @@
[medley.core :as m]
[metabase.api.common :as api]
[metabase.app-db.cluster-lock :as cluster-lock]
+ [metabase.audit-app.core :as audit]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.models.interface :as mi]
[metabase.permissions.published-tables :as published-tables]
@@ -1069,3 +1070,17 @@
metabase-enterprise.advanced-permissions.models.permissions.data-permissions
[_query _user-id]
:full)
+
+(defn has-db-transforms-permission?
+ "Returns true if the given user has the transforms permission for the given source db."
+ [user-id database-id]
+ (and (not= database-id audit/audit-db-id)
+ (user-has-permission-for-database? user-id
+ :perms/transforms
+ :yes
+ database-id)))
+
+(defn has-any-transforms-permission?
+ "Returns true if the current user has the transforms permission for _any_ source db."
+ [user-id]
+ (user-has-any-perms-of-type? user-id :perms/transforms))
diff --git a/src/metabase/permissions/user.clj b/src/metabase/permissions/user.clj
index 323127eab93..e1117a396a7 100644
--- a/src/metabase/permissions/user.clj
+++ b/src/metabase/permissions/user.clj
@@ -7,23 +7,11 @@
[metabase.util :as u]))
(defenterprise user->tenant-collection-and-descendant-ids
- "OSS version of user->tenant-collection-and-descendant-ids. Returns an empty vector since tenants are an EE feature."
+ "Returns descendant IDs for the user's tenant collection. Returns an empty vector in OSS since tenants are an EE feature."
metabase-enterprise.tenants.model
[_user-or-id]
[])
-(defenterprise has-any-transforms-permission?
- "OSS version of has-any-transforms-permission? Returns false since transforms are an EE feature."
- metabase-enterprise.transforms.util
- [_user-id]
- false)
-
-(defenterprise has-db-transforms-permission?
- "OSS version of has-db-transforms-permission? Returns false since transforms are an EE feature."
- metabase-enterprise.transforms.util
- [_user-id _database-id]
- false)
-
(defn user-permissions-set
"Return a set of all permissions object paths that `user-or-id` has been granted access to. (2 DB Calls)"
[user-or-id]
diff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.clj
index a4e4230348b..1f154d3c999 100644
--- a/src/metabase/premium_features/token_check.clj
+++ b/src/metabase/premium_features/token_check.clj
@@ -127,7 +127,7 @@
(defenterprise transform-stats
"Stats for Transforms"
- metabase-enterprise.transforms.core
+ metabase.transforms.core
[]
{:transform-native-runs 0
:transform-python-runs 0
diff --git a/src/metabase/remote_sync/events.clj b/src/metabase/remote_sync/events.clj
index 98f0ecd9b0c..bc6a60c9126 100644
--- a/src/metabase/remote_sync/events.clj
+++ b/src/metabase/remote_sync/events.clj
@@ -25,3 +25,19 @@
;; Snippet events are derived in the the ...models.native-query-snippet interface
;; with some indirection
+
+;; Transform Tag events
+(derive ::transform-tag-event :metabase/event)
+(derive :event/transform-tag-create ::transform-tag-event)
+(derive :event/transform-tag-update ::transform-tag-event)
+(derive :event/transform-tag-delete ::transform-tag-event)
+
+;; Transform Run events
+(derive ::transform-run-event :metabase/event)
+(derive :event/transform-run-complete ::transform-run-event)
+
+;; Transform events
+(derive ::transform-event :metabase/event)
+(derive :event/create-transform ::transform-event)
+(derive :event/update-transform ::transform-event)
+(derive :event/delete-transform ::transform-event)
diff --git a/src/metabase/search/appdb/core.clj b/src/metabase/search/appdb/core.clj
index 30aa8e278ef..7fdf12e9e91 100644
--- a/src/metabase/search/appdb/core.clj
+++ b/src/metabase/search/appdb/core.clj
@@ -160,6 +160,10 @@
query (->> (search.index/search-query search-string search-ctx [:legacy_input])
(add-collection-join-and-where-clauses search-ctx)
(add-table-where-clauses search-ctx)
+ (#(sql.helpers/where % (search.filter/transform-source-type-where-clause
+ search-ctx
+ :search_index.model
+ :search_index.source_type)))
(search.scoring/with-scores search-ctx scorers)
(search.filter/with-filters search-ctx))]
(->> (t2/query query)
@@ -181,6 +185,10 @@
search-ctx (assoc search-ctx :models applicable-models)]
(->> (search.index/search-query (:search-string search-ctx) search-ctx [[[:distinct :model] :model]])
(add-collection-join-and-where-clauses search-ctx)
+ (#(sql.helpers/where % (search.filter/transform-source-type-where-clause
+ search-ctx
+ :search_index.model
+ :search_index.source_type)))
(search.filter/with-filters search-ctx)
t2/query
(into #{} (map :model)))))
diff --git a/src/metabase/search/config.clj b/src/metabase/search/config.clj
index 9ee4192621c..4d48608af23 100644
--- a/src/metabase/search/config.clj
+++ b/src/metabase/search/config.clj
@@ -1,7 +1,6 @@
(ns metabase.search.config
(:require
[metabase.api.common :as api]
- [metabase.config.core :as config]
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.permissions.core :as perms]
@@ -42,8 +41,7 @@
(def model->db-model
"Mapping of model name to :db_model and :alias"
- (cond-> api/model->db-model
- config/ee-available? (assoc "transform" {:db-model :model/Transform :alias :transform})))
+ api/model->db-model)
;; We won't need this once fully migrated to specs, but kept for now in case legacy cod falls out of sync
(def excluded-models
@@ -73,9 +71,7 @@
(def models-search-order
"The order of this list influences the order of the results: items earlier in the
list will be ranked higher."
- (cond-> ["dashboard" "metric" "segment" "measure" "indexed-entity" "card" "dataset" "collection" "table" "action" "document"]
- config/ee-available? (concat ["transform"])
- :always (conj "database")))
+ ["dashboard" "metric" "segment" "measure" "indexed-entity" "card" "dataset" "collection" "table" "action" "document" "transform" "database"])
(assert (= all-models (set models-search-order)) "The models search order has to include all models")
@@ -274,7 +270,8 @@
[:include-dashboard-questions? {:optional true} :boolean]
[:include-metadata? {:optional true} :boolean]
[:non-temporal-dim-ids {:optional true} ms/NonBlankString]
- [:has-temporal-dim {:optional true} :boolean]])
+ [:has-temporal-dim {:optional true} :boolean]
+ [:enabled-transform-source-types [:set ms/NonBlankString]]])
(defmulti column->string
"Turn a complex column into a string"
diff --git a/src/metabase/search/filter.clj b/src/metabase/search/filter.clj
index 9ea03b6f51f..17a68fe6a92 100644
--- a/src/metabase/search/filter.clj
+++ b/src/metabase/search/filter.clj
@@ -141,6 +141,19 @@
;; nor within one of their sub-collections
~@(for [p child-patterns] [:not-like :collection.location p])]]))))
+(defn transform-source-type-where-clause
+ "Build a clause that limits transforms to enabled source types.
+ When a `model-col` is provided, non-transform models always pass through."
+ ([search-context source-type-col]
+ (let [enabled-types (:enabled-transform-source-types search-context)]
+ (if (seq enabled-types)
+ [:in source-type-col enabled-types]
+ [:= [:inline 0] [:inline 1]])))
+ ([search-context model-col source-type-col]
+ [:or
+ [:!= model-col [:inline "transform"]]
+ (transform-source-type-where-clause search-context source-type-col)]))
+
(defn with-filters
"Return a HoneySQL clause corresponding to all the optional search filters."
[search-context qry]
diff --git a/src/metabase/search/impl.clj b/src/metabase/search/impl.clj
index 926df26a7d7..a1bb0f08005 100644
--- a/src/metabase/search/impl.clj
+++ b/src/metabase/search/impl.clj
@@ -11,6 +11,7 @@
[metabase.search.filter :as search.filter]
[metabase.search.in-place.filter :as search.in-place.filter]
[metabase.search.in-place.scoring :as scoring]
+ [metabase.transforms.feature-gating :as transforms.gating]
[metabase.util :as u]
[metabase.util.i18n :refer [deferred-tru tru]]
[metabase.util.json :as json]
@@ -59,14 +60,6 @@
(can-write? search-ctx instance)
true))
-(defmethod check-permissions-for-model :transform
- [search-ctx instance]
- (and (:is-superuser? search-ctx)
- (premium-features/enable-transforms?)
- (if (:archived? search-ctx)
- (can-write? search-ctx instance)
- true)))
-
;; TODO: remove this implementation now that we check permissions in the SQL, leaving it in for now to guard against
;; issue with new pure sql implementation
(defmethod check-permissions-for-model :table
@@ -326,6 +319,7 @@
:calculate-available-models? (boolean calculate-available-models?)
:current-user-id current-user-id
:current-user-perms current-user-perms
+ :enabled-transform-source-types (transforms.gating/enabled-source-types)
:filter-items-in-personal-collection (or filter-items-in-personal-collection
(fvalue :filter-items-in-personal-collection))
:is-impersonated-user? is-impersonated-user?
diff --git a/src/metabase/search/in_place/filter.clj b/src/metabase/search/in_place/filter.clj
index 7ea136f0559..6b835a40e2e 100644
--- a/src/metabase/search/in_place/filter.clj
+++ b/src/metabase/search/in_place/filter.clj
@@ -18,6 +18,7 @@
[metabase.premium-features.core :as premium-features]
[metabase.query-processor.parameters.dates :as params.dates]
[metabase.search.config :as search.config :refer [SearchableModel SearchContext]]
+ [metabase.search.filter :as search.filter]
[metabase.search.in-place.util :as search.util]
[metabase.search.permissions :as search.permissions]
[metabase.util.date-2 :as u.date]
@@ -349,9 +350,11 @@
has-temporal-dim
display-type
is-superuser?]} search-context
+ enabled-types (:enabled-transform-source-types search-context)
feature->supported-models (feature->supported-models)]
(cond-> models
(not is-superuser?) (disj "transform")
+ (empty? enabled-types) (disj "transform")
(some? collection) (set/intersection (:collection feature->supported-models))
(some? created-at) (set/intersection (:created-at feature->supported-models))
(some? created-by) (set/intersection (:created-by feature->supported-models))
@@ -383,6 +386,11 @@
has-temporal-dim
display-type]} search-context]
(cond-> honeysql-query
+ (= model "transform")
+ (sql.helpers/where (search.filter/transform-source-type-where-clause
+ search-context
+ (search.config/column-with-model-alias "transform" :source_type)))
+
(not (str/blank? search-string))
(sql.helpers/where (search-string-clause-for-model model search-context search-native-query))
diff --git a/src/metabase/search/spec.clj b/src/metabase/search/spec.clj
index 73df12de8ab..c493c41ee67 100644
--- a/src/metabase/search/spec.clj
+++ b/src/metabase/search/spec.clj
@@ -16,8 +16,7 @@
(def search-models
"Set of search model string names. Sorted by order to index based on importance and amount of time to index"
- (cond-> ["collection" "dashboard" "segment" "measure" "database" "action" "document"]
- config/ee-available? (conj "transform")
+ (cond-> ["collection" "dashboard" "segment" "measure" "database" "action" "document" "transform"]
;; metric/card/dataset moved to the end because they take a long time due to computing has_temporal_dim etc.
;; table and indexed-entity moved to the end because there can be a large number of them
true (conj "table" "indexed-entity" "metric" "card" "dataset")))
@@ -86,7 +85,8 @@
:non-temporal-dim-ids :text
:has-temporal-dim :boolean
:display-type :text
- :is-published :boolean})
+ :is-published :boolean
+ :source-type :text})
(def ^:private explicit-attrs
"These attributes must be explicitly defined, omitting them could be a source of bugs."
@@ -110,7 +110,8 @@
:updated-at
:non-temporal-dim-ids
:has-temporal-dim
- :is-published])
+ :is-published
+ :source-type])
distinct
vec))
diff --git a/src/metabase/sync/sync_metadata/tables.clj b/src/metabase/sync/sync_metadata/tables.clj
index 8e58832231b..813a75afaf0 100644
--- a/src/metabase/sync/sync_metadata/tables.clj
+++ b/src/metabase/sync/sync_metadata/tables.clj
@@ -11,7 +11,6 @@
[metabase.lib.schema.common :as lib.schema.common]
[metabase.models.humanization :as humanization]
[metabase.models.interface :as mi]
- [metabase.premium-features.core :refer [defenterprise]]
[metabase.sync.fetch-metadata :as fetch-metadata]
[metabase.sync.interface :as i]
[metabase.sync.sync-metadata.crufty :as crufty]
@@ -82,12 +81,6 @@
;; MSSQL
#"^syncobj_0x.*"})
-(defenterprise is-temp-transform-table?
- "Return true if `table` references a temporary transform table created during transforms execution."
- metabase-enterprise.transforms.util
- [_table]
- false)
-
;;; ---------------------------------------------------- Syncing -----------------------------------------------------
(mu/defn- update-database-metadata!
@@ -257,7 +250,7 @@
(into #{}
(remove (fn [table]
(or (metabase-metadata/is-metabase-metadata-table? table)
- (is-temp-transform-table? table))))
+ (sync-util/is-temp-transform-table? table))))
(:tables db-metadata)))
(mu/defn- select-tables :- [:set (ms/InstanceOf :model/Table)]
diff --git a/src/metabase/sync/util.clj b/src/metabase/sync/util.clj
index f8f3169716a..df67b7dfe51 100644
--- a/src/metabase/sync/util.clj
+++ b/src/metabase/sync/util.clj
@@ -10,6 +10,7 @@
[metabase.driver.util :as driver.u]
[metabase.events.core :as events]
[metabase.models.interface :as mi]
+ [metabase.premium-features.core :as premium-features]
[metabase.query-processor.interface :as qp.i]
[metabase.sync.interface :as i]
[metabase.task-history.core :as task-history]
@@ -28,6 +29,23 @@
(set! *warn-on-reflection* true)
+(def ^:private transform-temp-table-prefix
+ "Prefix used for temporary tables created during transforms."
+ "mb_transform_temp_table")
+
+(defn- transforms-enabled?
+ "Whether any transforms are enabled."
+ []
+ (or (not (premium-features/is-hosted?))
+ (premium-features/has-feature? :transforms)))
+
+(defn is-temp-transform-table?
+ "Return true when `table` matches the transform temporary table naming pattern and transforms are enabled."
+ [table]
+ (boolean
+ (when (and (transforms-enabled?) (:name table))
+ (str/starts-with? (u/lower-case-en (:name table)) transform-temp-table-prefix))))
+
(derive ::event :metabase/event)
(def ^:private sync-event-topics
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/api.clj b/src/metabase/transforms/api/transform.clj
similarity index 92%
rename from enterprise/backend/src/metabase_enterprise/transforms/api.clj
rename to src/metabase/transforms/api/transform.clj
index e411fbfbb7c..52e654b007d 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/api.clj
+++ b/src/metabase/transforms/api/transform.clj
@@ -1,29 +1,30 @@
-(ns metabase-enterprise.transforms.api
+(ns metabase.transforms.api.transform
(:require
- [metabase-enterprise.transforms.api.transform-job]
- [metabase-enterprise.transforms.api.transform-tag]
- [metabase-enterprise.transforms.canceling :as transforms.canceling]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.models.transform :as transform.model]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.models.transform-run-cancelation :as transform-run-cancelation]
- [metabase-enterprise.transforms.ordering :as transforms.ordering]
- [metabase-enterprise.transforms.schema :as transforms.schema]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
[metabase.api.util.handlers :as handlers]
+ [metabase.database-routing.core :as database-routing]
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.util :as driver.u]
[metabase.events.core :as events]
[metabase.lib.core :as lib]
[metabase.models.interface :as mi]
+ [metabase.models.transforms.transform :as transform.model]
+ [metabase.models.transforms.transform-run :as transform-run]
+ [metabase.models.transforms.transform-run-cancelation :as transform-run-cancelation]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.schema :as qp.schema]
[metabase.request.core :as request]
+ [metabase.transforms.api.transform-job]
+ [metabase.transforms.api.transform-tag]
+ [metabase.transforms.canceling :as transforms.canceling]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.ordering :as transforms.ordering]
+ [metabase.transforms.schema :as transforms.schema]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.i18n :refer [deferred-tru]]
[metabase.util.jvm :as u.jvm]
@@ -38,8 +39,8 @@
^{:clj-kondo/ignore [:metabase/no-jsqlparser-imports]}
(net.sf.jsqlparser.statement.select PlainSelect)))
-(comment metabase-enterprise.transforms.api.transform-job/keep-me
- metabase-enterprise.transforms.api.transform-tag/keep-me)
+(comment metabase.transforms.api.transform-job/keep-me
+ metabase.transforms.api.transform-tag/keep-me)
(set! *warn-on-reflection* true)
@@ -50,10 +51,6 @@
(mr/def ::run-trigger
[:enum "none" "global-schedule"])
-(defn- check-is-data-analyst
- []
- (api/check-403 (or api/*is-superuser?* api/*is-data-analyst?*)))
-
(defn- python-source-table-ref->table-id
"Change source of python transform from name->table-ref to name->table-id.
@@ -90,7 +87,7 @@
(deferred-tru "Cannot run transforms on audit databases."))
(api/check-400 (every? (fn [feature] (driver.u/supports? (:engine database) feature database)) features)
(deferred-tru "The database does not support the requested transform features."))
- (api/check-400 (not (transforms.util/db-routing-enabled? database))
+ (api/check-400 (not (database-routing/db-routing-enabled? database))
(deferred-tru "Transforms are not supported on databases with DB routing enabled."))))
(defn- check-feature-enabled!
@@ -101,16 +98,18 @@
(defn get-transforms
"Get a list of transforms."
[& {:keys [last_run_start_time last_run_statuses tag_ids]}]
- (check-is-data-analyst)
- (let [transforms (t2/select :model/Transform {:order-by [[:id :asc]]})]
- (->> (t2/hydrate transforms :last_run :transform_tag_ids :creator :owner)
- (into []
- (comp (transforms.util/->date-field-filter-xf [:last_run :start_time] last_run_start_time)
- (transforms.util/->status-filter-xf [:last_run :status] last_run_statuses)
- (transforms.util/->tag-filter-xf [:tag_ids] tag_ids)
- (map #(update % :last_run transforms.util/localize-run-timestamps))
- (map python-source-table-ref->table-id)))
- transforms.util/add-source-readable)))
+ (let [enabled-types (transforms.util/enabled-source-types-for-user)]
+ (api/check-403 (seq enabled-types))
+ (let [transforms (t2/select :model/Transform {:where [:in :source_type enabled-types]
+ :order-by [[:id :asc]]})]
+ (->> (t2/hydrate transforms :last_run :transform_tag_ids :creator :owner)
+ (into []
+ (comp (transforms.util/->date-field-filter-xf [:last_run :start_time] last_run_start_time)
+ (transforms.util/->status-filter-xf [:last_run :status] last_run_statuses)
+ (transforms.util/->tag-filter-xf [:tag_ids] tag_ids)
+ (map #(update % :last_run transforms.util/localize-run-timestamps))
+ (map python-source-table-ref->table-id)))
+ transforms.util/add-source-readable))))
;; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest
;; of the REST API
@@ -352,7 +351,7 @@
[:start_time {:optional true} [:maybe ms/NonBlankString]]
[:end_time {:optional true} [:maybe ms/NonBlankString]]
[:run_methods {:optional true} [:maybe (ms/QueryVectorOf [:enum "manual" "cron"])]]]]
- (check-is-data-analyst)
+ (api/check-data-analyst)
(-> (transform-run/paged-runs (assoc query-params
:offset (request/offset)
:limit (request/limit)))
@@ -560,14 +559,14 @@
{:columns columns}))
(def ^{:arglists '([request respond raise])} routes
- "`/api/ee/transform` routes."
+ "`/api/transform` routes."
(handlers/routes
(api.macros/ns-handler *ns* +auth)))
(def ^{:arglists '([request respond raise])} transform-tag-routes
- "`/api/ee/transform-tag` routes."
- (api.macros/ns-handler 'metabase-enterprise.transforms.api.transform-tag +auth))
+ "`/api/transform-tag` routes."
+ (api.macros/ns-handler 'metabase.transforms.api.transform-tag +auth))
(def ^{:arglists '([request respond raise])} transform-job-routes
- "`/api/ee/transform-job` routes."
- (api.macros/ns-handler 'metabase-enterprise.transforms.api.transform-job +auth))
+ "`/api/transform-job` routes."
+ (api.macros/ns-handler 'metabase.transforms.api.transform-job +auth))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.clj b/src/metabase/transforms/api/transform_job.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.clj
rename to src/metabase/transforms/api/transform_job.clj
index 0514db65c65..e8bb19ce82b 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.clj
+++ b/src/metabase/transforms/api/transform_job.clj
@@ -1,14 +1,14 @@
-(ns metabase-enterprise.transforms.api.transform-job
+(ns metabase.transforms.api.transform-job
(:require
[medley.core :as m]
- [metabase-enterprise.transforms.jobs :as transforms.jobs]
- [metabase-enterprise.transforms.models.transform-job :as transform-job]
- [metabase-enterprise.transforms.schedule :as transforms.schedule]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
[metabase.models.interface :as mi]
+ [metabase.models.transforms.transform-job :as transform-job]
+ [metabase.transforms.jobs :as transforms.jobs]
+ [metabase.transforms.schedule :as transforms.schedule]
+ [metabase.transforms.util :as transforms.util]
[metabase.util.i18n :refer [deferred-tru]]
[metabase.util.jvm :as u.jvm]
[metabase.util.log :as log]
@@ -197,7 +197,7 @@
[:last_run_statuses {:optional true} [:maybe (ms/QueryVectorOf [:enum "started" "succeeded" "failed" "timeout"])]]
[:tag_ids {:optional true} [:maybe (ms/QueryVectorOf ms/IntGreaterThanOrEqualToZero)]]]]
(log/info "Getting all transform jobs")
- (api/check-403 (or api/*is-superuser?* api/*is-data-analyst?*))
+ (api/check-data-analyst)
(let [jobs (t2/select :model/TransformJob {:order-by [[:created_at :desc]]})]
(into []
(comp (map add-next-run)
@@ -210,5 +210,5 @@
(t2/hydrate jobs :tag_ids :last_run))))
(def ^{:arglists '([request respond raise])} routes
- "`/api/ee/transform-job` routes."
+ "`/api/transform-job` routes."
(api.macros/ns-handler *ns* +auth))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/api/transform_tag.clj b/src/metabase/transforms/api/transform_tag.clj
similarity index 93%
rename from enterprise/backend/src/metabase_enterprise/transforms/api/transform_tag.clj
rename to src/metabase/transforms/api/transform_tag.clj
index 6ed00dd18c7..36b2729c381 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/api/transform_tag.clj
+++ b/src/metabase/transforms/api/transform_tag.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.transforms.api.transform-tag
+(ns metabase.transforms.api.transform-tag
(:require
- [metabase-enterprise.transforms.models.transform-tag :as transform-tag]
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
[metabase.models.interface :as mi]
+ [metabase.models.transforms.transform-tag :as transform-tag]
[metabase.util.i18n :refer [deferred-tru]]
[metabase.util.log :as log]
[metabase.util.malli.schema :as ms]
@@ -68,9 +68,9 @@
[_route-params
_query-params]
(log/info "Getting all transform tags")
- (api/check-403 (or api/*is-superuser?* api/*is-data-analyst?*))
+ (api/check-data-analyst)
(t2/hydrate (t2/select :model/TransformTag {:order-by [[:name :asc]]}) :can_run))
(def ^{:arglists '([request respond raise])} routes
- "`/api/ee/transform-tag` routes."
+ "`/api/transform-tag` routes."
(api.macros/ns-handler *ns* +auth))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/canceling.clj b/src/metabase/transforms/canceling.clj
similarity index 92%
rename from enterprise/backend/src/metabase_enterprise/transforms/canceling.clj
rename to src/metabase/transforms/canceling.clj
index f4a2612ccbc..8482a03cd0b 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/canceling.clj
+++ b/src/metabase/transforms/canceling.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.transforms.canceling
+(ns metabase.transforms.canceling
(:require
[clojure.core.async :as a]
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.calendar-interval :as calendar-interval]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.models.transform-run-cancelation :as wr.cancelation]
+ [metabase.models.transforms.transform-run :as transform-run]
+ [metabase.models.transforms.transform-run-cancelation :as wr.cancelation]
[metabase.task.core :as task]
[metabase.util.jvm :as u.jvm]
[metabase.util.log :as log])
@@ -14,7 +14,7 @@
(set! *warn-on-reflection* true)
-(def ^:private job-key "metabase-enterprise.transforms.canceling")
+(def ^:private job-key "metabase.transforms.canceling")
(defonce ^:private ^ScheduledExecutorService scheduler
(Executors/newScheduledThreadPool 1))
diff --git a/src/metabase/transforms/core.clj b/src/metabase/transforms/core.clj
new file mode 100644
index 00000000000..4a811e6b293
--- /dev/null
+++ b/src/metabase/transforms/core.clj
@@ -0,0 +1,48 @@
+(ns metabase.transforms.core
+ "API namespace for the `metabase.transforms` module."
+ (:require
+ [java-time.api :as t]
+ [metabase.models.transforms.transform]
+ [metabase.models.transforms.transform-run]
+ [metabase.transforms.settings]
+ [metabase.transforms.util]
+ [potemkin :as p]
+ [toucan2.core :as t2]))
+
+(p/import-vars
+ [metabase.transforms.settings
+ transform-timeout]
+ [metabase.transforms.util
+ native-query-transform?
+ python-transform?
+ query-transform?
+ transform-source-database
+ transform-source-type
+ transform-type
+ is-temp-transform-table?]
+ [metabase.models.transforms.transform-run
+ timeout-run!]
+ [metabase.models.transforms.transform
+ update-transform-tags!])
+
+(defn transform-stats
+ "Calculate successful transform runs over a window of the previous UTC day 00:00-23:59.
+ Rolling stats are included under :transform-rolling (up to date totals for today)"
+ []
+ (let [today-utc (t/offset-date-time (t/zone-offset "+00"))
+ yesterday-utc (t/minus today-utc (t/days 1))
+ count-runs (fn [source-types date]
+ (or (:cnt (t2/query-one {:select [[[:count :r.id] :cnt]]
+ :from [[:transform_run :r]]
+ :join [[:transform :t] [:= :t.id :r.transform_id]]
+ :where [:and
+ [:= :r.status "succeeded"]
+ [:in :t.source_type source-types]
+ [:= [:cast :r.end_time :date] [:cast date :date]]]}))
+ 0))]
+ {:transform-native-runs (count-runs ["native" "mbql"] yesterday-utc)
+ :transform-python-runs (count-runs ["python"] yesterday-utc)
+ :transform-usage-date (str (t/local-date yesterday-utc))
+ :transform-rolling-native-runs (count-runs ["native" "mbql"] today-utc)
+ :transform-rolling-python-runs (count-runs ["python"] today-utc)
+ :transform-rolling-usage-date (str (t/local-date today-utc))}))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/execute.clj b/src/metabase/transforms/execute.clj
similarity index 81%
rename from enterprise/backend/src/metabase_enterprise/transforms/execute.clj
rename to src/metabase/transforms/execute.clj
index b1f201dd99e..990a3a0ab51 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/execute.clj
+++ b/src/metabase/transforms/execute.clj
@@ -1,6 +1,6 @@
-(ns metabase-enterprise.transforms.execute
+(ns metabase.transforms.execute
(:require
- [metabase-enterprise.transforms.interface :as transforms.i]))
+ [metabase.transforms.interface :as transforms.i]))
(set! *warn-on-reflection* true)
diff --git a/src/metabase/transforms/feature_gating.clj b/src/metabase/transforms/feature_gating.clj
new file mode 100644
index 00000000000..bb5186fb757
--- /dev/null
+++ b/src/metabase/transforms/feature_gating.clj
@@ -0,0 +1,28 @@
+(ns metabase.transforms.feature-gating
+ (:require
+ [metabase.premium-features.core :as premium-features]))
+
+(defn query-transforms-enabled?
+ "Query transforms: available in OSS, requires :transforms feature in EE.
+ Note: OSS intentionally gets query transforms without a license."
+ []
+ (or (not (premium-features/is-hosted?))
+ (premium-features/has-feature? :transforms)))
+
+(defn python-transforms-enabled?
+ "Python transforms: EE only, requires both :transforms and :transforms-python."
+ []
+ (and (premium-features/has-feature? :transforms)
+ (premium-features/has-feature? :transforms-python)))
+
+(defn enabled-source-types
+ "Returns set of enabled source types for WHERE clause filtering."
+ []
+ (cond-> #{}
+ (query-transforms-enabled?) (into ["native" "mbql"])
+ (python-transforms-enabled?) (conj "python")))
+
+(defn any-transforms-enabled?
+ "Whether any transforms are enabled."
+ []
+ (or (query-transforms-enabled?) (python-transforms-enabled?)))
diff --git a/src/metabase/transforms/init.clj b/src/metabase/transforms/init.clj
new file mode 100644
index 00000000000..4331e67adbe
--- /dev/null
+++ b/src/metabase/transforms/init.clj
@@ -0,0 +1,16 @@
+(ns metabase.transforms.init
+ (:require
+ [metabase.models.transforms.job-run]
+ [metabase.models.transforms.transform]
+ [metabase.models.transforms.transform-job]
+ [metabase.models.transforms.transform-job-transform-tag]
+ [metabase.models.transforms.transform-run]
+ [metabase.models.transforms.transform-run-cancelation]
+ [metabase.models.transforms.transform-tag]
+ [metabase.models.transforms.transform-transform-tag]
+ [metabase.transforms.canceling]
+ [metabase.transforms.jobs]
+ [metabase.transforms.query-impl]
+ [metabase.transforms.schedule]
+ [metabase.transforms.settings]
+ [metabase.transforms.timeout]))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/instrumentation.clj b/src/metabase/transforms/instrumentation.clj
similarity index 99%
rename from enterprise/backend/src/metabase_enterprise/transforms/instrumentation.clj
rename to src/metabase/transforms/instrumentation.clj
index e194fb652ac..04d7904abd2 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/instrumentation.clj
+++ b/src/metabase/transforms/instrumentation.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.instrumentation
+(ns metabase.transforms.instrumentation
(:require
[metabase.analytics.prometheus :as prometheus]
[metabase.util :as u]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/interface.clj b/src/metabase/transforms/interface.clj
similarity index 95%
rename from enterprise/backend/src/metabase_enterprise/transforms/interface.clj
rename to src/metabase/transforms/interface.clj
index 779eeedcc1c..b6fb789d31a 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/interface.clj
+++ b/src/metabase/transforms/interface.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.interface)
+(ns metabase.transforms.interface)
(defn- transform->transform-type
[transform]
@@ -42,7 +42,7 @@
triggered the run. For cron/scheduled runs, this is typically nil, and the run will be attributed
to the transform's owner (if set) or creator.
- Do not use this directly. Use [[metabase-enterprise.transforms.execute/execute!]] instead."
+ Do not use this directly. Use [[metabase.transforms.execute/execute!]] instead."
{:added "0.57.0" :arglists '([transform options])}
(fn [transform _options]
(transform->transform-type transform)))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/jobs.clj b/src/metabase/transforms/jobs.clj
similarity index 95%
rename from enterprise/backend/src/metabase_enterprise/transforms/jobs.clj
rename to src/metabase/transforms/jobs.clj
index e89eec9a860..953daafb2f3 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/jobs.clj
+++ b/src/metabase/transforms/jobs.clj
@@ -1,21 +1,21 @@
-(ns metabase-enterprise.transforms.jobs
+(ns metabase.transforms.jobs
(:require
[clojure.string :as str]
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.calendar-interval :as calendar-interval]
[clojurewerkz.quartzite.triggers :as triggers]
[flatland.ordered.set :as ordered-set]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.instrumentation :as transforms.instrumentation]
- [metabase-enterprise.transforms.models.job-run :as transforms.job-run]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.ordering :as transforms.ordering]
- [metabase-enterprise.transforms.settings :as transforms.settings]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.channel.urls :as urls]
[metabase.events.core :as events]
+ [metabase.models.transforms.job-run :as transforms.job-run]
+ [metabase.models.transforms.transform-run :as transform-run]
[metabase.revisions.core :as revisions]
[metabase.task.core :as task]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.instrumentation :as transforms.instrumentation]
+ [metabase.transforms.ordering :as transforms.ordering]
+ [metabase.transforms.settings :as transforms.settings]
+ [metabase.transforms.util :as transforms.util]
[metabase.util :as u]
[metabase.util.i18n :as i18n]
[metabase.util.log :as log]
@@ -248,7 +248,7 @@
(throw t))))
run-id))))
-(def ^:private job-key "metabase-enterprise.transforms.jobs.timeout-job")
+(def ^:private job-key "metabase.transforms.jobs.timeout-job")
(task/defjob ^{:doc "Times out transform jobs when necessary."
org.quartz.DisallowConcurrentExecution true}
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/ordering.clj b/src/metabase/transforms/ordering.clj
similarity index 94%
rename from enterprise/backend/src/metabase_enterprise/transforms/ordering.clj
rename to src/metabase/transforms/ordering.clj
index 9476cc2082f..654a1cb4a08 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/ordering.clj
+++ b/src/metabase/transforms/ordering.clj
@@ -1,10 +1,8 @@
-(ns metabase-enterprise.transforms.ordering
+(ns metabase.transforms.ordering
(:require
[clojure.set :as set]
[clojure.string :as str]
[flatland.ordered.set :refer [ordered-set]]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.driver :as driver]
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
@@ -12,6 +10,8 @@
[metabase.lib.schema.id :as lib.schema.id]
[metabase.lib.schema.metadata :as lib.schema.metadata]
[metabase.query-processor.preprocess :as qp.preprocess]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.util :as transforms.util]
[metabase.util.i18n :as i18n]
[metabase.util.malli :as mu]
[toucan2.core :as t2]))
@@ -43,9 +43,9 @@
(if-some [data (database-routing-error-ex-data e)]
(let [message (i18n/trs "Failed to run transform because the database {0} has database routing turned on. Running transforms on databases with db routing enabled is not supported." (:database-name data))]
(throw (ex-info message
- {:metabase-enterprise.transforms.jobs/transform-failure true
- :metabase-enterprise.transforms.jobs/failures [{:metabase-enterprise.transforms.jobs/transform transform
- :metabase-enterprise.transforms.jobs/message message}]}
+ {:metabase.transforms.jobs/transform-failure true
+ :metabase.transforms.jobs/failures [{:metabase.transforms.jobs/transform transform
+ :metabase.transforms.jobs/message message}]}
e)))
(throw e)))))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/query_impl.clj b/src/metabase/transforms/query_impl.clj
similarity index 93%
rename from enterprise/backend/src/metabase_enterprise/transforms/query_impl.clj
rename to src/metabase/transforms/query_impl.clj
index 4b2ed1fd02e..52e87b53681 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/query_impl.clj
+++ b/src/metabase/transforms/query_impl.clj
@@ -1,12 +1,13 @@
-(ns metabase-enterprise.transforms.query-impl
+(ns metabase.transforms.query-impl
(:require
- [metabase-enterprise.transforms.instrumentation :as transforms.instrumentation]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.util :as transforms.util]
+ [metabase.database-routing.core :as database-routing]
[metabase.driver :as driver]
[metabase.driver.util :as driver.u]
[metabase.lib.schema.common :as schema.common]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.transforms.instrumentation :as transforms.instrumentation]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.util :as transforms.util]
[metabase.util.i18n :as i18n]
[metabase.util.log :as log]
[metabase.util.malli.registry :as mr]
@@ -43,7 +44,7 @@
{})
(defn- throw-if-db-routing-enabled [transform driver database]
- (when (transforms.util/db-routing-enabled? database)
+ (when (database-routing/db-routing-enabled? database)
(throw (ex-info (i18n/tru "Failed to run the transform ({0}) because the database ({1}) has database routing turned on. Running transforms on databases with db routing enabled is not supported."
(:name transform)
(:name database))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/schedule.clj b/src/metabase/transforms/schedule.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/transforms/schedule.clj
rename to src/metabase/transforms/schedule.clj
index 7ed11c7d82c..1c83f78d735 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/schedule.clj
+++ b/src/metabase/transforms/schedule.clj
@@ -1,14 +1,14 @@
-(ns metabase-enterprise.transforms.schedule
+(ns metabase.transforms.schedule
(:require
[clojurewerkz.quartzite.conversion :as conversion]
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.cron :as cron]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.transforms.jobs :as transforms.jobs]
[metabase.driver :as driver]
[metabase.query-processor.timezone :as qp.timezone]
[metabase.task-history.core :as task-history]
[metabase.task.core :as task]
+ [metabase.transforms.jobs :as transforms.jobs]
[metabase.util.log :as log]
[toucan2.core :as t2])
(:import
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/schema.clj b/src/metabase/transforms/schema.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/transforms/schema.clj
rename to src/metabase/transforms/schema.clj
index 46954a10090..91c43a4ca65 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/schema.clj
+++ b/src/metabase/transforms/schema.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.schema
+(ns metabase.transforms.schema
(:require
[metabase.lib.metadata.column :as lib.metadata.column]
[metabase.lib.schema.common :as lib.schema.common]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/settings.clj b/src/metabase/transforms/settings.clj
similarity index 90%
rename from enterprise/backend/src/metabase_enterprise/transforms/settings.clj
rename to src/metabase/transforms/settings.clj
index ee1e6a6c518..3dca0a0a8c9 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/settings.clj
+++ b/src/metabase/transforms/settings.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.settings
+(ns metabase.transforms.settings
(:require
[metabase.settings.core :as setting]
[metabase.util.i18n :refer [deferred-tru]]))
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/timeout.clj b/src/metabase/transforms/timeout.clj
similarity index 85%
rename from enterprise/backend/src/metabase_enterprise/transforms/timeout.clj
rename to src/metabase/transforms/timeout.clj
index c40788f7761..09657ae5536 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/timeout.clj
+++ b/src/metabase/transforms/timeout.clj
@@ -1,16 +1,16 @@
-(ns metabase-enterprise.transforms.timeout
+(ns metabase.transforms.timeout
(:require
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.calendar-interval :as calendar-interval]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.settings :as transforms.settings]
+ [metabase.models.transforms.transform-run :as transform-run]
[metabase.task.core :as task]
+ [metabase.transforms.settings :as transforms.settings]
[metabase.util.log :as log]))
(set! *warn-on-reflection* true)
-(def ^:private job-key "metabase-enterprise.transforms.timeout")
+(def ^:private job-key "metabase.transforms.timeout")
(defn- timeout-transform-runs! [_ctx]
(log/trace "Timing out old runs.")
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/util.clj b/src/metabase/transforms/util.clj
similarity index 94%
rename from enterprise/backend/src/metabase_enterprise/transforms/util.clj
rename to src/metabase/transforms/util.clj
index f6d50258ec7..a91da0f7637 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/util.clj
+++ b/src/metabase/transforms/util.clj
@@ -1,16 +1,11 @@
-(ns metabase-enterprise.transforms.util
+(ns metabase.transforms.util
(:require
[buddy.core.codecs :as codecs]
[buddy.core.hash :as buddy-hash]
[clojure.core.async :as a]
[clojure.string :as str]
[java-time.api :as t]
- [metabase-enterprise.transforms.canceling :as canceling]
- [metabase-enterprise.transforms.instrumentation :as transforms.instrumentation]
- [metabase-enterprise.transforms.interface :as transforms.i]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.schema :as transforms.schema]
- [metabase-enterprise.transforms.settings :as transforms.settings]
+ [metabase.api.common :as api]
[metabase.driver :as driver]
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.util :as driver.u]
@@ -21,13 +16,18 @@
[metabase.lib.query :as lib.query]
[metabase.lib.schema.common :as lib.schema.common]
[metabase.models.interface :as mi]
- [metabase.permissions.core :as perms]
- [metabase.premium-features.core :as premium-features :refer [defenterprise]]
+ [metabase.models.transforms.transform-run :as transform-run]
[metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.parameters.dates :as params.dates]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.sync.core :as sync]
+ [metabase.transforms.canceling :as canceling]
+ [metabase.transforms.feature-gating :as transforms.gating]
+ [metabase.transforms.instrumentation :as transforms.instrumentation]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.schema :as transforms.schema]
+ [metabase.transforms.settings :as transforms.settings]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
[metabase.util.honey-sql-2 :as h2x]
@@ -104,27 +104,16 @@
(defn check-feature-enabled
"Checking whether we have proper feature flags for using a given transform."
[transform]
- (if (python-transform? transform)
- (and (premium-features/has-feature? :transforms)
- (premium-features/has-feature? :transforms-python))
- (premium-features/has-feature? :transforms)))
-
-(defenterprise has-db-transforms-permission?
- "Returns true if the given user has the transforms permission for the given source db."
- :feature :transforms
- [user-id database-id]
- (or (perms/is-superuser? user-id)
- (perms/user-has-permission-for-database? user-id
- :perms/transforms
- :yes
- database-id)))
-
-(defenterprise has-any-transforms-permission?
- "Returns true if the current user has the transforms permission for _any_ source db."
- :feature :transforms
- [user-id]
- (or (perms/is-superuser? user-id)
- (perms/user-has-any-perms-of-type? user-id :perms/transforms)))
+ (cond
+ (query-transform? transform) (transforms.gating/query-transforms-enabled?)
+ (python-transform? transform) (transforms.gating/python-transforms-enabled?)
+ :else false))
+
+(defn enabled-source-types-for-user
+ "Returns set of enabled source types for WHERE clause filtering."
+ []
+ (when (api/is-data-analyst?)
+ (transforms.gating/enabled-source-types)))
(defn source-tables-readable?
"Check if the source tables/database in a transform are readable by the current user.
@@ -506,19 +495,12 @@
(log/infof "Renaming tables: %s" (pr-str rename-map))
(driver/rename-tables! driver database-id rename-map))
-(defenterprise is-temp-transform-table?
+(defn is-temp-transform-table?
"Return true when `table` matches the transform temporary table naming pattern and transforms are enabled."
- :feature :transforms
[table]
- (when-let [table-name (:name table)]
- (str/starts-with? (u/lower-case-en table-name) driver.u/transform-temp-table-prefix)))
-
-(defn db-routing-enabled?
- "Returns whether or not the given database is either a router or destination database"
- [db-or-id]
- (or (t2/exists? :model/DatabaseRouter :database_id (u/the-id db-or-id))
- (some->> (:router-database-id db-or-id)
- (t2/exists? :model/DatabaseRouter :database_id))))
+ (boolean
+ (when-let [table-name (and (transforms.gating/any-transforms-enabled?) (:name table))]
+ (str/starts-with? (u/lower-case-en table-name) driver.u/transform-temp-table-prefix))))
;;; ------------------------------------------------- Source Table Resolution -----------------------------------------
diff --git a/src/metabase/upload/core.clj b/src/metabase/upload/core.clj
index 97620724f8a..250f69cc8db 100644
--- a/src/metabase/upload/core.clj
+++ b/src/metabase/upload/core.clj
@@ -1,14 +1,18 @@
(ns metabase.upload.core
(:require
+ [metabase.upload.db]
[metabase.upload.impl]
[potemkin :as p]))
-(comment metabase.upload.impl/keep-me)
+(comment
+ metabase.upload.db/keep-me
+ metabase.upload.impl/keep-me)
(p/import-vars
+ [metabase.upload.db
+ current-database]
[metabase.upload.impl
can-create-upload?
- current-database
delete-upload!
model-hydrate-based-on-upload
update-action-schema
diff --git a/src/metabase/upload/db.clj b/src/metabase/upload/db.clj
new file mode 100644
index 00000000000..db2638ab00e
--- /dev/null
+++ b/src/metabase/upload/db.clj
@@ -0,0 +1,8 @@
+(ns metabase.upload.db
+ (:require
+ [toucan2.core :as t2]))
+
+(defn current-database
+ "The database being used for uploads."
+ []
+ (t2/select-one :model/Database :uploads_enabled true))
diff --git a/src/metabase/upload/impl.clj b/src/metabase/upload/impl.clj
index 16f8d694df0..88caa26fea8 100644
--- a/src/metabase/upload/impl.clj
+++ b/src/metabase/upload/impl.clj
@@ -186,11 +186,6 @@
[driver col->upload-type]
(update-vals col->upload-type (partial defaulting-database-type driver)))
-(defn current-database
- "The database being used for uploads."
- []
- (t2/select-one :model/Database :uploads_enabled true))
-
(mu/defn table-identifier :- :string
"Returns a string that can be used as a table identifier in SQL, including a schema if provided."
[{:keys [schema name] :as _table}
diff --git a/test/metabase/data_studio/api/table_test.clj b/test/metabase/data_studio/api/table_test.clj
new file mode 100644
index 00000000000..b075b13b65d
--- /dev/null
+++ b/test/metabase/data_studio/api/table_test.clj
@@ -0,0 +1,549 @@
+(ns ^:mb/driver-tests metabase.data-studio.api.table-test
+ "Tests for /api/data-studio/table endpoints."
+ (:require
+ [clojure.test :refer :all]
+ [metabase.data-studio.api.table :as api.table]
+ [metabase.permissions.models.permissions-group :as perms-group]
+ [metabase.sync.core :as sync]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
+ [toucan2.core :as t2])
+ (:import (java.util.concurrent CountDownLatch TimeUnit)))
+
+(set! *warn-on-reflection* true)
+
+(use-fixtures :once (fixtures/initialize :db))
+
+(deftest bulk-edit-visibility-sync-test
+ (testing "POST /api/data-studio/table/edit visibility field synchronization"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {table-1-id :id} {:db_id db-id}
+ :model/Table {table-2-id :id} {:db_id db-id}]
+
+ (testing "updating data_layer syncs to visibility_type for all tables"
+ ;; Update two tables to internal, which should sync to nil visibility_type
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [table-1-id table-2-id]
+ :data_layer "internal"})
+ (is (= :internal (t2/select-one-fn :data_layer :model/Table :id table-1-id)))
+ (is (= nil (t2/select-one-fn :visibility_type :model/Table :id table-1-id)))
+ (is (= :internal (t2/select-one-fn :data_layer :model/Table :id table-2-id)))
+ (is (= nil (t2/select-one-fn :visibility_type :model/Table :id table-2-id))))
+
+ (testing "updating data_layer to hidden syncs to hidden visibility_type"
+ ;; Update one table back to hidden, which should sync to :hidden
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [table-1-id]
+ :data_layer "hidden"})
+ (is (= :hidden (t2/select-one-fn :data_layer :model/Table :id table-1-id)))
+ (is (= :hidden (t2/select-one-fn :visibility_type :model/Table :id table-1-id))))
+
+ (testing "cannot update both visibility_type and data_layer at once"
+ (mt/user-http-request :crowberto :post 400 "data-studio/table/edit"
+ {:table_ids [table-1-id]
+ :visibility_type "hidden"
+ :data_layer "hidden"})))))
+
+(deftest data-analyst-can-access-endpoints-test
+ (testing "Data analysts (members of Data Analysts group) can access data studio endpoints"
+ (let [data-analyst-group-id (:id (perms-group/data-analyst))]
+ (mt/with-temp [:model/User {analyst-id :id} {:first_name "Data"
+ :last_name "Analyst"
+ :is_data_analyst true}
+ :model/PermissionsGroupMembership _ {:user_id analyst-id :group_id data-analyst-group-id}
+ :model/Database {db-id :id} {}
+ :model/Table {table-id :id} {:db_id db-id}]
+ (testing "data analyst can edit tables"
+ (is (= {} (mt/user-http-request analyst-id :post 200 "data-studio/table/edit"
+ {:table_ids [table-id]
+ :data_layer "final"}))))
+ (testing "data analyst can get selection info"
+ (is (map? (mt/user-http-request analyst-id :post 200 "data-studio/table/selection"
+ {:table_ids [table-id]}))))))))
+
+(deftest regular-user-cannot-access-data-studio-test
+ (testing "Regular users (not in Data Analysts group) cannot access data studio endpoints"
+ (mt/with-temp [:model/User {user-id :id} {:first_name "Regular"
+ :last_name "User"
+ :email "[email protected]"}
+ :model/Database {db-id :id} {}
+ :model/Table {table-id :id} {:db_id db-id}]
+ (testing "regular user cannot edit tables"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request user-id :post 403 "data-studio/table/edit"
+ {:table_ids [table-id]
+ :data_layer "final"}))))
+ (testing "regular user cannot get selection info"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request user-id :post 403 "data-studio/table/selection"
+ {:table_ids [table-id]})))))))
+
+(deftest ^:parallel non-admins-cant-trigger-bulk-sync-test
+ (testing "Non-admins should not be allowed to trigger sync"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "data-studio/table/sync-schema" {:database_ids [(mt/id)]})))))
+
+(deftest trigger-bulk-metadata-sync-for-table-test
+ ;; lot more to test here but will wait for firmer ground
+ (testing "Can we trigger a metadata sync for a filtered set of tables"
+ (let [tables (atom [])
+ latch (CountDownLatch. 4)]
+ (mt/with-temp [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {_ :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t5 :id} {:db_id d2, :schema "FOO"}]
+ (with-redefs [sync/sync-table! (fn [table]
+ (swap! tables conj table)
+ (.countDown latch)
+ nil)]
+ (mt/user-http-request :crowberto :post 204 "data-studio/table/sync-schema" {:database_ids [d1],
+ :schema_ids [(format "%d:FOO" d2)]
+ :table_ids [t4]})
+ (testing "sync called?"
+ (is (true? (.await latch 4 TimeUnit/SECONDS)))
+ (is (= [t1 t2 t4 t5] (map :id @tables)))))))))
+
+(deftest ^:parallel non-admins-cant-trigger-bulk-rescan-values-test
+ (testing "Non-admins should not be allowed to trigger rescan values"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "data-studio/table/rescan-values" {:database_ids [(mt/id)]})))))
+
+(deftest trigger-rescan-values-for-tables-test
+ ;; lot more to test here but will wait for firmer ground
+ (testing "Can we trigger a field values sync for a filtered set of tables"
+ (let [tables (atom [])
+ latch (CountDownLatch. 4)]
+ (mt/with-temp [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {_ :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t5 :id} {:db_id d2, :schema "FOO"}]
+ (with-redefs [sync/update-field-values-for-table! (fn [table]
+ (swap! tables conj table)
+ (.countDown latch)
+ nil)]
+ (mt/user-http-request :crowberto :post 204 "data-studio/table/rescan-values" {:database_ids [d1],
+ :schema_ids [(format "%d:FOO" d2)]
+ :table_ids [t4]})
+ (testing "rescanned?"
+ (is (true? (.await latch 4 TimeUnit/SECONDS)))
+ (is (= [t1 t2 t4 t5] (map :id @tables)))))))))
+
+(deftest ^:parallel non-admins-cant-trigger-bulk-discard-values-test
+ (testing "Non-admins should not be allowed to trigger discard values"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "data-studio/table/discard-values" {:database_ids [(mt/id)]})))))
+
+(deftest ^:parallel bulk-discard-values-test
+ (testing "POST /api/data-studio/table/discard-values"
+ (mt/with-temp
+ [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t3 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t5 :id} {:db_id d2, :schema "FOO"}
+ :model/Field {f1 :id} {:table_id t1}
+ :model/FieldValues {v1 :id} {:field_id f1, :values ["T1"]}
+ :model/Field {f2 :id} {:table_id t2}
+ :model/FieldValues {v2 :id} {:field_id f2, :values ["T2"]}
+ :model/Field {f3 :id} {:table_id t3}
+ :model/FieldValues {v3 :id} {:field_id f3, :values ["T3"]}
+ :model/Field {f4 :id} {:table_id t4}
+ :model/FieldValues {v4 :id} {:field_id f4, :values ["T4-1"]}
+ :model/Field {f5 :id} {:table_id t4}
+ :model/FieldValues {v5 :id} {:field_id f5, :values ["T4-2"]}
+ :model/Field {f6 :id} {:table_id t5}
+ :model/FieldValues {v6 :id} {:field_id f6, :values ["T5-1"]}
+ :model/Field {f7 :id} {:table_id t5}
+ :model/FieldValues {v7 :id} {:field_id f7, :values ["T5-2"]}]
+ (let [url "data-studio/table/discard-values"
+ remaining-field-values-q {:select [:fv.id]
+ :from [[(t2/table-name :model/FieldValues) :fv]
+ [(t2/table-name :model/Field) :f]]
+ :where [:and [:= :fv.field_id :f.id]
+ [:in :f.table_id [t1 t2 t3 t4 t5]]]
+ :order-by [[:fv.id :asc]]}
+ get-field-values #(mapv :id (t2/query remaining-field-values-q))]
+ (testing "Non-admin toucans should not be allowed to discard values"
+ (is (= "You don't have permissions to do that." (mt/user-http-request :rasta :post 403 url {:table_ids [t1]})))
+ (testing "FieldValues should still exist"
+ (is (= [v1 v2 v3 v4 v5 v6 v7] (get-field-values)))))
+ (testing "Admins should be able to successfully delete them"
+ (is (nil? (mt/user-http-request :crowberto :post 204 url {:database_ids [d1],
+ :schema_ids [(format "%d:FOO" d2)]
+ :table_ids [t4]})))
+ (testing "Selected FieldValues should be gone"
+ (is (= [v3] (get-field-values)))))))))
+
+(deftest ^:parallel table-selectors->filter-test
+ (testing "table-selectors->filter function generates correct WHERE clauses"
+ (let [selectors->table-ids (fn [selectors]
+ (let [where (#'api.table/table-selectors->filter selectors)]
+ (t2/select-pks-set :model/Table {:where where})))]
+ (mt/with-temp [:model/Database {db-1 :id} {}
+ :model/Database {db-2 :id} {}
+ :model/Table {table-1 :id} {:db_id db-1}
+ :model/Table {table-2 :id} {:db_id db-1, :schema "schema-a"}
+ :model/Table {table-3 :id} {:db_id db-2, :schema "schema-a"}
+ :model/Table {table-4 :id} {:db_id db-2, :schema "schema-b"}
+ :model/Table {table-5 :id} {:db_id db-2}]
+
+ (testing "filter by database_ids"
+ (is (= #{table-1 table-2}
+ (selectors->table-ids {:database_ids [db-1]}))))
+
+ (testing "filter by table_ids"
+ (is (= #{table-3 table-4}
+ (selectors->table-ids {:table_ids [table-3 table-4]}))))
+
+ (testing "filter by schema_ids"
+ (is (= #{table-2}
+ (selectors->table-ids {:schema_ids [(format "%d:schema-a" db-1)]}))))
+
+ (testing "filter by multiple schema_ids"
+ (is (= #{table-3 table-4}
+ (selectors->table-ids {:schema_ids [(format "%d:schema-a" db-2)
+ (format "%d:schema-b" db-2)]}))))
+
+ (testing "combine database_ids and table_ids (OR logic)"
+ (is (= #{table-1 table-2 table-3}
+ (selectors->table-ids {:database_ids [db-1]
+ :table_ids [table-3]}))))
+
+ (testing "combine all selectors (OR logic)"
+ (is (= #{table-1 table-2 table-4 table-5}
+ (selectors->table-ids {:database_ids [db-1]
+ :table_ids [table-5]
+ :schema_ids [(format "%d:schema-b" db-2)]}))))
+
+ (testing "empty selectors returns no tables"
+ (is (= nil (selectors->table-ids {}))))))))
+
+(deftest trigger-sync-on-data-layer-change-from-hidden-test
+ (testing "Changing data_layer from hidden to another value triggers sync"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {hidden-1 :id} {:db_id db-id, :data_layer :hidden}
+ :model/Table {hidden-2 :id} {:db_id db-id, :data_layer :hidden}
+ :model/Table {hidden-3 :id} {:db_id db-id, :data_layer :hidden}
+ :model/Table {internal-1 :id} {:db_id db-id, :data_layer :internal}
+ :model/Table {final-1 :id} {:db_id db-id, :data_layer :final}]
+ (let [synced-ids (atom #{})]
+ (mt/with-dynamic-fn-redefs [api.table/sync-unhidden-tables (fn [tables] (reset! synced-ids (set (map :id tables))))]
+ (testing "Changing from hidden to final triggers sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [hidden-1 hidden-2]
+ :data_layer "final"})
+ (is (= #{hidden-1 hidden-2} @synced-ids)))
+
+ (testing "Changing from hidden to internal triggers sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [hidden-3]
+ :data_layer "internal"})
+ (is (= #{hidden-3} @synced-ids)))
+
+ (testing "Not changing from hidden does not trigger sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [internal-1]
+ :data_layer "final"})
+ (is (= #{} @synced-ids)))
+
+ (testing "Changing to hidden does not trigger sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [final-1]
+ :data_layer "hidden"})
+ (is (= #{} @synced-ids))))))))
+
+(deftest bulk-edit-test
+ (testing "can edit a bunch of things at once"
+ (mt/with-temp [:model/Database {clojure :id} {}
+ :model/Database {jvm :id} {}
+ :model/Table {vars :id} {:db_id clojure}
+ :model/Table {namespaces :id} {:db_id clojure}
+ :model/Table {beans :id} {:db_id jvm}
+ :model/Table {classes :id} {:db_id jvm}
+ :model/Table {gc :id} {:db_id jvm, :schema "jre"}
+ :model/Table {jit :id} {:db_id jvm, :schema "jre"}]
+
+ (testing "only admin can edit"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "data-studio/table/edit"
+ {:database_ids [clojure jvm]
+ :data_layer "hidden"}))))
+
+ (testing "simple happy path updating with db ids"
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:database_ids [clojure jvm]
+ :data_layer "hidden"
+ :data_authority "authoritative"
+ :data_source "ingested"})
+ (is (= #{:hidden} (t2/select-fn-set :data_layer :model/Table :db_id [:in [clojure jvm]])))
+ (is (= #{:authoritative} (t2/select-fn-set :data_authority :model/Table :db_id [:in [clojure jvm]])))
+ (is (= #{:ingested} (t2/select-fn-set :data_source :model/Table :db_id [:in [clojure jvm]]))))
+
+ (testing "updating with all selectors"
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:database_ids [clojure]
+ :table_ids [classes]
+ :schema_ids [(format "%d:jre" jvm)]
+ :data_layer "internal"})
+ (is (= {vars :internal
+ namespaces :internal
+ beans :hidden
+ classes :internal
+ gc :internal
+ jit :internal}
+ (t2/select-pk->fn :data_layer :model/Table :db_id [:in [clojure jvm]]))))
+
+ (testing "can update owner_email"
+ (is (= #{nil} (t2/select-fn-set :owner_email :model/Table :db_id [:in [clojure jvm]])))
+
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:database_ids [clojure]
+ :owner_email "[email protected]"})
+
+ (is (= {vars "[email protected]"
+ namespaces "[email protected]"
+ beans nil
+ classes nil
+ gc nil
+ jit nil}
+ (t2/select-pk->fn :owner_email :model/Table :db_id [:in [clojure jvm]]))))
+
+ (testing "can update owner_user_id"
+ (is (= #{nil} (t2/select-fn-set :owner_user_id :model/Table :db_id [:in [clojure jvm]])))
+
+ (mt/user-http-request :crowberto :post 200 "data-studio/table/edit"
+ {:table_ids [beans classes]
+ :owner_user_id (mt/user->id :rasta)})
+
+ (is (= {vars nil
+ namespaces nil
+ beans (mt/user->id :rasta)
+ classes (mt/user->id :rasta)
+ gc nil
+ jit nil}
+ (t2/select-pk->fn :owner_user_id :model/Table :db_id [:in [clojure jvm]])))))))
+
+;;; ------------------------------------------------- Selection Tests -------------------------------------------------
+
+(deftest selection-basic-test
+ (testing "POST /api/data-studio/table/selection"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {t1 :id} {:db_id db-id :name "orders" :schema "PUBLIC" :is_published false}
+ :model/Table {t2 :id} {:db_id db-id :name "products" :schema "PUBLIC" :is_published true}
+ :model/Table _ {:db_id db-id :name "people" :schema "PUBLIC" :is_published false}]
+ (testing "returns a published table in selection with all required fields"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [t2]})]
+ (is (=? {:selected_table {:id t2
+ :db_id db-id
+ :name "products"
+ :display_name "Products"
+ :schema "PUBLIC"
+ :is_published true}}
+ response))))
+ (testing "returns an unpublished table in selection with all required fields"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [t1]})]
+ (is (=? {:selected_table {:id t1
+ :db_id db-id
+ :name "orders"
+ :display_name "Orders"
+ :schema "PUBLIC"
+ :is_published false}}
+ response))))
+ (testing "returns nil for :selected_table when there are multiple selected tables"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [t1 t2]})]
+ (is (=? {:selected_table nil}
+ response))))
+ (testing "tables with no remapping should have empty upstream/downstream"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [t2]})]
+ (is (=? {:published_downstream_tables []
+ :unpublished_upstream_tables []}
+ response)))))))
+
+(deftest selection-with-remapping-test
+ (testing "POST /api/data-studio/table/selection with remapping dependencies"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ ;; Orders table with FK to Products
+ :model/Table {orders-id :id} {:db_id db-id :name "orders" :schema "PUBLIC" :is_published false}
+ :model/Field _ {:table_id orders-id :name "id" :semantic_type :type/PK
+ :base_type :type/Integer}
+ :model/Field {product-fk :id} {:table_id orders-id :name "product_id" :semantic_type :type/FK
+ :base_type :type/Integer}
+ ;; Products table
+ :model/Table {products-id :id} {:db_id db-id :name "products" :schema "PUBLIC" :is_published false}
+ :model/Field _ {:table_id products-id :name "id" :semantic_type :type/PK
+ :base_type :type/Integer}
+ :model/Field {prod-name-f :id} {:table_id products-id :name "name" :semantic_type :type/Name
+ :base_type :type/Text}
+ ;; Dimension for FK remapping: product_id -> products.name
+ :model/Dimension _ {:field_id product-fk
+ :human_readable_field_id prod-name-f
+ :type :external}]
+ (testing "selecting orders returns products as upstream dependency"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [orders-id]})]
+ (is (=? {:selected_table {:id orders-id
+ :db_id db-id
+ :name "orders"
+ :display_name "Orders"
+ :schema "PUBLIC"}
+ :unpublished_upstream_tables [{:id products-id
+ :db_id db-id
+ :name "products"
+ :display_name "Products"
+ :schema "PUBLIC"}]}
+ response))))
+
+ (testing "if products is already published, it appears in published_downstream when selecting it"
+ (t2/update! :model/Table products-id {:is_published true})
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [products-id]})]
+ (is (=? {:selected_table {:id products-id
+ :db_id db-id
+ :name "products"
+ :display_name "Products"
+ :schema "PUBLIC"}
+ :unpublished_upstream_tables []}
+ response))
+ ;; orders is unpublished and depends on products
+ ;; when we want to unpublish products, orders would need to be unpublished too
+ ;; but orders is already unpublished, so published_downstream_tables should be empty
+ (is (= [] (:published_downstream_tables response)))))
+
+ (testing "when orders is published and we select products, orders appears in published_downstream"
+ (t2/update! :model/Table orders-id {:is_published true})
+ (t2/update! :model/Table products-id {:is_published true})
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [products-id]})]
+ (is (=? {:selected_table {:id products-id
+ :db_id db-id
+ :name "products"
+ :display_name "Products"
+ :schema "PUBLIC"}
+ :published_downstream_tables [{:id orders-id
+ :db_id db-id
+ :name "orders"
+ :display_name "Orders"
+ :schema "PUBLIC"}]}
+ response)))))))
+
+(deftest selection-recursive-upstream-test
+ (testing "POST /api/data-studio/table/selection with recursive upstream dependencies"
+ ;; Chain: order_items -> orders -> customers
+ ;; order_items.order_id remaps to orders.name
+ ;; orders.customer_id remaps to customers.name
+ (mt/with-temp [:model/Database {db-id :id} {}
+ ;; Customers table
+ :model/Table {customers-id :id} {:db_id db-id :name "customers" :schema "PUBLIC"
+ :is_published false}
+ :model/Field _ {:table_id customers-id :name "id"
+ :semantic_type :type/PK :base_type :type/Integer}
+ :model/Field {cust-name-f :id} {:table_id customers-id :name "name"
+ :semantic_type :type/Name :base_type :type/Text}
+ ;; Orders table
+ :model/Table {orders-id :id} {:db_id db-id :name "orders" :schema "PUBLIC"
+ :is_published false}
+ :model/Field _ {:table_id orders-id :name "id"
+ :semantic_type :type/PK :base_type :type/Integer}
+ :model/Field {order-name-f :id} {:table_id orders-id :name "name"
+ :semantic_type :type/Name :base_type :type/Text}
+ :model/Field {customer-fk :id} {:table_id orders-id :name "customer_id"
+ :semantic_type :type/FK :base_type :type/Integer}
+ ;; Order items table
+ :model/Table {items-id :id} {:db_id db-id :name "order_items" :schema "PUBLIC"
+ :is_published false}
+ :model/Field _ {:table_id items-id :name "id"
+ :semantic_type :type/PK :base_type :type/Integer}
+ :model/Field {order-fk :id} {:table_id items-id :name "order_id"
+ :semantic_type :type/FK :base_type :type/Integer}
+ ;; Dimensions for FK remapping
+ :model/Dimension _ {:field_id customer-fk
+ :human_readable_field_id cust-name-f
+ :type :external}
+ :model/Dimension _ {:field_id order-fk
+ :human_readable_field_id order-name-f
+ :type :external}]
+ (testing "selecting order_items returns orders and customers as upstream (recursive)"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [items-id]})]
+ (is (=? {:selected_table {:id items-id
+ :db_id db-id
+ :name "order_items"
+ :display_name "Order Items"
+ :schema "PUBLIC"}
+ :unpublished_upstream_tables (mt/malli=? [:sequential {:min 2 :max 2} :map])}
+ response))
+ (is (= #{orders-id customers-id}
+ (set (map :id (:unpublished_upstream_tables response)))))
+ ;; Verify upstream tables have all required fields
+ (doseq [table (:unpublished_upstream_tables response)]
+ (are [k] (contains? table k)
+ :id :db_id :name :display_name :schema)))))))
+
+(deftest selection-recursive-downstream-test
+ (testing "POST /api/data-studio/table/selection with recursive downstream dependencies"
+ ;; Same chain: order_items -> orders -> customers
+ ;; If we unpublish customers, we need to unpublish orders and order_items too
+ (mt/with-temp [:model/Database {db-id :id} {}
+ ;; Customers table (published)
+ :model/Table {customers-id :id} {:db_id db-id :name "customers" :schema "PUBLIC"
+ :is_published true}
+ :model/Field _ {:table_id customers-id :name "id"
+ :semantic_type :type/PK :base_type :type/Integer}
+ :model/Field {cust-name-f :id} {:table_id customers-id :name "name"
+ :semantic_type :type/Name :base_type :type/Text}
+ ;; Orders table (published)
+ :model/Table {orders-id :id} {:db_id db-id :name "orders" :schema "PUBLIC"
+ :is_published true}
+ :model/Field _ {:table_id orders-id :name "id"
+ :semantic_type :type/PK :base_type :type/Integer}
+ :model/Field {order-name-f :id} {:table_id orders-id :name "name"
+ :semantic_type :type/Name :base_type :type/Text}
+ :model/Field {customer-fk :id} {:table_id orders-id :name "customer_id"
+ :semantic_type :type/FK :base_type :type/Integer}
+ ;; Order items table (published)
+ :model/Table {items-id :id} {:db_id db-id :name "order_items" :schema "PUBLIC"
+ :is_published true}
+ :model/Field _ {:table_id items-id :name "id"
+ :semantic_type :type/PK :base_type :type/Integer}
+ :model/Field {order-fk :id} {:table_id items-id :name "order_id"
+ :semantic_type :type/FK :base_type :type/Integer}
+ ;; Dimensions for FK remapping
+ :model/Dimension _ {:field_id customer-fk
+ :human_readable_field_id cust-name-f
+ :type :external}
+ :model/Dimension _ {:field_id order-fk
+ :human_readable_field_id order-name-f
+ :type :external}]
+ (testing "selecting customers returns orders and order_items as downstream (recursive)"
+ (let [response (mt/user-http-request :crowberto :post 200 "data-studio/table/selection"
+ {:table_ids [customers-id]})]
+ (is (=? {:selected_table {:id customers-id
+ :db_id db-id
+ :name "customers"
+ :display_name "Customers"
+ :schema "PUBLIC"}
+ :published_downstream_tables (mt/malli=? [:sequential {:min 2 :max 2} :map])}
+ response))
+ (is (= #{orders-id items-id}
+ (set (map :id (:published_downstream_tables response)))))
+ ;; Verify downstream tables have all required fields
+ (doseq [table (:published_downstream_tables response)]
+ (are [k] (contains? table k)
+ :id :db_id :name :display_name :schema)))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/models/transform_job_test.clj b/test/metabase/models/transforms/transform_job_test.clj
similarity index 96%
rename from enterprise/backend/test/metabase_enterprise/transforms/models/transform_job_test.clj
rename to test/metabase/models/transforms/transform_job_test.clj
index decbe6e00cf..752a12a9732 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/models/transform_job_test.clj
+++ b/test/metabase/models/transforms/transform_job_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.transforms.models.transform-job-test
+(ns metabase.models.transforms.transform-job-test
"Tests for the transform job model."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.transforms.models.transform-job :as transform-job]
+ [metabase.models.transforms.transform-job :as transform-job]
[metabase.test :as mt]
[metabase.util.i18n :as i18n]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/models/transform_tag_test.clj b/test/metabase/models/transforms/transform_tag_test.clj
similarity index 88%
rename from enterprise/backend/test/metabase_enterprise/transforms/models/transform_tag_test.clj
rename to test/metabase/models/transforms/transform_tag_test.clj
index 2f1eff896c5..027b3275c6e 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/models/transform_tag_test.clj
+++ b/test/metabase/models/transforms/transform_tag_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.transforms.models.transform-tag-test
+(ns metabase.models.transforms.transform-tag-test
"Tests for the transform tag model."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.transforms.models.transform-tag :as transform-tag]
+ [metabase.models.transforms.transform-tag :as transform-tag]
[metabase.test :as mt]
[metabase.util.i18n :as i18n]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/models/transform_test.clj b/test/metabase/models/transforms/transform_test.clj
similarity index 94%
rename from enterprise/backend/test/metabase_enterprise/transforms/models/transform_test.clj
rename to test/metabase/models/transforms/transform_test.clj
index 8d200497a7c..d256beeaf91 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/models/transform_test.clj
+++ b/test/metabase/models/transforms/transform_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.models.transform-test
+(ns metabase.models.transforms.transform-test
(:require
[clojure.test :refer :all]
[metabase.test :as mt]))
diff --git a/test/metabase/search/appdb/index_test.clj b/test/metabase/search/appdb/index_test.clj
index 3478905e2cb..b0ed38ed2c2 100644
--- a/test/metabase/search/appdb/index_test.clj
+++ b/test/metabase/search/appdb/index_test.clj
@@ -3,7 +3,6 @@
[clojure.test :refer :all]
[java-time.api :as t]
[metabase.app-db.core :as mdb]
- [metabase.config.core :as config]
[metabase.indexed-entities.models.model-index :as model-index]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
@@ -542,8 +541,7 @@
(def ^:private model->deleted-descendants
;; Note that these refer to the table names, not the search-model names.
- {"core_user" (cond-> #{"action" "collection" "document" "measure" "model_index_value" "report_card" "report_dashboard" "segment"}
- config/ee-available? (conj "transform"))
+ {"core_user" #{"action" "collection" "document" "measure" "model_index_value" "report_card" "report_dashboard" "segment" "transform"}
"model_index" #{"model_index_value"}
"metabase_database" #{"action" "measure" "metabase_table" "model_index_value" "report_card" "segment"}
"metabase_table" #{"action" "measure" "model_index_value" "report_card" "segment"}
diff --git a/test/metabase/search/filter_test.clj b/test/metabase/search/filter_test.clj
index 6860e964dff..f38f81ebc6c 100644
--- a/test/metabase/search/filter_test.clj
+++ b/test/metabase/search/filter_test.clj
@@ -2,7 +2,6 @@
(:require
[clojure.math.combinatorics :as math.combo]
[clojure.test :refer :all]
- [metabase.config.core :as config]
[metabase.models.resolution]
[metabase.search.config :as search.config]
[metabase.search.filter :as search.filter]
@@ -25,7 +24,9 @@
(math.combo/subsets (remove #{:archived? :table-db-id} (filter-keys))))
(defn- with-all-models [search-ctx]
- (assoc search-ctx :models search.config/all-models))
+ (assoc search-ctx
+ :models search.config/all-models
+ :enabled-transform-source-types #{"mbql"}))
(defn- with-all-models-and-regular-user [search-ctx]
(with-all-models (assoc search-ctx :is-impersonated-user? false :is-sandboxed-user? false)))
@@ -84,66 +85,79 @@
(search.filter/search-context->applicable-models search-ctx)))))))
(def kitchen-sink-filter-context
- {:archived? true
- :collection 5
- :created-at "2024-10-01"
- :created-by [123]
- :include-dashboard-questions? true
- :table-db-id 231
- :last-edited-by [321]
- :last-edited-at "2024-10-02"
- :search-native-query true
- :verified true
- :ids [1 2 3 4]
- :non-temporal-dim-ids "[1]"
- :has-temporal-dim true
- :display-type ["line"]
- :models (disj search.config/all-models "dataset")})
+ {:archived? true
+ :collection 5
+ :created-at "2024-10-01"
+ :created-by [123]
+ :include-dashboard-questions? true
+ :table-db-id 231
+ :last-edited-by [321]
+ :last-edited-at "2024-10-02"
+ :search-native-query true
+ :verified true
+ :ids [1 2 3 4]
+ :non-temporal-dim-ids "[1]"
+ :has-temporal-dim true
+ :display-type ["line"]
+ :models (disj search.config/all-models "dataset")
+ :enabled-transform-source-types #{"mbql"}})
(deftest with-filters-test
(testing "The kitchen sink context is complete"
(is (empty? (remove kitchen-sink-filter-context (filter-keys)))))
(testing "In the general case, we simply filter by models, and exclude dashboard cards"
- (is (= {:select [:some :stuff]
- :from :somewhere
- :where [:and
- [:= 1 2]
- [:or [:= nil :search_index.dashboard_id] nil]]}
+ (is (= {:select [:some :stuff],
+ :from :somewhere,
+ :where
+ [:and
+ [:= 1 2]
+ [:or [:= nil :search_index.dashboard_id] nil]]}
(search.filter/with-filters {:models []} {:select [:some :stuff], :from :somewhere})))
- (is (= {:select [:some :stuff]
- :from :somewhere
- :where [:and
- [:in :search_index.model ["a"]]
- [:or [:= nil :search_index.dashboard_id] nil]]}
+ (is (= {:select [:some :stuff],
+ :from :somewhere,
+ :where
+ [:and
+ [:in :search_index.model ["a"]]
+ [:or [:= nil :search_index.dashboard_id] nil]]}
(search.filter/with-filters {:models ["a"]} {:select [:some :stuff], :from :somewhere}))))
(testing "We can insert appropriate constraints for all the filters"
- (is (= {:select [:some :stuff]
- :from :somewhere
- ;; This :where clause is a set to avoid flakes, since the clause order will be non-deterministic.
- :where #{:and
- [:in :search_index.model (cond-> #{"dashboard" "table" "segment" "measure" "collection" "database" "action" "indexed-entity" "metric" "card" "document"}
- config/ee-available? (conj "transform"))]
- [:in :search_index.model_id ["1" "2" "3" "4"]]
- [:in :search_index.model ["card" "dataset" "metric" "dashboard" "action"]]
- [:= :search_index.archived true]
- [:>= [:cast :search_index.model_created_at :date] #t"2024-10-01"]
- [:< [:cast :search_index.model_created_at :date] #t"2024-10-02"]
- ;; depends on whether :content-verification is enabled
- #_[:= :search_index.verified true]
- [:in :search_index.creator_id [123]]
- [:or
- [:= nil :search_index.dashboard_id]
- [:not= [:inline 0] [:coalesce :search_index.dashboardcard_count [:inline 0]]]]
- [:= :search_index.database_id 231]
- [:>= [:cast :search_index.last_edited_at :date] #t"2024-10-02"]
- [:< [:cast :search_index.last_edited_at :date] #t"2024-10-03"]
- [:in :search_index.last_editor_id [321]]
- [:= :search_index.non_temporal_dim_ids "[1]"]
- [:= :search_index.has_temporal_dim true]
- [:in :search_index.display_type ["line"]]
- [:or [:= :search_index.collection_id 5] [:like :collection.location "%/5/%"]]
- [:not= :search_index.model [:inline "table"]]}}
+ (is (= {:select [:some :stuff],
+ :from :somewhere,
+ :where
+ #{[:in :search_index.last_editor_id [321]]
+ [:in :search_index.creator_id [123]]
+ [:or [:= :search_index.collection_id 5] [:like :collection.location "%/5/%"]]
+ [:not= :search_index.model [:inline "table"]]
+ [:= :search_index.archived true]
+ [:in :search_index.model ["card" "dataset" "metric" "dashboard" "action"]]
+ [:or
+ [:= nil :search_index.dashboard_id]
+ [:not= [:inline 0] [:coalesce :search_index.dashboardcard_count [:inline 0]]]]
+ [:in
+ :search_index.model
+ #{"dashboard"
+ "table"
+ "segment"
+ "collection"
+ "measure"
+ "transform"
+ "document"
+ "database"
+ "action"
+ "indexed-entity"
+ "metric"
+ "card"}]
+ [:< [:cast :search_index.model_created_at :date] #t "2024-10-02"]
+ [:in :search_index.model_id ["1" "2" "3" "4"]]
+ [:< [:cast :search_index.last_edited_at :date] #t "2024-10-03"]
+ [:>= [:cast :search_index.model_created_at :date] #t "2024-10-01"]
+ [:= :search_index.non_temporal_dim_ids "[1]"]
+ [:= :search_index.has_temporal_dim true]
+ :and
+ [:= :search_index.database_id 231]
+ [:in :search_index.display_type ["line"]]
+ [:>= [:cast :search_index.last_edited_at :date] #t "2024-10-02"]}}
(-> (search.filter/with-filters kitchen-sink-filter-context {:select [:some :stuff], :from :somewhere})
(update :where set))))))
diff --git a/test/metabase/search/impl_test.clj b/test/metabase/search/impl_test.clj
index 78d8602971d..6784b3bc63a 100644
--- a/test/metabase/search/impl_test.clj
+++ b/test/metabase/search/impl_test.clj
@@ -15,6 +15,7 @@
[metabase.search.in-place.legacy :as search.legacy]
[metabase.search.ingestion :as search.ingestion]
[metabase.test :as mt]
+ [metabase.transforms.feature-gating :as transforms.gating]
[toucan2.core :as t2]))
(deftest ^:parallel parse-engine-test
@@ -90,7 +91,8 @@
:current-user-perms #{"/"}
:model-ancestors? false
:limit-int 100
- :calculate-available-models? false}))]
+ :calculate-available-models? false
+ :enabled-transform-source-types (transforms.gating/enabled-source-types)}))]
;; warm it up, in case the DB call depends on the order of test execution and it needs to
;; do some initialization
(search/init-index!)
@@ -100,7 +102,7 @@
;; the call count number here are expected to change if we change the search api
;; we have this test here just to keep tracks this number to remind us to put effort
;; into keep this number as low as we can
- (is (<= (call-count) 9)))))))))
+ (is (<= (call-count) 10)))))))))
(deftest created-at-correctness-test
(let [search-term "created-at-filtering"
diff --git a/test/metabase/search/in_place/filter_test.clj b/test/metabase/search/in_place/filter_test.clj
index fd96d26fc16..8d350cc26f2 100644
--- a/test/metabase/search/in_place/filter_test.clj
+++ b/test/metabase/search/in_place/filter_test.clj
@@ -5,22 +5,22 @@
(:require
[clojure.test :refer :all]
[metabase.audit-app.core :as audit]
- [metabase.config.core :as config]
[metabase.search.config :as search.config]
[metabase.search.in-place.filter :as search.filter]
[metabase.search.permissions :as search.permissions]
[metabase.test :as mt]))
(def default-search-ctx
- {:search-string nil
- :archived? false
- :models search.config/all-models
- :model-ancestors? false
- :current-user-id 1
- :is-superuser? true
- :is-data-analyst? false
- :current-user-perms #{"/"}
- :calculate-available-models? false})
+ {:search-string nil
+ :archived? false
+ :models search.config/all-models
+ :model-ancestors? false
+ :current-user-id 1
+ :is-superuser? true
+ :is-data-analyst? false
+ :current-user-perms #{"/"}
+ :calculate-available-models? false
+ :enabled-transform-source-types #{"mbql"}})
(deftest ^:parallel ->applicable-models-test
(testing "without optional filters"
@@ -34,7 +34,11 @@
(is (= search.config/all-models
(search.filter/search-context->applicable-models
(merge default-search-ctx
- {:archived? true})))))))
+ {:archived? true}))))
+ (is (= (disj search.config/all-models "transform")
+ (search.filter/search-context->applicable-models
+ (merge default-search-ctx
+ {:enabled-transform-source-types #{}})))))))
(deftest ^:parallel ->applicable-models-test-2
(testing "optional filters will return intersection of support models and provided models\n"
@@ -51,8 +55,7 @@
:created-by #{1}})))))
(testing "created at"
- (is (= (cond-> #{"dashboard" "table" "dataset" "document" "collection" "database" "action" "card" "metric"}
- config/ee-available? (conj "transform"))
+ (is (= #{"dashboard" "table" "dataset" "document" "collection" "database" "action" "card" "metric" "transform"}
(search.filter/search-context->applicable-models
(merge default-search-ctx
{:created-at "past3days"}))))
@@ -100,8 +103,7 @@
:last-edited-at "past3days"})))))
(testing "search native query"
- (is (= (cond-> #{"dataset" "action" "card" "metric"}
- config/ee-available? (conj "transform"))
+ (is (= #{"dataset" "action" "card" "metric" "transform"}
(search.filter/search-context->applicable-models
(merge default-search-ctx
{:search-native-query true})))))))
@@ -113,8 +115,7 @@
(search.filter/search-context->applicable-models
(merge default-search-ctx
{:is-superuser? true
- :models (cond-> #{"dashboard" "card" "transform"}
- config/ee-available? (conj "transform"))}))
+ :models #{"dashboard" "card" "transform"}}))
"transform")))
(testing "Non-superuser does not see transform in applicable models"
@@ -122,8 +123,7 @@
(search.filter/search-context->applicable-models
(merge default-search-ctx
{:is-superuser? false
- :models (cond-> #{"dashboard" "card"}
- config/ee-available? (conj "transform"))}))
+ :models #{"dashboard" "card" "transform"}}))
"transform"))))
(testing "Non-superuser with transform in models set - transform is filtered out"
diff --git a/test/metabase/sync/sync_metadata/tables_test.clj b/test/metabase/sync/sync_metadata/tables_test.clj
index 1c4068a5021..1816ae1948b 100644
--- a/test/metabase/sync/sync_metadata/tables_test.clj
+++ b/test/metabase/sync/sync_metadata/tables_test.clj
@@ -42,21 +42,24 @@
(set (for [table (t2/select [:model/Table :name :visibility_type :initial_sync_status] :db_id (mt/id))]
(into {} table))))))))
-(deftest transform-temp-tables-are-skipped-test
- (mt/when-ee-evailable
- (let [temp-table {:name "mb_transform_temp_table_temp_123"
- :schema "public"}
- normal-table {:name "orders"
- :schema "public"}
- db-metadata {:tables #{temp-table normal-table}}]
- (testing "table-set excludes transform temporary tables when flagged and has transforms feature"
- (mt/with-premium-features #{:transforms}
- (is (= #{normal-table}
- (#'sync-tables/table-set db-metadata)))))
- (testing "ignroe it if transform feature is disabled"
- (mt/with-premium-features #{}
- (is (= #{normal-table temp-table}
- (#'sync-tables/table-set db-metadata))))))))
+(deftest transform-temp-tables-are-skipped-without-premium-features
+ (let [temp-table {:name "mb_transform_temp_table_temp_123"
+ :schema "public"}
+ normal-table {:name "orders"
+ :schema "public"}
+ db-metadata {:tables #{temp-table normal-table}}]
+ (testing "with no premium features, table-set excludes transform temporary tables"
+ (mt/with-premium-features #{}
+ (is (= #{normal-table}
+ (#'sync-tables/table-set db-metadata)))))
+ (testing "when hosted, includes transform temporary tables"
+ (mt/with-premium-features #{:hosting}
+ (is (= #{normal-table temp-table}
+ (#'sync-tables/table-set db-metadata)))))
+ (testing "when hosted with `transforms` enabled, excludes the temp tables"
+ (mt/with-premium-features #{:hosting :transforms}
+ (is (= #{normal-table}
+ (#'sync-tables/table-set db-metadata)))))))
(deftest retire-tables-test
(testing "`retire-tables!` should retire the Table(s) passed to it, not all Tables in the DB -- see #9593"
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.clj b/test/metabase/transforms/api/transform_job_test.clj
similarity index 83%
rename from enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.clj
rename to test/metabase/transforms/api/transform_job_test.clj
index fc4e683542b..8adb9b4dcb4 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.clj
+++ b/test/metabase/transforms/api/transform_job_test.clj
@@ -1,23 +1,24 @@
-(ns metabase-enterprise.transforms.api.transform-job-test
+(ns metabase.transforms.api.transform-job-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.transforms.models.transform-job]
- [metabase-enterprise.transforms.models.transform-tag]
- [metabase-enterprise.transforms.schedule :as transforms.schedule]
- [metabase-enterprise.transforms.test-util :refer [parse-instant utc-timestamp]]
+ [metabase.models.transforms.transform-job]
+ [metabase.models.transforms.transform-tag]
[metabase.test :as mt]
+ [metabase.transforms.schedule :as transforms.schedule]
+ [metabase.transforms.test-util :refer [parse-instant
+ utc-timestamp]]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
(deftest create-job-test
- (testing "POST /api/ee/transform-job"
+ (testing "POST /api/transform-job"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformTag tag1 {:name "test-tag-1"}
:model/TransformTag tag2 {:name "test-tag-2"}]
(testing "Creates job with valid data"
- (let [response (mt/user-http-request :lucky :post 200 "ee/transform-job"
+ (let [response (mt/user-http-request :lucky :post 200 "transform-job"
{:name "Test Job"
:description "Test Description"
:schedule "0 0 0 * * ?"
@@ -31,14 +32,14 @@
(is (= (set [(:id tag1) (:id tag2)]) (set (:tag_ids response))))))
(testing "Validates cron expression"
- (let [response (mt/user-http-request :lucky :post 400 "ee/transform-job"
+ (let [response (mt/user-http-request :lucky :post 400 "transform-job"
{:name "Bad Cron Job"
:schedule "invalid cron"})]
(is (string? response))
(is (re-find #"Invalid cron expression" response))))
(testing "Validates tag IDs exist"
- (let [response (mt/user-http-request :lucky :post 400 "ee/transform-job"
+ (let [response (mt/user-http-request :lucky :post 400 "transform-job"
{:name "Job with bad tags"
:schedule "0 0 0 * * ?"
:tag_ids [999999]})]
@@ -46,7 +47,7 @@
(is (re-find #"tag IDs do not exist" response)))))))))
(deftest get-job-test
- (testing "GET /api/ee/transform-job/:id"
+ (testing "GET /api/transform-job/:id"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformTag tag {:name "test-tag"}
@@ -54,17 +55,17 @@
:schedule "0 0 0 * * ?"}
:model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag) :position 0}]
(testing "Returns job with hydrated fields"
- (let [response (mt/user-http-request :lucky :get 200 (str "ee/transform-job/" (:id job)))]
+ (let [response (mt/user-http-request :lucky :get 200 (str "transform-job/" (:id job)))]
(is (= (:id job) (:id response)))
(is (= "Test Job" (:name response)))
(is (= [(:id tag)] (:tag_ids response)))
(is (nil? (:last_run response)))))
(testing "Returns 404 for non-existent job"
- (mt/user-http-request :lucky :get 404 "ee/transform-job/999999")))))))
+ (mt/user-http-request :lucky :get 404 "transform-job/999999")))))))
(deftest get-job-transforms-test
- (testing "GET /api/ee/transform-job/:id/transforms"
+ (testing "GET /api/transform-job/:id/transforms"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(let [lucky-id (mt/user->id :lucky)]
@@ -77,7 +78,7 @@
:model/TransformJob {job-id :id} {}
:model/TransformJobTransformTag _ {:job_id job-id :tag_id tag-id :position 0}]
(testing "Returns the transforms of the job"
- (let [response (mt/user-http-request :lucky :get 200 (str "ee/transform-job/" job-id "/transforms"))]
+ (let [response (mt/user-http-request :lucky :get 200 (str "transform-job/" job-id "/transforms"))]
(is (=? [{:id transform1-id, :name "tr1"} {:id transform2-id, :name "tr2"}]
(sort-by :id response)))
(testing "Response hydrates creator"
@@ -85,10 +86,10 @@
(is (every? #(= lucky-id (get-in % [:creator :id])) response)))))
(testing "Returns 404 for non-existent job"
- (mt/user-http-request :lucky :get 404 "ee/transform-job/999999/transforms"))))))))
+ (mt/user-http-request :lucky :get 404 "transform-job/999999/transforms"))))))))
(deftest list-jobs-test
- (testing "GET /api/ee/transform-job"
+ (testing "GET /api/transform-job"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(let [at-5-second-schedule "5 * * * * ?"]
@@ -111,29 +112,29 @@
returned-jobs (fn [response] (into [] (filter (comp our-job-ids :id)) response))
returned-job-ids (fn [response] (into #{} (keep (comp our-job-ids :id)) response))]
(testing "listing without filtering"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-job")]
+ (let [response (mt/user-http-request :lucky :get 200 "transform-job")]
(is (= our-job-ids (returned-job-ids response)))))
(testing "filtering by tag_ids"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-job" :tag_ids [t2-id])]
+ (let [response (mt/user-http-request :lucky :get 200 "transform-job" :tag_ids [t2-id])]
(is (=? [{:schedule "0 0 0 * * ?"
:tag_ids [t2-id]
:name "Job 3"
:id j3-id}]
(returned-jobs response)))))
(testing "filtering by last_run_start_time"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-job" :last_run_start_time "2025-08-26~")]
+ (let [response (mt/user-http-request :lucky :get 200 "transform-job" :last_run_start_time "2025-08-26~")]
(is (= #{j2-id} (returned-job-ids response)))))
(testing "filtering by last_run_statuses"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-job" :last_run_statuses ["started" "succeeded"])]
+ (let [response (mt/user-http-request :lucky :get 200 "transform-job" :last_run_statuses ["started" "succeeded"])]
(is (= #{j2-id} (returned-job-ids response)))))
(testing "filtering by last_run_end_time without scheduled job"
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-job" :next_run_start_time "2025-08-26~")]
+ (let [response (mt/user-http-request :lucky :get 200 "transform-job" :next_run_start_time "2025-08-26~")]
(is (= #{} (returned-job-ids response)))))
(testing "filtering by last_run_end_time with scheduled job"
(mt/with-temp-scheduler!
(transforms.schedule/initialize-job! {:id j1-id, :schedule at-5-second-schedule})
(try
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-job" :next_run_start_time "2025-08-27~")]
+ (let [response (mt/user-http-request :lucky :get 200 "transform-job" :next_run_start_time "2025-08-27~")]
(is (=? [{:id j1-id
:last_run {:job_id j1-id
:run_method "cron"
@@ -148,15 +149,15 @@
(transforms.schedule/delete-job! j1-id))))))))))))
(deftest update-job-test
- (testing "PUT /api/ee/transform-job/:id"
+ (testing "PUT /api/transform-job/:id"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformTag tag1 {:name "tag-1"}
:model/TransformTag tag2 {:name "tag-2"}]
- (let [job (mt/user-http-request :lucky :post 200 "ee/transform-job"
+ (let [job (mt/user-http-request :lucky :post 200 "transform-job"
{:name "Original" :schedule "0 0 0 * * ?"})]
(testing "Updates job fields"
- (let [response (mt/user-http-request :lucky :put 200 (str "ee/transform-job/" (:id job))
+ (let [response (mt/user-http-request :lucky :put 200 (str "transform-job/" (:id job))
{:name "Updated"
:description "New Description"
:schedule "0 0 */2 * * ?"
@@ -167,42 +168,42 @@
(is (= (set [(:id tag1) (:id tag2)]) (set (:tag_ids response))))))
(testing "Validates cron expression"
- (let [response (mt/user-http-request :lucky :put 400 (str "ee/transform-job/" (:id job))
+ (let [response (mt/user-http-request :lucky :put 400 (str "transform-job/" (:id job))
{:schedule "invalid"})]
(is (string? response))
(is (re-find #"Invalid cron expression" response))))))))))
(deftest update-job-remove-tags-test
- (testing "PUT /api/ee/transform-job/:id"
+ (testing "PUT /api/transform-job/:id"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(testing "should be able to remove all tags from a job"
(mt/with-temp [:model/TransformTag tag {}
:model/TransformJob job {}
:model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag) :position 0}]
- (let [response (mt/user-http-request :lucky :put 200 (str "ee/transform-job/" (:id job))
+ (let [response (mt/user-http-request :lucky :put 200 (str "transform-job/" (:id job))
{:tag_ids []})]
(is (= [] (:tag_ids response))))))))))
(deftest delete-job-test
- (testing "DELETE /api/ee/transform-job/:id"
+ (testing "DELETE /api/transform-job/:id"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformJob job {:name "To Delete" :schedule "0 0 0 * * ?"}]
(testing "Deletes job"
- (mt/user-http-request :lucky :delete 204 (str "ee/transform-job/" (:id job)))
+ (mt/user-http-request :lucky :delete 204 (str "transform-job/" (:id job)))
(is (nil? (t2/select-one :model/TransformJob :id (:id job)))))
(testing "Returns 404 for non-existent job"
- (mt/user-http-request :lucky :delete 404 "ee/transform-job/999999")))))))
+ (mt/user-http-request :lucky :delete 404 "transform-job/999999")))))))
(deftest execute-job-test
- (testing "POST /api/ee/transform-job/:id/execute"
+ (testing "POST /api/transform-job/:id/execute"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformJob job {:name "To Execute" :schedule "0 0 0 * * ?"}]
(testing "Returns stub run response"
- (let [response (mt/user-http-request :lucky :post 200 (str "ee/transform-job/" (:id job) "/run"))]
+ (let [response (mt/user-http-request :lucky :post 200 (str "transform-job/" (:id job) "/run"))]
(is (= "Job run started" (:message response)))
(is (string? (:job_run_id response)))
(is (re-matches #"stub-\d+-\d+" (:job_run_id response))))))))))
@@ -211,11 +212,11 @@
(testing "All endpoints require transform permissions"
(mt/with-premium-features #{:transforms}
(mt/with-temp [:model/TransformJob job {:name "Test" :schedule "0 0 0 * * ?"}]
- (mt/user-http-request :rasta :post 403 "ee/transform-job"
+ (mt/user-http-request :rasta :post 403 "transform-job"
{:name "New" :schedule "0 0 0 * * ?"})
- (mt/user-http-request :rasta :get 403 "ee/transform-job")
- (mt/user-http-request :rasta :get 403 (str "ee/transform-job/" (:id job)))
- (mt/user-http-request :rasta :put 403 (str "ee/transform-job/" (:id job))
+ (mt/user-http-request :rasta :get 403 "transform-job")
+ (mt/user-http-request :rasta :get 403 (str "transform-job/" (:id job)))
+ (mt/user-http-request :rasta :put 403 (str "transform-job/" (:id job))
{:name "Updated"})
- (mt/user-http-request :rasta :delete 403 (str "ee/transform-job/" (:id job)))
- (mt/user-http-request :rasta :post 403 (str "ee/transform-job/" (:id job) "/run"))))))
+ (mt/user-http-request :rasta :delete 403 (str "transform-job/" (:id job)))
+ (mt/user-http-request :rasta :post 403 (str "transform-job/" (:id job) "/run"))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api/transform_tag_test.clj b/test/metabase/transforms/api/transform_tag_test.clj
similarity index 75%
rename from enterprise/backend/test/metabase_enterprise/transforms/api/transform_tag_test.clj
rename to test/metabase/transforms/api/transform_tag_test.clj
index f1a12c05d15..3168327eaa5 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/api/transform_tag_test.clj
+++ b/test/metabase/transforms/api/transform_tag_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.transforms.api.transform-tag-test
+(ns metabase.transforms.api.transform-tag-test
"Tests for transform tag CRUD API endpoints."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.transforms.models.transform-tag]
+ [metabase.models.transforms.transform-tag]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[metabase.util :as u]
@@ -11,12 +11,12 @@
(use-fixtures :once (fixtures/initialize :db :test-users))
(deftest create-tag-test
- (testing "POST /api/ee/transform-tag"
+ (testing "POST /api/transform-tag"
(mt/with-premium-features #{:transforms}
(mt/with-data-analyst-role! (mt/user->id :lucky)
(testing "Creates a new tag with valid name"
(let [tag-name (str "test-tag-" (u/generate-nano-id))
- response (mt/user-http-request :lucky :post 200 "ee/transform-tag"
+ response (mt/user-http-request :lucky :post 200 "transform-tag"
{:name tag-name})]
(try
(is (some? (:id response)))
@@ -29,27 +29,27 @@
(testing "Returns 400 for duplicate tag name"
(mt/with-temp [:model/TransformTag tag {}]
- (is (string? (mt/user-http-request :lucky :post 400 "ee/transform-tag"
+ (is (string? (mt/user-http-request :lucky :post 400 "transform-tag"
{:name (:name tag)}))
"Should return 400 with error message for duplicate name")))
(testing "Returns validation error for empty name"
- (let [response (mt/user-http-request :lucky :post "ee/transform-tag"
+ (let [response (mt/user-http-request :lucky :post "transform-tag"
{:name ""})]
(is (:errors response) "Should return validation errors for empty name"))
- (let [response (mt/user-http-request :lucky :post "ee/transform-tag"
+ (let [response (mt/user-http-request :lucky :post "transform-tag"
{:name " "})]
(is (:errors response) "Should return validation errors for blank name")))))))
(deftest update-tag-test
(mt/with-premium-features #{:transforms}
- (testing "PUT /api/ee/transform-tag/:tag-id"
+ (testing "PUT /api/transform-tag/:tag-id"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(testing "Updates tag name successfully"
(mt/with-temp [:model/TransformTag tag {}]
(let [updated-name (str "updated-" (u/generate-nano-id))
response (mt/user-http-request :lucky :put 200
- (str "ee/transform-tag/" (:id tag))
+ (str "transform-tag/" (:id tag))
{:name updated-name})]
(is (= (:id tag) (:id response)))
(is (= updated-name (:name response))))))
@@ -57,41 +57,41 @@
(testing "Returns 404 for non-existent tag"
(is (= "Not found."
(mt/user-http-request :lucky :put 404
- "ee/transform-tag/999999"
+ "transform-tag/999999"
{:name "new-name"}))))
(testing "Returns 400 when updating to duplicate name"
(mt/with-temp [:model/TransformTag existing-tag {}
:model/TransformTag tag-to-update {}]
(is (string? (mt/user-http-request :lucky :put 400
- (str "ee/transform-tag/" (:id tag-to-update))
+ (str "transform-tag/" (:id tag-to-update))
{:name (:name existing-tag)}))
"Should return 400 with error message for duplicate name")))))))
(deftest delete-tag-test
- (testing "DELETE /api/ee/transform-tag/:tag-id"
+ (testing "DELETE /api/transform-tag/:tag-id"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(testing "Deletes tag successfully"
(mt/with-temp [:model/TransformTag tag {}]
(is (t2/exists? :model/TransformTag :id (:id tag)))
- (mt/user-http-request :lucky :delete 204 (str "ee/transform-tag/" (:id tag)))
+ (mt/user-http-request :lucky :delete 204 (str "transform-tag/" (:id tag)))
(is (not (t2/exists? :model/TransformTag :id (:id tag))))))
(testing "Returns 404 for non-existent tag"
(is (= "Not found."
(mt/user-http-request :lucky :delete 404
- "ee/transform-tag/999999"))))))))
+ "transform-tag/999999"))))))))
(deftest list-tags-test
- (testing "GET /api/ee/transform-tag"
+ (testing "GET /api/transform-tag"
(mt/with-data-analyst-role! (mt/user->id :lucky)
(mt/with-premium-features #{:transforms}
(testing "Returns all tags ordered by name"
(mt/with-temp [:model/TransformTag tag1 {:name "tag 1"}
:model/TransformTag tag2 {:name "tag 3"}
:model/TransformTag tag3 {:name "tag 2"}]
- (let [response (mt/user-http-request :lucky :get 200 "ee/transform-tag")
+ (let [response (mt/user-http-request :lucky :get 200 "transform-tag")
tag-names (map :name response)]
;; Should include our test tags
(is (some #(= (:name tag1) %) tag-names))
@@ -103,16 +103,16 @@
(deftest permissions-test
(testing "Transform tag endpoints require data-analyst permissions"
(mt/with-premium-features #{:transforms}
- (testing "POST /api/ee/transform-tag"
- (is (string? (mt/user-http-request :rasta :post 403 "ee/transform-tag"
+ (testing "POST /api/transform-tag"
+ (is (string? (mt/user-http-request :rasta :post 403 "transform-tag"
{:name "test"}))))
- (testing "GET /api/ee/transform-tag"
- (is (string? (mt/user-http-request :rasta :get 403 "ee/transform-tag"))))
+ (testing "GET /api/transform-tag"
+ (is (string? (mt/user-http-request :rasta :get 403 "transform-tag"))))
- (testing "PUT /api/ee/transform-tag/:tag-id"
- (is (string? (mt/user-http-request :rasta :put 403 "ee/transform-tag/1"
+ (testing "PUT /api/transform-tag/:tag-id"
+ (is (string? (mt/user-http-request :rasta :put 403 "transform-tag/1"
{:name "test"}))))
- (testing "DELETE /api/ee/transform-tag/:tag-id"
- (is (string? (mt/user-http-request :rasta :delete 403 "ee/transform-tag/1")))))))
+ (testing "DELETE /api/transform-tag/:tag-id"
+ (is (string? (mt/user-http-request :rasta :delete 403 "transform-tag/1")))))))
diff --git a/test/metabase/transforms/api/transform_test.clj b/test/metabase/transforms/api/transform_test.clj
new file mode 100644
index 00000000000..ce5e0d7772b
--- /dev/null
+++ b/test/metabase/transforms/api/transform_test.clj
@@ -0,0 +1,1672 @@
+(ns ^:mb/driver-tests metabase.transforms.api.transform-test
+ "Tests for /api/transform endpoints."
+ (:require
+ [clojure.test :refer :all]
+ [medley.core :as m]
+ [metabase.driver :as driver]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.models.transforms.transform :as transform.model]
+ [metabase.permissions.core :as perms]
+ [metabase.permissions.models.permissions-group :as perms-group]
+ [metabase.query-processor :as qp]
+ [metabase.search.test-util :as search.tu]
+ [metabase.test :as mt]
+ [metabase.transforms.api.transform]
+ [metabase.transforms.query-test-util :as query-test-util]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :refer [get-test-schema
+ parse-instant
+ utc-timestamp
+ with-transform-cleanup!]]
+ [metabase.transforms.util :as transforms.util]
+ [metabase.util :as u]
+ [toucan2.core :as t2]))
+
+(set! *warn-on-reflection* true)
+
+;;; ------------------------------------------------------------
+;;; Assertion Helpers
+;;; ------------------------------------------------------------
+
+(defn assert-run-count
+ "Assert that the response contains the expected number of runs."
+ [response expected-count]
+ (is (= expected-count (count (:data response)))
+ (str "Expected " expected-count " runs, got " (count (:data response)))))
+
+(defn assert-transform-ids
+ "Assert that the response contains runs for exactly the expected transform IDs."
+ [response expected-ids]
+ (let [actual-ids (set (map :transform_id (:data response)))]
+ (is (= expected-ids actual-ids)
+ (str "Expected transform IDs " expected-ids ", got " actual-ids))))
+
+(defn- search-transform-ids
+ [search-term]
+ (into #{}
+ (comp (filter #(= "transform" (name (:model %))))
+ (map :id))
+ (search.tu/search-results search-term)))
+
+(defn- make-query
+ "Create a query filtering products by category, using shared utility.
+ Returns a legacy MBQL query structure for API compatibility."
+ [category]
+ (let [table-name (t2/select-one-fn :name :model/Table (mt/id :transforms_products))]
+ (query-test-util/make-query
+ {:source-table table-name
+ :source-column "category"
+ :filter-fn lib/=
+ :filter-values [category]})))
+
+(deftest create-transform-test
+ (mt/with-premium-features #{}
+ (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)
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (with-transform-cleanup! [table-name "gadget_products"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ response (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Gadget Products"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})
+ transform-id (:id response)
+ lucky-id (mt/user->id :lucky)
+ creator-id (t2/select-one-fn :creator_id :model/Transform transform-id)]
+ (testing "Response includes creator_id"
+ (is (= lucky-id (:creator_id response))))
+ (testing "Database record has creator_id set correctly"
+ (is (= lucky-id creator-id)))
+ (testing "Response hydrates creator"
+ (is (map? (:creator response)))
+ (is (= lucky-id (get-in response [:creator :id]))))
+ (testing "Response includes owner_user_id defaulting to creator"
+ (is (= lucky-id (:owner_user_id response))))
+ (testing "Response hydrates owner"
+ (is (map? (:owner response)))
+ (is (= lucky-id (get-in response [:owner :id]))))))))))))
+
+(deftest create-transform-with-owner-test
+ (mt/with-premium-features #{}
+ (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"
+ (with-transform-cleanup! [table-name "owner_user_id_test"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ rasta-id (mt/user->id :rasta)
+ response (mt/user-http-request :crowberto :post 200 "transform"
+ {:name "Transform with explicit owner"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}
+ :owner_user_id rasta-id})]
+ (is (= rasta-id (:owner_user_id response))
+ "owner_user_id should match the specified user")
+ (is (nil? (:owner_email response))
+ "owner_email should be nil when owner_user_id is set")
+ (is (= rasta-id (get-in response [:owner :id]))
+ "Hydrated owner should match the specified user"))))))))
+
+(deftest create-transform-with-external-email-test
+ (mt/with-premium-features #{}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (testing "Creating a transform with external owner_email"
+ (with-transform-cleanup! [table-name "owner_email_test"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ response (mt/user-http-request :crowberto :post 200 "transform"
+ {:name "Transform with external owner"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}
+ :owner_email "[email protected]"})]
+ (is (nil? (:owner_user_id response))
+ "owner_user_id should be nil when owner_email is set")
+ (is (= "[email protected]" (:owner_email response))
+ "owner_email should match the specified email")
+ (is (= {:email "[email protected]"} (:owner response))
+ "Hydrated owner should be email-only map"))))))))
+
+(deftest update-transform-owner-test
+ (mt/with-premium-features #{}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (with-transform-cleanup! [table-name "update_owner_test"]
+ (let [query (make-query "Gadget")
+ schema (get-test-schema)
+ created (mt/user-http-request :crowberto :post 200 "transform"
+ {:name "Transform for owner update"
+ :source {:type "query"
+ :query query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})
+ transform-id (:id created)
+ crowberto-id (mt/user->id :crowberto)
+ rasta-id (mt/user->id :rasta)]
+ (testing "Initial owner is the creator"
+ (is (= crowberto-id (:owner_user_id created))))
+ (testing "Update owner to a different user"
+ (let [updated (mt/user-http-request :crowberto :put 200
+ (format "transform/%s" transform-id)
+ {:owner_user_id rasta-id})]
+ (is (= rasta-id (:owner_user_id updated)))
+ (is (nil? (:owner_email updated)))
+ (is (= rasta-id (get-in updated [:owner :id])))))
+ (testing "Update owner to external email"
+ (let [updated (mt/user-http-request :crowberto :put 200
+ (format "transform/%s" transform-id)
+ {:owner_email "[email protected]"
+ :owner_user_id nil})]
+ (is (nil? (:owner_user_id updated)))
+ (is (= "[email protected]" (:owner_email updated)))
+ (is (= {:email "[email protected]"} (:owner updated)))))
+ (testing "Clear owner by setting both to nil"
+ (let [updated (mt/user-http-request :crowberto :put 200
+ (format "transform/%s" transform-id)
+ {:owner_user_id nil
+ :owner_email nil})]
+ (is (nil? (:owner_user_id updated)))
+ (is (nil? (:owner_email updated)))
+ (is (nil? (:owner updated)))))))))))
+
+(deftest transform-type-detection-test
+ (mt/with-premium-features #{}
+ (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
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (testing "MBQL query transforms are detected as :mbql"
+ (with-transform-cleanup! [table-name "mbql_transform"]
+ (let [mbql-query (mt/mbql-query transforms_products)
+ schema (get-test-schema)
+ response (mt/user-http-request :lucky :post 200 "transform"
+ {:name "MBQL Transform"
+ :source {:type "query"
+ :query mbql-query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})]
+ (is (= "mbql" (:source_type response))))))
+ (testing "Native query transforms are detected as :native"
+ (with-transform-cleanup! [table-name "native_transform"]
+ (let [schema (get-test-schema)
+ response (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Native Transform"
+ :source {:type "query"
+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})]
+ (is (= "native" (:source_type response)))))))))))))
+
+(deftest transform-type-updates-test
+ (mt/with-premium-features #{}
+ (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
+ (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 "type_update_transform"]
+ (let [native-query (lib/native-query (mt/metadata-provider) "SELECT 1")
+ mbql-query (mt/mbql-query transforms_products)
+ schema (get-test-schema)
+ created (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Native Transform"
+ :source {:type "query"
+ :query native-query}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})]
+ (is (= "native" (:source_type created)))
+ (testing "Type automatically changes to mbql when updating to an MBQL query"
+ (let [updated (mt/user-http-request :lucky :put 200
+ (format "transform/%s" (:id created))
+ {:source {:type "query"
+ :query mbql-query}})]
+ (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))))))))))))
+
+(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))))))))))))
+
+(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))))))))))))
+
+(deftest list-transforms-test
+ (mt/with-premium-features #{}
+ (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"
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/user-http-request :lucky :get 200 "transform")))
+ (testing "Can list with query parameters"
+ (mt/dataset transforms-dataset/transforms-test
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (with-transform-cleanup! [table-name "gadget_products"]
+ (let [body {:name "Gadget Products"
+ :description "Desc"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}}
+ _ (mt/user-http-request :lucky :post 200 "transform" body)
+ list-resp (mt/user-http-request :lucky :get 200 "transform")
+ lucky-id (mt/user->id :lucky)]
+ (is (seq list-resp))
+ (testing "List response hydrates creator"
+ (is (every? #(map? (:creator %)) list-resp))
+ (is (some #(= lucky-id (get-in % [:creator :id])) list-resp)))
+ (testing "List response includes source_readable field"
+ (is (every? #(contains? % :source_readable) list-resp))
+ (is (some #(true? (:source_readable %)) list-resp)
+ "At least one transform should have readable sources")))))))))))
+
+(deftest filter-transforms-test
+ (mt/with-premium-features #{}
+ (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)
+ (mt/with-temp [:model/Transform {t1-id :id} {}
+ :model/Transform {t2-id :id} {}
+ :model/TransformTag {tag1-id :id} {:name "tag1"}
+ :model/TransformTag {tag2-id :id} {:name "tag2"}
+ :model/TransformTransformTag _ {:transform_id t1-id :tag_id tag1-id :position 1}
+ :model/TransformTransformTag _ {:transform_id t2-id :tag_id tag2-id :position 1}
+ :model/TransformRun _ {:transform_id t1-id :status "started" :run_method "manual"
+ :start_time (parse-instant "2025-08-26T10:12:11")
+ :end_time nil
+ :is_active true}]
+ (testing "no filters"
+ (is (=? [{:id t1-id} {:id t2-id}]
+ (mt/user-http-request :lucky :get 200 "transform"))))
+ (testing "last_run_start_time filter"
+ (is (=? [{:id t1-id}]
+ (mt/user-http-request :lucky :get 200 "transform" :last_run_start_time "2025-08-26T10:12:11"))))
+ (testing "last_run_statuses filter"
+ (is (=? [{:id t1-id}]
+ (mt/user-http-request :lucky :get 200 "transform" :last_run_statuses ["started" "succeeded"]))))
+ (testing "tag_ids filter"
+ (is (=? [{:id t1-id}]
+ (mt/user-http-request :lucky :get 200 "transform" :tag_ids [tag1-id])))
+ (is (=? [{:id t2-id}]
+ (mt/user-http-request :lucky :get 200 "transform" :tag_ids [tag2-id]))))))))))
+
+(deftest get-transforms-test
+ (mt/with-premium-features #{}
+ (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)
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (with-transform-cleanup! [table-name "gadget_products"]
+ (let [body {:name "Gadget Products"
+ :description "Desc"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}}
+ resp (mt/user-http-request :lucky :post 200 "transform" body)
+ get-resp (mt/user-http-request :lucky :get 200 (format "transform/%s" (:id resp)))
+ lucky-id (mt/user->id :lucky)]
+ (is (=? (m/dissoc-in body [:source :query :lib/metadata])
+ (update-in get-resp [:source :query] lib/normalize)))
+ (testing "GET response hydrates creator"
+ (is (map? (:creator get-resp)))
+ (is (= lucky-id (get-in get-resp [:creator :id]))))))))))))
+
+(deftest source-readable-field-test
+ (mt/with-premium-features #{}
+ (testing "Transforms API includes source_readable field"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (with-transform-cleanup! [table-name "test_readable"]
+ (let [body {:name "Test Transform"
+ :description "Test"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}}]
+ (testing "Users with transforms permission can see source_readable field"
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (let [created (mt/user-http-request :lucky :post 200 "transform" body)]
+ (testing "in POST /transform response"
+ (is (contains? created :source_readable))
+ (is (boolean? (:source_readable created))))
+ (testing "in GET /transform response"
+ (let [list-resp (mt/user-http-request :lucky :get 200 "transform")]
+ (is (every? #(contains? % :source_readable) list-resp))
+ (is (every? #(boolean? (:source_readable %)) list-resp))))
+ (testing "in GET /transform/:id response"
+ (let [get-resp (mt/user-http-request :lucky :get 200 (format "transform/%s" (:id created)))]
+ (is (contains? get-resp :source_readable))
+ (is (boolean? (:source_readable get-resp)))))
+ (testing "source_readable is true when user has database read permission"
+ (let [get-resp (mt/user-http-request :lucky :get 200 (format "transform/%s" (:id created)))]
+ (is (true? (:source_readable get-resp))
+ "User with transforms permission should be able to read the source database"))))))))))))))
+
+(defn- ->transform [transform-name query]
+ {:source {:type "query",
+ :query query}
+ :name transform-name
+ :target {:schema "public"
+ :name "orders_2"
+ :type "table"}})
+
+(deftest get-transform-dependencies-test
+ (mt/with-premium-features #{}
+ (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"}
+ :model/Field _ {:table_id table, :name "foo"}
+ :model/Transform parent (->transform "transform1" (mt/mbql-query orders))
+ :model/Transform child (-> (->transform "transform2" (mt/mbql-query nil {:source-table table}))
+ (assoc-in [:target :name] "orders_3"))]
+ (let [deps-resp (mt/user-http-request :lucky :get 200 (format "transform/%s/dependencies" (:id child)))]
+ (is (=? [{:name "transform1"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :lib/type "mbql/query"
+ :stages [{:source-table (mt/id :orders)}]}}
+ :id (:id parent)
+ :entity_id (:entity_id parent)
+ :target {:schema "public", :name "orders_2", :type "table"}}]
+ deps-resp))
+ (testing "Dependencies response hydrates creator"
+ (is (every? #(map? (:creator %)) deps-resp)))))))))
+
+(deftest put-transforms-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)
+ (with-transform-cleanup! [table-name "gadget_products"]
+ (let [query2 (make-query "None")
+ resp (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Gadget Products"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}})
+ transform {:name "Gadget Products 2"
+ :description "Desc"
+ :source {:type "query"
+ :query query2}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}}
+ put-resp (mt/user-http-request :lucky :put 200 (format "transform/%s" (:id resp))
+ transform)
+ lucky-id (mt/user->id :lucky)]
+ (is (=? (m/dissoc-in transform [:source :query :lib/metadata])
+ (update-in put-resp [:source :query] lib/normalize)))
+ (testing "PUT response hydrates creator"
+ (is (map? (:creator put-resp)))
+ (is (= lucky-id (get-in put-resp [:creator :id]))))))))))))
+
+(deftest change-target-table-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)
+ (with-transform-cleanup! [table1-name "dookey_products"
+ table2-name "doohickey_products"]
+ (let [query2 (make-query "Doohickey")
+ original {:name "Gadget Products"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table1-name}}
+ resp (mt/user-http-request :lucky :post 200 "transform"
+ original)
+ updated {:name "Doohickey Products"
+ :description "Desc"
+ :source {:type "query"
+ :query query2}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table2-name}}]
+ (is (=? (-> updated
+ (m/dissoc-in [:source :query :lib/metadata]))
+ (-> (mt/user-http-request :lucky :put 200 (format "transform/%s" (:id resp)) updated)
+ (update-in [:source :query] lib/normalize))))
+ (is (false? (transforms.util/target-table-exists? original)))))))))))
+
+(deftest delete-transforms-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)
+ (with-transform-cleanup! [table-name "gadget_products"]
+ (let [resp (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Gadget Products"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}})]
+ (mt/user-http-request :lucky :delete 204 (format "transform/%s" (:id resp)))
+ (mt/user-http-request :lucky :get 404 (format "transform/%s" (:id resp)))))))))))
+
+(deftest delete-table-transforms-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)
+ (with-transform-cleanup! [table-name "gadget_products"]
+ (let [resp (mt/user-http-request :lucky :post 200 "transform"
+ {:name "Gadget Products"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}})]
+ (mt/user-http-request :lucky :delete 204 (format "transform/%s/table" (:id resp)))))))))))
+
+(defn- test-run!
+ [transform-id]
+ (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (let [resp (mt/user-http-request :lucky :post 202 (format "transform/%s/run" transform-id))
+ timeout-s 10 ; 10 seconds is our timeout to finish execution and sync
+ limit (+ (System/currentTimeMillis) (* timeout-s 1000))]
+ (is (=? {:message "Transform run started"}
+ resp))
+ (loop []
+ (when (> (System/currentTimeMillis) limit)
+ (throw (ex-info (str "Transform run timed out after " timeout-s " seconds") {})))
+ (let [resp (mt/user-http-request :lucky :get 200 (format "transform/%s" transform-id))
+ status (some-> resp :last_run :status keyword)]
+ (when-not (contains? #{:started :succeeded} status)
+ (throw (ex-info (str "Transform run failed with status " status) {:resp resp})))
+ (when-not (some? (:table resp))
+ (Thread/sleep 100)
+ (recur))))))))
+
+(defn- check-query-results
+ "Verifies that a transform successfully created a table with expected data.
+
+ Uses a simple count-based approach that works reliably across all drivers
+ without depending on field metadata being synced.
+
+ Args:
+ table-name - Name of the table created by the transform
+ ids - Vector of expected product IDs (for count validation)
+ category - The category filter used (e.g., \"Gadget\" or \"Doohickey\")"
+ [table-name ids category]
+ ;; Use the metadata provider to find the table
+ (let [mp (mt/metadata-provider)
+ ;; Find the table by name
+ table (m/find-first (comp #{table-name} :name)
+ (lib.metadata/tables mp))]
+ (when-not table
+ (throw (ex-info (str "Table not found in metadata: " table-name)
+ {:table-name table-name})))
+
+ ;; Build a query for the table
+ (let [base-query (lib/query mp table)
+ ;; Find the category column
+ category-column (m/find-first
+ (comp #{"category"} u/lower-case-en :name)
+ (lib/visible-columns base-query))
+ ;; Filter by category and count rows
+ filtered-query (if category-column
+ (lib/filter base-query (lib/= category-column category))
+ base-query)
+ count-query (lib/aggregate filtered-query (lib/count))
+ result (qp/process-query count-query)
+ actual-count (-> (mt/formatted-rows [int] result) first first)]
+ ;; Verify we got the expected number of rows
+ (is (= (count ids) actual-count)
+ (str "Expected " (count ids) " rows with category " category
+ " in table " table-name ", but got " actual-count)))))
+
+(defn- wait-for-table
+ "Wait for a table to appear in metadata, with timeout.
+ Copied from execute_test.clj - will consolidate later."
+ [table-name timeout-ms]
+ (let [mp (mt/metadata-provider)
+ limit (+ (System/currentTimeMillis) timeout-ms)]
+ (loop []
+ (Thread/sleep 200)
+ (when (> (System/currentTimeMillis) limit)
+ (throw (ex-info "table has not been created" {:table-name table-name, :timeout-ms timeout-ms})))
+ (or (m/find-first (comp #{table-name} :name) (lib.metadata/tables mp))
+ (recur)))))
+
+(deftest execute-transform-test
+ (mt/with-premium-features #{}
+ (testing "transform execution with :transforms/table target"
+ (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)
+ (let [schema (t2/select-one-fn :schema :model/Table (mt/id :transforms_products))]
+ (with-transform-cleanup! [{table1-name :name :as target1} {:type "table"
+ :schema schema
+ :name "gadget_products"}
+ {table2-name :name :as target2} {:type "table"
+ :schema schema
+ :name "doohickey_products"}]
+ (let [query2 (make-query "Doohickey")
+ original {:name "Gadget Products"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target target1}
+ {transform-id :id} (mt/user-http-request :lucky :post 200 "transform"
+ original)
+ _ (do (test-run! transform-id)
+ (wait-for-table table1-name 5000))
+ _ (is (true? (transforms.util/target-table-exists? original)))
+ _ (check-query-results table1-name [5 11 16] "Gadget")
+ updated {:name "Doohickey Products"
+ :description "Desc"
+ :source {:type "query"
+ :query query2}
+ :target target2}]
+ (is (=? (-> updated
+ (m/dissoc-in [:source :query :lib/metadata]))
+ (->
+ (mt/user-http-request :lucky :put 200 (format "transform/%s" transform-id) updated)
+ (update-in [:source :query] lib/normalize))))
+ (test-run! transform-id)
+ (wait-for-table table2-name 5000)
+ (is (true? (transforms.util/target-table-exists? original)))
+ (is (true? (transforms.util/target-table-exists? updated)))
+ (check-query-results table2-name [2 3 4 13] "Doohickey")))))))))))
+
+(deftest get-runs-filter-by-single-transform-id-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - filter by single transform ID"
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-temp [:model/Transform transform1 {}
+ :model/Transform transform2 {}
+ :model/TransformRun run1 {:transform_id (:id transform1)}
+ :model/TransformRun run2 {:transform_id (:id transform2)}]
+ (testing "Filter by transform1 ID only returns transform1 runs"
+ (let [response (mt/user-http-request :lucky :get 200 "transform/run"
+ :transform_ids [(:id transform1)])]
+ (assert-run-count response 1)
+ (assert-transform-ids response #{(:id transform1)})
+ (is (= (:id run1) (-> response :data first :id)))))
+ (testing "Filter by transform2 ID only returns transform2 runs"
+ (let [response (mt/user-http-request :lucky :get 200 "transform/run"
+ :transform_ids [(:id transform2)])]
+ (assert-run-count response 1)
+ (assert-transform-ids response #{(:id transform2)})
+ (is (= (:id run2) (-> response :data first :id))))))))))
+
+(deftest get-runs-filter-by-multiple-transform-ids-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - filter by multiple transform IDs"
+ (mt/with-temp [:model/Transform transform1 {}
+ :model/Transform transform2 {}
+ :model/Transform transform3 {}
+ :model/TransformRun _run1 {:transform_id (:id transform1)}
+ :model/TransformRun _run2 {:transform_id (:id transform2)}
+ :model/TransformRun _run3 {:transform_id (:id transform3)}]
+ (testing "Filter by transform1 and transform2 IDs returns only those runs"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_ids [(:id transform1) (:id transform2)])]
+ (assert-run-count response 2)
+ (assert-transform-ids response #{(:id transform1) (:id transform2)})))))))
+
+(deftest get-runs-filter-by-single-status-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - filter by single status"
+ (mt/with-temp [:model/Transform transform {}
+ :model/TransformRun _run1 {:transform_id (:id transform) :status "succeeded"}
+ :model/TransformRun _run2 {:transform_id (:id transform) :status "failed"}
+ :model/TransformRun _run3 {:transform_id (:id transform) :status "failed"}]
+ (testing "Filter by 'failed' status returns only failed runs"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :statuses ["failed"])]
+ (is (>= (count (:data response)) 2))
+ (is (every? #(= "failed" (:status %))
+ (filter #(= (:id transform) (:transform_id %)) (:data response))))))
+ (testing "Filter by 'succeeded' status returns only succeeded runs"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :statuses ["succeeded"])]
+ (is (>= (count (:data response)) 1))
+ (is (some #(and (= "succeeded" (:status %))
+ (= (:id transform) (:transform_id %)))
+ (:data response)))))))))
+
+(defn- transform-runs
+ [our-pred & filters]
+ (let [response (apply mt/user-http-request :crowberto :get 200 "transform/run" filters)]
+ (filter our-pred (:data response))))
+
+(defn- with-clean-transform-runs-fn [f]
+ (let [existing (t2/select :model/TransformRun)]
+ (try
+ (t2/delete! :model/TransformRun)
+ (f)
+ (finally
+ (t2/delete! :model/TransformRun)
+ (when (seq existing)
+ (t2/insert! :model/TransformRun existing))))))
+
+(defmacro with-clean-transform-runs [& body]
+ `(with-clean-transform-runs-fn (fn [] ~@body)))
+
+(deftest get-runs-filter-by-multiple-statuses-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - filter by multiple statuses"
+ (with-clean-transform-runs
+ (mt/with-temp [:model/Transform {t0-id :id} {}
+ :model/Transform {t1-id :id} {}
+ :model/TransformRun {r0-id :id} {:transform_id t0-id :status "timeout" :run_method "cron"
+ :start_time (parse-instant "2025-08-25T10:12:11")
+ :end_time (parse-instant "2025-08-26T10:52:17")}
+ :model/TransformRun {r1-id :id} {:transform_id t0-id :status "succeeded" :run_method "manual"
+ :start_time (parse-instant "2025-08-26T10:12:11")
+ :end_time (parse-instant "2025-08-27T10:52:17")}
+ :model/TransformRun {r2-id :id} {:transform_id t1-id :status "succeeded" :run_method "cron"
+ :start_time (parse-instant "2025-08-22T10:12:11")
+ :end_time (parse-instant "2025-08-22T10:12:17")}
+ :model/TransformRun {r3-id :id} {:transform_id t1-id :status "succeeded" :run_method "manual"
+ :start_time (parse-instant "2025-08-22T23:57:34")
+ :end_time (parse-instant "2025-08-23T00:17:41")}
+ :model/TransformRun {_r4-id :id} {:transform_id t1-id :status "failed" :run_method "cron"
+ :start_time (parse-instant "2025-08-25T15:22:18")
+ :end_time (parse-instant "2025-08-25T19:12:17")}
+ :model/TransformRun {_r5-id :id} {:transform_id t1-id :status "timeout" :run_method "manual"
+ :start_time (parse-instant "2025-08-25T20:29:58")
+ :end_time (parse-instant "2025-08-25T22:12:17")}
+ :model/TransformRun {_r6-id :id} {:transform_id t1-id :status "started" :run_method "cron"
+ :start_time (parse-instant "2025-08-25T23:56:04")
+ :end_time nil :is_active true}]
+ (let [our-run-pred (comp #{t0-id t1-id} :transform_id)
+ t0-runs [{:id r1-id
+ :start_time (utc-timestamp "2025-08-26T10:12:11")
+ :end_time (utc-timestamp "2025-08-27T10:52:17")
+ :run_method "manual"
+ :status "succeeded"
+ :transform {:id t0-id}
+ :transform_id t0-id}
+ {:id r0-id
+ :start_time (utc-timestamp "2025-08-25T10:12:11")
+ :end_time (utc-timestamp "2025-08-26T10:52:17")
+ :run_method "cron"
+ :status "timeout"
+ :transform {:id t0-id}
+ :transform_id t0-id}]]
+ (testing "Filter by 'succeeded' and 'failed' returns both types"
+ (let [statuses #{"succeeded" "failed" "started"}
+ our-runs (transform-runs our-run-pred :statuses (vec statuses))]
+ (is (= 5 (count our-runs)))
+ (is (every? #(contains? statuses (:status %)) our-runs))))
+ (testing "Filter by 'start_time'"
+ (is (=? [{:id r1-id
+ :start_time (utc-timestamp "2025-08-26T10:12:11")
+ :end_time (utc-timestamp "2025-08-27T10:52:17")
+ :run_method "manual"
+ :status "succeeded"
+ :transform {:id t0-id}
+ :transform_id t0-id}]
+ (transform-runs our-run-pred :start_time "2025-08-26~")))
+ (let [our-runs (transform-runs our-run-pred :start_time "~2025-08-25")]
+ (is (= 6 (count our-runs))))
+ (let [our-runs (transform-runs our-run-pred :start_time "2025-08-22~2025-08-23")]
+ (is (=? [{:transform {:id t1-id}
+ :run_method "manual"
+ :is_active nil
+ :start_time (utc-timestamp "2025-08-22T23:57:34")
+ :end_time (utc-timestamp "2025-08-23T00:17:41")
+ :transform_id t1-id
+ :status "succeeded"
+ :id r3-id}
+ {:transform {:id t1-id}
+ :run_method "cron"
+ :is_active nil
+ :start_time (utc-timestamp "2025-08-22T10:12:11")
+ :end_time (utc-timestamp "2025-08-22T10:12:17")
+ :transform_id t1-id
+ :status "succeeded"
+ :id r2-id}]
+ our-runs))))
+ (testing "Filter by 'end_time'"
+ (is (=? t0-runs
+ (transform-runs our-run-pred :end_time "2025-08-26~")))
+ (is (empty? (transform-runs our-run-pred :end_time "~2025-08-21"))))
+ (testing "Filter by 'run_methods'"
+ (let [our-runs (transform-runs our-run-pred :run_methods ["manual"])]
+ (is (= 3 (count our-runs)))
+ (is (every? (comp #{"manual"} :run_method) our-runs)))
+ (let [our-runs (transform-runs our-run-pred :run_methods ["cron"])]
+ (is (= 4 (count our-runs)))
+ (is (every? (comp #{"cron"} :run_method) our-runs)))
+ (let [our-runs (transform-runs our-run-pred :run_methods ["cron" "manual"])]
+ (is (= 7 (count our-runs)))))
+ (testing "Filter by a combination"
+ (is (=? [{:id r3-id
+ :status "succeeded"
+ :run_method "manual"
+ :start_time (utc-timestamp "2025-08-22T23:57:34")
+ :end_time (utc-timestamp "2025-08-23T00:17:41")
+ :transform {:id t1-id}
+ :transform_id t1-id}]
+ (transform-runs our-run-pred :run_methods ["manual"] :start_time "~2025-08-25" :end_time "~2025-08-23"))))))))))
+
+(deftest get-runs-filter-by-single-tag-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - filter by single tag"
+ (mt/with-temp [:model/Transform transform1 {}
+ :model/Transform transform2 {}
+ :model/Transform transform3 {}
+ :model/TransformTag tag1 {}
+ :model/TransformTag _tag2 {}
+ :model/TransformTag _tag3 {}
+ :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
+ :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag1) :position 0}
+ :model/TransformRun _run1 {:transform_id (:id transform1)}
+ :model/TransformRun _run2 {:transform_id (:id transform2)}
+ :model/TransformRun _run3 {:transform_id (:id transform3)}]
+ (testing "Filter by tag1 returns only tagged transforms' runs"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_tag_ids [(:id tag1)])]
+ (assert-run-count response 2)
+ (assert-transform-ids response #{(:id transform1) (:id transform2)})
+ (is (not (contains? (set (map :transform_id (:data response)))
+ (:id transform3))))))))))
+
+(deftest get-runs-filter-by-multiple-tags-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - filter by multiple tags (union)"
+ (mt/with-temp [:model/Transform transform1 {:name "Transform with tag1"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"
+ :template-tags {}}}}
+ :target {:type "table"
+ :name (str "test_table_1_" (u/generate-nano-id))}}
+ :model/Transform transform2 {:name "Transform with both tags"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 2"
+ :template-tags {}}}}
+ :target {:type "table"
+ :name (str "test_table_2_" (u/generate-nano-id))}}
+ :model/Transform transform3 {:name "Transform with tag2"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 3"
+ :template-tags {}}}}
+ :target {:type "table"
+ :name (str "test_table_3_" (u/generate-nano-id))}}
+ :model/Transform transform4 {:name "Untagged Transform"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 4"
+ :template-tags {}}}}
+ :target {:type "table"
+ :name (str "test_table_4_" (u/generate-nano-id))}}
+ :model/TransformTag tag1 {}
+ :model/TransformTag tag2 {}
+ :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
+ :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag1) :position 0}
+ :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag2) :position 1}
+ :model/TransformTransformTag _ {:transform_id (:id transform3) :tag_id (:id tag2) :position 0}
+ :model/TransformRun _run1 {:transform_id (:id transform1)}
+ :model/TransformRun _run2 {:transform_id (:id transform2)}
+ :model/TransformRun _run3 {:transform_id (:id transform3)}
+ :model/TransformRun _run4 {:transform_id (:id transform4)}]
+ ;; Associate tags with transforms
+ (testing "Filter by tag1 and tag2 returns union (transforms with either tag)"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_tag_ids [(:id tag1) (:id tag2)])
+ returned-transform-ids (set (map :transform_id (:data response)))]
+ (assert-run-count response 3)
+ (assert-transform-ids response #{(:id transform1) (:id transform2) (:id transform3)})
+ (is (not (contains? returned-transform-ids (:id transform4))))))))))
+
+(deftest get-runs-combine-transform-id-and-status-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - combine transform ID and status filters"
+ (mt/with-temp [:model/Transform transform1 {:name "Transform 1"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"
+ :template-tags {}}}}
+ :target {:type "table"
+ :name (str "test_table_1_" (u/generate-nano-id))}}
+ :model/Transform transform2 {:name "Transform 2"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 2"
+ :template-tags {}}}}
+ :target {:type "table"
+ :name (str "test_table_2_" (u/generate-nano-id))}}
+ :model/TransformRun _run1 {:transform_id (:id transform1) :status "succeeded"}
+ :model/TransformRun _run1 {:transform_id (:id transform1) :status "failed"}
+ :model/TransformRun _run1 {:transform_id (:id transform1) :status "failed"}
+ :model/TransformRun _run1 {:transform_id (:id transform2) :status "failed"}]
+ ;; Create multiple runs with different statuses for transform1
+ (testing "Filter by transform1 ID and failed status"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_ids [(:id transform1)]
+ :statuses ["failed"])]
+ (assert-run-count response 2)
+ (is (every? #(and (= (:id transform1) (:transform_id %))
+ (= "failed" (:status %)))
+ (:data response)))))))))
+
+(deftest get-runs-combine-tag-and-status-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - combine tag and status filters"
+ (mt/with-temp [:model/Transform transform1 {}
+ :model/Transform transform2 {}
+ :model/Transform transform3 {}
+ :model/TransformTag tag1 {}
+ :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
+ :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag1) :position 0}
+ :model/TransformRun _run1 {:transform_id (:id transform1) :status "succeeded"}
+ :model/TransformRun _run1 {:transform_id (:id transform2) :status "failed"}
+ :model/TransformRun _run1 {:transform_id (:id transform3) :status "failed"}
+ :model/TransformRun _run1 {:transform_id (:id transform2) :status "succeeded"}]
+ ;; Associate tag1 with transform1 and transform2
+ (testing "Filter by tag1 and failed status returns only failed runs of tagged transforms"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_tag_ids [(:id tag1)]
+ :statuses ["failed"])]
+ (assert-run-count response 1)
+ (is (= (:id transform2) (-> response :data first :transform_id)))
+ (is (= "failed" (-> response :data first :status)))))))))
+
+(deftest get-runs-intersect-transform-id-and-tag-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/transform/run - intersection of transform IDs and tags"
+ (mt/with-temp [:model/Transform transform1 {}
+ :model/Transform transform2 {}
+ :model/TransformTag tag1 {}
+ :model/TransformTag tag2 {}
+ :model/TransformTransformTag _ {:transform_id (:id transform1) :tag_id (:id tag1) :position 0}
+ :model/TransformTransformTag _ {:transform_id (:id transform2) :tag_id (:id tag2) :position 0}
+ :model/TransformRun _run1 {:transform_id (:id transform1)}
+ :model/TransformRun _run1 {:transform_id (:id transform2)}]
+ (testing "Filter by transform1 ID and tag1 returns transform1 (has both)"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_ids [(:id transform1)]
+ :transform_tag_ids [(:id tag1)])]
+ (assert-run-count response 1)
+ (assert-transform-ids response #{(:id transform1)})))
+ (testing "Filter by transform1 ID and tag2 returns empty (transform1 doesn't have tag2)"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_ids [(:id transform1)]
+ :transform_tag_ids [(:id tag2)])]
+ (assert-run-count response 0)))
+ (testing "Filter by both transform IDs and tag1 returns only transform1"
+ (let [response (mt/user-http-request :crowberto :get 200 "transform/run"
+ :transform_ids [(:id transform1) (:id transform2)]
+ :transform_tag_ids [(:id tag1)])]
+ (assert-run-count response 1)
+ (assert-transform-ids response #{(:id transform1)})))))))
+
+(deftest transform-revisions-test
+ (mt/with-premium-features #{}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (with-transform-cleanup! [table-name "transform_revisions_test"]
+ (let [test-transform-revisions (fn [action url req exp-revisions]
+ (let [response (mt/user-http-request :crowberto action 200 url req)
+ transform-id (:id response)
+ ;; Read the updated transform from the DB for accurate comparison
+ transform (-> (t2/select-one :model/Transform transform-id)
+ (t2/hydrate :transform_tag_ids))]
+ (is (= exp-revisions (t2/count :model/Revision :model "Transform"
+ :model_id transform-id)))
+ (let [revision (t2/select-one :model/Revision :model "Transform"
+ :model_id transform-id :most_recent true)
+ rev-transform (:object revision)
+ removed #{:id :entity_id :created_at :updated_at}]
+ (is (every? #(not (contains? rev-transform %)) removed))
+ ;; Compare revision with DB transform (both have in-memory representation)
+ (is (=? (dissoc rev-transform :source :owner) transform)))
+ transform-id))
+ gadget-req {:name "Gadget Products"
+ :description "The gadget products"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}}
+ transform-id (test-transform-revisions :post "transform" gadget-req 1)
+ widget-req {:name "Widget Products"
+ :description "The widget products"
+ :source {:type "query"
+ :query (make-query "Widget")}
+ :tag_ids [4]
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}}]
+ (test-transform-revisions :put (str "transform/" transform-id) widget-req 2)))))))
+
+(deftest permissions-test
+ (mt/with-premium-features #{}
+ (testing "Transform endpoints require transforms permission"
+ (mt/with-temp [:model/Transform transform {}]
+ (testing "Regular users without transform permission get 403"
+ (mt/user-http-request :rasta :get 403 "transform")
+ (mt/user-http-request :rasta :get 403 (str "transform/" (:id transform)))
+ (mt/user-http-request :rasta :post 403 "transform"
+ {:name "Test"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"}}}
+ :target {:type "table" :name "test_table"}})
+ (mt/user-http-request :rasta :put 403 (str "transform/" (:id transform))
+ {:name "Updated"})
+ (mt/user-http-request :rasta :delete 403 (str "transform/" (:id transform))))
+ (testing "Data analysts can read transforms"
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/user-http-request :lucky :get 200 "transform")
+ (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform)))))))))
+
+(defmethod driver/database-supports? [::driver/driver ::extract-columns-from-query]
+ [_driver _feature _database]
+ true)
+
+(doseq [driver [:clickhouse :redshift :bigquery-cloud-sdk :snowflake]]
+ (defmethod driver/database-supports? [driver ::extract-columns-from-query]
+ [_driver _feature _database]
+ false))
+
+(deftest ^:parallel extract-columns-from-query-test
+ (mt/with-premium-features #{}
+ (testing "POST /api/transform/extract-columns"
+ (mt/test-drivers (mt/normal-driver-select {:+features [:transforms/table
+ ::extract-columns-from-query]})
+ (mt/dataset transforms-dataset/transforms-test
+ (letfn [(make-native-query [sql]
+ {:lib/type :mbql/query
+ :database (mt/id)
+ :stages [{:lib/type :mbql.stage/native
+ :native sql}]})]
+ (testing "Successfully extracts columns from a simple SELECT query"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/extract-columns"
+ {:query (make-native-query "SELECT id, name, category, price FROM transforms_products")})]
+ (is (= ["id" "price"] (:columns response))
+ "Should only return numeric (id, price) columns, filtering out text columns (name, category)")))
+ (testing "Returns nil for invalid SQL"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/extract-columns"
+ {:query (make-native-query "SELECT * FORM invalid_table")})]
+ (is (nil? (:columns response)))))
+ (testing "Extracts columns from query with aliases"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/extract-columns"
+ {:query (make-native-query "SELECT id AS product_id, name AS product_name FROM transforms_products")})]
+ (is (= ["product_id"] (:columns response))
+ "Should only return numeric column (id), filtering out text column (name)")))
+ (testing "Filters columns by type - only returns numeric and temporal columns"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/extract-columns"
+ {:query (make-native-query "SELECT id, name, category, price, created_at FROM transforms_products")})]
+ (is (= ["id" "price" "created_at"] (:columns response))
+ "Should return numeric (id, price) and temporal (created_at) columns, filtering out text columns (name, category)")))
+ (testing "Requires superuser permissions"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "transform/extract-columns"
+ {:query (make-native-query "SELECT * FROM transforms_products")}))))
+ (testing "Returns 404 for non-existent database"
+ (is (= "Not found."
+ (mt/user-http-request :crowberto :post 404 "transform/extract-columns"
+ {:query {:lib/type :mbql/query
+ :database 999999
+ :stages [{:lib/type :mbql.stage/native
+ :native "SELECT * FROM transforms_products"}]}}))))))))))
+
+(deftest ^:parallel is-simple-query-test
+ (mt/with-premium-features #{}
+ (testing "POST /api/transform/is-simple-query"
+ (testing "Returns true for simple SELECT queries"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "SELECT id, name FROM products"})]
+ (is (true? (:is_simple response)))
+ (is (nil? (:reason response)))))
+ (testing "Returns true for simple SELECT with WHERE clause"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "SELECT id, name FROM products WHERE category = 'Electronics'"})]
+ (is (true? (:is_simple response)))))
+ (testing "Returns true for simple SELECT with JOIN"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "SELECT p.id, p.name, c.name FROM products p JOIN categories c ON p.category_id = c.id"})]
+ (is (true? (:is_simple response)))))
+ (testing "Returns false for query with LIMIT"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "SELECT id, name FROM products LIMIT 10"})]
+ (is (false? (:is_simple response)))
+ (is (= "Contains a LIMIT" (:reason response)))))
+ (testing "Returns false for query with OFFSET"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "SELECT id, name FROM products OFFSET 5"})]
+ (is (false? (:is_simple response)))
+ (is (= "Contains an OFFSET" (:reason response)))))
+ (testing "Returns false for query with LIMIT and OFFSET"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "SELECT id, name FROM products LIMIT 10 OFFSET 5"})]
+ (is (false? (:is_simple response)))
+ (is (= "Contains a LIMIT" (:reason response)))))
+ (testing "Returns false for query with CTE"
+ (let [response (mt/user-http-request :crowberto :post 200 "transform/is-simple-query"
+ {:query "WITH category_counts AS (SELECT category, COUNT(*) as cnt FROM products GROUP BY category) SELECT * FROM category_counts"})]
+ (is (false? (:is_simple response)))
+ (is (= "Contains a CTE" (:reason response))))))))
+
+;;; ------------------------------------------------------------
+;;; User Attribution Tests
+;;; ------------------------------------------------------------
+
+(deftest manual-run-user-attribution-test
+ (mt/with-premium-features #{}
+ (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
+ (with-transform-cleanup! [table-name "user_attribution_test"]
+ (let [rasta-id (mt/user->id :rasta)
+ crowberto-id (mt/user->id :crowberto)
+ ;; Create transform owned by rasta, but run by crowberto
+ transform (mt/user-http-request :crowberto :post 200 "transform"
+ {:name "Attribution Test"
+ :source {:type "query"
+ :query (make-query "Gadget")}
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name table-name}
+ :owner_user_id rasta-id})
+ transform-id (:id transform)]
+ ;; Verify owner is rasta
+ (is (= rasta-id (:owner_user_id transform))
+ "Owner should be rasta")
+ ;; Run as crowberto (different from owner)
+ (mt/user-http-request :crowberto :post 202
+ (format "transform/%d/run" transform-id))
+ ;; Wait for run to start and check attribution
+ (let [run (u/poll {:thunk #(t2/select-one :model/TransformRun :transform_id transform-id)
+ :done? some?
+ :timeout-ms 5000})]
+ (is (some? run) "Run should exist")
+ (is (= crowberto-id (:user_id run))
+ "Run should be attributed to the triggering user (crowberto), not the owner (rasta)")))))))))
+
+;;; ------------------------------------------------------------
+;;; Collection Items Integration Tests
+;;; ------------------------------------------------------------
+
+(deftest collection-items-include-transforms-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/collection/:id/items"
+ (testing "Includes transforms in collection items"
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-temp [:model/Collection {collection-id :id} {:name "Transforms Collection"
+ :namespace :transforms}
+ :model/Transform {transform-id :id}
+ {:name "Test Transform"
+ :description "A test transform"
+ :collection_id collection-id}]
+ ;; Test 1: Transform appears in unfiltered results
+ (let [items (:data (mt/user-http-request :lucky :get 200
+ (format "collection/%d/items" collection-id)))]
+ (is (= 1 (count items)))
+ (is (= "transform" (:model (first items))))
+ (is (= "Test Transform" (:name (first items)))))
+
+ ;; Test 2: Transform appears when filtered by models=transform
+ (let [items (:data (mt/user-http-request :lucky :get 200
+ (format "collection/%d/items" collection-id)
+ :models "transform"))]
+ (is (= 1 (count items)))
+ (is (= transform-id (:id (first items)))))
+
+ ;; Test 3: Transform NOT returned when filtering for other models only
+ (let [items (:data (mt/user-http-request :lucky :get 200
+ (format "collection/%d/items" collection-id)
+ :models "card"))]
+ (is (empty? items)))
+
+ ;; Test 4: Non-analysts users don't see transforms
+ (perms/grant-collection-read-permissions! (perms/all-users-group) collection-id)
+ (let [items (:data (mt/user-http-request :rasta :get 200
+ (format "collection/%d/items" collection-id)))]
+ (is (empty? items)))
+
+ ;; Test 5: Admins see transforms
+ (let [items (:data (mt/user-http-request :crowberto :get 200
+ (format "collection/%d/items" collection-id)))]
+ (is (= 1 (count items)))
+ (is (= "transform" (:model (first items))))
+ (is (= "Test Transform" (:name (first items)))))))))))
+
+(deftest create-transform-with-tags-test
+ (mt/with-premium-features #{}
+ (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
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (let [schema (t2/select-one-fn :schema :model/Table :db_id (mt/id) :active true)]
+ (testing "Can create transform with tags"
+ ;; Create tags via API since we're testing transform creation with existing tags
+ (let [tag1 (mt/user-http-request :lucky :post 200 "transform-tag"
+ {:name (str "test-tag-1-" (random-uuid))})
+ tag2 (mt/user-http-request :lucky :post 200 "transform-tag"
+ {:name (str "test-tag-2-" (random-uuid))})]
+ (try
+ (let [transform-request (-> (merge (mt/with-temp-defaults :model/Transform)
+ {:tag_ids [(:id tag1) (:id tag2)]})
+ (assoc-in [:target :schema] schema))
+ transform-response (mt/user-http-request :lucky :post 200 "transform"
+ transform-request)]
+ (try
+ (is (= (:name transform-request) (:name transform-response)))
+ (is (= (:tag_ids transform-request) (sort (:tag_ids transform-response))))
+ (finally
+ (t2/delete! :model/Transform :id (:id transform-response)))))
+ (finally
+ (t2/delete! :model/TransformTag :id [:in [(:id tag1) (:id tag2)]])))))
+ (testing "Can create transform without tags"
+ (let [transform-request (assoc-in (mt/with-temp-defaults :model/Transform)
+ [:target :schema] schema)
+ transform-response (mt/user-http-request :lucky :post 200 "transform"
+ transform-request)]
+ (try
+ (is (= (:name transform-request) (:name transform-response)))
+ (is (= [] (:tag_ids transform-response)))
+ (finally
+ (t2/delete! :model/Transform :id (:id transform-response)))))))))))))
+
+(deftest update-transform-tags-test
+ (mt/with-premium-features #{}
+ (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
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-temp [:model/Transform transform {:name "Test Transform"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"}}}
+ :target {:type "table"
+ :name "test_table"}}
+ :model/TransformTag tag1 {:name "update-tag-1"}
+ :model/TransformTag tag2 {:name "update-tag-2"}
+ :model/TransformTag tag3 {:name "update-tag-3"}]
+ (testing "Can add tags to transform"
+ (let [updated (mt/user-http-request :lucky :put 200 (str "transform/" (:id transform))
+ {:tag_ids [(:id tag1) (:id tag2)]})]
+ (is (= [(:id tag1) (:id tag2)] (sort (:tag_ids updated))))))
+ (testing "Can update tags on transform"
+ (let [updated (mt/user-http-request :lucky :put 200 (str "transform/" (:id transform))
+ {:tag_ids [(:id tag2) (:id tag3)]})]
+ (is (= [(:id tag2) (:id tag3)] (sort (:tag_ids updated))))))
+ (testing "Can remove all tags from transform"
+ (let [updated (mt/user-http-request :lucky :put 200 (str "transform/" (:id transform))
+ {:tag_ids []})]
+ (is (= [] (:tag_ids updated))))))))))))
+
+(deftest get-transform-with-tags-test
+ (mt/with-premium-features #{}
+ (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
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-temp [:model/Transform transform {:name "Transform With Tags"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"}}}
+ :target {:type "table"
+ :name "tagged_table"}}
+ :model/TransformTag tag1 {:name "get-tag-1"}
+ :model/TransformTag tag2 {:name "get-tag-2"}]
+ ;; Add tags to transform
+ (transform.model/update-transform-tags! (:id transform) [(:id tag1) (:id tag2)])
+ (testing "Single transform returns tag_ids"
+ (let [fetched (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform)))]
+ (is (= [(:id tag1) (:id tag2)] (sort (:tag_ids fetched))))))
+ (testing "Transform without tags returns empty array"
+ (mt/with-temp [:model/Transform transform2 {:name "Transform Without Tags"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"}}}
+ :target {:type "table"
+ :name "untagged_table"}}]
+ (let [fetched (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform2)))]
+ (is (= [] (:tag_ids fetched)))))))))))))
+
+(deftest list-transforms-with-tags-test
+ (mt/with-premium-features #{}
+ (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)
+ (mt/with-temp [:model/Transform transform1 {:name "Transform 1"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"}}}
+ :target {:type "table"
+ :name "list_table_1"}}
+ :model/Transform transform2 {:name "Transform 2"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 2"}}}
+ :target {:type "table"
+ :name "list_table_2"}}
+ :model/TransformTag tag1 {:name "list-tag-1"}
+ :model/TransformTag tag2 {:name "list-tag-2"}]
+ ;; Add tags to transforms
+ (transform.model/update-transform-tags! (:id transform1) [(:id tag1)])
+ (transform.model/update-transform-tags! (:id transform2) [(:id tag1) (:id tag2)])
+ (testing "List endpoint returns all transforms with their tag_ids"
+ (let [transforms (mt/user-http-request :lucky :get 200 "transform")
+ t1 (some #(when (= (:id %) (:id transform1)) %) transforms)
+ t2 (some #(when (= (:id %) (:id transform2)) %) transforms)]
+ (is (= [(:id tag1)] (:tag_ids t1)))
+ (is (= [(:id tag1) (:id tag2)] (sort (:tag_ids t2))))))))))))
+
+(deftest delete-tag-removes-associations-test
+ (mt/with-premium-features #{}
+ (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
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-temp [:model/Transform transform {:name "Transform for Delete Test"
+ :source {:type "query"
+ :query {:database (mt/id)
+ :type "native"
+ :native {:query "SELECT 1"}}}
+ :target {:type "table"
+ :name "delete_test_table"}}
+ :model/TransformTag tag2 {:name "tag-to-keep"}]
+ ;; Create tag1 via API since we're testing its deletion
+ (let [tag1 (mt/user-http-request :lucky :post 200 "transform-tag"
+ {:name "tag-to-delete"})]
+ (try
+ ;; Add both tags to transform
+ (transform.model/update-transform-tags! (:id transform) [(:id tag1) (:id tag2)])
+
+ ;; Verify tags are associated
+ (let [fetched (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform)))]
+ (is (= (set [(:id tag1) (:id tag2)]) (set (:tag_ids fetched)))))
+
+ ;; Delete tag1
+ (mt/user-http-request :lucky :delete 204 (str "transform-tag/" (:id tag1)))
+
+ ;; Verify tag1 is removed but tag2 remains
+ (let [fetched (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform)))]
+ (is (= [(:id tag2)] (vec (:tag_ids fetched)))))
+ (finally
+ (t2/delete! :model/TransformTag :id (:id tag1))))))))))))
+
+(deftest preserve-tag-order-test
+ (mt/with-premium-features #{}
+ (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
+ (mt/with-data-analyst-role! (mt/user->id :lucky)
+ (mt/with-temp [:model/TransformTag tag1 {:name "order-tag-1"}
+ :model/TransformTag tag2 {:name "order-tag-2"}
+ :model/TransformTag tag3 {:name "order-tag-3"}]
+
+ (let [schema (t2/select-one-fn :schema :model/Table :db_id (mt/id) :active true)]
+ (testing "Creating transform with specific tag order preserves that order"
+ (let [transform-request (-> (merge (mt/with-temp-defaults :model/Transform)
+ {:tag_ids [(:id tag3) (:id tag1) (:id tag2)]})
+ (assoc-in [:target :schema] schema))
+ transform (mt/user-http-request :lucky :post 200 "transform"
+ transform-request)]
+ (try
+ ;; Should preserve the exact order: tag3, tag1, tag2
+ (is (= [(:id tag3) (:id tag1) (:id tag2)] (:tag_ids transform)))
+ ;; Verify order is preserved when fetching
+ (let [fetched (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform)))]
+ (is (= [(:id tag3) (:id tag1) (:id tag2)] (:tag_ids fetched))))
+ ;; Update with different order
+ (let [updated (mt/user-http-request :lucky :put 200 (str "transform/" (:id transform))
+ {:tag_ids [(:id tag2) (:id tag3) (:id tag1)]})]
+ ;; Should now have the new order: tag2, tag3, tag1
+ (is (= [(:id tag2) (:id tag3) (:id tag1)] (:tag_ids updated))))
+ ;; Verify new order persists
+ (let [fetched-again (mt/user-http-request :lucky :get 200 (str "transform/" (:id transform)))]
+ (is (= [(:id tag2) (:id tag3) (:id tag1)] (:tag_ids fetched-again))))
+ (finally
+ (t2/delete! :model/Transform :id (:id transform))))))
+ (testing "Duplicate tag IDs are handled correctly"
+ (let [transform-request (-> (merge (mt/with-temp-defaults :model/Transform)
+ {:tag_ids [(:id tag1) (:id tag2) (:id tag1)]})
+ (assoc-in [:target :schema] schema))
+ transform (mt/user-http-request :lucky :post 200 "transform"
+ transform-request)]
+ (try
+ ;; Should only have each tag once, but preserve relative order
+ (is (= [(:id tag1) (:id tag2)] (:tag_ids transform)))
+ (finally
+ (t2/delete! :model/Transform :id (:id transform))))))))))))))
+
+(deftest root-collection-items-include-transforms-test
+ (mt/with-premium-features #{}
+ (testing "GET /api/collection/root/items"
+ (testing "Includes transforms in root collection items"
+ (mt/with-temp [:model/Transform {transform-id :id}
+ {:name "Root Transform"
+ :description "A transform at root"}]
+ (testing "Transform appears in unfiltered results"
+ (let [items (->> (:data (mt/user-http-request :crowberto :get 200
+ "collection/root/items"
+ :namespace "transforms"))
+ (filter #(= "transform" (:model %))))]
+ (is (= 1 (count items)))
+ (is (= "transform" (:model (first items))))
+ (is (= "Root Transform" (:name (first items))))))
+ (testing "Transform appears when filtered by models=trans form"
+
+ (let [items (:data (mt/user-http-request :crowberto :get 200
+ "collection/root/items"
+ :namespace "transforms"
+ :models "transform"))]
+ (is (= 1 (count items)))
+ (is (= transform-id (:id (first items))))))
+ (testing "Transform NOT returned when filtering for other models only"
+ (let [items (:data (mt/user-http-request :crowberto :get 200
+ "collection/root/items"
+ :namespace "transforms"
+ :models "card"))]
+ (is (empty? items))))
+ (testing "Non-admin users don't see transforms"
+ (let [items (->> (:data (mt/user-http-request :rasta :get 200
+ "collection/root/items"
+ :namespace "transforms"))
+ (filter #(= "transform" (:model %))))]
+ (is (empty? items)))))))))
+
+(deftest transforms-appear-in-here-test
+ (mt/with-premium-features #{}
+ (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"
+ :namespace :transforms}
+ :model/Collection {child-id :id} {:name "Child"
+ :location (format "/%d/" parent-id)
+ :namespace :transforms}
+ :model/Transform _ {:name "Test Transform"
+ :collection_id child-id}]
+ ;; Check child collection shows transform in :here
+ (let [child-coll (first (:data (mt/user-http-request :crowberto :get 200
+ (format "collection/%d/items" parent-id))))]
+ (is (= ["transform"] (:here child-coll)))))))))
+
+(deftest transforms-appear-in-below-test
+ (mt/with-premium-features #{}
+ (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"
+ :namespace :transforms}
+ :model/Collection {child-id :id} {:name "Child"
+ :location (format "/%d/" parent-id)
+ :namespace :transforms}
+ :model/Collection {grandchild-id :id} {:name "Grandchild"
+ :location (format "/%d/%d/" parent-id child-id)
+ :namespace :transforms}
+ :model/Transform _ {:name "Nested Transform"
+ :collection_id grandchild-id}]
+ ;; Check child collection shows transform in :below
+ (let [child-coll (first (:data (mt/user-http-request :crowberto :get 200
+ (format "collection/%d/items" parent-id))))]
+ (is (= ["collection"] (:here child-coll)))
+ (is (= ["transform"] (:below child-coll)))))))))
+
+(deftest native-incremental-column-type-validated-on-create-test
+ (mt/with-premium-features #{}
+ (testing "POST /api/transform column type validation"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
+ (mt/dataset transforms-dataset/transforms-test
+ (let [schema (get-test-schema)]
+ (testing "Rejects unsupported checkpoint column type (text)"
+ (let [response (mt/user-http-request :crowberto :post 400 "transform"
+ {:name "Invalid Incremental Transform"
+ :source {:type "query"
+ :query (lib/native-query (mt/metadata-provider)
+ "SELECT id, name, category, price FROM transforms_products")
+ :source-incremental-strategy {:type "checkpoint"
+ :checkpoint-filter "name"}}
+ :target {:type "table-incremental"
+ :schema schema
+ :name "invalid_incremental"
+ :target-incremental-strategy {:type "append"}}})]
+ (is (string? response))
+ (is (re-find #"Only numeric and temporal" response))))))))))
+
+(deftest native-incremental-column-type-validated-on-update-test
+ (mt/with-premium-features #{}
+ (testing "PUT /api/transform column type validation"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
+ (mt/dataset transforms-dataset/transforms-test
+ (let [schema (get-test-schema)]
+ (with-transform-cleanup! [table-name "update_incremental_test"]
+ (let [;; Create a non-incremental transform first
+ created (mt/user-http-request :crowberto :post 200 "transform"
+ {:name "Test Transform"
+ :source {:type "query"
+ :query (lib/native-query (mt/metadata-provider)
+ "SELECT id, name, category FROM transforms_products")}
+ :target {:type "table"
+ :schema schema
+ :name table-name}})]
+ (testing "Rejects update to unsupported checkpoint column type (text)"
+ (let [response (mt/user-http-request :crowberto :put 400
+ (format "transform/%d" (:id created))
+ {:source {:type "query"
+ :query (lib/native-query (mt/metadata-provider)
+ "SELECT id, name, category FROM transforms_products")
+ :source-incremental-strategy {:type "checkpoint"
+ :checkpoint-filter "category"}}
+ :target {:type "table-incremental"
+ :schema schema
+ :name table-name
+ :target-incremental-strategy {:type "append"}}})]
+ (is (string? response))
+ (is (re-find #"Only numeric and temporal" response))))))))))))
+
+(deftest mbql-incremental-column-type-validated-on-create-test
+ (mt/with-premium-features #{}
+ (testing "MBQL query with checkpoint-filter-unique-key - checkpoint column type validation"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
+ (mt/dataset transforms-dataset/transforms-test
+ (let [schema (get-test-schema)]
+ (testing "Rejects unsupported checkpoint column type (text)"
+ (let [query (mt/mbql-query transforms_products)
+ response (mt/user-http-request :crowberto :post 400 "transform"
+ {:name "Invalid MBQL Incremental"
+ :source {:type "query"
+ :query query
+ :source-incremental-strategy {:type "checkpoint"
+ :checkpoint-filter-unique-key "column-unique-key-v1$name"}}
+ :target {:type "table-incremental"
+ :schema schema
+ :name "invalid_mbql_incremental"
+ :target-incremental-strategy {:type "append"}}})]
+ (is (string? response))
+ (is (re-find #"not supported" response))))))))))
+
+(deftest native-incremental-column-validation-when-not-extractable-test
+ (mt/with-premium-features #{}
+ (testing "Native query checkpoint column validation with text input fallback"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table ::extract-columns-from-query)
+ (mt/dataset transforms-dataset/transforms-test
+ (let [schema (get-test-schema)]
+ (testing "Accepts any column if they were not extractable"
+ (with-transform-cleanup! [table-name "fallback_test_unextracted"]
+ (with-redefs [metabase.transforms.api.transform/extract-all-columns-from-query
+ ;; simulate lack of driver support for extraction
+ (fn [_driver _database-id _query] nil)]
+ (let [response (mt/user-http-request :crowberto :post 200 "transform"
+ {:name "Unextracted Column - Text Input Fallback"
+ :source {:type "query"
+ :query (lib/native-query (mt/metadata-provider)
+ "SELECT id, name, created_at FROM transforms_products")
+ :source-incremental-strategy {:type "checkpoint"
+ ;; created_at is in the query but not in our stubbed extraction
+ :checkpoint-filter "created_at"}}
+ :target {:type "table-incremental"
+ :schema schema
+ :name table-name
+ :target-incremental-strategy {:type "append"}}})]
+ (is (some? (:id response))
+ "Should accept column not in extracted metadata, allowing text input fallback")))))))))))
+
+(deftest search-filters-transform-source-types-test
+ (mt/with-premium-features #{}
+ (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))
+ query-name (str search-term "-query")
+ python-name (str search-term "-python")
+ query-source {:type "query"
+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}
+ python-source {:type "python"
+ :body "print('hello world')"
+ :source-tables {}
+ :source-database (mt/id)}]
+ (mt/with-temp [:model/Transform {query-id :id} {:name query-name
+ :source query-source
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name (str "target_" (u/generate-nano-id))}}
+ :model/Transform {python-id :id} {:name python-name
+ :source python-source
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name (str "target_" (u/generate-nano-id))
+ :database (mt/id)}}]
+ (search.tu/with-new-search-and-legacy-search
+ (let [transform-ids (search-transform-ids search-term)]
+ (is (contains? transform-ids query-id))
+ (is (not (contains? transform-ids python-id)))))))))))
+
+(deftest search-hides-transforms-for-non-superusers-test
+ (mt/with-premium-features #{}
+ (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))
+ query-name (str search-term "-query")
+ query-source {:type "query"
+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}]
+ (mt/with-temp [:model/Transform {transform-id :id} {:name query-name
+ :source query-source
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name (str "target_" (u/generate-nano-id))}}]
+ (search.tu/with-new-search-and-legacy-search
+ (let [results (mt/user-http-request :rasta :get 200 "search" :q search-term :models "transform")
+ ids (set (map :id (:data results)))]
+ (is (empty? ids))
+ (is (not (contains? ids transform-id)))))))))))
+
+(deftest search-includes-native-and-mbql-query-transforms-test
+ (mt/with-premium-features #{}
+ (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))
+ native-name (str search-term "-native")
+ mbql-name (str search-term "-mbql")
+ native-source {:type "query"
+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}
+ mbql-source {:type "query"
+ :query (mt/mbql-query transforms_products)}]
+ (mt/with-temp [:model/Transform {native-id :id} {:name native-name
+ :source native-source
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name (str "target_" (u/generate-nano-id))}}
+ :model/Transform {mbql-id :id} {:name mbql-name
+ :source mbql-source
+ :target {:type "table"
+ :schema (get-test-schema)
+ :name (str "target_" (u/generate-nano-id))}}]
+ (search.tu/with-new-search-and-legacy-search
+ (is (= #{native-id mbql-id}
+ (search-transform-ids search-term))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/execute_test.clj b/test/metabase/transforms/execute_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/transforms/execute_test.clj
rename to test/metabase/transforms/execute_test.clj
index e76ce13487e..998159bdcad 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/execute_test.clj
+++ b/test/metabase/transforms/execute_test.clj
@@ -1,12 +1,7 @@
-(ns ^:mb/driver-tests metabase-enterprise.transforms.execute-test
+(ns ^:mb/driver-tests metabase.transforms.execute-test
(:require
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.query-test-util :as query-test-util]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :as transforms.tu :refer [with-transform-cleanup! delete-schema!]]
- [metabase-enterprise.transforms.util :as transforms.util]
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.lib.core :as lib]
@@ -16,6 +11,11 @@
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.query-test-util :as query-test-util]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :as transforms.tu :refer [delete-schema! with-transform-cleanup!]]
+ [metabase.transforms.util :as transforms.util]
[toucan2.core :as t2]
[toucan2.util :as u]))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/jobs_test.clj b/test/metabase/transforms/jobs_test.clj
similarity index 81%
rename from enterprise/backend/test/metabase_enterprise/transforms/jobs_test.clj
rename to test/metabase/transforms/jobs_test.clj
index e6d09b32d1e..1c2a6ba37fe 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/jobs_test.clj
+++ b/test/metabase/transforms/jobs_test.clj
@@ -1,21 +1,21 @@
-(ns ^:mb/driver-tests metabase-enterprise.transforms.jobs-test
+(ns ^:mb/driver-tests metabase.transforms.jobs-test
#_{:clj-kondo/ignore [:discouraged-namespace]}
(:require
[clojure.string :as str]
[clojure.test :refer :all]
[clojure.tools.logging :as log]
- [metabase-enterprise.transforms.execute :as transforms.execute]
- [metabase-enterprise.transforms.jobs :as jobs]
- [metabase-enterprise.transforms.models.job-run :as transforms.job-run]
- [metabase-enterprise.transforms.models.transform-run :as transform-run]
- [metabase-enterprise.transforms.test-dataset :as transforms-dataset]
- [metabase-enterprise.transforms.test-util :refer [with-transform-cleanup!]]
[metabase.driver :as driver]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
+ [metabase.models.transforms.job-run :as transforms.job-run]
+ [metabase.models.transforms.transform-run :as transform-run]
[metabase.notification.seed :as notification.seed]
[metabase.query-processor.compile :as qp.compile]
[metabase.test :as mt]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.jobs :as jobs]
+ [metabase.transforms.test-dataset :as transforms-dataset]
+ [metabase.transforms.test-util :refer [with-transform-cleanup!]]
[toucan2.core :as t2]))
(deftest basic-deps-test
@@ -92,11 +92,29 @@
(is (nil? (#'jobs/next-transform sorted-ordering transforms-by-id #{1 2 3})))))
(def ^:private query-source {:type "query"})
-(def ^:private python-source {:type "python"})
(deftest run-transform-feature-flag-test
- (testing "Query transforms are skipped without :transforms feature"
+ (testing "Query transforms run without any features"
(mt/with-premium-features #{}
+ (let [query-transform {:id 3
+ :source query-source
+ :name "Test Query Transform"}
+ run-id 102
+ logged-messages (atom [])
+ run-called? (atom false)]
+ (with-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 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")))))
+ (testing "Query transforms are skipped when hosted without :transforms feature"
+ (mt/with-premium-features #{:hosting}
(let [query-transform {:id 1
:source query-source
:name "Test Query Transform"}
@@ -114,27 +132,8 @@
(:message (first @logged-messages)))
"Warning message should indicate transform was skipped due to missing features")))))
- (testing "Python transforms are skipped without :transforms-python feature"
- (mt/with-premium-features #{:transforms}
- (let [python-transform {:id 2
- :source python-source
- :name "Test Python Transform"}
- run-id 101
- logged-messages (atom [])]
- (with-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 python-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 2 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 feature"
- (mt/with-premium-features #{:transforms}
+ (mt/with-premium-features #{:hosting :transforms}
(let [query-transform {:id 3
:source query-source
:name "Test Query Transform"}
@@ -343,50 +342,51 @@
(is (mt/received-email-body? :crowberto #"transform2")))))))))))))
(deftest run-mbql-transform-anonymous-user-routing-error-test
- (mt/with-premium-features #{:database-routing :transforms}
- (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
- (mt/dataset transforms-dataset/transforms-test
- (mt/with-model-cleanup [:model/Notification]
- (mt/with-fake-inbox
- (mt/with-model-cleanup [:model/Notification
- :model/TransformJobRun]
- (notification.seed/seed-notification!)
- (let [mp (mt/metadata-provider)
- table (t2/select-one :model/Table (mt/id :transforms_products))
+ (mt/when-ee-evailable
+ (mt/with-premium-features #{:database-routing :transforms}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/dataset transforms-dataset/transforms-test
+ (mt/with-model-cleanup [:model/Notification]
+ (mt/with-fake-inbox
+ (mt/with-model-cleanup [:model/Notification
+ :model/TransformJobRun]
+ (notification.seed/seed-notification!)
+ (let [mp (mt/metadata-provider)
+ table (t2/select-one :model/Table (mt/id :transforms_products))
;; generate sql for different dbs
- sql (-> (lib/query mp (lib.metadata/table mp (mt/id :transforms_products)))
- (lib/with-fields [(lib.metadata/field mp (mt/id :transforms_products :name))])
- (lib/limit 10)
- qp.compile/compile
- :query)]
- (with-transform-cleanup! [target0 {:type "table"
- :schema (:schema table)
- :name "t0"}]
- (mt/with-temp [:model/Database _destination {:engine driver/*driver*
- :router_database_id (mt/id)
- :details {:destination_database true}}
- :model/DatabaseRouter _ {:database_id (mt/id)
- :user_attribute "db_name"}
- :model/TransformTag tag {:name "test-tag"}
- :model/TransformJob job {:name "test-job"
- :schedule "0 0 * * * ? *"}
- :model/TransformJobTransformTag _ {:job_id (:id job)
- :tag_id (:id tag)
- :position 0}
- ;; independent transform
- :model/Transform t0 {:name "transform0"
- :source {:type :query
- :query (lib/native-query mp sql)}
- :creator_id (mt/user->id :crowberto)
- :target target0}
- :model/TransformTransformTag _tag0 {:transform_id (:id t0)
+ sql (-> (lib/query mp (lib.metadata/table mp (mt/id :transforms_products)))
+ (lib/with-fields [(lib.metadata/field mp (mt/id :transforms_products :name))])
+ (lib/limit 10)
+ qp.compile/compile
+ :query)]
+ (with-transform-cleanup! [target0 {:type "table"
+ :schema (:schema table)
+ :name "t0"}]
+ (mt/with-temp [:model/Database _destination {:engine driver/*driver*
+ :router_database_id (mt/id)
+ :details {:destination_database true}}
+ :model/DatabaseRouter _ {:database_id (mt/id)
+ :user_attribute "db_name"}
+ :model/TransformTag tag {:name "test-tag"}
+ :model/TransformJob job {:name "test-job"
+ :schedule "0 0 * * * ? *"}
+ :model/TransformJobTransformTag _ {:job_id (:id job)
:tag_id (:id tag)
- :position 0}]
+ :position 0}
+ ;; independent transform
+ :model/Transform t0 {:name "transform0"
+ :source {:type :query
+ :query (lib/native-query mp sql)}
+ :creator_id (mt/user->id :crowberto)
+ :target target0}
+ :model/TransformTransformTag _tag0 {:transform_id (:id t0)
+ :tag_id (:id tag)
+ :position 0}]
;; NOTE: No `with-current-user` wrapper - this simulates running the transform
;; without a user context (e.g., from a cron job or background task).
;; previously this could produce the wrong error message from the QP routing middleware.
- (try
- (jobs/run-job! (:id job) {:run-method :cron})
- (catch Exception _))
- (is (mt/received-email-subject? :crowberto #"The job .* had failures"))
- (is (mt/received-email-body? :crowberto #"transform0"))))))))))))
+ (try
+ (jobs/run-job! (:id job) {:run-method :cron})
+ (catch Exception _))
+ (is (mt/received-email-subject? :crowberto #"The job .* had failures"))
+ (is (mt/received-email-body? :crowberto #"transform0")))))))))))))
diff --git a/test/metabase/transforms/models_test.clj b/test/metabase/transforms/models_test.clj
new file mode 100644
index 00000000000..56f4cdb1b37
--- /dev/null
+++ b/test/metabase/transforms/models_test.clj
@@ -0,0 +1,327 @@
+(ns metabase.transforms.models-test
+ "Tests for transform jobs and tags database tables and basic CRUD operations."
+ (:require
+ [clojure.test :refer :all]
+ [metabase.collections.models.collection :as collection]
+ [metabase.config.core :as config]
+ [metabase.models.transforms.transform :as transform.model]
+ [metabase.models.transforms.transform-job :as transform-job]
+ [metabase.models.transforms.transform-run :as transform-run]
+ [metabase.models.transforms.transform-tag :as transform-tag]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
+ [metabase.util :as u]
+ [toucan2.core :as t2]))
+
+;; Use the default test fixture which sets up the test database
+(use-fixtures :once (fixtures/initialize :db :test-users))
+
+(deftest job-tags-association-test
+ (testing "Job-tag associations via join table"
+ (mt/with-temp [:model/TransformJob job {}
+ :model/TransformTag tag1 {}
+ :model/TransformTag tag2 {}
+ :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag1) :position 0}
+ :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag2) :position 1}]
+ (testing "Can retrieve tags for job"
+ (let [tag-ids (t2/select-fn-set :tag_id :model/TransformJobTransformTag :job_id (:id job))]
+ (is (contains? tag-ids (:id tag1)) "Should include first tag")
+ (is (contains? tag-ids (:id tag2)) "Should include second tag")
+ (is (= 2 (count tag-ids)) "Should have exactly 2 tags")))
+
+ (testing "Can retrieve jobs for tag"
+ (let [job-ids (t2/select-fn-set :job_id :model/TransformJobTransformTag :tag_id (:id tag1))]
+ (is (contains? job-ids (:id job)) "Should include the job"))))))
+
+(deftest cascade-delete-tag-test
+ (testing "Deleting a tag cascades to associations"
+ (mt/with-temp [:model/TransformTag tag {}
+ :model/TransformJob job {}
+ :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag) :position 0}]
+ ;; Delete the tag
+ (t2/delete! :model/TransformTag :id (:id tag))
+
+ ;; Verify cascade deletion
+ (testing "Tag associations are deleted"
+ (is (not (t2/exists? :model/TransformJobTransformTag :tag_id (:id tag)))
+ "Job-tag association should be deleted"))
+
+ ;; Verify job still exists
+ (is (t2/exists? :model/TransformJob :id (:id job))
+ "Job should still exist after tag deletion"))))
+
+(deftest cascade-delete-job-test
+ (testing "Deleting a job cascades to associations"
+ (mt/with-temp [:model/TransformTag tag {}
+ :model/TransformJob job {}
+ :model/TransformJobTransformTag _ {:job_id (:id job) :tag_id (:id tag) :position 0}]
+ ;; Delete the job (not the tag)
+ (t2/delete! :model/TransformJob :id (:id job))
+
+ ;; Verify cascade deletion
+ (testing "Tag associations are deleted"
+ (is (not (t2/exists? :model/TransformJobTransformTag :job_id (:id job)))
+ "Job-tag association should be deleted"))
+
+ ;; Verify tag still exists
+ (is (t2/exists? :model/TransformTag :id (:id tag))
+ "Tag should still exist after job deletion"))))
+
+(deftest transform-tag-helper-functions-test
+ (testing "TransformTag helper functions"
+ (mt/with-temp [:model/TransformTag tag {}]
+ (testing "tag-name-exists?"
+ (is (transform-tag/tag-name-exists? (:name tag))
+ "Should return true for existing tag name")
+ (is (not (transform-tag/tag-name-exists? (str "nonexistent-" (u/generate-nano-id))))
+ "Should return false for non-existing tag name"))
+
+ (testing "tag-name-exists-excluding?"
+ (is (not (transform-tag/tag-name-exists-excluding? (:name tag) (:id tag)))
+ "Should return false when checking same tag's name")
+ (is (transform-tag/tag-name-exists-excluding? (:name tag) (inc (:id tag)))
+ "Should return true when name exists but with different ID")))))
+
+(deftest hydrate-tag-ids-test
+ (testing "TransformJob tag_ids hydration preserves position order"
+ (mt/with-temp [:model/TransformJob job1 {:name "job1" :schedule "0 0 * * * ?"}
+ :model/TransformJob job2 {:name "job2" :schedule "0 0 * * * ?"}
+ :model/TransformTag tag1 {:name "tag1"}
+ :model/TransformTag tag2 {:name "tag2"}
+ :model/TransformJobTransformTag _ {:job_id (:id job1) :tag_id (:id tag1) :position 0}
+ :model/TransformJobTransformTag _ {:job_id (:id job1) :tag_id (:id tag2) :position 1}
+ :model/TransformJobTransformTag _ {:job_id (:id job2) :tag_id (:id tag2) :position 0}]
+
+ (testing "Hydration adds tag_ids to jobs in position order"
+ (let [[hjob1 hjob2] (t2/hydrate [job1 job2] :tag_ids)]
+ (is (= [(:id tag1) (:id tag2)] (:tag_ids hjob1))
+ "Job1 should have both tags in position order")
+ (is (= [(:id tag2)] (:tag_ids hjob2))
+ "Job2 should have only tag2")))
+
+ (testing "Jobs with no tags have empty tag_ids"
+ (mt/with-temp [:model/TransformJob job3 {}]
+ (let [[hydrated-job] (t2/hydrate [job3] :tag_ids)]
+ (is (= [] (:tag_ids hydrated-job))
+ "Job with no tags should have empty tag_ids array")))))))
+
+(deftest transform-tags-ordering-test
+ (testing "Transform tags maintain specified order through updates"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform transform {}
+ :model/TransformTag tag1 {:name "tag1"}
+ :model/TransformTag tag2 {:name "tag2"}
+ :model/TransformTag tag3 {:name "tag3"}
+ :model/TransformTag tag4 {:name "tag4"}]
+ (let [transform-id (:id transform)]
+
+ (testing "Transform created without creator_id defaults to internal user"
+ (is (= config/internal-mb-user-id (:creator_id transform))))
+
+ (testing "Initial tag order is preserved"
+ (transform.model/update-transform-tags! transform-id [(:id tag2) (:id tag1) (:id tag3)])
+ (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
+ (is (= [(:id tag2) (:id tag1) (:id tag3)] (:tag_ids hydrated))
+ "Tags should be in the order specified")))
+
+ (testing "Reordering tags preserves new order"
+ (transform.model/update-transform-tags! transform-id [(:id tag3) (:id tag1) (:id tag2)])
+ (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
+ (is (= [(:id tag3) (:id tag1) (:id tag2)] (:tag_ids hydrated))
+ "Tags should be reordered correctly")))
+
+ (testing "Adding and removing tags preserves order"
+ (transform.model/update-transform-tags! transform-id [(:id tag1) (:id tag4)])
+ (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
+ (is (= [(:id tag1) (:id tag4)] (:tag_ids hydrated))
+ "Should have only the specified tags in order")))
+
+ (testing "Duplicate tags are deduplicated while preserving order"
+ (transform.model/update-transform-tags! transform-id [(:id tag2) (:id tag3) (:id tag2) (:id tag1)])
+ (let [hydrated (t2/hydrate (t2/select-one :model/Transform :id transform-id) :transform_tag_ids)]
+ (is (= [(:id tag2) (:id tag3) (:id tag1)] (:tag_ids hydrated))
+ "Duplicates removed, order preserved"))))))))
+
+(deftest job-tags-ordering-test
+ (testing "Job tags maintain specified order through updates"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/TransformJob job {:name "test job" :schedule "0 0 * * *"}
+ :model/TransformTag tag1 {:name "tag1"}
+ :model/TransformTag tag2 {:name "tag2"}
+ :model/TransformTag tag3 {:name "tag3"}]
+ (let [job-id (:id job)]
+
+ (testing "Initial tag order is preserved"
+ (transform-job/update-job-tags! job-id [(:id tag2) (:id tag1)])
+ (let [hydrated (t2/hydrate (t2/select-one :model/TransformJob :id job-id) :tag_ids)]
+ (is (= [(:id tag2) (:id tag1)] (:tag_ids hydrated))
+ "Tags should be in the order specified")))
+
+ (testing "Reordering and adding tags preserves order"
+ (transform-job/update-job-tags! job-id [(:id tag1) (:id tag3) (:id tag2)])
+ (let [hydrated (t2/hydrate (t2/select-one :model/TransformJob :id job-id) :tag_ids)]
+ (is (= [(:id tag1) (:id tag3) (:id tag2)] (:tag_ids hydrated))
+ "Tags should be reordered with new tag added"))))))))
+
+(deftest table-with-db-and-fields-hydration-test
+ (testing "table-with-db-and-fields hydration handles NULL schemas correctly"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ ;; Create tables with different schema values
+ :model/Table {table-with-schema-id :id} {:db_id db-id
+ :schema "public"
+ :name "test_table_with_schema"}
+ :model/Table {table-null-schema-id :id} {:db_id db-id
+ :schema nil
+ :name "test_table_null_schema"}
+ :model/Table {other-table-id :id} {:db_id db-id
+ :schema "other"
+ :name "other_table"}
+ ;; Create transforms targeting these tables
+ :model/Transform transform1 {:name "Transform with schema"
+ :source {:type "query"
+ :query {:database db-id
+ :type "native"
+ :native {:query "SELECT 1"
+ :template-tags {}}}}
+ :target {:type "table"
+ :schema "public"
+ :name "test_table_with_schema"
+ :db_id db-id}}
+ :model/Transform transform2 {:name "Transform with NULL schema"
+ :source {:type "query"
+ :query {:database db-id
+ :type "native"
+ :native {:query "SELECT 2"
+ :template-tags {}}}}
+ :target {:type "table"
+ :schema nil
+ :name "test_table_null_schema"
+ :db_id db-id}}]
+
+ (testing "Hydrates table with non-NULL schema"
+ (let [hydrated (t2/hydrate transform1 :table-with-db-and-fields)]
+ (is (some? (:table hydrated))
+ "Transform should have hydrated table")
+ (is (= table-with-schema-id (-> hydrated :table :id))
+ "Should hydrate correct table with schema")))
+
+ (testing "Hydrates table with NULL schema"
+ (let [hydrated (t2/hydrate transform2 :table-with-db-and-fields)]
+ (is (some? (:table hydrated))
+ "Transform with NULL schema should have hydrated table")
+ (is (= table-null-schema-id (-> hydrated :table :id))
+ "Should hydrate correct table with NULL schema")))
+
+ (testing "Hydrates multiple transforms with mixed schemas in single batch"
+ (let [hydrated (t2/hydrate [transform1 transform2] :table-with-db-and-fields)]
+ (is (= 2 (count hydrated))
+ "Should hydrate both transforms")
+ (is (every? (comp some? :table) hydrated)
+ "Both transforms should have hydrated tables")
+ (is (= #{table-with-schema-id table-null-schema-id}
+ (set (map (comp :id :table) hydrated)))
+ "Should hydrate both tables correctly")))
+
+ (testing "Does not hydrate unrelated tables"
+ (let [hydrated (t2/hydrate transform1 :table-with-db-and-fields)]
+ (is (not= other-table-id (-> hydrated :table :id))
+ "Should not hydrate unrelated table"))))))
+
+(deftest creator-hydration-test
+ (testing "Transform creator hydration returns user details"
+ (let [user1-data {:first_name "Test"
+ :last_name "Creator"
+ :email "[email protected]"}
+ user2-data {:first_name "Second"
+ :last_name "User"
+ :email "[email protected]"}]
+ (mt/with-temp [:model/User {user1-id :id} user1-data
+ :model/Database {db-id :id} {}
+ :model/Transform transform1 {:name "Transform with creator"
+ :creator_id user1-id
+ :source {:type "query"
+ :query {:database db-id
+ :type "native"
+ :native {:query "SELECT 1"
+ :template-tags {}}}}
+ :target {:type "table"
+ :schema "public"
+ :name "test_table"
+ :db_id db-id}}
+ :model/User {user2-id :id} user2-data
+ :model/Transform transform2 {:name "Second transform"
+ :creator_id user2-id
+ :source {:type "query"
+ :query {:database db-id
+ :type "native"
+ :native {:query "SELECT 2"
+ :template-tags {}}}}
+ :target {:type "table"
+ :schema "public"
+ :name "test_table2"
+ :db_id db-id}}]
+ (testing "Hydrates creator with user details"
+ (is (=? (assoc user1-data :id user1-id)
+ (:creator (t2/hydrate transform1 :creator)))))
+ (testing "Hydrates multiple transforms with creators in batch"
+ (let [hydrated (t2/hydrate [transform1 transform2] :creator)]
+ (is (= 2 (count hydrated))
+ "Should hydrate both transforms")
+ (is (=? (assoc user1-data :id user1-id)
+ (:creator (first hydrated)))
+ "First hydrated should match the first user's data")
+ (is (=? (assoc user2-data :id user2-id)
+ (:creator (second hydrated)))
+ "Second hydrated should match the second user's data")))))))
+
+(deftest check-allowed-content-transforms
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-temp [:model/Collection transforms {:name "Test Transforms" :namespace collection/transforms-ns}
+ :model/Collection regular-col {:name "Test Regular"}]
+ (mt/with-model-cleanup [:model/Transform :model/Card]
+ (testing "Can only add allowed content types"
+ (is (some? (t2/insert! :model/Transform (assoc (mt/with-temp-defaults :model/Transform) :collection_id (:id transforms)))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A Card can only go in Collections in the.*"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model :collection_id (:id transforms)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"A Transform can only go in Collections in the :transforms namespace."
+ (t2/insert! :model/Transform (assoc (mt/with-temp-defaults :model/Transform) :collection_id (:id regular-col))))))))))
+
+(deftest deleted-transform-preserves-runs-test
+ (testing "Deleting a transform sets transform_id to NULL but preserves the run"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-id :id
+ transform-name :name
+ entity-id :entity_id} {}
+ :model/TransformRun {run-id :id} {:transform_id transform-id
+ :transform_name transform-name
+ :transform_entity_id entity-id
+ :status "succeeded"
+ :run_method "manual"}]
+ (t2/delete! :model/Transform :id transform-id)
+
+ (let [run (t2/select-one :model/TransformRun :id run-id)]
+ (is (some? run))
+ (is (nil? (:transform_id run)))
+ (is (= transform-name (:transform_name run)))
+ (is (= entity-id (:transform_entity_id run))))))))
+
+(deftest orphaned-run-hydration-test
+ (testing "Hydrating :transform on orphaned runs returns {:name ... :deleted true}"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/TransformRun run {:transform_id nil
+ :transform_name "Deleted Transform"
+ :transform_entity_id "test-entity-id-123"
+ :status "succeeded"
+ :run_method "manual"}]
+ (let [hydrated (t2/hydrate run :transform)]
+ (is (= {:name "Deleted Transform" :deleted true} (:transform hydrated))))))))
+
+(deftest start-run-captures-transform-info-test
+ (testing "start-run! captures transform_name and transform_entity_id"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-id :id
+ transform-name :name
+ entity-id :entity_id} {}]
+ (let [run (transform-run/start-run! transform-id {:run_method "manual"})]
+ (is (= transform-name (:transform_name run)))
+ (is (= entity-id (:transform_entity_id run))))))))
diff --git a/test/metabase/transforms/ordering_test.clj b/test/metabase/transforms/ordering_test.clj
new file mode 100644
index 00000000000..6cc78a2910f
--- /dev/null
+++ b/test/metabase/transforms/ordering_test.clj
@@ -0,0 +1,360 @@
+(ns ^:mb/driver-tests metabase.transforms.ordering-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.driver :as driver]
+ [metabase.driver.sql :as driver.sql]
+ [metabase.query-processor.compile :as qp.compile]
+ [metabase.test :as mt]
+ [metabase.test.data.sql :as sql.tx]
+ [metabase.transforms.execute :as transforms.execute]
+ [metabase.transforms.interface :as transforms.i]
+ [metabase.transforms.ordering :as ordering]
+ [toucan2.core :as t2]))
+
+(defn- default-schema-or-public [& [fallback-driver]]
+ (let [driver (or driver/*driver* fallback-driver)]
+ (or (and driver (driver.sql/default-schema driver)) "public")))
+
+(defn- make-transform [query & [name schema]]
+ (let [name (or name (mt/random-name))
+ schema (or schema (default-schema-or-public))]
+ {:source {:type :query
+ :query query}
+ :name (str "transform_" name)
+ :target {:schema schema
+ :name name
+ :type :table}}))
+
+(use-fixtures :once (fn [thunk]
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (thunk))))
+
+(deftest basic-ordering-test
+ (mt/with-temp [:model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders)}})]
+ (is (= {t1 #{}}
+ (ordering/transform-ordering (t2/select :model/Transform :id t1))))))
+
+(deftest dependency-ordering-test
+ (mt/with-temp [:model/Table {table :id} {:schema (default-schema-or-public)
+ :name "orders_2"}
+ :model/Field _ {:table_id table
+ :name "foo"}
+ :model/Transform {parent :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders)}}
+ "orders_2")
+ :model/Transform {child :id} (make-transform
+ {:database (mt/id)
+ :type "query"
+ :query {:source-table table}}
+ "orders_3")]
+ (is (= {parent #{}
+ child #{parent}}
+ (ordering/transform-ordering (t2/select :model/Transform :id [:in [parent child]]))))))
+
+(defn- transform-deps-for-db [transform]
+ (mt/with-metadata-provider (mt/id)
+ (#'transforms.i/table-dependencies transform)))
+
+(deftest not-run-transform-dependency-ordering-test
+ (mt/test-driver (mt/normal-driver-select {:+parent :sql-jdbc})
+ (testing "dependencies are correctly identified when no transforms have been run yet"
+ (mt/with-temp [:model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM orders LIMIT 100"}}
+ "orders_transform")
+ :model/Transform {t2 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM products LIMIT 100"}}
+ "products_transform")
+ :model/Transform {t3 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM orders_transform ot
+ LEFT JOIN products p
+ ON ot.product_id = p.id
+ LIMIT 100"}}
+ "orders_transform_products")
+ :model/Transform {t4 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM orders_transform ot
+ LEFT JOIN products_transform pt
+ ON ot.product_id = pt.id
+ LIMIT 100"}}
+ "orders_transform_products_transform")]
+ (is (= #{{:transform t1} {:transform t2}}
+ (transform-deps-for-db (t2/select-one :model/Transform t4))))
+ (is (= {t1 #{}
+ t2 #{}
+ t3 #{t1}
+ t4 #{t1 t2}}
+ (ordering/transform-ordering (t2/select :model/Transform :id [:in [t1 t2 t3 t4]]))))))
+ (testing "dependencies are correctly identified when some transform have been run and some haven't"
+ (mt/with-temp [:model/Transform {t1 :id :as transform1} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM checkins LIMIT 100"}}
+ "checkins_transform")
+ :model/Transform {t2 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM venues LIMIT 100"}}
+ "venues_transform")
+ :model/Transform {t3 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query "SELECT * FROM venues_transform vt
+ LEFT JOIN checkins_transform ct
+ ON vt.id = ct.venue_id
+ LIMIT 100"}}
+ "venues_transform_2")]
+ (try
+ (transforms.execute/execute! transform1 {:run-method :manual})
+ (let [table1 (t2/select-one-pk :model/Table :name "checkins_transform")]
+ (is (= #{{:table table1} {:transform t2}}
+ (transform-deps-for-db (t2/select-one :model/Transform t3)))))
+ (is (= {t1 #{}
+ t2 #{}
+ t3 #{t1 t2}}
+ (ordering/transform-ordering (t2/select :model/Transform :id [:in [t1 t2 t3]]))))
+ (finally
+ (t2/delete! :model/Table :name "checkins_transform")))))))
+
+(deftest bigquery-native-transform-dependency-ordering-test
+ (mt/test-driver :biquery-cloud-sdk
+ (let [[dataset] (sql.tx/qualified-name-components :bigquery-cloud-sdk nil)]
+ (testing "dependencies are correctly identified when some transform have been run and some haven't"
+ (mt/with-temp [:model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query (format "SELECT * FROM `%s.checkins` LIMIT 100" dataset)}}
+ "checkins_transform" dataset)
+ :model/Table {table1 :id} {:schema dataset
+ :name "checkins_transform"}
+ :model/Transform {t2 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query (format "SELECT * FROM `%s.venues` LIMIT 100" dataset)}}
+ "venues_transform" dataset)
+ :model/Transform {t3 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query (format "SELECT * FROM `%s.venues_transform` vt
+ LEFT JOIN `%s.checkins_transform` ct
+ ON vt.id = ct.venue_id
+ LIMIT 100" dataset dataset)}}
+ "venues_transform_2" dataset)]
+ (is (= #{{:table table1} {:transform t2}}
+ (transform-deps-for-db (t2/select-one :model/Transform t3))))
+ (is (= {t1 #{}
+ t2 #{}
+ t3 #{t1 t2}}
+ (ordering/transform-ordering (t2/select :model/Transform :id [:in [t1 t2 t3]])))))))))
+
+(deftest ^:parallel basic-dependencies-test
+ (mt/with-temp [:model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders)}})]
+ (is (= #{{:table (mt/id :orders)}}
+ (transform-deps-for-db (t2/select-one :model/Transform :id t1))))))
+
+(deftest ^:parallel joined-dependencies-test
+ (mt/test-drivers (mt/normal-drivers-with-feature :left-join)
+ (mt/with-temp [:model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders),
+ :joins
+ [{:fields "all",
+ :strategy "left-join",
+ :alias "Products",
+ :condition
+ [:=
+ [:field
+ (mt/id :orders :product_id)
+ {:base-type "type/Integer"}]
+ [:field
+ (mt/id :products :id)
+ {:base-type "type/Integer",
+ :join-alias "Products"}]],
+ :source-table (mt/id :products)}]},
+ :parameters []})]
+ (is (= #{{:table (mt/id :orders)}
+ {:table (mt/id :products)}}
+ (transform-deps-for-db (t2/select-one :model/Transform :id t1)))))))
+
+(deftest card-dependencies-test
+ (mt/test-drivers (mt/normal-driver-select {:+features [:transforms/table :left-join]})
+ (mt/with-temp [:model/Card {card :id} {:dataset_query {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders),
+ :joins
+ [{:fields "all",
+ :strategy "left-join",
+ :alias "Products",
+ :condition
+ [:=
+ [:field
+ (mt/id :orders :product_id)
+ {:base-type "type/Integer"}]
+ [:field
+ (mt/id :products :id)
+ {:base-type "type/Integer",
+ :join-alias "Products"}]],
+ :source-table (mt/id :products)}]},
+ :parameters []}}
+ :model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query
+ {:aggregation [["count"]],
+ :breakout [["field" "Products__category" {:base-type "type/Text"}]],
+ :source-table (str "card__" card)},
+ :parameters []})]
+ (is (= #{{:table (mt/id :orders)}
+ {:table (mt/id :products)}}
+ (transform-deps-for-db (t2/select-one :model/Transform :id t1)))))))
+
+(deftest native-dependencies-test
+ (mt/with-temp [:model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type :native
+ :native (qp.compile/compile
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders)}})})]
+ (is (= #{{:table (mt/id :orders)}}
+ (transform-deps-for-db (t2/select-one :model/Transform :id t1))))))
+
+(deftest native-card-dependencies-test
+ (mt/test-drivers (mt/normal-driver-select {:+features [:transforms/table
+ :native-parameter-card-reference
+ :left-join]})
+ (mt/with-temp [:model/Card {card :id} {:dataset_query {:database (mt/id),
+ :type "query",
+ :query {:source-table (mt/id :orders),
+ :joins
+ [{:fields "all",
+ :strategy "left-join",
+ :alias "Products",
+ :condition
+ [:=
+ [:field
+ (mt/id :orders :product_id)
+ {:base-type "type/Integer"}]
+ [:field
+ (mt/id :products :id)
+ {:base-type "type/Integer",
+ :join-alias "Products"}]],
+ :source-table (mt/id :products)}]},
+ :parameters []}}
+ :model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type :native,
+ :native {:query
+ (mt/native-query-with-card-template-tag
+ (:engine (mt/db))
+ (str "#" card)),
+ :template-tags
+ {(keyword (str "#" card))
+ {:type "card"
+ :name "card"
+ :display-name "card"
+ :card-id card}}}})]
+ (is (= #{{:table (mt/id :orders)}
+ {:table (mt/id :products)}}
+ (transform-deps-for-db (t2/select-one :model/Transform :id t1)))))))
+
+(defn- rotations
+ [v]
+ (let [n (count v)
+ elements (cycle v)]
+ (into #{} (map #(take n (drop % elements)))
+ (range n))))
+
+(deftest find-cycle-test
+ (let [test-graph
+ {1 #{2}
+ 2 #{3 5}
+ 3 #{4}
+ 4 #{6}
+ 5 #{6}
+ 6 #{7}
+ 7 #{3}}
+ cycles (rotations [3 4 6 7])]
+ (is (contains? cycles
+ (ordering/find-cycle test-graph)))))
+
+(deftest get-transform-cycle-test
+ (testing "cycle is detected in transform referencing itself"
+ (mt/with-temp [:model/Table {table1 :id} {:schema (default-schema-or-public)
+ :name "table_1"}
+ :model/Field _ {:table_id table1
+ :name "foo"}
+ :model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table table1}}
+ "table_1")]
+ (is (= {:cycle-str "transform_table_1"
+ :cycle [t1]}
+ (ordering/get-transform-cycle (t2/select-one :model/Transform :id t1))))))
+ (testing "cycle is caught in 2 transforms referencing each other"
+ (mt/with-temp [:model/Table {table1 :id} {:schema (default-schema-or-public), :name "table_1"}
+ :model/Field _ {:table_id table1
+ :name "foo"}
+ :model/Table {table2 :id} {:schema (default-schema-or-public), :name "table_2"}
+ :model/Field _ {:table_id table2
+ :name "foo"}
+ :model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table table1}}
+ "table_2")
+ :model/Transform {t2 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table table2}}
+ "table_1")]
+ (is (= {:cycle-str "transform_table_2 -> transform_table_1",
+ :cycle [t1 t2]}
+ (ordering/get-transform-cycle (t2/select-one :model/Transform :id t1))))))
+ (testing "cycle is detected in 3 transforms referencing each other"
+ (mt/with-temp [:model/Table {table1 :id} {:schema (default-schema-or-public)
+ :name "table_1"}
+ :model/Field _ {:table_id table1
+ :name "foo"}
+ :model/Table {table2 :id} {:schema (default-schema-or-public)
+ :name "table_2"}
+ :model/Field _ {:table_id table2
+ :name "foo"}
+ :model/Table {table3 :id} {:schema (default-schema-or-public)
+ :name "table_3"}
+ :model/Field _ {:table_id table3
+ :name "foo"}
+ :model/Transform {t1 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table table1}}
+ "table_2")
+ :model/Transform {t2 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table table2}}
+ "table_3")
+ :model/Transform {t3 :id} (make-transform
+ {:database (mt/id),
+ :type "query",
+ :query {:source-table table3}}
+ "table_1")]
+ (is (= {:cycle-str "transform_table_2 -> transform_table_1 -> transform_table_3",
+ :cycle [t1 t3 t2]}
+ (ordering/get-transform-cycle (t2/select-one :model/Transform :id t1)))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/query_test_util.clj b/test/metabase/transforms/query_test_util.clj
similarity index 96%
rename from enterprise/backend/test/metabase_enterprise/transforms/query_test_util.clj
rename to test/metabase/transforms/query_test_util.clj
index 44baae49ee3..5e8607d46ec 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/query_test_util.clj
+++ b/test/metabase/transforms/query_test_util.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.query-test-util
+(ns metabase.transforms.query-test-util
"Shared utilities for building test queries in transform tests."
(:require
[medley.core :as m]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/revision_test.clj b/test/metabase/transforms/revision_test.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/transforms/revision_test.clj
rename to test/metabase/transforms/revision_test.clj
index d6b43dd3e5e..1ef94ea3f53 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/revision_test.clj
+++ b/test/metabase/transforms/revision_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.revision-test
+(ns metabase.transforms.revision-test
(:require
[clojure.test :refer :all]
[metabase.revisions.models.revision :as revision]))
diff --git a/test/metabase/transforms/search_test.clj b/test/metabase/transforms/search_test.clj
new file mode 100644
index 00000000000..4b9adcec1b1
--- /dev/null
+++ b/test/metabase/transforms/search_test.clj
@@ -0,0 +1,187 @@
+(ns metabase.transforms.search-test
+ (:require
+ [clojure.test :refer :all]
+ [java-time.api :as t]
+ [metabase.app-db.core :as mdb]
+ [metabase.lib.core :as lib]
+ [metabase.search.appdb.index :as search.index]
+ [metabase.search.engine :as search.engine]
+ [metabase.search.ingestion :as search.ingestion]
+ [metabase.search.test-util :as search.tu]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
+ [toucan2.core :as t2])
+ (:import
+ (org.postgresql.util PGobject)))
+
+(set! *warn-on-reflection* true)
+
+(use-fixtures :once (fixtures/initialize :db :test-users))
+
+(defn- ingest!
+ [model where-clause]
+ (#'search.engine/update!
+ :search.engine/appdb
+ (#'search.ingestion/query->documents
+ (#'search.ingestion/spec-index-reducible model where-clause))))
+
+(defn- fetch-one [model & clauses]
+ (apply t2/select-one (search.index/active-table) :model model clauses))
+
+(defn ingest-then-fetch!
+ [model entity-name]
+ (ingest! model [:= :this.name entity-name])
+ (fetch-one model :name entity-name))
+
+(def ^:private default-index-entity
+ {:model nil
+ :model_id nil
+ :name nil
+ :official_collection nil
+ :database_id nil
+ :pinned nil
+ :view_count nil
+ :collection_id nil
+ :last_viewed_at nil
+ :model_created_at nil
+ :model_updated_at nil
+ :dashboardcard_count nil
+ :last_edited_at nil
+ :last_editor_id nil
+ :verified nil})
+
+(defn index-entity
+ [entity]
+ (merge default-index-entity entity))
+
+(deftest transform-ingestion-test
+ (search.tu/with-temp-index-table
+ (testing "A simple SQL transform gets properly ingested & indexed for search"
+ (let [now (t/truncate-to (t/offset-date-time) :millis)]
+ (mt/with-temp [:model/Transform {transform-id :id} {:name "Test transform"
+ :description "A test transform"
+ :source {:type "query"
+ :query (mt/native-query {:query "SELECT 1"})}
+ :target {:database (mt/id)
+ :table "test_table"}
+ :created_at now
+ :updated_at now}]
+ (let [ingested-transform (ingest-then-fetch! "transform" "Test transform")]
+ (is (=? (index-entity
+ {:model "transform"
+ :model_id (str transform-id)
+ :name "Test transform"
+ :database_id (mt/id)
+ :model_created_at now
+ :model_updated_at now})
+ ingested-transform))))))
+
+ (testing "A simple MBQL transform gets properly ingested & indexed for search"
+ (let [now (t/truncate-to (t/offset-date-time) :millis)]
+ (mt/with-temp [:model/Transform {transform-id :id} {:name "Test MBQL transform"
+ :description "An MBQL test transform"
+ :source {:type "query"
+ :query (mt/mbql-query venues {:limit 10})}
+ :target {:database (mt/id)
+ :table "test_mbql_table"}
+ :created_at now
+ :updated_at now}]
+ (let [ingested-transform (ingest-then-fetch! "transform" "Test MBQL transform")]
+ (is (=? (index-entity
+ {:model "transform"
+ :model_id (str transform-id)
+ :name "Test MBQL transform"
+ :database_id (mt/id)
+ :model_created_at now
+ :model_updated_at now})
+ ingested-transform))))))))
+
+(deftest transform-query-ingestion-test
+ (testing "Contents of SQL and Python transform sources are extracted and indexed for full-text search"
+ (when (= (mdb/db-type) :postgres)
+ (mt/with-temp [:model/Transform _ {:target {:database (mt/id)
+ :table "test_table"}
+ :name "Test SQL transform"
+ :source {:type "query"
+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}}]
+ (let [ingested-transform (ingest-then-fetch! "transform" "Test SQL transform")
+ vector-value (.getValue ^PGobject (:with_native_query_vector ingested-transform))]
+ (is (string? vector-value))
+ (is (re-find #"select" vector-value))
+ (is (re-find #"sql" vector-value))))
+
+ (mt/when-ee-evailable
+ (mt/with-temp [:model/Transform _ {:target {:database (mt/id)}
+ :source {:type "python"
+ :source-database (mt/id)
+ :body "import pandas as pd\n"}
+ :name "Test python transform"}]
+ (let [ingested-transform (ingest-then-fetch! "transform" "Test python transform")
+ vector-value (.getValue ^PGobject (:with_native_query_vector ingested-transform))]
+ (is (string? vector-value))
+ (is (re-find #"import" vector-value))
+ (is (re-find #"panda" vector-value)))))
+
+ (testing "MBQL queries are not indexed in with_native_query_vector"
+ (mt/with-temp [:model/Transform _ {:target {:database (mt/id)
+ :table "test_mbql_table"}
+ :name "Test MBQL transform"
+ :source {:type "query"
+ :query (mt/mbql-query venues {:limit 10})}}]
+ (let [ingested-transform (ingest-then-fetch! "transform" "Test MBQL transform")
+ vector-value (.getValue ^PGobject (:with_native_query_vector ingested-transform))]
+ (is (string? vector-value))
+ (is (re-find #"test" vector-value))
+ (is (re-find #"mbql" vector-value))
+ ;; Ensure that the actual MQBL query isn't indexed
+ (is (not (re-find #"source" vector-value)))
+ (is (not (re-find #"table" vector-value)))))))))
+
+(deftest transform-deletion-test
+ (search.tu/with-temp-index-table
+ (testing "Transform is removed from search index when deleted"
+ (binding [search.ingestion/*force-sync* true]
+ (mt/with-temp [:model/Transform {transform-id :id} {:name "Transform to delete"}]
+ (ingest! "transform" [:= :this.id transform-id])
+ (is (some? (fetch-one "transform" :model_id (str transform-id)))
+ "Transform should be in the search index after ingestion")
+ (t2/delete! :model/Transform :id transform-id)
+ (is (nil? (fetch-one "transform" :model_id (str transform-id)))
+ "Transform should be removed from the search index after deletion"))))))
+
+(deftest transform-search-test
+ (mt/with-premium-features #{:transforms}
+ (search.tu/with-temp-index-table
+ (mt/as-admin
+ (testing "Transforms can be indexed and subsequently searched for"
+ (binding [search.ingestion/*force-sync* true]
+ (mt/with-temp [:model/Transform {transform-id :id}
+ {:name "Customer Revenue Analysis"
+ :description "Analyzes revenue by customer segment"
+ :source {:type "query"
+ :query (mt/native-query {:query "SELECT customer_id, SUM(revenue) FROM orders GROUP BY customer_id"})}
+ :target {:database (mt/id)
+ :table "customer_revenue"}}]
+ (ingest! "transform" [:= :this.id transform-id])
+ (testing "Can search by transform name"
+ (let [results (search.tu/search-results "Customer Revenue")]
+ (is (seq results) "Search should return results")
+ (is (some #(and (= "transform" (:model %))
+ (= transform-id (:id %)))
+ results)
+ "Results should include the transform")))
+ (testing "Can search by transform description"
+ (let [results (search.tu/search-results "customer segment")]
+ (is (some #(and (= "transform" (:model %))
+ (= transform-id (:id %)))
+ results)
+ "Should find transform by description text")))
+ (testing "Can filter search results to transforms only"
+ (mt/with-temp [:model/Card _ {:name "Customer Revenue Card"
+ :database_id (mt/id)
+ :table_id (mt/id :orders)
+ :dataset_query (mt/native-query {:query "SELECT 1"})}]
+ (ingest! "card" [:like :this.name "%Customer Revenue%"])
+ (let [transform-only-results (search.tu/search-results "Customer Revenue" {:models #{"transform"}})]
+ (is (every? #(= "transform" (:model %)) transform-only-results)
+ "All results should be transforms when filtered")))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/test_dataset.clj b/test/metabase/transforms/test_dataset.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/transforms/test_dataset.clj
rename to test/metabase/transforms/test_dataset.clj
index 4ab800bf5ab..0e1194ead0b 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/test_dataset.clj
+++ b/test/metabase/transforms/test_dataset.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.test-dataset
+(ns metabase.transforms.test-dataset
"A minimal but sufficient dataset for testing transforms functionality.
This dataset is intentionally small to speed up test execution, especially
on cloud databases like Snowflake where database creation is expensive."
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/test_util.clj b/test/metabase/transforms/test_util.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/transforms/test_util.clj
rename to test/metabase/transforms/test_util.clj
index 6fde854b922..79eca9a0a01 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/test_util.clj
+++ b/test/metabase/transforms/test_util.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.transforms.test-util
+(ns metabase.transforms.test-util
(:require
[clojure.string :as str]
[clojure.test :refer :all]
@@ -111,7 +111,7 @@
(defn test-run
[transform-id]
- (let [resp (mt/user-http-request :crowberto :post 202 (format "ee/transform/%s/run" transform-id))
+ (let [resp (mt/user-http-request :crowberto :post 202 (format "transform/%s/run" transform-id))
timeout-s 10 ; 10 seconds is our timeout to finish execution and sync
limit (+ (System/currentTimeMillis) (* timeout-s 1000))]
(is (=? {:message "Transform run started"}
@@ -119,7 +119,7 @@
(loop [last-resp nil]
(when (> (System/currentTimeMillis) limit)
(throw (ex-info (str "Transform run timed out after " timeout-s " seconds") {:resp last-resp})))
- (let [resp (mt/user-http-request :crowberto :get 200 (format "ee/transform/%s" transform-id))
+ (let [resp (mt/user-http-request :crowberto :get 200 (format "transform/%s" transform-id))
status (some-> resp :last_run :status keyword)]
(when-not (contains? #{:started :succeeded} status)
(throw (ex-info (str "Transform run failed with status " status) {:resp resp :status status})))
@@ -136,7 +136,7 @@
(when (> (u/since-ms start-time) timeout-ms)
(throw (ex-info (format "Transform %d did not complete after %dms" transform-id timeout-ms)
{:transform-id transform-id :timeout-ms timeout-ms})))
- (let [resp (mt/user-http-request :crowberto :get 200 (format "ee/transform/%d" transform-id))
+ (let [resp (mt/user-http-request :crowberto :get 200 (format "transform/%d" transform-id))
status (some-> resp :last_run :status keyword)]
(case status
:succeeded resp
diff --git a/test/metabase/transforms/util_test.clj b/test/metabase/transforms/util_test.clj
new file mode 100644
index 00000000000..cac57184531
--- /dev/null
+++ b/test/metabase/transforms/util_test.clj
@@ -0,0 +1,318 @@
+(ns ^:mb/driver-tests metabase.transforms.util-test
+ "Tests for transform utility functions."
+ (:require
+ [clojure.test :refer :all]
+ [metabase.api.common :as api]
+ [metabase.driver :as driver]
+ [metabase.driver.util :as driver.u]
+ [metabase.permissions.models.data-permissions :as data-perms]
+ [metabase.permissions.models.permissions-group :as perms-group]
+ [metabase.test :as mt]
+ [metabase.test.data.sql :as sql.tx]
+ [metabase.transforms.util :as transforms.util]))
+
+(set! *warn-on-reflection* true)
+
+(deftest temp-table-name-test
+ (testing "temp-table-name generates valid table names respecting driver limits"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (let [driver driver/*driver*]
+
+ (testing "Basic table name generation"
+ (let [result (driver.u/temp-table-name driver nil)
+ table-name (name result)]
+ (is (keyword? result))
+ (is (nil? (namespace result)))
+ (is (re-matches #"mb_transform_temp_table_[a-f0-9]{8}" table-name))))
+
+ (testing "Table name preserves namespace when present"
+ (let [result (driver.u/temp-table-name driver :schema/orders)]
+ (is (= "schema" (namespace result)))
+ (is (re-matches #"mb_transform_temp_table_[a-f0-9]{8}" (name result)))))))))
+
+(deftest temp-table-name-creates-table-test
+ (testing "temp-table-name produces names that can actually create tables"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/python)
+ (let [driver driver/*driver*
+ db-id (mt/id)
+
+ table-name (driver.u/temp-table-name driver :test_table)
+ schema-name (when (get-method sql.tx/session-schema driver)
+ (sql.tx/session-schema driver))
+ qualified-table-name (if schema-name
+ (keyword schema-name (name table-name))
+ table-name)
+ column-definitions {"id" (driver/type->database-type driver :type/Integer)}]
+ (mt/as-admin
+ (try
+ (testing "Can create table with generated temp name"
+ (driver/create-table! driver db-id qualified-table-name column-definitions {})
+ (when-not (= driver :mongo) ;; mongo doesn't actually create tables
+ (is (driver/table-exists? driver (mt/db) {:schema schema-name :name (name table-name)}))))
+ (finally
+ (try
+ (driver/drop-table! driver db-id qualified-table-name)
+ (catch Exception _e
+ ;; Ignore cleanup errors
+ nil)))))))))
+
+(deftest is-temp-transform-tables-test
+ (mt/with-premium-features #{}
+ (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))}]
+ (is (true? (transforms.util/is-temp-transform-table? table-with-schema)))
+ (is (true? (transforms.util/is-temp-transform-table? table-without-schema)))))))
+
+(deftest create-table-from-schema!-test
+ (testing "create-table-from-schema! preserves column order from schema definition"
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (let [driver driver/*driver*
+ db-id (mt/id)
+ schema-name (when (get-method sql.tx/session-schema driver)
+ (sql.tx/session-schema driver))
+ table-name (keyword "test_column_order")
+ qualified-table-name (if schema-name
+ (keyword schema-name (name table-name))
+ table-name)
+ table-schema {:name qualified-table-name
+ :columns [{:name "zebra_col" :type :type/Text}
+ {:name "apple_col" :type :type/Integer}
+ {:name "mango_col" :type :type/Boolean}]}]
+ (mt/as-admin
+ (try
+ (testing "Creating table with ordered columns"
+ (transforms.util/create-table-from-schema! driver db-id table-schema)
+ (is (driver/table-exists? driver (mt/db) {:schema schema-name :name (name table-name)})))
+
+ (when (get-method driver/describe-table driver)
+ (testing "Column order matches schema definition order (not alphabetical)"
+ (let [table-metadata {:schema schema-name :name (name table-name)}
+ described-fields (:fields (driver/describe-table driver (mt/db) table-metadata))
+ sorted-fields (sort-by :database-position described-fields)
+ column-names (mapv :name sorted-fields)
+ expected-names ["zebra_col" "apple_col" "mango_col"]]
+ (is (= expected-names column-names)
+ (str "Expected column order " expected-names
+ " but got " column-names)))))
+
+ (finally
+ (try
+ (driver/drop-table! driver db-id qualified-table-name)
+ (catch Exception _e
+ ;; Ignore cleanup errors
+ nil)))))))))
+
+;;; ------------------------------------------------------------
+;;; Filter xf tests
+;;; ------------------------------------------------------------
+
+(deftest ^:parallel matching-timestamp?-test
+ (testing "matching-timestamp? checks if a timestamp falls within a date range [start, end)"
+ (let [matching-timestamp? #'transforms.util/matching-timestamp?
+ field-path [:start_time]
+ range-jan-feb {:start "2024-01-01T00:00:00Z" :end "2024-02-01T00:00:00Z"}
+ range-start-only {:start "2024-01-01T00:00:00Z" :end nil}
+ range-end-only {:start nil :end "2024-02-01T00:00:00Z"}]
+
+ (testing "with both start and end bounds"
+ (are [expected timestamp]
+ (= expected (matching-timestamp? {:start_time timestamp} field-path range-jan-feb))
+ nil nil ; missing field returns nil
+ true "2024-01-15T12:00:00Z" ; timestamp in middle of range
+ false "2023-12-15T12:00:00Z" ; timestamp before range
+ false "2024-02-15T12:00:00Z" ; timestamp after range
+ true "2024-01-01T00:00:00Z" ; start boundary is inclusive
+ true "2024-02-01T00:00:00Z")) ; end boundary is inclusive too 🤷
+
+ (testing "with only start bound"
+ (are [expected timestamp]
+ (= expected (matching-timestamp? {:start_time timestamp} field-path range-start-only))
+ true "2024-01-15T12:00:00Z" ; timestamp after start
+ true "2024-02-15T12:00:00Z" ; any timestamp after start
+ false "2023-12-15T12:00:00Z")) ; timestamp before start
+
+ (testing "with only end bound"
+ (are [expected timestamp]
+ (= expected (matching-timestamp? {:start_time timestamp} field-path range-end-only))
+ true "2024-01-15T12:00:00Z" ; timestamp before end
+ true "2023-12-15T12:00:00Z" ; any timestamp before end
+ false "2024-02-15T12:00:00Z")) ; timestamp after end
+
+ (testing "returns nil when field value is missing"
+ (are [job] (nil? (matching-timestamp? job field-path range-jan-feb))
+ {}
+ {:other "value"})))))
+
+;;; ------------------------------------------------- Source Table Resolution Tests ----------------------------------
+
+(deftest batch-lookup-table-ids-test
+ (testing "batch-lookup-table-ids looks up table IDs from ref maps"
+ (mt/with-temp [:model/Database db {}
+ :model/Table t1 {:db_id (:id db) :name "table_one" :schema nil}
+ :model/Table t2 {:db_id (:id db) :name "table_two" :schema "my_schema"}]
+ (testing "returns nil for empty input"
+ (is (nil? (transforms.util/batch-lookup-table-ids [])))
+ (is (nil? (transforms.util/batch-lookup-table-ids nil))))
+
+ (testing "looks up table without schema"
+ (let [refs [{:database_id (:id db) :schema nil :table "table_one"}]
+ result (transforms.util/batch-lookup-table-ids refs)]
+ (is (= {[(:id db) nil "table_one"] (:id t1)} result))))
+
+ (testing "looks up table with schema"
+ (let [refs [{:database_id (:id db) :schema "my_schema" :table "table_two"}]
+ result (transforms.util/batch-lookup-table-ids refs)]
+ (is (= {[(:id db) "my_schema" "table_two"] (:id t2)} result))))
+
+ (testing "handles mixed refs with and without schema"
+ (let [refs [{:database_id (:id db) :schema nil :table "table_one"}
+ {:database_id (:id db) :schema "my_schema" :table "table_two"}]
+ result (transforms.util/batch-lookup-table-ids refs)]
+ (is (= {[(:id db) nil "table_one"] (:id t1)
+ [(:id db) "my_schema" "table_two"] (:id t2)}
+ result))))
+
+ (testing "returns empty for non-existent table"
+ (let [refs [{:database_id (:id db) :schema nil :table "nonexistent"}]
+ result (transforms.util/batch-lookup-table-ids refs)]
+ (is (= {} result)))))))
+
+(deftest normalize-source-tables-test
+ (testing "normalize-source-tables converts all entries to map format"
+ (mt/with-temp [:model/Database db {}
+ :model/Table t1 {:db_id (:id db) :name "existing_table" :schema nil}]
+ (testing "converts integer table ID to map format"
+ (let [result (transforms.util/normalize-source-tables {"t" (:id t1)})]
+ (is (map? (get result "t")))
+ (is (= (:id db) (get-in result ["t" :database_id])))
+ (is (= "existing_table" (get-in result ["t" :table])))
+ (is (= (:id t1) (get-in result ["t" :table_id])))))
+
+ (testing "throws for non-existent integer table ID"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Tables not found for ids: 999999"
+ (transforms.util/normalize-source-tables {"t" 999999}))))
+
+ (testing "populates table_id for existing table"
+ (let [source-tables {"t" {:database_id (:id db) :schema nil :table "existing_table"}}
+ result (transforms.util/normalize-source-tables source-tables)]
+ (is (= (:id t1) (get-in result ["t" :table_id])))))
+
+ (testing "preserves existing table_id"
+ (let [source-tables {"t" {:database_id (:id db) :schema nil :table "existing_table" :table_id 999}}
+ result (transforms.util/normalize-source-tables source-tables)]
+ (is (= 999 (get-in result ["t" :table_id])))))
+
+ (testing "leaves table_id nil for non-existent table ref"
+ (let [source-tables {"t" {:database_id (:id db) :schema nil :table "nonexistent"}}
+ result (transforms.util/normalize-source-tables source-tables)]
+ (is (nil? (get-in result ["t" :table_id])))))
+
+ (testing "handles mixed int and map entries"
+ (let [source-tables {"t1" (:id t1)
+ "t2" {:database_id (:id db) :schema nil :table "existing_table"}}
+ result (transforms.util/normalize-source-tables source-tables)]
+ (is (map? (get result "t1")))
+ (is (= (:id t1) (get-in result ["t1" :table_id])))
+ (is (= (:id t1) (get-in result ["t2" :table_id]))))))))
+
+(deftest resolve-source-tables-test
+ (testing "resolve-source-tables returns {alias -> table_id} map"
+ (mt/with-temp [:model/Database db {}
+ :model/Table t1 {:db_id (:id db) :name "table_one" :schema nil}
+ :model/Table t2 {:db_id (:id db) :name "table_two" :schema nil}]
+ (testing "passes through integer entries (old format)"
+ (is (= {"t" 123} (transforms.util/resolve-source-tables {"t" 123}))))
+
+ (testing "resolves map with table_id"
+ (let [source-tables {"t" {:database_id (:id db) :schema nil :table "table_one" :table_id (:id t1)}}]
+ (is (= {"t" (:id t1)} (transforms.util/resolve-source-tables source-tables)))))
+
+ (testing "looks up table_id for map without it"
+ (let [source-tables {"t" {:database_id (:id db) :schema nil :table "table_one"}}]
+ (is (= {"t" (:id t1)} (transforms.util/resolve-source-tables source-tables)))))
+
+ (testing "throws for non-existent table"
+ (let [source-tables {"t" {:database_id (:id db) :schema nil :table "nonexistent"}}]
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Tables not found: nonexistent"
+ (transforms.util/resolve-source-tables source-tables)))))
+
+ (testing "throws with schema in error message"
+ (let [source-tables {"t" {:database_id (:id db) :schema "my_schema" :table "nonexistent"}}]
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Tables not found: my_schema\.nonexistent"
+ (transforms.util/resolve-source-tables source-tables)))))
+
+ (testing "handles mixed entries (old and new format)"
+ (let [source-tables {"t1" (:id t1)
+ "t2" {:database_id (:id db) :schema nil :table "table_two"}}]
+ (is (= {"t1" (:id t1) "t2" (:id t2)}
+ (transforms.util/resolve-source-tables source-tables))))))))
+
+(deftest source-tables-readable?-test
+ (testing "source-tables-readable? function"
+ (mt/with-premium-features #{:transforms :transforms-python}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/with-temp [:model/Database {db-id :id} {:engine driver/*driver*}
+ :model/Table {table-id :id} {:db_id db-id :name "test_table"}]
+ (binding [api/*current-user-id* (mt/user->id :lucky)]
+ (mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/view-data :unrestricted
+ (testing "returns true for query transform when user can read database"
+ (let [transform {:source {:type :query
+ :query {:database db-id}}}]
+ (is (true? (transforms.util/source-tables-readable? transform)))))
+
+ (testing "returns true for python transform when user can read all source tables"
+ (let [transform {:source {:type :python
+ :source-tables {"t1" table-id}}}]
+ (is (true? (transforms.util/source-tables-readable? transform)))))
+
+ (testing "handles source tables with table_id in map format"
+ (let [transform {:source {:type :python
+ :source-tables {"t1" {:table_id table-id}}}}]
+ (is (true? (transforms.util/source-tables-readable? transform))))))))))))
+
+(deftest source-tables-readable-permissions-test
+ (testing "source-tables-readable? with various permission levels"
+ (mt/with-premium-features #{:transforms :transforms-python}
+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
+ (mt/with-temp [:model/Database {db-id :id} {:engine driver/*driver*}
+ :model/Table {table1-id :id} {:db_id db-id :name "test_table_1"}
+ :model/Table {table2-id :id} {:db_id db-id :name "test_table_2"}]
+
+ (testing "Query transforms - blocked database access"
+ (let [transform {:source {:type :query
+ :query {:database db-id}}}]
+ (mt/with-user-in-groups [group {:name "Blocked Group"}
+ user [group]]
+ (mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/view-data :blocked
+ (mt/with-db-perm-for-group! group db-id :perms/view-data :blocked
+ (binding [api/*current-user-id* (:id user)]
+ (is (false? (transforms.util/source-tables-readable? transform))
+ "User with blocked database access should not be able to read source database")))))))
+
+ (testing "Python transforms - blocked database access"
+ (let [transform {:source {:type :python
+ :source-tables {"t1" table1-id}}}]
+ (mt/with-user-in-groups [group {:name "Blocked Group"}
+ user [group]]
+ (mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/view-data :blocked
+ (mt/with-db-perm-for-group! group db-id :perms/view-data :blocked
+ (binding [api/*current-user-id* (:id user)]
+ (is (false? (transforms.util/source-tables-readable? transform))
+ "User with blocked database access should not be able to read source tables")))))))
+
+ (testing "Python transforms - granular access but missing some tables"
+ (let [transform {:source {:type :python
+ :source-tables {"t1" table1-id
+ "t2" table2-id}}}]
+ (mt/with-user-in-groups [group {:name "Limited Granular Group"}
+ user [group]]
+ ;; Block all-users from viewing data at database level, then grant specific access via test group
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-db-perm-for-group! group db-id :perms/view-data :unrestricted
+ (mt/with-db-perm-for-group! group db-id :perms/create-queries :query-builder-and-native
+ ;; Block table2 for the test group only
+ (data-perms/set-table-permission! (:id group) table2-id :perms/view-data :blocked)
+ (binding [api/*current-user-id* (:id user)]
+ (is (false? (transforms.util/source-tables-readable? transform))
+ "User who cannot read all source tables should have source_readable=false")))))))))))))
diff --git a/test/metabase/upload/db_test.clj b/test/metabase/upload/db_test.clj
new file mode 100644
index 00000000000..cf84ef70020
--- /dev/null
+++ b/test/metabase/upload/db_test.clj
@@ -0,0 +1,17 @@
+(ns ^:mb/upload-tests metabase.upload.db-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.test :as mt]
+ [metabase.upload.db :as upload.db]
+ [toucan2.core :as t2]))
+
+(deftest current-database-test
+ (mt/with-discard-model-updates! [:model/Database]
+ (testing "returns the uploads-enabled database"
+ (t2/update! :model/Database :uploads_enabled true {:uploads_enabled false})
+ (t2/update! :model/Database (mt/id) {:uploads_enabled true})
+ (is (= (mt/id)
+ (:id (upload.db/current-database)))))
+ (testing "returns nil when uploads are disabled"
+ (t2/update! :model/Database :uploads_enabled true {:uploads_enabled false})
+ (is (nil? (upload.db/current-database))))))
diff --git a/test/metabase/upload/impl_test.clj b/test/metabase/upload/impl_test.clj
index 8026f46de1e..0eb9e7790d0 100644
--- a/test/metabase/upload/impl_test.clj
+++ b/test/metabase/upload/impl_test.clj
@@ -27,6 +27,7 @@
[metabase.test :as mt]
[metabase.test.data.impl :as data.impl]
[metabase.test.data.sql :as sql.tx]
+ [metabase.upload.db :as upload.db]
[metabase.upload.impl :as upload]
[metabase.upload.parsing :as upload-parsing]
[metabase.upload.types :as upload-types]
@@ -719,7 +720,7 @@
(when (driver/upload-type->database-type driver/*driver* :metabase.upload/offset-datetime)
(with-mysql-local-infile-on-and-off
(with-redefs [driver/db-default-timezone (constantly "Z")
- upload/current-database (constantly (mt/db))]
+ upload.db/current-database (constantly (mt/db))]
(let [transpose (fn [m] (apply mapv vector m))
[csv-strs expected] (transpose [["2022-01-01T12:00:00-07" "2022-01-01T19:00:00Z"]
["2022-01-01T12:00:00-07:00" "2022-01-01T19:00:00Z"]
@@ -1618,7 +1619,7 @@
(mt/with-report-timezone-id! "UTC"
(testing "Append should succeed for all possible CSV column types"
(mt/with-dynamic-fn-redefs [driver/db-default-timezone (constantly "Z")
- upload/current-database (constantly (mt/db))]
+ upload.db/current-database (constantly (mt/db))]
(with-upload-table!
[table (create-upload-table!
{:col->upload-type (columns-with-auto-pk
@@ -1650,7 +1651,7 @@
(mt/with-report-timezone-id! "UTC"
(testing "Append should succeed for offset datetime columns"
(with-redefs [driver/db-default-timezone (constantly "Z")
- upload/current-database (constantly (mt/db))]
+ upload.db/current-database (constantly (mt/db))]
(with-upload-table!
[table (create-upload-table!
{:col->upload-type (columns-with-auto-pk