The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Uxw 2973 admin toggle for transforms global (#69240)
Nick Fitzpatrick30b32c0c7fff
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.tsindex d846117ed39..d58ce63fd4c 100644--- a/e2e/support/helpers/e2e-data-studio-helpers.ts+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts@@ -52,6 +52,7 @@ export const DataStudio = {DataStudio.Transforms.list().should("be.visible");},pythonResults: () => cy.findByTestId("python-results"),+ enableTransformPage: () => cy.findByTestId("enable-transform-page"),},Jobs: {header: () => cy.findByTestId("jobs-header"),diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.tsindex 1d4463d43ae..586f2a9596a 100644--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts@@ -6,7 +6,10 @@ import {WRITABLE_DB_ID,} from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import { NORMAL_USER_ID } from "e2e/support/cypress_sample_instance_data";+import {+ ALL_USERS_GROUP_ID,+ NORMAL_USER_ID,+} from "e2e/support/cypress_sample_instance_data";import { createLibraryWithItems } from "e2e/support/test-library-data";import { DataPermissionValue } from "metabase/admin/permissions/types";import type {@@ -4112,6 +4115,17 @@ describe("scenarios > data studio > transforms > permissions", () => {});H.setUserAsAnalyst(NORMAL_USER_ID);+ cy.log(+ "Ensure that transform permissions are visible when instance is hosted and transform feature is present",+ );++ cy.findByRole("radio", { name: "Data" }).click({ force: true });+ cy.findByRole("menuitem", { name: "All Users" }).click();++ cy.findByRole("columnheader", { name: /Transforms/ })+ .scrollIntoView()+ .should("be.visible");+cy.log("sign in as normal user and create a transform");cy.signInAsNormalUser();visitTransformListPage();@@ -4156,9 +4170,19 @@ describe("scenarios > data studio > transforms > permissions > oss", () => {});it(- "should have transforms available by default in OSS without upsell gem icon",+ "should be able to enable transforms in OSS without upsell gem icon",{ tags: "@OSS" },() => {+ cy.log("ensure that transform permissions are not shown");+ cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP_ID}`);++ //Check that a known header is present+ cy.findByRole("columnheader", { name: "Database name" }).should(+ "be.visible",+ );+ //Ensure transform permissions are not displayed+ cy.findByRole("columnheader", { name: /Transforms/ }).should("not.exist");+cy.log("Visit data studio page");cy.visit("/data-studio");H.DataStudio.nav().should("be.visible");@@ -4176,6 +4200,11 @@ describe("scenarios > data studio > transforms > permissions > oss", () => {cy.log("Verify transforms page is accessible");H.DataStudio.nav().findByText("Transforms").click();++ H.DataStudio.Transforms.enableTransformPage()+ .findByRole("button", { name: "Enable transforms" })+ .click();+H.DataStudio.Transforms.list().should("be.visible");cy.log("Verify can create transforms in OSS");@@ -4185,6 +4214,18 @@ describe("scenarios > data studio > transforms > permissions > oss", () => {H.popover().findByText(/Python/i).should("not.exist");++ cy.log("transform permissions should still not");+ H.goToAdmin();+ H.appBar().findByRole("link", { name: "Permissions" }).click();+ cy.findByRole("menuitem", { name: "All Users" }).click();++ //Check that a known header is present+ cy.findByRole("columnheader", { name: "Database name" }).should(+ "be.visible",+ );+ //Ensure transform permissions are not displayed+ cy.findByRole("columnheader", { name: /Transforms/ }).should("not.exist");},);});@@ -4195,9 +4236,18 @@ describe("scenarios > data studio > transforms > permissions > pro-self-hosted",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", () => {+ it("should have transforms available in self-hosted pro without upsell gem icon", () => {H.activateToken("pro-self-hosted").then(() => {+ cy.log("ensure that transform permissions are not shown");+ cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP_ID}`);++ //Check that a known header is present+ cy.findByRole("columnheader", { name: "Database name" }).should(+ "be.visible",+ );+ //Ensure transform permissions are not displayed+ cy.findByRole("columnheader", { name: /Transforms/ }).should("not.exist");+cy.log("Visit data studio page");cy.visit("/data-studio");H.DataStudio.nav().should("be.visible");@@ -4215,10 +4265,27 @@ describe("scenarios > data studio > transforms > permissions > pro-self-hosted",cy.log("Verify transforms page is accessible");H.DataStudio.nav().findByText("Transforms").click();+ H.DataStudio.Transforms.enableTransformPage()+ .findByRole("button", { name: "Enable 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");++ cy.log("transform permissions should now be visible");+ H.goToAdmin();+ H.appBar().findByRole("link", { name: "Permissions" }).click();+ cy.findByRole("menuitem", { name: "All Users" }).click();++ //Check that a known header is present+ cy.findByRole("columnheader", { name: "Database name" }).should(+ "be.visible",+ );+ //Ensure transform permissions are displayed+ cy.findByRole("columnheader", { name: /Transforms/ })+ .scrollIntoView()+ .should("be.visible");});});});diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.tsindex f19c3573817..dfd89154c1d 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts@@ -6,7 +6,6 @@ import type {SpecialGroupType,} from "metabase/admin/permissions/types";import { isNotNull } from "metabase/lib/types";-import { PLUGIN_TRANSFORMS } from "metabase/plugins";import type { Group, GroupsPermissions } from "metabase-types/api";import { buildDataModelPermission } from "./data-model-permission";@@ -14,16 +13,27 @@ import { buildDetailsPermission } from "./details-permission";import { buildDownloadPermission } from "./download-permission";import { buildTransformsPermission } from "./transforms-permission";-export const getFeatureLevelDataPermissions = (- entityId: EntityId,- groupId: number,- groupType: SpecialGroupType,- permissions: GroupsPermissions,- dataAccessPermissionValue: DataPermissionValue,- defaultGroup: Group,- permissionSubject: PermissionSubject,- permissionView?: "group" | "database",-): PermissionSectionConfig[] => {+export const getFeatureLevelDataPermissions = ({+ entityId,+ groupId,+ groupType,+ permissions,+ dataAccessPermissionValue,+ defaultGroup,+ permissionSubject,+ permissionView,+ showTransformPermissions = false,+}: {+ entityId: EntityId;+ groupId: number;+ groupType: SpecialGroupType;+ permissions: GroupsPermissions;+ dataAccessPermissionValue: DataPermissionValue;+ defaultGroup: Group;+ permissionSubject: PermissionSubject;+ permissionView?: "group" | "database";+ showTransformPermissions?: boolean;+}): PermissionSectionConfig[] => {const isAdmin = groupType === "admin";const isExternal = groupType === "external";const downloadPermission = buildDownloadPermission(@@ -61,7 +71,7 @@ export const getFeatureLevelDataPermissions = (): null;- const transformsPermission = PLUGIN_TRANSFORMS.isEnabled+ const transformsPermission = showTransformPermissions? buildTransformsPermission(entityId,groupId,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.unit.spec.tsindex a05f8114cd9..7200ee97774 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.unit.spec.ts@@ -46,18 +46,19 @@ describe("getFeatureLevelDataPermissions", () => {});describe("schemas subject (database level)", () => {- it("returns 4 permissions including transforms when PLUGIN_TRANSFORMS.isEnabled is true", () => {+ it("returns 4 permissions including transforms when PLUGIN_TRANSFORMS.isEnabled is true and transforms are enabled on the instance", () => {PLUGIN_TRANSFORMS.isEnabled = true;- const permissions = getFeatureLevelDataPermissions(- { databaseId },+ const permissions = getFeatureLevelDataPermissions({+ entityId: { databaseId },groupId,groupType,- getPermissionGraph(),- DataPermissionValue.UNRESTRICTED,+ permissions: getPermissionGraph(),+ dataAccessPermissionValue: DataPermissionValue.UNRESTRICTED,defaultGroup,- "schemas",- );+ permissionSubject: "schemas",+ showTransformPermissions: true,+ });expect(permissions).toHaveLength(4);expect(permissions[0]).toMatchObject({ permission: "download" });@@ -71,18 +72,18 @@ describe("getFeatureLevelDataPermissions", () => {});});- it("returns 3 permissions without transforms when PLUGIN_TRANSFORMS.isEnabled is false", () => {+ it("returns 3 permissions when the transform token feature is disabled", () => {PLUGIN_TRANSFORMS.isEnabled = false;- const permissions = getFeatureLevelDataPermissions(- { databaseId },+ const permissions = getFeatureLevelDataPermissions({+ entityId: { databaseId },groupId,groupType,- getPermissionGraph(),- DataPermissionValue.UNRESTRICTED,+ permissions: getPermissionGraph(),+ dataAccessPermissionValue: DataPermissionValue.UNRESTRICTED,defaultGroup,- "schemas",- );+ permissionSubject: "schemas",+ });expect(permissions).toHaveLength(3);expect(permissions[0]).toMatchObject({ permission: "download" });@@ -92,18 +93,19 @@ describe("getFeatureLevelDataPermissions", () => {});describe("tables subject (schema level)", () => {- it("returns 2 permissions without transforms regardless of PLUGIN_TRANSFORMS.isEnabled", () => {+ it("returns 2 permissions without transforms regardless of showTransformPermissions", () => {PLUGIN_TRANSFORMS.isEnabled = true;- const permissions = getFeatureLevelDataPermissions(- { databaseId, schemaName: "public" },+ const permissions = getFeatureLevelDataPermissions({+ entityId: { databaseId, schemaName: "public" },groupId,groupType,- getPermissionGraph(),- DataPermissionValue.UNRESTRICTED,+ permissions: getPermissionGraph(),+ dataAccessPermissionValue: DataPermissionValue.UNRESTRICTED,defaultGroup,- "tables",- );+ permissionSubject: "tables",+ showTransformPermissions: true,+ });expect(permissions).toHaveLength(2);expect(permissions[0]).toMatchObject({ permission: "download" });@@ -112,18 +114,17 @@ describe("getFeatureLevelDataPermissions", () => {});describe("fields subject (table level)", () => {- it("returns 2 permissions without transforms regardless of PLUGIN_TRANSFORMS.isEnabled", () => {- PLUGIN_TRANSFORMS.isEnabled = true;-- const permissions = getFeatureLevelDataPermissions(- { databaseId, schemaName: "public", tableId: 1 },+ it("returns 2 permissions without transforms regardless of showTransformPermissions", () => {+ const permissions = getFeatureLevelDataPermissions({+ entityId: { databaseId, schemaName: "public", tableId: 1 },groupId,groupType,- getPermissionGraph(),- DataPermissionValue.UNRESTRICTED,+ permissions: getPermissionGraph(),+ dataAccessPermissionValue: DataPermissionValue.UNRESTRICTED,defaultGroup,- "fields",- );+ permissionSubject: "fields",+ showTransformPermissions: true,+ });expect(permissions).toHaveLength(2);expect(permissions[0]).toMatchObject({ permission: "download" });diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsxindex 9790a240ef1..f9843f5bc9e 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx@@ -6,7 +6,6 @@ import type {PermissionSubject,SpecialGroupType,} from "metabase/admin/permissions/types";-import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { getUser } from "metabase/selectors/user";import type { User } from "metabase-types/api";import type { AdminPathKey, State } from "metabase-types/store";@@ -34,11 +33,17 @@ export const databaseManagementPermissionAllowedPathGetter = (return canUserAccessDatabaseManagement(user) ? ["databases"] : [];};-export const getDataColumns = (- subject: PermissionSubject,- groupType?: SpecialGroupType,- isExternal?: boolean,-) => {+export const getDataColumns = ({+ subject,+ groupType,+ isExternal,+ showTransformPermissions = false,+}: {+ subject: PermissionSubject;+ groupType?: SpecialGroupType;+ isExternal?: boolean;+ showTransformPermissions?: boolean;+}) => {const allSubjectsColumns: { name: string; hint?: ReactNode }[] = [{name: t`Download results`,@@ -57,7 +62,7 @@ export const getDataColumns = (name: t`Manage database`,});- if (PLUGIN_TRANSFORMS.isEnabled) {+ if (showTransformPermissions) {allSubjectsColumns.push({name: t`Transforms`,hint:diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.unit.spec.tsindex 7dcc52ece1a..98c57184fdc 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.unit.spec.ts@@ -10,10 +10,16 @@ describe("getDataColumns", () => {});describe("schemas subject (database level)", () => {- it("returns 4 columns with Transforms when PLUGIN_TRANSFORMS.isEnabled is true", () => {+ it("returns 4 permissions including transforms when PLUGIN_TRANSFORMS.isEnabled is true and transforms are enabled on the instance", () => {PLUGIN_TRANSFORMS.isEnabled = true;- expect(getDataColumns("schemas", "admin")).toStrictEqual([+ expect(+ getDataColumns({+ subject: "schemas",+ groupType: "admin",+ showTransformPermissions: true,+ }),+ ).toStrictEqual([{name: "Download results",hint: "Downloads of native queries are only allowed if a group has download permissions for the entire database.",@@ -24,10 +30,8 @@ describe("getDataColumns", () => {]);});- it("returns 3 columns without Transforms when PLUGIN_TRANSFORMS.isEnabled is false", () => {- PLUGIN_TRANSFORMS.isEnabled = false;-- expect(getDataColumns("schemas")).toStrictEqual([+ it("returns 3 permissions when the transform token feature is disabled", () => {+ expect(getDataColumns({ subject: "schemas" })).toStrictEqual([{name: "Download results",hint: "Downloads of native queries are only allowed if a group has download permissions for the entire database.",@@ -49,10 +53,14 @@ describe("getDataColumns", () => {];PLUGIN_TRANSFORMS.isEnabled = true;- expect(getDataColumns("tables")).toStrictEqual(expectedColumns);+ expect(getDataColumns({ subject: "tables" })).toStrictEqual(+ expectedColumns,+ );PLUGIN_TRANSFORMS.isEnabled = false;- expect(getDataColumns("tables")).toStrictEqual(expectedColumns);+ expect(getDataColumns({ subject: "tables" })).toStrictEqual(+ expectedColumns,+ );});});@@ -67,10 +75,14 @@ describe("getDataColumns", () => {];PLUGIN_TRANSFORMS.isEnabled = true;- expect(getDataColumns("fields")).toStrictEqual(expectedColumns);+ expect(getDataColumns({ subject: "fields" })).toStrictEqual(+ expectedColumns,+ );PLUGIN_TRANSFORMS.isEnabled = false;- expect(getDataColumns("fields")).toStrictEqual(expectedColumns);+ expect(getDataColumns({ subject: "fields" })).toStrictEqual(+ expectedColumns,+ );});});});diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.tsindex 617c662572c..cc9af46e7ca 100644--- a/frontend/src/metabase-types/api/mocks/settings.ts+++ b/frontend/src/metabase-types/api/mocks/settings.ts@@ -377,6 +377,7 @@ export const createMockSettings = ("subscription-allowed-domains": null,"token-features": createMockTokenFeatures(),"token-status": null,+ "transforms-enabled": false,version: createMockVersion(),"version-info": createMockVersionInfo(),"version-info-last-checked": null,diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 74023341f40..144685d3c47 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -582,6 +582,7 @@ interface PublicSettings {"snowplow-url": string;"start-of-week": DayOfWeekId;"token-features": TokenFeatures;+ "transforms-enabled": boolean;version: Version;"version-info-last-checked": string | null;"airgap-enabled": boolean;diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.tsindex 810956e6672..9d6640449f1 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts@@ -191,15 +191,25 @@ const buildNativePermission = (};};-export const buildFieldsPermissions = (- entityId: TableEntityId,- groupId: number,- groupType: SpecialGroupType,- permissions: GroupsPermissions,- originalPermissions: GroupsPermissions,- defaultGroup: Group,- database: Database,-): PermissionSectionConfig[] => {+export const buildFieldsPermissions = ({+ entityId,+ groupId,+ groupType,+ permissions,+ originalPermissions,+ defaultGroup,+ database,+ showTransformPermissions,+}: {+ entityId: TableEntityId;+ groupId: number;+ groupType: SpecialGroupType;+ permissions: GroupsPermissions;+ originalPermissions: GroupsPermissions;+ defaultGroup: Group;+ database: Database;+ showTransformPermissions: boolean;+}): PermissionSectionConfig[] => {const isAdmin = groupType === "admin";const accessPermission = buildAccessPermission(@@ -227,14 +237,15 @@ export const buildFieldsPermissions = (return _.compact([shouldShowViewDataColumn && accessPermission,nativePermission,- ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions(+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions({entityId,groupId,groupType,permissions,- accessPermission.value,+ dataAccessPermissionValue: accessPermission.value,defaultGroup,- "fields",- ),+ permissionSubject: "fields",+ showTransformPermissions,+ }),]);};diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsxindex 57ce0efbc7a..0e6ad9309e0 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx@@ -3,6 +3,8 @@ import { createSelector } from "@reduxjs/toolkit";import { msgid, ngettext, t } from "ttag";import _ from "underscore";+import { getPlan } from "metabase/common/utils/plan";+import { getIsHosted } from "metabase/databases/selectors";import { Groups } from "metabase/entities/groups";import { Tables } from "metabase/entities/tables";import { getSpecialGroupType, isDefaultGroup } from "metabase/lib/groups";@@ -12,6 +14,8 @@ import {PLUGIN_TENANTS,} from "metabase/plugins";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";+import { getSetting } from "metabase/selectors/settings";+import { getTokenFeature } from "metabase/setup";import type Schema from "metabase-lib/v1/metadata/Schema";import type {Database,@@ -173,6 +177,31 @@ type EntityWithPermissions = {callout?: string;};+export const getShouldShowTransformPermissions = createSelector(+ (state: State) => getPlan(getSetting(state, "token-features")),+ getIsHosted,+ (state: State) => getSetting(state, "transforms-enabled"),+ (state: State) => getTokenFeature(state, "transforms"),+ (plan, isHosted, transformsSettingEnabled, transformsFeatureEnabled) => {+ // Never show in oss+ if (plan === "oss") {+ return false;+ }+ // Pro Self Hosted - setting enabled+ if (!isHosted && transformsFeatureEnabled && transformsSettingEnabled) {+ return true;+ }++ // Pro Cloud - ignore setting+ if (isHosted && transformsFeatureEnabled) {+ return true;+ }++ // Don't show by default+ return false;+ },+);+export const getDatabasesPermissionEditor = createSelector(getMetadataWithHiddenTables,getGroupRouteParams,@@ -181,6 +210,7 @@ export const getDatabasesPermissionEditor = createSelector(getGroup,Groups.selectors.getList,getIsLoadingDatabaseTables,+ getShouldShowTransformPermissions,(metadata,params,@@ -189,6 +219,7 @@ export const getDatabasesPermissionEditor = createSelector(group: Group,groups: Group[],isLoading,+ showTransformPermissions,) => {const { groupId, databaseId, schemaName } = params;@@ -236,15 +267,16 @@ export const getDatabasesPermissionEditor = createSelector(id: table.id,name: table.display_name,entityId,- permissions: buildFieldsPermissions(+ permissions: buildFieldsPermissions({entityId,groupId,groupType,permissions,originalPermissions,- isExternal ? externalUsersGroup : defaultGroup,+ defaultGroup: isExternal ? externalUsersGroup : defaultGroup,database,- ),+ showTransformPermissions,+ }),};});} else if (database && databaseId != null) {@@ -259,15 +291,16 @@ export const getDatabasesPermissionEditor = createSelector(name: schema.name,entityId,canSelect: true,- permissions: buildTablesPermissions(+ permissions: buildTablesPermissions({entityId,groupId,groupType,permissions,originalPermissions,- isExternal ? externalUsersGroup : defaultGroup,+ defaultGroup: isExternal ? externalUsersGroup : defaultGroup,database,- ),+ showTransformPermissions,+ }),};});if (maybeDbEntities) {@@ -289,16 +322,17 @@ export const getDatabasesPermissionEditor = createSelector(? t`(Database routing enabled)`: undefined,canSelect: true,- permissions: buildSchemasPermissions(+ permissions: buildSchemasPermissions({entityId,groupId,groupType,permissions,originalPermissions,- isExternal ? externalUsersGroup : defaultGroup,+ defaultGroup: isExternal ? externalUsersGroup : defaultGroup,database,- "group",- ),+ permissionView: "group",+ showTransformPermissions,+ }),};});}@@ -310,11 +344,12 @@ export const getDatabasesPermissionEditor = createSelector(showViewDataColumn && { name: t`View data` },{ name: t`Create queries` },...(permissionSubject- ? PLUGIN_FEATURE_LEVEL_PERMISSIONS.getDataColumns(- permissionSubject,+ ? PLUGIN_FEATURE_LEVEL_PERMISSIONS.getDataColumns({+ subject: permissionSubject,groupType,isExternal,- )+ showTransformPermissions,+ }): []),]);@@ -386,7 +421,15 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelectogetDataPermissions,getOriginalDataPermissions,getOrderedGroups,- (metadata, params, permissions, originalPermissions, groups) => {+ getShouldShowTransformPermissions,+ (+ metadata,+ params,+ permissions,+ originalPermissions,+ groups,+ showTransformPermissions,+ ) => {const { databaseId, schemaName, tableId } = params;const database = metadata?.database(databaseId);@@ -422,45 +465,54 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto!!allTenantUsersGroup && (isAllTenantUsersGroup || isTenantGroup);if (tableId != null) {- groupPermissions = buildFieldsPermissions(- {+ groupPermissions = buildFieldsPermissions({+ entityId: {databaseId,schemaName,tableId,},- group.id,+ groupId: group.id,groupType,permissions,originalPermissions,- shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,+ defaultGroup: shouldUseAllExternalUsersGroup+ ? allTenantUsersGroup+ : defaultGroup,database,- );+ showTransformPermissions,+ });} else if (schemaName != null) {- groupPermissions = buildTablesPermissions(- {+ groupPermissions = buildTablesPermissions({+ entityId: {databaseId,schemaName,},- group.id,+ groupId: group.id,groupType,permissions,originalPermissions,- shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,+ defaultGroup: shouldUseAllExternalUsersGroup+ ? allTenantUsersGroup+ : defaultGroup,database,- );+ showTransformPermissions,+ });} else if (databaseId != null) {- groupPermissions = buildSchemasPermissions(- {+ groupPermissions = buildSchemasPermissions({+ entityId: {databaseId,},- group.id,+ groupId: group.id,groupType,permissions,originalPermissions,- shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,+ defaultGroup: shouldUseAllExternalUsersGroup+ ? allTenantUsersGroup+ : defaultGroup,database,- "database",- );+ permissionView: "database",+ showTransformPermissions,+ });}return {@@ -481,7 +533,10 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto{ name: t`Group name` },showViewDataColumn && { name: t`View data` },{ name: t`Create queries` },- ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getDataColumns(permissionSubject),+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getDataColumns({+ subject: permissionSubject,+ showTransformPermissions,+ }),]);const hasLegacyNoSelfServiceValueInPermissionGraph =diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsxnew file mode 100644index 00000000000..2640f5fa0bf--- /dev/null+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx@@ -0,0 +1,86 @@+import { createMockTokenFeatures } from "metabase-types/api/mocks";+import {+ createMockSettingsState,+ createMockState,+} from "metabase-types/store/mocks";++import { getShouldShowTransformPermissions } from "./permission-editor";++describe("getShouldShowTransformPermissions", () => {+ describe("OSS version", () => {+ it("should return false for OSS version regardless of other settings", () => {+ const state = createMockState({+ settings: createMockSettingsState({+ "is-hosted?": false,+ "transforms-enabled": true,+ }),+ });++ expect(getShouldShowTransformPermissions(state)).toBe(false);+ });+ });++ describe("Pro Self-Hosted", () => {+ it("should return true when transforms feature and setting are both enabled", () => {+ const state = createMockState({+ settings: createMockSettingsState({+ "is-hosted?": false,+ "transforms-enabled": true,+ "token-features": createMockTokenFeatures({ transforms: true }),+ }),+ });++ expect(getShouldShowTransformPermissions(state)).toBe(true);+ });++ it("should return false when transforms feature is enabled but setting is disabled", () => {+ const state = createMockState({+ settings: createMockSettingsState({+ "is-hosted?": false,+ "transforms-enabled": false,+ "token-features": createMockTokenFeatures({ transforms: true }),+ }),+ });++ expect(getShouldShowTransformPermissions(state)).toBe(false);+ });+ });++ describe("Pro Cloud", () => {+ it("should return true when transforms feature is enabled (ignores setting)", () => {+ const state = createMockState({+ settings: createMockSettingsState({+ "is-hosted?": true,+ "transforms-enabled": false,+ "token-features": createMockTokenFeatures({ transforms: true }),+ }),+ });++ expect(getShouldShowTransformPermissions(state)).toBe(true);+ });++ it("should return false when transforms feature is disabled", () => {+ const state = createMockState({+ settings: createMockSettingsState({+ "is-hosted?": true,+ "transforms-enabled": false,+ "token-features": createMockTokenFeatures({ transforms: false }),+ }),+ });++ expect(getShouldShowTransformPermissions(state)).toBe(false);+ });++ it("should return false when transforms feature is disabled even when the setting is enabled", () => {+ const state = createMockState({+ settings: createMockSettingsState({+ "is-hosted?": true,+ "transforms-enabled": true,+ "token-features": createMockTokenFeatures({ transforms: false }),+ }),+ });++ expect(getShouldShowTransformPermissions(state)).toBe(false);+ });+ });+});diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.tsindex 56cc67c339f..2dc3a5a9ef7 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts@@ -192,16 +192,27 @@ const buildNativePermission = (};};-export const buildSchemasPermissions = (- entityId: DatabaseEntityId,- groupId: number,- groupType: SpecialGroupType,- permissions: GroupsPermissions,- originalPermissions: GroupsPermissions,- defaultGroup: Group,- database: Database,- permissionView: "group" | "database",-): PermissionSectionConfig[] => {+export const buildSchemasPermissions = ({+ entityId,+ groupId,+ groupType,+ permissions,+ originalPermissions,+ defaultGroup,+ database,+ permissionView,+ showTransformPermissions,+}: {+ entityId: DatabaseEntityId;+ groupId: number;+ groupType: SpecialGroupType;+ permissions: GroupsPermissions;+ originalPermissions: GroupsPermissions;+ defaultGroup: Group;+ database: Database;+ permissionView: "group" | "database";+ showTransformPermissions: boolean;+}): PermissionSectionConfig[] => {const isAdmin = groupType === "admin";const accessPermission = buildAccessPermission(@@ -231,15 +242,16 @@ export const buildSchemasPermissions = (return _.compact([shouldShowViewDataColumn && accessPermission,nativePermission,- ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions(+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions({entityId,groupId,groupType,permissions,- accessPermission.value,+ dataAccessPermissionValue: accessPermission.value,defaultGroup,- "schemas",+ permissionSubject: "schemas",permissionView,- ),+ showTransformPermissions,+ }),]);};diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.tsindex f25bf6abbfe..4df59a7f113 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts@@ -184,15 +184,25 @@ const buildNativePermission = (};};-export const buildTablesPermissions = (- entityId: SchemaEntityId,- groupId: number,- groupType: SpecialGroupType,- permissions: GroupsPermissions,- originalPermissions: GroupsPermissions,- defaultGroup: Group,- database: Database,-): PermissionSectionConfig[] => {+export const buildTablesPermissions = ({+ entityId,+ groupId,+ groupType,+ permissions,+ originalPermissions,+ defaultGroup,+ database,+ showTransformPermissions,+}: {+ entityId: SchemaEntityId;+ groupId: number;+ groupType: SpecialGroupType;+ permissions: GroupsPermissions;+ originalPermissions: GroupsPermissions;+ defaultGroup: Group;+ database: Database;+ showTransformPermissions: boolean;+}): PermissionSectionConfig[] => {const isAdmin = groupType === "admin";const accessPermission = buildAccessPermission(@@ -221,14 +231,15 @@ export const buildTablesPermissions = (return _.compact([shouldShowViewDataColumn && accessPermission,nativePermission,- ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions(+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions({entityId,groupId,groupType,permissions,- accessPermission.value,+ dataAccessPermissionValue: accessPermission.value,defaultGroup,- "tables",- ),+ permissionSubject: "tables",+ showTransformPermissions,+ }),]);};diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsxindex 7dfbc715351..59095702676 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx@@ -1,16 +1,16 @@-import type { Location } from "history";import type { ReactNode } from "react";import { t } from "ttag";+import { useSetting } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { useSelector } from "metabase/lib/redux";import { PLUGIN_TRANSFORMS } from "metabase/plugins";+import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";import { SectionLayout } from "../../components/SectionLayout";type TransformsSectionLayoutProps = {- location: Location;children?: ReactNode;};@@ -19,9 +19,13 @@ export function TransformsSectionLayout({}: TransformsSectionLayoutProps) {usePageTitle(t`Transforms`);const shouldShowUpsell = useSelector(getShouldShowTransformsUpsell);+ const isTransformsEnabled = useSetting("transforms-enabled");+ const isHosted = useSetting("is-hosted?");if (shouldShowUpsell) {return <PLUGIN_TRANSFORMS.TransformsUpsellPage />;+ } else if (!isTransformsEnabled && !isHosted) {+ return <EnableTransformsPage />;}return <SectionLayout>{children}</SectionLayout>;diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsxnew file mode 100644index 00000000000..f724370f59b--- /dev/null+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx@@ -0,0 +1,123 @@+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";+import {+ setupStoreEEBillingEndpoint,+ setupStoreEECloudAddOnsEndpoint,+} from "__support__/server-mocks";+import { mockSettings } from "__support__/settings";+import { renderWithProviders, screen } from "__support__/ui";+import {+ createMockTokenFeatures,+ createMockUser,+} from "metabase-types/api/mocks";+import { createMockState } from "metabase-types/store/mocks";++import { TransformsSectionLayout } from "./TransformsSectionLayout";++jest.mock("metabase/nav/components/AppSwitcher", () => ({+ AppSwitcher: () => "App Switcher",+}));++const setup = ({+ isHosted = false,+ hasTransformFeature = false,+ transformsEnabled = false,+ isAdmin = false,+}: {+ isHosted?: boolean;+ hasTransformFeature?: boolean;+ transformsEnabled?: boolean;+ isAdmin?: boolean;+} = {}) => {+ const settings = mockSettings({+ "token-features": createMockTokenFeatures({+ transforms: hasTransformFeature,+ hosting: isHosted,+ }),+ "transforms-enabled": transformsEnabled,+ "is-hosted?": isHosted,+ });++ if (isHosted || hasTransformFeature) {+ setupEnterpriseOnlyPlugin("transforms");+ }++ renderWithProviders(+ <TransformsSectionLayout>List of transforms</TransformsSectionLayout>,+ {+ storeInitialState: createMockState({+ settings,+ currentUser: createMockUser({ is_superuser: isAdmin }),+ }),+ },+ );+};++describe("TransformSectionLayout", () => {+ describe("OSS", () => {+ it("should show you an enable transforms screen in OSS if transforms are not enabled", async () => {+ setup();+ await assertEnableScreen();+ });+ it("should show you an enable transforms screen with an enable button if you are an admin and transforms are not enabled", async () => {+ setup({ isAdmin: true });+ await assertEnableScreen();++ expect(+ await screen.findByRole("button", { name: "Enable transforms" }),+ ).toBeInTheDocument();+ });+ it("should show allow you into transforms if transforms are enabled", async () => {+ setup({+ transformsEnabled: true,+ });++ await assertInApp();+ });+ });++ describe("Pro Self Hosted", () => {+ it("Should show you enable screen if transforms are not enabled", async () => {+ setup({ hasTransformFeature: true });+ await assertEnableScreen();+ });++ it("Should only allow you into transforms if you transforms are enabled", async () => {+ setup({ hasTransformFeature: true, transformsEnabled: true });+ await assertInApp();+ });+ });++ describe("Pro Hosted", () => {+ beforeEach(() => {+ setupStoreEECloudAddOnsEndpoint(5);+ setupStoreEEBillingEndpoint(5);+ });++ it("should show you an upsell page if you are hosted and the transform feature is not present", async () => {+ setup({ isHosted: true });+ await assertDataStudioUpsellPage();+ });++ it("should show you an upsell page if you are hosted and the transform feature is not present, even when transforms are enabled on the instance", async () => {+ setup({ isHosted: true, transformsEnabled: true });+ await assertDataStudioUpsellPage();+ });++ it("should show you the app if the instance is hosted and the transform feature is present", async () => {+ setup({ isHosted: true, hasTransformFeature: true });+ await assertInApp();+ });+ });+});++const assertInApp = async () =>+ expect(await screen.findByText("List of transforms")).toBeInTheDocument();+const assertEnableScreen = async () =>+ expect(+ await screen.findByText("Customize and clean up your data"),+ ).toBeInTheDocument();++const assertDataStudioUpsellPage = async () =>+ expect(+ await screen.findByText("Start transforming your data in Metabase"),+ ).toBeInTheDocument();diff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.tsindex 49cbaf2c08b..91abbcc24bf 100644--- a/frontend/src/metabase/plugins/oss/permissions.ts+++ b/frontend/src/metabase/plugins/oss/permissions.ts@@ -132,23 +132,40 @@ const getDefaultAdvancedPermissions = () => ({export const PLUGIN_ADVANCED_PERMISSIONS = getDefaultAdvancedPermissions();const getDefaultFeatureLevelPermissions = () => ({- getFeatureLevelDataPermissions: (- _entityId: DatabaseEntityId,- _groupId: number,- _groupType: SpecialGroupType,- _permissions: GroupsPermissions,- _dataAccessPermissionValue: DataPermissionValue,- _defaultGroup: Group,- _permissionSubject: PermissionSubject,- _permissionView?: "group" | "database",- ) => {+ getFeatureLevelDataPermissions: ({+ entityId: _entityId,+ groupId: _groupId,+ groupType: _groupType,+ permissions: _permissions,+ dataAccessPermissionValue: _dataAccessPermissionValue,+ defaultGroup: _defaultGroup,+ permissionSubject: _permissionSubject,+ permissionView: _permissionView,+ showTransformPermissions: _showTransformPermissions,+ }: {+ entityId: DatabaseEntityId;+ groupId: number;+ groupType: SpecialGroupType;+ permissions: GroupsPermissions;+ dataAccessPermissionValue: DataPermissionValue;+ defaultGroup: Group;+ permissionSubject: PermissionSubject;+ permissionView?: "group" | "database";+ showTransformPermissions?: boolean;+ }) => {return [] as any;},- getDataColumns: (- _subject: PermissionSubject,- _groupType?: SpecialGroupType,- _isExternal?: boolean,- ) => [] as any,+ getDataColumns: ({+ subject: _subject,+ groupType: _groupType,+ isExternal: _isExternal,+ showTransformPermissions: _showTransformPermissions,+ }: {+ subject: PermissionSubject;+ groupType?: SpecialGroupType;+ isExternal?: boolean;+ showTransformPermissions?: boolean;+ }) => [] as any,getDownloadWidgetMessageOverride: (_result: Dataset): string | null => null,canDownloadResults: (_result: Dataset): boolean => true,canAccessDataModel: (state: State): boolean => getUserIsAdmin(state),diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsxnew file mode 100644index 00000000000..6831405e707--- /dev/null+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx@@ -0,0 +1,109 @@+import { t } from "ttag";++import { useUpdateSettingMutation } from "metabase/api";+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 { useSelector } from "metabase/lib/redux";+import { getUserIsAdmin } from "metabase/selectors/user";+import {+ Button,+ Card,+ Center,+ Group,+ Icon,+ type IconName,+ SimpleGrid,+ Stack,+ Text,+ Title,+} from "metabase/ui";+export const EnableTransformsPage = () => {+ const isAdmin = useSelector(getUserIsAdmin);++ const [updateSetting, { isLoading: updateSettingLoading }] =+ useUpdateSettingMutation();++ const enableTransforms = () =>+ updateSetting({+ key: "transforms-enabled",+ value: true,+ });++ return (+ <PageContainer data-testid="enable-transform-page">+ <PaneHeader+ breadcrumbs={+ <DataStudioBreadcrumbs>{t`Transforms`}</DataStudioBreadcrumbs>+ }+ />+ <Center>+ <Card withBorder p="3rem" w="40rem">+ <Stack gap="md" align="start">+ <Title order={2}>{t`Customize and clean up your data`}</Title>+ <Text lh="1.25rem">{t`Transforms let you create new tables within your connected databases, helping you make nicer and more self-explanatory datasets for your end users to look at and explore.`}</Text>+ {isAdmin && (+ <>+ <Text+ fw="bold"+ lh="1.25rem"+ >{t`Because transforms require write access to your database, make sure you know what you’re doing and that you understand the risks.`}</Text>+ <Button+ loading={updateSettingLoading}+ variant="primary"+ onClick={enableTransforms}+ >{t`Enable transforms`}</Button>+ </>+ )}+ </Stack>+ <SimpleGrid cols={2} mt="3rem" spacing="sm">+ <SimpleCard+ icon="sql"+ title={t`Custom tables`}+ description={t`Create the tables your end users need with SQL queries`}+ />+ <SimpleCard+ icon="clock"+ title={t`Smart scheduling`}+ description={t`Tell your transformd when to run by assigning tags`}+ />+ <SimpleCard+ icon="eye"+ title={t`Observability`}+ description={t`See which transforms ran, and when`}+ />+ <SimpleCard+ icon="lock"+ title={t`Permissioned`}+ description={t`Only Admins can create and run transforms`}+ />+ </SimpleGrid>+ </Card>+ </Center>+ </PageContainer>+ );+};++const SimpleCard = ({+ icon,+ title,+ description,+}: {+ icon: IconName;+ title: string;+ description: string;+}) => (+ <Card bg="background-secondary" shadow="none">+ <Group wrap="nowrap" align="start" gap="sm">+ <Icon name={icon} c="brand" size={16} flex="0 0 1rem" />+ <Stack gap="xs">+ <Text fw="bold" lh="1rem">+ {title}+ </Text>+ <Text fz="sm" lh="1rem">+ {description}+ </Text>+ </Stack>+ </Group>+ </Card>+);diff --git a/src/metabase/transforms/settings.clj b/src/metabase/transforms/settings.cljindex 3dca0a0a8c9..d48f69e50fe 100644--- a/src/metabase/transforms/settings.clj+++ b/src/metabase/transforms/settings.clj@@ -15,3 +15,11 @@:export? false:encryption :no:audit :getter)++(setting/defsetting transforms-enabled+ (deferred-tru "Enable transforms for instances that have not explicetly purchased the transform add-on")+ :type :boolean+ :visibility :authenticated+ :default false+ :export? false+ :audit :getter)