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
Data Analysts user group (#67770)
Aleksandr Lesnenko10e8a68cf5b9
diff --git a/dev/src/dev/search_perf.clj b/dev/src/dev/search_perf.cljindex 2d3144940d4..729cddc9421 100644--- a/dev/src/dev/search_perf.clj+++ b/dev/src/dev/search_perf.clj@@ -306,6 +306,7 @@{:current-user-id api/*current-user-id*:current-user-perms @api/*current-user-permissions-set*:is-superuser? api/*is-superuser?*+ :is-data-analyst api/*is-data-analyst?*:is-impersonated-user? (perms-util/impersonated-user?):is-sandboxed-user? (perms-util/impersonated-user?):archived falsediff --git a/e2e/snapshot-creators/default.cy.snap.js b/e2e/snapshot-creators/default.cy.snap.jsindex 88449af0a0b..c9436699406 100644--- a/e2e/snapshot-creators/default.cy.snap.js+++ b/e2e/snapshot-creators/default.cy.snap.js@@ -125,22 +125,22 @@ describe("snapshots", () => {// groupscy.request("POST", "/api/permissions/group", { name: "collection" }).then(({ body }) => {- expect(body.id).to.eq(COLLECTION_GROUP); // 4+ expect(body.id).to.eq(COLLECTION_GROUP); // 5},);cy.request("POST", "/api/permissions/group", { name: "data" }).then(({ body }) => {- expect(body.id).to.eq(DATA_GROUP); // 5+ expect(body.id).to.eq(DATA_GROUP); // 6},);cy.request("POST", "/api/permissions/group", { name: "readonly" }).then(({ body }) => {- expect(body.id).to.eq(READONLY_GROUP); // 6+ expect(body.id).to.eq(READONLY_GROUP); // 7},);cy.request("POST", "/api/permissions/group", { name: "nosql" }).then(({ body }) => {- expect(body.id).to.eq(NOSQL_GROUP); // 7+ expect(body.id).to.eq(NOSQL_GROUP); // 8},);diff --git a/e2e/support/cypress_data.js b/e2e/support/cypress_data.jsindex 9f4c40ff3c9..2c52902bcc2 100644--- a/e2e/support/cypress_data.js+++ b/e2e/support/cypress_data.js@@ -43,14 +43,15 @@ export const SAMPLE_DB_TABLES = {export const USER_GROUPS = {ALL_USERS_GROUP: 1,ADMIN_GROUP: 2,- COLLECTION_GROUP: 4,- DATA_GROUP: 5,- READONLY_GROUP: 6,- NOSQL_GROUP: 7,+ COLLECTION_GROUP: 5,+ DATA_GROUP: 6,+ READONLY_GROUP: 7,+ NOSQL_GROUP: 8,};-export const TENANT_USER_GROUPS = {+export const MAGIC_USER_GROUPS = {EXTERNAL_USERS_GROUP: 3,+ DATA_ANALYSTS_GROUP: 4,};const {diff --git a/e2e/support/cypress_sample_instance_data.js b/e2e/support/cypress_sample_instance_data.jsindex 33f229d087d..9872ce801b0 100644--- a/e2e/support/cypress_sample_instance_data.js+++ b/e2e/support/cypress_sample_instance_data.js@@ -156,6 +156,10 @@ export const ALL_EXTERNAL_USERS_GROUP_ID = _.findWhere(},)?.id;+export const DATA_ANALYSTS_GROUP_ID = _.findWhere(SAMPLE_INSTANCE_DATA.groups, {+ magic_group_type: "data-analyst",+})?.id;+export const COLLECTION_GROUP_ID = _.findWhere(SAMPLE_INSTANCE_DATA.groups, {name: "collection",}).id;diff --git a/e2e/support/helpers/e2e-users-helpers.ts b/e2e/support/helpers/e2e-users-helpers.tsindex 3ba0316b43e..08478d8b5c2 100644--- a/e2e/support/helpers/e2e-users-helpers.ts+++ b/e2e/support/helpers/e2e-users-helpers.ts@@ -3,6 +3,11 @@ interface User {first_name?: string | null;last_name?: string | null;}++export function setUserAsAnalyst(userId: number) {+ cy.request("PUT", `/api/user/${userId}`, { is_data_analyst: true });+}+/*** Get user's full name, or an email address if name is not available.*/diff --git a/e2e/test/scenarios/admin-2/people.cy.spec.js b/e2e/test/scenarios/admin-2/people.cy.spec.jsindex 5d9b2b78602..2dfb8802e07 100644--- a/e2e/test/scenarios/admin-2/people.cy.spec.js+++ b/e2e/test/scenarios/admin-2/people.cy.spec.js@@ -110,7 +110,7 @@ describe("scenarios > admin > people", () => {cy.findByRole("link", { name: /group/i }).click();- cy.findByRole("table").findByRole("link", { name: /data/i }).click();+ cy.findByRole("table").findByRole("link", { name: /data$/i }).click();// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usagecy.findByText("1 member");diff --git a/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts b/e2e/test/scenarios/collections/collections-reproductions.cy.spec.tsindex f24ac48499b..72a448f5d5e 100644--- a/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts+++ b/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts@@ -203,6 +203,7 @@ describe("issue 56567", () => {["All Users", allUsersPermission],["collection", "Curate"],["data", "No access"],+ ["Data Analysts", "No access"],["nosql", "No access"],["readonly", "View"],];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.tsindex d3c59b71899..e658a10318a 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@@ -1,24 +1,23 @@import {SAMPLE_DB_ID,SAMPLE_DB_SCHEMA_ID,- USER_GROUPS,WRITABLE_DB_ID,} from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import { ORDERS_QUESTION_ID } from "e2e/support/cypress_sample_instance_data";-import { DataModel } from "e2e/support/helpers";+import {+ NODATA_USER_ID,+ ORDERS_QUESTION_ID,+} from "e2e/support/cypress_sample_instance_data";import type { TableId } from "metabase-types/api";const { H } = cy;const { TablePicker, TableSection, FieldSection, PreviewSection } = H.DataModel;-const { ALL_USERS_GROUP } = USER_GROUPS;const {FEEDBACK,FEEDBACK_ID,ORDERS,ORDERS_ID,- PEOPLE_ID,PRODUCTS,PRODUCTS_ID,REVIEWS,@@ -27,9 +26,6 @@ const {const MYSQL_DB_ID = SAMPLE_DB_ID + 1;const MYSQL_DB_SCHEMA_ID = `${MYSQL_DB_ID}:`;-const CUSTOM_MAPPING_ERROR =- "You need unrestricted data access on this table to map custom display values.";-describe("scenarios > data studio > datamodel", () => {beforeEach(() => {H.restore();@@ -1064,31 +1060,6 @@ describe("scenarios > data studio > datamodel", () => {cy.findByText("New description").should("be.visible");});- it("should allow changing the table name with data model permissions only", () => {- setDataModelPermissions({ tableIds: [ORDERS_ID] });-- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: ORDERS_ID,- });-- TableSection.getNameInput().clear().type("New orders").blur();- cy.wait("@updateTable");- verifyAndCloseToast("Table name updated");- TableSection.getNameInput().should("have.value", "New orders");- cy.signOut();-- cy.signInAsNormalUser();- H.startNewQuestion();- H.miniPicker().within(() => {- cy.findByText("Sample Database").click();- cy.findByText("People").should("be.visible");- cy.findByText("New orders").should("be.visible");- });- });-it("should allow clearing the table description", () => {H.DataModel.visitDataStudio({databaseId: SAMPLE_DB_ID,@@ -1107,41 +1078,80 @@ describe("scenarios > data studio > datamodel", () => {// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usagecy.findByText("No description yet").should("be.visible");});- });- describe("Field name and description", () => {- it("should allow changing the field name", () => {+ it("should allow analysts to edit all table metadata even without data access", () => {+ H.setUserAsAnalyst(NODATA_USER_ID);++ cy.signIn("nodata");H.DataModel.visitDataStudio({databaseId: SAMPLE_DB_ID,schemaId: SAMPLE_DB_SCHEMA_ID,tableId: ORDERS_ID,});- TableSection.getFieldNameInput("Tax").clear().type("New tax").blur();+ cy.log("change table name");+ TableSection.getNameInput().clear().type("Analyst Orders").blur();+ cy.wait("@updateTable");+ verifyAndCloseToast("Table name updated");+ TableSection.getNameInput().should("have.value", "Analyst Orders");++ cy.log("change table description");+ TableSection.getDescriptionInput()+ .clear()+ .type("Description by analyst")+ .blur();+ cy.wait("@updateTable");+ verifyAndCloseToast("Table description updated");+ TableSection.getDescriptionInput().should(+ "have.value",+ "Description by analyst",+ );++ cy.log("change field name");+ TableSection.getFieldNameInput("Tax")+ .clear()+ .type("Analyst Tax")+ .blur();cy.wait("@updateField");verifyAndCloseToast("Name of Tax updated");- TableSection.getFieldNameInput("New tax").should("be.visible");+ TableSection.getFieldNameInput("Analyst Tax").should("be.visible");- cy.log("verify preview");- TableSection.clickField("New tax");- FieldSection.getPreviewButton().click();- verifyTablePreview({- column: "New tax",- values: ["2.07", "6.1", "2.9", "6.01", "7.03"],+ cy.log("change field description");+ TableSection.getFieldDescriptionInput("Total")+ .clear()+ .type("Total edited by analyst")+ .blur();+ cy.wait("@updateField");+ verifyAndCloseToast("Description of Total updated");++ cy.log("verify changes in data reference as admin");+ cy.signInAsAdmin();+ cy.visit(`/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}`);+ cy.get("main").within(() => {+ cy.findByText("Analyst Orders").should("be.visible");+ cy.findByText("Description by analyst").should("be.visible");});- verifyObjectDetailPreview({ rowNumber: 4, row: ["New tax", "2.07"] });- cy.log("verify viz");+ cy.log("verify changes in question picker as normal user");+ cy.signInAsNormalUser();+ H.startNewQuestion();+ H.miniPicker().within(() => {+ cy.findByText("Sample Database").click();+ cy.findByText("People").should("be.visible");+ cy.findByText("Analyst Orders").should("be.visible");+ });++ cy.log("verify field changes in table visualization");H.openOrdersTable();- H.tableHeaderColumn("New tax").should("be.visible");+ H.tableHeaderColumn("Analyst Tax").should("be.visible");H.tableHeaderColumn("Tax", { scrollIntoView: false }).should("not.exist",);});+ });- it("should allow changing the field name with data model permissions only", () => {- setDataModelPermissions({ tableIds: [ORDERS_ID] });- cy.signIn("none");+ describe("Field name and description", () => {+ it("should allow changing the field name", () => {H.DataModel.visitDataStudio({databaseId: SAMPLE_DB_ID,schemaId: SAMPLE_DB_SCHEMA_ID,@@ -1152,23 +1162,17 @@ describe("scenarios > data studio > datamodel", () => {cy.wait("@updateField");verifyAndCloseToast("Name of Tax updated");TableSection.getFieldNameInput("New tax").should("be.visible");- TableSection.getField("New tax").should("be.visible");cy.log("verify preview");TableSection.clickField("New tax");FieldSection.getPreviewButton().click();- cy.wait("@dataset");- PreviewSection.get()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");- PreviewSection.getPreviewTypeInput().findByText("Detail").click();- cy.wait("@dataset");- PreviewSection.get()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");+ verifyTablePreview({+ column: "New tax",+ values: ["2.07", "6.1", "2.9", "6.01", "7.03"],+ });+ verifyObjectDetailPreview({ rowNumber: 4, row: ["New tax", "2.07"] });- cy.log("verify viz as normal user");- cy.signInAsNormalUser();+ cy.log("verify viz");H.openOrdersTable();H.tableHeaderColumn("New tax").should("be.visible");H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(@@ -1242,6 +1246,83 @@ describe("scenarios > data studio > datamodel", () => {// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usagecy.findByText("No description yet").should("be.visible");});++ it("should allow analysts to edit field metadata but not preview data without data access", () => {+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");+ H.DataModel.visitDataStudio({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId: ORDERS_ID,+ });++ cy.log("change field name from table section");+ TableSection.getFieldNameInput("Tax")+ .clear()+ .type("Analyst Tax Field")+ .blur();+ cy.wait("@updateField");+ verifyAndCloseToast("Name of Tax updated");+ TableSection.getFieldNameInput("Analyst Tax Field").should(+ "be.visible",+ );+ TableSection.getField("Analyst Tax Field").should("be.visible");++ cy.log("change field description from table section");+ TableSection.getFieldDescriptionInput("Total")+ .clear()+ .type("Analyst total description")+ .blur();+ cy.wait("@updateField");+ verifyAndCloseToast("Description of Total updated");+ TableSection.getFieldDescriptionInput("Total").should(+ "have.value",+ "Analyst total description",+ );++ cy.log("navigate to field detail and change semantic type");+ TableSection.clickField("Discount");+ FieldSection.getSemanticTypeInput()+ .should("have.value", "Discount")+ .click();+ H.popover().findByText("Currency").click();+ cy.wait("@updateField");+ verifyAndCloseToast("Semantic type of Discount updated");+ FieldSection.getSemanticTypeInput().should("have.value", "Currency");++ cy.log("verify table preview is blocked without data permissions");+ FieldSection.getPreviewButton().click();+ cy.wait("@dataset");+ PreviewSection.get()+ .findByText("Sorry, you don’t have permission to see that.")+ .should("be.visible");++ cy.log("verify detail preview is also blocked");+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();+ cy.wait("@dataset");+ PreviewSection.get()+ .findByText("Sorry, you don’t have permission to see that.")+ .should("be.visible");++ cy.log("verify field changes in data reference as admin");+ cy.signInAsAdmin();+ cy.visit(+ `/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}/fields/${ORDERS.TOTAL}`,+ );+ cy.get("main").within(() => {+ cy.findByText("Total").should("be.visible");+ cy.findByText("Analyst total description").should("be.visible");+ });++ cy.log("verify field changes in table visualization as normal user");+ cy.signInAsNormalUser();+ H.openOrdersTable();+ H.tableHeaderColumn("Analyst Tax Field").should("be.visible");+ H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(+ "not.exist",+ );+ H.tableHeaderColumn("Discount ($)").should("be.visible");+ });});describe("Sorting", () => {@@ -1534,46 +1615,6 @@ describe("scenarios > data studio > datamodel", () => {);});- it("should allow changing the field name with data model permissions only", () => {- setDataModelPermissions({ tableIds: [ORDERS_ID] });- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: ORDERS_ID,- fieldId: ORDERS.TOTAL,- });-- FieldSection.getNameInput().clear().type("New total").blur();- cy.wait("@updateField");- verifyAndCloseToast("Name of Total updated");- FieldSection.getNameInput().should("have.value", "New total");- TableSection.getFieldNameInput("New total")- .scrollIntoView()- .should("be.visible");-- cy.log("verify preview");- TableSection.clickField("New total");- FieldSection.getPreviewButton().click();- cy.wait("@dataset");- PreviewSection.get()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");- PreviewSection.getPreviewTypeInput().findByText("Detail").click();- cy.wait("@dataset");- PreviewSection.get()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");-- cy.log("verify viz as normal user");- cy.signInAsNormalUser();- H.openOrdersTable();- H.tableHeaderColumn("New total").should("be.visible");- H.tableHeaderColumn("Total", { scrollIntoView: false }).should(- "not.exist",- );- });-it("should allow changing the field description", () => {H.DataModel.visitDataStudio({databaseId: SAMPLE_DB_ID,@@ -1981,84 +2022,6 @@ describe("scenarios > data studio > datamodel", () => {cy.findByLabelText("Left column").should("contain.text", "User ID");});- it("should allow to change the field foreign key target with no permissions to Reviews table", () => {- setDataModelPermissions({- tableIds: [ORDERS_ID, PRODUCTS_ID, PEOPLE_ID],- });-- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: ORDERS_ID,- fieldId: ORDERS.USER_ID,- });- FieldSection.getSemanticTypeFkTarget()- .should("have.value", "People → ID")- .click();- H.popover().within(() => {- cy.findByText("Reviews → ID").should("not.exist");- cy.findByText("Products → ID").click();- });- cy.wait("@updateField");- H.undoToast().should(- "contain.text",- "Semantic type of User ID updated",- );- FieldSection.getSemanticTypeFkTarget().should(- "have.value",- "Products → ID",- );-- cy.log("verify preview");- FieldSection.getPreviewButton().click();- cy.wait("@dataset");- PreviewSection.get()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");- PreviewSection.getPreviewTypeInput().findByText("Detail").click();- cy.wait("@dataset");- PreviewSection.get()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");-- cy.log("verify viz as normal user");- cy.signInAsNormalUser();- H.openTable({- database: SAMPLE_DB_ID,- table: ORDERS_ID,- mode: "notebook",- });- cy.icon("join_left_outer").click();- H.miniPicker().within(() => {- cy.findByText("Sample Database").click();- cy.findByText("Products").click();- });- cy.findByLabelText("Left column").should("contain.text", "User ID");- });-- it("should not allow setting foreign key target for inaccessible tables", () => {- setDataModelPermissions({ tableIds: [REVIEWS_ID] });-- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: REVIEWS_ID,- fieldId: REVIEWS.PRODUCT_ID,- });- FieldSection.getDisplayValuesInput().click();-- H.popover().within(() => {- cy.findByRole("option", { name: /Use original value/ })- .should("be.visible")- .and("not.have.attr", "data-combobox-disabled");- cy.findByRole("option", { name: /Use foreign key/ })- .should("be.visible")- .and("have.attr", "data-combobox-disabled", "true");- });- });-it("should allow to change the type to 'Currency' and choose the currency (metabase#59052)", () => {H.DataModel.visitDataStudio({databaseId: SAMPLE_DB_ID,@@ -2238,6 +2201,56 @@ describe("scenarios > data studio > datamodel", () => {},);});++ it("should allow analysts to change the foreign key target without data access", () => {+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");++ H.DataModel.visitDataStudio({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId: ORDERS_ID,+ fieldId: ORDERS.USER_ID,+ });++ FieldSection.getSemanticTypeFkTarget()+ .should("have.value", "People → ID")+ .click();+ H.popover().within(() => {+ cy.findByText("Reviews → ID").should("be.visible");+ cy.findByText("Products → ID").click();+ });+ cy.wait("@updateField");+ H.undoToast().should(+ "contain.text",+ "Semantic type of User ID updated",+ );+ FieldSection.getSemanticTypeFkTarget().should(+ "have.value",+ "Products → ID",+ );++ cy.log("verify preview is blocked without data permissions");+ FieldSection.getPreviewButton().click();+ cy.wait("@dataset");+ PreviewSection.get()+ .findByText("Sorry, you don’t have permission to see that.")+ .should("be.visible");++ cy.log("verify FK target change works in query builder as normal user");+ cy.signInAsNormalUser();+ H.openTable({+ database: SAMPLE_DB_ID,+ table: ORDERS_ID,+ mode: "notebook",+ });+ cy.icon("join_left_outer").click();+ H.miniPicker().within(() => {+ cy.findByText("Sample Database").click();+ cy.findByText("Products").click();+ });+ cy.findByLabelText("Left column").should("contain.text", "User ID");+ });});describe("Behavior", () => {@@ -2653,34 +2666,6 @@ describe("scenarios > data studio > datamodel", () => {.and("have.value", "Title");});- it("should allow to change foreign key target for accessible tables", () => {- setDataModelPermissions({- tableIds: [ORDERS_ID, REVIEWS_ID, PRODUCTS_ID],- });-- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: REVIEWS_ID,- fieldId: REVIEWS.PRODUCT_ID,- });-- FieldSection.getDisplayValuesInput().click();- H.popover().findByText("Use foreign key").click();- H.popover().findByText("Title").click();- cy.wait("@updateFieldDimension");- H.undoToast().should(- "contain.text",- "Display values of Product ID updated",- );-- cy.signInAsNormalUser();- H.openReviewsTable({ limit: 1 });- // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage- cy.findByText("Rustic Paper Wallet").should("be.visible");- });-it("should allow 'Custom mapping' null values", () => {const remappedNullValue = "nothin";@@ -2868,54 +2853,6 @@ describe("scenarios > data studio > datamodel", () => {});});- it("should show a proper error message when using custom mapping", () => {- setDataModelPermissions({ tableIds: [REVIEWS_ID] });-- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: REVIEWS_ID,- fieldId: REVIEWS.RATING,- });- FieldSection.getDisplayValuesInput().click();-- H.popover().within(() => {- cy.findByRole("option", { name: /Use original value/ })- .should("be.visible")- .and("not.have.attr", "data-combobox-disabled");- cy.findByRole("option", { name: /Custom mapping/ })- .should("be.visible")- .and("have.attr", "data-combobox-disabled", "true");- });-- cy.signInAsAdmin();- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: REVIEWS_ID,- fieldId: REVIEWS.RATING,- });- FieldSection.getDisplayValuesInput().click();- H.popover().findByText("Custom mapping").click();- cy.wait("@updateFieldDimension");- H.undoToast().should(- "contain.text",- "Display values of Rating updated",- );-- cy.signIn("none");- H.DataModel.visitDataStudio({- databaseId: SAMPLE_DB_ID,- schemaId: SAMPLE_DB_SCHEMA_ID,- tableId: REVIEWS_ID,- fieldId: REVIEWS.RATING,- });-- // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage- cy.findByText(CUSTOM_MAPPING_ERROR).should("exist");- });-it("should allow 'Custom mapping' option only for 'Search box' filtering type (metabase#16322)", () => {H.DataModel.visitDataStudio({databaseId: SAMPLE_DB_ID,@@ -3009,6 +2946,105 @@ describe("scenarios > data studio > datamodel", () => {.eq(10) // 1st data row, 2nd column (User ID).should("have.text", "2023-10-07T01:34:35.462-07:00");});++ it("should allow analysts to change display values to use foreign key without data access", () => {+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");++ H.DataModel.visitDataStudio({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId: REVIEWS_ID,+ fieldId: REVIEWS.PRODUCT_ID,+ });++ FieldSection.getDisplayValuesInput().click();+ H.popover().findByText("Use foreign key").click();+ H.popover().findByText("Title").click();+ cy.wait("@updateFieldDimension");+ H.undoToast().should(+ "contain.text",+ "Display values of Product ID updated",+ );++ FieldSection.getDisplayValuesInput().should(+ "have.value",+ "Use foreign key",+ );+ FieldSection.getDisplayValuesFkTargetInput().should(+ "have.value",+ "Title",+ );++ cy.log("verify preview is blocked without data permissions");+ FieldSection.getPreviewButton().click();+ cy.wait("@dataset");+ PreviewSection.get()+ .findByText("Sorry, you don’t have permission to see that.")+ .should("be.visible");++ cy.log("verify display value change works as normal user");+ cy.signInAsNormalUser();+ H.openReviewsTable({ limit: 1 });+ H.main().findByText("Rustic Paper Wallet").should("be.visible");+ });++ it("should disable custom mapping for analysts without data access", () => {+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");++ H.DataModel.visitDataStudio({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId: REVIEWS_ID,+ fieldId: REVIEWS.RATING,+ });++ cy.log("verify custom mapping is disabled without data access");+ FieldSection.getDisplayValuesInput().click();+ H.popover().within(() => {+ cy.findByRole("option", { name: /Use original value/ })+ .should("be.visible")+ .and("not.have.attr", "data-combobox-disabled");+ cy.findByRole("option", { name: /Custom mapping/ })+ .should("be.visible")+ .and("have.attr", "data-combobox-disabled", "true");+ });++ cy.log("verify admin can set up custom mapping");+ cy.signInAsAdmin();+ H.DataModel.visitDataStudio({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId: REVIEWS_ID,+ fieldId: REVIEWS.RATING,+ });+ FieldSection.getDisplayValuesInput().click();+ H.popover().findByText("Custom mapping").click();+ cy.wait("@updateFieldValues");+ H.undoToast().should(+ "contain.text",+ "Display values of Rating updated",+ );+ H.undoToast().icon("close").click({ force: true });++ H.modal().within(() => {+ cy.findByDisplayValue("1").click().clear().type("Terrible");+ cy.findByDisplayValue("5").click().clear().type("Amazing");+ cy.button("Save").click();+ });+ cy.wait("@updateFieldValues");+ H.undoToast().should(+ "contain.text",+ "Display values of Rating updated",+ );++ cy.log("verify custom mapping works as normal user");+ cy.signInAsNormalUser();+ H.openReviewsTable();+ H.main().findByText("Terrible").should("be.visible");+ H.main().findAllByText("Amazing").should("be.visible");+ });});describe("Unfold JSON", { tags: "@external" }, () => {@@ -3480,7 +3516,7 @@ describe("scenarios > data studio > datamodel", () => {fieldId: ORDERS.PRODUCT_ID,});- DataModel.TableSection.getVisibilityTypeInput().click();+ H.DataModel.TableSection.getVisibilityTypeInput().click();H.popover().findByText("Copper").click();cy.wait("@updateTable");@@ -3868,27 +3904,6 @@ function clickAway() {cy.get("body").click(0, 0);}-const setDataModelPermissions = ({- tableIds = [],-}: {- tableIds: TableId[];-}) => {- const permissions = Object.fromEntries(tableIds.map((id) => [id, "all"]));-- // @ts-expect-error invalid cy.updatePermissionsGraph typing- cy.updatePermissionsGraph({- [ALL_USERS_GROUP]: {- [SAMPLE_DB_ID]: {- "data-model": {- schemas: {- PUBLIC: permissions,- },- },- },- },- });-};-type TableSummary = {id: TableId;db_id: number;diff --git a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.tsindex 1007540ed34..7274827cba5 100644--- a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts@@ -1,15 +1,11 @@-import {- SAMPLE_DB_ID,- SAMPLE_DB_SCHEMA_ID,- USER_GROUPS,-} from "e2e/support/cypress_data";+import { SAMPLE_DB_ID, SAMPLE_DB_SCHEMA_ID } from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";+import { NODATA_USER_ID } from "e2e/support/cypress_sample_instance_data";const { H } = cy;const { SegmentList, SegmentEditor, SegmentRevisionHistory } = H.DataModel;const { ORDERS, ORDERS_ID, PRODUCTS, PRODUCTS_ID, PEOPLE, PEOPLE_ID } =SAMPLE_DATABASE;-const { ALL_USERS_GROUP } = USER_GROUPS;describe("scenarios > data studio > data model > segments",@@ -614,12 +610,12 @@ describe(});});- describe("Readonly access with data model permissions", () => {+ describe("Readonly access for data analysts", () => {it("should show segments in list but hide New segment button for non-admin", () => {createTestSegment({ name: "Readonly Test Segment" });- setDataModelPermissions({ tableIds: [ORDERS_ID] });- cy.signIn("none");+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");cy.log("verify segment is visible in list");visitDataStudioSegments(ORDERS_ID);@@ -636,9 +632,7 @@ describe(cy.visit(`/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/segments/new`,);- H.main()- .findByText("Sorry, you don’t have permission to see that.")- .should("be.visible");+ cy.url().should("include", "/unauthorized");});it("should display segment detail in readonly mode for non-admin", () => {@@ -648,8 +642,8 @@ describe(});cy.get<number>("@segmentId").then((segmentId) => {- setDataModelPermissions({ tableIds: [ORDERS_ID] });- cy.signIn("none");+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");visitDataModelSegment(ORDERS_ID, segmentId);@@ -766,20 +760,3 @@ function verifySegmentNotInQueryBuilder(H.getNotebookStep("data").button("Filter").click();H.popover().findByText(segmentName).should("not.exist");}--function setDataModelPermissions({ tableIds = [] }: { tableIds: number[] }) {- const permissions = Object.fromEntries(tableIds.map((id) => [id, "all"]));-- // @ts-expect-error invalid cy.updatePermissionsGraph typing- cy.updatePermissionsGraph({- [ALL_USERS_GROUP]: {- [SAMPLE_DB_ID]: {- "data-model": {- schemas: {- PUBLIC: permissions,- },- },- },- },- });-}diff --git a/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.tsindex 6e71bd28461..855b0469c43 100644--- a/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts@@ -1,5 +1,6 @@import { SAMPLE_DB_ID, SAMPLE_DB_SCHEMA_ID } from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";+import { NODATA_USER_ID } from "e2e/support/cypress_sample_instance_data";const { H } = cy;const { MeasureList, MeasureEditor, MeasureRevisionHistory } = H.DataModel;@@ -389,6 +390,76 @@ describe("scenarios > data studio > data model > measures", () => {.should("be.visible");});});++ describe("Readonly access for data analysts", () => {+ it("should show measures in list but hide New measure button for non-admin", () => {+ createTestMeasure({ name: "Readonly Test Measure" });++ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");++ cy.log("verify measure is visible in list");+ visitDataStudioMeasures(ORDERS_ID);+ MeasureList.getMeasure("Readonly Test Measure")+ .scrollIntoView()+ .should("be.visible");++ cy.log("verify New measure button is not visible");+ MeasureList.get()+ .findByRole("link", { name: /New measure/i })+ .should("not.exist");++ cy.log("verify direct navigation to new measure page is blocked");+ cy.visit(+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/measures/new`,+ );+ cy.url().should("include", "/unauthorized");+ });++ it("should display measure detail in readonly mode for non-admin", () => {+ createTestMeasure({+ name: "Readonly Detail Measure",+ description: "Test description for readonly",+ });++ cy.get<number>("@measureId").then((measureId) => {+ H.setUserAsAnalyst(NODATA_USER_ID);+ cy.signIn("nodata");++ visitDataModelMeasure(ORDERS_ID, measureId);++ cy.log("verify measure name input is disabled");+ MeasureEditor.get()+ .findByDisplayValue("Readonly Detail Measure")+ .should("be.disabled");++ cy.log("verify description is displayed as plain text");+ MeasureEditor.get().findByText("Description").should("be.visible");+ MeasureEditor.get()+ .findByText("Test description for readonly")+ .should("be.visible");++ cy.log("verify Save button is not visible");+ MeasureEditor.get()+ .findByRole("button", { name: /Save/i })+ .should("not.exist");++ cy.log("verify Remove measure option is hidden in actions menu");+ MeasureEditor.getActionsButton().click();+ H.popover().findByText("Preview").should("be.visible");+ H.popover().findByText("Remove measure").should("not.exist");+ cy.realPress("Escape");++ cy.log("verify revision history is still accessible");+ MeasureEditor.getRevisionHistoryTab().click();+ MeasureRevisionHistory.get().within(() => {+ cy.findByText(/created this measure/i)+ .scrollIntoView()+ .should("be.visible");+ });+ });+ });+ });});function visitDataStudioTable(tableId: number) {diff --git a/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj b/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.cljindex e3042982c9e..528f66dd1f3 100644--- a/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj+++ b/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj@@ -65,14 +65,16 @@"Adds to `user` a set of boolean flags indicating whether or not current user has access to advanced permissions.This function is meant to be used for GET /api/user/current."[user]- (let [permissions-set @api/*current-user-permissions-set*- user-id api/*current-user-id*]+ (let [permissions-set @api/*current-user-permissions-set*+ user-id api/*current-user-id*+ can-access-data-model (perms/user-has-any-perms-of-type? user-id :perms/manage-table-metadata)](update user :permissions assoc:can_access_setting (perms/set-has-application-permission-of-type? permissions-set :setting):can_access_subscription (perms/set-has-application-permission-of-type? permissions-set :subscription):can_access_monitoring (perms/set-has-application-permission-of-type? permissions-set :monitoring)- :can_access_data_model (perms/user-has-any-perms-of-type? user-id :perms/manage-table-metadata)+ :can_access_data_model can-access-data-model:can_access_db_details (perms/user-has-any-perms-of-type? user-id :perms/manage-database)+ :is_data_analyst api/*is-data-analyst?*:is_group_manager api/*is-group-manager?*)))(defenterprise current-user-has-application-permissions?diff --git a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.cljindex 8bf1d2cfc29..5e53fdaa165 100644--- a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj+++ b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj@@ -188,7 +188,7 @@[:entity_type {:optional true} [:maybe :string]][:owner_email {:optional true} [:maybe :string]][:owner_user_id {:optional true} [:maybe :int]]]]]- (api/check-superuser)+ (api/check-data-analyst)(let [where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))set-ks [:data_authority:data_source@@ -214,7 +214,7 @@[_route-params_query-paramsbody :- ::table-selectors]- (api/check-superuser)+ (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})@@ -235,7 +235,7 @@[_route-params_query-paramsbody :- ::table-selectors]- (api/check-superuser)+ (api/check-data-analyst)(let [target-collection (api/let-404 [colls (seq (t2/select :model/Collection:type collection/library-data-collection-type{:limit 2}))]@@ -267,7 +267,7 @@[_route-params_query-paramsbody :- ::table-selectors]- (api/check-superuser)+ (api/check-data-analyst)(let [where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))downstream-ids (all-downstream-table-ids where)update-where (if (seq downstream-ids)@@ -299,7 +299,7 @@[__body :- ::table-selectors]- (api/check-superuser)+ (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])]@@ -318,7 +318,7 @@[__body :- ::table-selectors]- (api/check-superuser)+ (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]@@ -331,7 +331,7 @@[__body :- ::table-selectors]- (api/check-superuser)+ (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)]diff --git a/enterprise/backend/src/metabase_enterprise/library/api.clj b/enterprise/backend/src/metabase_enterprise/library/api.cljindex 991ec69fea9..6a99374f611 100644--- a/enterprise/backend/src/metabase_enterprise/library/api.clj+++ b/enterprise/backend/src/metabase_enterprise/library/api.clj@@ -17,11 +17,11 @@(api.macros/defendpoint :post "/""Creates the Library if it doesn't exist. Returns the created collection.- Requires superuser permissions."+ Requires data analyst or superuser permissions."[_route_query_body]- (api/check-superuser)+ (api/check-data-analyst)(api/check-400 (not (collections/library-collection)) "Library already exists")(collections/create-library-collection!))diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.cljindex 9a551d9395f..a8fc1322670 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj@@ -55,7 +55,7 @@(delete-group :crowberto 204 false)))(testing "if `advanced-permissions` is enabled"- (mt/with-premium-features #{:advanced-permissions}+ (mt/with-premium-features #{:advanced-permissions :data-studio}(testing "still fails if user is not a manager"(get-groups user 403)(get-one-group user 403 group)@@ -210,8 +210,8 @@:user_id (:id new-user):is_group_manager true})))))- (testing "Admin can could view all groups"- (is (= (t2/select-fn-set :id :model/PermissionsGroup :is_tenant_group false)+ (testing "Admin can view all groups with members"+ (is (= (t2/select-fn-set :group_id :model/PermissionsGroupMembership)(membership->groups-ids (get-membership :crowberto 200))))))))))(deftest get-users-api-testdiff --git a/enterprise/backend/test/metabase_enterprise/data_studio/api/permissions_groups_test.clj b/enterprise/backend/test/metabase_enterprise/data_studio/api/permissions_groups_test.cljnew file mode 100644index 00000000000..eaecf4308f0--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/data_studio/api/permissions_groups_test.clj@@ -0,0 +1,80 @@+(ns metabase-enterprise.data-studio.api.permissions-groups-test+ (:require+ [clojure.string :as str]+ [clojure.test :refer [deftest testing is]]+ [metabase.permissions.core :as perms]+ [metabase.permissions.models.permissions-group :as perms-group]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(deftest fetch-groups-test+ (testing "GET /api/permissions/group - Data Analysts group is visible with the feature"+ (mt/with-premium-features #{:data-studio}+ (is (contains? (set (map :id (mt/user-http-request :crowberto :get 200 "permissions/group")))+ (:id (perms-group/data-analyst))))))+ (testing "GET /api/permissions/group - Data Analysts group is not visible without the feature"+ (mt/with-premium-features #{}+ (is (not (contains? (set (map :id (mt/user-http-request :crowberto :get 200 "permissions/group")))+ (:id (perms-group/data-analyst))))))))++;;; ---------------------------------------- sync-data-analyst-group-for-oss! tests ----------------------------------------++(deftest sync-data-analyst-group-for-oss!-ee-noop-test+ (testing "When we have the feature, sync-data-analyst-group-for-oss! does nothing"+ (mt/with-premium-features #{:data-studio}+ (let [data-analyst-group-id (:id (perms-group/data-analyst))]+ (mt/with-temp [:model/User {user-id :id} {}]+ (perms/add-user-to-group! user-id data-analyst-group-id)+ (let [member-count-before (t2/count :model/PermissionsGroupMembership :group_id data-analyst-group-id)]+ (perms-group/sync-data-analyst-group-for-oss!)+ ;; Group should still have same members+ (is (= member-count-before+ (t2/count :model/PermissionsGroupMembership :group_id data-analyst-group-id)))+ ;; Group should still be the magic group+ (is (= perms-group/data-analyst-magic-group-type+ (t2/select-one-fn :magic_group_type :model/PermissionsGroup :id data-analyst-group-id)))))))))++(defmacro with-reset-data-analyst-group! [& body]+ `(let [original# (t2/select-one-pk :model/PermissionsGroup :magic_group_type perms-group/data-analyst-magic-group-type)]+ (try+ (mt/with-model-cleanup [:model/PermissionsGroup]+ (do ~@body))+ (finally (t2/update! :model/PermissionsGroup :id original# {:magic_group_type perms-group/data-analyst-magic-group-type})))))++(deftest sync-data-analyst-group-for-oss!-converts-with-members-test+ (testing "Without the premium feature, sync-data-analyst-group-for-oss! converts the Data Analysts group when it has members"+ (mt/with-premium-features #{}+ (with-reset-data-analyst-group!+ (let [original-group-id (t2/select-one-pk :model/PermissionsGroup :magic_group_type perms-group/data-analyst-magic-group-type)]+ (mt/with-temp [:model/User {user-id :id} {}]+ (perms/add-user-to-group! user-id original-group-id)+ (perms-group/sync-data-analyst-group-for-oss!)+ (testing "Original group should be renamed and demoted"+ (let [original-group (t2/select-one :model/PermissionsGroup :id original-group-id)]+ (is (str/starts-with? (:name original-group) "Data Analysts (converted)"))+ (is (nil? (:magic_group_type original-group)))))+ (testing "User should still be in the converted group"+ (is (t2/exists? :model/PermissionsGroupMembership+ :user_id user-id+ :group_id original-group-id)))+ (testing "New magic group should exist and be empty"+ (let [new-magic-group (t2/select-one :model/PermissionsGroup+ :magic_group_type perms-group/data-analyst-magic-group-type)]+ (is (some? new-magic-group))+ (is (= "Data Analysts" (:name new-magic-group)))+ (is (zero? (t2/count :model/PermissionsGroupMembership :group_id (:id new-magic-group))))))))))))++(deftest sync-data-analyst-group-for-oss!-idempotent-empty-test+ (testing "In OSS, sync-data-analyst-group-for-oss! is idempotent when magic group is empty"+ (mt/with-premium-features #{}+ (with-reset-data-analyst-group!+ (let [group-count-before (t2/count :model/PermissionsGroup)+ data-analyst-group-id (t2/select-one-pk :model/PermissionsGroup :magic_group_type perms-group/data-analyst-magic-group-type)]+ ;; Ensure no members in the group+ (t2/delete! :model/PermissionsGroupMembership :group_id data-analyst-group-id)+ (perms-group/sync-data-analyst-group-for-oss!)+ (testing "No new groups should be created"+ (is (= group-count-before (t2/count :model/PermissionsGroup))))+ (testing "Magic group should still exist unchanged"+ (is (= perms-group/data-analyst-magic-group-type+ (t2/select-one-fn :magic_group_type :model/PermissionsGroup :id data-analyst-group-id)))))))))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.cljindex 718e6d5c028..197e924a75a 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@@ -5,6 +5,7 @@[metabase-enterprise.data-studio.api.table :as api.table][metabase.collections.models.collection :as collection][metabase.collections.test-helpers :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]@@ -99,6 +100,59 @@{:table_ids [(mt/id :users)]:data_layer "gold"}))))))+(deftest data-analyst-can-access-endpoints-test+ (mt/with-premium-features #{:data-studio}+ (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"+ :email "[email protected]"+ :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}+ :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 "gold"}))))+ (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]}))))+ (testing "data analyst can unpublish tables"+ (is (nil? (mt/user-http-request analyst-id :post 204 "ee/data-studio/table/unpublish-tables"+ {:table_ids [table-id]})))))))))++(deftest regular-user-cannot-access-data-studio-test+ (mt/with-premium-features #{:data-studio}+ (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}+ :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 "gold"}))))+ (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"+ {:table_ids [table-id]}))))+ (testing "regular user cannot unpublish tables"+ (is (= "You don't have permissions to do that."+ (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"diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.cljindex a8d5c2f4aee..24e9a0076c5 100644--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj@@ -330,16 +330,16 @@(let [new-user (t2/select-one :model/User :email "[email protected]")](testing "new user"(is- (=- {:email "[email protected]"- :first_name "New"- :is_qbnewb true- :is_superuser false- :id true- :last_name "User"- :date_joined true- :common_name "New User"- :tenant_id false}+ (=?+ {:email "[email protected]"+ :first_name "New"+ :is_qbnewb true+ :is_superuser false+ :id true+ :last_name "User"+ :date_joined true+ :common_name "New User"+ :tenant_id false}(-> (mt/boolean-ids-and-timestamps [new-user])first(dissoc :last_login)))))@@ -374,16 +374,16 @@(is (saml-test/successful-login? response))(testing "new user with no first or last name"(is- (=- [{:email "[email protected]"- :first_name nil- :is_qbnewb true- :is_superuser false- :id true- :last_name nil- :date_joined true- :common_name "[email protected]"- :tenant_id false}]+ (=?+ [{:email "[email protected]"+ :first_name nil+ :is_qbnewb true+ :is_superuser false+ :id true+ :last_name nil+ :date_joined true+ :common_name "[email protected]"+ :tenant_id false}](->>(mt/boolean-ids-and-timestamps (t2/select :model/User :email "[email protected]"))(map #(dissoc % :last_login)))))))@@ -399,7 +399,7 @@(is (saml-test/successful-login? response))(testing "update user first and last name"(is- (=+ (=?[{:email "[email protected]":first_name "New":is_qbnewb truediff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.cljindex 18076f06a72..9eaf916be39 100644--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj@@ -512,17 +512,17 @@default-redirect-uri)](is (successful-login? (client/client-real-response :post 302 "/auth/sso" req-options))))(let [new-user (t2/select-one :model/User :email "[email protected]")]- (is (= {:email "[email protected]"- :first_name "New"- :is_qbnewb true- :is_superuser false- :id true- :last_name "User"- :date_joined true- :common_name "New User"- :tenant_id false}- (-> (mt/boolean-ids-and-timestamps new-user)- (dissoc :last_login))))+ (is (=? {:email "[email protected]"+ :first_name "New"+ :is_qbnewb true+ :is_superuser false+ :id true+ :last_name "User"+ :date_joined true+ :common_name "New User"+ :tenant_id false}+ (-> (mt/boolean-ids-and-timestamps new-user)+ (dissoc :last_login))))(testing "User Invite Event is logged."(is (= "[email protected]"(get-in (mt/latest-audit-log-entry :user-invited (:id new-user))@@ -545,32 +545,32 @@(let [req-options (saml-post-request-options (new-user-no-names-saml-test-response)default-redirect-uri)](is (successful-login? (client/client-real-response :post 302 "/auth/sso" req-options)))- (is (= [{:email "[email protected]"- :first_name nil- :is_qbnewb true- :is_superuser false- :id true- :last_name nil- :date_joined true- :common_name "[email protected]"- :tenant_id false}]- (->> (mt/boolean-ids-and-timestamps (t2/select :model/User :email "[email protected]"))- (map #(dissoc % :last_login))))))+ (is (=? [{:email "[email protected]"+ :first_name nil+ :is_qbnewb true+ :is_superuser false+ :id true+ :last_name nil+ :date_joined true+ :common_name "[email protected]"+ :tenant_id false}]+ (->> (mt/boolean-ids-and-timestamps (t2/select :model/User :email "[email protected]"))+ (map #(dissoc % :last_login))))));; login with the same user, but now givenname and surname attributes exist(let [req-options (saml-post-request-options (new-user-saml-test-response)default-redirect-uri)](is (successful-login? (client/client-real-response :post 302 "/auth/sso" req-options)))- (is (= [{:email "[email protected]"- :first_name "New"- :is_qbnewb true- :is_superuser false- :id true- :last_name "User"- :date_joined true- :common_name "New User"- :tenant_id false}]- (->> (mt/boolean-ids-and-timestamps (t2/select :model/User :email "[email protected]"))- (map #(dissoc % :last_login))))))+ (is (=? [{:email "[email protected]"+ :first_name "New"+ :is_qbnewb true+ :is_superuser false+ :id true+ :last_name "User"+ :date_joined true+ :common_name "New User"+ :tenant_id false}]+ (->> (mt/boolean-ids-and-timestamps (t2/select :model/User :email "[email protected]"))+ (map #(dissoc % :last_login))))))(finally(t2/delete! :model/User :%lower.email "[email protected]")))))))))diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex ff6ec909921..e398c4a8474 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -128,15 +128,13 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {showLabel={isNavbarOpened}/>)}- {canAccessDataModel && (- <DataStudioTab- label={t`Glossary`}- icon="glossary"- to={Urls.dataStudioGlossary()}- isSelected={currentTab === "glossary"}- showLabel={isNavbarOpened}- />- )}+ <DataStudioTab+ label={t`Glossary`}+ icon="glossary"+ to={Urls.dataStudioGlossary()}+ isSelected={currentTab === "glossary"}+ showLabel={isNavbarOpened}+ />{PLUGIN_DEPENDENCIES.isEnabled && (<DataStudioTablabel={t`Dependency graph`}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsxindex d31ed795452..246319a29df 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx@@ -9,7 +9,6 @@ import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import {canUserCreateNativeQueries,canUserCreateQueries,- getUserIsAdmin,} from "metabase/selectors/user";import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";@@ -28,7 +27,6 @@ export const CreateMenu = ({const [modal, setModal] = useState<"snippet-folder" | "publish-table">();const closeModal = () => setModal(undefined);- const isAdmin = useSelector(getUserIsAdmin);const hasNativeWrite = useSelector(canUserCreateNativeQueries);const hasDataAccess = useSelector(canUserCreateQueries);const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);@@ -41,15 +39,13 @@ export const CreateMenu = ({hasDataAccess && metricCollectionId && canWriteToMetricCollection;const menuItems = [- isAdmin && (- <Menu.Item- key="publish-table"- leftSection={<FixedSizeIcon name="publish" />}- onClick={() => setModal("publish-table")}- >- {t`Publish a table`}- </Menu.Item>- ),+ <Menu.Item+ key="publish-table"+ leftSection={<FixedSizeIcon name="publish" />}+ onClick={() => setModal("publish-table")}+ >+ {t`Publish a table`}+ </Menu.Item>,canCreateMetric && (<Menu.Itemkey="metric"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/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsxindex 7bf67cc7037..d76f5383157 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx@@ -55,21 +55,39 @@ const setup = ({};describe("CreateMenu", () => {- it("renders nothing if menu does not have any options (user lacks permissions)", () => {- setup();+ it("renders all options for admins", async () => {+ setup({ user: fullPermissionsUser });++ await userEvent.click(screen.getByRole("button", { name: /New/ }));+expect(- screen.queryByRole("button", { name: /New/ }),- ).not.toBeInTheDocument();+ screen.getAllByRole("menuitem").map((item) => item.textContent),+ ).toEqual([+ "Publish a table",+ "Metric",+ "New snippet",+ "New snippet folder",+ ]);+ });++ it("renders publish option for data analysts", async () => {+ setup({ user: { is_data_analyst: true } });++ await userEvent.click(screen.getByRole("button", { name: /New/ }));++ expect(+ screen.getAllByRole("menuitem").map((item) => item.textContent),+ ).toEqual(["Publish a table"]);});- it("does not render snippet menu items if user only has query builder access", async () => {+ it("renders publish and metric options if user only has query builder access", async () => {setup({ user: { permissions: { can_create_queries: true } } });await userEvent.click(screen.getByRole("button", { name: /New/ }));expect(screen.getAllByRole("menuitem").map((item) => item.textContent),- ).toEqual(["Metric"]);+ ).toEqual(["Publish a table", "Metric"]);});it("does not render Metric option when canWriteToMetricCollection is false", async () => {@@ -91,21 +109,6 @@ describe("CreateMenu", () => {).toEqual(["Publish a table", "New snippet", "New snippet folder"]);});- it("renders all options when user has full permissions", async () => {- setup({ user: fullPermissionsUser });-- await userEvent.click(screen.getByRole("button", { name: /New/ }));-- expect(- screen.getAllByRole("menuitem").map((item) => item.textContent),- ).toEqual([- "Publish a table",- "Metric",- "New snippet",- "New snippet folder",- ]);- });-it("renders nothing if remote sync is set to read-only", () => {setup({ user: fullPermissionsUser, remoteSyncType: "read-only" });expect(diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsxindex 7de8b8c82c6..304ac967e80 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx@@ -7,7 +7,6 @@ import { useListCollectionsTreeQuery } from "metabase/api";import { isLibraryCollection } from "metabase/collections/utils";import DateTime from "metabase/common/components/DateTime";import { ForwardRefLink } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";@@ -50,7 +49,7 @@ import {isCollection,isEmptyStateData,} from "./types";-import { getAccessibleCollection } from "./utils";+import { getAccessibleCollection, getWritableCollection } from "./utils";interface EmptyStateActionProps {data: EmptyStateData;@@ -121,10 +120,6 @@ export function LibrarySectionLayout() {"include-library": true,});- const isInstanceRemoteSyncEnabled = Boolean(- useSetting("remote-sync-enabled"),- );-const libraryCollection = useMemo(() => collections.find(isLibraryCollection),[collections],@@ -133,23 +128,22 @@ export function LibrarySectionLayout() {const tableCollection = useMemo(() =>libraryCollection &&- getAccessibleCollection(- libraryCollection,- "library-data",- isInstanceRemoteSyncEnabled,- ),- [libraryCollection, isInstanceRemoteSyncEnabled],+ getAccessibleCollection(libraryCollection, "library-data"),+ [libraryCollection],);const metricCollection = useMemo(() =>libraryCollection &&- getAccessibleCollection(- libraryCollection,- "library-metrics",- isInstanceRemoteSyncEnabled,- ),- [libraryCollection, isInstanceRemoteSyncEnabled],+ getAccessibleCollection(libraryCollection, "library-metrics"),+ [libraryCollection],+ );++ const writableMetricCollection = useMemo(+ () =>+ libraryCollection &&+ getWritableCollection(libraryCollection, "library-metrics"),+ [libraryCollection],);const getItemHref = useCallback((item: TreeItem): string | null => {@@ -373,8 +367,8 @@ export function LibrarySectionLayout() {onChange={(e) => setSearchQuery(e.target.value)}/><CreateMenu- metricCollectionId={metricCollection?.id}- canWriteToMetricCollection={metricCollection?.can_write}+ metricCollectionId={writableMetricCollection?.id}+ canWriteToMetricCollection={!!writableMetricCollection}/></Flex><Card withBorder p={0}>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.tsindex 9019324d17c..fb5364e71d7 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.ts@@ -82,36 +82,21 @@ export function buildSnippetTree(return [{ ...rootNode, name: t`SQL snippets`, children }];}-export function getWritableCollection(+export function getAccessibleCollection(rootCollection: Collection,type: CollectionType,) {- const collection = rootCollection.children?.find(+ return rootCollection.children?.find((collection) => collection.type === type,);- return collection?.can_write ? collection : undefined;}-export function getAccessibleCollection(+export function getWritableCollection(rootCollection: Collection,type: CollectionType,- isInstanceRemoteSyncEnabled: boolean,) {- const collection = rootCollection.children?.find(- (collection) => collection.type === type,- );- if (!collection) {- return undefined;- }-- // If instance remote-sync is enabled AND this collection has remote-sync enabled,- // show it even if read-only. Otherwise, only show writable collections.- const isCollectionRemoteSynced =- isInstanceRemoteSyncEnabled && collection.is_remote_synced;- if (isCollectionRemoteSynced) {- return collection;- }- return collection.can_write ? collection : undefined;+ const collection = getAccessibleCollection(rootCollection, type);+ return collection?.can_write ? collection : undefined;}type EmptyStateConfig = {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/app/pages/LibrarySectionLayout/utils.unit.spec.tsindex d334b52cd64..f933f20f59f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.unit.spec.ts@@ -53,117 +53,36 @@ describe("getWritableCollection", () => {});describe("getAccessibleCollection", () => {- describe("when instance remote-sync is disabled", () => {- const isInstanceRemoteSyncEnabled = false;-- it("returns collection when can_write is true", () => {- const childCollection = createMockCollection({- id: 2,- type: "library-data",- can_write: true,- is_remote_synced: false,- });- const rootCollection = createMockCollection({- id: 1,- children: [childCollection],- });-- const result = getAccessibleCollection(- rootCollection,- "library-data",- isInstanceRemoteSyncEnabled,- );-- expect(result).toEqual(childCollection);+ it("returns collection when it exists with can_write true", () => {+ const childCollection = createMockCollection({+ id: 2,+ type: "library-data",+ can_write: true,});-- it("returns undefined when can_write is false even if collection is remote synced", () => {- const childCollection = createMockCollection({- id: 2,- type: "library-data",- can_write: false,- is_remote_synced: true,- });- const rootCollection = createMockCollection({- id: 1,- children: [childCollection],- });-- const result = getAccessibleCollection(- rootCollection,- "library-data",- isInstanceRemoteSyncEnabled,- );-- expect(result).toBeUndefined();+ const rootCollection = createMockCollection({+ id: 1,+ children: [childCollection],});++ const result = getAccessibleCollection(rootCollection, "library-data");++ expect(result).toEqual(childCollection);});- describe("when instance remote-sync is enabled", () => {- const isInstanceRemoteSyncEnabled = true;-- it("returns collection when can_write is true (regardless of is_remote_synced)", () => {- const childCollection = createMockCollection({- id: 2,- type: "library-data",- can_write: true,- is_remote_synced: false,- });- const rootCollection = createMockCollection({- id: 1,- children: [childCollection],- });-- const result = getAccessibleCollection(- rootCollection,- "library-data",- isInstanceRemoteSyncEnabled,- );-- expect(result).toEqual(childCollection);+ it("returns collection when it exists with can_write false", () => {+ const childCollection = createMockCollection({+ id: 2,+ type: "library-data",+ can_write: false,});-- it("returns collection when can_write is false but collection is remote synced", () => {- const childCollection = createMockCollection({- id: 2,- type: "library-data",- can_write: false,- is_remote_synced: true,- });- const rootCollection = createMockCollection({- id: 1,- children: [childCollection],- });-- const result = getAccessibleCollection(- rootCollection,- "library-data",- isInstanceRemoteSyncEnabled,- );-- expect(result).toEqual(childCollection);+ const rootCollection = createMockCollection({+ id: 1,+ children: [childCollection],});- it("returns undefined when can_write is false and collection is not remote synced", () => {- const childCollection = createMockCollection({- id: 2,- type: "library-data",- can_write: false,- is_remote_synced: false,- });- const rootCollection = createMockCollection({- id: 1,- children: [childCollection],- });-- const result = getAccessibleCollection(- rootCollection,- "library-data",- isInstanceRemoteSyncEnabled,- );-- expect(result).toBeUndefined();- });+ const result = getAccessibleCollection(rootCollection, "library-data");++ expect(result).toEqual(childCollection);});it("returns undefined when collection type does not exist", () => {@@ -177,11 +96,7 @@ describe("getAccessibleCollection", () => {children: [childCollection],});- const result = getAccessibleCollection(- rootCollection,- "library-data",- true,- );+ const result = getAccessibleCollection(rootCollection, "library-data");expect(result).toBeUndefined();});@@ -192,11 +107,7 @@ describe("getAccessibleCollection", () => {children: undefined,});- const result = getAccessibleCollection(- rootCollection,- "library-data",- true,- );+ const result = getAccessibleCollection(rootCollection, "library-data");expect(result).toBeUndefined();});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsxindex 4afaac8a8f1..35f5d3d8903 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx@@ -3,17 +3,27 @@ import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import type { EnterpriseSettings, Measure, Table } from "metabase-types/api";-import { createMockMeasure, createMockTable } from "metabase-types/api/mocks";+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 = {}, remoteSyncType }: SetupOpts = {}) {+function setup({+ measures = [],+ table = {},+ isAdmin = true,+ remoteSyncType,+}: SetupOpts = {}) {const mockTable = createMockTable({id: 1,db_id: 1,@@ -28,6 +38,7 @@ function setup({ measures = [], table = {}, remoteSyncType }: SetupOpts = {}) {{withRouter: true,storeInitialState: {+ currentUser: createMockUser({ is_superuser: isAdmin }),settings: mockSettings({"remote-sync-type": remoteSyncType,"remote-sync-enabled": !!remoteSyncType,@@ -76,16 +87,24 @@ describe("MeasureList", () => {});describe("'new measure' link", () => {- it("is rendered by default", () => {- setup();+ it("is rendered when user is an admin", () => {+ setup({ measures: [], isAdmin: true });expect(screen.getByRole("link", { name: /New measure/i }),).toBeInTheDocument();});+ it("is not rendered when user is not an admin", () => {+ setup({ measures: [], isAdmin: false });++ expect(+ screen.queryByRole("link", { name: /New measure/i }),+ ).not.toBeInTheDocument();+ });+it("is not rendered when remote sync is set to read-only", () => {- setup({ remoteSyncType: "read-only" });+ setup({ measures: [], isAdmin: true, remoteSyncType: "read-only" });expect(screen.queryByRole("link", { name: /New measure/i }),@@ -94,6 +113,8 @@ describe("MeasureList", () => {it("is still rendered when remote sync is set to read-only but table is not published", () => {setup({+ measures: [],+ isAdmin: true,remoteSyncType: "read-only",table: { is_published: false },});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsxindex a237187409f..9054e064aa2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx@@ -9,12 +9,12 @@ import {UserInput,} from "metabase/metadata/components";import { useMetadataToasts } from "metabase/metadata/hooks";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";import { useEditTablesMutation } from "metabase-enterprise/api";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,@@ -38,7 +38,7 @@ export function TableAttributesEditBulk({hasLibrary,onUpdate,}: TableAttributesEditBulkProps) {- const isAdmin = useSelector(getUserIsAdmin);+ const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);const {selectedDatabases,selectedSchemas,@@ -158,7 +158,7 @@ export function TableAttributesEditBulk({<Box px="lg"><Group gap="sm">- {isAdmin && (+ {!remoteSyncReadOnly && (<Buttonflex={1}p="sm"@@ -168,7 +168,7 @@ export function TableAttributesEditBulk({{t`Publish`}</Button>)}- {isAdmin && hasLibrary && (+ {!remoteSyncReadOnly && hasLibrary && (<Buttonflex={1}p="sm"diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsxindex f36eacc4e7b..697a11bbefd 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx@@ -68,11 +68,13 @@ function TestWrapper({type SetupOpts = {initialTables?: Set<TableId>;isAdmin?: boolean;+ isDataAnalyst?: boolean;};function setup({initialTables = new Set([1]),- isAdmin = true,+ isAdmin = false,+ isDataAnalyst = false,}: SetupOpts = {}) {setupUsersEndpoints([createMockUser()]);setupUserKeyValueEndpoints({@@ -94,25 +96,35 @@ function setup({renderWithProviders(<TestWrapper initialTables={initialTables} />, {withRouter: false,storeInitialState: {- currentUser: createMockUser({ is_superuser: isAdmin }),+ currentUser: createMockUser({+ is_superuser: isAdmin,+ is_data_analyst: isDataAnalyst,+ }),},});}describe("TableAttributesEditBulk", () => {- it("should not render publish buttons for non-admin users", async () => {- setup({ isAdmin: false });+ it("should render publish buttons for admins", async () => {+ setup({ isAdmin: true });await waitFor(() => {expect(screen.getByText(/tables selected/i)).toBeInTheDocument();});- expect(- screen.queryByRole("button", { name: /Publish/i }),- ).not.toBeInTheDocument();- expect(- screen.queryByRole("button", { name: /Unpublish/i }),- ).not.toBeInTheDocument();+ expect(screen.getByText("Publish")).toBeInTheDocument();+ expect(screen.getByText("Unpublish")).toBeInTheDocument();+ });++ it("should render publish buttons for data analysts", async () => {+ setup({ isDataAnalyst: true });++ await waitFor(() => {+ expect(screen.getByText(/tables selected/i)).toBeInTheDocument();+ });++ expect(screen.getByText("Publish")).toBeInTheDocument();+ expect(screen.getByText("Unpublish")).toBeInTheDocument();});it("should reset form state when selection changes", async () => {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsxindex 7920f0fe1e5..dbf7dc2577e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx@@ -21,7 +21,6 @@ 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 { getUserIsAdmin } from "metabase/selectors/user";import {Box,Button,@@ -63,7 +62,6 @@ const TableSectionBase = ({hasLibrary,onSyncOptionsClick,}: Props) => {- const isAdmin = useSelector(getUserIsAdmin);const [updateTable] = useUpdateTableMutation();const [updateTableSorting, { isLoading: isUpdatingSorting }] =useUpdateTableMutation();@@ -217,7 +215,7 @@ const TableSectionBase = ({</Box><Group justify="stretch" gap="sm">- {isAdmin && !remoteSyncReadOnly && (+ {!remoteSyncReadOnly && (<Buttonflex="1"p="sm"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.tsxindex 39aa979d04a..b2c678aec52 100644--- 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@@ -24,6 +24,7 @@ type SetupOpts = {activeTab?: DataStudioTableMetadataTab;segments?: Segment[];isAdmin?: boolean;+ isDataAnalyst?: boolean;remoteSyncType?: EnterpriseSettings["remote-sync-type"];};@@ -31,7 +32,8 @@ function setup({table = createMockTable(),activeTab = "field",segments,- isAdmin = true,+ isAdmin = false,+ isDataAnalyst = false,remoteSyncType,}: SetupOpts = {}) {const onSyncOptionsClick = jest.fn();@@ -63,7 +65,10 @@ function setup({{withRouter: true,storeInitialState: {- currentUser: createMockUser({ is_superuser: isAdmin }),+ currentUser: createMockUser({+ is_superuser: isAdmin,+ is_data_analyst: isDataAnalyst,+ }),settings,},},@@ -85,26 +90,23 @@ describe("TableSection", () => {);});- it("should not render publish button for non-admin users", () => {- setup({ isAdmin: false });+ it("should render publish button for admins", () => {+ setup({ isAdmin: true });- expect(- screen.queryByRole("button", { name: /Publish/i }),- ).not.toBeInTheDocument();- expect(- screen.queryByRole("button", { name: /Unpublish/i }),- ).not.toBeInTheDocument();+ 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.queryByRole("button", { name: /Publish/i }),- ).not.toBeInTheDocument();- expect(- screen.queryByRole("button", { name: /Unpublish/i }),- ).not.toBeInTheDocument();+ expect(screen.queryByText("Publish")).not.toBeInTheDocument();+ expect(screen.queryByText("Unpublish")).not.toBeInTheDocument();});describe("tabs", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsxindex 771e7fd27bd..a69ce550a3b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx@@ -51,8 +51,10 @@ export function getDataStudioMetadataRoutes() {)}<Routepath="database/:databaseId/schema/:schemaId/table/:tableId/measures/new"- component={DataModelNewMeasurePage}- />+ component={IsAdmin}+ >+ <IndexRoute component={DataModelNewMeasurePage} />+ </Route><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId"component={DataModelMeasureDetailPage}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsxindex 73cfce32502..78ba1bc36ef 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { MeasureAggregationPicker } from "metabase/querying/measures";-import { Card, Stack, TextInput } from "metabase/ui";+import { Card, Stack, Text, TextInput } from "metabase/ui";import type * as Lib from "metabase-lib";import S from "./MeasureEditor.module.css";@@ -19,7 +19,7 @@ export function MeasureEditor({description,onQueryChange,onDescriptionChange,- readOnly,+ readOnly = false,}: MeasureEditorProps) {return (<Card withBorder p="xl">@@ -31,17 +31,24 @@ export function MeasureEditor({readOnly={readOnly}/>)}- <TextInput- label={t`Give it a description`}- placeholder={t`Only if it really needs it`}- value={description}- onChange={(e) => onDescriptionChange(e.target.value)}- maw={400}- classNames={{- label: S.descriptionLabel,- }}- readOnly={readOnly}- />+ {!readOnly && (+ <TextInput+ label={t`Give it a description`}+ placeholder={t`Only if it really needs it`}+ value={description}+ onChange={(e) => onDescriptionChange(e.target.value)}+ maw={400}+ classNames={{+ label: S.descriptionLabel,+ }}+ />+ )}+ {readOnly && description && (+ <Stack gap="sm">+ <Text fw="bold">{t`Description`}</Text>+ <Text c="text-secondary">{description}</Text>+ </Stack>+ )}</Stack></Card>);diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsxindex 6fed72779e6..d85b1fa046c 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.unit.spec.tsx@@ -27,7 +27,7 @@ describe("MeasureEditor", () => {).toBeInTheDocument();});- it("disables inputs when read-only", () => {+ it("shows description as plain text when read-only", () => {renderWithProviders(<MeasureEditorquery={query}@@ -38,9 +38,11 @@ describe("MeasureEditor", () => {/>,);- expect(screen.getByLabelText("Give it a description")).toHaveAttribute(- "readonly",- );+ expect(+ screen.queryByLabelText("Give it a description"),+ ).not.toBeInTheDocument();+ expect(screen.getByText("Description")).toBeInTheDocument();+ expect(screen.getByText(description)).toBeInTheDocument();expect(screen.queryByText("Pick an aggregation function"),).not.toBeInTheDocument();diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsxindex f84fc204b86..7dc8ba18e5b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx@@ -20,7 +20,7 @@ type MeasureHeaderProps = {measure: Measure;tabUrls: MeasureTabUrls;previewUrl?: string;- onRemove: () => void;+ onRemove?: () => void;onNameChange?: (name: string) => void;breadcrumbs?: ReactNode;actions?: ReactNode;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex a8934c2eff2..af8773acbe0 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -38,7 +38,7 @@ export function MeasureDetailPage({const metadata = useSelector(getMetadata);const table = metadata.tables[measure.table_id];const canWriteMeasures = useSelector((state) =>- getUserCanWriteMeasures(state, table?.is_published),+ getUserCanWriteMeasures(state, !!table?.is_published),);const { sendSuccessToast, sendErrorToast } = useMetadataToasts();@@ -105,9 +105,11 @@ export function MeasureDetailPage({measure={measure}tabUrls={tabUrls}previewUrl={previewUrl}- onRemove={onRemove}+ onRemove={canWriteMeasures ? onRemove : undefined}+ readOnly={!canWriteMeasures}breadcrumbs={breadcrumbs}actions={+ canWriteMeasures &&isDirty && (<Group gap="sm"><Button onClick={handleReset}>{t`Cancel`}</Button>@@ -122,7 +124,6 @@ export function MeasureDetailPage({</Group>)}- readOnly={!canWriteMeasures}/><MeasureEditorquery={query}@@ -131,11 +132,13 @@ export function MeasureDetailPage({onDescriptionChange={setDescription}readOnly={!canWriteMeasures}/>- <LeaveRouteConfirmModal- key={measure.id}- route={route}- isEnabled={isDirty && !isSaving}- />+ {canWriteMeasures && (+ <LeaveRouteConfirmModal+ key={measure.id}+ route={route}+ isEnabled={isDirty && !isSaving}+ />+ )}</PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.tsindex 764032e980d..d6129a5d893 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts@@ -34,6 +34,12 @@ export const getUserCanWriteMeasures = (state: State,isTablePublished: boolean,) => {+ const isAdmin = getUserIsAdmin(state);++ if (!isAdmin) {+ return false;+ }+const isRemoteSyncReadOnly = getIsRemoteSyncReadOnly(state);return !isRemoteSyncReadOnly || !isTablePublished;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/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsxindex 5b853726d4e..2d0aa4f19dc 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx@@ -3,16 +3,17 @@ import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import type { EnterpriseSettings, Table } from "metabase-types/api";-import { createMockTable } from "metabase-types/api/mocks";+import { createMockTable, createMockUser } from "metabase-types/api/mocks";import { TableMeasures } from "./TableMeasures";type SetupOpts = {+ isAdmin?: boolean;remoteSyncType?: EnterpriseSettings["remote-sync-type"];table?: Partial<Table>;};-const setup = ({ remoteSyncType, table }: SetupOpts = {}) => {+const setup = ({ isAdmin = true, remoteSyncType, table }: SetupOpts = {}) => {const mockTable = createMockTable({id: 1,db_id: 1,@@ -30,6 +31,7 @@ const setup = ({ remoteSyncType, table }: SetupOpts = {}) => {"remote-sync-type": remoteSyncType,"remote-sync-enabled": !!remoteSyncType,}),+ currentUser: createMockUser({ is_superuser: isAdmin }),},},);@@ -37,6 +39,22 @@ const setup = ({ remoteSyncType, table }: SetupOpts = {}) => {describe("TablesMeasures", () => {describe("'new measure' link", () => {+ it("is rendered when user is an admin", () => {+ setup({ isAdmin: true });++ expect(+ screen.getByRole("link", { name: /New measure/i }),+ ).toBeInTheDocument();+ });++ it("is not rendered when user is not an admin", () => {+ setup({ isAdmin: false });++ expect(+ screen.queryByRole("link", { name: /New measure/i }),+ ).not.toBeInTheDocument();+ });+it("is not rendered when remote sync is set to read-only", () => {setup({ remoteSyncType: "read-only" });diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsxindex c8f5af4d91a..5c588f7b3bd 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx@@ -44,10 +44,9 @@ export function getDataStudioTableRoutes() {</Route>)}<Route path=":tableId/measures" component={TableMeasuresPage} />- <Route- path=":tableId/measures/new"- component={PublishedTableNewMeasurePage}- />+ <Route path=":tableId/measures/new" component={IsAdmin}>+ <IndexRoute component={PublishedTableNewMeasurePage} />+ </Route><Routepath=":tableId/measures/:measureId"component={PublishedTableMeasureDetailPage}diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.tsindex 83e555f97bf..09e213e8f99 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts@@ -14,6 +14,7 @@ import {type PermissionSectionConfig,type PermissionSubject,type SchemaEntityId,+ type SpecialGroupType,type TableEntityId,} from "metabase/admin/permissions/types";import {@@ -85,11 +86,23 @@ const getPermissionValue = (}};+const getDisabledTooltip = (groupType: SpecialGroupType) => {+ switch (groupType) {+ case "admin":+ return Messages.UNABLE_TO_CHANGE_ADMIN_PERMISSIONS;+ case "analyst":+ return Messages.UNABLE_TO_CHANGE_DATA_ANALYST_PERMISSIONS;+ case "external":+ return Messages.EXTERNAL_USERS_NO_ACCESS_DATABASE;+ default:+ return null;+ }+};+export const buildDataModelPermission = (entityId: EntityId,groupId: number,- isAdmin: boolean,- isExternal: boolean,+ groupType: SpecialGroupType,permissions: GroupsPermissions,defaultGroup: Group,permissionSubject: PermissionSubject,@@ -130,19 +143,17 @@ export const buildDataModelPermission = (),];+ const disabledTooltip = getDisabledTooltip(groupType);+return {permission: DataPermission.DATA_MODEL,type: DataPermissionType.DATA_MODEL,- isDisabled: isAdmin || isExternal,+ isDisabled: disabledTooltip !== null,warning,confirmations,value,- isHighlighted: isAdmin,- disabledTooltip: isAdmin- ? Messages.UNABLE_TO_CHANGE_ADMIN_PERMISSIONS- : isExternal- ? Messages.EXTERNAL_USERS_NO_ACCESS_DATABASE- : null,+ isHighlighted: groupType === "admin" || groupType === "analyst",+ disabledTooltip,options: [DATA_MODEL_PERMISSION_OPTIONS.none,...(hasChildEntities ? [DATA_MODEL_PERMISSION_OPTIONS.controlled] : []),diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.unit.spec.tsindex 911e92c6383..fdf0a9c7997 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.unit.spec.ts@@ -1,3 +1,4 @@+import type { SpecialGroupType } from "metabase/admin/permissions/types";import { DataPermissionValue } from "metabase/admin/permissions/types";import type { Group, GroupsPermissions } from "metabase-types/api";@@ -29,9 +30,9 @@ const getPermissionGraph = (value = "all"): GroupsPermissions =>},}) as any;-const isAdmin = true;-const isNotAdmin = false;-const isNotExternal = false;+const adminGroupType: SpecialGroupType = "admin";+const regularGroupType: SpecialGroupType = null;+const analystGroupType: SpecialGroupType = "analyst";const defaultGroup: Group = {id: defaultGroupId,@@ -43,8 +44,7 @@ describe("buildDataModelPermission", () => {const permissionModel = buildDataModelPermission({ databaseId },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph(),defaultGroup,"schemas",@@ -59,8 +59,7 @@ describe("buildDataModelPermission", () => {const permissionModel = buildDataModelPermission({ databaseId },groupId,- isAdmin,- isNotExternal,+ adminGroupType,getPermissionGraph(),defaultGroup,"schemas",@@ -72,12 +71,27 @@ describe("buildDataModelPermission", () => {);});- it("does not disable permission editing for non-admins", () => {+ it("disables permission editing for data analysts", () => {const permissionModel = buildDataModelPermission({ databaseId },groupId,- isNotAdmin,- isNotExternal,+ analystGroupType,+ getPermissionGraph(),+ defaultGroup,+ "schemas",+ );++ expect(permissionModel.isDisabled).toBe(true);+ expect(permissionModel.disabledTooltip).toBe(+ "Data Analysts always have full access to edit table metadata.",+ );+ });++ it("does not disable permission editing for regular groups", () => {+ const permissionModel = buildDataModelPermission(+ { databaseId },+ groupId,+ regularGroupType,getPermissionGraph(),defaultGroup,"schemas",@@ -92,8 +106,7 @@ describe("buildDataModelPermission", () => {const schemasPermissionModel = buildDataModelPermission({ databaseId },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph(),defaultGroup,"schemas",@@ -102,8 +115,7 @@ describe("buildDataModelPermission", () => {const tablesPermissionModel = buildDataModelPermission({ databaseId, schemaName: "schema" },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph(),defaultGroup,"tables",@@ -123,8 +135,7 @@ describe("buildDataModelPermission", () => {const permissionModel = buildDataModelPermission({ databaseId, schemaName: "schema", tableId: 1 },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph(),defaultGroup,"fields",@@ -144,8 +155,7 @@ describe("buildDataModelPermission", () => {const permissionModel = buildDataModelPermission({ databaseId },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph(),defaultGroup,"schemas",@@ -163,8 +173,7 @@ describe("buildDataModelPermission", () => {const permissionModel = buildDataModelPermission({ databaseId },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph("none"),defaultGroup,"schemas",@@ -183,8 +192,7 @@ describe("buildDataModelPermission", () => {const permissionModel = buildDataModelPermission({ databaseId },groupId,- isNotAdmin,- isNotExternal,+ regularGroupType,getPermissionGraph("block"),defaultGroup,"schemas",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 02dbde49c3a..160cdab9cc5 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@@ -2,6 +2,7 @@ import type {DataPermissionValue,EntityId,PermissionSubject,+ SpecialGroupType,} from "metabase/admin/permissions/types";import type { Group, GroupsPermissions } from "metabase-types/api";@@ -12,14 +13,16 @@ import { buildDownloadPermission } from "./download-permission";export const getFeatureLevelDataPermissions = (entityId: EntityId,groupId: number,- isAdmin: boolean,- isExternal: boolean,+ groupType: SpecialGroupType,permissions: GroupsPermissions,dataAccessPermissionValue: DataPermissionValue,defaultGroup: Group,permissionSubject: PermissionSubject,permissionView?: "group" | "database",) => {+ const isAdmin = groupType === "admin";+ const isExternal = groupType === "external";+const downloadPermission = buildDownloadPermission(entityId,groupId,@@ -35,8 +38,7 @@ export const getFeatureLevelDataPermissions = (buildDataModelPermission(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,defaultGroup,permissionSubject,diff --git a/frontend/src/metabase-types/api/group.ts b/frontend/src/metabase-types/api/group.tsindex 1c7600ae7d1..027ebaaacb1 100644--- a/frontend/src/metabase-types/api/group.ts+++ b/frontend/src/metabase-types/api/group.ts@@ -28,6 +28,7 @@ export type GroupInfo = {| "all-internal-users"| "admin"| "all-external-users"+ | "data-analyst"| null;is_tenant_group?: boolean;};diff --git a/frontend/src/metabase-types/api/mocks/user.ts b/frontend/src/metabase-types/api/mocks/user.tsindex 189d6dd8bdd..f84c6062c03 100644--- a/frontend/src/metabase-types/api/mocks/user.ts+++ b/frontend/src/metabase-types/api/mocks/user.ts@@ -21,6 +21,7 @@ export const createMockUser = (opts?: Partial<User>): User => {is_active: true,is_qbnewb: false,is_superuser: false,+ is_data_analyst: false,is_installer: false,has_invited_second_user: false,has_question_and_dashboard: false,diff --git a/frontend/src/metabase-types/api/user.ts b/frontend/src/metabase-types/api/user.tsindex 8d8f7c3d86b..1cdf3950343 100644--- a/frontend/src/metabase-types/api/user.ts+++ b/frontend/src/metabase-types/api/user.ts@@ -34,6 +34,7 @@ export interface BaseUser {is_active: boolean;is_qbnewb: boolean;is_superuser: boolean;+ is_data_analyst: boolean;date_joined: string;last_login: string;@@ -48,6 +49,7 @@ export interface UserPermissions {// requires advanced_permissions featureis_group_manager?: boolean;+ is_data_analyst?: boolean;can_access_data_model?: boolean;can_access_db_details?: boolean;can_access_monitoring?: boolean;diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsxindex 782a7723ae4..6501b7ff834 100644--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx@@ -1,9 +1,11 @@import { useDisclosure } from "@mantine/hooks";+import { useMemo } from "react";import { t } from "ttag";import {getGroupNameLocalized,isAdminGroup,+ isDataAnalystGroup,isDefaultGroup,} from "metabase/lib/groups";import { isNotNull } from "metabase/lib/types";@@ -20,10 +22,14 @@ const getGroupSections = (groups: GroupInfo[]) => {(g) => isDefaultGroup(g) || PLUGIN_TENANTS.isExternalUsersGroup(g),);const adminGroup = groups.find(isAdminGroup);- const pinnedGroups = [defaultGroup, adminGroup].filter(isNotNull);+ const dataAnalystGroup = groups.find(isDataAnalystGroup);+ const pinnedGroups = [defaultGroup, adminGroup, dataAnalystGroup].filter(+ isNotNull,+ );const regularGroups = groups.filter((group) =>!isAdminGroup(group) &&+ !isDataAnalystGroup(group) &&!isDefaultGroup(group) &&!PLUGIN_TENANTS.isExternalUsersGroup(group),);@@ -59,7 +65,10 @@ export const MembershipSelect = ({const [popoverOpened, { open: openPopover, toggle: togglePopover }] =useDisclosure();const selectedGroupIds = Array.from(memberships.keys());- const { pinnedGroups, regularGroups } = getGroupSections(groups);+ const { pinnedGroups, regularGroups } = useMemo(+ () => getGroupSections(groups),+ [groups],+ );const handleToggleMembership = (groupId: number) => {if (memberships.has(groupId)) {diff --git a/frontend/src/metabase/admin/permissions/constants/messages.ts b/frontend/src/metabase/admin/permissions/constants/messages.tsindex 7499c426f86..40d7feb7869 100644--- a/frontend/src/metabase/admin/permissions/constants/messages.ts+++ b/frontend/src/metabase/admin/permissions/constants/messages.ts@@ -4,6 +4,12 @@ export const Messages = {get UNABLE_TO_CHANGE_ADMIN_PERMISSIONS() {return t`Administrators always have the highest level of access to everything in Metabase.`;},+ get UNABLE_TO_CHANGE_DATA_ANALYST_PERMISSIONS() {+ return t`Data Analysts always have full access to edit table metadata.`;+ },+ get UNABLE_TO_CHANGE_DATA_ANALYST_LIBRARY_PERMISSIONS() {+ return t`Data Analysts always have full access to library collections.`;+ },get NATIVE_PERMISSION_REQUIRES_DATA_ACCESS() {return t`Groups with View data access set to "Blocked" can't create queries.`;},diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsxindex 6f28f1bc934..9aaed1d93b7 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsx@@ -153,10 +153,11 @@ describe("Admin > CollectionPermissionsPage (enterprise)", () => {enterprisePlugins: ["audit_app", "collections"],});- // change all users users view to no access- await userEvent.click(- await screen.findAllByText("View").then((dropdowns) => dropdowns[0]),- );+ // change all internal users view to no access+ const allUsersRow = await screen.findByRole("row", {+ name: /All internal users/i,+ });+ await userEvent.click(within(allUsersRow).getByText("View"));await userEvent.click(await screen.findByText("No access"));expect(diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsxindex 3f64c04eb3d..975e4a2a3a2 100644--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx@@ -1,5 +1,6 @@import { createSelector } from "@reduxjs/toolkit";import { getIn } from "icepick";+import type { ReactElement } from "react";import { t } from "ttag";import _ from "underscore";@@ -17,9 +18,11 @@ import { Groups } from "metabase/entities/groups";import { SnippetCollections } from "metabase/entities/snippet-collections";import {getGroupNameLocalized,- isAdminGroup,+ getGroupSortOrder,+ getSpecialGroupType,isDefaultGroup,} from "metabase/lib/groups";+import { isNotNull } from "metabase/lib/types";import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";import type {Collection,@@ -36,7 +39,7 @@ import type {import { COLLECTION_OPTIONS } from "../constants/collections-permissions";import { Messages } from "../constants/messages";-import type { DataPermissionValue } from "../types";+import type { DataPermissionValue, SpecialGroupType } from "../types";import { getPermissionWarningModal } from "./confirmations";@@ -211,6 +214,41 @@ const getToggleLabel = (namespace?: CollectionNamespace) =>? t`Also change sub-folders`: t`Also change sub-collections`;+const getCollectionDisabledTooltip = (+ groupType: SpecialGroupType,+ isLibrary: boolean,+ isIACollection: boolean,+): string | null => {+ if (groupType === "admin" && isIACollection) {+ return PLUGIN_COLLECTIONS.INSTANCE_ANALYTICS_ADMIN_READONLY_MESSAGE;+ }+ if (groupType === "analyst" && isLibrary) {+ return Messages.UNABLE_TO_CHANGE_DATA_ANALYST_LIBRARY_PERMISSIONS;+ }+ switch (groupType) {+ case "admin":+ return Messages.UNABLE_TO_CHANGE_ADMIN_PERMISSIONS;+ case "external":+ return Messages.EXTERNAL_USERS_NO_ACCESS_COLLECTION;+ default:+ return null;+ }+};++type PermissionOption = {+ label: string;+ value: string;+ icon: string;+ iconColor: string;+};++type PermissionConfirmation = {+ title: string;+ message: string;+ confirmButtonText: string;+ cancelButtonText: string;+};+export type CollectionPermissionEditorType = null | {title: string;filterPlaceholder: string;@@ -218,15 +256,18 @@ export type CollectionPermissionEditorType = null | {entities: {id: number;name: string;+ icon?: ReactElement;permissions: {- toggleLabel: string;+ toggleLabel: string | null;hasChildren: boolean;isDisabled: boolean;disabledTooltip: string | null;value: string;warning: string | null;- confirmations: (newValue: string) => string[];- options: string[];+ confirmations: (+ newValue: DataPermissionValue,+ ) => (PermissionConfirmation | undefined)[];+ options: PermissionOption[];}[];}[];};@@ -250,14 +291,22 @@ export const getCollectionsPermissionEditor = createSelector(const toggleLabel = hasChildren ? getToggleLabel(namespace) : null;const isTenantCollection = PLUGIN_TENANTS.isTenantCollection(collection);- const entities = groups+ const sortedGroups = [...groups].sort(+ (a, b) => getGroupSortOrder(a) - getGroupSortOrder(b),+ );++ const entities = sortedGroups.map((group: GroupType) => {- const isAdmin = isAdminGroup(group);- const isExternal = PLUGIN_TENANTS.isExternalUsersGroup(group);+ const isExternalUsersGroup = PLUGIN_TENANTS.isExternalUsersGroup(group);const isTenantGroup = PLUGIN_TENANTS.isTenantGroup(group);+ const isExternal = isExternalUsersGroup || isTenantGroup;+ const groupType = getSpecialGroupType(group, isExternal);+ const isLibrary = isLibraryCollection(collection);const defaultGroup = _.find(groups,- isExternal ? PLUGIN_TENANTS.isExternalUsersGroup : isDefaultGroup,+ isExternalUsersGroup+ ? PLUGIN_TENANTS.isExternalUsersGroup+ : isDefaultGroup,);if (isTenantGroup && !isTenantCollection) {@@ -283,8 +332,7 @@ export const getCollectionsPermissionEditor = createSelector(const isIACollection = isInstanceAnalyticsCollection(collection);const options =- isIACollection ||- (isTenantCollection && (isTenantGroup || isExternal))+ isIACollection || (isTenantCollection && isExternal)? [COLLECTION_OPTIONS.read, COLLECTION_OPTIONS.none]: [COLLECTION_OPTIONS.write,@@ -292,14 +340,14 @@ export const getCollectionsPermissionEditor = createSelector(COLLECTION_OPTIONS.none,];- const disabledTooltip = isIACollection- ? PLUGIN_COLLECTIONS.INSTANCE_ANALYTICS_ADMIN_READONLY_MESSAGE- : isTenantGroup || isExternal- ? Messages.EXTERNAL_USERS_NO_ACCESS_COLLECTION- : Messages.UNABLE_TO_CHANGE_ADMIN_PERMISSIONS;+ const disabledTooltip = getCollectionDisabledTooltip(+ groupType,+ isLibrary,+ isIACollection,+ );- const disabled =- (!isTenantCollection && (isTenantGroup || isExternal)) || isAdmin;+ const isDisabled =+ (!isTenantCollection && isExternal) || disabledTooltip !== null;return {id: group.id,@@ -311,8 +359,8 @@ export const getCollectionsPermissionEditor = createSelector({toggleLabel,hasChildren,- isDisabled: disabled,- disabledTooltip: isAdmin || isExternal ? disabledTooltip : null,+ isDisabled,+ disabledTooltip,value: getCollectionPermission(permissions,group.id,@@ -325,7 +373,7 @@ export const getCollectionsPermissionEditor = createSelector(],};})- .filter(Boolean);+ .filter(isNotNull);return {title: t`Permissions for ${collection.name}`,@@ -364,7 +412,7 @@ function getCollectionWarning(permissions: CollectionPermissions,) {if (!collection) {- return;+ return null;}const collectionPerm = getCollectionPermission(permissions,@@ -385,4 +433,6 @@ function getCollectionWarning(} else if (collectionPerm === "read" && descendentPerms.has("write")) {return t`This group has permission to edit at least one subcollection of this collection.`;}++ return null;}diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.tsindex fd825077fef..810956e6672 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts@@ -19,7 +19,11 @@ import type { Group, GroupsPermissions } from "metabase-types/api";import { DATA_PERMISSION_OPTIONS } from "../../constants/data-permissions";import { Messages } from "../../constants/messages";-import type { PermissionSectionConfig, TableEntityId } from "../../types";+import type {+ PermissionSectionConfig,+ SpecialGroupType,+ TableEntityId,+} from "../../types";import {DataPermission,DataPermissionType,@@ -190,13 +194,14 @@ const buildNativePermission = (export const buildFieldsPermissions = (entityId: TableEntityId,groupId: number,- isAdmin: boolean,- isExternal: boolean,+ groupType: SpecialGroupType,permissions: GroupsPermissions,originalPermissions: GroupsPermissions,defaultGroup: Group,database: Database,): PermissionSectionConfig[] => {+ const isAdmin = groupType === "admin";+const accessPermission = buildAccessPermission(entityId,groupId,@@ -225,8 +230,7 @@ export const buildFieldsPermissions = (...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,accessPermission.value,defaultGroup,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.tsindex b8b0deb9a27..bee34151d91 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts@@ -2,19 +2,25 @@ import { createSelector } from "@reduxjs/toolkit";import _ from "underscore";import { Groups } from "metabase/entities/groups";-import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";+import {+ getGroupSortOrder,+ isAdminGroup,+ isDataAnalystGroup,+ isDefaultGroup,+} from "metabase/lib/groups";import { PLUGIN_TENANTS } from "metabase/plugins";import type { Group } from "metabase-types/api";const isPinnedGroup = (group: Group) =>- isAdminGroup(group) || isDefaultGroup(group);+ isAdminGroup(group) || isDefaultGroup(group) || isDataAnalystGroup(group);export const getOrderedGroups = createSelector(Groups.selectors.getList,(groups: Group[]) => {const [pinnedGroups, unpinnedGroups] = _.partition(groups, isPinnedGroup);+ const sortedPinnedGroups = _.sortBy(pinnedGroups, getGroupSortOrder);return [- pinnedGroups,+ sortedPinnedGroups,..._.partition(unpinnedGroups, PLUGIN_TENANTS.isTenantGroup),];},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 484b72ca668..54fb1bc21aa 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@@ -5,7 +5,7 @@ import _ from "underscore";import { Groups } from "metabase/entities/groups";import { Tables } from "metabase/entities/tables";-import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";+import { getSpecialGroupType, isDefaultGroup } from "metabase/lib/groups";import {PLUGIN_AUDIT,PLUGIN_FEATURE_LEVEL_PERMISSIONS,@@ -28,6 +28,7 @@ import type {PermissionSectionConfig,PermissionSubject,RawGroupRouteParams,+ SpecialGroupType,} from "../../types";import { DataPermission, DataPermissionValue } from "../../types";import {@@ -47,6 +48,17 @@ import { getOrderedGroups } from "./groups";import { buildSchemasPermissions } from "./schemas";import { buildTablesPermissions } from "./tables";+const getGroupHint = (groupType: SpecialGroupType): string | null => {+ switch (groupType) {+ case "admin":+ return t`The Administrators group is special, and always has Unrestricted access.`;+ case "analyst":+ return t`The Data Analysts group always has full access to edit table metadata.`;+ default:+ return null;+ }+};+export const getIsLoadingDatabaseTables = (state: State,{ params }: { params: Pick<RawGroupRouteParams, "databaseId"> },@@ -184,7 +196,6 @@ export const getDatabasesPermissionEditor = createSelector(return null;}- const isAdmin = isAdminGroup(group);const defaultGroup = _.find(groups, isDefaultGroup);const externalUsersGroup = _.find(groups,@@ -200,6 +211,8 @@ export const getDatabasesPermissionEditor = createSelector((PLUGIN_TENANTS.isExternalUsersGroup(group) ||PLUGIN_TENANTS.isTenantGroup(group));+ const groupType = getSpecialGroupType(group, isExternal);+const hasSingleSchema =databaseId != null &&metadata.database(databaseId)?.getSchemas().length === 1;@@ -226,8 +239,7 @@ export const getDatabasesPermissionEditor = createSelector(permissions: buildFieldsPermissions(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,originalPermissions,isExternal ? externalUsersGroup : defaultGroup,@@ -250,8 +262,7 @@ export const getDatabasesPermissionEditor = createSelector(permissions: buildTablesPermissions(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,originalPermissions,isExternal ? externalUsersGroup : defaultGroup,@@ -281,8 +292,7 @@ export const getDatabasesPermissionEditor = createSelector(permissions: buildSchemasPermissions(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,originalPermissions,isExternal ? externalUsersGroup : defaultGroup,@@ -399,12 +409,12 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelectotableId != null ? "fields" : schemaName != null ? "tables" : "schemas";const entities = sortedGroups.map((group) => {- const isAdmin = isAdminGroup(group);-const isAllTenantUsersGroup =!!allTenantUsersGroup && PLUGIN_TENANTS.isExternalUsersGroup(group);const isTenantGroup = PLUGIN_TENANTS.isTenantGroup(group);+ const isExternal = isAllTenantUsersGroup || isTenantGroup;+ const groupType = getSpecialGroupType(group, isExternal);let groupPermissions;const shouldUseAllExternalUsersGroup =@@ -418,8 +428,7 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelectotableId,},group.id,- isAdmin,- isAllTenantUsersGroup,+ groupType,permissions,originalPermissions,shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,@@ -432,8 +441,7 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelectoschemaName,},group.id,- isAdmin,- isAllTenantUsersGroup,+ groupType,permissions,originalPermissions,shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,@@ -445,8 +453,7 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelectodatabaseId,},group.id,- isAdmin,- isAllTenantUsersGroup,+ groupType,permissions,originalPermissions,shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,@@ -461,9 +468,7 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelectoicon: isTenantGroup ? (<PLUGIN_TENANTS.TenantGroupHintIcon />) : undefined,- hint: isAdmin- ? t`The Administrators group is special, and always has Unrestricted access.`- : null,+ hint: getGroupHint(groupType),entityId: params,permissions: groupPermissions,};diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.tsindex 0eca672501a..56cc67c339f 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts@@ -21,6 +21,7 @@ import type {DataPermissionValue,DatabaseEntityId,PermissionSectionConfig,+ SpecialGroupType,} from "../../types";import { DataPermission, DataPermissionType } from "../../types";import {@@ -194,14 +195,15 @@ const buildNativePermission = (export const buildSchemasPermissions = (entityId: DatabaseEntityId,groupId: number,- isAdmin: boolean,- isExternal: boolean,+ groupType: SpecialGroupType,permissions: GroupsPermissions,originalPermissions: GroupsPermissions,defaultGroup: Group,database: Database,permissionView: "group" | "database",): PermissionSectionConfig[] => {+ const isAdmin = groupType === "admin";+const accessPermission = buildAccessPermission(entityId,groupId,@@ -232,8 +234,7 @@ export const buildSchemasPermissions = (...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,accessPermission.value,defaultGroup,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.tsindex 231e247f68d..f25bf6abbfe 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts@@ -16,7 +16,11 @@ import type { Group, GroupsPermissions } from "metabase-types/api";import { DATA_PERMISSION_OPTIONS } from "../../constants/data-permissions";import { Messages } from "../../constants/messages";import { navigateToGranularPermissions } from "../../permissions";-import type { PermissionSectionConfig, SchemaEntityId } from "../../types";+import type {+ PermissionSectionConfig,+ SchemaEntityId,+ SpecialGroupType,+} from "../../types";import {DataPermission,DataPermissionType,@@ -183,13 +187,14 @@ const buildNativePermission = (export const buildTablesPermissions = (entityId: SchemaEntityId,groupId: number,- isAdmin: boolean,- isExternal: boolean,+ groupType: SpecialGroupType,permissions: GroupsPermissions,originalPermissions: GroupsPermissions,defaultGroup: Group,database: Database,): PermissionSectionConfig[] => {+ const isAdmin = groupType === "admin";+const accessPermission = buildAccessPermission(entityId,groupId,@@ -219,8 +224,7 @@ export const buildTablesPermissions = (...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getFeatureLevelDataPermissions(entityId,groupId,- isAdmin,- isExternal,+ groupType,permissions,accessPermission.value,defaultGroup,diff --git a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsxindex 548af328148..7a42d85cbf9 100644--- a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx@@ -12,6 +12,7 @@ import {renderWithProviders,screen,waitForLoaderToBeRemoved,+ within,} from "__support__/ui";import { delay } from "__support__/utils";import DataPermissionsPage from "metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage";@@ -21,11 +22,8 @@ import { PLUGIN_ADMIN_PERMISSIONS_TABLE_GROUP_ROUTES } from "metabase/plugins";import { createMockGroup } from "metabase-types/api/mocks/group";import { createSampleDatabase } from "metabase-types/api/mocks/presets";-const NATIVE_QUERIES_PERMISSION_INDEX = 0;-const TEST_DATABASE = createSampleDatabase();-// Order is important here for test to pass, since admin options aren't editableconst TEST_GROUPS = [createMockGroup({id: 1,@@ -68,10 +66,9 @@ const setup = async () => {};const editDatabasePermission = async () => {- const permissionsSelectElem = (- await screen.findAllByTestId("permissions-select")- )[NATIVE_QUERIES_PERMISSION_INDEX];- await userEvent.click(permissionsSelectElem);+ const row = await screen.findByRole("row", { name: /All internal users/i });+ const permissionSelect = within(row).getAllByTestId("permissions-select")[0];+ await userEvent.click(permissionSelect);const clickElement = screen.getByLabelText(/close icon/);await userEvent.click(clickElement);diff --git a/frontend/src/metabase/admin/permissions/types.ts b/frontend/src/metabase/admin/permissions/types.tsindex 2d5e3bb7dfd..db3c92fbf3d 100644--- a/frontend/src/metabase/admin/permissions/types.ts+++ b/frontend/src/metabase/admin/permissions/types.ts@@ -79,6 +79,8 @@ export enum DataPermissionValue {export type PermissionSubject = "schemas" | "tables" | "fields";+export type SpecialGroupType = "admin" | "analyst" | "external" | null;+export type PermissionSectionConfig = {permission: DataPermission;type: DataPermissionType;diff --git a/frontend/src/metabase/lib/groups.ts b/frontend/src/metabase/lib/groups.tsindex 1e9432fc5f0..6ae57b8301c 100644--- a/frontend/src/metabase/lib/groups.ts+++ b/frontend/src/metabase/lib/groups.ts@@ -1,5 +1,6 @@import { t } from "ttag";+import type { SpecialGroupType } from "metabase/admin/permissions/types";import { color } from "metabase/lib/colors";import { PLUGIN_TENANTS } from "metabase/plugins";import type { GroupInfo } from "metabase-types/api";@@ -11,6 +12,8 @@ const SPECIAL_GROUP_NAMES = new Map([["Administrators", t`Administrators`],// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045["All tenant users", t`All tenant users`],+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045+ ["Data Analysts", t`Data Analysts`],]);export function isDefaultGroup(group: Pick<GroupInfo, "magic_group_type">) {@@ -21,6 +24,26 @@ export function isAdminGroup(group: Pick<GroupInfo, "magic_group_type">) {return group.magic_group_type === "admin";}+export function isDataAnalystGroup(group: Pick<GroupInfo, "magic_group_type">) {+ return group.magic_group_type === "data-analyst";+}++export function getSpecialGroupType(+ group: Pick<GroupInfo, "magic_group_type">,+ isExternal: boolean = false,+): SpecialGroupType {+ if (isAdminGroup(group)) {+ return "admin";+ }+ if (isDataAnalystGroup(group)) {+ return "analyst";+ }+ if (isExternal) {+ return "external";+ }+ return null;+}+export function canEditPermissions(group: Pick<GroupInfo, "magic_group_type">) {return !isAdminGroup(group);}@@ -42,3 +65,16 @@ export function getGroupColor(group: Pick<GroupInfo, "magic_group_type">) {export function getGroupNameLocalized(group: Pick<GroupInfo, "name">) {return SPECIAL_GROUP_NAMES.get(group.name) ?? group.name;}++export function getGroupSortOrder(group: Pick<GroupInfo, "magic_group_type">) {+ if (isAdminGroup(group)) {+ return 0;+ }+ if (isDefaultGroup(group)) {+ return 1;+ }+ if (isDataAnalystGroup(group)) {+ return 2;+ }+ return 3;+}diff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.tsindex 1019b9bebf2..d62be147ece 100644--- a/frontend/src/metabase/plugins/oss/permissions.ts+++ b/frontend/src/metabase/plugins/oss/permissions.ts@@ -6,6 +6,7 @@ import {type DatabaseEntityId,type EntityId,type PermissionSubject,+ type SpecialGroupType,} from "metabase/admin/permissions/types";import { getUserIsAdmin } from "metabase/selectors/user";import type Database from "metabase-lib/v1/metadata/Database";@@ -134,8 +135,7 @@ const getDefaultFeatureLevelPermissions = () => ({getFeatureLevelDataPermissions: (_entityId: DatabaseEntityId,_groupId: number,- _isAdmin: boolean,- _isExternal: boolean,+ _groupType: SpecialGroupType,_permissions: GroupsPermissions,_dataAccessPermissionValue: DataPermissionValue,_defaultGroup: Group,diff --git a/frontend/src/metabase/selectors/user.ts b/frontend/src/metabase/selectors/user.tsindex ea854311640..9c70d7bd3e9 100644--- a/frontend/src/metabase/selectors/user.ts+++ b/frontend/src/metabase/selectors/user.ts@@ -12,6 +12,11 @@ export const getUserIsAdmin = createSelector((user) => user?.is_superuser || false,);+export const getUserIsAnalyst = createSelector(+ [getUser],+ (user) => !!user?.is_data_analyst,+);+export const canManageSubscriptions = createSelector([getUserIsAdmin,diff --git a/resources/migrations/058_update_migrations.yaml b/resources/migrations/058_update_migrations.yamlindex 534aaf88920..cd3e32ae72f 100644--- a/resources/migrations/058_update_migrations.yaml+++ b/resources/migrations/058_update_migrations.yaml@@ -1285,6 +1285,52 @@ databaseChangeLog:constraints:nullable: true+ - changeSet:+ id: v58.2026-01-05T12:00:00+ author: metasasha+ comment: Add is_data_analyst column to core_user table for analyst role+ changes:+ - addColumn:+ tableName: core_user+ columns:+ - column:+ name: is_data_analyst+ type: ${boolean.type}+ defaultValueBoolean: false+ remarks: Indicates if the user has data analyst privileges for Data Studio+ constraints:+ nullable: false++ - changeSet:+ id: v58.2026-01-09T12:00:00+ author: johnswanson+ comment: Create data-analyst magic permissions group+ changes:+ - sql:+ sql: INSERT INTO permissions_group (name, magic_group_type) VALUES ('Data Analysts', 'data-analyst')+ rollback:+ - sql:+ sql: DELETE FROM permissions_group WHERE magic_group_type = 'data-analyst';++ - changeSet:+ id: v58.2026-01-09T12:00:01+ author: johnswanson+ comment: Grant read permissions on existing Library collections to Data Analysts group+ changes:+ - sql:+ sql: >-+ INSERT INTO permissions (group_id, object)+ SELECT pg.id, '/collection/' || c.id || '/'+ FROM permissions_group pg, collection c+ WHERE pg.magic_group_type = 'data-analyst'+ AND c.type IN ('library', 'library-data', 'library-metrics')+ rollback:+ - sql:+ # We can safely delete ALL permissions for this group because it will be deleted in the rollback above+ sql: >-+ DELETE FROM permissions+ WHERE group_id IN (SELECT id FROM permissions_group WHERE magic_group_type = 'data-analyst');+# >>>>>>>>>> DO NOT ADD NEW MIGRATIONS BELOW THIS LINE! ADD THEM ABOVE <<<<<<<<<<########################################################################################################################diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.cljindex cdd2685b9f9..a4741782927 100644--- a/src/metabase/api/common.clj+++ b/src/metabase/api/common.clj@@ -121,6 +121,11 @@"Is the current user a group manager of at least one group?"false)+;;; TODO -- move this to [[metabase.request.current]]+(def ^:dynamic ^Boolean *is-data-analyst?*+ "Is the current user a data analyst with access to Data Studio?"+ false)+;;; TODO -- move this to [[metabase.request.current]](def ^:dynamic *current-user-permissions-set*"Delay to the set of permissions granted to the current user. See documentation in [[metabase.permissions.models.permissions]] for@@ -187,6 +192,12 @@[](check-403 *is-superuser?*))+(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?*)))+;; checkp- functions: as in "check param". These functions expect that you pass a symbol so they can throw exceptions;; w/ relevant error messages.diff --git a/src/metabase/collections/models/collection.clj b/src/metabase/collections/models/collection.cljindex 942eaf0d479..d16386e600c 100644--- a/src/metabase/collections/models/collection.clj+++ b/src/metabase/collections/models/collection.clj@@ -201,7 +201,8 @@:location base-location})](doseq [col [library data metrics]](t2/delete! :model/Permissions :collection_id (:id col))- (perms/grant-collection-read-permissions! (perms/all-users-group) col))+ (perms/grant-collection-read-permissions! (perms/all-users-group) col)+ (perms/grant-collection-readwrite-permissions! (perms/data-analyst-group) col))library))(methodical/defmethod t2/table-name :model/Collection [_model] :collection)diff --git a/src/metabase/comments/api.clj b/src/metabase/comments/api.cljindex c109904ad5a..fcc7ce4e404 100644--- a/src/metabase/comments/api.clj+++ b/src/metabase/comments/api.clj@@ -291,8 +291,8 @@;; no access in embedding context(api/check-404 (not (analytics/embedding-context? (get-in req [:headers "x-metabase-client"]))))- (let [clauses (user/filter-clauses nil nil nil nil {:limit (request/limit)- :offset (request/offset)})]+ (let [clauses (user/filter-clauses {:limit (request/limit)+ :offset (request/offset)})];; returns nothing while we're trying to figure out how do we deal with sandboxes and tenants etc;; do not forget to uncomment tests (both api and e2e){:data (->> (t2/select [:model/User :id :first_name :last_name :email]diff --git a/src/metabase/core/core.clj b/src/metabase/core/core.cljindex 197a13b54bc..0e41797ab4b 100644--- a/src/metabase/core/core.clj+++ b/src/metabase/core/core.clj@@ -20,6 +20,7 @@[metabase.initialization-status.core :as init-status][metabase.logger.core :as logger][metabase.notification.core :as notification]+ [metabase.permissions.core :as perms][metabase.plugins.core :as plugins][metabase.premium-features.core :refer [defenterprise]][metabase.sample-data.core :as sample-data]@@ -173,6 +174,8 @@;; and the test suite can take 2x longer. this is really unfortunate because it could lead to some false;; negatives, but for now there's not much we can do(mdb/setup-db! :create-sample-content? (not config/is-test?))+ ;; In OSS, convert any Data Analysts group with members to a normal visible group+ (perms/sync-data-analyst-group-for-oss!);; Disable read-only mode if its on during startup.;; This can happen if a cloud migration process dies during h2 dump.(when (cloud-migration/read-only-mode)diff --git a/src/metabase/permissions/core.clj b/src/metabase/permissions/core.cljindex 5b04bd36190..590b508baa7 100644--- a/src/metabase/permissions/core.clj+++ b/src/metabase/permissions/core.clj@@ -86,7 +86,8 @@set-has-full-permissions?][metabase.permissions.models.permissions-groupnon-magic-groups- all-users-magic-group-type]+ all-users-magic-group-type+ sync-data-analyst-group-for-oss!][metabase.permissions.models.permissions-group-membershipadd-users-to-groups!add-user-to-groups!@@ -135,6 +136,7 @@;;; import these vars with different names to make their purpose more obvious.(p/import-def metabase.permissions.models.permissions-group/all-users all-users-group)(p/import-def metabase.permissions.models.permissions-group/admin admin-group)+(p/import-def metabase.permissions.models.permissions-group/data-analyst data-analyst-group)(p/import-def metabase.permissions.models.application-permissions-revision/latest-id latest-application-permissions-revision-id)(p/import-def metabase.permissions.models.collection-permission-graph-revision/latest-id latest-collection-permissions-revision-id)(p/import-def metabase.permissions.models.permissions-revision/latest-id latest-permissions-revision-id)diff --git a/src/metabase/permissions/models/collection/graph.clj b/src/metabase/permissions/models/collection/graph.cljindex d5731acf393..e1bedff68f1 100644--- a/src/metabase/permissions/models/collection/graph.clj+++ b/src/metabase/permissions/models/collection/graph.clj@@ -3,6 +3,7 @@for more details and for the code for generating and updating the *data* permissions graph."(:require[clojure.data :as data]+ [clojure.set :as set][metabase.api.common :as api][metabase.audit-app.core :as audit][metabase.permissions.models.collection-permission-graph-revision :as c-perm-revision]@@ -268,6 +269,22 @@(cond-> graph(seq other-ns-ids) (update :groups update-vals #(apply dissoc % other-ns-ids)))))+(defn- check-data-analyst-library-permissions+ "Check that we're not modifying library collection permissions for the Data Analysts group.+ Data Analysts always have full read-write access to library collections."+ [changes]+ (let [data-analyst-group-id (u/the-id (perms-group/data-analyst))+ library-collection-ids (t2/select-pks-set :model/Collection+ :type [:in ["library" "library-data" "library-metrics"]])]+ (when-let [group-changes (get changes data-analyst-group-id)]+ (let [changed-collection-ids (set (keys group-changes))+ library-changes (set/intersection changed-collection-ids library-collection-ids)]+ (when (seq library-changes)+ (throw (ex-info (str "You cannot modify library collection permissions for the '"+ (:name (perms-group/data-analyst))+ "' group.")+ {:status-code 400})))))))+(mu/defn update-graph!"Update the Collections permissions graph for Collections of `collection-namespace` (default `nil`, the 'default'namespace). This works just like [[metabase.models.permission/update-data-perms-graph!]], but for Collections;@@ -313,6 +330,8 @@[diff-old changes] (data/diff (:groups old-graph) (->> (:groups filtered-new-graph)(filter (comp seq second))(into {})))]++ (check-data-analyst-library-permissions changes)(when-not force? (perms.u/check-revision-numbers old-graph filtered-new-graph))(when (seq changes)(let [revision-id (t2/with-transaction [_conn]diff --git a/src/metabase/permissions/models/data_permissions.clj b/src/metabase/permissions/models/data_permissions.cljindex 69c76e510bf..2384c1e71f6 100644--- a/src/metabase/permissions/models/data_permissions.clj+++ b/src/metabase/permissions/models/data_permissions.clj@@ -234,6 +234,12 @@api/*is-superuser?*(t2/select-one-fn :is_superuser :model/User :id user-id)))+(defn- is-data-analyst?+ [user-id]+ (if (= user-id api/*current-user-id*)+ api/*is-data-analyst?*+ (t2/select-one-fn :is_data_analyst :model/User :id user-id)))+(mu/defn database-permission-for-user :- ::permissions.schema/data-permission-value"Returns the effective permission value for a given user, permission type, and database ID. If the user hasmultiple permissions for the given type in different groups, they are coalesced into a single value."@@ -315,8 +321,15 @@(when (not= :model/Table (model-by-perm-type perm-type))(throw (ex-info (tru "Permission type {0} is a database-level permission." perm-type){perm-type (permissions.schema/data-permissions perm-type)})))- (if (is-superuser? user-id)+ (cond+ (is-superuser? user-id)+ (most-permissive-value perm-type)++ (and (= perm-type :perms/manage-table-metadata)+ (is-data-analyst? user-id))(most-permissive-value perm-type)++ :else(let [perm-values (into #{}(comp (filter #(or (= (:table_id %) table-id)(nil? (:table_id %))))@@ -357,8 +370,15 @@(when (not= :model/Table (model-by-perm-type perm-type))(throw (ex-info (tru "Permission type {0} is not a table-level permission." perm-type){perm-type (permissions.schema/data-permissions perm-type)})))- (if (is-superuser? user-id)+ (cond+ (is-superuser? user-id)(most-permissive-value perm-type)++ (and (= perm-type :perms/manage-table-metadata)+ (is-data-analyst? user-id))+ (most-permissive-value perm-type)++ :else;; The schema-level permission is the most-restrictive table-level permission within a schema. So for each group,;; select the most-restrictive table-level permission. Then use normal coalesce logic to select the *least*;; restrictive group permission.@@ -381,8 +401,15 @@(when (not= :model/Table (model-by-perm-type perm-type))(throw (ex-info (tru "Permission type {0} is not a table-level permission." perm-type){perm-type (permissions.schema/data-permissions perm-type)})))- (if (is-superuser? user-id)+ (cond+ (is-superuser? user-id)+ (most-permissive-value perm-type)++ (and (= perm-type :perms/manage-table-metadata)+ (is-data-analyst? user-id))(most-permissive-value perm-type)++ :else;; The DB-level permission is the most-restrictive table-level permission within a DB. So for each group, select the;; most-restrictive table-level permission. Then use normal coalesce logic to select the *least* restrictive group;; permission.@@ -406,8 +433,15 @@(when (not= :model/Table (model-by-perm-type perm-type))(throw (ex-info (tru "Permission type {0} is not a table-level permission." perm-type){perm-type (permissions.schema/data-permissions perm-type)})))- (if (is-superuser? user-id)+ (cond+ (is-superuser? user-id)+ (most-permissive-value perm-type)++ (and (= perm-type :perms/manage-table-metadata)+ (is-data-analyst? user-id))(most-permissive-value perm-type)++ :else;; The schema-level permission is the most-restrictive table-level permission within a schema. So for each group,;; select the most-restrictive table-level permission. Then use normal coalesce logic to select the *least*;; restrictive group permission.@@ -434,8 +468,15 @@(when (not= :model/Table (model-by-perm-type perm-type))(throw (ex-info (tru "Permission type {0} is not a table-level permission." perm-type){perm-type (permissions.schema/data-permissions perm-type)})))- (if (is-superuser? user-id)+ (cond+ (is-superuser? user-id)(most-permissive-value perm-type)++ (and (= perm-type :perms/manage-table-metadata)+ (is-data-analyst? user-id))+ (most-permissive-value perm-type)++ :else(let [perm-values (->> (get-permissions user-id perm-type database-id)(map :perm_value)(into #{}))]@@ -468,6 +509,8 @@group, for at least one database or table."[user-id perm-type](or (is-superuser? user-id)+ (and (= perm-type :perms/manage-table-metadata)+ (is-data-analyst? user-id))(let [value (most-permissive-value perm-type)](t2/exists? :model/DataPermissions{:select [[:p.perm_value :value]]diff --git a/src/metabase/permissions/models/data_permissions/sql.clj b/src/metabase/permissions/models/data_permissions/sql.cljindex 7e1ca89650b..da424ffdf12 100644--- a/src/metabase/permissions/models/data_permissions/sql.clj+++ b/src/metabase/permissions/models/data_permissions/sql.clj@@ -106,8 +106,9 @@(def UserInfo"The user-id to use in the visibility query and their superuser status."[:map- [:user-id pos-int?]- [:is-superuser? :boolean]])+ [:user-id pos-int?]+ [:is-superuser? :boolean]+ [:is-data-analyst? {:optional true} :boolean]])(def PermissionMapping"Map of permission-type to either a permission value or tuple of (permission-value, :most/:least) indicating if we want to get the@@ -120,14 +121,16 @@(mu/defn visible-table-filter-select"Selects a column from tables that are visible to the provided user given a mapping of permission types to the required value or the requiredvalue and a directive if we should test against the most or least permissive permission the user has."- [select-column :- [:enum :id :db_id]- {:keys [user-id is-superuser?]} :- UserInfo- permission-mapping :- PermissionMapping]+ [select-column :- [:enum :id :db_id]+ {:keys [user-id is-superuser? is-data-analyst?]} :- UserInfo+ permission-mapping :- PermissionMapping]{:select [(case select-column:id :mt.id:db_id :mt.db_id)]:from [[:metabase_table :mt]]- :where (if is-superuser?+ :where (if (or is-superuser?+ (and is-data-analyst?+ (contains? permission-mapping :perms/manage-table-metadata)))[:= [:inline 1] [:inline 1]](into [:and](mapcat (fn [[perm-type perm-level]]@@ -176,10 +179,13 @@Uses UNION ALL to separate table-level and database-level permission lookups, avoidinginefficient BitmapOr scans that occur with OR joins."- [column-or-exp :- :any- {:keys [user-id is-superuser?]} :- UserInfo- permission-mapping :- PermissionMapping]- (if is-superuser?+ [column-or-exp :- :any+ {:keys [user-id is-superuser? is-data-analyst?]} :- UserInfo+ permission-mapping :- PermissionMapping]+ ;; Superusers see all tables. Data analysts see all tables when checking manage-table-metadata.+ (if (or is-superuser?+ (and is-data-analyst?+ (contains? permission-mapping :perms/manage-table-metadata))){:clause [:= [:inline 1] [:inline 1]]}(let [perm-types (keys permission-mapping)perm-type-filter (into [:or]@@ -270,11 +276,14 @@(mu/defn visible-database-filter-select"Selects database IDs that are visible to the provided user given a mapping of permission types to the required value.Similar to visible-table-filter-select but for databases."- [{:keys [user-id is-superuser?]} :- UserInfo+ [{:keys [user-id is-superuser? is-data-analyst?]} :- UserInfopermission-mapping :- PermissionMapping]{:select [:md.id]:from [[:metabase_database :md]]- :where (if is-superuser?+ ;; Superusers see all databases. Data analysts see all databases when checking manage-table-metadata.+ :where (if (or is-superuser?+ (and is-data-analyst?+ (contains? permission-mapping :perms/manage-table-metadata)))[:= [:inline 1] [:inline 1]](into [:and](mapcat (fn [[perm-type perm-level]]diff --git a/src/metabase/permissions/models/permissions_group.clj b/src/metabase/permissions/models/permissions_group.cljindex bb103363fd1..8e8f9a57218 100644--- a/src/metabase/permissions/models/permissions_group.clj+++ b/src/metabase/permissions/models/permissions_group.clj@@ -16,6 +16,7 @@[metabase.settings.core :as setting][metabase.util :as u][metabase.util.i18n :refer [tru]]+ [metabase.util.log :as log][methodical.core :as methodical][toucan2.core :as t2][toucan2.tools.hydrate :as t2.hydrate]))@@ -71,6 +72,14 @@"Fetch the `Administrators` permissions group"(magic-group admin-magic-group-type))+(def data-analyst-magic-group-type+ "The magic-group type of the \"Data Analysts\" magic group."+ "data-analyst")++(def ^{:arglists '([])} data-analyst+ "Fetch the `Data Analysts` permissions group"+ (magic-group data-analyst-magic-group-type))+;;; --------------------------------------------------- Validation ---------------------------------------------------(defn exists-with-name?@@ -85,16 +94,22 @@(when (exists-with-name? group-name)(throw (ex-info (tru "A group with that name already exists.") {:status-code 400}))))+(def ^:dynamic ^:private *allow-modifying-magic-groups*+ "Dynamic var that, when bound to true, allows modifying magic groups. Used by [[sync-data-analyst-group-for-oss!]]."+ false)+(defn- check-not-magic-group"Make sure we're not trying to edit/delete one of the magic groups, or throw an exception."[{id :id}]{:pre [(integer? id)]}- (doseq [magic-group [(all-users)- (all-external-users)- (admin)]]- (when (= id (:id magic-group))- (throw (ex-info (tru "You cannot edit or delete the ''{0}'' permissions group!" (:name magic-group))- {:status-code 400})))))+ (when-not *allow-modifying-magic-groups*+ (doseq [magic-group [(all-users)+ (all-external-users)+ (admin)+ (data-analyst)]]+ (when (= id (:id magic-group))+ (throw (ex-info (tru "You cannot edit or delete the ''{0}'' permissions group!" (:name magic-group))+ {:status-code 400}))))));;; --------------------------------------------------- Lifecycle ----------------------------------------------------@@ -199,3 +214,57 @@(let [group-id->num-members (group-id->num-members)](for [group groups](assoc group :member_count (get group-id->num-members (u/the-id group) 0)))))++;;; ------------------------------------------ OSS Data Analyst Group Handling ------------------------------------------++(defn- unique-converted-group-name+ "Generate a unique name for the converted Data Analysts group.+ Returns \"Data Analysts (converted)\", or \"Data Analysts (converted) (2)\", etc."+ []+ (let [existing-names (t2/select-fn-set :name :model/PermissionsGroup+ :name [:like "Data Analysts (converted)%"])+ base-name "Data Analysts (converted)"]+ (if-not (contains? existing-names base-name)+ base-name+ (loop [n 2]+ (let [candidate (str base-name " (" n ")")]+ (if-not (contains? existing-names candidate)+ candidate+ (recur (inc n))))))))++(defn- grant-library-permissions!+ "Grant write permissions on all library collections to a group."+ [group-id]+ (when-let [collection-ids (seq (t2/select-pks-set :model/Collection+ :type [:in ["library" "library-data" "library-metrics"]]))]+ (t2/insert! :model/Permissions+ (for [coll-id collection-ids]+ {:group_id group-id+ :object (str "/collection/" coll-id "/")}))))++(defn sync-data-analyst-group-for-oss!+ "On OSS startup, convert the Data Analysts group to a normal visible group and create a new empty magic group.++ In OSS, we don't want the Data Analysts group to be invisible while still granting permissions - that's a hidden+ backdoor. Instead, we convert any existing Data Analysts group (with members) to a normal group with a unique name+ like 'Data Analysts (converted)' that admins can see and manage. We then create a fresh empty Data Analysts magic+ group.++ This is idempotent: if the magic group has no members, nothing happens."+ []+ (when-not (premium-features/enable-data-studio?)+ (when-let [existing-group (t2/select-one :model/PermissionsGroup :magic_group_type data-analyst-magic-group-type)]+ (when (pos? (t2/count :model/PermissionsGroupMembership :group_id (:id existing-group)))+ (log/info "Converting Data Analysts group to normal group for OSS")+ (binding [*allow-modifying-magic-groups* true]+ (t2/with-transaction [_conn]+ ;; Rename and demote the existing group to a normal visible group+ (t2/update! :model/PermissionsGroup (:id existing-group)+ {:name (unique-converted-group-name)+ :magic_group_type nil})+ ;; Create new empty magic group with default library permissions+ (let [{new-group-id :id} (t2/insert-returning-instance! :model/PermissionsGroup+ {:name "Data Analysts"+ :magic_group_type data-analyst-magic-group-type})]+ (grant-library-permissions! new-group-id))+ (t2/update! :model/User {:is_data_analyst true} {:is_data_analyst false})))))))diff --git a/src/metabase/permissions/models/permissions_group_membership.clj b/src/metabase/permissions/models/permissions_group_membership.cljindex 7a24d8b4865..33466b0d238 100644--- a/src/metabase/permissions/models/permissions_group_membership.clj+++ b/src/metabase/permissions/models/permissions_group_membership.clj@@ -85,13 +85,16 @@[{:keys [group_id user_id]}](check-not-all-users-group group_id)(check-not-all-external-users-group group_id)- ;; Otherwise if this is the Admin group...+ ;; If this is the Admin group...(when (= group_id (:id (perms-group/admin)));; ...and this is the last membership, throw an exception(throw-if-last-admin!);; ...otherwise we're ok. Unset the `:is_superuser` flag for the user whose membership was revoked(when *update-user-when-added-to-admin-group?*- (t2/update! 'User user_id {:is_superuser false}))))+ (t2/update! 'User user_id {:is_superuser false})))+ ;; If this is the Data Analysts group, unset the `:is_data_analyst` flag+ (when (= group_id (:id (perms-group/data-analyst)))+ (t2/update! 'User user_id {:is_data_analyst false})))(defmacro without-is-superuser-sync-on-add-to-admin-group"When inserting a superuser, we don't want the group membership insert to trigger a recursive update on the@@ -198,6 +201,12 @@(when (= group-id (:id (perms-group/admin)))user-id))))+ new-data-analyst-ids (->> user-id-group-id->is-group-manager?+ keys+ (keep (fn [[user-id group-id]]+ (when (= group-id (:id (perms-group/data-analyst)))+ user-id))))+sql (add-users-to-groups-sql user-id-group-id->is-group-manager?)](t2/with-transaction [_conn](when (< (t2/query-one sql)@@ -208,6 +217,8 @@(throw (ex-info (tru "Error inserting Permissions Group Membership") {})))(when (seq new-admin-ids)(t2/update! :model/User :id [:in new-admin-ids] {:is_superuser true}))+ (when (seq new-data-analyst-ids)+ (t2/update! :model/User :id [:in new-data-analyst-ids] {:is_data_analyst true}));; Publish events for each new membership(doseq [[[user-id group-id] is-group-manager?] user-id-group-id->is-group-manager?](events/publish-event! :event/group-membership-creatediff --git a/src/metabase/permissions_rest/api.clj b/src/metabase/permissions_rest/api.cljindex 0f74380b87c..23ec5853564 100644--- a/src/metabase/permissions_rest/api.clj+++ b/src/metabase/permissions_rest/api.clj@@ -188,7 +188,11 @@[:= :user_id api/*current-user-id*][:= :is_group_manager true]]}])(when-not (setting/get :use-tenants)- [:not :is_tenant_group])]+ [:not :is_tenant_group])+ (when-not (premium-features/enable-data-studio?)+ [:or+ [:= nil :magic_group_type]+ [:not= "data-analyst" :magic_group_type]])]where (case tenancy"external" (if (setting/get :use-tenants)[:and base-where [:= :is_tenant_group true]]@@ -296,7 +300,9 @@:from [:permissions_group_membership]:where [:and[:= :user_id api/*current-user-id*]- [:= :is_group_manager true]]}])))))+ [:= :is_group_manager true]]}])+ (not (premium-features/enable-data-studio?))+ (sql.helpers/where [:not= :group_id (u/the-id (perms/data-analyst-group))])))));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to;; use our API + we will need it when we make auto-TypeScript-signature generation happendiff --git a/src/metabase/permissions_rest/data_permissions/graph.clj b/src/metabase/permissions_rest/data_permissions/graph.cljindex fbd25ac8a22..24acbb23ee4 100644--- a/src/metabase/permissions_rest/data_permissions/graph.clj+++ b/src/metabase/permissions_rest/data_permissions/graph.clj@@ -121,6 +121,10 @@:data-model {:schemas :all}:details :yes})+(def ^:private data-analyst-perms+ "Data Analysts have implicit manage-table-metadata permission for all databases."+ {:data-model {:schemas :all}})+(defn- add-admin-perms-to-permissions-graph"These are not stored in the data-permissions table, but the API expects them to be there (for legacy reasons), so here we populate it.For every db in the incoming graph, adds on admin permissions."@@ -141,6 +145,27 @@db-ids)api-graph)))+(defn- add-data-analyst-perms-to-permissions-graph+ "Data Analysts have implicit manage-table-metadata permission for all databases.+ This is not stored in the data-permissions table, so we add it to the graph for the API."+ [api-graph {:keys [db-id group-ids group-id audit?]}]+ (let [data-analyst-group-id (u/the-id (perms/data-analyst-group))+ db-ids (if db-id [db-id] (t2/select-pks-vec :model/Database+ {:where [:and+ (when-not audit? [:not= :id audit/audit-db-id])]}))]+ ;; Don't add data analyst perms when we're fetching perms for a specific non-data-analyst group+ (if (or (= group-id data-analyst-group-id)+ (contains? (set group-ids) data-analyst-group-id)+ ;; If we're not filtering on specific group IDs, always include the data analyst group+ (and (nil? group-id)+ (nil? (seq group-ids))))+ (reduce (fn [api-graph db-id]+ (update-in api-graph [data-analyst-group-id db-id]+ #(merge % data-analyst-perms)))+ api-graph+ db-ids)+ api-graph)))+(defn- remove-empty-vals"Recursively walks a nested map from bottom-up, removing keys with nil or empty map values."[m]@@ -219,7 +244,8 @@remove-empty-vals(add-sandboxes-to-permissions-graph opts)(add-impersonations-to-permissions-graph opts)- (add-admin-perms-to-permissions-graph opts))})))+ (add-admin-perms-to-permissions-graph opts)+ (add-data-analyst-perms-to-permissions-graph opts))})));;; ---------------------------------------- Updating permissions -----------------------------------------------------@@ -395,6 +421,19 @@(throw (ee-permissions-exception :blocked)))(perms/set-database-permission! group-id db-id :perms/view-data :blocked)))))+(defn- check-data-analyst-locked-permissions+ "Check that we're not modifying data-model permission for the Data Analysts group.+ Data Analysts always have full data-model (manage-table-metadata) permissions."+ [group-updates]+ (let [data-analyst-group-id (u/the-id (perms/data-analyst-group))]+ (when-let [da-updates (get group-updates data-analyst-group-id)]+ (doseq [[_db-id db-changes] da-updates]+ (when (and (contains? db-changes :data-model)+ (not= (:data-model db-changes) (:data-model data-analyst-perms)))+ (throw (ex-info (tru "You cannot modify the data model permission for the ''{0}'' group."+ (:name (perms/data-analyst-group)))+ {:status-code 400})))))))+(defn check-audit-db-permissions"Check that the changes coming in does not attempt to change audit database permission. Admins shouldchange these permissions implicitly via collection permissions."@@ -435,6 +474,7 @@(when (seq graph-updates)(cluster-lock/with-cluster-lock ::update-data-perms-graph(let [group-updates (:groups graph-updates)]+ (check-data-analyst-locked-permissions group-updates)(check-audit-db-permissions group-updates)(t2/with-transaction [_conn](update-data-perms-graph!* group-updates)diff --git a/src/metabase/premium_features/core.clj b/src/metabase/premium_features/core.cljindex 6763d3b220b..9dda27515bc 100644--- a/src/metabase/premium_features/core.clj+++ b/src/metabase/premium_features/core.clj@@ -54,6 +54,7 @@enable-dashboard-subscription-filters?enable-database-auth-providers?enable-database-routing?+ enable-data-studio?enable-dependencies?enable-email-allow-list?enable-email-restrict-recipients?diff --git a/src/metabase/request/schema.clj b/src/metabase/request/schema.cljindex 271639faa29..c1111143964 100644--- a/src/metabase/request/schema.clj+++ b/src/metabase/request/schema.clj@@ -6,8 +6,9 @@;;; enumerated here?(mr/def ::current-user-info[:map- [:metabase-user-id {:optional true} pos-int?]- [:is-superuser? {:optional true} :boolean]- [:user-locale {:optional true} [:maybe string?]]- [:is-group-manager? {:optional true} :boolean]- [:permissions-set {:optional true} [:set :string]]])+ [:metabase-user-id {:optional true} pos-int?]+ [:is-superuser? {:optional true} :boolean]+ [:is-data-analyst? {:optional true} :boolean]+ [:user-locale {:optional true} [:maybe string?]]+ [:is-group-manager? {:optional true} :boolean]+ [:permissions-set {:optional true} [:set :string]]])diff --git a/src/metabase/request/session.clj b/src/metabase/request/session.cljindex a4c51222969..a315c3580f1 100644--- a/src/metabase/request/session.clj+++ b/src/metabase/request/session.clj@@ -2,7 +2,7 @@(:require[metabase.api.common:as api- :refer [*current-user* *current-user-id* *current-user-permissions-set* *is-group-manager?* *is-superuser?*]]+ :refer [*current-user* *current-user-id* *current-user-permissions-set* *is-group-manager?* *is-superuser?* *is-data-analyst?*]][metabase.permissions.core :as perms][metabase.request.schema :as request.schema][metabase.settings.core :as setting]@@ -37,12 +37,13 @@(mu/defn do-with-current-user"Impl for [[with-current-user]] and [[metabase.server.middleware.session/with-current-user-for-request]]"- [{:keys [metabase-user-id is-superuser? user-locale settings is-group-manager?], :as current-user-info} :- [:maybe ::request.schema/current-user-info]+ [{:keys [metabase-user-id is-superuser? is-data-analyst? user-locale settings is-group-manager?], :as current-user-info} :- [:maybe ::request.schema/current-user-info]thunk](binding [*current-user-id* metabase-user-idi18n/*user-locale* user-locale*is-group-manager?* (boolean is-group-manager?)*is-superuser?* (boolean is-superuser?)+ *is-data-analyst?* (boolean is-data-analyst?)*current-user* (delay (find-user metabase-user-id))*current-user-permissions-set* (delay (current-user-info->permissions-set current-user-info))];; As mentioned above, do not rebind user-local values to something new, because changes to its value will not be@@ -63,7 +64,12 @@"Part of the impl for `with-current-user` -- don't use this directly."[current-user-id](when current-user-id- (t2/select-one [:model/User [:id :metabase-user-id] [:is_superuser :is-superuser?] [:locale :user-locale] :settings]+ (t2/select-one [:model/User+ [:id :metabase-user-id]+ [:is_superuser :is-superuser?]+ [:is_data_analyst :is-data-analyst?]+ [:locale :user-locale]+ :settings]:id current-user-id)))(defn do-as-admindiff --git a/src/metabase/search/config.clj b/src/metabase/search/config.cljindex be410628466..9ee4192621c 100644--- a/src/metabase/search/config.clj+++ b/src/metabase/search/config.clj@@ -241,6 +241,7 @@[:archived? [:maybe :boolean]][:current-user-id pos-int?][:is-superuser? :boolean]+ [:is-data-analyst? :boolean];; TODO only optional and maybe for tests, clean that up![:context {:optional true} [:maybe :keyword]][:is-impersonated-user? {:optional true} [:maybe :boolean]]diff --git a/src/metabase/search/impl.clj b/src/metabase/search/impl.cljindex f10546171c1..926df26a7d7 100644--- a/src/metabase/search/impl.clj+++ b/src/metabase/search/impl.clj@@ -254,6 +254,7 @@[:is-impersonated-user? {:optional true} :boolean][:is-sandboxed-user? {:optional true} :boolean][:is-superuser? :boolean]+ [:is-data-analyst? {:optional true} :boolean][:current-user-perms [:set perms/PathSchema]][:archived {:optional true} [:maybe :boolean]][:created-at {:optional true} [:maybe ms/NonBlankString]]@@ -296,6 +297,7 @@include-dashboard-questions?include-metadata?is-superuser?+ is-data-analyst?last-edited-atlast-edited-bylimit@@ -329,6 +331,7 @@:is-impersonated-user? is-impersonated-user?:is-sandboxed-user? is-sandboxed-user?:is-superuser? is-superuser?+ :is-data-analyst? (boolean is-data-analyst?):models models:model-ancestors? (boolean model-ancestors?):search-engine enginediff --git a/src/metabase/search/permissions.clj b/src/metabase/search/permissions.cljindex 0164ec42ee0..959bcad3091 100644--- a/src/metabase/search/permissions.clj+++ b/src/metabase/search/permissions.clj@@ -49,11 +49,12 @@(mu/defn permitted-tables-clause"Build the WHERE clause and optional CTEs for table permission filtering.Returns a map with :clause (WHERE clause fragment) and :with (optional CTE definitions)."- [{:keys [current-user-id is-superuser?]} :- SearchContext table-id-col :- [:or :keyword [:vector :keyword]]]+ [{:keys [current-user-id is-superuser? is-data-analyst?]} :- SearchContext table-id-col :- [:or :keyword [:vector :keyword]]](mi/visible-filter-clause:model/Tabletable-id-col{:user-id current-user-id- :is-superuser? is-superuser?}+ :is-superuser? is-superuser?+ :is-data-analyst? is-data-analyst?}{:perms/view-data :unrestricted:perms/create-queries :query-builder}))diff --git a/src/metabase/server/middleware/session.clj b/src/metabase/server/middleware/session.cljindex 20f19907851..9bcb15aaa89 100644--- a/src/metabase/server/middleware/session.clj+++ b/src/metabase/server/middleware/session.clj@@ -102,6 +102,7 @@(t2.pipeline/compile*(cond-> {:select [[:session.user_id :metabase-user-id][:user.is_superuser :is-superuser?]+ [:user.is_data_analyst :is-data-analyst?][:user.locale :user-locale]]:from [[:core_session :session]]:left-join [[:core_user :user] [:= :session.user_id :user.id]@@ -147,6 +148,7 @@(cond-> {:select [[:api_key.user_id :metabase-user-id][:api_key.key :api-key][:user.is_superuser :is-superuser?]+ [:user.is_data_analyst :is-data-analyst?][:user.locale :user-locale]]:from :api_key:left-join [[:core_user :user] [:= :api_key.user_id :user.id]]diff --git a/src/metabase/users/models/user.clj b/src/metabase/users/models/user.cljindex 17cd8bffc29..ef1bfd21ffb 100644--- a/src/metabase/users/models/user.clj+++ b/src/metabase/users/models/user.clj@@ -72,10 +72,11 @@#{:internal :personal :api-key})(def ^:private insert-default-values- {:date_joined :%now- :last_login nil- :is_active true- :is_superuser false})+ {:date_joined :%now+ :last_login nil+ :is_active true+ :is_superuser false+ :is_data_analyst false})(defn user-local-settings"Returns the user's settings (defaulting to an empty map) or `nil` if the user/user-id isn't set"@@ -346,7 +347,7 @@(def ^:private default-user-columns"Sequence of columns that are normally returned when fetching a User from the DB."- [:id :email :date_joined :first_name :last_name :last_login :is_superuser :is_qbnewb :tenant_id])+ [:id :email :date_joined :first_name :last_name :last_login :is_superuser :is_data_analyst :is_qbnewb :tenant_id])(def admin-or-self-visible-columns"Sequence of columns that we can/should return for admins fetching a list of all Users, or for the current user@@ -545,22 +546,52 @@[:like :%lower.email (wildcard-query query)]])(defn filter-clauses- "Honeysql clauses for filtering on users- - with a status,- - with a query,- - with a group_id,- - with include_deactivated"- [status query group_ids include_deactivated & [{:keys [limit offset]}]]+ "Honeysql clauses for filtering on users.++ Options:+ :status - filter by status (\"active\", \"deactivated\", \"all\")+ :query - text search on first_name, last_name, email+ :group-ids - filter by permissions group membership+ :include-deactivated - legacy alias for status=all+ :is-data-analyst? - filter by data analyst status (true/false)+ :can-access-data-studio? - filter by Data Studio access (analysts, superusers, or users with table metadata perms)+ :limit - pagination limit+ :offset - pagination offset"+ [{:keys [status query group-ids include-deactivated is-data-analyst? can-access-data-studio? limit offset]}](cond-> {}true (sql.helpers/where [:= :core_user.type "personal"])- true (sql.helpers/where (status-clause status include_deactivated))+ true (sql.helpers/where (status-clause status include-deactivated));; don't send the internal user(perms/sandboxed-or-impersonated-user?) (sql.helpers/where [:= :core_user.id api/*current-user-id*])(some? query) (sql.helpers/where (query-clause query))- (some? group_ids) (sql.helpers/right-join+ (some? is-data-analyst?) (sql.helpers/where (if is-data-analyst?+ :core_user.is_data_analyst+ [:not :core_user.is_data_analyst]))+ (some? can-access-data-studio?) (sql.helpers/where (if can-access-data-studio?+ [:or+ :core_user.is_data_analyst+ :core_user.is_superuser+ [:in :core_user.id+ {:select-distinct [:pgm.user_id]+ :from [[:permissions_group_membership :pgm]]+ :join [[:data_permissions :p] [:= :p.group_id :pgm.group_id]]+ :where [:and+ [:= :p.perm_type "perms/manage-table-metadata"]+ [:= :p.perm_value "yes"]]}]]+ [:and+ [:not :core_user.is_data_analyst]+ [:not :core_user.is_superuser]+ [:not-in :core_user.id+ {:select-distinct [:pgm.user_id]+ :from [[:permissions_group_membership :pgm]]+ :join [[:data_permissions :p] [:= :p.group_id :pgm.group_id]]+ :where [:and+ [:= :p.perm_type "perms/manage-table-metadata"]+ [:= :p.perm_value "yes"]]}]]))+ (some? group-ids) (sql.helpers/right-join:permissions_group_membership[:= :core_user.id :permissions_group_membership.user_id])- (some? group_ids) (sql.helpers/where- [:in :permissions_group_membership.group_id group_ids])+ (some? group-ids) (sql.helpers/where+ [:in :permissions_group_membership.group_id group-ids])(some? limit) (sql.helpers/limit limit)(some? offset) (sql.helpers/offset offset)))diff --git a/src/metabase/users_rest/api.clj b/src/metabase/users_rest/api.cljindex 9e0d713af95..107437bddb1 100644--- a/src/metabase/users_rest/api.clj+++ b/src/metabase/users_rest/api.clj@@ -212,26 +212,31 @@Also takes `group_id`, which filters on group id."[_route-params- {:keys [status query group_id include_deactivated tenant_id tenancy] :as params}+ {:keys [status query group_id include_deactivated tenant_id tenancy is_data_analyst can_access_data_studio] :as params}:- [:map- [:status {:optional true} [:maybe :string]]- [:query {:optional true} [:maybe :string]]- [:group_id {:optional true} [:maybe ms/PositiveInt]]- [:include_deactivated {:default false} [:maybe ms/BooleanValue]]- [:tenancy {:optional true} [:maybe- [:enum :all :internal :external]]]- [:tenant_id {:optional true} [:maybe ms/PositiveInt]]]]+ [:status {:optional true} [:maybe :string]]+ [:query {:optional true} [:maybe :string]]+ [:group_id {:optional true} [:maybe ms/PositiveInt]]+ [:include_deactivated {:default false} [:maybe ms/BooleanValue]]+ [:is_data_analyst {:optional true} [:maybe ms/BooleanValue]]+ [:can_access_data_studio {:optional true} [:maybe ms/BooleanValue]]+ [:tenancy {:optional true} [:maybe+ [:enum :all :internal :external]]]+ [:tenant_id {:optional true} [:maybe ms/PositiveInt]]]](or api/*is-superuser?*(if group_id(perms/check-manager-of-group group_id)(perms/check-group-manager)))(api/check-400 (not (every? #(contains? params %) [:tenant_id :tenancy]))(tru "You cannot specify both `tenancy` and `tenant_id`"))- (let [include_deactivated include_deactivated- group-id-clause (when group_id [group_id])- clauses (let [clauses (user/filter-clauses status query group-id-clause include_deactivated- {:limit (request/limit)- :offset (request/offset)})]+ (let [clauses (let [clauses (user/filter-clauses {:status status+ :query query+ :group-ids (when group_id [group_id])+ :include-deactivated include_deactivated+ :is-data-analyst? is_data_analyst+ :can-access-data-studio? can_access_data_studio+ :limit (request/limit)+ :offset (request/offset)})](cond(not api/*is-superuser?*) (sql.helpers/where clauses [:= :tenant_id (:tenant_id @api/*current-user*)])(contains? params :tenant_id) (sql.helpers/where clauses [:= :tenant_id tenant_id])@@ -289,7 +294,7 @@- If user-visibility is :none or the user is sandboxed, include only themselves."[];; defining these functions so the branching logic below can be as clear as possible- (letfn [(all [] (let [clauses (cond-> (user/filter-clauses nil nil nil nil)+ (letfn [(all [] (let [clauses (cond-> (user/filter-clauses {})(not api/*is-superuser?*) (sql.helpers/where[:= :tenant_id (:tenant_id @api/*current-user*)])true (sql.helpers/order-by [:%lower.last_name :asc] [:%lower.first_name :asc]))]@@ -298,7 +303,7 @@:limit (request/limit):offset (request/offset)}))(within-group [] (let [user-ids (same-groups-user-ids api/*current-user-id*)- clauses (cond-> (user/filter-clauses nil nil nil nil)+ clauses (cond-> (user/filter-clauses {})(not api/*is-superuser?*) (sql.helpers/where [:= :tenant_id (:tenant_id @api/*current-user*)])(seq user-ids) (sql.helpers/where [:in :core_user.id user-ids])true (sql.helpers/order-by [:%lower.last_name :asc] [:%lower.first_name :asc]))]@@ -541,13 +546,14 @@[{:keys [id]} :- [:map[:id ms/PositiveInt]]_query-params- {:keys [email first_name last_name user_group_memberships is_superuser] :as body}+ {:keys [email first_name last_name user_group_memberships is_superuser is_data_analyst] :as body}:- [:map[:email {:optional true} [:maybe ms/Email]][:first_name {:optional true} [:maybe ms/NonBlankString]][:last_name {:optional true} [:maybe ms/NonBlankString]][:user_group_memberships {:optional true} [:maybe [:sequential ::user-group-membership]]][:is_superuser {:optional true} [:maybe :boolean]]+ [:is_data_analyst {:optional true} [:maybe :boolean]][:is_group_manager {:optional true} [:maybe :boolean]][:login_attributes {:optional true} [:maybe users.schema/LoginAttributes]][:locale {:optional true} [:maybe ms/ValidLocale]]@@ -592,7 +598,13 @@(events/publish-event! :event/user-update {:object (t2/select-one :model/User :id id):previous-object user-before-update:user-id api/*current-user-id*}))- (maybe-update-user-personal-collection-name! user-before-update body))+ (maybe-update-user-personal-collection-name! user-before-update body)+ ;; Handle is_data_analyst by updating Data Analysts group membership+ (when (and api/*is-superuser?* (contains? body :is_data_analyst))+ (let [data-analyst-group-id (:id (perms/data-analyst-group))]+ (if is_data_analyst+ (perms/add-user-to-group! id data-analyst-group-id)+ (perms/remove-user-from-group! id data-analyst-group-id)))))(maybe-set-user-group-memberships! id user_group_memberships is_superuser)))(-> (fetch-user :id id)(t2/hydrate :user_group_memberships)))diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.cljindex 1ba5aa05921..c4c490d7e42 100644--- a/src/metabase/warehouses_rest/api.clj+++ b/src/metabase/warehouses_rest/api.clj@@ -274,7 +274,9 @@filter-by-data-access? (not (or include-editable-data-model?exclude-uneditable-details?filter-on-router-database-id))- user-info {:user-id api/*current-user-id* :is-superuser? (mi/superuser?)}+ user-info {:user-id api/*current-user-id*+ :is-superuser? (mi/superuser?)+ :is-data-analyst? api/*is-data-analyst?*}base-where [:and(when-not include-analytics?[:= :is_audit false])diff --git a/test/metabase/actions_rest/api_test.clj b/test/metabase/actions_rest/api_test.cljindex 6ff324bdc11..f31c6dca548 100644--- a/test/metabase/actions_rest/api_test.clj+++ b/test/metabase/actions_rest/api_test.clj@@ -35,7 +35,8 @@[:date_joined :any][:is_qbnewb :boolean][:is_superuser :boolean]- [:tenant_id [:maybe ms/PositiveInt]]])+ [:tenant_id [:maybe ms/PositiveInt]]+ [:is_data_analyst :boolean]])(def ^:private ExpectedGetQueryActionAPIResponse"Expected schema for a query action as it should appear in the response for an API request to one of the GET endpoints."diff --git a/test/metabase/app_db/setup_test.clj b/test/metabase/app_db/setup_test.cljindex 7d0de30f2d0..250794b80c2 100644--- a/test/metabase/app_db/setup_test.clj+++ b/test/metabase/app_db/setup_test.clj@@ -32,7 +32,7 @@(letfn [(test* [data-source](is (= :done(mdb.setup/setup-db! :h2 data-source true true)))- (is (= ["Administrators" "All Users" "All tenant users"]+ (is (= ["Administrators" "All Users" "All tenant users" "Data Analysts"](mapv :name (jdbc/query {:datasource data-source}"SELECT name FROM permissions_group ORDER BY name ASC;")))))](let [subname (fn [] (format "mem:%s;DB_CLOSE_DELAY=10" (mt/random-name)))]diff --git a/test/metabase/permissions_rest/api_test.clj b/test/metabase/permissions_rest/api_test.cljindex 92a76b3cd48..9daf2539841 100644--- a/test/metabase/permissions_rest/api_test.clj+++ b/test/metabase/permissions_rest/api_test.clj@@ -64,6 +64,14 @@(is (= "You don't have permissions to do that."(mt/user-http-request :rasta :get 403 "permissions/group"))))))+(deftest no-data-analyst-groups-test+ (testing "GET /api/permissions/group"+ (testing "in OSS, the data analyst group is hidden"+ ;; note that this uses `config/ee-available?` instead of a feature to avoid hiding a group that may stil provide permissions!+ (when-not config/ee-available?+ (is (not (contains? (set (map :name (mt/user-http-request :crowberto :get 200 "permissions/group")))+ "Data Analysts")))))))+(deftest groups-list-limit-test(testing "GET /api/permissions/group?limit=1&offset=1"(testing "Limit and offset pagination have defaults"diff --git a/test/metabase/pulse/api/pulse_test.clj b/test/metabase/pulse/api/pulse_test.cljindex aea0456403f..fccddfdff63 100644--- a/test/metabase/pulse/api/pulse_test.clj+++ b/test/metabase/pulse/api/pulse_test.clj@@ -33,7 +33,7 @@(defn- user-details [user](select-keysuser- [:email :first_name :last_login :is_qbnewb :is_superuser :id :last_name :date_joined :common_name :locale :tenant_id]))+ [:email :first_name :last_login :is_qbnewb :is_superuser :id :last_name :date_joined :common_name :locale :tenant_id :is_data_analyst]))(defn- pulse-card-details [card](-> (select-keys card [:id :collection_id :name :description :display])diff --git a/test/metabase/pulse/models/pulse_channel_test.clj b/test/metabase/pulse/models/pulse_channel_test.cljindex b16b687f44f..bb49107263e 100644--- a/test/metabase/pulse/models/pulse_channel_test.clj+++ b/test/metabase/pulse/models/pulse_channel_test.clj@@ -126,7 +126,7 @@(defn user-details[username](-> (mt/fetch-user username)- (dissoc :date_joined :last_login :is_superuser :is_qbnewb :locale :tenant_id)+ (dissoc :date_joined :last_login :is_superuser :is_qbnewb :locale :tenant_id :is_data_analyst)mt/derecordize));; create a channel then select its detailsdiff --git a/test/metabase/pulse/models/pulse_test.clj b/test/metabase/pulse/models/pulse_test.cljindex b408a6fc6d1..b1709197055 100644--- a/test/metabase/pulse/models/pulse_test.clj+++ b/test/metabase/pulse/models/pulse_test.clj@@ -87,7 +87,7 @@:channel_type :email:details {:other "stuff"}:recipients [{:email "[email protected]"}- (dissoc (user-details :rasta) :is_superuser :is_qbnewb)]})]})+ (dissoc (user-details :rasta) :is_superuser :is_qbnewb :is_data_analyst)]})]})(-> (dissoc (models.pulse/retrieve-pulse pulse-id) :id :pulse_id :created_at :updated_at)(update :creator dissoc :date_joined :last_login :tenant_id)(update :entity_id boolean)@@ -256,7 +256,7 @@:schedule_hour 18:channel_type :email:recipients [{:email "[email protected]"}- (dissoc (user-details :crowberto) :is_superuser :is_qbnewb :tenant_id)]})]})+ (dissoc (user-details :crowberto) :is_superuser :is_qbnewb :tenant_id :is_data_analyst)]})]})(mt/derecordize(update-pulse-then-select! {:id (u/the-id pulse):name "We like to party"diff --git a/test/metabase/search/impl_test.clj b/test/metabase/search/impl_test.cljindex 6d50e462811..78d8602971d 100644--- a/test/metabase/search/impl_test.clj+++ b/test/metabase/search/impl_test.clj@@ -86,6 +86,7 @@:models search.config/all-models:current-user-id (mt/user->id :crowberto):is-superuser? true+ :is-data-analyst? false:current-user-perms #{"/"}:model-ancestors? false:limit-int 100diff --git a/test/metabase/search/in_place/filter_test.clj b/test/metabase/search/in_place/filter_test.cljindex 92190271cd6..fd96d26fc16 100644--- a/test/metabase/search/in_place/filter_test.clj+++ b/test/metabase/search/in_place/filter_test.clj@@ -18,6 +18,7 @@:model-ancestors? false:current-user-id 1:is-superuser? true+ :is-data-analyst? false:current-user-perms #{"/"}:calculate-available-models? false})diff --git a/test/metabase/segments/api_test.clj b/test/metabase/segments/api_test.cljindex 1677a1cdcea..c309b8b2fee 100644--- a/test/metabase/segments/api_test.clj+++ b/test/metabase/segments/api_test.clj@@ -16,7 +16,7 @@(defn- user-details [user](select-keysuser- [:email :first_name :last_login :is_qbnewb :is_superuser :id :last_name :date_joined :common_name :locale :tenant_id]))+ [:email :first_name :last_login :is_qbnewb :is_superuser :is_data_analyst :id :last_name :date_joined :common_name :locale :tenant_id]))(defn- segment-response [segment](-> (into {} segment)diff --git a/test/metabase/server/middleware/session_test.clj b/test/metabase/server/middleware/session_test.cljindex 5616cde92c5..fd8efc9ed99 100644--- a/test/metabase/server/middleware/session_test.clj+++ b/test/metabase/server/middleware/session_test.clj@@ -119,6 +119,7 @@(mt/with-premium-features #{}(is (= (merge req {:metabase-user-id (mt/user->id :lucky):is-superuser? false+ :is-data-analyst? false:user-locale nil})(#'mw.session/merge-current-user-info req)))))(testing "Include :is-group-manager? if we have EE + :advanced-permissions "@@ -126,6 +127,7 @@(mt/with-premium-features #{:advanced-permissions}(is (= (merge req {:metabase-user-id (mt/user->id :lucky):is-superuser? false+ :is-data-analyst? false:is-group-manager? false:user-locale nil})(#'mw.session/merge-current-user-info req))))))))))@@ -232,7 +234,11 @@(t2/insert! :model/Session {:id test-session-id:key_hashed test-session-key-hashed:user_id (mt/user->id :lucky)})- (is (= {:metabase-user-id (mt/user->id :lucky), :is-superuser? false, :is-group-manager? false, :user-locale nil}+ (is (= {:metabase-user-id (mt/user->id :lucky),+ :is-superuser? false,+ :is-group-manager? false,+ :user-locale nil+ :is-data-analyst? false}(#'mw.session/current-user-info-for-session test-session-key nil)))(finally(t2/delete! :model/Session :id test-session-id)))))@@ -243,7 +249,11 @@(t2/insert! :model/Session {:id test-session-id:key_hashed test-session-key-hashed:user_id (mt/user->id :crowberto)})- (is (= {:metabase-user-id (mt/user->id :crowberto), :is-superuser? true, :is-group-manager? false, :user-locale nil}+ (is (= {:metabase-user-id (mt/user->id :crowberto),+ :is-superuser? true,+ :is-group-manager? false,+ :user-locale nil+ :is-data-analyst? false}(#'mw.session/current-user-info-for-session test-session-key nil)))(finally(t2/delete! :model/Session :id test-session-id)))))@@ -291,7 +301,11 @@:key_hashed test-session-key-hashed:user_id (mt/user->id :lucky):anti_csrf_token test-anti-csrf-token})- (is (= {:metabase-user-id (mt/user->id :lucky), :is-superuser? false, :is-group-manager? false, :user-locale nil}+ (is (= {:metabase-user-id (mt/user->id :lucky),+ :is-superuser? false,+ :is-group-manager? false,+ :user-locale nil+ :is-data-analyst? false}(#'mw.session/current-user-info-for-session test-session-key test-anti-csrf-token)))(finally(t2/delete! :model/Session :id test-session-id)))diff --git a/test/metabase/users_rest/api_test.clj b/test/metabase/users_rest/api_test.cljindex a8a3ef666e0..87b49bc946e 100644--- a/test/metabase/users_rest/api_test.clj+++ b/test/metabase/users_rest/api_test.clj@@ -1133,7 +1133,7 @@(letfn [(change-user-via-api! [m](-> (mt/user-http-request :crowberto :put 200 (str "user/" user-id) m)(t2/hydrate :personal_collection_id ::personal-collection-name)- (dissoc :user_group_memberships :personal_collection_id :email :is_superuser :jwt_attributes)+ (dissoc :user_group_memberships :personal_collection_id :email :is_superuser :jwt_attributes :is_data_analyst)(#(apply (partial dissoc %) (keys @user-defaults)))mt/boolean-ids-and-timestamps))](testing "Name keys ommitted does not update the user"@@ -1228,6 +1228,72 @@(is (= before(fetch-rasta))))))))+(defn- user-is-data-analyst?+ "Check if a user is a member of the Data Analysts group."+ [user-id]+ (t2/exists? :model/PermissionsGroupMembership+ :user_id user-id+ :group_id (:id (perms-group/data-analyst))))++(deftest update-data-analyst-status-test+ (testing "PUT /api/user/:id"+ (testing "Test that a superuser can set the :is_data_analyst flag (adds to Data Analysts group)"+ (mt/with-temp [:model/User {user-id :id} {:first_name "Test" :last_name "User" :email "[email protected]"}]+ (is (not (user-is-data-analyst? user-id)))+ (mt/user-http-request :crowberto :put 200 (str "user/" user-id)+ {:is_data_analyst true})+ (is (user-is-data-analyst? user-id))))++ (testing "Test that a superuser can unset the :is_data_analyst flag (removes from Data Analysts group)"+ (mt/with-temp [:model/User {user-id :id} {:first_name "Test" :last_name "User" :email "[email protected]"}]+ (mt/user-http-request :crowberto :put 200 (str "user/" user-id)+ {:is_data_analyst true})+ (is (user-is-data-analyst? user-id))+ (mt/user-http-request :crowberto :put 200 (str "user/" user-id)+ {:is_data_analyst false})+ (is (not (user-is-data-analyst? user-id)))))++ (testing "Test that a normal user cannot change the :is_data_analyst flag for themselves"+ (is (not (user-is-data-analyst? (mt/user->id :rasta))))+ (mt/user-http-request :rasta :put 200 (str "user/" (mt/user->id :rasta))+ {:is_data_analyst true})+ (is (not (user-is-data-analyst? (mt/user->id :rasta)))))++ (testing "Test that a normal user cannot change the :is_data_analyst flag for another user"+ (mt/with-temp [:model/User {user-id :id} {:first_name "Test" :last_name "User" :email "[email protected]"}]+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :put 403 (str "user/" user-id)+ {:is_data_analyst true})))))))++(deftest filter-by-data-analyst-test+ (testing "GET /api/user"+ (testing "Filter users by is_data_analyst=true includes data analysts group members"+ (mt/with-temp [:model/User {analyst-id :id} {:first_name "Analyst" :last_name "User"+ :email "[email protected]"+ :is_data_analyst true}+ :model/User {non-analyst-id :id} {:first_name "NonAnalyst" :last_name "User"+ :email "[email protected]"}]+ (let [result (:data (mt/user-http-request :crowberto :get 200 "user" :is_data_analyst true))+ result-ids (set (map :id result))]+ (testing "data analyst group member is included"+ (is (contains? result-ids analyst-id)))+ (testing "non-analyst is excluded"+ (is (not (contains? result-ids non-analyst-id)))))))++ (testing "Filter users by is_data_analyst=false excludes data analysts group members"+ (mt/with-temp [:model/User {analyst-id :id} {:first_name "Analyst2"+ :last_name "User"+ :email "[email protected]"+ :is_data_analyst true}+ :model/User {non-analyst-id :id} {:first_name "NonAnalyst2" :last_name "User"+ :email "[email protected]"}]+ (let [result (:data (mt/user-http-request :crowberto :get 200 "user" :is_data_analyst false))+ result-ids (set (map :id result))]+ (testing "data analyst group member is excluded"+ (is (not (contains? result-ids analyst-id))))+ (testing "non-analyst is included"+ (is (contains? result-ids non-analyst-id))))))))+(deftest update-permissions-test(testing "PUT /api/user/:id"(testing "Check that a non-superuser CANNOT update someone else's user details"