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
Consolidate permissions e2e tests (#83645)
Nemanja Glumac6623df6c2211
diff --git a/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js b/e2e/test/scenarios/permissions/admin-permissions.cy.spec.jsindex 88e8264d21c..68c93dd999b 100644--- a/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js@@ -1,12 +1,8 @@const { H } = cy;import { SAMPLE_DB_ID, USER_GROUPS } from "e2e/support/cypress_data";-import {- ORDERS_DASHBOARD_ID,- ORDERS_QUESTION_ID,-} from "e2e/support/cypress_sample_instance_data";+import { SECOND_COLLECTION_ID } from "e2e/support/cypress_sample_instance_data";-const { ALL_USERS_GROUP, ADMIN_GROUP, COLLECTION_GROUP, DATA_GROUP } =- USER_GROUPS;+const { ALL_USERS_GROUP, ADMIN_GROUP, DATA_GROUP } = USER_GROUPS;const COLLECTION_ACCESS_PERMISSION_INDEX = 0;@@ -19,9 +15,6 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {});it("shows hidden tables", () => {- H.DataModel.visit({ databaseId: SAMPLE_DB_ID });- cy.icon("eye_crossed_out").eq(0).click();-cy.visit(`admin/permissions/data/group/${ALL_USERS_GROUP}/database/${SAMPLE_DB_ID}`,);@@ -84,6 +77,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {// Navigation to other collection should not show any warningsH.selectSidebarItem("Our analytics");+ cy.url().should("include", "/admin/permissions/collections/root");H.modal().should("not.exist");@@ -109,7 +103,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {cy.url().should("include", "/admin/permissions/data/group");});- it("allows to view and edit permissions", () => {+ it("doesn't propagate permissions after turning off 'Also change sub-collections' toggle (#30494), and allows to view and edit permissions", () => {cy.visit("/admin/permissions/collections");const collections = ["Our analytics", "First collection"];@@ -129,6 +123,51 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {["readonly", "View"],]);+ cy.log("Show selected option for the collection with children");+ H.selectPermissionRow("All Users", COLLECTION_ACCESS_PERMISSION_INDEX);+ H.assertPermissionOptions(["Curate", "View", "No access"]);++ H.selectSidebarItem("Third collection");+ H.selectPermissionRow("All Users", COLLECTION_ACCESS_PERMISSION_INDEX);+ H.assertPermissionOptions(["Curate", "View"]);++ visitSecondCollectionPermissions();++ cy.log("Doesn't propagate permissions after turning off the toggle");+ H.modifyPermission(+ "All Users",+ COLLECTION_ACCESS_PERMISSION_INDEX,+ "View",+ true, // Turn 'Also change sub-collections' toggle on+ );++ H.modifyPermission(+ "All Users",+ COLLECTION_ACCESS_PERMISSION_INDEX,+ null,+ false, // Turn 'Also change sub-collections' toggle off+ );++ // Navigate to children+ H.selectSidebarItem("Third collection");++ H.assertPermissionTable([+ ["Administrators", "Curate"],+ ["All Users", "No access"], // Check permission hasn't been propagated+ ["collection", "Curate"],+ ["data", "No access"],+ ["nosql", "No access"],+ ["readonly", "View"],+ ]);++ cy.log("View and edit permissions");+ visitSecondCollectionPermissions();+ H.assertPermissionForItem(+ "All Users",+ COLLECTION_ACCESS_PERMISSION_INDEX,+ "No access",+ );+H.modifyPermission("All Users",COLLECTION_ACCESS_PERMISSION_INDEX,@@ -200,72 +239,6 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {});});- it("don't propagate permissions after turning off 'Also change sub-collections' toggle (#30494)", () => {- cy.visit("/admin/permissions/collections");-- const collections = ["Our analytics", "First collection"];- H.assertSidebarItems(collections);-- H.selectSidebarItem("First collection");- H.assertSidebarItems([...collections, "Second collection"]);-- H.selectSidebarItem("Second collection");-- H.assertPermissionTable([- ["Administrators", "Curate"],- ["All Users", "No access"],- ["collection", "Curate"],- ["data", "No access"],- ["nosql", "No access"],- ["readonly", "View"],- ]);-- H.modifyPermission(- "All Users",- COLLECTION_ACCESS_PERMISSION_INDEX,- "View",- true, // Turn 'Also change sub-collections' toggle on- );-- H.modifyPermission(- "All Users",- COLLECTION_ACCESS_PERMISSION_INDEX,- null,- false, // Turn 'Also change sub-collections' toggle off- );-- // Navigate to children- H.selectSidebarItem("Third collection");-- H.assertPermissionTable([- ["Administrators", "Curate"],- ["All Users", "No access"], // Check permission hasn't been propagated- ["collection", "Curate"],- ["data", "No access"],- ["nosql", "No access"],- ["readonly", "View"],- ]);- });-- it("show selected option for the collection with children", () => {- cy.visit("/admin/permissions/collections");-- const collections = ["Our analytics", "First collection"];- H.assertSidebarItems(collections);-- H.selectSidebarItem("First collection");- H.assertSidebarItems([...collections, "Second collection"]);-- H.selectSidebarItem("Second collection");- H.selectPermissionRow("All Users", COLLECTION_ACCESS_PERMISSION_INDEX);- H.assertPermissionOptions(["Curate", "View", "No access"]);-- H.selectSidebarItem("Third collection");- H.selectPermissionRow("All Users", COLLECTION_ACCESS_PERMISSION_INDEX);-- H.assertPermissionOptions(["Curate", "View"]);- });-context("data permissions", () => {it("warns about leaving with unsaved changes", () => {cy.visit("/admin/permissions");@@ -344,7 +317,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {]);});- it("should show a modal when a revision changes while an admin is editing", () => {+ it("should show a modal when a revision changes while an admin is editing, in the group and database focused views", () => {cy.intercept("/api/permissions/graph/group/1").as("graph");cy.visit("/admin/permissions");@@ -366,12 +339,9 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {H.modal().findByText("Someone just changed permissions");});});- });- });- context("database focused view", () => {- it("should show a modal when a revision changes while an admin is editing", () => {- cy.intercept("/api/permissions/graph/group/1").as("graph");+ cy.log("Database focused view");+ cy.intercept("/api/permissions/graph/group/1").as("graph2");cy.visit("/admin/permissions/");H.selectSidebarItem("collection");@@ -382,7 +352,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {"Query builder and native",);- cy.get("@graph").then((data) => {+ cy.get("@graph2").then((data) => {cy.request("PUT", "/api/permissions/graph", {groups: {},revision: data.response.body.revision,@@ -398,61 +368,6 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {});});-describe("scenarios > admin > permissions", () => {- beforeEach(() => {- H.restore();- cy.signInAsAdmin();- H.activateToken("pro-self-hosted");- });-- it("Visualization and Settings query builder buttons are not visible for questions that use blocked data sources", () => {- cy.updatePermissionsGraph({- [ALL_USERS_GROUP]: {- [SAMPLE_DB_ID]: {- "view-data": "blocked",- },- },- [COLLECTION_GROUP]: {- [SAMPLE_DB_ID]: {- "view-data": "blocked",- },- },- });-- cy.signIn("nodata");- H.visitQuestion(ORDERS_QUESTION_ID);-- H.queryBuilderMain().findByText(- "Sorry, you don't have permission to run this query.",- );- H.queryBuilderFooter()- .findByTestId("viz-settings-button")- .should("not.exist");- H.queryBuilderFooter().findByText("Visualization").should("not.exist");- });-- it("shows permission error for cards that use blocked data sources", () => {- cy.updatePermissionsGraph({- [ALL_USERS_GROUP]: {- [SAMPLE_DB_ID]: {- "view-data": "blocked",- },- },- [COLLECTION_GROUP]: {- [SAMPLE_DB_ID]: {- "view-data": "blocked",- },- },- });-- cy.signIn("nodata");- H.visitDashboard(ORDERS_DASHBOARD_ID);-- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("Sorry, you don't have permission to see this card.");- });-});-describe("scenarios > admin > permissions", () => {beforeEach(() => {H.restore();@@ -474,17 +389,15 @@ describe("scenarios > admin > permissions", () => {cy.findByText("Data permissions");cy.findByText("Database ‘View data’ levels").click();- cy.findByTestId("database-view-data-level").should(- "not.contain",- /No self-service/,- );+ cy.findByTestId("database-view-data-level")+ .should("contain", "Can view")+ .and("not.contain", "No self-service");cy.findByText("Database ‘View data’ levels").click();cy.findByText(/Schema or table ‘View data’ levels/).click();- cy.findByTestId("schema-table-level").should(- "not.contain",- /No self-service/,- );+ cy.findByTestId("schema-table-level")+ .should("contain", "Can view")+ .and("not.contain", "No self-service");cy.findByText(/Schema or table ‘View data’ levels/).click();cy.findByText("‘Create queries’ levels");@@ -493,8 +406,6 @@ describe("scenarios > admin > permissions", () => {});// Data permissions w/ `legacy-no-self-service` in graph- cy.visit("/admin/permissions");-cy.intercept("GET", `/api/permissions/graph/group/${ALL_USERS_GROUP}`, {statusCode: 200,body: {@@ -510,6 +421,7 @@ describe("scenarios > admin > permissions", () => {},},});+ cy.visit("/admin/permissions");cy.get("main").within(() => {cy.findByText("Permissions help").as("permissionHelpButton").click();@@ -520,7 +432,10 @@ describe("scenarios > admin > permissions", () => {.as("permissionsHelpContent").within(() => {cy.findByText("Database ‘View data’ levels").click();- cy.findAllByText(/No self-service/);+ cy.findByTestId("database-view-data-level").should(+ "contain",+ "No self-service",+ );cy.findByLabelText("Close").click();});@@ -543,12 +458,28 @@ describe("scenarios > admin > permissions", () => {cy.get("@permissionsHelpContent").within(() => {cy.findByText("Data permissions");});++ // Application permissions+ cy.visit("/admin/permissions/application");+ cy.get("main").within(() => {+ cy.findByText("Permissions help").as("permissionHelpButton").click();+ cy.get("@permissionHelpButton").should("not.exist");+ });++ cy.findByLabelText("Permissions help reference").within(() => {+ cy.findAllByText("Applications permissions");++ cy.findByText(+ "Application settings are useful for granting groups access to some, but not all, of Metabase’s administrative features.",+ );+ cy.findByLabelText("Close").click();+ });});- it("should show a dismissable modal and banner showing split permission changes (#metabase#45073", () => {+ it("should show a dismissable modal and banner showing split permission changes (metabase#45073)", () => {// We need a way to pass true values for these settings in CI. Generally in CI, these values will always be false// because we always start with a fresh instance. However, to test the flow of someone who has upgraded from 49 -> current- // we set them to false and ensure a modal is shown explaining the new permissions structure+ // we set them to true and ensure a modal is shown explaining the new permissions structureconst tempState = {"show-updated-permission-modal": true,"show-updated-permission-banner": true,@@ -592,6 +523,8 @@ describe("scenarios > admin > permissions", () => {cy.wait("@sessionProps");cy.reload();+ cy.wait("@sessionProps");+ cy.findByRole("menuitem", { name: "All Users" }).should("be.visible");cy.findByRole("dialog", { name: /permissions may look different/ }).should("not.exist",@@ -602,7 +535,7 @@ describe("scenarios > admin > permissions", () => {it("split permission change modal should dismiss even if network request fails", () => {// We need a way to pass true values for these settings in CI. Generally in CI, these values will always be false// because we always start with a fresh instance. However, to test the flow of someone who has upgraded from 49 -> current- // we set them to false and ensure a modal is shown explaining the new permissions structure+ // we set them to true and ensure a modal is shown explaining the new permissions structureconst tempState = {"show-updated-permission-modal": true,};@@ -630,6 +563,10 @@ describe("scenarios > admin > permissions", () => {"not.exist",);cy.findByRole("menuitem", { name: "All Users" }).click();+ cy.url().should(+ "include",+ `/admin/permissions/data/group/${ALL_USERS_GROUP}`,+ );});});@@ -731,3 +668,10 @@ describe("scenarios > admin > permissions", () => {});});});++function visitSecondCollectionPermissions() {+ cy.visit(`/admin/permissions/collections/${SECOND_COLLECTION_ID}`);+ cy.get("main")+ .findByText("Permissions for Second collection")+ .should("be.visible");+}diff --git a/e2e/test/scenarios/permissions/application-permissions.cy.spec.js b/e2e/test/scenarios/permissions/application-permissions.cy.spec.jsindex 447d096f653..a9005f4e8f7 100644--- a/e2e/test/scenarios/permissions/application-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/application-permissions.cy.spec.js@@ -18,24 +18,39 @@ describe("scenarios > admin > permissions > application", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();- // H.activateToken("pro-self-hosted");H.activateToken("pro-self-hosted");});- it("shows permissions help", () => {- cy.visit("/admin/permissions/application");- cy.get("main").within(() => {- cy.findByText("Permissions help").as("permissionHelpButton").click();- cy.get("@permissionHelpButton").should("not.exist");- });+ describe("default permissions", () => {+ it("gives ability to create dashboard subscriptions and question alerts, but not to access monitoring tools", () => {+ H.setupSMTP();+ cy.signInAsNormalUser();++ cy.log("Set up a dashboard subscription");+ H.visitDashboard(ORDERS_DASHBOARD_ID);+ H.toggleDashboardSubscriptionsSidebar();+ H.sidebar().findByText("Email this dashboard").should("exist");++ cy.log("Create a question alert");+ H.visitQuestion(ORDERS_QUESTION_ID);+ cy.findByLabelText("Move, trash, and more…").click();+ H.popover().findByText("Create an alert").click();+ H.modal().findByText("New alert").should("be.visible");++ cy.log("Monitoring tools are not accessible");+ cy.visit("/");+ H.getProfileLink().click();- cy.findByLabelText("Permissions help reference").within(() => {- cy.findAllByText("Applications permissions");+ H.popover()+ .findByTestId("mode-switcher-profile-link")+ .should("be.visible");+ H.popover().findByText(adminAppLinkText).should("not.exist");- cy.findByText(- "Application settings are useful for granting groups access to some, but not all, of Metabase’s administrative features.",- );- cy.findByLabelText("Close").click();+ cy.visit("/monitor/errors");+ H.main().findByText("Sorry, you don’t have permission to see that.");++ cy.visit("/monitor");+ H.main().findByText("Sorry, you don’t have permission to see that.");});});@@ -54,6 +69,7 @@ describe("scenarios > admin > permissions > application", () => {cy.button("Yes").click();});+ H.setupSMTP();createSubscription(NORMAL_USER_ID);cy.signInAsNormalUser();@@ -62,7 +78,13 @@ describe("scenarios > admin > permissions > application", () => {it("revokes ability to create subscriptions and alerts and manage them", () => {H.visitDashboard(ORDERS_DASHBOARD_ID);+ H.sharingMenuButton().should("be.visible");+ H.dashboardHeader()+ .findByTestId("dashboard-subscriptions-button")+ .should("not.exist");+H.openSharingMenu();+ H.sharingMenu().findByText("Copy link").should("be.visible");H.sharingMenu().findByText(/subscri/i).should("not.exist");@@ -74,28 +96,11 @@ describe("scenarios > admin > permissions > application", () => {cy.visit("/account/notifications");cy.findByTestId("notifications-list").within(() => {+ cy.findByText("Subscription").should("be.visible");cy.icon("close").should("not.exist");});});});-- describe("granted", () => {- it("gives ability to create dashboard subscriptions and question alerts", () => {- H.setupSMTP();- cy.signInAsNormalUser();-- cy.log("Set up a dashboard subscription");- H.visitDashboard(ORDERS_DASHBOARD_ID);- H.toggleDashboardSubscriptionsSidebar();- H.sidebar().findByText("Email this dashboard").should("exist");-- cy.log("Create a question alert");- H.visitQuestion(ORDERS_QUESTION_ID);- cy.findByLabelText("Move, trash, and more…").click();- H.popover().findByText("Create an alert").click();- H.modal().findByText("New alert").should("be.visible");- });- });});describe("monitoring permission", () => {@@ -113,14 +118,6 @@ describe("scenarios > admin > permissions > application", () => {cy.button("Yes").click();});- H.createNativeQuestion(- {- name: "broken_question",- native: { query: "select * from broken_question" },- },- { loadMetadata: true },- );-cy.signInAsNormalUser();});@@ -140,22 +137,6 @@ describe("scenarios > admin > permissions > application", () => {cy.findByTestId("monitor-main").findByText("Erroring questions");});});-- describe("revoked", () => {- it("does not allow accessing admin tools for non-admins", () => {- cy.signInAsNormalUser();- cy.visit("/");- H.getProfileLink().click();-- H.popover().findByText(adminAppLinkText).should("not.exist");-- cy.visit("/monitor/errors");- H.main().findByText("Sorry, you don’t have permission to see that.");-- cy.visit("/monitor");- H.main().findByText("Sorry, you don’t have permission to see that.");- });- });});describe("settings permission", () => {@@ -181,8 +162,6 @@ describe("scenarios > admin > permissions > application", () => {cy.url().should("include", "/admin/settings/general");cy.findByTestId("admin-layout-content").within(() => {- cy.findByText("License and Billing").should("not.exist");- cy.findByLabelText("Updates").should("not.exist");cy.findByLabelText("Site name").should("be.visible").clear()diff --git a/e2e/test/scenarios/permissions/create-queries.cy.spec.js b/e2e/test/scenarios/permissions/create-queries.cy.spec.jsindex ac9380afacd..6539ef0536d 100644--- a/e2e/test/scenarios/permissions/create-queries.cy.spec.js+++ b/e2e/test/scenarios/permissions/create-queries.cy.spec.js@@ -1,7 +1,7 @@const { H } = cy;import { USER_GROUPS } from "e2e/support/cypress_data";-const { ALL_USERS_GROUP } = USER_GROUPS;+const { ALL_USERS_GROUP, DATA_GROUP } = USER_GROUPS;const NATIVE_QUERIES_PERMISSION_INDEX = 0;@@ -59,7 +59,9 @@ describe("scenarios > admin > permissions > create queries > granular", () => {// should not allow 'query builder and native' as a granular permissions permission optionsH.selectPermissionRow("Orders", NATIVE_QUERIES_PERMISSION_INDEX);- H.popover().should("not.contain", "Query builder and native");+ H.popover()+ .should("contain", "Query builder only")+ .and("not.contain", "Query builder and native");// should have db set to granularH.selectSidebarItem("All Users");@@ -89,55 +91,13 @@ describe("scenarios > admin > permissions > create queries > granular", () => {});});-describe("scenarios > admin > permissions > create queries > no", () => {- beforeEach(() => {- H.restore();- cy.signInAsAdmin();- });-- it("should allow setting create queries to 'no' in group view", () => {- cy.visit("/admin/permissions/data");- H.selectSidebarItem("data");-- H.modifyPermission(- "Sample Database",- NATIVE_QUERIES_PERMISSION_INDEX,- "No",- );-- H.assertPermissionTable([["Sample Database", "No"]]);-- cy.button("Save changes").click();-- H.modal().within(() => {- cy.findByText("Save permissions?");- cy.button("Yes").click();- });-- H.assertPermissionTable([["Sample Database", "No"]]);-- cy.findByTextEnsureVisible("Sample Database").click();-- H.assertPermissionTable([- ["Accounts", "No"],- ["Analytic Events", "No"],- ["Feedback", "No"],- ["Invoices", "No"],- ["Orders", "No"],- ["People", "No"],- ["Products", "No"],- ["Reviews", "No"],- ]);- });-});-describe("scenarios > admin > permissions > create queries > query builder and native", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();});- it("should allow setting create queries to 'query builder and native' in group view", () => {+ it("should allow setting create queries to 'query builder and native' and 'no' in group view", () => {cy.visit("/admin/permissions");H.selectSidebarItem("collection");@@ -159,7 +119,9 @@ describe("scenarios > admin > permissions > create queries > query builder and n// Test that query builder and native is not an option when it's not selected at table levelH.selectPermissionRow("Orders", NATIVE_QUERIES_PERMISSION_INDEX);- H.popover().should("not.contain", "Query builder and native");+ H.popover()+ .should("contain", "Query builder only")+ .and("not.contain", "Query builder and native");// Navigate backH.selectSidebarItem("collection");@@ -205,6 +167,9 @@ describe("scenarios > admin > permissions > create queries > query builder and n// After saving permissions, user should be able to make further edits without refreshing the page// metabase#37811+ cy.intercept("GET", `/api/permissions/graph/group/${DATA_GROUP}`).as(+ "dataGroupGraph",+ );H.selectSidebarItem("data");H.modifyPermission(@@ -213,8 +178,35 @@ describe("scenarios > admin > permissions > create queries > query builder and n"No",);+ H.assertPermissionTable([["Sample Database", "No"]]);++ cy.wait("@dataGroupGraph");cy.button("Refresh the page").should("not.exist");+ cy.button("Save changes").click();++ H.modal().within(() => {+ cy.findByText("Save permissions?");+ cy.button("Yes").click();+ });++ H.assertPermissionTable([["Sample Database", "No"]]);++ cy.findByTextEnsureVisible("Sample Database").click();++ H.assertPermissionTable([+ ["Accounts", "No"],+ ["Analytic Events", "No"],+ ["Feedback", "No"],+ ["Invoices", "No"],+ ["Orders", "No"],+ ["People", "No"],+ ["Products", "No"],+ ["Reviews", "No"],+ ]);++ H.selectSidebarItem("data");+// User should have the option to change permissions back to query builder and native at the database levelH.modifyPermission("Sample Database",@@ -223,7 +215,7 @@ describe("scenarios > admin > permissions > create queries > query builder and n);});- it("should allow setting create queries to 'query builder and native' in database view", () => {+ it("should allow setting create queries to 'query builder only' and then 'query builder and native' in database view", () => {cy.visit("/admin/permissions/");cy.findByRole("tab", { name: "Databases" }).click();@@ -241,43 +233,50 @@ describe("scenarios > admin > permissions > create queries > query builder and n["readonly", "No"],]);- H.modifyPermission(- "readonly",- NATIVE_QUERIES_PERMISSION_INDEX,- "Query builder and native",- );-- const finalPermissions = [- ["Administrators", "Query builder and native"],- ["All Users", "No"],- ["collection", "No"],- ["data", "Query builder and native"],- ["nosql", "Query builder only"],- ["readonly", "Query builder and native"],- ];- H.assertPermissionTable(finalPermissions);-- H.selectSidebarItem("Orders");-- H.assertPermissionTable(finalPermissions);-- // Navigate back- cy.get("a").contains("Sample Database").click();-- cy.button("Save changes").click();-- H.modal().within(() => {- cy.findByText("Save permissions?");- cy.contains(- "readonly will be able to use the query builder and write native queries for Sample Database.",- );- cy.button("Yes").click();+ [+ {+ value: "Query builder only",+ message:+ "readonly will only be able to use the query builder for Sample Database.",+ },+ {+ value: "Query builder and native",+ message:+ "readonly will be able to use the query builder and write native queries for Sample Database.",+ },+ ].forEach(({ value, message }) => {+ cy.log(value);+ H.modifyPermission("readonly", NATIVE_QUERIES_PERMISSION_INDEX, value);++ const finalPermissions = [+ ["Administrators", "Query builder and native"],+ ["All Users", "No"],+ ["collection", "No"],+ ["data", "Query builder and native"],+ ["nosql", "Query builder only"],+ ["readonly", value],+ ];+ H.assertPermissionTable(finalPermissions);++ H.selectSidebarItem("Orders");++ H.assertPermissionTable(finalPermissions);++ // Navigate back+ cy.get("a").contains("Sample Database").click();++ cy.button("Save changes").click();++ H.modal().within(() => {+ cy.findByText("Save permissions?");+ cy.contains(message);+ cy.button("Yes").click();+ });++ cy.button("Save changes").should("not.exist");++ H.assertPermissionTable(finalPermissions);});-- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("Save changes").should("not.exist");-- H.assertPermissionTable(finalPermissions);});});@@ -348,25 +347,6 @@ describe("scenarios > admin > permissions > create queries > query builder only"cy.findByText("Save changes").should("not.exist");H.assertPermissionTable(finalTablePermissions);-- // After saving permissions, user should be able to make further edits without refreshing the page- // metabase#37811- H.selectSidebarItem("data");-- H.modifyPermission(- "Sample Database",- NATIVE_QUERIES_PERMISSION_INDEX,- "No",- );-- cy.button("Refresh the page").should("not.exist");-- // User should have the option to change permissions back to query builder only at the database level- H.modifyPermission(- "Sample Database",- NATIVE_QUERIES_PERMISSION_INDEX,- "Query builder only",- );});it("should set entire database to 'query builder only' if a table is changed to it while db is 'query builder only'", () => {@@ -441,143 +421,4 @@ describe("scenarios > admin > permissions > create queries > query builder only"H.assertPermissionTable(finalTablePermissions);});-- it("should allow setting create queries to 'query builder only' in group view", () => {- cy.visit("/admin/permissions");- H.selectSidebarItem("collection");-- H.assertPermissionTable([["Sample Database", "No"]]);-- // Drill down to tables permissions- cy.findByTextEnsureVisible("Sample Database").click();-- H.assertPermissionTable([- ["Accounts", "No"],- ["Analytic Events", "No"],- ["Feedback", "No"],- ["Invoices", "No"],- ["Orders", "No"],- ["People", "No"],- ["Products", "No"],- ["Reviews", "No"],- ]);-- // Navigate back- H.selectSidebarItem("collection");-- H.modifyPermission(- "Sample Database",- NATIVE_QUERIES_PERMISSION_INDEX,- "Query builder only",- );-- H.assertPermissionTable([["Sample Database", "Query builder only"]]);-- // Drill down to tables permissions- cy.findByTextEnsureVisible("Sample Database").click();-- const finalTablePermissions = [- ["Accounts", "Query builder only"],- ["Analytic Events", "Query builder only"],- ["Feedback", "Query builder only"],- ["Invoices", "Query builder only"],- ["Orders", "Query builder only"],- ["People", "Query builder only"],- ["Products", "Query builder only"],- ["Reviews", "Query builder only"],- ];-- H.assertPermissionTable(finalTablePermissions);-- cy.button("Save changes").click();-- H.modal().within(() => {- cy.findByText("Save permissions?");- cy.contains(- "collection will only be able to use the query builder for Sample Database.",- );- cy.button("Yes").click();- });-- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("Save changes").should("not.exist");-- H.assertPermissionTable(finalTablePermissions);-- // After saving permissions, user should be able to make further edits without refreshing the page- // metabase#37811- H.selectSidebarItem("data");-- H.modifyPermission(- "Sample Database",- NATIVE_QUERIES_PERMISSION_INDEX,- "No",- );-- cy.button("Refresh the page").should("not.exist");-- // User should have the option to change permissions back to query builder only at the database level- H.modifyPermission(- "Sample Database",- NATIVE_QUERIES_PERMISSION_INDEX,- "Query builder only",- );- });-- it("should allow setting create queries to 'query builder only' in database view", () => {- cy.visit("/admin/permissions/");- cy.findByRole("tab", { name: "Databases" }).click();-- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("Select a database to see group permissions");-- H.selectSidebarItem("Sample Database");-- H.assertPermissionTable([- ["Administrators", "Query builder and native"],- ["All Users", "No"],- ["collection", "No"],- ["data", "Query builder and native"],- ["nosql", "Query builder only"],- ["readonly", "No"],- ]);-- H.modifyPermission(- "readonly",- NATIVE_QUERIES_PERMISSION_INDEX,- "Query builder only",- );-- const finalPermissions = [- ["Administrators", "Query builder and native"],- ["All Users", "No"],- ["collection", "No"],- ["data", "Query builder and native"],- ["nosql", "Query builder only"],- ["readonly", "Query builder only"],- ];- H.assertPermissionTable(finalPermissions);-- H.selectSidebarItem("Orders");-- H.assertPermissionTable(finalPermissions);-- // Navigate back- cy.get("a").contains("Sample Database").click();-- cy.button("Save changes").click();-- H.modal().within(() => {- cy.findByText("Save permissions?");- cy.contains(- "readonly will only be able to use the query builder for Sample Database.",- );- cy.button("Yes").click();- });-- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("Save changes").should("not.exist");-- H.assertPermissionTable(finalPermissions);- });});diff --git a/e2e/test/scenarios/permissions/data-model-permissions.cy.spec.js b/e2e/test/scenarios/permissions/data-model-permissions.cy.spec.jsindex c034907611d..0c687113156 100644--- a/e2e/test/scenarios/permissions/data-model-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/data-model-permissions.cy.spec.js@@ -14,7 +14,6 @@ describe("scenarios > admin > permissions", () => {H.activateToken("pro-self-hosted");cy.intercept("PUT", "/api/table/*").as("tableUpdate");- cy.intercept("PUT", "/api/field/*").as("fieldUpdate");cy.intercept("GET","/api/table/*/query_metadata?include_sensitive_fields=true&include_editable_data_model=true",@@ -61,6 +60,7 @@ describe("scenarios > admin > permissions", () => {H.DataModel.TablePicker.getTable("Changed Name").button("Hide table").click();+ cy.wait("@tableUpdate");H.DataModel.TablePicker.getTable("Changed Name").button("Hide table").should("not.exist");diff --git a/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js b/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.jsindex 5117dc0e3ee..148e3b72de5 100644--- a/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js+++ b/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js@@ -130,7 +130,7 @@ describe("scenarios > admin > permissions > downgrade ee to oss", () => {H.modifyPermission("Orders",- EE_DATA_ACCESS_PERMISSION_INDEX,+ OSS_NATIVE_QUERIES_PERMISSION_INDEX,"Query builder only",);diff --git a/e2e/test/scenarios/permissions/download-permissions.cy.spec.js b/e2e/test/scenarios/permissions/download-permissions.cy.spec.jsindex 27ddfe0d9fd..ca966588685 100644--- a/e2e/test/scenarios/permissions/download-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/download-permissions.cy.spec.js@@ -43,6 +43,8 @@ describe("scenarios > admin > permissions > data > downloads", () => {});it("setting downloads permission UI flow should work", () => {+ cy.intercept("PUT", "/api/permissions/graph").as("saveGraph");+cy.log("allows changing download results permission for a database");cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);@@ -56,6 +58,8 @@ describe("scenarios > admin > permissions > data > downloads", () => {cy.findByText("Are you sure you want to do this?");cy.button("Yes").click();});+ cy.wait("@saveGraph").its("response.statusCode").should("eq", 200);+ cy.reload();H.assertPermissionForItem("All Users", DOWNLOAD_PERMISSION_INDEX, "No");@@ -76,6 +80,8 @@ describe("scenarios > admin > permissions > data > downloads", () => {cy.findByText("Are you sure you want to do this?");cy.button("Yes").click();});+ cy.wait("@saveGraph").its("response.statusCode").should("eq", 200);+ cy.reload();H.assertPermissionForItem("All Users",@@ -107,6 +113,7 @@ describe("scenarios > admin > permissions > data > downloads", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Showing first 2,000 rows");+ cy.findByLabelText("Download results").should("not.exist");cy.icon("download").should("not.exist");});@@ -126,6 +133,7 @@ describe("scenarios > admin > permissions > data > downloads", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Showing first 2,000 rows");+ cy.findByLabelText("Download results").should("not.exist");cy.icon("download").should("not.exist");H.visitDashboard(ORDERS_DASHBOARD_ID);@@ -153,6 +161,7 @@ describe("scenarios > admin > permissions > data > downloads", () => {cy.signInAsNormalUser();H.visitQuestion(ORDERS_QUESTION_ID);+ assertDownloadPerms(`@cardQuery${ORDERS_QUESTION_ID}`, "limited");H.downloadAndAssert({ fileType: "xlsx", questionId: ORDERS_QUESTION_ID });});@@ -177,19 +186,25 @@ describe("scenarios > admin > permissions > data > downloads", () => {cy.get("@nativeQuestionId").then((id) => {H.visitQuestion(id);+ assertDownloadPerms(`@cardQuery${id}`, "full");H.downloadAndAssert({ fileType: "xlsx", questionId: id });// Make sure we can download results from an ad-hoc nested query based on a native questioncy.findByText("Explore results").click();cy.wait("@dataset");+ assertDownloadPerms("@dataset", "full");H.downloadAndAssert({ fileType: "xlsx" });// Make sure we can download results from a native model- cy.request("PUT", `/api/card/${id}`, { name: "Native Model" });+ cy.request("PUT", `/api/card/${id}`, {+ name: "Native Model",+ type: "model",+ });- H.visitQuestion(id);+ H.visitModel(id);+ assertDownloadPerms(`@modelQuery${id}`, "full");H.downloadAndAssert({ fileType: "xlsx", questionId: id });});@@ -204,6 +219,7 @@ describe("scenarios > admin > permissions > data > downloads", () => {H.visitQuestion(id);cy.findByText("Showing first 2,000 rows");+ cy.findByLabelText("Download results").should("not.exist");cy.icon("download").should("not.exist");// Ad-hoc nested query also shouldn't be downloadable@@ -211,14 +227,19 @@ describe("scenarios > admin > permissions > data > downloads", () => {cy.wait("@dataset");cy.findByText("Showing first 2,000 rows");+ cy.findByLabelText("Download results").should("not.exist");cy.icon("download").should("not.exist");// Convert question to a model, which also shouldn't be downloadable- cy.request("PUT", `/api/card/${id}`, { name: "Native Model" });+ cy.request("PUT", `/api/card/${id}`, {+ name: "Native Model",+ type: "model",+ });- H.visitQuestion(id);+ H.visitModel(id);cy.findByText("Showing first 2,000 rows");+ cy.findByLabelText("Download results").should("not.exist");cy.icon("download").should("not.exist");});});@@ -230,19 +251,25 @@ describe("scenarios > admin > permissions > data > downloads", () => {cy.get("@nativeQuestionId").then((id) => {H.visitQuestion(id);+ assertDownloadPerms(`@cardQuery${id}`, "limited");H.downloadAndAssert({ fileType: "xlsx", questionId: id });// Ad-hoc nested query based on a native question should also have a download row limitcy.findByText("Explore results").click();cy.wait("@dataset");+ assertDownloadPerms("@dataset", "limited");H.downloadAndAssert({ fileType: "xlsx" });// Convert question to a model, which should also have a download row limit- cy.request("PUT", `/api/card/${id}`, { name: "Native Model" });+ cy.request("PUT", `/api/card/${id}`, {+ name: "Native Model",+ type: "model",+ });- H.visitQuestion(id);+ H.visitModel(id);+ assertDownloadPerms(`@modelQuery${id}`, "limited");H.downloadAndAssert({ fileType: "xlsx", questionId: id });});@@ -272,3 +299,9 @@ function setDownloadPermissionsForProductsTable(permission) {},});}++function assertDownloadPerms(requestAlias, downloadPerms) {+ cy.get(requestAlias)+ .its("response.body.data.download_perms")+ .should("eq", downloadPerms);+}diff --git a/e2e/test/scenarios/permissions/impersonated.cy.spec.js b/e2e/test/scenarios/permissions/impersonated.cy.spec.jsindex 79a0e72e0c9..cd2b202e246 100644--- a/e2e/test/scenarios/permissions/impersonated.cy.spec.js+++ b/e2e/test/scenarios/permissions/impersonated.cy.spec.js@@ -7,13 +7,6 @@ const PG_DB_ID = 2;describe("impersonated permission", { tags: "@external" }, () => {describe("admins", () => {- beforeEach(() => {- H.restore("postgres-12");- H.createTestRoles({ type: "postgres" });- cy.signInAsAdmin();- H.activateToken("pro-self-hosted");- });-describe("impersonated users", () => {const setImpersonatedPermission = () => {cy.updatePermissionsGraph(@@ -52,7 +45,7 @@ describe("impersonated permission", { tags: "@external" }, () => {setImpersonatedPermission();});- it("have limited access", () => {+ it("have limited access, and caching does not circumvent it", () => {cy.signInAsImpersonatedUser();cy.visit(`/browse/databases/${PG_DB_ID}`);@@ -94,9 +87,11 @@ describe("impersonated permission", { tags: "@external" }, () => {H.runNativeQuery();cy.findAllByTestId("header-cell").contains("subtotal");- });- it("caching should not circumvent impersonation permissions", () => {+ cy.log("Caching should not circumvent impersonation permissions");+ cy.signInAsAdmin();+ cy.visit("/");+cy.log("create a question for a table the impersonated user does not have access to",);diff --git a/e2e/test/scenarios/permissions/permissions-baseline.cy.spec.js b/e2e/test/scenarios/permissions/permissions-baseline.cy.spec.jsindex cc0125055da..1ba65ae7349 100644--- a/e2e/test/scenarios/permissions/permissions-baseline.cy.spec.js+++ b/e2e/test/scenarios/permissions/permissions-baseline.cy.spec.js@@ -16,17 +16,16 @@ describe("scenarios > permissions", () => {"/admin",];- for (const path of PATHS) {- it(`should display the permissions screen on ${path}`, () => {- cy.signIn("none");+ it("should display the permissions screen on pages the user can't access, and not allow running adhoc native questions", () => {+ cy.signIn("none");++ PATHS.forEach((path) => {+ cy.log(path);cy.visit(path);checkUnauthorized();});- }-- it("should not allow to run adhoc native questions without permissions", () => {- cy.signIn("none");+ cy.log("adhoc native question");H.visitQuestionAdhoc({display: "scalar",@@ -41,14 +40,10 @@ describe("scenarios > permissions", () => {{ autorun: false },);- cy.findAllByLabelText("Refresh").should("be.disabled");- });-- it("should let a user with no data permissions view questions", () => {- cy.signIn("nodata");- H.visitQuestion(ORDERS_QUESTION_ID);- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.contains("February 11, 2028, 9:40 PM"); // check that the data loads+ cy.findByTestId("native-query-editor-container")+ .findByTestId("run-button")+ .should("be.visible")+ .and("be.disabled");});});diff --git a/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.js b/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.jsindex d4ab5f2ca0a..9a1b52898f7 100644--- a/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.js+++ b/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.js@@ -2,6 +2,7 @@ const { H } = cy;import { SAMPLE_DB_ID, USERS, USER_GROUPS } from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import {+ FIRST_COLLECTION_ID,NODATA_USER_ID,ORDERS_DASHBOARD_ID,ORDERS_QUESTION_ID,@@ -13,7 +14,7 @@ const { nocollection } = USERS;const PG_DB_ID = 2;-describe("postgres > user > query", { tags: "@external" }, () => {+describe("issue 14873", { tags: "@external" }, () => {beforeEach(() => {H.restore("postgres-12");cy.signInAsAdmin();@@ -40,8 +41,6 @@ describe("postgres > user > query", { tags: "@external" }, () => {},},});-- cy.intercept("POST", "/api/dataset/pivot").as("pivotDataset");});it("should handle the use of `regexExtract` in a sandboxed table (metabase#14873)", () => {@@ -106,6 +105,10 @@ describe("issue 19603", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("First collection").click();+ cy.url().should(+ "include",+ `/admin/permissions/collections/${FIRST_COLLECTION_ID}`,+ );// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Second collection").should("not.exist");});@@ -113,6 +116,7 @@ describe("issue 19603", () => {describe("issue 20436", () => {const url = `/admin/permissions/data/group/${ALL_USERS_GROUP}`;+ const CREATE_QUERIES_PERMISSION_INDEX = 1;function changePermissions(from, to) {cy.findAllByText(from).first().click();@@ -166,8 +170,11 @@ describe("issue 20436", () => {cy.wait("@updatePermissions");cy.visit(url);- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("Query builder only");+ H.assertPermissionForItem(+ "Sample Database",+ CREATE_QUERIES_PERMISSION_INDEX,+ "Query builder only",+ );});});@@ -176,10 +183,12 @@ describe("UI elements that make no sense for users without data permissions (metH.restore();});- it("should not offer to save question to users with no data permissions", () => {+ it("should let users without data permissions view but not save questions, and hide visualization settings when data is blocked", () => {cy.signIn("nodata");H.visitQuestion(ORDERS_QUESTION_ID);+ // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage+ cy.contains("February 11, 2028, 9:40 PM"); // check that the data loadscy.findByTestId("viz-settings-button");// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage@@ -210,9 +219,8 @@ describe("UI elements that make no sense for users without data permissions (metH.newButton().click();H.popover().should("contain", "Dashboard").and("not.contain", "Question");- });- it("should not show visualization or question settings to users with block data permissions", () => {+ cy.log("blocked data permissions");cy.signInAsAdmin();H.activateToken("pro-self-hosted");cy.updatePermissionsGraph({@@ -228,9 +236,9 @@ describe("UI elements that make no sense for users without data permissions (metH.visitQuestion(ORDERS_QUESTION_ID);- cy.findByTextEnsureVisible(- "Sorry, you don't have permission to run this query.",- );+ H.queryBuilderMain()+ .findByText("Sorry, you don't have permission to run this query.")+ .should("be.visible");H.queryBuilderFooter().findByTestId("viz-settings-button")@@ -243,6 +251,11 @@ describe("UI elements that make no sense for users without data permissions (metH.newButton().click();H.popover().should("contain", "Dashboard").and("not.contain", "Question");++ H.visitDashboard(ORDERS_DASHBOARD_ID);+ H.getDashboardCard()+ .findByText("Sorry, you don't have permission to see this card.")+ .should("be.visible");});});@@ -327,7 +340,7 @@ describe("issue 22695 ", () => {});});-describe("issue 22726", () => {+describe("issues 22726 and 22727", () => {beforeEach(() => {cy.intercept("POST", "/api/dataset").as("dataset");cy.intercept("POST", "/api/card").as("createCard");@@ -343,36 +356,7 @@ describe("issue 22726", () => {cy.signIn("nocollection");});- it("should offer to duplicate a question in a view-only collection (metabase#22726)", () => {- H.visitQuestion(ORDERS_QUESTION_ID);-- H.openQuestionActions();- H.popover().findByText("Duplicate").click();- cy.findByTextEnsureVisible(- `${H.getFullName(nocollection)}'s Personal Collection`,- );-- cy.button("Duplicate").click();- cy.wait("@createCard");- });-});--describe("issue 22727", () => {- beforeEach(() => {- cy.intercept("POST", "/api/dataset").as("dataset");-- H.restore();- cy.signInAsAdmin();-- // Let's give all users a read only access to "Our analytics"- cy.updateCollectionGraph({- [ALL_USERS_GROUP]: { root: "read" },- });-- cy.signIn("nocollection");- });-- it("should not offer to save question in view only collection (metabase#22727, metabase#20717)", () => {+ it("should not offer to save a question in a view-only collection, but should offer to duplicate it (metabase#22727, metabase#20717, metabase#22726)", () => {// It is important to start from a saved question and to alter it.// We already have a reproduction that makes sure "Our analytics" is not offered when starting from an ad-hoc question (table).H.visitQuestion(ORDERS_QUESTION_ID);@@ -385,15 +369,27 @@ describe("issue 22727", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Save").click();- cy.findByTestId("save-question-modal").then((modal) => {- // This part reproduces https://github.com/metabase/metabase/issues/20717- cy.findByText(/^Replace original qeustion/).should("not.exist");-+ cy.findByTestId("save-question-modal").within(() => {// This part is an actual repro for https://github.com/metabase/metabase/issues/22727cy.findByLabelText(/Where do you want to save this/)- .invoke("text")- .should("not.eq", "Our analytics");+ .should("contain.text", "Personal Collection")+ .and("not.contain.text", "Our analytics");++ // This part reproduces https://github.com/metabase/metabase/issues/20717+ cy.findByText(/^Replace original question/).should("not.exist");});++ cy.log("metabase#22726");+ H.visitQuestion(ORDERS_QUESTION_ID);++ H.openQuestionActions();+ H.popover().findByText("Duplicate").click();+ cy.findByTextEnsureVisible(+ `${H.getFullName(nocollection)}'s Personal Collection`,+ );++ cy.button("Duplicate").click();+ cy.wait("@createCard").its("response.statusCode").should("eq", 200);});});@@ -432,9 +428,10 @@ describe("issue 23981", () => {).click();H.entityPickerModal().within(() => {+ cy.findByText("Collections").should("be.visible");cy.findByText("Our analytics").should("not.exist");cy.log('ensure that "Collections" is not selectable');- cy.findByText("Collections").should("be.visible").click();+ cy.findByText("Collections").click();cy.button("Select this collection").should("be.disabled");});});@@ -476,6 +473,21 @@ describe("issue 24966", () => {const dashboardDetails = { parameters: [dashboardFilter] };+ const allCategories = ["Doohickey", "Gadget", "Gizmo", "Widget"];++ function verifyCategoryList(visibleCategories) {+ H.popover().within(() => {+ visibleCategories.forEach((value) => {+ cy.findByText(value).should("be.visible");+ });+ allCategories+ .filter((value) => !visibleCategories.includes(value))+ .forEach((value) => {+ cy.findByText(value).should("not.exist");+ });+ });+ }+beforeEach(() => {H.restore();cy.signInAsAdmin();@@ -539,6 +551,7 @@ describe("issue 24966", () => {cy.signIn("nodata");H.visitDashboard("@dashboardId");H.filterWidget().click();+ verifyCategoryList(["Gizmo"]);cy.findByLabelText("Gizmo").click();cy.button("Add filter").click();cy.location("search").should("eq", "?text=Gizmo");@@ -546,6 +559,7 @@ describe("issue 24966", () => {cy.signInAsSandboxedUser();H.visitDashboard("@dashboardId");H.filterWidget().click();+ verifyCategoryList(["Widget"]);cy.findByLabelText("Widget").click();cy.button("Add filter").click();cy.location("search").should("eq", "?text=Widget");diff --git a/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.ts b/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.tsindex bc83e62c87b..84e94f00fac 100644--- a/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.ts+++ b/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.ts@@ -74,16 +74,16 @@ describe("issue 11994", () => {cy.signIn("readonly");});- it("does not show raw data toggle for pivot questions (metabase#11994)", () => {+ it("does not show raw data toggle for pivot questions, nor offer to save combo question viewed in raw mode (metabase#11994)", () => {H.visitQuestion("@pivotQuestionId");+ cy.findByTestId("pivot-table").should("be.visible");cy.icon("table2").should("not.exist");cy.findByTestId("qb-header").findByText(/Save/).should("not.exist");- });- it("does not offer to save combo question viewed in raw mode (metabase#11994)", () => {H.visitQuestion("@comboQuestionId");cy.location().then((questionLocation) => {cy.icon("table2").click();+ H.tableInteractive().should("be.visible");cy.location("href").should("eq", questionLocation.href);});cy.findByTestId("qb-header").findByText(/Save/).should("not.exist");@@ -93,7 +93,6 @@ describe("issue 11994", () => {describe("issue 39221", () => {beforeEach(() => {cy.intercept("GET", "/api/setting").as("siteSettings");- cy.intercept("GET", "/api/session/properties").as("sessionProperties");H.restore();});@@ -104,12 +103,31 @@ describe("issue 39221", () => {// Unjustified type cast. FIXMEcy.signIn(user as "admin" | "normal");H.openReviewsTable({ mode: "notebook" });- // Opening a SQL preview sidebar will trigger a user-local setting updatecy.findByLabelText("View SQL").click();+ cy.findByTestId("native-query-preview-sidebar").should("be.visible");++ cy.intercept(+ "PUT",+ "/api/setting/notebook-native-preview-sidebar-width",+ ).as("updateSidebarWidth");+ cy.intercept("GET", "/api/session/properties").as("sessionProperties");++ // Resizing the SQL preview sidebar triggers a user-local setting update+ const options = { pointer: "mouse", button: "left" } as const;+ cy.findByTestId("notebook-native-preview-resize-handle").realMouseDown(+ options,+ );+ cy.findByTestId("notebook-native-preview-resize-handle").realMouseMove(+ -200,+ 0,+ );+ cy.findByTestId("notebook-native-preview-resize-handle").realMouseUp(+ options,+ );- cy.wait("@sessionProperties");+ cy.wait(["@updateSidebarWidth", "@sessionProperties"]);- cy.get("@siteSettings").should("be.null");+ cy.get("@siteSettings.all").should("have.length", 0);});});});diff --git a/e2e/test/scenarios/permissions/sandboxing/sandboxing-misconfiguration.cy.spec.ts b/e2e/test/scenarios/permissions/sandboxing/sandboxing-misconfiguration.cy.spec.tsindex d9d20cc3df9..52ae5b3991e 100644--- a/e2e/test/scenarios/permissions/sandboxing/sandboxing-misconfiguration.cy.spec.ts+++ b/e2e/test/scenarios/permissions/sandboxing/sandboxing-misconfiguration.cy.spec.ts@@ -12,91 +12,95 @@ import {const { H } = cy;-describe("admin > permissions > sandboxing > misconfiguration", () => {- before(() => {- H.restore("postgres-writable");-- cy.signInAsAdmin();- H.activateToken("pro-self-hosted");-- H.blockUserGroupPermissions(USER_GROUPS.ALL_USERS_GROUP, WRITABLE_DB_ID);- H.blockUserGroupPermissions(USER_GROUPS.COLLECTION_GROUP, WRITABLE_DB_ID);- H.blockUserGroupPermissions(USER_GROUPS.READONLY_GROUP, WRITABLE_DB_ID);-- // @ts-expect-error - this isn't typed yet- cy.createUserFromRawData(gizmoViewer);-- cy.log("Create a simple editable products table");- H.queryWritableDB("DROP TABLE IF EXISTS products");- H.queryWritableDB(- "CREATE TABLE IF NOT EXISTS products (id INT PRIMARY KEY, category VARCHAR, name VARCHAR)",- );- H.queryWritableDB(- "INSERT INTO products (id, name, category) VALUES (1, 'A', 'Gizmo'), (2, 'B', 'Widget')",- );- H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: "products" });-- H.snapshot("sandboxing-misconfiguration-snapshot");- });-- beforeEach(() => {- cy.signInAsAdmin();- // Unjustified type cast. FIXME- H.restore("sandboxing-misconfiguration-snapshot" as any);- });-- it("if we create a sandboxing policy on a column but then the column is deleted, the sandboxing system fails closed", () => {- assignAttributeToUser({ user: gizmoViewer, attributeValue: "Gizmo" });- configureSandboxPolicy(- {- filterTableBy: "column",- filterColumn: "Category",- },- {- tableName: "Products",- databaseId: WRITABLE_DB_ID,- },- );-- const questionData = {- name: "Simple question based on the 'Products' table",- model: "card",- };-- H.getTableId({- name: "products",- }).then((tableId) => {- H.createQuestion(- {- database: WRITABLE_DB_ID,- name: questionData.name,- query: {- "source-table": tableId,- limit: 20,- },- },- { wrapId: true },+describe(+ "admin > permissions > sandboxing > misconfiguration",+ { tags: "@external" },+ () => {+ before(() => {+ H.restore("postgres-writable");++ cy.signInAsAdmin();+ H.activateToken("pro-self-hosted");++ H.blockUserGroupPermissions(USER_GROUPS.ALL_USERS_GROUP, WRITABLE_DB_ID);+ H.blockUserGroupPermissions(USER_GROUPS.COLLECTION_GROUP, WRITABLE_DB_ID);+ H.blockUserGroupPermissions(USER_GROUPS.READONLY_GROUP, WRITABLE_DB_ID);++ // @ts-expect-error - this isn't typed yet+ cy.createUserFromRawData(gizmoViewer);++ cy.log("Create a simple editable products table");+ H.queryWritableDB("DROP TABLE IF EXISTS products");+ H.queryWritableDB(+ "CREATE TABLE IF NOT EXISTS products (id INT PRIMARY KEY, category VARCHAR, name VARCHAR)",+ );+ H.queryWritableDB(+ "INSERT INTO products (id, name, category) VALUES (1, 'A', 'Gizmo'), (2, 'B', 'Widget')",);+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: "products" });++ H.snapshot("sandboxing-misconfiguration-snapshot");});- signInAs(gizmoViewer);+ beforeEach(() => {+ cy.signInAsAdmin();+ // Unjustified type cast. FIXME+ H.restore("sandboxing-misconfiguration-snapshot" as any);+ });- cy.get<number>("@questionId").then((questionId) => {- getCardResponses([{ ...questionData, id: questionId }]).then((data) =>- rowsShouldContainOnlyOneCategory({- ...data,- productCategory: "Gizmo",- }),+ it("if we create a sandboxing policy on a column but then the column is deleted, the sandboxing system fails closed", () => {+ assignAttributeToUser({ user: gizmoViewer, attributeValue: "Gizmo" });+ configureSandboxPolicy(+ {+ filterTableBy: "column",+ filterColumn: "Category",+ },+ {+ tableName: "Products",+ databaseId: WRITABLE_DB_ID,+ },);- H.queryWritableDB("ALTER TABLE products DROP COLUMN category");-- cy.log(- "After the column is dropped, the sandboxing system should fail closed",- );- getCardResponses([{ ...questionData, id: questionId }]).then(- ({ responses }) => responses.forEach(assertResponseFailsClosed),- );+ const questionData = {+ name: "Simple question based on the 'Products' table",+ model: "card",+ };++ H.getTableId({+ name: "products",+ }).then((tableId) => {+ H.createQuestion(+ {+ database: WRITABLE_DB_ID,+ name: questionData.name,+ query: {+ "source-table": tableId,+ limit: 20,+ },+ },+ { wrapId: true },+ );+ });++ signInAs(gizmoViewer);++ cy.get<number>("@questionId").then((questionId) => {+ getCardResponses([{ ...questionData, id: questionId }]).then((data) =>+ rowsShouldContainOnlyOneCategory({+ ...data,+ productCategory: "Gizmo",+ }),+ );++ H.queryWritableDB("ALTER TABLE products DROP COLUMN category");++ cy.log(+ "After the column is dropped, the sandboxing system should fail closed",+ );+ getCardResponses([{ ...questionData, id: questionId }]).then(+ ({ responses }) => responses.forEach(assertResponseFailsClosed),+ );+ });});- });-});+ },+);diff --git a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.jsindex 7d62a0eedf4..bb929cf0dcd 100644--- a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js+++ b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js@@ -32,7 +32,10 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {cy.visit("/admin/people");});- it("should add key attributes to an existing user", () => {+ it("should add key attributes to an existing user and to a new user", () => {+ cy.intercept("PUT", "/api/user/*").as("updateUser");+ cy.intercept("POST", "/api/user").as("createUser");+cy.findByTestId("admin-people-list-table").icon("ellipsis").first()@@ -45,9 +48,12 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {cy.findByPlaceholderText("Value").type("3");cy.findByText("Update").click();});- });+ cy.wait("@updateUser").then(({ request, response }) => {+ expect(response.statusCode).to.eq(200);+ expect(request.body.login_attributes).to.have.property("User ID", "3");+ });+ H.modal().should("not.exist");- it("should add key attributes to a new user", () => {cy.button("Invite someone").click();H.modal().within(() => {cy.findByPlaceholderText("Johnny").type("John");@@ -61,8 +67,12 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {cy.findByPlaceholderText("Key").type("User ID");cy.findByPlaceholderText("Value").type("1");cy.findAllByText("Create").click();- cy.button("Done").click();});+ cy.wait("@createUser").then(({ request, response }) => {+ expect(response.statusCode).to.eq(200);+ expect(request.body.login_attributes).to.have.property("User ID", "1");+ });+ H.modal().button("Done").click();});});@@ -124,65 +134,58 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {cy.signInAsNormalUser();});- describe("table sandboxed on a user attribute", () => {- it("should display correct number of orders", () => {- H.openOrdersTable();- // 10 rows filtered on User ID- cy.findAllByText(ATTRIBUTE_VALUE).should("have.length", 10);- H.assertDatasetReqIsSandboxed({- columnId: ORDERS.USER_ID,- columnAssertion: Number(ATTRIBUTE_VALUE),- });+ it("should sandbox a table on a user attribute, a question with joins, and a table sandboxed on a saved parameterized SQL question", () => {+ cy.log("Table sandboxed on a user attribute");+ H.openOrdersTable();+ // 10 rows filtered on User ID+ cy.findAllByText(ATTRIBUTE_VALUE).should("have.length", 10);+ H.assertDatasetReqIsSandboxed({+ columnId: ORDERS.USER_ID,+ columnAssertion: Number(ATTRIBUTE_VALUE),});- });- describe("question with joins", () => {- it("should be sandboxed even after applying a filter to the question", () => {- cy.log("Open saved question with joins");- H.visitQuestion("@questionId");+ cy.log("Open saved question with joins");+ H.visitQuestion("@questionId");- cy.log("Make sure user is initially sandboxed");- cy.get(".test-TableInteractive-cellWrapper--firstColumn").should(- "have.length",- 10,- );+ cy.log("Make sure user is initially sandboxed");+ cy.get(".test-TableInteractive-cellWrapper--firstColumn").should(+ "have.length",+ 10,+ );- cy.log("Add filter to a question");- H.openNotebook();- H.filter({ mode: "notebook" });- H.popover().findByText("Total").click();- H.selectFilterOperator("Greater than");- H.popover().within(() => {- cy.findByPlaceholderText("Enter a number").type("100");- cy.button("Add filter").click();- });+ cy.log("Add filter to a question");+ H.openNotebook();+ H.filter({ mode: "notebook" });+ H.popover().findByText("Total").click();+ H.selectFilterOperator("Greater than");+ H.popover().within(() => {+ cy.findByPlaceholderText("Enter a number").type("100");+ cy.button("Add filter").click();+ });- H.visualize();- cy.log("Make sure user is still sandboxed");- H.assertDatasetReqIsSandboxed({- columnId: ORDERS.USER_ID,- columnAssetion: ATTRIBUTE_VALUE,- });- cy.get(".test-TableInteractive-cellWrapper--firstColumn").should(- "have.length",- 6,- );+ H.visualize();+ cy.log("Make sure user is still sandboxed");+ H.assertDatasetReqIsSandboxed({+ columnId: ORDERS.USER_ID,+ columnAssertion: Number(ATTRIBUTE_VALUE),});- });+ cy.get(".test-TableInteractive-cellWrapper--firstColumn").should(+ "have.length",+ 6,+ );- describe("table sandboxed on a saved parameterized SQL question", () => {- it("should show filtered categories", () => {- H.openPeopleTable();- H.assertDatasetReqIsSandboxed({- columnId: PEOPLE.ID,- columnAssertion: Number(ATTRIBUTE_VALUE),- });- cy.findAllByTestId("header-cell").should("have.length", 4);- cy.get(".test-TableInteractive-cellWrapper--firstColumn").should(- "have.length",- 1,- );+ cy.log("Table sandboxed on a saved parameterized SQL question");+ cy.visit("/");+ H.openPeopleTable();+ H.assertDatasetReqIsSandboxed({+ columnId: PEOPLE.ID,+ columnAssertion: Number(ATTRIBUTE_VALUE),});+ cy.findAllByTestId("header-cell").should("have.length", 4);+ cy.get(".test-TableInteractive-cellWrapper--firstColumn").should(+ "have.length",+ 1,+ );});});@@ -191,13 +194,14 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {function verifyCategoryList(visibleCategories) {H.popover().within(() => {- allCategories.forEach((value) => {- if (visibleCategories.includes(value)) {- cy.findByText(value).should("be.visible");- } else {- cy.findByText(value).should("not.exist");- }+ visibleCategories.forEach((value) => {+ cy.findByText(value).should("be.visible");});+ allCategories+ .filter((value) => !visibleCategories.includes(value))+ .forEach((value) => {+ cy.findByText(value).should("not.exist");+ });});}@@ -277,24 +281,12 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {const USER_ATTRIBUTE = "User ID";const ATTRIBUTE_VALUE = "3";const TTAG_NAME = "cid";- const QUESTION_NAME = "Joined test";// Add user attribute to existing ("normal" / id:2) usercy.request("PUT", `/api/user/${NORMAL_USER_ID}`, {login_attributes: { [USER_ATTRIBUTE]: ATTRIBUTE_VALUE },});- // Orders join Products- createJoinedQuestion(QUESTION_NAME);-- cy.sandboxTable({- table_id: ORDERS_ID,- group_id: DATA_GROUP,- attribute_remappings: {- [USER_ATTRIBUTE]: ["dimension", ["field", ORDERS.USER_ID, null]],- },- });-H.createNativeQuestion({name: "sql param in a dashboard",dashboard_id: ORDERS_DASHBOARD_ID,@@ -333,7 +325,7 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {// 1 row filtered on User IDcy.findAllByText(ATTRIBUTE_VALUE).should("have.length", 1);H.assertDatasetReqIsSandboxed({- columnId: PEOPLE.USER_ID,+ columnId: PEOPLE.ID,columnAssertion: Number(ATTRIBUTE_VALUE),});});@@ -704,7 +696,6 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {it("Advanced sandboxing should not ignore data model features like object detail of FK (metabase-enterprise#520)", () => {cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("PUT", "/api/card/*").as("questionUpdate");H.createNativeQuestion({name: "EE_520_Q1",@@ -826,12 +817,6 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {// Title of the first order for User ID = 1// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Awesome Concrete Shoes");-- cy.signOut();- cy.signInAsAdmin();- cy.visit(- "/admin/permissions/data/group/3/database/1/schema/PUBLIC/5/segmented",- );});});@@ -986,8 +971,6 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {});it("should be able to remove columns via QB sidebar / settings (metabase#14841)", () => {- cy.intercept("POST", "/api/dataset").as("dataset");-cy.sandboxTable({table_id: ORDERS_ID,attribute_remappings: {@@ -1005,6 +988,7 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {cy.signOut();cy.signInAsSandboxedUser();createJoinedQuestion("14841", { visitQuestion: true });+ H.tableInteractive().should("contain", "37.65");H.openVizSettingsSidebar();cy.findByTestId("sidebar-left")@@ -1101,34 +1085,6 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {H.assertQueryBuilderRowCount(6); // test that user is sandboxed - normal users has 30});- it("should show dashboard subscriptions for sandboxed user (metabase#14990)", () => {- H.setupSMTP();-- cy.sandboxTable({- table_id: ORDERS_ID,- attribute_remappings: {- attr_uid: ["dimension", ["field-id", ORDERS.USER_ID]],- },- });-- cy.signInAsSandboxedUser();- H.visitDashboard(ORDERS_DASHBOARD_ID);- H.toggleDashboardSubscriptionsSidebar();-- // should forward to email since that is the only one setup- H.sidebar().findByText("Email this dashboard").should("exist");-- // test that user is sandboxed - normal users has over 2000 rows- H.getDashboardCard().within(() => {- H.assertTableRowsCount(11);- });- H.assertDatasetReqIsSandboxed({- requestAlias: `@dashcardQuery${ORDERS_DASHBOARD_DASHCARD_ID}`,- columnId: ORDERS.USER_ID,- columnAssertion: Number(USERS.sandboxed.login_attributes.attr_uid),- });- });-it("should be able to visit ad-hoc/dirty question when permission is granted to the linked table column, but not to the linked table itself (metabase#15105)", () => {cy.sandboxTable({table_id: ORDERS_ID,@@ -1202,12 +1158,10 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {});H.assertQueryBuilderRowCount(57); // test that user is sandboxed - normal users has 1,112 rowsH.assertDatasetReqIsSandboxed();-- // Add positive assertion once this issue is fixed});it(- "sandboxed user should receive sandboxed dashboard subscription",+ "sandboxed user should see dashboard subscriptions and receive a sandboxed subscription (metabase#14990)",{ tags: "@external" },() => {H.setupSMTP();@@ -1237,6 +1191,9 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {H.toggleDashboardSubscriptionsSidebar();+ // metabase#14990: should forward to email since that is the only one setup+ H.sidebar().findByText("Email this dashboard").should("exist");+H.sidebar().findByPlaceholderText("Enter user names or email addresses").click();diff --git a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.tsindex 899e29eab18..237e83b8743 100644--- a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts+++ b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts@@ -1,6 +1,5 @@import { USER_GROUPS } from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import { checkNotNull } from "metabase/utils/types";import type { CollectionItem, Dashboard } from "metabase-types/api";import {@@ -9,9 +8,11 @@ import {assignAttributeToUser,configureSandboxPolicy,createSandboxingDashboardAndQuestions,+ getDashcardResponses,gizmoViewer,modelCustomView,questionCustomView,+ rowsShouldContainOnlyOneCategory,signInAs,widgetViewer,} from "./helpers/e2e-sandboxing-helpers";@@ -38,8 +39,6 @@ describe(const customViews: CollectionItem[] = [];before(() => {- cy.intercept("/api/card/*/query").as("cardQuery");-H.restore("postgres-12");cy.signInAsAdmin();@@ -70,12 +69,9 @@ describe(});beforeEach(() => {- cy.intercept("/api/card/*/query").as("cardQuery");-cy.intercept("/api/dashboard/*/dashcard/*/card/*/query").as("dashcardQuery",);- cy.intercept("POST", "/api/dataset").as("datasetQuery");// Unjustified type cast. FIXMEH.restore("sandboxing-snapshot" as any);});@@ -197,7 +193,25 @@ describe(});signInAs(gizmoViewer);- H.visitDashboard(checkNotNull(dashboard).id);+ getDashcardResponses(dashboard, sandboxableQuestions).then(+ ({ questions, responses }) => {+ if (customColumnType.endsWith("Literal")) {+ // A literal column matches every row, so results stay mixed+ responses.forEach((response) => {+ expect(JSON.stringify(response.body)).not.to.contain(+ "stacktrace",+ );+ expect(response.body.data.is_sandboxed).to.be.true;+ });+ } else {+ rowsShouldContainOnlyOneCategory({+ questions,+ responses,+ productCategory: "Gizmo",+ });+ }+ },+ );H.getDashboardCard(0).within(() => {cy.findByText("Question showing all products").should("be.visible");@@ -339,6 +353,7 @@ describe(cy.findByLabelText("WA").should("not.exist");cy.findByLabelText("Add filter").click();});+ cy.location("search").should("contain", "Location=CA");signInAs(users["Washington"]);H.visitDashboard(dashboard_id);diff --git a/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts b/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.tsindex 6eb53a2c2ee..df7f100a7dc 100644--- a/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts+++ b/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts@@ -29,28 +29,24 @@ describe(H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });cy.intercept("POST", "/api/transform").as("createTransform");- cy.intercept("POST", "/api/transform/*/run").as("runTransform");});describe("permission editor UI", () => {- it("shows Transforms column only at database level, not schema level", () => {- cy.visit(`/admin/permissions/data/database/${WRITABLE_DB_ID}`);- cy.findByTestId("permission-table")- .find("thead")- .should("contain.text", "Transforms");+ it("shows Transforms column only at database level, and allows changing and saving transforms permission", () => {+ cy.intercept("PUT", "/api/permissions/graph").as("savePermissions");cy.visit(`/admin/permissions/data/database/${WRITABLE_DB_ID}/schema/Schema%20A`,);cy.findByTestId("permission-table").find("thead")- .should("not.contain.text", "Transforms");- });-- it("allows changing and saving transforms permission", () => {- cy.intercept("PUT", "/api/permissions/graph").as("savePermissions");+ .should("contain.text", "Create queries")+ .and("not.contain.text", "Transforms");cy.visit(`/admin/permissions/data/database/${WRITABLE_DB_ID}`);+ cy.findByTestId("permission-table")+ .find("thead")+ .should("contain.text", "Transforms");H.assertPermissionForItem("All Users",@@ -107,19 +103,12 @@ describe(H.setUserAsAnalyst(NORMAL_USER_ID);});- it("allows user to view transforms list page", () => {+ it("allows user to view transforms list page and create a new transform via UI", () => {cy.signInAsNormalUser();cy.visit("/data-studio/transforms");H.DataStudio.Transforms.list().should("be.visible");- cy.button("Create a transform").should("be.visible");- });-- it("allows user to create a new transform via UI", () => {- cy.signInAsNormalUser();- cy.visit("/data-studio/transforms");-- cy.button("Create a transform").click();+ cy.button("Create a transform").should("be.visible").click();H.popover().findByText("Query builder").click();H.miniPicker().within(() => {@@ -174,6 +163,7 @@ describe(H.DataStudio.Transforms.header().findByDisplayValue("Admin Created Transform").should("be.visible");+ H.DataStudio.Transforms.editDefinitionButton().should("be.visible");});});});@@ -210,6 +200,7 @@ describe(cy.log("Writable Postgres should not be present in mini-picker when user lacks transform permission for it",);+ H.miniPicker().findByText("Our analytics").should("be.visible");H.miniPicker().findByText(/Writable Postgres/).should("not.exist");@@ -253,31 +244,7 @@ describe(H.setUserAsAnalyst(NORMAL_USER_ID, false);});- it("denies user access to transforms list page", () => {- cy.signInAsNormalUser();- cy.visit("/data-studio/transforms");-- cy.url().should("include", "/unauthorized");- cy.findByRole("img", { name: /key/ }).should("exist");- });-- it("denies user access to a specific transform page", () => {- cy.signInAsAdmin();- H.createAndRunMbqlTransform({- sourceTable: SOURCE_TABLE,- targetTable: TARGET_TABLE,- targetSchema: TARGET_SCHEMA,- name: "Admin Only Transform",- }).then(({ transformId }) => {- cy.signInAsNormalUser();- H.visitTransform(transformId);-- cy.url().should("include", "/unauthorized");- cy.findByRole("img", { name: /key/ }).should("exist");- });- });-- it("denies user from creating transforms via API", () => {+ it("denies user access to a transform page, and from creating and running transforms via API", () => {cy.signInAsNormalUser();H.getTableId({ databaseId: WRITABLE_DB_ID, name: SOURCE_TABLE }).then(@@ -308,17 +275,19 @@ describe(});},);- });- it("denies user from running transforms via API", () => {cy.signInAsAdmin();H.createMbqlTransform({sourceTable: SOURCE_TABLE,targetTable: TARGET_TABLE,targetSchema: TARGET_SCHEMA,- name: "Transform to Run",+ name: "Admin Only Transform",}).then(({ body: transform }) => {cy.signInAsNormalUser();+ H.visitTransform(transform.id);++ cy.url().should("include", "/unauthorized");+ cy.findByRole("img", { name: /key/ }).should("exist");cy.request({method: "POST",@@ -332,13 +301,14 @@ describe(});describe("permission changes affect access immediately", () => {- it("grants access after permission is added", () => {+ it("grants access after permission is added, and revokes it after permission is removed", () => {denyTransformsPermissionToAllGroups();H.setUserAsAnalyst(NORMAL_USER_ID, false);cy.signInAsNormalUser();cy.visit("/data-studio/transforms");cy.url().should("include", "/unauthorized");+ cy.findByRole("img", { name: /key/ }).should("exist");cy.signInAsAdmin();grantTransformsPermissionToAllGroups();@@ -348,15 +318,6 @@ describe(cy.visit("/data-studio/transforms");getTransformsNavLink().should("be.visible");H.DataStudio.Transforms.list().should("be.visible");- });-- it("revokes access after permission is removed", () => {- grantTransformsPermissionToAllGroups();- H.setUserAsAnalyst(NORMAL_USER_ID);-- cy.signInAsNormalUser();- cy.visit("/data-studio/transforms");- getTransformsNavLink().should("be.visible");cy.signInAsAdmin();denyTransformsPermissionToAllGroups();diff --git a/e2e/test/scenarios/permissions/view-data.cy.spec.js b/e2e/test/scenarios/permissions/view-data.cy.spec.jsindex 5f48aa3918c..9ac6b961a8e 100644--- a/e2e/test/scenarios/permissions/view-data.cy.spec.js+++ b/e2e/test/scenarios/permissions/view-data.cy.spec.js@@ -124,13 +124,19 @@ describe("scenarios > admin > permissions > view data > granular", () => {cy.signInAsAdmin();});- it("should not allow making permissions granular in the either database or group focused view", () => {+ it("should not show the view data column without a token in either the database or group focused view", () => {cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);+ cy.findByTestId("permission-table")+ .findByText("Create queries")+ .should("exist");cy.get("main").findByText("View data").should("not.exist");cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);+ cy.findByTestId("permission-table")+ .findByText("Create queries")+ .should("exist");cy.get("main").findByText("View data").should("not.exist");});});@@ -176,7 +182,17 @@ describe("scenarios > admin > permissions > view data > granular", () => {});});- it("should allow making permissions granular in the group focused view", () => {+ it("should preserve parent value for children when selecting granular, allow making permissions granular in the group focused view, and infer parent permissions if all granular permissions are equal", () => {+ cy.log("Preserve parent value for children when selecting granular");+ cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);++ H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Blocked");++ H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Granular");++ H.assertPermissionForItem("Orders", DATA_ACCESS_PERM_IDX, "Blocked");++ cy.log("Make permissions granular in the group focused view");cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Granular");@@ -207,23 +223,9 @@ describe("scenarios > admin > permissions > view data > granular", () => {cy.wait("@saveGraph").then(({ response }) => {expect(response.statusCode).to.equal(200);});- });-- it("should infer parent permissions if all granular permissions are equal", () => {- // TODO: this feature (not test) is broken when changing permissions for all schemas to the samve value-- cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);-- H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Granular");-- makeOrdersSandboxed();-- H.selectSidebarItem("All Users");-- H.assertPermissionTable([- ["Sample Database", "Granular", "No", "1 million rows", "No", "No", "No"],- ]);+ cy.log("Infer parent permissions if all granular permissions are equal");+ // TODO: this feature (not test) is broken when changing permissions for all schemas to the same valuecy.findByTestId("permission-table").find("tbody > tr").contains("Sample Database")@@ -238,16 +240,6 @@ describe("scenarios > admin > permissions > view data > granular", () => {["Sample Database", "Can view", "No", "1 million rows", "No", "No", "No"],]);});-- it("should preserve parent value for children when selecting granular for permissions available to child entities", () => {- cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);-- H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Blocked");-- H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Granular");-- H.assertPermissionForItem("Orders", DATA_ACCESS_PERM_IDX, "Blocked");- });});describe(@@ -266,7 +258,9 @@ describe(// Check there is no Impersonated option on H2H.selectPermissionRow("Sample Database", DATA_ACCESS_PERM_IDX);- H.popover().should("not.contain", "Impersonated");+ H.popover()+ .should("contain", "Blocked")+ .and("not.contain", "Impersonated");// Set impersonated access on Postgres databaseH.modifyPermission("QA Postgres12", DATA_ACCESS_PERM_IDX, "Impersonated");@@ -385,6 +379,21 @@ describe(});it("allows switching to the granular access and update table permissions", () => {+ cy.log(+ "Set unrestricted for children if database is set to impersonated before going granular",+ );+ cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);++ H.modifyPermission("QA Postgres12", DATA_ACCESS_PERM_IDX, "Impersonated");++ H.selectImpersonatedAttribute("role");+ H.saveImpersonationSettings();++ H.modifyPermission("QA Postgres12", DATA_ACCESS_PERM_IDX, "Granular");++ H.assertPermissionForItem("Orders", DATA_ACCESS_PERM_IDX, "Can view");++ cy.log("Same, after saving the impersonated permissions");cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);H.modifyPermission("QA Postgres12", DATA_ACCESS_PERM_IDX, "Impersonated");@@ -470,19 +479,6 @@ describe(cy.focused().should("have.attr", "placeholder", "username");});-- it("should set unrestricted for children if database is set to impersonated before going granular", () => {- cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);-- H.modifyPermission("QA Postgres12", DATA_ACCESS_PERM_IDX, "Impersonated");-- H.selectImpersonatedAttribute("role");- H.saveImpersonationSettings();-- H.modifyPermission("Sample Database", DATA_ACCESS_PERM_IDX, "Granular");-- H.assertPermissionForItem("Orders", DATA_ACCESS_PERM_IDX, "Can view");- });},);@@ -499,7 +495,9 @@ describe("scenarios > admin > permissions > view data > legacy no self-service",cy.visit(`/admin/permissions/data/group/${ALL_USERS_GROUP}`);H.selectPermissionRow("Sample Database", DATA_ACCESS_PERM_IDX);- H.popover().should("not.contain", "No self-service (Deprecated)");+ H.popover()+ .should("contain", "Blocked")+ .and("not.contain", "No self-service (Deprecated)");H.selectPermissionRow("Sample Database", CREATE_QUERIES_PERM_IDX);@@ -511,7 +509,6 @@ describe("scenarios > admin > permissions > view data > legacy no self-service",);// load the page w/ legacy value in the graph and test that it does exist- cy.reload();cy.intercept("GET", `/api/permissions/graph/group/${ALL_USERS_GROUP}`, {statusCode: 200,body: {@@ -527,6 +524,7 @@ describe("scenarios > admin > permissions > view data > legacy no self-service",},},});+ cy.reload();H.assertPermissionTable([[@@ -604,6 +602,7 @@ describe("scenarios > admin > permissions > view data > sandboxed", () => {});it("allows editing sandboxed access in the database focused view", () => {+ cy.intercept("PUT", "/api/permissions/graph").as("saveGraph");cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);// make sure that we have native permissions now so that we can validate that@@ -690,7 +689,9 @@ describe("scenarios > admin > permissions > view data > sandboxed", () => {"not.exist",);- cy.button("Save changes").click();+ H.savePermissions();+ cy.wait("@saveGraph").its("response.statusCode").should("eq", 200);+ cy.reload();H.assertPermissionTable(expectedFinalPermissions);});@@ -940,7 +941,7 @@ describe("scenarios > admin > permissions > view data > unrestricted", () => {});});-// ENFORMCENT RELATED TESTS+// ENFORCEMENT RELATED TESTSdescribe("scenarios > admin > permissions > view data > blocked (enforcement)", () => {beforeEach(() => {@@ -949,32 +950,25 @@ describe("scenarios > admin > permissions > view data > blocked (enforcement)",H.activateToken("pro-self-hosted");});- it("should deny view access to a query builder question that makes use of a blocked table", () => {- assertCollectionGroupUserHasAccess(ORDERS_QUESTION_ID, true);- cy.visit(- `/admin/permissions/data/database/${SAMPLE_DB_ID}/schema/PUBLIC/table/${ORDERS_ID}`,- );- removeCollectionGroupPermissions();- assertCollectionGroupHasNoAccess(ORDERS_QUESTION_ID, true);- });-it("should deny view access to a query builder question that makes use of a blocked database", () => {- assertCollectionGroupUserHasAccess(ORDERS_QUESTION_ID, true);+ assertCollectionGroupUserHasAccess(ORDERS_QUESTION_ID);cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);removeCollectionGroupPermissions();- assertCollectionGroupHasNoAccess(ORDERS_QUESTION_ID, true);+ assertCollectionGroupHasNoAccess(ORDERS_QUESTION_ID);});- it("should deny view access to any native question if the user has blocked view data for any table or database", () => {+ it("should deny view access to query builder questions using a blocked table and to any native question", () => {H.createNativeQuestion({native: { query: "select 1" },}).then(({ body: { id: nativeQuestionId } }) => {- assertCollectionGroupUserHasAccess(nativeQuestionId, false);+ assertCollectionGroupUserHasAccess(ORDERS_QUESTION_ID);+ assertCollectionGroupUserHasAccess(nativeQuestionId);cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}/schema/PUBLIC/table/${ORDERS_ID}`,);removeCollectionGroupPermissions();- assertCollectionGroupHasNoAccess(nativeQuestionId, false);+ assertCollectionGroupHasNoAccess(ORDERS_QUESTION_ID);+ assertCollectionGroupHasNoAccess(nativeQuestionId);});});});@@ -988,18 +982,19 @@ function lackPermissionsView(shouldExist) {// NOTE: all helpers below make user of the "sandboxed" user and "collection" group to test permissions// as this user is of only one group and has permission to view existing question-function assertCollectionGroupUserHasAccess(questionId, isQbQuestion) {+function assertCollectionGroupUserHasAccess(questionId) {cy.signOut();cy.signIn("sandboxed");H.visitQuestion(questionId);+ cy.findByTestId("query-visualization-root").should("be.visible");lackPermissionsView(false);cy.signOut();cy.signInAsAdmin();}-function assertCollectionGroupHasNoAccess(questionId, isQbQuestion) {+function assertCollectionGroupHasNoAccess(questionId) {cy.signOut();cy.signIn("sandboxed");