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
Remove individual user access management from data apps (#83081)
Phoomparin Manoa5d07f60998c
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 64b9eb9013f..841062f7516 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -3791,8 +3791,7 @@:model/Permissions:model/PermissionsGroup:model/QueryAction- :model/Table- :model/User}+ :model/Table}:model-exports #{:model/DataApp}}enterprise/data-studiodiff --git a/e2e/test/scenarios/data-apps/admin.cy.spec.ts b/e2e/test/scenarios/data-apps/admin.cy.spec.tsindex efc71c9529f..ea9936ec56c 100644--- a/e2e/test/scenarios/data-apps/admin.cy.spec.ts+++ b/e2e/test/scenarios/data-apps/admin.cy.spec.ts@@ -129,7 +129,7 @@ describe("scenarios > data apps > admin management", () => {);}- it("badges an outdated app, refuses to open it, and still lets an admin manage its users", () => {+ it("badges an outdated app and refuses to open it", () => {markAppOutdated();cy.visit("/admin/settings/apps");@@ -141,22 +141,9 @@ describe("scenarios > data apps > admin management", () => {cy.findByText("Outdated").should("be.visible");cy.findByText(displayName).should("be.visible");cy.findByRole("link", { name: displayName }).should("not.exist");- cy.findByRole("button", {- name: `Actions for ${displayName}`,- }).click();});});- H.popover().findByText("Manage user access").click();-- cy.location("pathname").should(- "eq",- `/admin/settings/apps/${OUTDATED_APP}/users`,- );- H.main()- .findByRole("heading", { name: "Manage access to this app" })- .should("be.visible");-H.openDataApp(OUTDATED_APP);H.main().findByText("This data app is outdated").should("be.visible");cy.get("iframe").should("not.exist");diff --git a/e2e/test/scenarios/data-apps/user-access.cy.spec.ts b/e2e/test/scenarios/data-apps/user-access.cy.spec.tsindex c4d31c320fc..ecaa4f6bf45 100644--- a/e2e/test/scenarios/data-apps/user-access.cy.spec.ts+++ b/e2e/test/scenarios/data-apps/user-access.cy.spec.ts@@ -1,347 +1,15 @@-import { SAMPLE_DB_ID, USERS } from "e2e/support/cypress_data";-import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import {- ALL_USERS_GROUP_ID,- COLLECTION_GROUP_ID,- DATA_GROUP_ID,-} from "e2e/support/cypress_sample_instance_data";-import type { PortableTable } from "e2e/support/helpers";-import {- type DataApp,- DataPermission,- DataPermissionValue,- type Table,-} from "metabase-types/api";-const { H } = cy;-const { ORDERS_ID, PRODUCTS_ID } = SAMPLE_DATABASE;-const SYNCED_APP_SLUG = "good";-const DATA_APP_NAME = SYNCED_APP_SLUG;-const DATA_APP_DISPLAY_NAME = "Good App";const ALLOWED_HOST = "https://secret-api.data-app.test";-const NORMAL_USER_NAME = `${USERS.normal.first_name} ${USERS.normal.last_name}`;-const NODATA_USER_NAME = `${USERS.nodata.first_name} ${USERS.nodata.last_name}`;--describe("scenarios > data apps > user access (EMB-2328)", () => {+describe("scenarios > data apps > authentication", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();H.activateToken("bleeding-edge");});- it("adds and removes a data app user by pasting a single email", () => {- pullAppReading([]);-- cy.visit("/admin/settings/apps");- openManageUserAccessFromAppRow();-- cy.location("pathname").should(- "eq",- `/admin/settings/apps/${DATA_APP_NAME}/users`,- );-- H.main().within(() => {- cy.findByRole("link", { name: "Data apps" }).should("be.visible");- cy.findByText(DATA_APP_DISPLAY_NAME).should("be.visible");- cy.findByText("No one has access yet").should("be.visible");-- cy.findByRole("heading", { name: "Manage access to this app" }).should(- "be.visible",- );- });-- cy.findByRole("button", { name: "Add users" }).click();- H.popover().findByText(NORMAL_USER_NAME).should("be.visible");-- cy.findByRole("textbox", { name: "Search for a user to add" })- .paste(` ${USERS.normal.email.toUpperCase()} `)- .should("have.value", "");-- cy.findByRole("button", { name: "Add" }).click();-- userRow(USERS.normal.email).should("be.visible");- cy.reload();-- H.main().within(() => {- cy.findByText(NORMAL_USER_NAME, { timeout: 20_000 }).should("be.visible");- cy.findByText(USERS.normal.email).should("be.visible");- cy.findByText("No one has access yet").should("not.be.visible");- });-- cy.findByRole("button", { name: `Remove ${NORMAL_USER_NAME}` }).click();-- H.main().within(() => {- cy.findByText("No one has access yet", { timeout: 20_000 }).should(- "be.visible",- );-- cy.findByText(NORMAL_USER_NAME).should("not.exist");- });- });-- it("adds users from comma-separated emails without duplicating existing members", () => {- pullAppReading([]);-- cy.get<number>("@dataAppGroupId").then((groupId) => {- H.addUserToGroup(groupId, USERS.normal.email);- });-- cy.visit(`/admin/settings/apps/${DATA_APP_NAME}/users`);- userRow(USERS.normal.email).should("be.visible");-- cy.findByRole("button", { name: "Add users" }).click();- H.popover().findByText(NODATA_USER_NAME).should("be.visible");-- cy.log("paste a comma-separated list of emails");- cy.findByRole("textbox", { name: "Search for a user to add" })- .paste(` ${USERS.normal.email}, ${USERS.nodata.email.toUpperCase()} `)- .should("have.value", USERS.normal.email);-- cy.findByRole("button", { name: "Add" }).click();-- userRow(USERS.nodata.email).should("be.visible");- cy.reload();-- cy.log("both users from the comma-separated list should be visible");- userRow(USERS.normal.email).should("have.length", 1).and("be.visible");- userRow(USERS.nodata.email).should("have.length", 1).and("be.visible");- });-- // SQLite does not have a schema.- // The visible hierarchy should be "[Database] > [Table]" in table warnings.- it("links a missing-access warning to a table without a schema", () => {- H.activateToken("pro-self-hosted");- H.addSqliteDatabase();-- cy.get<number>("@sqliteID").then((databaseId) => {- H.withDatabase(databaseId, ({ NUMBER_WITH_NULLS_ID }) => {- cy.request<Table>("GET", `/api/table/${NUMBER_WITH_NULLS_ID}`)- .its("body")- .as("sqliteTable");- });-- cy.updatePermissionsGraph({- [ALL_USERS_GROUP_ID]: {- [databaseId]: {- [DataPermission.VIEW_DATA]: DataPermissionValue.BLOCKED,- },- },- [COLLECTION_GROUP_ID]: {- [databaseId]: {- [DataPermission.VIEW_DATA]: DataPermissionValue.BLOCKED,- },- },- });- });-- H.activateToken("bleeding-edge");-- cy.get<Table>("@sqliteTable").then(({ name, schema }) => {- expect(schema).to.equal("");-- pullAppReading([["sqlite", null, name]]);- });-- cy.get<number>("@dataAppGroupId").then((groupId) => {- H.addUserToGroup(groupId, USERS.nodata.email);- });-- cy.visit(`/admin/settings/apps/${DATA_APP_NAME}/users`);- userRow(USERS.nodata.email)- .findByRole("button", { name: "Missing data access" })- .should("be.visible")- .realHover();-- cy.get<Table>("@sqliteTable").then(({ id, db_id }) => {- cy.findByTestId("missing-tables-list").within(() => {- cy.findAllByRole("link").should("have.length", 2);-- cy.findByRole("link", { name: "sqlite" }).should(- "have.attr",- "href",- `/admin/permissions/data/database/${db_id}`,- );-- cy.findByRole("link", { name: "Number With Nulls" })- .should(- "have.attr",- "href",- `/admin/permissions/data/database/${db_id}/table/${id}`,- )- .and("have.attr", "target", "_blank")- .and("have.attr", "rel", "noopener noreferrer")- .invoke("removeAttr", "target")- .click();- });-- cy.location("pathname").should(- "eq",- `/admin/permissions/data/database/${db_id}/table/${id}`,- );- });-- cy.findByTestId("permissions-editor-breadcrumbs").should(- "contain.text",- "Number With Nulls",- );-- H.assertPermissionForItem("All Users", 0, "Blocked");- });-- it("shows warnings only for users missing access to used tables", () => {- // The no-data snapshot user belongs to both of these groups.- // Block the products table in both groups.- cy.updatePermissionsGraph({- [ALL_USERS_GROUP_ID]: {- [SAMPLE_DB_ID]: {- [DataPermission.VIEW_DATA]: {- PUBLIC: {- [ORDERS_ID]: DataPermissionValue.UNRESTRICTED,- [PRODUCTS_ID]: DataPermissionValue.BLOCKED,- },- },- },- },-- [COLLECTION_GROUP_ID]: {- [SAMPLE_DB_ID]: {- [DataPermission.VIEW_DATA]: {- PUBLIC: {- [ORDERS_ID]: DataPermissionValue.UNRESTRICTED,- [PRODUCTS_ID]: DataPermissionValue.BLOCKED,- },- },- },- },-- [DATA_GROUP_ID]: {- [SAMPLE_DB_ID]: {- [DataPermission.VIEW_DATA]: {- PUBLIC: {- [ORDERS_ID]: DataPermissionValue.UNRESTRICTED,- [PRODUCTS_ID]: DataPermissionValue.UNRESTRICTED,- },- },- },- },- });-- pullAppReading([- ["Sample Database", "PUBLIC", "ORDERS"],- ["Sample Database", "PUBLIC", "PRODUCTS"],- ]);- cy.request<DataApp>(`/api/apps/${DATA_APP_NAME}`)- .its("body.table_ids")- .should(- "deep.equal",- [ORDERS_ID, PRODUCTS_ID].sort((a, b) => a - b),- );-- cy.get<number>("@dataAppGroupId").then((groupId) => {- H.addUserToGroup(groupId, USERS.normal.email);- H.addUserToGroup(groupId, USERS.nodata.email);- });-- cy.visit("/admin/settings/apps");-- dataAppRow()- .findByRole("link", {- name: "Some users are missing data access.",- })- .should("be.visible")- .click();-- cy.location("pathname").should(- "eq",- `/admin/settings/apps/${DATA_APP_NAME}/users`,- );-- cy.findByRole("heading", { name: "Manage access to this app" }).should(- "be.visible",- );-- userRow(USERS.normal.email).within(() => {- cy.findByText(NORMAL_USER_NAME).should("be.visible");-- cy.findByRole("button", { name: "Missing data access" }).should(- "not.exist",- );- });-- userRow(USERS.nodata.email).within(() => {- cy.findByText(NODATA_USER_NAME).should("be.visible");-- cy.findByRole("button", { name: "Missing data access" })- .should("be.visible")- .realHover();- });-- cy.findByTestId("data-access-warning-popover").within(() => {- cy.findByText(- `${USERS.nodata.first_name} doesn’t have permission to view these tables used in this app:`,- ).should("be.visible");-- cy.findByTestId("missing-tables-list").within(() => {- cy.findAllByRole("link")- .should("have.length", 3)- .and("be.visible")- .should(($links) => {- expect(- [...$links].map((link) => ({- label: link.textContent,- href: link.getAttribute("href"),- target: link.getAttribute("target"),- rel: link.getAttribute("rel"),- })),- ).to.deep.equal([- {- label: "Sample Database",- href: `/admin/permissions/data/database/${SAMPLE_DB_ID}`,- target: "_blank",- rel: "noopener noreferrer",- },- {- label: "PUBLIC",- href: `/admin/permissions/data/database/${SAMPLE_DB_ID}/schema/PUBLIC`,- target: "_blank",- rel: "noopener noreferrer",- },- {- label: "Products",- href: `/admin/permissions/data/database/${SAMPLE_DB_ID}/schema/PUBLIC/table/${PRODUCTS_ID}`,- target: "_blank",- rel: "noopener noreferrer",- },- ]);- });-- cy.findByRole("link", { name: "Orders" }).should("not.exist");- });- });-- cy.findByRole("button", { name: `Remove ${NODATA_USER_NAME}` }).click();-- H.main().within(() => {- cy.findByText(USERS.normal.email).should("be.visible");-- cy.findByText(USERS.nodata.email, { timeout: 20_000 }).should(- "not.exist",- );- });-- cy.visit("/admin/settings/apps");- dataAppRow().within(() => {- cy.findByText(DATA_APP_DISPLAY_NAME).should("be.visible");-- cy.findByRole("link", {- name: "Some users are missing data access.",- }).should("not.exist");- });- });-describe("signed-out visitors", () => {beforeEach(() => {H.setupGitSync();@@ -430,45 +98,3 @@ describe("scenarios > data apps > user access (EMB-2328)", () => {});});});--const dataAppRow = () =>- cy- .findByTestId(`data-app-list-item-${DATA_APP_NAME}`)- .scrollIntoView()- .should("be.visible");--function openManageUserAccessFromAppRow() {- dataAppRow()- .findByRole("button", { name: `Actions for ${DATA_APP_DISPLAY_NAME}` })- .click();-- H.popover().findByText("Manage user access").click();-}--const userRow = (email: string) => H.main().findByText(email).closest("tr");--/**- * Pulls the example data apps with the `good` app's saved questions replaced by- * one per table in `tables`, so the app depends on exactly those tables. The- * import records them as the app's table dependencies.- */-function pullAppReading(tables: PortableTable[]) {- H.pullExampleDataApps({- goodAppCards: tables.map((table, index) =>- H.dataAppRepresentations.card({- entityId: `goodAppReads${String(index).padStart(9, "0")}`,- name: table[2],- type: "question",- collection: "goodAppCollection0000",- table,- }),- ),- });-- cy.request<DataApp>(`/api/apps/${DATA_APP_NAME}`).then(({ body: app }) => {- expect(app.resource_collection_id).to.be.a("number");- expect(app.permission_group_id).not.to.eq(null);-- cy.wrap(app.permission_group_id, { log: false }).as("dataAppGroupId");- });-}diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/api.clj b/enterprise/backend/src/metabase_enterprise/data_apps/api.cljindex efe8372d0ba..198ef108981 100644--- a/enterprise/backend/src/metabase_enterprise/data_apps/api.clj+++ b/enterprise/backend/src/metabase_enterprise/data_apps/api.clj@@ -14,7 +14,6 @@[metabase-enterprise.data-apps.query-definition :as query-definition][metabase-enterprise.data-apps.resource-serialization :as data-app.resource-serialization][metabase-enterprise.data-apps.schema :as data-apps.schema]- [metabase-enterprise.data-apps.user-access :as data-app.user-access][metabase.api-scope.data-app :as api-scope][metabase.api.common :as api][metabase.api.macros :as api.macros]@@ -98,7 +97,6 @@[:resource_collection_id ms/PositiveInt][:permission_group_id [:maybe ms/PositiveInt]][:table_ids [:sequential ms/PositiveInt]]- [:has_user_permission_warnings {:optional true} :boolean][:bundle_hash [:maybe :string]][:created_at :any][:updated_at :any]])@@ -133,23 +131,6 @@[:configured :boolean][:url [:maybe :string]]])-(def ^:private PermissionWarningsRequest- [:map {:closed true}- [:user_ids [:sequential {:min 1 :max 100 :distinct true} ms/PositiveInt]]])--(def ^:private MissingTable- [:map {:closed true}- [:id ms/PositiveInt]- [:name ms/NonBlankString]- [:schema [:maybe :string]]- [:database_id ms/PositiveInt]- [:database_name ms/NonBlankString]])--(def ^:private PermissionWarning- [:map {:closed true}- [:user_id ms/PositiveInt]- [:missing_tables [:sequential MissingTable]]])-(def ^:private SerializeResourcesRequest[:map {:closed true}[:collection ms/NanoIdString]@@ -238,13 +219,6 @@(assoc app :outdated (data-app.config/outdated? app))(select-keys app [:name :display_name])))-(defn- data-app-list-response- [warning-group-ids app]- (cond-> (data-app-response app)- api/*is-superuser?*- (assoc :has_user_permission_warnings- (contains? warning-group-ids (:permission_group_id app)))))-(defn- read-check-data-app"Check whether the current user can access a data app. Viewing requires read access to the app'sresource collection, which every app has."@@ -274,10 +248,8 @@(let [apps (->> (data-apps.db/data-apps available)(remove #(and (or available (not api/*is-superuser?*))(data-app.config/outdated? %)))- (mapv api/read-check))- warning-group-ids (when api/*is-superuser?*- (data-app.user-access/groups-with-permission-warnings apps))]- (mapv (partial data-app-list-response warning-group-ids) apps)))+ (mapv api/read-check))]+ (mapv data-app-response apps)));; NOTE on the `slug-regex` constraint: the default path-param matcher allows;; slashes inside a segment, so `/:slug` would otherwise swallow `/x/bundle`.@@ -339,21 +311,6 @@;; above (returning `generic-204-no-content` would fail that validation).nil)-(api.macros/defendpoint :post ["/:slug/user-permission-warnings" :slug slug-regex]- :- [:sequential PermissionWarning]- "Return warnings for users who cannot access every table used by a data app."- [{:keys [slug]} :- [:map {:closed true} [:slug ms/NonBlankString]]- _query-params- {user-ids :user_ids} :- PermissionWarningsRequest]- (let [app (write-check-data-app slug)- users (data-apps.db/users-for-permission-warnings user-ids)]- (api/check-404 (= (count users) (count user-ids)))- (api/check-400 (every? :is_active users)- (tru "Deactivated users cannot be added to data apps."))- (api/check-400 (every? (comp nil? :tenant_id) users)- (tru "Tenant users cannot be added to data apps."))- (data-app.user-access/permission-warnings (:table_ids app) users)))-(api.macros/defendpoint :post "/serialize-resources" :- SerializeResourcesResponse"Serialize what the files of a data app's collection are written from, as serialization writes it: the saved questionholding the query Metabase builds from each `defineQuery` definition in `queries`, in the app's `collection`,diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/db.clj b/enterprise/backend/src/metabase_enterprise/data_apps/db.cljindex d8049b86b36..d1cc708ab4f 100644--- a/enterprise/backend/src/metabase_enterprise/data_apps/db.clj+++ b/enterprise/backend/src/metabase_enterprise/data_apps/db.clj@@ -55,11 +55,6 @@filter-column (assoc :where [:in filter-column filter-ids])(seq order-columns) (assoc :order-by (mapv (fn [column] [column :asc]) order-columns)))))-(defn users-for-permission-warnings- "The fields needed to calculate permission warnings for Users with `user-ids`."- [user-ids]- (t2/select [:model/User :id :is_superuser :is_active :tenant_id] :id [:in user-ids]))-(mu/defn data-app-exists?"Whether a DataApp named `slug` exists."[slug :- :string]@@ -280,50 +275,3 @@:join [[:metabase_database :d] [:= :d.id :t.db_id]]:where [:in :t.id table-ids]:order-by [[:d.name :asc] [:t.schema :asc] [:t.display_name :asc]]}))--(defn sandboxed-user-table-access- "Sandboxed table access from non-data-app groups for the requested users and tables."- [user-ids table-ids]- (t2/query {:select-distinct [[:pgm.user_id :user_id]- [:s.table_id :table_id]]- :from [[:permissions_group_membership :pgm]]- :join [[:sandboxes :s] [:= :s.group_id :pgm.group_id]- [:permissions_group :pg] [:= :pg.id :pgm.group_id]]- :where [:and- [:in :pgm.user_id user-ids]- [:in :s.table_id table-ids]- [:not :pg.is_data_app_group]]}))--(defn unrestricted-user-table-access- "Unrestricted table access from non-data-app groups for the requested users and tables."- [user-ids table-ids]- (t2/query {:select-distinct [[:pgm.user_id :user_id]- [:t.id :table_id]]- :from [[:permissions_group_membership :pgm]]- :join [[:data_permissions :dp] [:= :dp.group_id :pgm.group_id]- [:permissions_group :pg] [:= :pg.id :pgm.group_id]- (warehouse-schema-overlay/table-query {:alias :t, :user-settings? false})- [:and- [:= :t.db_id :dp.db_id]- [:or- [:= :dp.table_id nil]- [:= :dp.table_id :t.id]]]]- :where [:and- [:in :pgm.user_id user-ids]- [:in :t.id table-ids]- [:not :pg.is_data_app_group]- [:= :dp.perm_type (u/qualified-name :perms/view-data)]- [:= :dp.perm_value "unrestricted"]]}))--(defn active-group-members- "Active user memberships for `group-ids`, including API-key users."- [group-ids]- (t2/query {:select [[:pgm.group_id :group_id]- [:u.id :id]- :u.is_superuser- :u.email]- :from [[:permissions_group_membership :pgm]]- :join [[:core_user :u] [:= :u.id :pgm.user_id]]- :where [:and- [:in :pgm.group_id group-ids]- [:= :u.is_active true]]}))diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/user_access.clj b/enterprise/backend/src/metabase_enterprise/data_apps/user_access.cljdeleted file mode 100644index 7a8afe3e97a..00000000000--- a/enterprise/backend/src/metabase_enterprise/data_apps/user_access.clj+++ /dev/null@@ -1,84 +0,0 @@-(ns metabase-enterprise.data-apps.user-access- (:require- [clojure.string :as str]- [metabase-enterprise.data-apps.db :as data-apps.db]))--(set! *warn-on-reflection* true)--(defn- table-details- [table-ids]- (if (seq table-ids)- (data-apps.db/table-details table-ids)- []))--(defn- sandboxed-user-table-pairs- [user-ids table-ids]- (if (and (seq user-ids) (seq table-ids))- (into #{}- (map (juxt :user_id :table_id))- (data-apps.db/sandboxed-user-table-access user-ids table-ids))- #{}))--(defn- unrestricted-user-table-pairs- [user-ids table-ids]- (if (and (seq user-ids) (seq table-ids))- (into #{}- (map (juxt :user_id :table_id))- (data-apps.db/unrestricted-user-table-access user-ids table-ids))- #{}))--(defn- user-warning- [user tables unrestricted-pairs sandboxed-pairs]- (when-not (:is_superuser user)- (let [user-id (:id user)- has-access? (fn [{table-id :id}]- (or (unrestricted-pairs [user-id table-id])- (sandboxed-pairs [user-id table-id])))- missing (remove has-access? tables)]- (when (seq missing)- {:user_id (:id user)- :missing_tables (vec missing)}))))--(defn permission-warnings- "Returns access warnings for the requested users who cannot access every table in `table-ids`.- Superusers and users with unrestricted or sandboxed access to every table are omitted."- [table-ids users]- (if (seq table-ids)- (let [tables (table-details table-ids)- user-ids (map :id users)- unrestricted-pairs (unrestricted-user-table-pairs user-ids table-ids)- sandboxed-pairs (sandboxed-user-table-pairs user-ids table-ids)]- (into [] (keep #(user-warning % tables unrestricted-pairs sandboxed-pairs)) users))- []))--(defn- active-group-members- [group-ids]- (if (seq group-ids)- (->> (data-apps.db/active-group-members group-ids)- (remove #(str/ends-with? (:email %) "@api-key.invalid")))- []))--(defn- group-has-permission-warning?- [users table-ids unrestricted-pairs sandboxed-pairs]- (let [tables (mapv (fn [table-id] {:id table-id}) table-ids)]- (boolean (some #(user-warning % tables unrestricted-pairs sandboxed-pairs) users))))--(defn groups-with-permission-warnings- "The permission group IDs for apps with an active member who cannot access every dependent table."- [apps]- (let [apps (filter #(and (:permission_group_id %) (seq (:table_ids %))) apps)- group-ids (into #{} (map :permission_group_id) apps)- memberships (active-group-members group-ids)- group->users (group-by :group_id memberships)- user-ids (into #{} (map :id) memberships)- table-ids (into #{} (mapcat :table_ids) apps)- unrestricted-pairs (unrestricted-user-table-pairs user-ids table-ids)- sandboxed-pairs (sandboxed-user-table-pairs user-ids table-ids)]- (into #{}- (keep (fn [{:keys [permission_group_id table_ids]}]- (when (group-has-permission-warning? (group->users permission_group_id)- table_ids- unrestricted-pairs- sandboxed-pairs)- permission_group_id)))- apps)))diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/api_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/api_test.cljindex 45fa6cfefad..b5b73e6b303 100644--- a/enterprise/backend/test/metabase_enterprise/data_apps/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/data_apps/api_test.clj@@ -6,7 +6,6 @@[metabase-enterprise.data-apps.config :as data-app.config][metabase-enterprise.data-apps.query-definition :as query-definition][metabase-enterprise.data-apps.resources :as data-app.resources]- [metabase-enterprise.data-apps.user-access :as data-app.user-access][metabase.actions.core :as actions][metabase.api.macros.defendpoint.closed-schemas :as closed-schemas][metabase.lib.core :as lib]@@ -141,130 +140,6 @@(deftest ^:parallel query-definition-request-schema-is-closed-test(is (empty? (closed-schemas/findings ::query-definition/query-definition))))-(deftest user-permission-warnings-test- (mt/with-premium-features #{:data-apps :advanced-permissions :sandboxes}- (mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup :model/Sandbox]- (mt/with-no-data-perms-for-all-users!- (create-app!)- (let [{app-group-id :permission_group_id}- (data-app.resources/ensure-resources! (t2/select-one :model/DataApp :name "demo"))- allowed-table-id (mt/id :venues)- missing-table-id (mt/id :orders)- user-id (mt/user->id :rasta)]- (testing "an app with no synchronized dependencies has no warnings"- (is (= []- (mt/user-http-request :crowberto :post 200 "apps/demo/user-permission-warnings"- {:user_ids [user-id]}))))- (t2/update! :model/DataApp :name "demo" {:table_ids [allowed-table-id missing-table-id]})- (perms/add-user-to-group! user-id app-group-id)- (perms/set-table-permission! app-group-id- missing-table-id- :perms/view-data- :unrestricted)- (perms/set-table-permission! (perms/all-users-group)- allowed-table-id- :perms/view-data- :unrestricted)- (testing "returns only users who lack access from a non-data-app group"- (is (=? [{:user_id user-id- :missing_tables [{:id missing-table-id- :name "Orders"- :database_id (mt/id)}]}]- (mt/user-http-request :crowberto :post 200 "apps/demo/user-permission-warnings"- {:user_ids [user-id (mt/user->id :crowberto)]}))))- (testing "unrestricted access from another group is adequate"- (mt/with-temp [:model/PermissionsGroup {group-id :id} {}]- (perms/add-user-to-group! user-id group-id)- (perms/set-table-permission! group-id- missing-table-id- :perms/view-data- :unrestricted)- (is (= []- (mt/user-http-request :crowberto :post 200 "apps/demo/user-permission-warnings"- {:user_ids [user-id]})))))- (testing "sandboxed access is adequate"- (mt/with-temp [:model/PermissionsGroup {group-id :id} {}- :model/Sandbox _ {:group_id group-id :table_id missing-table-id}]- (perms/add-user-to-group! user-id group-id)- (is (= []- (mt/user-http-request :crowberto :post 200 "apps/demo/user-permission-warnings"- {:user_ids [user-id]}))))))))))--(deftest permission-warning-lookups-are-batched-test- (mt/with-premium-features #{:data-apps :advanced-permissions :sandboxes}- (mt/with-no-data-perms-for-all-users!- (let [table-ids [(mt/id :venues) (mt/id :orders)]- users [{:id (mt/user->id :rasta) :is_superuser false}- {:id (mt/user->id :lucky) :is_superuser false}]- query-count (fn [users]- (t2/with-call-count [call-count]- (data-app.user-access/permission-warnings table-ids users)- (call-count)))]- (is (= 3 (query-count users)))- (is (= (query-count (take 1 users))- (query-count users))- "permission warning query count must not grow with the number of users")))))--(deftest data-app-list-warning-lookups-are-batched-test- (mt/with-premium-features #{:data-apps :advanced-permissions :sandboxes}- (mt/with-no-data-perms-for-all-users!- (mt/with-temp [:model/PermissionsGroup {first-group-id :id} {}- :model/PermissionsGroup {second-group-id :id} {}]- (perms/add-user-to-group! (mt/user->id :rasta) first-group-id)- (perms/add-user-to-group! (mt/user->id :lucky) second-group-id)- (let [apps [{:permission_group_id first-group-id- :table_ids [(mt/id :venues)]}- {:permission_group_id second-group-id- :table_ids [(mt/id :orders)]}]- warning-groups #(t2/with-call-count [call-count]- (let [result (data-app.user-access/groups-with-permission-warnings %)]- {:result result :query-count (call-count)}))- one-app (warning-groups (take 1 apps))- two-apps (warning-groups apps)]- (is (= #{first-group-id} (:result one-app)))- (is (= #{first-group-id second-group-id} (:result two-apps)))- (is (= 3 (:query-count one-app) (:query-count two-apps))- "warning status query count must not grow with the number of apps"))))))--(deftest data-app-list-includes-user-permission-warning-status-test- (mt/with-premium-features #{:data-apps :advanced-permissions :sandboxes}- (mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup]- (mt/with-no-data-perms-for-all-users!- (create-app!)- (let [{app-group-id :permission_group_id}- (data-app.resources/ensure-resources! (t2/select-one :model/DataApp :name "demo"))- table-id (mt/id :orders)- user-id (mt/user->id :rasta)- warning? #(->> (mt/user-http-request :crowberto :get 200 "apps")- (filter (comp #{"demo"} :name))- first- :has_user_permission_warnings)]- (t2/update! :model/DataApp :name "demo" {:table_ids [table-id]})- (perms/add-user-to-group! user-id app-group-id)- (is (true? (warning?)))- (perms/set-table-permission! (perms/all-users-group)- table-id- :perms/view-data- :unrestricted)- (is (false? (warning?))))))))--(deftest data-app-list-warning-status-ignores-deactivated-members-test- (mt/with-premium-features #{:data-apps :advanced-permissions :sandboxes}- (mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup]- (mt/with-no-data-perms-for-all-users!- (create-app!)- (let [{app-group-id :permission_group_id}- (data-app.resources/ensure-resources! (t2/select-one :model/DataApp :name "demo"))- table-id (mt/id :orders)]- (mt/with-temp [:model/User {user-id :id} {:email "[email protected]"}]- (perms/add-user-to-group! user-id app-group-id)- (t2/update! :model/User :id user-id {:is_active false})- (t2/update! :model/DataApp :name "demo" {:table_ids [table-id]})- (is (false? (->> (mt/user-http-request :crowberto :get 200 "apps")- (filter (comp #{"demo"} :name))- first- :has_user_permission_warnings)))))))))-(deftest deactivated-users-cannot-be-added-to-data-apps-test(mt/with-premium-features #{:data-apps}(mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup]@@ -275,38 +150,12 @@:is_active false}](is (= "Deactivated users cannot be added to data apps."(mt/user-http-request :crowberto :post 400 "permissions/membership"- {:group_id app-group-id :user_id user-id})))- (is (= "Deactivated users cannot be added to data apps."- (mt/user-http-request :crowberto :post 400 "apps/demo/user-permission-warnings"- {:user_ids [user-id]}))))))))--(deftest user-permission-warnings-validates-users-test- (mt/with-premium-features #{:data-apps :tenants}- (mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup]- (create-app!)- (testing "unknown users"- (mt/user-http-request :crowberto :post 404 "apps/demo/user-permission-warnings"- {:user_ids [Integer/MAX_VALUE]}))- (testing "tenant users"- (mt/with-temp [:model/Tenant {tenant-id :id} {:name "Data app tenant" :slug "data-app-tenant"}- :model/User {user-id :id} {:email "[email protected]"- :tenant_id tenant-id}]- (is (= "Tenant users cannot be added to data apps."- (mt/user-http-request :crowberto :post 400 "apps/demo/user-permission-warnings"- {:user_ids [user-id]}))))))))--(deftest non-superuser-cannot-read-user-permission-warnings-test- (mt/with-premium-features #{:data-apps}- (mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup]- (create-app!)- (is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :post 403 "apps/demo/user-permission-warnings"- {:user_ids [(mt/user->id :rasta)]}))))))+ {:group_id app-group-id :user_id user-id}))))))))(deftest data-app-write-endpoints-require-feature-token-test(mt/with-premium-features #{}- (mt/user-http-request :crowberto :post 402 "apps/demo/user-permission-warnings"- {:user_ids [(mt/user->id :rasta)]})))+ (mt/user-http-request :crowberto :post 402 "apps/serialize-resources"+ {:collection "goodAppCollection0000" :queries [] :actions []})))(deftest data-app-membership-additions-require-feature-token-test(mt/with-model-cleanup [:model/DataApp :model/Collection :model/PermissionsGroup]diff --git a/enterprise/frontend/src/metabase-enterprise/api/data-app.ts b/enterprise/frontend/src/metabase-enterprise/api/data-app.tsindex 367e15e9df2..2cb5792b528 100644--- a/enterprise/frontend/src/metabase-enterprise/api/data-app.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/data-app.ts@@ -1,8 +1,6 @@import type {DataApp,DataAppRepoStatus,- DataAppUserPermissionWarning,- GetDataAppUserPermissionWarningsRequest,SetDataAppEnabledRequest,} from "metabase-types/api";@@ -42,16 +40,6 @@ export const dataAppApi = EnterpriseApi.injectEndpoints({}),providesTags: () => [REPO_STATUS_TAG],}),- getDataAppUserPermissionWarnings: builder.query<- DataAppUserPermissionWarning[],- GetDataAppUserPermissionWarningsRequest- >({- query: ({ name, user_ids }) => ({- method: "POST",- url: `/api/apps/${encodeURIComponent(name)}/user-permission-warnings`,- body: { user_ids },- }),- }),setDataAppEnabled: builder.mutation<DataApp, SetDataAppEnabledRequest>({query: ({ name, enabled }) => ({method: "PUT",@@ -76,7 +64,6 @@ export const {useListDataAppsQuery,useGetDataAppQuery,useGetDataAppRepoStatusQuery,- useGetDataAppUserPermissionWarningsQuery,useSetDataAppEnabledMutation,useDeleteDataAppMutation,} = dataAppApi;diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppUsersPage.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppUsersPage.tsxdeleted file mode 100644index 812187e687b..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppUsersPage.tsx+++ /dev/null@@ -1,135 +0,0 @@-import { skipToken } from "@reduxjs/toolkit/query";-import { useMemo, useState } from "react";-import { t } from "ttag";--import { AdminPaneLayout } from "metabase/admin/components/AdminPaneLayout";-import {- useCreateMembershipMutation,- useDeleteMembershipMutation,- useGetPermissionsGroupQuery,-} from "metabase/api";-import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useToast } from "metabase/common/hooks";-import { isApiKeyGroupMember } from "metabase/common/utils/groups";-import { useParams } from "metabase/router";-import { SettingsPageWrapper } from "metabase/settings-components";-import { Box, Button, Stack, Text } from "metabase/ui";-import { useGetDataAppQuery } from "metabase-enterprise/api";-import type { Group, Member } from "metabase-types/api";--import { DataAppUserList } from "./components/DataAppUserList/DataAppUserList";--export const ManageDataAppUsersPage = () => {- const { slug = "" } = useParams<{ slug: string }>();- const appRequest = useGetDataAppQuery(slug);-- const groupRequest = useGetPermissionsGroupQuery(- appRequest.data?.permission_group_id ?? skipToken,- );-- const error = appRequest.error ?? groupRequest.error;- const isLoading = appRequest.isLoading || groupRequest.isLoading;-- return (- <SettingsPageWrapper>- <LoadingAndErrorWrapper error={error} loading={isLoading}>- {appRequest.data && groupRequest.data && (- <DataAppUsers- appName={slug}- appTitle={appRequest.data.display_name}- group={groupRequest.data}- />- )}- </LoadingAndErrorWrapper>- </SettingsPageWrapper>- );-};--const DataAppUsers = ({- appName,- appTitle,- group,-}: {- appName: string;- appTitle: string;- group: Group;-}) => {- const [sendToast] = useToast();- const [isAdding, setIsAdding] = useState(false);-- const [createMembership] = useCreateMembershipMutation();- const [deleteMembership] = useDeleteMembershipMutation();-- const members = useMemo(- () => group.members.filter((member) => !isApiKeyGroupMember(member)),- [group.members],- );-- const handleAddUsers = async (userIds: number[]) => {- const results = await Promise.allSettled(- userIds.map((userId) =>- createMembership({ group_id: group.id, user_id: userId }).unwrap(),- ),- );-- const failedUserIds = userIds.filter(- (_, index) => results[index].status === "rejected",- );-- if (failedUserIds.length > 0) {- sendToast({ message: t`Failed to add users`, icon: "warning" });- } else {- setIsAdding(false);- }-- return failedUserIds;- };-- const handleRemoveUser = async (member: Member) => {- const { error } = await deleteMembership(member);-- if (error) {- sendToast({ message: t`Failed to remove user`, icon: "warning" });- }-- return !error;- };-- return (- <Stack gap="xl">- <Box px="md">- <Breadcrumbs- crumbs={[[t`Data apps`, "/admin/settings/apps"], [appTitle]]}- size="large"- />- </Box>-- <AdminPaneLayout- title={- <Text component="span" fz="2rem" lh="2rem">- {t`Manage access to this app`}- </Text>- }- titleActions={- <Button- variant="filled"- onClick={() => setIsAdding(true)}- disabled={isAdding}- >- {t`Add users`}- </Button>- }- >- <DataAppUserList- appName={appName}- isAdding={isAdding}- members={members}- onAddUsers={handleAddUsers}- onCancelAdd={() => setIsAdding(false)}- onRemoveUser={handleRemoveUser}- />- </AdminPaneLayout>- </Stack>- );-};diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppUsersPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppUsersPage.unit.spec.tsxdeleted file mode 100644index 859e0e7f7e6..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppUsersPage.unit.spec.tsx+++ /dev/null@@ -1,440 +0,0 @@-import userEvent from "@testing-library/user-event";-import fetchMock from "fetch-mock";--import { renderWithProviders, screen, waitFor, within } from "__support__/ui";-import { UndoListing } from "metabase/common/components/UndoListing";-import { Route } from "metabase/router";-import type { Group, Member } from "metabase-types/api";-import {- createMockDataApp,- createMockGroup,- createMockUser,-} from "metabase-types/api/mocks";--import { ManageDataAppUsersPage } from "./ManageDataAppUsersPage";--const createMockMember = (opts?: Partial<Member>): Member => ({- user_id: 1,- group_id: 9,- membership_id: 10,- email: "[email protected]",- first_name: "Existing",- last_name: "User",- is_group_manager: false,- is_superuser: false,- ...opts,-});--const createMockMembers = (count: number) =>- Array.from({ length: count }, (_, index) =>- createMockMember({- user_id: index + 100,- membership_id: index + 100,- first_name: `Member ${index + 1}`,- last_name: "",- email: `member${index + 1}@example.com`,- }),- );--const setup = ({- warningRequestFails = false,- members = [createMockMember()],-}: {- warningRequestFails?: boolean;- members?: Member[];-} = {}) => {- const group: Group = {- ...createMockGroup({ id: 9, name: "Data App: sales" }),- members,- };-- const candidate = createMockUser({- id: 2,- first_name: "Pending",- last_name: "User",- email: "[email protected]",- });-- const deactivatedCandidate = createMockUser({- id: 3,- first_name: "Deactivated",- last_name: "User",- is_active: false,- });-- const anotherCandidate = createMockUser({- id: 5,- first_name: "Another",- last_name: "User",- email: "[email protected]",- });-- const tenantCandidate = createMockUser({- id: 4,- first_name: "Tenant",- last_name: "User",- tenant_id: 12,- });-- fetchMock.get(- "path:/api/apps/sales",- createMockDataApp({ permission_group_id: 9 }),- );- fetchMock.get("path:/api/permissions/group/9", () => group);- fetchMock.get("path:/api/user", {- data: [candidate, anotherCandidate, deactivatedCandidate, tenantCandidate],- total: 4,- });- fetchMock.post(- "path:/api/apps/sales/user-permission-warnings",- warningRequestFails- ? 500- : {- body: [- {- user_id: 1,- missing_tables: [- {- id: 8,- name: "Orders",- schema: "PUBLIC",- database_id: 2,- database_name: "Sample Database",- },- ],- },- ],- },- );-- renderWithProviders(- <Route- path="admin/settings/apps/:slug/users"- element={- <>- <ManageDataAppUsersPage />- <UndoListing />- </>- }- />,- {- withRouter: true,- initialRoute: "/admin/settings/apps/sales/users",- },- );-- return { group };-};--describe("ManageDataAppUsersPage", () => {- it("links back to data apps and shows the app name in the breadcrumb", async () => {- setup();-- const breadcrumb = await screen.findByTestId("breadcrumbs");-- const dataAppsLink = within(breadcrumb).getByRole("link", {- name: "Data apps",- });-- expect(dataAppsLink).toHaveAttribute("href", "/admin/settings/apps");- expect(within(breadcrumb).getByText("Sales")).toBeInTheDocument();- });-- it("does not check data access for users before adding them", async () => {- setup();-- expect(- await screen.findByRole("button", { name: "Missing data access" }),- ).toBeInTheDocument();-- expect(- fetchMock.callHistory.calls(- "path:/api/apps/sales/user-permission-warnings",- ),- ).toHaveLength(1);-- await userEvent.click(- await screen.findByRole("button", { name: "Add users" }),- );-- await userEvent.click(await screen.findByText("Pending User"));-- expect(- fetchMock.callHistory.calls(- "path:/api/apps/sales/user-permission-warnings",- ),- ).toHaveLength(1);- });-- it("keeps the empty state visible while adding the first user", async () => {- setup({ members: [] });-- expect(- await screen.findByText("No one has access yet"),- ).toBeInTheDocument();-- await userEvent.click(screen.getByRole("button", { name: "Add users" }));-- expect(- screen.getByRole("textbox", { name: "Search for a user to add" }),- ).toBeInTheDocument();- expect(screen.getByText("No one has access yet")).toBeInTheDocument();- });-- // Maps between pasted emails and the resolved users.- it.each([- [" [email protected] ", ["Pending User"]],- [- ["Pending User", "Another User"],- ],- ])("selects users pasted as %s", async (emails, names) => {- setup();-- await userEvent.click(- await screen.findByRole("button", { name: "Add users" }),- );-- // Pasting can match email addresses only after the user list has loaded.- await screen.findByText("Pending User");-- const searchInput = screen.getByRole("textbox", {- name: "Search for a user to add",- });-- await userEvent.click(searchInput);- await userEvent.paste(emails);-- expect(searchInput).toHaveValue("");- expect(screen.getByRole("button", { name: "Add" })).toBeEnabled();-- for (const name of names) {- expect(screen.getByText(name)).toBeInTheDocument();- }- });-- it("only offers active internal users to add", async () => {- setup();-- await userEvent.click(- await screen.findByRole("button", { name: "Add users" }),- );-- expect(await screen.findByText("Pending User")).toBeInTheDocument();- expect(screen.queryByText("Deactivated User")).not.toBeInTheDocument();- expect(screen.queryByText("Tenant User")).not.toBeInTheDocument();- });-- it("keeps adding enabled when the existing-user warning check fails", async () => {- setup({ warningRequestFails: true });-- await userEvent.click(- await screen.findByRole("button", { name: "Add users" }),- );-- await userEvent.click(await screen.findByText("Pending User"));-- expect(- (await screen.findAllByText(/couldn't check data access/i)).length,- ).toBeGreaterThan(0);-- expect(screen.getByRole("button", { name: "Add" })).toBeEnabled();- });-- it("prevents re-submission while users are still being added", async () => {- setup();-- let finishAdding!: () => void;-- const pendingAddition = new Promise<void>((resolve) => {- finishAdding = resolve;- });-- fetchMock.post("path:/api/permissions/membership", async () => {- await pendingAddition;-- return 204;- });-- await userEvent.click(- await screen.findByRole("button", { name: "Add users" }),- );-- await userEvent.click(await screen.findByText("Pending User"));-- const addButton = screen.getByRole("button", { name: "Add" });- await userEvent.click(addButton);-- try {- expect(addButton).toBeDisabled();-- await userEvent.click(addButton);-- expect(- fetchMock.callHistory.calls("path:/api/permissions/membership"),- ).toHaveLength(1);- } finally {- finishAdding();- }-- await waitFor(() =>- expect(- screen.queryByRole("button", { name: "Add" }),- ).not.toBeInTheDocument(),- );- });-- it("retries only the users that failed to be added", async () => {- setup();-- let finishSuccessfulAddition!: () => void;-- const pendingAddition = new Promise<void>((resolve) => {- finishSuccessfulAddition = resolve;- });-- const submittedUserIds: number[] = [];-- fetchMock.post("path:/api/permissions/membership", async ({ options }) => {- const { user_id } = JSON.parse(String(options.body));- submittedUserIds.push(user_id);-- if (user_id === 2) {- await pendingAddition;-- return 204;- }-- // The other user's first attempt fails, but their retry succeeds.- return submittedUserIds.filter((id) => id === user_id).length === 1- ? 500- : 204;- });-- await userEvent.click(- await screen.findByRole("button", { name: "Add users" }),- );-- await screen.findByText("Pending User");-- await userEvent.click(- screen.getByRole("textbox", { name: "Search for a user to add" }),- );-- await userEvent.paste("[email protected], [email protected]");- await userEvent.click(screen.getByRole("button", { name: "Add" }));-- try {- await waitFor(() => expect(submittedUserIds).toEqual([2, 5]));-- expect(screen.getByRole("button", { name: "Add" })).toBeDisabled();- } finally {- finishSuccessfulAddition();- }-- expect(await screen.findByText("Failed to add users")).toBeInTheDocument();- expect(screen.queryByText("Pending User")).not.toBeInTheDocument();- expect(screen.getByText("Another User")).toBeInTheDocument();-- await userEvent.click(screen.getByRole("button", { name: "Add" }));-- await waitFor(() =>- expect(- screen.queryByRole("button", { name: "Add" }),- ).not.toBeInTheDocument(),- );-- expect(submittedUserIds).toEqual([2, 5, 5]);- });-- it("returns to the previous page after removing its last member", async () => {- const members = createMockMembers(26);- const { group } = setup({ members });-- fetchMock.delete("path:/api/permissions/membership/125", () => {- group.members = members.slice(0, 25);-- return 204;- });-- await userEvent.click(- await screen.findByRole("button", { name: "Next page" }),- );-- await userEvent.click(- screen.getByRole("button", { name: "Remove Member 26" }),- );-- // should show the first page's member- expect(await screen.findByText("[email protected]")).toBeInTheDocument();- expect(screen.queryByText("[email protected]")).not.toBeInTheDocument();- });-- it("returns to the previous page when removing two members before the first removal finishes", async () => {- const members = createMockMembers(27);- const { group } = setup({ members });-- let finishRemovals!: () => void;-- const pendingRemovals = new Promise<void>((resolve) => {- finishRemovals = resolve;- });-- for (const memberId of [125, 126]) {- fetchMock.delete(- `path:/api/permissions/membership/${memberId}`,- async () => {- await pendingRemovals;-- group.members = group.members.filter(- (member) => member.membership_id !== memberId,- );-- return 204;- },- );- }-- await userEvent.click(- await screen.findByRole("button", { name: "Next page" }),- );-- await userEvent.click(- screen.getByRole("button", { name: "Remove Member 26" }),- );-- await userEvent.click(- screen.getByRole("button", { name: "Remove Member 27" }),- );-- // let both delete handlers remove their members- finishRemovals();-- // should show the first page's member- expect(await screen.findByText("[email protected]")).toBeInTheDocument();- expect(screen.queryByText("[email protected]")).not.toBeInTheDocument();- expect(screen.queryByText("[email protected]")).not.toBeInTheDocument();- });-- it("stays on the current page when removing a member fails", async () => {- setup({ members: createMockMembers(26) });-- fetchMock.delete("path:/api/permissions/membership/125", 500);-- await userEvent.click(- await screen.findByRole("button", { name: "Next page" }),- );-- await userEvent.click(- screen.getByRole("button", { name: "Remove Member 26" }),- );-- expect(- await screen.findByText("Failed to remove user"),- ).toBeInTheDocument();-- // should show the current page's member- expect(screen.getByText("[email protected]")).toBeInTheDocument();- expect(screen.queryByText("[email protected]")).not.toBeInTheDocument();- });-});diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.module.css b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.module.cssdeleted file mode 100644index 2bbc377b5fa..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.module.css+++ /dev/null@@ -1,14 +0,0 @@-.row {- border: 1px solid var(--mb-color-border);-}--.row:focus-within {- border-color: var(--mb-color-core-brand);-}--.row[data-has-current-users="true"]:focus-within {- box-shadow:- inset 1px 0 0 var(--mb-color-core-brand),- inset -1px 0 0 var(--mb-color-core-brand),- inset 0 1px 0 var(--mb-color-core-brand);-}diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsxdeleted file mode 100644index b060a7a0334..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/AddDataAppUsers/AddDataAppUsers.tsx+++ /dev/null@@ -1,290 +0,0 @@-import {- type ChangeEvent,- type ClipboardEvent,- type ReactNode,- useMemo,- useState,-} from "react";-import { t } from "ttag";--import { userToColor } from "metabase/admin/people/colors";-import { useListUsersQuery } from "metabase/api";-import { UserAvatar } from "metabase/common/components/UserAvatar";-import {- Box,- Button,- Flex,- Input,- Pill,- Popover,- Stack,- Text,- UnstyledButton,-} from "metabase/ui";-import type { Member, User } from "metabase-types/api";--import S from "./AddDataAppUsers.module.css";--const MAX_SELECTED_USERS = 100;--type Props = {- hasCurrentUsers: boolean;- members: Member[];- onAddUsers: (userIds: number[]) => Promise<number[]>;- onCancel: () => void;-};--export const AddDataAppUsers = ({- hasCurrentUsers,- members,- onAddUsers,- onCancel,-}: Props) => {- const [text, setText] = useState("");- const [isSubmitting, setIsSubmitting] = useState(false);- const [isPickerOpen, setIsPickerOpen] = useState(true);-- const [selectedUsers, setSelectedUsers] = useState<Map<number, User>>(- new Map(),- );-- const { data, error, isLoading } = useListUsersQuery({ tenancy: "internal" });-- const memberIds = useMemo(- () => new Set(members.map(({ user_id }) => user_id)),- [members],- );-- const eligibleUsers = useMemo(- () =>- (data?.data ?? []).filter(- (user) =>- user.is_active && user.tenant_id === null && !memberIds.has(user.id),- ),- [data, memberIds],- );-- const suggestedUsers = useMemo(() => {- const input = text.toLowerCase();-- return eligibleUsers.filter(- (user) =>- !selectedUsers.has(user.id) &&- (user.common_name.toLowerCase().includes(input) ||- user.email.toLowerCase().includes(input)),- );- }, [eligibleUsers, selectedUsers, text]);-- const addUser = (user: User) => {- if (selectedUsers.size >= MAX_SELECTED_USERS) {- return;- }-- setSelectedUsers(new Map(selectedUsers).set(user.id, user));-- setText("");- setIsPickerOpen(false);- };-- const handlePaste = (event: ClipboardEvent<HTMLInputElement>) => {- const emails = event.clipboardData- .getData("text")- .split(",")- .map((email) => email.trim().toLowerCase())- .filter(Boolean);-- const usersByEmail = new Map(- eligibleUsers.map((user) => [user.email.toLowerCase(), user]),- );-- const nextUsers = new Map(selectedUsers);- const unmatchedEmails: string[] = [];-- for (const email of emails) {- const user = usersByEmail.get(email);-- if (user && nextUsers.size < MAX_SELECTED_USERS) {- nextUsers.set(user.id, user);- } else {- unmatchedEmails.push(email);- }- }-- if (nextUsers.size > selectedUsers.size) {- event.preventDefault();-- setSelectedUsers(nextUsers);- setText(unmatchedEmails.join(", "));- setIsPickerOpen(false);- }- };-- const removeUser = (user: User) => {- const nextUsers = new Map(selectedUsers);-- nextUsers.delete(user.id);- setSelectedUsers(nextUsers);- };-- const handleSubmit = async () => {- if (isSubmitting) {- return;- }-- setIsSubmitting(true);- setIsPickerOpen(false);-- try {- const failedUserIds = await onAddUsers(Array.from(selectedUsers.keys()));-- // keep users who could not be added in the selection, so admins can try that again- setSelectedUsers((users) => {- const failedUsers = Array.from(users).filter(([id]) =>- failedUserIds.includes(id),- );-- return new Map(failedUsers);- });- } finally {- setIsSubmitting(false);- }- };-- return (- <Popover- opened={isPickerOpen && !isLoading && !error && suggestedUsers.length > 0}- onChange={setIsPickerOpen}- position="bottom-start"- shadow="md"- >- <Popover.Target>- <Box- mx={hasCurrentUsers ? "-1px" : 0}- mt={hasCurrentUsers ? "-1px" : 0}- >- <AddUsersRow- value={text}- isValid={selectedUsers.size > 0}- isSubmitting={isSubmitting}- hasCurrentUsers={hasCurrentUsers}- placeholder={t`Pick someone from the list, or paste a list of email addresses separated by commas`}- ariaLabel={t`Search for a user to add`}- onChange={(event) => {- setText(event.target.value);- setIsPickerOpen(true);- }}- onPaste={handlePaste}- onDone={handleSubmit}- onCancel={onCancel}- >- {Array.from(selectedUsers.values()).map((user, index) => (- <Pill- key={user.id}- size="md"- ms={index > 0 ? "sm" : ""}- withRemoveButton={!isSubmitting}- onRemove={() => removeUser(user)}- >- {user.common_name}- </Pill>- ))}- </AddUsersRow>- </Box>- </Popover.Target>-- <Popover.Dropdown>- <Stack gap={0} miw="15rem">- {suggestedUsers.map((user) => (- <Flex- key={user.id}- component={UnstyledButton}- align="center"- gap="md"- p="0.5rem 1rem"- onClick={() => addUser(user)}- >- <UserAvatar bg={userToColor(user)} user={user} />- <Text fw="bold" size="lg">- {user.common_name}- </Text>- </Flex>- ))}- </Stack>- </Popover.Dropdown>- </Popover>- );-};--interface AddUsersRowProps {- value: string;- isValid: boolean;- isSubmitting: boolean;- hasCurrentUsers: boolean;- placeholder: string;- ariaLabel: string;- onPaste: (event: ClipboardEvent<HTMLInputElement>) => void;- onChange: (event: ChangeEvent<HTMLInputElement>) => void;- onDone: () => void;- onCancel: () => void;- children?: ReactNode;-}--const AddUsersRow = ({- value,- isValid,- isSubmitting,- hasCurrentUsers,- placeholder,- ariaLabel,- onPaste,- onChange,- onDone,- onCancel,- children,-}: AddUsersRowProps) => (- <Flex- className={S.row}- data-has-current-users={hasCurrentUsers}- p="0.5rem"- align="center"- style={{- borderRadius: hasCurrentUsers ? "0.5rem 0.5rem 0 0" : "0.5rem",- }}- >- {children}-- <Input- disabled={isSubmitting}- type="text"- variant="unstyled"- flex="1 0 auto"- fz="lg"- styles={{ input: { background: "transparent" } }}- value={value}- placeholder={placeholder}- aria-label={ariaLabel}- autoFocus- onPaste={onPaste}- onChange={onChange}- />-- <Button- variant="subtle"- color="neutral"- onClick={onCancel}- mr="sm"- disabled={isSubmitting}- >- {t`Cancel`}- </Button>-- <Button- variant={isValid ? "filled" : "default"}- disabled={!isValid || isSubmitting}- loading={isSubmitting}- onClick={onDone}- >- {t`Add`}- </Button>- </Flex>-);diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsxindex e11d4164461..bd46c277ff1 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx@@ -70,15 +70,6 @@ export const DataAppActionsMenu = ({ app, canRemove = false }: Props) => {{t`View resources`}</Menu.Item>- {app.permission_group_id != null && (- <Menu.Item- component={Link}- to={`/admin/settings/apps/${app.name}/users`}- >- {t`Manage user access`}- </Menu.Item>- )}-<Menu.Item onClick={handleToggleEnabled}>{app.enabled ? t`Disable` : t`Re-enable`}</Menu.Item>diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.unit.spec.tsxindex cb106639e81..babfdebeead 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.unit.spec.tsx@@ -11,19 +11,16 @@ const setup = ({enabled = true,canRemove = false,resourceCollectionId = 9,- permissionGroupId = 9,}: {enabled?: boolean;canRemove?: boolean;resourceCollectionId?: number;- permissionGroupId?: number | null;} = {}) => {const app = createMockDataApp({name: "sales",display_name: "Sales",enabled,resource_collection_id: resourceCollectionId,- permission_group_id: permissionGroupId,});renderWithProviders(<>@@ -46,32 +43,17 @@ const confirmRemove = async () =>);describe("DataAppActionsMenu", () => {- it("links to the app's resources and group above the enable action", async () => {+ it("links to the app's resources above the enable action", async () => {setup();await openMenu();const menuItems = await screen.findAllByRole("menuitem");- expect(menuItems).toHaveLength(3);+ expect(menuItems).toHaveLength(2);expect(menuItems[0]).toHaveTextContent("View resources");expect(menuItems[0]).toHaveAttribute("href", "/collection/9");- expect(menuItems[1]).toHaveTextContent("Manage user access");- expect(menuItems[1]).toHaveAttribute(- "href",- "/admin/settings/apps/sales/users",- );- expect(menuItems[2]).toHaveTextContent("Disable");- });-- it("does not show the group link before an app has a permission group", async () => {- setup({ permissionGroupId: null });-- await openMenu();-- expect(- screen.queryByRole("menuitem", { name: "Manage user access" }),- ).not.toBeInTheDocument();+ expect(menuItems[1]).toHaveTextContent("Disable");});it("should show a toast when toggling enabled fails", async () => {diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppDataAccessWarning/DataAppDataAccessWarning.module.css b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppDataAccessWarning/DataAppDataAccessWarning.module.cssdeleted file mode 100644index 30dbb4d15ac..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppDataAccessWarning/DataAppDataAccessWarning.module.css+++ /dev/null@@ -1,17 +0,0 @@-.badge {- background-color: var(--mb-color-background_surface-warning-strong);- transition: background-color 150ms ease;-}--.button {- cursor: pointer;-}--.button:hover .badge,-.button:focus-visible .badge {- background-color: color-mix(- in srgb,- var(--mb-color-background_surface-warning-strong) 92%,- var(--mb-color-text-primary)- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppDataAccessWarning/DataAppDataAccessWarning.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppDataAccessWarning/DataAppDataAccessWarning.tsxdeleted file mode 100644index 051b50035a9..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppDataAccessWarning/DataAppDataAccessWarning.tsx+++ /dev/null@@ -1,143 +0,0 @@-import { t } from "ttag";--import { getDatabaseFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";-import { Link } from "metabase/router";-import {- Anchor,- Badge,- Flex,- HoverCard,- Icon,- Stack,- Text,- UnstyledButton,-} from "metabase/ui";-import type {- DataAppMissingTable,- DataAppUserPermissionWarning,-} from "metabase-types/api";--import S from "./DataAppDataAccessWarning.module.css";--interface Props {- warning: DataAppUserPermissionWarning;- userName: string;-}--export const DataAppDataAccessWarning = ({ warning, userName }: Props) => {- const label = t`Missing data access`;-- return (- <HoverCard- position="bottom-end"- openDelay={150}- closeDelay={100}- shadow="md"- >- <HoverCard.Target>- <UnstyledButton- className={S.button}- aria-label={label}- style={{ flexShrink: 0 }}- >- <Badge- className={S.badge}- size="sm"- c="text-primary"- bdrs="sm"- tt="none"- >- {label}- </Badge>- </UnstyledButton>- </HoverCard.Target>-- <HoverCard.Dropdown- data-testid="data-access-warning-popover"- p="lg"- w="30rem"- >- <Stack gap="lg">- <Text size="sm">- {t`${userName} doesn’t have permission to view these tables used in this app:`}- </Text>-- <Stack- component="ul"- data-testid="missing-tables-list"- gap="sm"- m={0}- pl={0}- style={{ listStyle: "none" }}- >- {warning.missing_tables.map((table) => {- const parts = getMissingTableSegments(table);-- return (- <Flex- component="li"- key={table.id}- align="center"- gap={4}- wrap="wrap"- >- {parts.map((part, index) => (- <Flex key={part.url} align="center" gap={4}>- <Anchor- component={Link}- to={part.url}- target="_blank"- rel="noopener noreferrer"- size="sm"- fw={700}- >- {part.label}- </Anchor>-- {index < parts.length - 1 && (- <Icon- name="chevronright"- size={12}- c="text-secondary"- aria-hidden- />- )}- </Flex>- ))}- </Flex>- );- })}- </Stack>- </Stack>- </HoverCard.Dropdown>- </HoverCard>- );-};--const getMissingTableSegments = (table: DataAppMissingTable) => [- {- label: table.database_name,- url: getDatabaseFocusPermissionsUrl({- databaseId: table.database_id,- }),- },- ...(table.schema- ? [- {- label: table.schema,- url: getDatabaseFocusPermissionsUrl({- databaseId: table.database_id,- schemaName: table.schema,- }),- },- ]- : []),- {- label: table.name,- url: getDatabaseFocusPermissionsUrl({- databaseId: table.database_id,- schemaName: table.schema ?? undefined,- tableId: table.id,- }),- },-];diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppListItem/DataAppListItem.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppListItem/DataAppListItem.tsxindex e8a3a881357..d5b9b5bd4ac 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppListItem/DataAppListItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppListItem/DataAppListItem.tsx@@ -1,7 +1,4 @@-import { t } from "ttag";--import { Link } from "metabase/router";-import { ActionIcon, Flex, Group, Icon, Tooltip } from "metabase/ui";+import { Flex, Group } from "metabase/ui";import type { DataApp } from "metabase-types/api";import { DataAppActionsMenu } from "../DataAppActionsMenu/DataAppActionsMenu";@@ -26,22 +23,6 @@ export const DataAppListItem = ({ app, canRemove = false }: Props) => (<Group flex="0 0 auto" gap="lg" wrap="nowrap" align="center"><DataAppStatusBadge app={app} />- {app.has_user_permission_warnings && (- <Tooltip label={t`Some users are missing data access.`}>- <ActionIcon- aria-label={t`Some users are missing data access.`}- component={Link}- to={`/admin/settings/apps/${app.name}/users`}- bg="background_surface-warning-strong"- c="text-primary"- bdrs="sm"- size="sm"- >- <Icon name="warning" size={14} />- </ActionIcon>- </Tooltip>- )}-<DataAppActionsMenu app={app} canRemove={canRemove} /></Group></Flex>diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppUserList/DataAppUserList.module.css b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppUserList/DataAppUserList.module.cssdeleted file mode 100644index 03325d250d2..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppUserList/DataAppUserList.module.css+++ /dev/null@@ -1,21 +0,0 @@-.userListContent {- display: flex;- flex-direction: column;- gap: var(--mantine-spacing-lg);-}--.userListContent.transitioningUserListContent {- display: grid;-}--.transitioningUserListContent > * {- grid-area: 1 / 1;-}--.userTable thead {- display: none;-}--.userTable tbody tr:not(:last-child) {- border-bottom: 1px solid var(--mb-color-border);-}diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppUserList/DataAppUserList.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppUserList/DataAppUserList.tsxdeleted file mode 100644index 1ef9783d8b5..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppUserList/DataAppUserList.tsx+++ /dev/null@@ -1,238 +0,0 @@-import { skipToken } from "@reduxjs/toolkit/query";-import cx from "classnames";-import { useEffect, useMemo } from "react";-import { t } from "ttag";--import NoResults from "assets/img/no_results.svg";-import { AdminContentTable } from "metabase/admin/components/AdminContentTable";-import { EmptyState } from "metabase/common/components/EmptyState";-import { PaginationControls } from "metabase/common/components/PaginationControls";-import { usePagination } from "metabase/common/hooks/use-pagination";-import Animation from "metabase/css/core/animation.module.css";-import {- Alert,- Box,- Collapse,- Flex,- Icon,- Stack,- Text,- UnstyledButton,-} from "metabase/ui";-import { getFullName } from "metabase/utils/user";-import { useGetDataAppUserPermissionWarningsQuery } from "metabase-enterprise/api";-import type { DataAppUserPermissionWarning, Member } from "metabase-types/api";--import { AddDataAppUsers } from "../AddDataAppUsers/AddDataAppUsers";-import { DataAppDataAccessWarning } from "../DataAppDataAccessWarning/DataAppDataAccessWarning";--import S from "./DataAppUserList.module.css";--const PAGE_SIZE = 25;--type Props = {- appName: string;- isAdding: boolean;- members: Member[];- onAddUsers: (userIds: number[]) => Promise<number[]>;- onCancelAdd: () => void;- onRemoveUser: (member: Member) => Promise<boolean>;-};--export const DataAppUserList = ({- appName,- isAdding,- members,- onAddUsers,- onCancelAdd,- onRemoveUser,-}: Props) => {- const { handleNextPage, handlePreviousPage, page, setPage } = usePagination();-- const lastPage = Math.max(0, Math.ceil(members.length / PAGE_SIZE) - 1);-- // make sure user does not stay in an empty page if the- // removed member is the last one in the page- useEffect(() => {- setPage((page) => Math.min(page, lastPage));- }, [lastPage, setPage]);-- const visibleMembers = useMemo(- () => members.slice(page * PAGE_SIZE, (page + 1) * PAGE_SIZE),- [members, page],- );-- const visibleMemberIds = useMemo(- () => visibleMembers.map(({ user_id }) => user_id),- [visibleMembers],- );-- const warnings = useDataAppUserWarnings(appName, visibleMemberIds);-- return (- <Stack data-testid="user-management-sections" gap="lg">- {warnings.isError && <WarningRequestError />}-- <Box- className={cx(- S.userListContent,- !isAdding && S.transitioningUserListContent,- )}- >- {(isAdding || members.length > 0) && (- <Box- data-testid="data-app-users-card"- bd={members.length > 0 ? "1px solid var(--mb-color-border)" : 0}- bdrs="md"- bg="background-primary"- style={{ overflow: "hidden" }}- >- {isAdding && (- <AddDataAppUsers- hasCurrentUsers={members.length > 0}- members={members}- onAddUsers={onAddUsers}- onCancel={onCancelAdd}- />- )}-- {members.length > 0 && (- <AdminContentTable- className={cx(S.userTable, Animation.fadeIn)}- columnTitles={[]}- >- {visibleMembers.map((member) => (- <MemberRow- key={member.membership_id}- member={member}- warning={warnings.byUserId.get(member.user_id)}- onRemove={onRemoveUser}- />- ))}- </AdminContentTable>- )}-- {members.length > PAGE_SIZE && (- <Flex align="center" justify="flex-end" p="md">- <PaginationControls- page={page}- pageSize={PAGE_SIZE}- itemsLength={visibleMembers.length}- total={members.length}- onNextPage={handleNextPage}- onPreviousPage={handlePreviousPage}- />- </Flex>- )}- </Box>- )}-- <Collapse- in={members.length === 0}- transitionDuration={150}- transitionTimingFunction="ease-out"- >- <DataAppUsersEmptyState />- </Collapse>- </Box>- </Stack>- );-};--const DataAppUsersEmptyState = () => (- <Box- data-testid="data-app-users-empty-state"- bg="background-secondary"- bdrs="md"- py="5rem"- >- <EmptyState- title={t`No one has access yet`}- spacing="sm"- illustrationElement={- <img- src={NoResults}- alt={t`No results`}- width={120}- height={120}- data-testid="data-app-users-empty-state-icon"- />- }- />- </Box>-);--const useDataAppUserWarnings = (appName: string, userIds: number[]) => {- const request = useGetDataAppUserPermissionWarningsQuery(- userIds.length > 0 ? { name: appName, user_ids: userIds } : skipToken,- );-- const warningByUserId = useMemo(- () =>- new Map(request.data?.map((warning) => [warning.user_id, warning]) ?? []),- [request.data],- );-- return {- byUserId: warningByUserId,- isError: request.isError,- };-};--const MemberRow = ({- member,- warning,- onRemove,-}: {- member: Member;- warning?: DataAppUserPermissionWarning;- onRemove: (member: Member) => void;-}) => {- const name = getFullName(member) ?? member.email;-- return (- <tr>- <td>- <Text fw={700}>{name}</Text>- </td>-- <td>{member.email}</td>-- <Box component="td" w="1%" style={{ whiteSpace: "nowrap" }}>- <Flex- data-testid="data-app-user-actions"- align="center"- justify="flex-end"- gap="lg"- wrap="nowrap"- style={{ minWidth: "max-content" }}- >- {warning && (- <DataAppDataAccessWarning- warning={warning}- userName={member.first_name || name}- />- )}-- <UnstyledButton- aria-label={t`Remove ${name}`}- onClick={() => onRemove(member)}- style={{- display: "flex",- alignItems: "center",- justifyContent: "center",- }}- >- <Icon name="close" c="text-disabled" size={16} />- </UnstyledButton>- </Flex>- </Box>- </tr>- );-};--const WarningRequestError = () => (- <Alert color="warning" icon={<Icon name="warning" />}>- {t`We couldn't check data access for some users. You can still update access to this data app.`}- </Alert>-);diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/index.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/index.tsxindex d028fd9dcee..ae41fea51f5 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/index.tsx@@ -1,7 +1,6 @@import { PLUGIN_DATA_APPS } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";-import { ManageDataAppUsersPage } from "./admin/ManageDataAppUsersPage";import { ManageDataAppsPage } from "./admin/ManageDataAppsPage";import { DataAppsNavbarSection } from "./navbar/DataAppsNavbarSection";import { getRoutes, registerDataAppsPagePrefetch } from "./routes";@@ -18,7 +17,6 @@ export function initializePlugin() {PLUGIN_DATA_APPS.isEnabled = true;PLUGIN_DATA_APPS.getRoutes = getRoutes;PLUGIN_DATA_APPS.ManageDataAppsPage = ManageDataAppsPage;- PLUGIN_DATA_APPS.ManageDataAppUsersPage = ManageDataAppUsersPage;PLUGIN_DATA_APPS.MainNavbarSection = DataAppsNavbarSection;registerDataAppsPagePrefetch();}diff --git a/frontend/src/metabase-types/api/data-app.ts b/frontend/src/metabase-types/api/data-app.tsindex e85aa2a3dd0..85e011b7253 100644--- a/frontend/src/metabase-types/api/data-app.ts+++ b/frontend/src/metabase-types/api/data-app.ts@@ -30,8 +30,6 @@ export interface DataApp {permission_group_id: number | null;/** Tables used by the last successful resource synchronization. */table_ids: number[];- /** Whether any app member lacks access to a table used by this app. */- has_user_permission_warnings?: boolean;/*** External origins the app's sandboxed bundle may `fetch`/XHR. Empty means* none (Metabase data still flows through the SDK). Each entry is an origin,@@ -60,21 +58,3 @@ export interface SetDataAppEnabledRequest {name: string;enabled: boolean;}--export interface DataAppMissingTable {- id: number;- name: string;- schema: string | null;- database_id: number;- database_name: string;-}--export interface DataAppUserPermissionWarning {- user_id: number;- missing_tables: DataAppMissingTable[];-}--export interface GetDataAppUserPermissionWarningsRequest {- name: string;- user_ids: number[];-}diff --git a/frontend/src/metabase-types/api/mocks/data-app.ts b/frontend/src/metabase-types/api/mocks/data-app.tsindex 1a3049b89c0..7a386d0b6ba 100644--- a/frontend/src/metabase-types/api/mocks/data-app.ts+++ b/frontend/src/metabase-types/api/mocks/data-app.ts@@ -13,7 +13,6 @@ export const createMockDataApp = (opts?: Partial<DataApp>): DataApp => ({resource_collection_id: 1,permission_group_id: 1,table_ids: [],- has_user_permission_warnings: false,allowed_hosts: [],bundle_hash: "abc123",created_at: "2024-01-01T00:00:00Z",diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/DataAppsSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/DataAppsSettingsPage.tsxindex 2bd41fbf844..1ce48b6e2da 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/DataAppsSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/DataAppsSettingsPage.tsx@@ -22,7 +22,3 @@ export function DataAppsManagePage() {return <PLUGIN_DATA_APPS.ManageDataAppsPage />;}--export function DataAppUsersManagePage() {- return <PLUGIN_DATA_APPS.ManageDataAppUsersPage />;-}diff --git a/frontend/src/metabase/admin/settingsRoutes.tsx b/frontend/src/metabase/admin/settingsRoutes.tsxindex 95b00b69fba..6a9fdd6cf89 100644--- a/frontend/src/metabase/admin/settingsRoutes.tsx+++ b/frontend/src/metabase/admin/settingsRoutes.tsx@@ -3,7 +3,6 @@ import type { Store } from "@reduxjs/toolkit";import { NotFound } from "metabase/common/components/ErrorPages";import {PLUGIN_AUTH_PROVIDERS,- PLUGIN_DATA_APPS,PLUGIN_MULTI_FACTOR_AUTH,PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";@@ -139,13 +138,6 @@ const dataAppsManage = () =>/* webpackChunkName: "admin-settings" */ "./settings/components/SettingsPages/DataAppsSettingsPage").then(({ DataAppsManagePage }) => ({ Component: DataAppsManagePage }));-const dataAppUsersManage = () =>- import(- /* webpackChunkName: "admin-settings" */ "./settings/components/SettingsPages/DataAppsSettingsPage"- ).then(({ DataAppUsersManagePage }) => ({- Component: DataAppUsersManagePage,- }));-const uploadSettings = () =>import(/* webpackChunkName: "admin-settings" */ "./settings/components/SettingsPages/UploadSettingsPage"@@ -254,9 +246,6 @@ export const getSettingsRoutes = (element={<IsAdmin />}><Route index lazy={dataAppsManage} />- {PLUGIN_DATA_APPS.isEnabled && (- <Route path=":slug/users" lazy={dataAppUsersManage} />- )}</Route><Route path="uploads" lazy={uploadSettings} /><Routediff --git a/frontend/src/metabase/plugins/oss/data-apps.ts b/frontend/src/metabase/plugins/oss/data-apps.tsindex 399d1fb9a0f..8a104ef466a 100644--- a/frontend/src/metabase/plugins/oss/data-apps.ts+++ b/frontend/src/metabase/plugins/oss/data-apps.ts@@ -8,7 +8,6 @@ export type DataAppsPlugin = {isEnabled: boolean;getRoutes: () => ReactNode | null;ManageDataAppsPage: ComponentType;- ManageDataAppUsersPage: ComponentType;MainNavbarSection: ComponentType<{ onItemSelect: () => void }>;};@@ -16,7 +15,6 @@ const getDefaultPluginDataApps = (): DataAppsPlugin => ({isEnabled: false,getRoutes: () => null,ManageDataAppsPage: PluginPlaceholder,- ManageDataAppUsersPage: PluginPlaceholder,MainNavbarSection: PluginPlaceholder,});