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
Revert "data studio application permission (#66265)" (#66505)
Aleksandr Lesnenkoc7acd66fbdac
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 7a45109e159..5432b50ca69 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -621,7 +621,6 @@:uses #{apieventsmodels- permissionsutil}}graph@@ -2000,9 +1999,7 @@:api #{metabase-enterprise.library.api}:uses #{apicollections- permissions- premium-features- request}}+ premium-features}}enterprise/llm{:team "Metabot"diff --git a/e2e/support/helpers/api/createLibrary.ts b/e2e/support/helpers/api/createLibrary.tsindex 14e75936c8d..523aa777cbe 100644--- a/e2e/support/helpers/api/createLibrary.ts+++ b/e2e/support/helpers/api/createLibrary.ts@@ -4,45 +4,12 @@ type LibraryResponse = Collection & {effective_children?: Collection[];};-export type LibraryCollections = {- library: Collection;- data: Collection;- metrics: Collection;-};--type CreateLibraryOptions = {- wrapIds?: boolean;-};--export const createLibrary = (- options?: CreateLibraryOptions,-): Cypress.Chainable<LibraryCollections> => {+export const createLibrary = (): Cypress.Chainable<+ Cypress.Response<LibraryResponse>+> => {cy.log("Initialize library");return cy.request("POST", "/api/ee/library")- .then(() => cy.request<LibraryResponse>("GET", "/api/ee/library"))- .then((response) => {- const library = response.body;- const data = library.effective_children?.find(- (child) => child.name === "Data",- );- const metrics = library.effective_children?.find(- (child) => child.name === "Metrics",- );-- if (!data || !metrics) {- throw new Error("Library missing Data or Metrics collections");- }-- const collections: LibraryCollections = { library, data, metrics };-- if (options?.wrapIds) {- cy.wrap(library.id).as("libraryId");- cy.wrap(data.id).as("dataCollectionId");- cy.wrap(metrics.id).as("metricsCollectionId");- }-- return cy.wrap(collections);- });+ .then(() => cy.request<LibraryResponse>("GET", "/api/ee/library"));};diff --git a/e2e/support/helpers/api/index.ts b/e2e/support/helpers/api/index.tsindex ee27730ef5d..27b2fba12e5 100644--- a/e2e/support/helpers/api/index.ts+++ b/e2e/support/helpers/api/index.ts@@ -8,7 +8,6 @@ export { createCollection } from "./createCollection";export { createComment } from "./createComment";export { createDashboard } from "./createDashboard";export { createLibrary } from "./createLibrary";-export type { LibraryCollections } from "./createLibrary";export type { DashboardDetails } from "./createDashboard";export { createDashboardWithQuestions } from "./createDashboardWithQuestions";export { createDashboardWithTabs } from "./createDashboardWithTabs";diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.tsindex d757c1a5c6c..a88a4fe862f 100644--- a/e2e/support/helpers/e2e-data-studio-helpers.ts+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts@@ -1,7 +1,7 @@import { codeMirrorHelpers } from "./e2e-codemirror-helpers";const modelingSidebar = () => cy.findByTestId("modeling-sidebar");-const librarySection = () => cy.findByTestId("library-section");+const collectionsSection = () => cy.findByTestId("collections-section");const snippetsSection = () => cy.findByTestId("snippets-section");const glossarySection = () => cy.findByTestId("glossary-section");const newSnippetPage = () => cy.findByTestId("new-snippet-page");@@ -42,8 +42,8 @@ export const DataStudio = {},ModelingSidebar: {root: modelingSidebar,- librarySection,- collectionsTree: () => librarySection().findByRole("tree"),+ collectionsSection,+ collectionsTree: () => collectionsSection().findByRole("tree"),snippetsSection,snippetsTree: () => snippetsSection().findByRole("tree"),snippetsTreeItem: (name: string) =>@@ -54,7 +54,7 @@ export const DataStudio = {glossarySection,glossaryLink: () => glossarySection().findByText("Glossary"),createCardMenuButton: () =>- librarySection().findByLabelText("Create model or metric"),+ collectionsSection().findByLabelText("Create model or metric"),createSnippetButton: () =>snippetsSection().findByLabelText("Create snippet"),snippetCollectionOptionsButton: () =>diff --git a/e2e/support/test-library-data.ts b/e2e/support/test-library-data.tsindex 82a1112c1ea..47ae872ac2c 100644--- a/e2e/support/test-library-data.ts+++ b/e2e/support/test-library-data.ts@@ -1,6 +1,7 @@const { H } = cy;import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import type { StructuredQuestionDetails } from "e2e/support/helpers/api";+import type { Collection } from "metabase-types/api";const { ORDERS_ID } = SAMPLE_DATABASE;@@ -8,6 +9,10 @@ type StructuredQuestionDetailsWithName = StructuredQuestionDetails & {name: string;};+type LibraryResponse = Collection & {+ effective_children?: Collection[];+};+export const TRUSTED_ORDERS_MODEL: StructuredQuestionDetailsWithName = {name: "Trusted Orders Model",query: {@@ -24,48 +29,65 @@ export const TRUSTED_ORDERS_METRIC: StructuredQuestionDetailsWithName = {};export function createLibraryWithItems() {- return H.createLibrary().then(({ data, metrics }) => {- return H.createQuestion(TRUSTED_ORDERS_MODEL, {- wrapId: true,- idAlias: "trustedOrdersModelId",- }).then(() =>- cy.get("@trustedOrdersModelId").then((modelId) =>- cy- .request("PUT", `/api/card/${modelId}`, {- type: "model",- collection_id: data.id,- })- .then(() =>- H.createQuestion(TRUSTED_ORDERS_METRIC, {- wrapId: true,- idAlias: "trustedOrdersMetricId",- }),- )- .then(() =>- cy.get("@trustedOrdersMetricId").then((metricId) =>- cy.request("PUT", `/api/card/${metricId}`, {- type: "metric",- collection_id: metrics.id,+ return H.createLibrary().then(+ (response: Cypress.Response<LibraryResponse>) => {+ const body = response.body;+ const modelsCollection = body.effective_children?.find(+ (child) => child.name === "Data",+ );+ const metricsCollection = body.effective_children?.find(+ (child) => child.name === "Metrics",+ );++ return H.createQuestion(TRUSTED_ORDERS_MODEL, {+ wrapId: true,+ idAlias: "trustedOrdersModelId",+ }).then(() =>+ cy.get("@trustedOrdersModelId").then((modelId) =>+ cy+ .request("PUT", `/api/card/${modelId}`, {+ type: "model",+ collection_id: modelsCollection?.id,+ })+ .then(() =>+ H.createQuestion(TRUSTED_ORDERS_METRIC, {+ wrapId: true,+ idAlias: "trustedOrdersMetricId",}),+ )+ .then(() =>+ cy.get("@trustedOrdersMetricId").then((metricId) =>+ cy.request("PUT", `/api/card/${metricId}`, {+ type: "metric",+ collection_id: metricsCollection?.id,+ }),+ ),),- ),- ),- );- });+ ),+ );+ },+ );}export function createLibraryWithModel() {- return H.createLibrary().then(({ data }) => {- return H.createQuestion(TRUSTED_ORDERS_MODEL, {- wrapId: true,- idAlias: "trustedOrdersModelId",- }).then(() =>- cy.get("@trustedOrdersModelId").then((modelId) =>- cy.request("PUT", `/api/card/${modelId}`, {- type: "model",- collection_id: data.id,- }),- ),- );- });+ return H.createLibrary().then(+ (response: Cypress.Response<LibraryResponse>) => {+ const body = response.body;+ const modelsCollection = body.effective_children?.find(+ (child) => child.name === "Data",+ );++ return H.createQuestion(TRUSTED_ORDERS_MODEL, {+ wrapId: true,+ idAlias: "trustedOrdersModelId",+ }).then(() =>+ cy.get("@trustedOrdersModelId").then((modelId) =>+ cy.request("PUT", `/api/card/${modelId}`, {+ type: "model",+ collection_id: modelsCollection?.id,+ }),+ ),+ );+ },+ );}diff --git a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-library.cy.spec.tsindex 0e6ac8351ef..f3fa5ec6868 100644--- a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts@@ -11,8 +11,6 @@ import {const { H } = cy;-const DATA_STUDIO_INDEX = 3;-describe("scenarios > data studio > modeling > library", () => {beforeEach(() => {H.restore();@@ -21,7 +19,10 @@ describe("scenarios > data studio > modeling > library", () => {H.activateToken("bleeding-edge");});- it("should create library via UI as admin and verify collections", () => {+ it("should create library via UI and verify collections", () => {+ cy.intercept("POST", "/api/ee/library").as("createLibrary");+ cy.intercept("GET", "/api/collection/tree*").as("getCollectionTree");+cy.log("Navigate to Data Studio Modeling");cy.visit("/data-studio/modeling");@@ -37,6 +38,9 @@ describe("scenarios > data studio > modeling > library", () => {cy.button("Create my Library").click();});+ cy.wait("@createLibrary");+ cy.wait("@getCollectionTree");+cy.log("Verify library collections appear in sidebar");H.DataStudio.ModelingSidebar.collectionsTree().within(() => {cy.findByText("Data").should("be.visible");@@ -60,42 +64,6 @@ describe("scenarios > data studio > modeling > library", () => {});});- it("should allow non-admin users with data-studio permission to create library", () => {- cy.intercept("POST", "/api/ee/library").as("createLibrary");-- cy.log("Grant data-studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Sign in as normal user");- cy.signInAsNormalUser();-- cy.log("Navigate to Data Studio Modeling");- cy.visit("/data-studio/modeling");-- cy.log("Click Library sidebar section to open modal");- H.DataStudio.ModelingSidebar.root()- .findByText("Library")- .should("be.visible")- .click();-- cy.log("Create library via modal");- H.modal().within(() => {- cy.findByText("Create your Library").should("be.visible");- cy.button("Create my Library").click();- });-- cy.wait("@createLibrary");-- cy.log("Verify library collections appear in sidebar");- H.DataStudio.ModelingSidebar.collectionsTree().within(() => {- cy.findByText("Data").should("be.visible");- cy.findByText("Metrics").should("be.visible");- });- });-it("should be available in the data picker", () => {createLibraryWithItems();diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.tsindex 6ae0d233a27..48e2a4bfa50 100644--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts@@ -21,7 +21,7 @@ const TARGET_SCHEMA = "Schema A";const TARGET_SCHEMA_2 = "Schema B";const CUSTOM_SCHEMA = "custom_schema";-describe("scenarios > data studio > transforms", () => {+describe("scenarios > admin > transforms", () => {beforeEach(() => {H.restore("postgres-writable");H.resetTestTable({ type: "postgres", table: "many_schemas" });@@ -1575,7 +1575,7 @@ LIMIT});});-describe("scenarios > data studio > transforms > databases without :schemas", () => {+describe("scenarios > admin > transforms > databases without :schemas", () => {const DB_NAME = "QA MySQL8";beforeEach(() => {@@ -1624,7 +1624,7 @@ describe("scenarios > data studio > transforms > databases without :schemas", ()});});-describe("scenarios > data studio > transforms > jobs", () => {+describe("scenarios > admin > transforms > jobs", () => {beforeEach(() => {H.restore("postgres-writable");H.resetTestTable({ type: "postgres", table: "many_schemas" });@@ -1900,7 +1900,7 @@ describe("scenarios > data studio > transforms > jobs", () => {});});-describe("scenarios > data studio > transforms > runs", () => {+describe("scenarios > admin > transforms > runs", () => {beforeEach(() => {H.restore("postgres-writable");H.resetTestTable({ type: "postgres", table: "many_schemas" });diff --git a/e2e/test/scenarios/permissions/application-permissions.cy.spec.js b/e2e/test/scenarios/permissions/application-permissions.cy.spec.jsindex 0b58cc797af..4b828374738 100644--- a/e2e/test/scenarios/permissions/application-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/application-permissions.cy.spec.js@@ -1,18 +1,15 @@const { H } = cy;-import { SAMPLE_DB_ID, USER_GROUPS } from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import {ORDERS_DASHBOARD_ID,ORDERS_QUESTION_ID,} from "e2e/support/cypress_sample_instance_data";-import { createLibraryWithItems } from "e2e/support/test-library-data";const { ORDERS_ID } = SAMPLE_DATABASE;const SETTINGS_INDEX = 0;const MONITORING_INDEX = 1;const SUBSCRIPTIONS_INDEX = 2;-const DATA_STUDIO_INDEX = 3;const NORMAL_USER_ID = 2;@@ -201,378 +198,6 @@ describe("scenarios > admin > permissions > application", () => {});});});-- describe("data studio permission", () => {- beforeEach(() => {- H.activateToken("bleeding-edge");- });-- describe("granted", () => {- beforeEach(() => {- cy.visit("/admin/permissions/application");-- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");-- cy.button("Save changes").click();-- H.modal().within(() => {- cy.findByText("Save permissions?");- cy.findByText("Are you sure you want to do this?");- cy.button("Yes").click();- });- });-- it("allows accessing data studio for non-admins but not transforms", () => {- createLibraryWithItems();- cy.signInAsNormalUser();-- cy.visit("/data-studio");- cy.url().should("include", "/data-studio");- H.main().should("be.visible");-- cy.log("transforms tab should not be visible for non-admins");- cy.findByRole("link", { href: "/data-studio/transforms" }).should(- "not.exist",- );-- cy.log("transforms page should not be accessible for non-admins");- cy.visit("/data-studio/transforms");- H.main().findByText("Sorry, you don’t have permission to see that.");-- cy.log("transforms API should still be admin-only");- cy.request({ url: "/api/ee/transform", failOnStatusCode: false })- .its("status")- .should("eq", 403);-- cy.log("Data Studio link should be visible for models in the library");- cy.get("@trustedOrdersModelId").then((modelId) => {- H.visitModel(modelId);- });- cy.findByLabelText("Open in Data Studio").click();- cy.url().should(- "match",- new RegExp("/data-studio/modeling/models/\\d+$"),- );- });- });-- describe("revoked", () => {- it("does not allow accessing data studio for non-admins", () => {- createLibraryWithItems();- cy.signInAsNormalUser();-- cy.visit("/data-studio");- H.main().findByText("Sorry, you don’t have permission to see that.");-- cy.log(- "Data Studio link should not be visible for models in the library without permission",- );- cy.get("@trustedOrdersModelId").then((modelId) => {- H.visitModel(modelId);- });- cy.findByLabelText("Open in Data Studio").should("not.exist");- });- });-- describe("library collection write access", () => {- it("grants write access when non-admin creates the library", () => {- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Create a question as admin first");- H.createQuestion({- name: "Question to become model",- query: { "source-table": ORDERS_ID },- }).then(({ body }) => {- cy.wrap(body.id).as("questionId");- });-- cy.signInAsNormalUser();-- cy.log("Non-admin creates the library - should get write access");- H.createLibrary().then(({ data }) => {- cy.wrap(data.id).as("dataCollectionId");- });-- cy.log("Non-admin should be able to move question to library as model");- cy.get("@questionId").then((questionId) => {- cy.get("@dataCollectionId").then((collectionId) => {- cy.request("PUT", `/api/card/${questionId}`, {- type: "model",- collection_id: collectionId,- });- });- });-- cy.log("Verify permissions show Curate for All Users on library");- cy.signInAsAdmin();- cy.get("@dataCollectionId").then((collectionId) => {- cy.visit(`/admin/permissions/collections/${collectionId}`);- });- H.assertPermissionForItem("All Users", 0, "Curate");- });-- it("grants write access to existing library when data studio permission is granted", () => {- cy.log("Admin creates library first");- H.createLibrary().then(({ data }) => {- cy.wrap(data.id).as("dataCollectionId");- });-- cy.log("Create a question as admin");- H.createQuestion({- name: "Question to become model",- query: { "source-table": ORDERS_ID },- }).then(({ body }) => {- cy.wrap(body.id).as("questionId");- });-- cy.log("Grant data studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Verify permissions show Curate for All Users on library");- cy.get("@dataCollectionId").then((collectionId) => {- cy.visit(`/admin/permissions/collections/${collectionId}`);- });- H.assertPermissionForItem("All Users", 0, "Curate");-- cy.log("Non-admin should be able to move question to library as model");- cy.signInAsNormalUser();- cy.get("@questionId").then((questionId) => {- cy.get("@dataCollectionId").then((collectionId) => {- cy.request("PUT", `/api/card/${questionId}`, {- type: "model",- collection_id: collectionId,- });- });- });-- cy.log("Verify model was created in the library");- cy.get("@questionId").then((questionId) => {- H.visitModel(questionId);- });- cy.findByLabelText("Open in Data Studio").should("be.visible");- });- });-- describe("library section visibility based on collection access", () => {- it("shows permission error when opening model without data access", () => {- const { ALL_USERS_GROUP } = USER_GROUPS;-- cy.log("Create library with a model");- createLibraryWithItems();-- cy.log("Grant data studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Block data access for All Users group");- cy.updatePermissionsGraph({- [ALL_USERS_GROUP]: {- [SAMPLE_DB_ID]: {- "view-data": "blocked",- "create-queries": "no",- },- },- });-- cy.log(- "Sign in as 'none' user (only in All Users group) and open model",- );- cy.signIn("none");-- cy.get("@trustedOrdersModelId").then((modelId) => {- cy.visit(`/data-studio/modeling/models/${modelId}`);- });-- cy.log("Verify permission error is shown");- H.main()- .findByText("Sorry, you don't have permission to run this query.")- .should("be.visible");- });-- it("hides library section when user has no access to library collections", () => {- const { ALL_USERS_GROUP } = USER_GROUPS;-- cy.log("Create library as admin");- H.createLibrary({ wrapIds: true });-- cy.log(- "Grant data studio permission but revoke library collection access",- );- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Revoke collection access for All Users on library");- cy.get("@libraryId").then((libraryId) => {- cy.get("@dataCollectionId").then((dataId) => {- cy.get("@metricsCollectionId").then((metricsId) => {- cy.updateCollectionGraph({- [ALL_USERS_GROUP]: {- [libraryId]: "none",- [dataId]: "none",- [metricsId]: "none",- },- });- });- });- });-- cy.log("Sign in as 'none' user and verify library section is hidden");- cy.signIn("none");- cy.visit("/data-studio/modeling");-- H.DataStudio.ModelingSidebar.root().should("be.visible");- H.DataStudio.ModelingSidebar.librarySection().should("not.exist");- H.DataStudio.ModelingSidebar.glossarySection().should("be.visible");- });-- it("shows only accessible library subcollections (partial access)", () => {- const { ALL_USERS_GROUP } = USER_GROUPS;-- cy.log("Create library with items as admin");- H.createLibrary({ wrapIds: true }).then(({ library, metrics }) => {- H.createQuestion(- {- name: "Trusted Orders Model",- query: { "source-table": ORDERS_ID },- },- { wrapId: true, idAlias: "trustedOrdersModelId" },- ).then(() =>- cy.get("@trustedOrdersModelId").then((modelId) => {- cy.get("@dataCollectionId").then((dataCollectionId) => {- cy.request("PUT", `/api/card/${modelId}`, {- type: "model",- collection_id: dataCollectionId,- });- });- }),- );-- cy.log("Grant data studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Revoke access to Metrics collection only");- cy.updateCollectionGraph({- [ALL_USERS_GROUP]: {- [library.id]: "read",- [metrics.id]: "none",- },- });- });-- cy.log("Sign in as 'none' user and verify partial library access");- cy.signIn("none");- cy.visit("/data-studio/modeling");-- H.DataStudio.ModelingSidebar.librarySection().should("be.visible");- H.DataStudio.ModelingSidebar.collectionsTree().within(() => {- cy.findByText("Data").should("be.visible");- cy.findByText("Metrics").should("not.exist");- });- });- });-- describe("data model section visibility", () => {- it("hides Data tab for users without data model permission", () => {- cy.log("Grant data studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Sign in as 'none' user and verify Data tab is not visible");- cy.signIn("none");- cy.visit("/data-studio/modeling");-- cy.log("Data tab should not be visible without data model permission");- cy.findByTestId("data-studio-data-tab").should("not.exist");- cy.findByTestId("data-studio-modeling-tab").should("be.visible");- });-- it("shows Data tab for users with data model permission on any database", () => {- const DATA_MODEL_PERMISSION_INDEX = 3;-- cy.log("Grant data studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Grant data model permission on Sample Database");- cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);- H.modifyPermission("All Users", DATA_MODEL_PERMISSION_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Sign in as 'none' user and verify Data tab is visible");- cy.signIn("none");- cy.visit("/data-studio");-- cy.findByTestId("data-studio-data-tab").should("be.visible");- cy.findByTestId("data-studio-modeling-tab").should("be.visible");- });-- it("allows editing table metadata with blocked data access but data model permission", () => {- const DATA_ACCESS_PERMISSION_INDEX = 0;- const DATA_MODEL_PERMISSION_INDEX = 3;-- cy.log("Grant data studio permission to All Users");- cy.visit("/admin/permissions/application");- H.modifyPermission("All Users", DATA_STUDIO_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Block data access but grant data model permission");- cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);- H.modifyPermission(- "All Users",- DATA_ACCESS_PERMISSION_INDEX,- "Blocked",- );- H.modifyPermission("All Users", DATA_MODEL_PERMISSION_INDEX, "Yes");- cy.button("Save changes").click();- H.modal().button("Yes").click();-- cy.log("Sign in as 'none' user and verify can access data model");- cy.signIn("none");-- cy.intercept("PUT", "/api/table/*").as("updateTable");- cy.intercept(- "GET",- "/api/table/*/query_metadata?include_sensitive_fields=true&include_editable_data_model=true",- ).as("tableMetadataFetch");-- cy.visit("/data-studio/data");- cy.findByTestId("data-studio-data-tab").should("be.visible");-- cy.log("Select table and verify can edit metadata");- H.DataModel.TablePicker.getTable("Orders").click();- cy.wait("@tableMetadataFetch");-- cy.log("Update table name to verify edit permissions work");- H.DataModel.TableSection.getNameInput()- .should("have.value", "Orders")- .clear()- .type("Modified Orders")- .blur();- cy.wait("@updateTable");-- H.undoToast().should("contain.text", "Table name updated");- });- });- });});function createSubscription(user_id) {diff --git a/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj b/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.cljindex bc2371b70e9..d34407fdff0 100644--- a/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj+++ b/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj@@ -62,7 +62,6 @@{: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_studio (perms/set-has-application-permission-of-type? permissions-set :data-studio):can_access_data_model (perms/user-has-any-perms-of-type? api/*current-user-id* :perms/manage-table-metadata):can_access_db_details (perms/user-has-any-perms-of-type? api/*current-user-id* :perms/manage-database):is_group_manager api/*is-group-manager?*})))diff --git a/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/application_permissions.clj b/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/application_permissions.cljindex ef80d1744fc..4c6f77c5633 100644--- a/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/application_permissions.clj+++ b/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/application_permissions.clj@@ -13,7 +13,7 @@(def ^:private GroupPermissionsGraph[:map-of- [:enum :setting :monitoring :subscription :data-studio]+ [:enum :setting :monitoring :subscription][:enum :yes :no]])(def ^:private ApplicationPermissionsGraph@@ -45,8 +45,7 @@[permission-set]{:setting (permission-for-type permission-set :setting):monitoring (permission-for-type permission-set :monitoring)- :subscription (permission-for-type permission-set :subscription)- :data-studio (permission-for-type permission-set :data-studio)})+ :subscription (permission-for-type permission-set :subscription)})(mu/defn graph :- ApplicationPermissionsGraph"Fetch a graph representing the application permissions status for groups that has at least one application permissiondiff --git a/enterprise/backend/src/metabase_enterprise/library/api.clj b/enterprise/backend/src/metabase_enterprise/library/api.cljindex 885b4a8e6ff..a436b7ffb48 100644--- a/enterprise/backend/src/metabase_enterprise/library/api.clj+++ b/enterprise/backend/src/metabase_enterprise/library/api.clj@@ -5,8 +5,6 @@[metabase.api.routes.common :refer [+auth]][metabase.collections.core :as collections][metabase.collections.models.collection :as collection]- [metabase.permissions.core :as perms]- [metabase.request.core :as request][toucan2.core :as t2]))(set! *warn-on-reflection* true)@@ -14,16 +12,13 @@(api.macros/defendpoint :post "/""Creates the Library if it doesn't exist. Returns the created collection.- Requires data-studio application permission."+ Requires superuser permissions."[_route_query_body]- (perms/check-has-application-permission :data-studio)+ (api/check-superuser)(api/check-400 (not (collections/library-collection)) "Library already exists")- ;; Library creation requires admin-level collection permissions which the user may not have,- ;; but we've verified they have data-studio permission above, so we run as admin- (request/as-admin- (collections/create-library-collection!)))+ (collections/create-library-collection!))(defn- add-here-and-below [collection](let [descendent-ids (map :id (collection/descendants-flat collection))diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/common_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/common_test.cljindex 9e1c68e5da3..f7c6995fef3 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/common_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/common_test.clj@@ -30,7 +30,6 @@(is (= {:can_access_setting true:can_access_subscription true:can_access_monitoring true- :can_access_data_studio true:can_access_data_model true:is_group_manager false:can_access_db_details true}@@ -40,7 +39,6 @@(is (= {:can_access_setting false:can_access_subscription true:can_access_monitoring false- :can_access_data_studio false:can_access_data_model false:is_group_manager false:can_access_db_details false}diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/application_permissions_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/application_permissions_test.cljindex 6e4d0c4c8cf..aa5e726d876 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/application_permissions_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/application_permissions_test.clj@@ -20,13 +20,11 @@(is (partial= {(:id (perms-group/admin)){:monitoring :yes:setting :yes- :subscription :yes- :data-studio :yes}+ :subscription :yes}(:id (perms-group/all-users)){:monitoring :no:setting :no- :subscription :yes- :data-studio :no}}+ :subscription :yes}}(:groups graph)))))(testing "group has no permissions will not be included in the graph"@@ -48,8 +46,7 @@(with-new-group-and-current-graph group-id current-graph(let [new-graph (assoc-in current-graph [:groups group-id] {:setting :yes:monitoring :no- :subscription :no- :data-studio :no})+ :subscription :no})_ (g-perms/update-graph! new-graph)updated-graph (g-perms/graph)](is (partial= (:groups new-graph) (:groups updated-graph)))@@ -97,8 +94,7 @@(let [current-graph (g-perms/graph)new-graph (assoc-in current-graph [:groups group-id] {:setting :yes:subscription :yes- :monitoring :no- :data-studio :no})+ :monitoring :no})_ (g-perms/update-graph! new-graph)updated-graph (g-perms/graph)](is (= (:groups new-graph) (:groups updated-graph)))diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api_test.cljindex e9b38eb7809..fb632bcdf48 100644--- a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj@@ -994,21 +994,3 @@{:query "WITH category_counts AS (SELECT category, COUNT(*) as cnt FROM products GROUP BY category) SELECT * FROM category_counts"})](is (false? (:is_simple response)))(is (= "Contains a CTE" (:reason response))))))))--(deftest permissions-test- (testing "Transform endpoints require superuser"- (mt/with-premium-features #{:transforms}- (mt/with-temp [:model/Transform transform {}]- (testing "Regular users get 403"- (mt/user-http-request :rasta :get 403 "ee/transform")- (mt/user-http-request :rasta :get 403 (str "ee/transform/" (:id transform)))- (mt/user-http-request :rasta :post 403 "ee/transform"- {:name "Test"- :source {:type "query"- :query {:database (mt/id)- :type "native"- :native {:query "SELECT 1"}}}- :target {:type "table" :name "test_table"}})- (mt/user-http-request :rasta :put 403 (str "ee/transform/" (:id transform))- {:name "Updated"})- (mt/user-http-request :rasta :delete 403 (str "ee/transform/" (:id transform))))))))diff --git a/enterprise/frontend/src/metabase-enterprise/api/library.ts b/enterprise/frontend/src/metabase-enterprise/api/library.tsindex 6dffd9c2a29..82d5a5212f8 100644--- a/enterprise/frontend/src/metabase-enterprise/api/library.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/library.ts@@ -1,4 +1,4 @@-import type { Collection } from "metabase-types/api";+import type { Collection, CollectionItem } from "metabase-types/api";import { EnterpriseApi } from "./api";import { listTag, tag } from "./tags";@@ -10,27 +10,17 @@ export const libraryApi = EnterpriseApi.injectEndpoints({method: "POST",url: "/api/ee/library",}),- invalidatesTags: [listTag("collection"), tag("library-collection")],+ invalidatesTags: [listTag("collection")],}),- getLibraryCollection: builder.query<Collection, void>({+ getLibraryCollection: builder.query<CollectionItem, void>({query: () => ({url: `/api/ee/library`,method: "GET",}),providesTags: () => [tag("library-collection")],}),- getLibraryCollectionTree: builder.query<Collection[], void>({- query: () => ({- url: `/api/ee/library/tree`,- method: "GET",- }),- providesTags: () => [tag("library-collection")],- }),}),});-export const {- useCreateLibraryMutation,- useGetLibraryCollectionQuery,- useGetLibraryCollectionTreeQuery,-} = libraryApi;+export const { useCreateLibraryMutation, useGetLibraryCollectionQuery } =+ libraryApi;diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.ts b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsindex df43c6a8272..339cffc023c 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.ts@@ -10,7 +10,6 @@ import {getOrderedGroups,} from "metabase/admin/permissions/selectors/data-permissions/groups";import { getGroupNameLocalized, isAdminGroup } from "metabase/lib/groups";-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";import type { Group } from "metabase-types/api";import { APPLICATION_PERMISSIONS_OPTIONS } from "./constants";@@ -43,11 +42,6 @@ export const canAccessSettings = createSelector((user) => user?.permissions?.can_access_setting ?? false,);-export const canAccessDataStudio = createSelector(- (state: ApplicationPermissionsState) => state.currentUser,- (user) => user?.permissions?.can_access_data_studio ?? false,-);-const getApplicationPermission = (permissions: ApplicationPermissions,groupId: number,@@ -105,63 +99,46 @@ export const getApplicationPermissionEditor = createSelector(const entities = groups.flat().map((group) => {const isAdmin = isAdminGroup(group);- const groupPermissions = [- getPermission(permissions, isAdmin, group.id, defaultGroup, "setting"),- getPermission(- permissions,- isAdmin,- group.id,- defaultGroup,- "monitoring",- ),- getPermission(- permissions,- isAdmin,- group.id,- defaultGroup,- "subscription",- ),- ];-- if (PLUGIN_DATA_STUDIO.isEnabled) {- groupPermissions.push(+ return {+ id: group.id,+ name: getGroupNameLocalized(group),+ permissions: [getPermission(permissions,isAdmin,group.id,defaultGroup,- "data-studio",+ "setting",),- );- }-- return {- id: group.id,- name: getGroupNameLocalized(group),- permissions: groupPermissions,+ getPermission(+ permissions,+ isAdmin,+ group.id,+ defaultGroup,+ "monitoring",+ ),+ getPermission(+ permissions,+ isAdmin,+ group.id,+ defaultGroup,+ "subscription",+ ),+ ],};});- const columns = [- { name: t`Group name` },- { name: t`Settings access` },- {- name: t`Monitoring access`,- hint: t`This grants access to Tools`,- },- { name: t`Subscriptions and Alerts` },- ];-- if (PLUGIN_DATA_STUDIO.isEnabled) {- columns.push({- name: t`Data Studio access`,- hint: t`This grants access to the Data Studio`,- });- }-return {filterPlaceholder: t`Search for a group`,- columns,+ columns: [+ { name: t`Group name` },+ { name: t`Settings access` },+ {+ name: t`Monitoring access`,+ hint: t`This grants access to Tools`,+ },+ { name: t`Subscriptions and Alerts` },+ ],entities,};},diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/types/permissions.ts b/enterprise/frontend/src/metabase-enterprise/application_permissions/types/permissions.tsindex e48e8715ef7..4e0cae60a56 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/types/permissions.ts+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/types/permissions.ts@@ -3,8 +3,7 @@ import type { GroupId } from "metabase-types/api";export type ApplicationPermissionKey =| "subscription"| "monitoring"- | "setting"- | "data-studio";+ | "setting";export type ApplicationPermissionValue = "yes" | "no";export type GroupApplicationPermissions = {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 3c5bac4d332..575751ea024 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@@ -89,7 +89,6 @@ function DataStudioNav({icon="database"to={Urls.dataStudioData()}isSelected={isDataTab}- data-testid="data-studio-data-tab"/>)}{canAccessTransforms && (@@ -98,7 +97,6 @@ function DataStudioNav({icon="transform"to={Urls.transformList()}isSelected={isTransformsTab}- data-testid="data-studio-transforms-tab"/>)}<DataStudioTab@@ -106,7 +104,6 @@ function DataStudioNav({icon="model"to={Urls.dataStudioModeling()}isSelected={isModelingTab}- data-testid="data-studio-modeling-tab"/>{PLUGIN_DEPENDENCIES.isEnabled && (<DataStudioTab@@ -114,7 +111,6 @@ function DataStudioNav({icon="schema"to={Urls.dependencyGraph()}isSelected={isDependenciesTab}- data-testid="data-studio-dependencies-tab"/>)}</Stack>@@ -133,18 +129,11 @@ type DataStudioTabProps = {icon: IconName;to: string;isSelected: boolean;- "data-testid"?: string;};const TOOLTIP_OPEN_DELAY = 1000;-function DataStudioTab({- label,- icon,- to,- isSelected,- "data-testid": testId,-}: DataStudioTabProps) {+function DataStudioTab({ label, icon, to, isSelected }: DataStudioTabProps) {return (<Tooltip label={label} position="right" openDelay={TOOLTIP_OPEN_DELAY}><Box@@ -153,7 +142,6 @@ function DataStudioTab({to={to}p="0.75rem"bdrs="md"- data-testid={testId}><FixedSizeIcon name={icon} display="block" /></Box>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.module.cssdeleted file mode 100644index dbb8d99f43f..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.module.css+++ /dev/null@@ -1,3 +0,0 @@-.section {- border-bottom: 1px solid var(--mb-color-border);-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsxindex 2928787ca0c..21c42902c95 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx@@ -1,92 +1,71 @@import { useDisclosure } from "@mantine/hooks";-import { skipToken } from "@reduxjs/toolkit/query";+import { useMemo } from "react";import { push } from "react-router-redux";import { t } from "ttag";-import { useDispatch } from "metabase/lib/redux";+import { isLibraryCollection } from "metabase/collections/utils";+import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";-import { Box, Skeleton } from "metabase/ui";-import {- useGetLibraryCollectionQuery,- useGetLibraryCollectionTreeQuery,-} from "metabase-enterprise/api";+import { getUserIsAdmin } from "metabase/selectors/user";import { ModelingSidebarSection } from "metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection";import type { Collection, CollectionId } from "metabase-types/api";-import { isObject } from "metabase-types/guards";import { CreateLibraryModal } from "./CreateLibraryModal";import { LibraryCollectionTree } from "./LibraryCollectionTree";-import S from "./LibrarySection.module.css";export type LibrarySectionProps = {+ collections: Collection[];selectedCollectionId: CollectionId | undefined;hasDataAccess: boolean;hasNativeWrite: boolean;};export function LibrarySection({+ collections,selectedCollectionId,hasDataAccess,hasNativeWrite,}: LibrarySectionProps) {+ const isAdmin = useSelector(getUserIsAdmin);const [isModalOpened, { open: openModal, close: closeModal }] =useDisclosure();const dispatch = useDispatch();- const {- data: libraryInfo,- error: libraryError,- isLoading: isLoadingLibrary,- } = useGetLibraryCollectionQuery();-- const libraryExists = isObject(libraryInfo) && "id" in libraryInfo;- const hasNoAccess = isObject(libraryError) && libraryError.status === 403;-- const { data: libraryTree, isLoading: isLoadingTree } =- useGetLibraryCollectionTreeQuery(libraryExists ? undefined : skipToken);-- const rootCollection = libraryTree?.[0];+ const rootCollection = useMemo(+ () => collections.find(isLibraryCollection),+ [collections],+ );const handleCreate = (collection: Collection) => {closeModal();dispatch(push(Urls.dataStudioCollection(collection.id)));};- if (isLoadingLibrary || isLoadingTree) {+ if (rootCollection != null) {return (- <Box className={S.section} p="md">- <Skeleton h={32} radius="xs" />- </Box>+ <LibraryCollectionTree+ rootCollection={rootCollection}+ selectedCollectionId={selectedCollectionId}+ hasDataAccess={hasDataAccess}+ hasNativeWrite={hasNativeWrite}+ />);}- if (hasNoAccess) {- return null;- }-- if (rootCollection != null) {+ if (isAdmin) {return (- <Box className={S.section} p="md" data-testid="library-section">- <LibraryCollectionTree- rootCollection={rootCollection}- selectedCollectionId={selectedCollectionId}- hasDataAccess={hasDataAccess}- hasNativeWrite={hasNativeWrite}+ <>+ <ModelingSidebarSection+ title={t`Library`}+ icon="repository"+ onClick={openModal}/>- </Box>+ {isModalOpened && (+ <CreateLibraryModal onCreate={handleCreate} onClose={closeModal} />+ )}+ </>);}- return (- <Box className={S.section} p="md" data-testid="library-section">- <ModelingSidebarSection- title={t`Library`}- icon="repository"- onClick={openModal}- />- {isModalOpened && (- <CreateLibraryModal onCreate={handleCreate} onClose={closeModal} />- )}- </Box>- );+ return null;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsxindex 0d722933535..b1ffa8bf7ca 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx@@ -1,6 +1,9 @@import { useMemo } from "react";-import { useListDatabasesQuery } from "metabase/api";+import {+ useListCollectionsTreeQuery,+ useListDatabasesQuery,+} from "metabase/api";import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";import type { CollectionId, NativeQuerySnippetId } from "metabase-types/api";@@ -19,6 +22,12 @@ export function ModelingSidebar({}: ModelingSidebarProps) {const { data: databaseData, isLoading: isLoadingDatabases } =useListDatabasesQuery();+ const { data: collections = [], isLoading: isLoadingCollections } =+ useListCollectionsTreeQuery({+ "exclude-other-user-collections": true,+ "exclude-archived": true,+ "include-library": true,+ });const { hasDataAccess, hasNativeWrite } = useMemo(() => {const databases = databaseData?.data ?? [];@@ -28,12 +37,15 @@ export function ModelingSidebar({};}, [databaseData]);- if (isLoadingDatabases) {+ const isLoading = isLoadingDatabases || isLoadingCollections;++ if (isLoading) {return null;}return (<ModelingSidebarView+ collections={collections}selectedCollectionId={selectedCollectionId}selectedSnippetId={selectedSnippetId}isGlossaryActive={isGlossaryActive}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsxindex c4f2888dae8..48838a13c90 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx@@ -3,7 +3,11 @@ import { t } from "ttag";import * as Urls from "metabase/lib/urls";import { Box, Stack } from "metabase/ui";import { LibrarySection } from "metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection";-import type { CollectionId, NativeQuerySnippetId } from "metabase-types/api";+import type {+ Collection,+ CollectionId,+ NativeQuerySnippetId,+} from "metabase-types/api";import { ModelingSidebarSection } from "../ModelingSidebarSection";@@ -11,6 +15,7 @@ import S from "./ModelingSidebarView.module.css";import { SnippetsSection } from "./SnippetsSection";interface ModelingSidebarViewProps {+ collections: Collection[];selectedCollectionId: CollectionId | undefined;selectedSnippetId?: NativeQuerySnippetId;isGlossaryActive: boolean;@@ -19,6 +24,7 @@ interface ModelingSidebarViewProps {}export function ModelingSidebarView({+ collections,selectedCollectionId,selectedSnippetId,isGlossaryActive,@@ -28,11 +34,14 @@ export function ModelingSidebarView({return (<Box w={320} h="100%" className={S.sidebar} data-testid="modeling-sidebar"><Stack gap={0}>- <LibrarySection- selectedCollectionId={selectedCollectionId}- hasDataAccess={hasDataAccess}- hasNativeWrite={hasNativeWrite}- />+ <Box className={S.section} p="md" data-testid="collections-section">+ <LibrarySection+ collections={collections}+ selectedCollectionId={selectedCollectionId}+ hasDataAccess={hasDataAccess}+ hasNativeWrite={hasNativeWrite}+ />+ </Box>{hasNativeWrite && (<Box className={S.section} p="md" data-testid="snippets-section">diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsxindex 270340a0884..759e31e3908 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx@@ -42,7 +42,6 @@ export function CollectionPage({ params }: CollectionPageProps) {} = useListCollectionItemsQuery({id: params.collectionId,models: ["dataset", "metric"],- include_editable_data_model: true,});const isLoading = isLoadingCollection || isLoadingItems;const error = collectionError ?? itemsError;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.tsindex abd016d6424..715cbfe827a 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts@@ -2,9 +2,8 @@ import { useMemo } from "react";import { skipToken, useListCollectionItemsQuery } from "metabase/api";import type { LibraryCollectionType } from "metabase/plugins";-import type { UserWithApplicationPermissions } from "metabase/plugins/oss/permissions";import { getIsEmbeddingIframe } from "metabase/selectors/embed";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";+import { getUserIsAdmin } from "metabase/selectors/user";import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";import type {CollectionItem,@@ -13,15 +12,9 @@ import type {} from "metabase-types/api";import type { State } from "metabase-types/store";+// Must be in sync with CanAccessDataStudio in frontend/src/metabase/route-guards.tsxexport function canAccessDataStudio(state: State) {- if (getIsEmbeddingIframe(state)) {- return false;- }- if (getUserIsAdmin(state)) {- return true;- }- const user = getUser(state) as UserWithApplicationPermissions | null;- return user?.permissions?.can_access_data_studio ?? false;+ return getUserIsAdmin(state) && !getIsEmbeddingIframe(state);}export function getLibraryCollectionType(@@ -90,17 +83,9 @@ export const useGetLibraryCollection = ({const { data: libraryCollection, isLoading: isLoadingCollection } =useGetLibraryCollectionQuery(undefined, { skip });- const data = useMemo(- () =>- libraryCollection- ? { ...libraryCollection, model: "collection" as const }- : undefined,- [libraryCollection],- );-return {isLoading: isLoadingCollection,- data,+ data: libraryCollection,};};diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.tsindex 6d9eab96fc8..2226f812da9 100644--- a/frontend/src/metabase-types/api/collection.ts+++ b/frontend/src/metabase-types/api/collection.ts@@ -181,7 +181,6 @@ export type ListCollectionItemsRequest = {pinned_state?: "all" | "is_pinned" | "is_not_pinned";namespace?: "snippets";collection_type?: CollectionType;- include_editable_data_model?: boolean;} & PaginationRequest &Partial<SortingOptions<ListCollectionItemsSortColumn>>;diff --git a/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsxindex edb7fe13108..d04a1a73254 100644--- a/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx+++ b/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx@@ -30,11 +30,6 @@ export const ApplicationPermissionsHelp = () => {<strong key="label">{t`Subscriptions and alerts:`}</strong>)} the group can create dashboard subscriptions and alerts.`}</Text>- <Text>- {jt`${(- <strong key="label">{t`Data Studio:`}</strong>- )} the group can access the Data Studio to manage curated assets.`}- </Text></Stack><Text component="footer" ta="center" py="1rem" fw={600}>diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/types.tsindex 65fe58c87f5..a0d70658ef3 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts@@ -8,7 +8,7 @@ import type {export type MiniPickerCollectionItem = Pick<CollectionItem,- "name" | "model" | "here" | "below"+ "id" | "name" | "model" | "here" | "below"> & {id: CollectionItem["id"] | CollectionId;};diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsxindex c5fa36345d9..89811424185 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx@@ -58,7 +58,6 @@ export const setup = ({can_access_setting: true,can_access_monitoring: false,can_access_subscription: false,- can_access_data_studio: false,};}diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.unit.spec.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.unit.spec.tsindex 0a04cc143aa..3180869a53c 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.unit.spec.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.unit.spec.ts@@ -34,7 +34,6 @@ function setup({can_access_setting: true,can_access_monitoring: false,can_access_subscription: false,- can_access_data_studio: false,};}setupTokenStatusEndpoint({ valid: true });diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsxindex 51092dd7dc2..cf3c185b0cc 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx@@ -436,7 +436,6 @@ function setup({can_access_setting: true,can_access_monitoring: false,can_access_subscription: false,- can_access_data_studio: false,};}const storeConfig = {diff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.tsindex caed4a29dca..fb1eddb9ab2 100644--- a/frontend/src/metabase/plugins/oss/permissions.ts+++ b/frontend/src/metabase/plugins/oss/permissions.ts@@ -26,7 +26,6 @@ export interface UserWithApplicationPermissions extends User {can_access_monitoring: boolean;can_access_setting: boolean;can_access_subscription: boolean;- can_access_data_studio: boolean;};}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsxindex a4d10f6d935..fb700cbf939 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { UploadInput } from "metabase/common/components/upload";-import { useDispatch, useSelector } from "metabase/lib/redux";+import { useDispatch } from "metabase/lib/redux";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_DATA_STUDIO } from "metabase/plugins";import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";@@ -100,13 +100,8 @@ export const QuestionActions = ({}};- const canAccessDataStudio = useSelector(- PLUGIN_DATA_STUDIO.canAccessDataStudio,- );-const shouldShowDataStudioLink =PLUGIN_DATA_STUDIO.isEnabled &&- canAccessDataStudio &&PLUGIN_DATA_STUDIO.getLibraryCollectionType(question.collection()?.type) !=null;diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsxindex d2319be2b27..a950968443d 100644--- a/frontend/src/metabase/route-guards.tsx+++ b/frontend/src/metabase/route-guards.tsx@@ -5,7 +5,6 @@ import { getAdminPaths } from "metabase/admin/app/selectors";import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";import { MetabaseReduxContext } from "metabase/lib/redux";import {- PLUGIN_DATA_STUDIO,PLUGIN_FEATURE_LEVEL_PERMISSIONS,PLUGIN_TRANSFORMS,} from "metabase/plugins";@@ -112,16 +111,6 @@ const UserCanAccessTransforms = connectedReduxRedirect<Props, State>({context: MetabaseReduxContext,});-const UserCanAccessDataStudio = connectedReduxRedirect<Props, State>({- wrapperDisplayName: "UserCanAccessDataStudio",- redirectPath: "/unauthorized",- allowRedirectBack: false,- authenticatedSelector: (state) =>- PLUGIN_DATA_STUDIO.canAccessDataStudio(state),- redirectAction: routerActions.replace,- context: MetabaseReduxContext,-});-export const IsAuthenticated = MetabaseIsSetup(UserIsAuthenticated(({ children }) => children),);@@ -141,9 +130,10 @@ export const CanAccessOnboarding = UserCanAccessOnboarding(({ children }) => children,);+// Must be in sync with canAccessDataStudio in enterprise/frontend/src/metabase-enterprise/data-studio/utils.tsexport const CanAccessDataStudio = MetabaseIsSetup(UserIsAuthenticated(- AvailableInEmbedding(UserCanAccessDataStudio(({ children }) => children)),+ UserIsAdmin(AvailableInEmbedding(({ children }) => children)),),);diff --git a/src/metabase/collections/models/collection.clj b/src/metabase/collections/models/collection.cljindex 9fe12df8691..6e22c788514 100644--- a/src/metabase/collections/models/collection.clj+++ b/src/metabase/collections/models/collection.clj@@ -170,6 +170,26 @@[](t2/select-one :model/Collection :type library-collection-type))+(defn create-library-collection!+ "Create the Library collection. Returns Created collection. Throws if it already exists."+ []+ (when-not (nil? (library-collection))+ (throw (ex-info "Library already exists" {})))+ (let [library (t2/insert-returning-instance! :model/Collection {:name "Library"+ :type library-collection-type+ :location "/"})+ base-location (str "/" (:id library) "/")+ models (t2/insert-returning-instance! :model/Collection {:name "Data"+ :type library-models-collection-type+ :location base-location})+ metrics (t2/insert-returning-instance! :model/Collection {:name "Metrics"+ :type library-metrics-collection-type+ :location base-location})]+ (doseq [col [library models metrics]]+ (t2/delete! :model/Permissions :collection_id (:id col))+ (perms/grant-collection-read-permissions! (perms/all-users-group) col))+ library))+(methodical/defmethod t2/table-name :model/Collection [_model] :collection)(methodical/defmethod t2/model-for-automagic-hydration [#_model :default #_k :collection]@@ -2165,28 +2185,3 @@(pos-int? (t2/count :model/Collection :id collection-id :type [:in [library-collection-typelibrary-models-collection-typelibrary-metrics-collection-type]]))))--(defn create-library-collection!- "Create the Library collection. Returns Created collection. Throws if it already exists."- []- (when-not (nil? (library-collection))- (throw (ex-info "Library already exists" {})))- (let [library (t2/insert-returning-instance! :model/Collection {:name "Library"- :type library-collection-type- :location "/"})- base-location (location-path library)- models (t2/insert-returning-instance! :model/Collection {:name "Data"- :type library-models-collection-type- :location base-location})- metrics (t2/insert-returning-instance! :model/Collection {:name "Metrics"- :type library-metrics-collection-type- :location base-location})- data-studio-group-ids (t2/select-fn-set :group_id [:model/Permissions :group_id] :object (perms/application-perms-path :data-studio))]- (doseq [col [library models metrics]]- ;; clear out default permissions- (t2/delete! :model/Permissions :collection_id (:id col))- (perms/grant-collection-read-permissions! (perms/all-users-group) col)-- (doseq [group data-studio-group-ids]- (perms/grant-collection-readwrite-permissions! group col)))- library))diff --git a/src/metabase/glossary/api.clj b/src/metabase/glossary/api.cljindex 7aa8c4a7ec0..0a77f31156e 100644--- a/src/metabase/glossary/api.clj+++ b/src/metabase/glossary/api.clj@@ -4,8 +4,6 @@[metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.events.core :as events]- [metabase.models.interface :as mi]- [metabase.permissions.core :as perms][metabase.util.malli.schema :as ms][toucan2.core :as t2]))@@ -28,7 +26,6 @@{:keys [term definition]} :- [:map[:term ms/NonBlankString][:definition ms/NonBlankString]]]- (api/check-403 (or (mi/superuser?) (perms/current-user-has-application-permissions? :data-studio)))(let [glossary (t2/insert-returning-instance! :model/Glossary{:term term:definition definition@@ -45,7 +42,6 @@{:keys [term definition]} :- [:map[:term ms/NonBlankString][:definition ms/NonBlankString]]]- (api/check-403 (or (mi/superuser?) (perms/current-user-has-application-permissions? :data-studio)))(let [previous-glossary (api/check-404 (t2/select-one :model/Glossary :id id))](t2/update! :model/Glossary id {:term term :definition definition})(let [glossary (t2/select-one :model/Glossary :id id)]@@ -58,7 +54,6 @@(api.macros/defendpoint :delete "/:id""Delete a glossary entry."[{:keys [id]} :- [:map [:id ms/PositiveInt]]]- (api/check-403 (or (mi/superuser?) (perms/current-user-has-application-permissions? :data-studio)))(let [glossary (api/check-404 (t2/select-one :model/Glossary :id id))](t2/delete! :model/Glossary :id id)(events/publish-event! :event/glossary-deletediff --git a/src/metabase/permissions/models/permissions.clj b/src/metabase/permissions/models/permissions.cljindex 1086e5df20a..df18d9ead13 100644--- a/src/metabase/permissions/models/permissions.clj+++ b/src/metabase/permissions/models/permissions.clj@@ -386,24 +386,6 @@(t2/delete! :model/Permissions where)(clear-current-user-cached-permissions!))))-(declare grant-collection-readwrite-permissions!)--(defn- grant-library-collection-permissions-for-data-studio!- "When granting data-studio application permission to a group, also grant them read-write access- to all existing library collections (Library, Data, Metrics).-- This is idempotent - if permissions already exist, they are not duplicated."- [group-id]- (let [library-types [(var-get (requiring-resolve 'metabase.collections.models.collection/library-collection-type))- (var-get (requiring-resolve 'metabase.collections.models.collection/library-models-collection-type))- (var-get (requiring-resolve 'metabase.collections.models.collection/library-metrics-collection-type))]- library-collections (t2/select :model/Collection :type [:in library-types])]- (when (seq library-collections)- (log/debugf "Granting library collection permissions to group %s for %d collections"- group-id (count library-collections))- (doseq [coll library-collections]- (grant-collection-readwrite-permissions! group-id coll)))))-(defn grant-permissions!"Grant permissions for `group-or-id` and return the inserted permissions. Two-arity grants any arbitrary Permissions `path`."[group-or-id path]@@ -412,9 +394,6 @@(map (fn [path-object]{:group_id (u/the-id group-or-id) :object path-object})(distinct (conj (perms.u/->v2-path path) path))))- (when (= path (permissions.path/application-perms-path :data-studio))- (grant-library-collection-permissions-for-data-studio! (u/the-id group-or-id)))-(clear-current-user-cached-permissions!);; on some occasions through weirdness we might accidentally try to insert a key that's already been inserted(catch Throwable ediff --git a/src/metabase/permissions/path.clj b/src/metabase/permissions/path.cljindex 719c650a7d3..98e973d47ef 100644--- a/src/metabase/permissions/path.clj+++ b/src/metabase/permissions/path.clj@@ -45,7 +45,4 @@"/application/monitoring/":subscription- "/application/subscription/"-- :data-studio- "/application/data-studio/"))+ "/application/subscription/"))diff --git a/src/metabase/permissions/util.clj b/src/metabase/permissions/util.cljindex 57b7489f98a..8ab3cf7b29b 100644--- a/src/metabase/permissions/util.clj+++ b/src/metabase/permissions/util.clj@@ -158,10 +158,9 @@"Any path starting with /application is a permissions that is not scoped by database or collection/application/setting/ -> permissions to access /admin/settings page/application/monitoring/ -> permissions to access tools, audit and troubleshooting- /application/subscription/ -> permisisons to create/edit subscriptions and alerts- /application/data-studio/ -> permissions to access data studio"+ /application/subscription/ -> permisisons to create/edit subscriptions and alerts"[:and "application/"- [:or "setting/" "monitoring/" "subscription/" "data-studio/"]])+ [:or "setting/" "monitoring/" "subscription/"]])(def ^:private block-permissions-rx"Any path starting with /block/ is for BLOCK aka anti-permissions.diff --git a/test/metabase/collections/models/collection_test.clj b/test/metabase/collections/models/collection_test.cljindex 2d3b0aa3ea7..2a40692ce99 100644--- a/test/metabase/collections/models/collection_test.clj+++ b/test/metabase/collections/models/collection_test.clj@@ -3308,41 +3308,29 @@non-archived-dashnon-archived-card]))))))))-(deftest create-library-test+(deftest create-library(mt/with-discard-model-updates! [:model/Collection]- (mt/with-group [test-group {:name "My Test Group"}]- (perms/grant-application-permissions! test-group :data-studio)- (testing "Can create a library if none exist"- (t2/update! (t2/table-name :model/Collection) :type collection/library-collection-type {:type nil})- (t2/update! (t2/table-name :model/Collection) :type collection/library-models-collection-type {:type nil})- (t2/update! (t2/table-name :model/Collection) :type collection/library-metrics-collection-type {:type nil})- (let [library (collection/create-library-collection!)]- (is (= "Library" (:name library)))- (is (= ["Data" "Metrics"] (sort (map :name (collection/descendants library)))))- (testing "Regular users can only read"- (binding [api/*current-user* (mt/user->id :lucky)- api/*current-user-permissions-set* (-> :lucky mt/user->id perms/user-permissions-set atom)]- (is (true? (mi/can-read? library)))- (is (false? (mi/can-write? library)))- (doseq [sub (collection/descendants library)]- (testing (str "collection: " (:name sub))- (is (true? (mi/can-read? sub)))- (is (false? (mi/can-write? sub)))))))- (testing "Users in data-studio can read and write"- (binding [api/*current-user* (mt/user->id :rasta)- api/*current-user-permissions-set* (-> :rasta mt/user->id perms/user-permissions-set atom)]- (is (true? (mi/can-read? library)))- (is (true? (mi/can-write? library)))- (doseq [sub (collection/descendants library)]- (testing (str "collection: " (:name sub))- (is (true? (mi/can-read? sub)))- (is (true? (mi/can-write? sub)))))))))- (testing "Creating a Layer when one already exists throws an exception"- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Library already exists" (collection/create-library-collection!))))- ;;cleanup created libraries- (t2/delete! :model/Collection :type [:in [collection/library-collection-type- collection/library-models-collection-type- collection/library-metrics-collection-type]]))))+ (testing "Can create a library if none exist"+ (t2/update! :model/Collection :type collection/library-collection-type {:type nil})+ (t2/update! :model/Collection :type collection/library-models-collection-type {:type nil})+ (t2/update! :model/Collection :type collection/library-metrics-collection-type {:type nil})+ (let [library (collection/create-library-collection!)]+ (is (= "Library" (:name library)))+ (is (= ["Data" "Metrics"] (sort (map :name (collection/descendants library)))))+ (testing "Only admins can write to the library, all users can read"+ (binding [api/*current-user* (mt/user->id :rasta)+ api/*current-user-permissions-set* (-> :rasta mt/user->id perms/user-permissions-set atom)]+ (is (true? (mi/can-read? library)))+ (is (false? (mi/can-write? library)))+ (doseq [sub (collection/descendants library)]+ (is (true? (mi/can-read? sub)))+ (is (false? (mi/can-write? sub))))))))+ (testing "Creating a Layer when one already exists throws an exception"+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Library already exists" (collection/create-library-collection!))))+ ;;cleanup created libraries+ (t2/delete! :model/Collection :type [:in [collection/library-collection-type+ collection/library-models-collection-type+ collection/library-metrics-collection-type]])))(deftest is-library-collection?(mt/with-temp [:model/Collection {library-id :id} {:name "Test Library" :type collection/library-collection-type}diff --git a/test/metabase/permissions/models/permissions_test.clj b/test/metabase/permissions/models/permissions_test.cljindex 0f1db1a5dc8..70a575165ba 100644--- a/test/metabase/permissions/models/permissions_test.clj+++ b/test/metabase/permissions/models/permissions_test.clj@@ -2,13 +2,10 @@(:require[clojure.test :refer :all][metabase.audit-app.impl :as audit.impl]- [metabase.collections.core :as collections][metabase.collections.models.collection :as collection]- [metabase.collections.test-helpers :refer [without-library]][metabase.models.interface :as mi][metabase.permissions.models.permissions :as perms][metabase.permissions.models.permissions-group :as perms-group]- [metabase.permissions.path :as permissions.path][metabase.permissions.util :as perms.u][metabase.test :as mt][metabase.test.fixtures :as fixtures]@@ -287,20 +284,3 @@(testing "admin can create dashboard in root collection"(is (true? (mi/can-create? :model/Dashboard {}))))))))--(deftest assigning-data-studio-gives-library-access- (testing "If there is no library, nothing extra gets created"- (mt/with-temp [:model/PermissionsGroup {group-id :id}]- (perms/grant-application-permissions! group-id :data-studio)- (is (= #{group-id} (t2/select-fn-set :group_id [:model/Permissions :group_id] :object (permissions.path/application-perms-path :data-studio)))))- (testing "Granting data-studio application permission also grants read-write access to Library collections"- (without-library- (let [library (collections/create-library-collection!)- models-col (t2/select-one :model/Collection :type collection/library-models-collection-type)- metrics-col (t2/select-one :model/Collection :type collection/library-metrics-collection-type)]- (mt/with-temp [:model/PermissionsGroup {group-id :id}]- (perms/grant-application-permissions! group-id :data-studio)- (is (= #{group-id} (t2/select-fn-set :group_id [:model/Permissions :group_id] :object (permissions.path/application-perms-path :data-studio))))- (is (= #{group-id} (t2/select-fn-set :group_id [:model/Permissions :group_id] :object (permissions.path/collection-readwrite-path library))))- (is (= #{group-id} (t2/select-fn-set :group_id [:model/Permissions :group_id] :object (permissions.path/collection-readwrite-path models-col))))- (is (= #{group-id} (t2/select-fn-set :group_id [:model/Permissions :group_id] :object (permissions.path/collection-readwrite-path metrics-col))))))))))