Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Workspace UI revamped (#75687)

Alexander Polyankinc2c7a41a53c7
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 3e2bd69ada0..d0d2e474211 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -3583,6 +3583,7 @@
enterprise/serialization}
:model-exports #{:model/Workspace}
:model-imports #{:model/Database
+ :model/Table
:model/User}}}
;; namespaces matching these patterns (with `re-find`) are excluded from the module linter. Since regex literals
diff --git a/e2e/support/helpers/e2e-workspace-helpers.ts b/e2e/support/helpers/e2e-workspace-helpers.ts
index 7a5dbc8ae0f..cdc2e5ecc52 100644
--- a/e2e/support/helpers/e2e-workspace-helpers.ts
+++ b/e2e/support/helpers/e2e-workspace-helpers.ts
@@ -1,6 +1,6 @@
import yaml from "js-yaml";
-import type { AdvancedConfig, WorkspaceId } from "metabase-types/api";
+import type { AdvancedConfig } from "metabase-types/api";
import { modal } from "./e2e-ui-elements-helpers";
@@ -10,9 +10,9 @@ export const WorkspaceListPage = {
cy.visit("/data-studio/workspaces");
WorkspaceListPage.get().should("be.visible");
},
- newButton: ({ first = true }: { first?: boolean } = {}) =>
+ newButton: ({ primary = true }: { primary?: boolean } = {}) =>
WorkspaceListPage.get().findByRole("button", {
- name: first ? "Create a workspace" : "New",
+ name: primary ? "Create a workspace" : "New",
}),
setupInstanceButton: () =>
WorkspaceListPage.get().findByRole("button", {
@@ -21,17 +21,46 @@ export const WorkspaceListPage = {
workspaceList: () => WorkspaceListPage.get().findByTestId("workspace-list"),
workspace: (name: string) =>
WorkspaceListPage.get().findByRole("region", { name }),
+ workspaceMenuButton: (name: string) =>
+ WorkspaceListPage.workspace(name).findByRole("button", {
+ name: "Workspace options",
+ }),
+ renameMenuItem: () => cy.findByRole("menuitem", { name: "Rename" }),
+ downloadConfigMenuItem: () =>
+ cy.findByRole("menuitem", { name: /Download config\.yml/ }),
+ deleteMenuItem: () => cy.findByRole("menuitem", { name: "Delete" }),
};
export const NewWorkspaceModal = {
get: () => modal(),
nameInput: () => NewWorkspaceModal.get().findByLabelText("Name"),
+ databaseCheckbox: (name: string) =>
+ NewWorkspaceModal.get().findByRole("checkbox", { name }),
createButton: () =>
- NewWorkspaceModal.get().findByRole("button", { name: "Create" }),
+ NewWorkspaceModal.get().findByRole("button", { name: "Create workspace" }),
cancelButton: () =>
NewWorkspaceModal.get().findByRole("button", { name: "Cancel" }),
};
+export const RenameWorkspaceModal = {
+ get: () => modal(),
+ nameInput: () => RenameWorkspaceModal.get().findByLabelText("Name"),
+ renameButton: () =>
+ RenameWorkspaceModal.get().findByRole("button", { name: "Rename" }),
+ cancelButton: () =>
+ RenameWorkspaceModal.get().findByRole("button", { name: "Cancel" }),
+};
+
+export const DeleteWorkspaceModal = {
+ get: () => modal(),
+ confirmButton: () =>
+ DeleteWorkspaceModal.get().findByRole("button", {
+ name: "Delete workspace",
+ }),
+ cancelButton: () =>
+ DeleteWorkspaceModal.get().findByRole("button", { name: "Cancel" }),
+};
+
export const SetupWorkspaceModal = {
get: () => modal(),
configInput: () => SetupWorkspaceModal.get().get('input[type="file"]'),
@@ -51,126 +80,26 @@ export const SetupWorkspaceModal = {
},
};
-export const WorkspacePage = {
- get: () => cy.findByTestId("workspace-page"),
- visit: (id: WorkspaceId) => {
- cy.visit(`/data-studio/workspaces/${id}`);
- WorkspacePage.get().should("be.visible");
- },
- nameInput: () => WorkspacePage.get().findByTestId("workspace-name-input"),
- breadcrumbs: () =>
- WorkspacePage.get().findByTestId("data-studio-breadcrumbs"),
- menuButton: () =>
- WorkspacePage.get().findByRole("button", { name: "Workspace actions" }),
- deleteMenuItem: () => cy.findByRole("menuitem", { name: "Delete" }),
-};
-
-export const DeleteWorkspaceModal = {
- get: () => modal(),
- confirmButton: () =>
- DeleteWorkspaceModal.get().findByRole("button", {
- name: "Delete workspace",
- }),
- cancelButton: () =>
- DeleteWorkspaceModal.get().findByRole("button", { name: "Cancel" }),
-};
-
-export const WorkspaceDatabaseSection = {
- get: () => cy.findByTestId("workspace-database-section"),
- addDatabaseButton: ({ first = true }: { first?: boolean } = {}) =>
- WorkspaceDatabaseSection.get().findByRole("button", {
- name: first ? "Add database" : "Add another database",
- }),
- databaseList: () =>
- WorkspaceDatabaseSection.get().findAllByTestId("workspace-database-item"),
- database: (name: string) =>
- WorkspaceDatabaseSection.get().findByRole("region", { name }),
- databaseMenuButton: (name: string) =>
- WorkspaceDatabaseSection.database(name).findByRole("button", {
- name: "Database actions",
- }),
- editMenuItem: () => cy.findByRole("menuitem", { name: "Edit" }),
- removeMenuItem: () => cy.findByRole("menuitem", { name: "Remove" }),
-};
-
-export const NewWorkspaceDatabaseModal = {
- get: () => modal(),
- databaseSelect: () =>
- NewWorkspaceDatabaseModal.get().findByRole("textbox", { name: "Database" }),
- schemasGroup: () =>
- NewWorkspaceDatabaseModal.get().findByText("Schemas to include"),
- schemaSelect: () =>
- NewWorkspaceDatabaseModal.get().findByLabelText("Schemas to include"),
- schemaOption: (name: string) => cy.findByRole("option", { name }),
- selectAllSchemasButton: () =>
- NewWorkspaceDatabaseModal.get().findByRole("button", {
- name: "Select all",
- }),
- submitButton: () =>
- NewWorkspaceDatabaseModal.get().findByRole("button", {
- name: "Add database",
- }),
- cancelButton: () =>
- NewWorkspaceDatabaseModal.get().findByRole("button", { name: "Cancel" }),
-};
-
-export const UpdateWorkspaceDatabaseModal = {
- get: () => modal(),
- schemasGroup: () =>
- UpdateWorkspaceDatabaseModal.get().findByText("Schemas to include"),
- schemaSelect: () =>
- UpdateWorkspaceDatabaseModal.get().findByLabelText("Schemas to include"),
- schemaOption: (name: string) => cy.findByRole("option", { name }),
- selectAllSchemasButton: () =>
- UpdateWorkspaceDatabaseModal.get().findByRole("button", {
- name: "Select all",
- }),
- saveButton: () =>
- UpdateWorkspaceDatabaseModal.get().findByRole("button", {
- name: "Save changes",
- }),
- cancelButton: () =>
- UpdateWorkspaceDatabaseModal.get().findByRole("button", { name: "Cancel" }),
-};
-
-export const RemoveWorkspaceDatabaseModal = {
- get: () => modal(),
- confirmButton: () =>
- RemoveWorkspaceDatabaseModal.get().findByRole("button", { name: "Remove" }),
- cancelButton: () =>
- RemoveWorkspaceDatabaseModal.get().findByRole("button", { name: "Cancel" }),
-};
-
-export const WorkspaceSetupSection = {
- get: () => cy.findByTestId("workspace-setup-section"),
- downloadConfigButton: () =>
- WorkspaceSetupSection.get().findByRole("link", {
- name: /Download config\.yml/,
- }),
-};
-
-export const WorkspaceInstancePage = {
- get: () => cy.findByTestId("workspace-instance-page"),
+export const CurrentWorkspacePage = {
+ get: () => cy.findByTestId("current-workspace-page"),
visit: () => {
cy.visit("/data-studio/workspaces");
- WorkspaceInstancePage.get().should("be.visible");
+ CurrentWorkspacePage.get().should("be.visible");
},
database: (name: string) =>
- WorkspaceInstancePage.get().findByRole("region", { name }),
+ CurrentWorkspacePage.get().findByRole("region", { name }),
remappingRow: (canonicalName: string) =>
- WorkspaceInstancePage.get().findByText(canonicalName),
+ CurrentWorkspacePage.get().findByText(canonicalName),
leaveButton: () =>
- WorkspaceInstancePage.get().findByRole("button", {
+ CurrentWorkspacePage.get().findByRole("button", {
name: "Leave workspace",
}),
};
-export const ExitWorkspaceModal = {
+export const LeaveWorkspaceModal = {
get: () => modal(),
confirmButton: () =>
- ExitWorkspaceModal.get().findByRole("button", {
- name: "Leave workspace",
- }),
+ LeaveWorkspaceModal.get().findByRole("button", { name: "Leave workspace" }),
cancelButton: () =>
- ExitWorkspaceModal.get().findByRole("button", { name: "Cancel" }),
+ LeaveWorkspaceModal.get().findByRole("button", { name: "Cancel" }),
};
diff --git a/e2e/test/scenarios/workspaces/workspace-instance.cy.spec.ts b/e2e/test/scenarios/workspaces/workspace-instance.cy.spec.ts
index bfb43844717..42fb7f9845a 100644
--- a/e2e/test/scenarios/workspaces/workspace-instance.cy.spec.ts
+++ b/e2e/test/scenarios/workspaces/workspace-instance.cy.spec.ts
@@ -110,7 +110,7 @@ describe("scenarios > workspaces > workspace instance", () => {
H.WorkspaceListPage.setupInstanceButton().click();
H.SetupWorkspaceModal.uploadConfig(POSTGRES_CONFIG);
H.SetupWorkspaceModal.setupButton().click();
- H.WorkspaceInstancePage.get().should("be.visible");
+ H.CurrentWorkspacePage.get().should("be.visible");
cy.log("create and run a transform via the API");
createAndRunTransform({
@@ -121,8 +121,8 @@ describe("scenarios > workspaces > workspace instance", () => {
});
cy.log("instance page shows the remapping for the transform target");
- H.WorkspaceInstancePage.visit();
- H.WorkspaceInstancePage.database(POSTGRES_DB_NAME)
+ H.CurrentWorkspacePage.visit();
+ H.CurrentWorkspacePage.database(POSTGRES_DB_NAME)
.should(
"contain.text",
`${POSTGRES_INPUT_SCHEMA}/${POSTGRES_TARGET_TABLE}`,
@@ -157,9 +157,9 @@ describe("scenarios > workspaces > workspace instance", () => {
});
cy.log("leave the workspace through the UI");
- H.WorkspaceInstancePage.visit();
- H.WorkspaceInstancePage.leaveButton().click();
- H.ExitWorkspaceModal.confirmButton().click();
+ H.CurrentWorkspacePage.visit();
+ H.CurrentWorkspacePage.leaveButton().click();
+ H.LeaveWorkspaceModal.confirmButton().click();
H.WorkspaceListPage.setupInstanceButton().should("be.visible");
});
});
@@ -192,7 +192,7 @@ describe("scenarios > workspaces > workspace instance", () => {
H.WorkspaceListPage.setupInstanceButton().click();
H.SetupWorkspaceModal.uploadConfig(MYSQL_CONFIG);
H.SetupWorkspaceModal.setupButton().click();
- H.WorkspaceInstancePage.get().should("be.visible");
+ H.CurrentWorkspacePage.get().should("be.visible");
cy.log("create and run a transform via the API");
createAndRunTransform({
@@ -203,8 +203,8 @@ describe("scenarios > workspaces > workspace instance", () => {
});
cy.log("instance page shows the remapping for the transform target");
- H.WorkspaceInstancePage.visit();
- H.WorkspaceInstancePage.database(MYSQL_DB_NAME)
+ H.CurrentWorkspacePage.visit();
+ H.CurrentWorkspacePage.database(MYSQL_DB_NAME)
.should("contain.text", MYSQL_TARGET_TABLE)
.and(
"contain.text",
@@ -235,9 +235,9 @@ describe("scenarios > workspaces > workspace instance", () => {
});
cy.log("leave the workspace through the UI");
- H.WorkspaceInstancePage.visit();
- H.WorkspaceInstancePage.leaveButton().click();
- H.ExitWorkspaceModal.confirmButton().click();
+ H.CurrentWorkspacePage.visit();
+ H.CurrentWorkspacePage.leaveButton().click();
+ H.LeaveWorkspaceModal.confirmButton().click();
H.WorkspaceListPage.setupInstanceButton().should("be.visible");
});
});
diff --git a/e2e/test/scenarios/workspaces/workspace-manager.cy.spec.ts b/e2e/test/scenarios/workspaces/workspace-manager.cy.spec.ts
index 15226e08731..407e3830b0d 100644
--- a/e2e/test/scenarios/workspaces/workspace-manager.cy.spec.ts
+++ b/e2e/test/scenarios/workspaces/workspace-manager.cy.spec.ts
@@ -1,60 +1,18 @@
import path from "path";
import { WRITABLE_DB_ID } from "e2e/support/cypress_data";
-import { NORMAL_USER_ID } from "e2e/support/cypress_sample_instance_data";
const { H } = cy;
const CONFIG_FILENAME = "config.yml";
-const CREATE_QUERIES_PERMISSION_INDEX = 1;
-const WORKSPACES_PERMISSION_INDEX = 6;
-
describe("scenarios > workspaces > workspace manager", () => {
- describe("navigation", () => {
- beforeEach(() => {
- H.restore();
- cy.signInAsAdmin();
- H.activateToken("bleeding-edge");
- });
-
- it("renames a workspace and navigates between the workspace and the list", () => {
- const originalName = "My workspace";
- const renamedName = "Renamed workspace";
-
- cy.log("create the workspace from the empty state");
- H.WorkspaceListPage.visit();
- H.WorkspaceListPage.newButton().click();
- H.NewWorkspaceModal.nameInput().type(originalName);
- H.NewWorkspaceModal.createButton().click();
- H.WorkspacePage.get().should("be.visible");
-
- cy.log("rename the workspace in the header");
- H.WorkspacePage.nameInput()
- .should("have.value", originalName)
- .clear()
- .type(renamedName)
- .blur();
- H.WorkspacePage.nameInput().should("have.value", renamedName);
-
- cy.log("navigate back to the list via the breadcrumbs");
- H.WorkspacePage.breadcrumbs()
- .findByRole("link", { name: "Workspaces" })
- .click();
- H.WorkspaceListPage.get().should("be.visible");
-
- cy.log("open the renamed workspace from the list");
- H.WorkspaceListPage.workspace(renamedName).should("be.visible").click();
- H.WorkspacePage.get().should("be.visible");
- H.WorkspacePage.nameInput().should("have.value", renamedName);
- });
- });
-
describe("postgres (with schemas)", () => {
const POSTGRES_DB_NAME = "Writable Postgres12";
const PG_SCHEMA_A = "Domestic";
const PG_SCHEMA_B = "Wild";
const workspaceName = "PG Workspace";
+ const renamedName = "Renamed PG Workspace";
beforeEach(() => {
H.restore("postgres-writable");
@@ -62,73 +20,51 @@ describe("scenarios > workspaces > workspace manager", () => {
H.activateToken("bleeding-edge");
H.resetTestTable({ type: "postgres", table: "multi_schema" });
H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+ enableWorkspaces(WRITABLE_DB_ID);
cy.deleteDownloadsFolder();
});
- it("should create, edit, download config, and delete a workspace as admin", () => {
- runPostgresWorkflow();
- });
-
- it("should create, edit, download config, and delete a workspace as analyst after granting workspace permissions", () => {
- H.setUserAsAnalyst(NORMAL_USER_ID);
- grantWorkspacesPermissions();
- cy.signInAsNormalUser();
- runPostgresWorkflow();
- });
-
- function runPostgresWorkflow() {
- cy.log("create the workspace");
+ it("creates, renames, downloads config, and deletes a workspace as admin", () => {
+ cy.log(
+ "create the workspace from the empty state, databases added at once",
+ );
H.WorkspaceListPage.visit();
H.WorkspaceListPage.newButton().click();
H.NewWorkspaceModal.nameInput().type(workspaceName);
+ H.NewWorkspaceModal.databaseCheckbox(POSTGRES_DB_NAME).click();
H.NewWorkspaceModal.createButton().click();
- H.WorkspacePage.get().should("be.visible");
-
- cy.log("add the writable Postgres database with one schema");
- H.WorkspaceDatabaseSection.addDatabaseButton().click();
- H.NewWorkspaceDatabaseModal.schemaSelect().click();
- H.NewWorkspaceDatabaseModal.schemaOption(PG_SCHEMA_A).click();
- H.NewWorkspaceDatabaseModal.submitButton().click();
- H.WorkspaceDatabaseSection.database(POSTGRES_DB_NAME)
+ cy.log("the database (with all of its schemas) is attached at once");
+ H.WorkspaceListPage.workspace(workspaceName)
.should("be.visible")
- .and("contain.text", PG_SCHEMA_A);
-
- cy.log("edit the database to include a second schema");
- H.WorkspaceDatabaseSection.databaseMenuButton(POSTGRES_DB_NAME).click();
- H.WorkspaceDatabaseSection.editMenuItem().click();
- H.UpdateWorkspaceDatabaseModal.schemaSelect().click();
- H.UpdateWorkspaceDatabaseModal.schemaOption(PG_SCHEMA_B).click();
- H.UpdateWorkspaceDatabaseModal.saveButton().click();
-
- H.WorkspaceDatabaseSection.database(POSTGRES_DB_NAME)
- .should("contain.text", PG_SCHEMA_A)
- .and("contain.text", PG_SCHEMA_B);
-
- cy.log("download the workspace config");
- downloadConfig();
+ .and("contain.text", POSTGRES_DB_NAME);
+
+ cy.log("rename the workspace via the menu");
+ H.WorkspaceListPage.workspaceMenuButton(workspaceName).click();
+ H.WorkspaceListPage.renameMenuItem().click();
+ H.RenameWorkspaceModal.nameInput().clear().type(renamedName);
+ H.RenameWorkspaceModal.renameButton().click();
+ H.WorkspaceListPage.workspace(renamedName).should("be.visible");
+
+ cy.log("download the workspace config via the menu");
+ H.WorkspaceListPage.workspaceMenuButton(renamedName).click();
+ H.WorkspaceListPage.downloadConfigMenuItem().click();
+ cy.verifyDownload(CONFIG_FILENAME, { timeout: 15000 });
readConfig().should((contents) => {
- expect(contents).to.contain(workspaceName);
+ expect(contents).to.contain(renamedName);
expect(contents).to.contain(POSTGRES_DB_NAME);
expect(contents).to.contain("postgres");
expect(contents).to.contain(PG_SCHEMA_A);
expect(contents).to.contain(PG_SCHEMA_B);
- expect(contents).to.match(/schema-filters-patterns:.*Domestic.*Wild/);
});
- cy.log("remove the database from the workspace");
- H.WorkspaceDatabaseSection.databaseMenuButton(POSTGRES_DB_NAME).click();
- H.WorkspaceDatabaseSection.removeMenuItem().click();
- H.RemoveWorkspaceDatabaseModal.confirmButton().click();
- H.WorkspaceDatabaseSection.databaseList().should("not.exist");
-
- cy.log("delete the workspace");
- H.WorkspacePage.menuButton().click();
- H.WorkspacePage.deleteMenuItem().click();
+ cy.log("delete the workspace via the menu");
+ H.WorkspaceListPage.workspaceMenuButton(renamedName).click();
+ H.WorkspaceListPage.deleteMenuItem().click();
H.DeleteWorkspaceModal.confirmButton().click();
- H.WorkspaceListPage.get().should("be.visible");
- H.WorkspaceListPage.workspace(workspaceName).should("not.exist");
- }
+ H.WorkspaceListPage.workspaceList().should("not.exist");
+ H.WorkspaceListPage.newButton().should("be.visible");
+ });
});
describe("mysql (no schemas)", () => {
@@ -139,30 +75,26 @@ describe("scenarios > workspaces > workspace manager", () => {
H.restore("mysql-writable");
cy.signInAsAdmin();
H.activateToken("bleeding-edge");
+ enableWorkspaces(WRITABLE_DB_ID);
cy.deleteDownloadsFolder();
});
it("creates, downloads config, and deletes a workspace as admin", () => {
- runMysqlWorkflow();
- });
-
- function runMysqlWorkflow() {
- cy.log("create the workspace");
+ cy.log("create the workspace with the schemaless database");
H.WorkspaceListPage.visit();
H.WorkspaceListPage.newButton().click();
H.NewWorkspaceModal.nameInput().type(workspaceName);
+ H.NewWorkspaceModal.databaseCheckbox(MYSQL_DB_NAME).click();
H.NewWorkspaceModal.createButton().click();
- H.WorkspacePage.get().should("be.visible");
-
- cy.log("add the writable MySQL database (no schemas to pick)");
- H.WorkspaceDatabaseSection.addDatabaseButton().click();
- H.NewWorkspaceDatabaseModal.schemasGroup().should("not.exist");
- H.NewWorkspaceDatabaseModal.submitButton().click();
- H.WorkspaceDatabaseSection.database(MYSQL_DB_NAME).should("be.visible");
+ H.WorkspaceListPage.workspace(workspaceName)
+ .should("be.visible")
+ .and("contain.text", MYSQL_DB_NAME);
cy.log("download the workspace config");
- downloadConfig();
+ H.WorkspaceListPage.workspaceMenuButton(workspaceName).click();
+ H.WorkspaceListPage.downloadConfigMenuItem().click();
+ cy.verifyDownload(CONFIG_FILENAME, { timeout: 15000 });
readConfig().should((contents) => {
expect(contents).to.contain(workspaceName);
expect(contents).to.contain(MYSQL_DB_NAME);
@@ -170,41 +102,22 @@ describe("scenarios > workspaces > workspace manager", () => {
expect(contents).not.to.contain("schema-filters-patterns");
});
- cy.log("remove the database from the workspace");
- H.WorkspaceDatabaseSection.databaseMenuButton(MYSQL_DB_NAME).click();
- H.WorkspaceDatabaseSection.removeMenuItem().click();
- H.RemoveWorkspaceDatabaseModal.confirmButton().click();
- H.WorkspaceDatabaseSection.databaseList().should("not.exist");
-
cy.log("delete the workspace");
- H.WorkspacePage.menuButton().click();
- H.WorkspacePage.deleteMenuItem().click();
+ H.WorkspaceListPage.workspaceMenuButton(workspaceName).click();
+ H.WorkspaceListPage.deleteMenuItem().click();
H.DeleteWorkspaceModal.confirmButton().click();
- H.WorkspaceListPage.get().should("be.visible");
- H.WorkspaceListPage.workspace(workspaceName).should("not.exist");
- }
+ H.WorkspaceListPage.workspaceList().should("not.exist");
+ H.WorkspaceListPage.newButton().should("be.visible");
+ });
});
});
-function grantWorkspacesPermissions() {
- cy.intercept("PUT", "/api/permissions/graph").as("savePermissions");
- cy.visit(`/admin/permissions/data/database/${WRITABLE_DB_ID}`);
- H.modifyPermission(
- "All Users",
- CREATE_QUERIES_PERMISSION_INDEX,
- "Query builder and native",
- );
- H.modifyPermission("All Users", WORKSPACES_PERMISSION_INDEX, "Yes");
- cy.button("Save changes").click();
- H.modal().within(() => {
- cy.button("Yes").click();
+function enableWorkspaces(databaseId: number) {
+ cy.request("GET", `/api/database/${databaseId}`).then(({ body }) => {
+ cy.request("PUT", `/api/database/${databaseId}`, {
+ settings: { ...body.settings, "database-enable-workspaces": true },
+ });
});
- cy.wait("@savePermissions");
-}
-
-function downloadConfig() {
- H.WorkspaceSetupSection.downloadConfigButton().click();
- cy.verifyDownload(CONFIG_FILENAME, { timeout: 15000 });
}
function readConfig() {
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/api/workspace_manager.clj b/enterprise/backend/src/metabase_enterprise/workspaces/api/workspace_manager.clj
index c9d3870dc77..d19b3473825 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/api/workspace_manager.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/api/workspace_manager.clj
@@ -25,18 +25,10 @@
[:enum {:decode/api keyword}
:unprovisioned :provisioning :provisioned :deprovisioning])
-(def ^:private AddDatabaseParams
- [:map {:closed true}
- [:database_id ::lib.schema.id/database]
- [:input_schemas [:sequential ms/NonBlankString]]])
-
-(def ^:private UpdateDatabaseParams
- [:map {:closed true}
- [:input_schemas [:sequential ms/NonBlankString]]])
-
(def ^:private CreateWorkspaceParams
[:map {:closed true}
- [:name ms/NonBlankString]])
+ [:name ms/NonBlankString]
+ [:database_ids [:sequential {:min 1} ::lib.schema.id/database]]])
(def ^:private UpdateWorkspaceParams
[:map {:closed true}
@@ -47,7 +39,8 @@
[:database_id ::lib.schema.id/database]
[:input_schemas [:sequential ms/NonBlankString]]
[:output_namespace :string]
- [:status WorkspaceStatus]])
+ [:status WorkspaceStatus]
+ [:database {:optional true} [:maybe :map]]])
(def ^:private CreatorResponse
[:map {:closed true}
@@ -78,7 +71,10 @@
;;; -------------------------------------------- Presentation --------------------------------------------------
(defn- present-workspace-database [wsd]
- (select-keys wsd [:database_id :input_schemas :output_namespace :status]))
+ (-> wsd
+ (select-keys [:database_id :input_schemas :output_namespace :status :database])
+ ;; never expose connection credentials
+ (m/update-existing :database #(some-> % (dissoc :details)))))
(defn- present-creator [creator]
(when creator
@@ -95,10 +91,7 @@
(api.macros/defendpoint :get "/" :- [:sequential WorkspaceResponse]
"List all Workspaces."
[]
- ;; Top-level gate: only Data Analysts (and admins) may list. We then apply `mi/can-read?` per row
- ;; for defense in depth — if `can-read?` ever grows tighter rules, the listing will narrow with it
- ;; instead of leaking rows that the per-row check would refuse.
- (api/check-data-analyst)
+ (api/check-superuser)
(into [] (comp (filter mi/can-read?)
(map present-workspace))
(ws/list-workspaces)))
@@ -110,7 +103,8 @@
(present-workspace (api/check-404 (ws/get-workspace id))))
(api.macros/defendpoint :post "/" :- WorkspaceResponse
- "Create a new Workspace (name only, no databases)."
+ "Create a new Workspace attached to the given databases (each must be eligible
+ for workspaces) and provision it (blocking)."
[_route-params _query-params params :- CreateWorkspaceParams]
(api/create-check :model/Workspace params)
(present-workspace
@@ -135,39 +129,6 @@
(ws/delete-workspace! id)
{:id id :deleted true})
-;;; ---------------------------------------- Database sub-endpoints --------------------------------------------
-
-(api.macros/defendpoint :post "/:id/database" :- WorkspaceResponse
- "Add a database to a workspace and provision it immediately (blocking)."
- [{:keys [id]} :- [:map [:id ms/PositiveInt]]
- _query-params
- params :- AddDatabaseParams]
- (api/create-check :model/WorkspaceDatabase params)
- (present-workspace
- (ws/add-database! id (:database_id params) (:input_schemas params))))
-
-(api.macros/defendpoint :put "/:id/database/:db-id" :- WorkspaceResponse
- "Update a database's input namespaces. Deprovisions the old config and reprovisions
- with the new one (blocking)."
- [{:keys [id db-id]} :- [:map [:id ms/PositiveInt] [:db-id ms/PositiveInt]]
- _query-params
- params :- UpdateDatabaseParams]
- (api/write-check (api/check-404 (t2/select-one :model/WorkspaceDatabase
- :workspace_id id
- :database_id db-id)))
- (present-workspace
- (ws/update-database! id db-id (:input_schemas params))))
-
-(api.macros/defendpoint :delete "/:id/database/:db-id"
- :- WorkspaceResponse
- "Deprovision and remove a database from a workspace (blocking)."
- [{:keys [id db-id]} :- [:map [:id ms/PositiveInt] [:db-id ms/PositiveInt]]]
- (api/write-check (api/check-404 (t2/select-one :model/WorkspaceDatabase
- :workspace_id id
- :database_id db-id)))
- (present-workspace
- (ws/remove-database! id db-id)))
-
;;; ------------------------------------------- Config download --------------------------------------------------
(api.macros/defendpoint :get "/:id/config"
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/core.clj b/enterprise/backend/src/metabase_enterprise/workspaces/core.clj
index eb9f5e0831d..9a9b8753afa 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/core.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/core.clj
@@ -5,8 +5,7 @@
- **Manager-side state.** Workspaces and their per-database configs live in the
`:model/Workspace` and `:model/WorkspaceDatabase` rows. Mutations go through
- [[create-workspace!]], [[add-database!]], [[update-database!]],
- [[remove-database!]], [[delete-workspace!]]. Provisioning operations are
+ [[create-workspace!]] and [[delete-workspace!]]. Provisioning operations are
synchronous — the caller waits until the warehouse work completes.
- **Instance-side state.** When a Metabase boots in workspace mode, the
@@ -33,10 +32,10 @@
└──────────────────────────────────────── provisioned"
(:require
[metabase-enterprise.workspaces.models.workspace :as workspace]
+ [metabase-enterprise.workspaces.models.workspace-database :as workspace-database]
[metabase-enterprise.workspaces.provisioning :as provisioning]
[metabase-enterprise.workspaces.settings :as ws.settings]
[metabase.driver.sql :as driver.sql]
- [metabase.driver.util :as driver.u]
[metabase.premium-features.core :refer [defenterprise]]
[metabase.settings.core :as setting]
[metabase.util.malli :as mu]
@@ -175,22 +174,15 @@
(throw (ex-info "Workspace not found"
{:status-code 404 :workspace_id workspace-id}))))
-(defn- assert-input-schemas-when-supported!
- "Throw 400 if the database supports the `:schemas` feature and `input-schemas` is empty.
- Databases without schemas (e.g. MySQL) accept an empty `input-schemas`."
- [database-id input-schemas]
- (when-let [db (t2/select-one :model/Database :id database-id)]
- (when (and (driver.u/supports? (:engine db) :schemas db)
- (empty? input-schemas))
- (throw (ex-info "input_schemas is required: at least one source schema must be specified"
- {:status-code 400 :database_id database-id})))))
-
-(defn- find-wsd
- "Find the WorkspaceDatabase for a given workspace + database, or throw 404."
- [ws database-id]
- (or (some #(when (= database-id (:database_id %)) %) (:databases ws))
- (throw (ex-info "Database not in workspace"
- {:status-code 404 :workspace_id (:id ws) :database_id database-id}))))
+(defn- assert-database-exists [database-id]
+ (or (t2/select-one :model/Database :id database-id)
+ (throw (ex-info "Database not found"
+ {:status-code 404 :database_id database-id}))))
+
+(defn- assert-database-eligible-for-workspaces [database]
+ (when-not (workspace-database/database-eligible-for-workspaces? database)
+ (throw (ex-info "Workspaces are not enabled for this database"
+ {:status-code 400 :database_id (:id database)}))))
;;; ------------------------------------- Manager-side reads --------------------------------------------------
@@ -208,58 +200,27 @@
;;; ------------------------------------- Manager-side writes -------------------------------------------------
(defn create-workspace!
- "Create a new Workspace (name only, no databases). Returns the created workspace, hydrated."
- [params]
- (workspace/create-workspace! (select-keys params [:name :creator_id])))
-
-(defn add-database!
- "Add a database to a workspace and provision it immediately (blocking).
- `input-schemas` is a vector of driver-opaque schema name strings.
- Returns the updated workspace, hydrated."
- [workspace-id database-id input-schemas]
- (let [ws (assert-workspace-exists workspace-id)]
- (assert-input-schemas-when-supported! database-id input-schemas)
- (when (some #(= database-id (:database_id %)) (:databases ws))
- (throw (ex-info "Database already in workspace"
- {:status-code 409 :workspace_id workspace-id :database_id database-id})))
+ "Create a new Workspace, attach the databases with ids `database_ids` — each must
+ exist (404) and be eligible for workspaces (400, see
+ [[workspace-database/database-eligible-for-workspaces?]]) — with all of their
+ known schemas as
+ `input_schemas`, and provision each database (blocking). Everything runs in a
+ single transaction, so a provisioning failure rolls back the workspace and its
+ database rows. Returns the created workspace, hydrated."
+ [{:keys [name creator_id database_ids]}]
+ (let [databases (mapv (fn [db-id]
+ (let [database (assert-database-exists db-id)]
+ (assert-database-eligible-for-workspaces database)
+ {:database_id db-id
+ :input_schemas (workspace-database/database-input-schemas database)}))
+ database_ids)]
(t2/with-transaction [_conn]
- (let [wsd-id (t2/insert-returning-pk! :model/WorkspaceDatabase
- {:workspace_id workspace-id
- :database_id database-id
- :input_schemas input-schemas
- :database_details {}
- :output_namespace ""})]
- (provisioning/provision-single! wsd-id)))
- (workspace/get-workspace workspace-id)))
-
-(defn update-database!
- "Update a database's config in a workspace: deprovision the existing one (if provisioned),
- update `input-schemas`, then reprovision (blocking). `input-schemas` is a vector of
- driver-opaque schema name strings. Returns the updated workspace, hydrated."
- [workspace-id database-id input-schemas]
- (let [ws (assert-workspace-exists workspace-id)
- wsd (find-wsd ws database-id)
- wsd-id (:id wsd)]
- (assert-input-schemas-when-supported! database-id input-schemas)
- (when (= :provisioned (:status wsd))
- (provisioning/deprovision-single! wsd-id))
- (provisioning/with-workspace-database-lock wsd-id
- (t2/with-transaction [_conn]
- (t2/update! :model/WorkspaceDatabase {:id wsd-id}
- {:input_schemas input-schemas})
- (provisioning/provision-single! wsd-id)))
- (workspace/get-workspace workspace-id)))
-
-(defn remove-database!
- "Deprovision a database (if provisioned) and remove it from the workspace (blocking).
- Returns the updated workspace, hydrated."
- [workspace-id database-id]
- (let [ws (assert-workspace-exists workspace-id)
- wsd (find-wsd ws database-id)]
- (when (= :provisioned (:status wsd))
- (provisioning/deprovision-single! (:id wsd)))
- (t2/delete! :model/WorkspaceDatabase :id (:id wsd))
- (workspace/get-workspace workspace-id)))
+ (let [ws (workspace/create-workspace! {:name name
+ :creator_id creator_id
+ :databases databases})]
+ (doseq [{wsd-id :id} (:databases ws)]
+ (provisioning/provision-single! wsd-id))
+ (workspace/get-workspace (:id ws))))))
(defn delete-workspace!
"Deprovision all databases (blocking), then delete the workspace."
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace.clj b/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace.clj
index b1f56ba54b4..1e139db39ee 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace.clj
@@ -3,7 +3,6 @@
[metabase-enterprise.workspaces.models.workspace-database]
[metabase.api.common :as api]
[metabase.models.interface :as mi]
- [metabase.permissions.core :as perms]
[metabase.util :as u]
[methodical.core :as methodical]
[toucan2.core :as t2]))
@@ -18,32 +17,19 @@
;;; --------------------------------------- Permission predicates ---------------------------------------
;;;
-;;; - read: Data Analyst + `mi/can-read?` for every attached WorkspaceDatabase.
-;;; - write: Data Analyst + `:perms/workspaces :yes` on any database
-;;; + `mi/can-write?` for every attached WorkspaceDatabase.
-;;; - create: Data Analyst + `:perms/workspaces :yes` on any database.
+;;; Workspaces are superuser-only: read, write, and create all require admin.
(defmethod mi/can-read? :model/Workspace
- ([instance]
- (and (api/is-data-analyst?)
- (every? mi/can-read? (:databases (t2/hydrate instance :databases)))))
- ([_model pk]
- (when-let [ws (t2/select-one :model/Workspace :id pk)]
- (mi/can-read? ws))))
+ ([_instance] api/*is-superuser?*)
+ ([_model _pk] api/*is-superuser?*))
(defmethod mi/can-create? :model/Workspace
[_model _instance]
- (and (api/is-data-analyst?)
- (perms/has-any-workspaces-permission? api/*current-user-id*)))
+ api/*is-superuser?*)
(defmethod mi/can-write? :model/Workspace
- ([instance]
- (and (api/is-data-analyst?)
- (perms/has-any-workspaces-permission? api/*current-user-id*)
- (every? mi/can-write? (:databases (t2/hydrate instance :databases)))))
- ([_model pk]
- (when-let [ws (t2/select-one :model/Workspace :id pk)]
- (mi/can-write? ws))))
+ ([_instance] api/*is-superuser?*)
+ ([_model _pk] api/*is-superuser?*))
(methodical/defmethod t2/batched-hydrate [:model/Workspace :databases]
[_model k workspaces]
@@ -68,16 +54,17 @@
:creator_id))
(defn list-workspaces
- "Return every Workspace with its `:databases` and `:creator` hydrated."
+ "Return every Workspace with its `:databases` (each with its `:database`) and
+ `:creator` hydrated."
[]
- (t2/hydrate (t2/select :model/Workspace {:order-by [[:id :asc]]}) :creator :databases))
+ (t2/hydrate (t2/select :model/Workspace {:order-by [[:id :asc]]}) :creator [:databases :database]))
(defn get-workspace
- "Return the Workspace with the given id and its `:databases` + `:creator` hydrated,
- or nil if none exists."
+ "Return the Workspace with the given id and its `:databases` (each with its
+ `:database`) + `:creator` hydrated, or nil if none exists."
[id]
(when-let [workspace (t2/select-one :model/Workspace :id id)]
- (t2/hydrate workspace :creator :databases)))
+ (t2/hydrate workspace :creator [:databases :database])))
(defn get-workspace-by-name
"Return the Workspace with the given name and its `:databases` + `:creator` hydrated,
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_database.clj b/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_database.clj
index 60fe4fee58e..938c5bdf768 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_database.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_database.clj
@@ -1,9 +1,11 @@
(ns metabase-enterprise.workspaces.models.workspace-database
(:require
+ [metabase-enterprise.workspaces.settings :as ws.settings]
[metabase.api.common :as api]
+ [metabase.driver.util :as driver.u]
[metabase.models.interface :as mi]
- [metabase.permissions.core :as perms]
[metabase.premium-features.core :refer [defenterprise]]
+ [metabase.settings.core :as setting]
[methodical.core :as methodical]
[toucan2.core :as t2]))
@@ -20,27 +22,50 @@
;;; --------------------------------------- Permission predicates ---------------------------------------
;;;
-;;; - read: Data Analyst.
-;;; - write/create: Data Analyst + `:perms/workspaces :yes` for `:database_id`.
+;;; WorkspaceDatabases are superuser-only: read, write, and create all require admin.
(defmethod mi/can-read? :model/WorkspaceDatabase
- ([_instance]
- (api/is-data-analyst?))
- ([_model _pk]
- (api/is-data-analyst?)))
+ ([_instance] api/*is-superuser?*)
+ ([_model _pk] api/*is-superuser?*))
(defmethod mi/can-write? :model/WorkspaceDatabase
- ([{:keys [database_id]}]
- (and (api/is-data-analyst?)
- (perms/has-db-workspaces-permission? api/*current-user-id* database_id)))
- ([_model pk]
- (when-let [wsd (t2/select-one :model/WorkspaceDatabase :id pk)]
- (mi/can-write? wsd))))
+ ([_instance]
+ api/*is-superuser?*)
+ ([_model _pk]
+ api/*is-superuser?*))
(defmethod mi/can-create? :model/WorkspaceDatabase
- [_model {:keys [database_id]}]
- (and (api/is-data-analyst?)
- (perms/has-db-workspaces-permission? api/*current-user-id* database_id)))
+ [_model _instance]
+ api/*is-superuser?*)
+
+(methodical/defmethod t2/batched-hydrate [:model/WorkspaceDatabase :database]
+ [_model k workspace-databases]
+ (mi/instances-with-hydrated-data
+ workspace-databases k
+ (fn []
+ (when-let [ids (seq (distinct (keep :database_id workspace-databases)))]
+ (t2/select-pk->fn identity :model/Database :id [:in ids])))
+ :database_id
+ {:default nil}))
+
+;;; --------------------------------------- Database eligibility ---------------------------------------
+
+(defn database-eligible-for-workspaces?
+ "True iff `database`'s driver supports the `:workspace` feature and the
+ `database-enable-workspaces` database-local setting is enabled for it."
+ [database]
+ (and (driver.u/supports? (:engine database) :workspace database)
+ (boolean (setting/with-database database
+ (ws.settings/database-enable-workspaces)))))
+
+(defn database-input-schemas
+ "The distinct non-blank schema names of `database`'s active tables, sorted.
+ Empty for schemaless drivers (e.g. MySQL)."
+ [database]
+ (->> (t2/select-fn-set :schema :model/Table :db_id (:id database) :active true)
+ (remove #(or (nil? %) (= % "")))
+ sort
+ vec))
(defenterprise reconcile-workspace-database-refs-before-delete!
"Enterprise impl of the `:model/Database` before-delete hook. Refuses (409) when any
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/settings.clj b/enterprise/backend/src/metabase_enterprise/workspaces/settings.clj
index 05cc5e0f99b..7df12766529 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/settings.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/settings.clj
@@ -7,6 +7,16 @@
"Marker so callers can `(comment ...keep-me)` to retain the require that registers the settings in this ns."
nil)
+(defsetting database-enable-workspaces
+ (deferred-tru "Whether to enable Workspaces for a specific Database.")
+ :default false
+ :type :boolean
+ :feature :workspaces
+ :driver-feature :workspace
+ :visibility :public
+ :export? false
+ :database-local :only)
+
(defsetting instance-workspace
(deferred-tru "The workspace loaded on this instance. Populated at boot from a config.yml `:workspace` section or at runtime via `POST /api/ee/advanced-config`. `nil` on parent and unconfigured instances. Read by the QP, transform hooks, and the EE `workspace-mode?` predicate via `metabase-enterprise.workspaces.core/instance-workspace`.")
:type :json
diff --git a/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj
index 5239cb59665..3fc69f1a4fc 100644
--- a/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj
@@ -78,8 +78,7 @@
:perms/manage-table-metadata :no
:perms/view-data :unrestricted
:perms/create-queries :no
- :perms/transforms :no
- :perms/workspaces :no}
+ :perms/transforms :no}
(-> (data-perms.graph/data-permissions-graph :db-id audit/audit-db-id :audit? true)
(get-in [(u/the-id (perms-group/all-users)) audit/audit-db-id])))))
(testing "Audit DB does not have scheduled syncs"
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj
index 62b117722f3..bfe1d6f10e2 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj
@@ -141,7 +141,8 @@
;; Workspace and WorkspaceDatabase are runtime-only -- per-instance workspace
;; provisioning state, not portable content. Same rationale as TableRemapping above.
:model/Workspace
- :model/WorkspaceDatabase})
+ :model/WorkspaceDatabase
+ :model/WorkspaceInstance})
(deftest ^:parallel comprehensive-entity-id-test
(let [entity-id-models (->> (v2.entity-ids/toucan-models)
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/api/workspace_manager_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/api/workspace_manager_test.clj
index 906928799bd..d374ee0bd40 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/api/workspace_manager_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/api/workspace_manager_test.clj
@@ -6,7 +6,6 @@
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
[metabase-enterprise.workspaces.provisioning :as provisioning]
- [metabase.permissions.core :as perms]
[metabase.permissions.test-util :as perms.test-util]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]))
@@ -28,64 +27,50 @@
(deftest crud-smoke-test
(testing "create, get, list, delete round-trip"
- (mt/with-model-cleanup [:model/Workspace]
- (let [{ws-id :id :as ws} (mt/user-http-request :crowberto :post 200 "ee/workspace-manager/"
- {:name "Smoke Test"})]
- (is (=? {:id pos-int? :name "Smoke Test" :databases [] :creator some?}
- ws))
- (testing "get"
- (is (=? {:id ws-id :name "Smoke Test"}
- (mt/user-http-request :crowberto :get 200 (str "ee/workspace-manager/" ws-id)))))
- (testing "list"
- (is (=? [{:id ws-id}]
- (mt/user-http-request :crowberto :get 200 "ee/workspace-manager/"))))
- (testing "delete"
- (is (=? {:id ws-id :deleted true}
- (mt/user-http-request :crowberto :delete 200 (str "ee/workspace-manager/" ws-id))))
- (mt/user-http-request :crowberto :get 404 (str "ee/workspace-manager/" ws-id)))))))
-
-(deftest database-endpoints-smoke-test
- (testing "add, update, remove database via HTTP"
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
+ (mt/with-temp [:model/Database {db-id :id} {:engine :postgres
+ :details {}
+ :settings {:database-enable-workspaces true}}]
(mt/with-model-cleanup [:model/Workspace]
- (let [{ws-id :id} (mt/user-http-request :crowberto :post 200 "ee/workspace-manager/"
- {:name "DB Test"})]
- (testing "POST /:id/database adds and provisions"
- (is (=? {:databases [{:database_id (mt/id) :status "provisioned"}]}
- (mt/user-http-request :crowberto :post 200
- (str "ee/workspace-manager/" ws-id "/database")
- {:database_id (mt/id) :input_schemas ["PUBLIC"]}))))
- (testing "PUT /:id/database/:db-id updates input"
- (is (=? {:databases [{:database_id (mt/id)
- :input_schemas ["PUBLIC" "ANALYTICS"]}]}
- (mt/user-http-request :crowberto :put 200
- (str "ee/workspace-manager/" ws-id "/database/" (mt/id))
- {:input_schemas ["PUBLIC" "ANALYTICS"]}))))
- (testing "DELETE /:id/database/:db-id deprovisions and removes"
- (is (=? {:databases empty?}
- (mt/user-http-request :crowberto :delete 200
- (str "ee/workspace-manager/" ws-id "/database/" (mt/id)))))))))))
+ (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
+ (let [{ws-id :id :as ws} (mt/user-http-request :crowberto :post 200 "ee/workspace-manager/"
+ {:name "Smoke Test" :database_ids [db-id]})]
+ (is (=? {:id pos-int?
+ :name "Smoke Test"
+ :databases [{:database_id db-id}]
+ :creator some?}
+ ws))
+ (testing "get"
+ (is (=? {:id ws-id :name "Smoke Test"}
+ (mt/user-http-request :crowberto :get 200 (str "ee/workspace-manager/" ws-id)))))
+ (testing "list"
+ (is (=? [{:id ws-id}]
+ (mt/user-http-request :crowberto :get 200 "ee/workspace-manager/"))))
+ (testing "delete"
+ (is (=? {:id ws-id :deleted true}
+ (mt/user-http-request :crowberto :delete 200 (str "ee/workspace-manager/" ws-id))))
+ (mt/user-http-request :crowberto :get 404 (str "ee/workspace-manager/" ws-id)))))))))
-(deftest add-database-without-schemas-feature-test
- (testing "POST /:id/database accepts an empty :input_schemas list for drivers that support workspaces but not the `:schemas` feature (e.g. MySQL)"
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (mt/with-temp [:model/Database {db-id :id} {:engine :mysql :details {}}]
- (mt/with-model-cleanup [:model/Workspace]
- (let [{ws-id :id} (mt/user-http-request :crowberto :post 200 "ee/workspace-manager/"
- {:name "Schemaless"})]
- (try
- (is (=? {:databases [{:database_id db-id
- :input_schemas empty?
- :status "provisioned"}]}
- (mt/user-http-request :crowberto :post 200
- (str "ee/workspace-manager/" ws-id "/database")
- {:database_id db-id :input_schemas []})))
- (finally
- ;; Drop the workspace-database row before the `with-temp` rollback
- ;; tries to delete the underlying Database -- the pre-delete hook
- ;; refuses to delete a Database with active workspace_database rows.
- (mt/user-http-request :crowberto :delete 200
- (str "ee/workspace-manager/" ws-id "/database/" db-id))))))))))
+(deftest create-workspace-with-database-ids-test
+ (testing "POST / attaches and provisions the given databases (each must be eligible) with their schemas"
+ (mt/with-temp [:model/Database {eligible-id :id} {:engine :postgres
+ :details {}
+ :settings {:database-enable-workspaces true}}
+ :model/Table _ {:db_id eligible-id :schema "public" :active true}
+ :model/Table _ {:db_id eligible-id :schema "analytics" :active true}
+ :model/Database {ineligible-id :id} {:engine :postgres :details {}}]
+ (mt/with-model-cleanup [:model/Workspace]
+ (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
+ (is (=? {:databases [{:database_id eligible-id
+ :input_schemas ["analytics" "public"]
+ :status "provisioned"}]}
+ (mt/user-http-request :crowberto :post 200 "ee/workspace-manager/"
+ {:name "With dbs" :database_ids [eligible-id]})))
+ (testing "an ineligible database is rejected"
+ (mt/user-http-request :crowberto :post 400 "ee/workspace-manager/"
+ {:name "Nope" :database_ids [ineligible-id]}))
+ (testing "at least one database is required"
+ (mt/user-http-request :crowberto :post 400 "ee/workspace-manager/"
+ {:name "Nope" :database_ids []})))))))
(deftest metadata-export-test
(testing "GET /:id/metadata/export streams metadata scoped to the workspace's databases + input"
@@ -120,73 +105,16 @@
(defmacro ^:private with-data-analyst [& body]
`(perms.test-util/with-data-analyst-role! (mt/user->id :rasta) ~@body))
-(defmacro ^:private with-workspaces-perm [db-id & body]
- `(perms.test-util/with-db-perm-for-group! (perms/all-users-group) ~db-id
- :perms/workspaces :yes
- ~@body))
-
-(deftest get-endpoints-use-workspace-can-read?-test
- (testing "GET /, GET /:id, and GET /:id/metadata/export dispatch through `Workspace.can-read?` — Data Analyst alone passes"
- (mt/with-temp [:model/Workspace {ws-id :id} {}]
- (with-data-analyst
- (mt/user-http-request :rasta :get 200 "ee/workspace-manager/")
- (mt/user-http-request :rasta :get 200 (str "ee/workspace-manager/" ws-id))
- (mt/user-http-request :rasta :get 202
- (str "ee/workspace-manager/" ws-id "/metadata/export"))))))
-
-(deftest post-workspace-uses-workspace-can-create?-test
- (testing "POST / dispatches through `Workspace.can-create?` — Data Analyst alone is rejected; granting `:perms/workspaces` on any DB lets the call through"
- (mt/with-model-cleanup [:model/Workspace]
- (with-data-analyst
- (mt/user-http-request :rasta :post 403 "ee/workspace-manager/" {:name "Nope"})
- (with-workspaces-perm (mt/id)
- (is (=? {:name "OK"}
- (mt/user-http-request :rasta :post 200 "ee/workspace-manager/" {:name "OK"}))))))))
-
-(deftest workspace-write-endpoints-use-workspace-can-write?-test
- (testing "PUT /:id, DELETE /:id, and GET /:id/config dispatch through `Workspace.can-write?` — Data Analyst alone is rejected (rules out `can-read?`); granting `:perms/workspaces` on any DB lets the call through"
+(deftest endpoints-are-superuser-only-test
+ (testing "All workspace-manager endpoints reject non-superusers, even Data Analysts"
(mt/with-temp [:model/Workspace {ws-id :id} {}]
(with-data-analyst
+ (mt/user-http-request :rasta :get 403 "ee/workspace-manager/")
+ (mt/user-http-request :rasta :get 403 (str "ee/workspace-manager/" ws-id))
+ (mt/user-http-request :rasta :get 403
+ (str "ee/workspace-manager/" ws-id "/metadata/export"))
+ (mt/user-http-request :rasta :post 403 "ee/workspace-manager/"
+ {:name "Nope" :database_ids [(mt/id)]})
(mt/user-http-request :rasta :put 403 (str "ee/workspace-manager/" ws-id) {:name "Nope"})
(mt/user-http-request :rasta :get 403 (str "ee/workspace-manager/" ws-id "/config"))
- (mt/user-http-request :rasta :delete 403 (str "ee/workspace-manager/" ws-id))
- (with-workspaces-perm (mt/id)
- (mt/user-http-request :rasta :put 200 (str "ee/workspace-manager/" ws-id) {:name "OK"})
- (mt/user-http-request :rasta :get 200 (str "ee/workspace-manager/" ws-id "/config"))
- (mt/user-http-request :rasta :delete 200 (str "ee/workspace-manager/" ws-id)))))))
-
-(deftest database-sub-endpoints-use-workspace-database-can-create?-and-can-write?-test
- (testing "POST /:id/database dispatches through `WorkspaceDatabase.can-create?`; PUT/DELETE /:id/database/:db-id dispatch through `WorkspaceDatabase.can-write?` — both keyed to the *specific* `:database_id`, not just any DB the caller has perm on (rules out `Workspace.can-write?`)"
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (mt/with-temp [:model/Database {target-db-id :id} {}
- :model/Database {other-db-id :id} {}
- :model/Workspace {ws-id :id} {}]
- (with-data-analyst
- (with-workspaces-perm target-db-id
- (testing "POST /:id/database — 403 against the no-perm DB"
- (mt/user-http-request :rasta :post 403
- (str "ee/workspace-manager/" ws-id "/database")
- {:database_id other-db-id :input_schemas ["PUBLIC"]}))
- (testing "POST /:id/database — 200 against the perm-holding DB"
- (mt/user-http-request :rasta :post 200
- (str "ee/workspace-manager/" ws-id "/database")
- {:database_id target-db-id :input_schemas ["PUBLIC"]}))
- ;; Attach `other-db-id` so we can target it on PUT / DELETE too.
- (mt/with-temp [:model/WorkspaceDatabase _ {:workspace_id ws-id
- :database_id other-db-id
- :input_schemas ["PUBLIC"]
- :status :provisioned}]
- (testing "PUT /:id/database/:db-id — 403 against the no-perm DB"
- (mt/user-http-request :rasta :put 403
- (str "ee/workspace-manager/" ws-id "/database/" other-db-id)
- {:input_schemas ["ANALYTICS"]}))
- (testing "PUT /:id/database/:db-id — 200 against the perm-holding DB"
- (mt/user-http-request :rasta :put 200
- (str "ee/workspace-manager/" ws-id "/database/" target-db-id)
- {:input_schemas ["PUBLIC"]}))
- (testing "DELETE /:id/database/:db-id — 403 against the no-perm DB"
- (mt/user-http-request :rasta :delete 403
- (str "ee/workspace-manager/" ws-id "/database/" other-db-id)))
- (testing "DELETE /:id/database/:db-id — 200 against the perm-holding DB"
- (mt/user-http-request :rasta :delete 200
- (str "ee/workspace-manager/" ws-id "/database/" target-db-id))))))))))
+ (mt/user-http-request :rasta :delete 403 (str "ee/workspace-manager/" ws-id))))))
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/core_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/core_test.clj
index 3cfc106caca..45016580f22 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/core_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/core_test.clj
@@ -53,96 +53,60 @@
(ws/create-workspace! {:name "B" :creator_id (mt/user->id :crowberto)})
(is (>= (count (ws/list-workspaces)) 2)))))
-;;; ----------------------------------------- Add/Remove Database ----------------------------------------------
-
-(deftest add-database-test
- (testing "add database provisions immediately"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "Add DB" :creator_id (mt/user->id :crowberto)})
- ws' (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC" "ANALYTICS"]))]
- (is (= 1 (count (:databases ws'))))
- (is (= ["PUBLIC" "ANALYTICS"]
- (:input_schemas (first (:databases ws')))))
- (is (= :provisioned (:status (first (:databases ws'))))))))
- (testing "input required on add"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "No Schema Add" :creator_id (mt/user->id :crowberto)})]
- (is (thrown-with-msg?
- ExceptionInfo #"input_schemas is required"
- (ws/add-database! (:id ws) (mt/id) []))))))
- (testing "input not required when database does not support :schemas (e.g. MySQL)"
- (when (workspaces.tu/driver-loadable? :mysql)
- (mt/with-temp [:model/Database {db-id :id} {:engine :mysql}]
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "MySQL Add" :creator_id (mt/user->id :crowberto)})
- ws' (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) db-id []))]
- (is (= 1 (count (:databases ws'))))
- (is (= [] (:input_schemas (first (:databases ws'))))))))))
- (testing "duplicate database throws 409"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "Dup DB" :creator_id (mt/user->id :crowberto)})]
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"]))
- (is (thrown-with-msg?
- ExceptionInfo #"Database already in workspace"
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"]))))))
- (testing "provisioning failure rolls the row back so the caller can retry cleanly"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "Roll Back" :creator_id (mt/user->id :crowberto)})
- failing-provisioner (reify provisioning/Provisioner
- (init! [_ _ _ _] (throw (ex-info "boom" {})))
- (grant! [_ _ _ _ _] nil)
- (destroy! [_ _ _ _] nil))]
- (with-redefs [provisioning/dispatching-provisioner failing-provisioner]
- (is (thrown-with-msg? ExceptionInfo #"boom"
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"]))))
- (is (empty? (:databases (ws/get-workspace (:id ws))))
- "the failed add must not leave a workspace_database row behind")))))
-
-(deftest remove-database-test
- (testing "remove deprovisions and deletes"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "Remove DB" :creator_id (mt/user->id :crowberto)})]
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"])
- (let [ws' (ws/remove-database! (:id ws) (mt/id))]
- (is (empty? (:databases ws'))))))))
- (testing "remove from non-existent workspace throws 404"
- (is (thrown-with-msg?
- ExceptionInfo #"Workspace not found"
- (ws/remove-database! 999999 (mt/id))))))
-
-;;; ----------------------------------------- Update Database --------------------------------------------------
-
-(deftest update-database-test
- (testing "update deprovisions old config and reprovisions with new input"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "Update DB" :creator_id (mt/user->id :crowberto)})]
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"])
- (let [ws' (ws/update-database! (:id ws) (mt/id) ["PUBLIC" "ANALYTICS"])]
- (is (= ["PUBLIC" "ANALYTICS"]
- (:input_schemas (first (:databases ws')))))
- (is (= :provisioned (:status (first (:databases ws'))))))))))
- (testing "reprovision failure rolls the input-schemas change back"
- (mt/with-model-cleanup [:model/Workspace]
- (let [ws (ws/create-workspace! {:name "Update Roll Back" :creator_id (mt/user->id :crowberto)})]
- (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"]))
- (let [failing-provisioner (reify provisioning/Provisioner
- (init! [_ _ _ _] (throw (ex-info "failure" {})))
- (grant! [_ _ _ _ _] nil)
- (destroy! [_ _ _ _] nil))]
- (with-redefs [provisioning/dispatching-provisioner failing-provisioner]
- (is (thrown-with-msg? ExceptionInfo #"failure"
- (ws/update-database! (:id ws) (mt/id) ["PUBLIC" "ANALYTICS"]))))
- (let [wsd (first (:databases (ws/get-workspace (:id ws))))]
- (is (= ["PUBLIC"] (:input_schemas wsd))
- "the new input_schemas must not commit when reprovisioning fails")
- (is (= :unprovisioned (:status wsd))
- "the row is left unprovisioned, consistent with the torn-down warehouse")))))))
+(deftest create-workspace-provisions-databases-test
+ (testing "create-workspace! attaches and provisions the given databases"
+ (mt/with-temp [:model/Database {db-id :id} {:engine :postgres
+ :details {}
+ :settings {:database-enable-workspaces true}}
+ :model/Table _ {:db_id db-id :schema "public" :active true}
+ :model/Database {ineligible-id :id} {:engine :postgres :details {}}]
+ (mt/with-model-cleanup [:model/Workspace]
+ (testing "an ineligible database is rejected"
+ (is (thrown-with-msg? ExceptionInfo #"Workspaces are not enabled for this database"
+ (ws/create-workspace! {:name "Nope"
+ :creator_id (mt/user->id :crowberto)
+ :database_ids [ineligible-id]}))))
+ (testing "a missing database is rejected"
+ (is (thrown-with-msg? ExceptionInfo #"Database not found"
+ (ws/create-workspace! {:name "Nope"
+ :creator_id (mt/user->id :crowberto)
+ :database_ids [Integer/MAX_VALUE]}))))
+ (testing "provisioning failure rolls back the workspace and its database rows"
+ (let [failing-provisioner (reify provisioning/Provisioner
+ (init! [_ _ _ _] (throw (ex-info "boom" {})))
+ (grant! [_ _ _ _ _] nil)
+ (destroy! [_ _ _ _] nil))]
+ (with-redefs [provisioning/dispatching-provisioner failing-provisioner]
+ (is (thrown-with-msg? ExceptionInfo #"boom"
+ (ws/create-workspace! {:name "Boom"
+ :creator_id (mt/user->id :crowberto)
+ :database_ids [db-id]}))))
+ (is (not (t2/exists? :model/Workspace :name "Boom"))
+ "the failed create must not leave a Workspace row behind")
+ (is (not (t2/exists? :model/WorkspaceDatabase :database_id db-id))
+ "the failed create must not leave WorkspaceDatabase rows behind")))
+ (testing "success: the attached database comes back :provisioned"
+ (with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
+ (let [ws (ws/create-workspace! {:name "Provisioned"
+ :creator_id (mt/user->id :crowberto)
+ :database_ids [db-id]})]
+ (is (=? [{:database_id db-id
+ :input_schemas ["public"]
+ :status :provisioned}]
+ (:databases ws))))))))))
+
+(defn- add-database!
+ "Test helper: insert a WorkspaceDatabase row for `workspace-id` and provision it
+ (blocking). Replaces the removed production add-database! for test setup."
+ [workspace-id database-id input-schemas]
+ (t2/with-transaction [_conn]
+ (let [wsd-id (t2/insert-returning-pk! :model/WorkspaceDatabase
+ {:workspace_id workspace-id
+ :database_id database-id
+ :input_schemas input-schemas
+ :database_details {}
+ :output_namespace ""})]
+ (provisioning/provision-single! wsd-id))))
;;; ----------------------------------------- Delete Workspace ------------------------------------------------
@@ -151,7 +115,7 @@
(mt/with-model-cleanup [:model/Workspace]
(let [ws (ws/create-workspace! {:name "Delete WS" :creator_id (mt/user->id :crowberto)})]
(with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
- (ws/add-database! (:id ws) (mt/id) ["PUBLIC"]))
+ (add-database! (:id ws) (mt/id) ["PUBLIC"]))
(with-redefs [provisioning/dispatching-provisioner (stub-provisioner)]
(ws/delete-workspace! (:id ws)))
(is (nil? (ws/get-workspace (:id ws)))))))
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
index 122709e8164..3f68f9f7566 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/e2e_test.clj
@@ -30,6 +30,7 @@
[metabase-enterprise.advanced-config.file :as advanced-config.file]
[metabase-enterprise.workspaces.config :as ws.config]
[metabase-enterprise.workspaces.core :as ws]
+ [metabase-enterprise.workspaces.provisioning :as provisioning]
[metabase-enterprise.workspaces.table-remapping :as ws.table-remapping]
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
@@ -92,6 +93,19 @@
[_driver _admin-details main-schema]
main-schema)
+(defn- add-database!
+ "Test helper: insert a WorkspaceDatabase row for `workspace-id` and provision it
+ (blocking). Replaces the removed production add-database! for test setup."
+ [workspace-id database-id input-schemas]
+ (t2/with-transaction [_conn]
+ (let [wsd-id (t2/insert-returning-pk! :model/WorkspaceDatabase
+ {:workspace_id workspace-id
+ :database_id database-id
+ :input_schemas input-schemas
+ :database_details {}
+ :output_namespace ""})]
+ (provisioning/provision-single! wsd-id))))
+
;;; -------------------- driver-branched helpers --------------------
;;;
;;; `admin-warehouse` is polymorphic: a JDBC db-spec map for JDBC drivers, a
@@ -343,8 +357,8 @@
;; multimethods, but through `provisioning/provision-single!`, which writes
;; the resulting `:database_details` and `:output_namespace` back to the
;; `WorkspaceDatabase` row — the inputs `build-workspace-config` reads.
- (ws/add-database! ws-id (:id ws-db)
- [(workspace-input-schema admin-driver admin-details main-schema)])
+ (add-database! ws-id (:id ws-db)
+ [(workspace-input-schema admin-driver admin-details main-schema)])
;; Sanity check: provisioning must have populated :output_namespace and flipped
;; status to :provisioned. If empty, the workspace driver impl is broken.
(let [wsd (-> (ws/get-workspace ws-id) :databases first)]
@@ -714,8 +728,8 @@
(let [{ws-id :id} (ws/create-workspace! {:name (str "ws-native-repro-" run-id)
:creator_id (mt/user->id :crowberto)})]
(try
- (ws/add-database! ws-id (:id ws-db)
- [(workspace-input-schema admin-driver admin-details main-schema)])
+ (add-database! ws-id (:id ws-db)
+ [(workspace-input-schema admin-driver admin-details main-schema)])
(let [cfg-map (ws.config/build-workspace-config ws-id)
yaml-str (ws.config/config->yaml cfg-map)
reparsed (yaml/parse-string yaml-str)]
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_database_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_database_test.clj
index aae8dba08d6..0e868083cdc 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_database_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_database_test.clj
@@ -14,7 +14,6 @@
[metabase-enterprise.workspaces.models.workspace]
[metabase-enterprise.workspaces.models.workspace-database]
[metabase.models.interface :as mi]
- [metabase.permissions.core :as perms]
[metabase.permissions.test-util :as perms.test-util]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
@@ -136,51 +135,47 @@
;;; ========================================= Permission predicates =========================================
;;;
-;;; - read: Data Analyst.
-;;; - write/create: Data Analyst + `:perms/workspaces :yes` for `:database_id`.
+;;; All WorkspaceDatabase permission predicates are superuser-only.
(defmacro ^:private with-normal-user [& body]
`(mt/with-test-user :rasta ~@body))
+(defmacro ^:private with-admin [& body]
+ `(mt/with-test-user :crowberto ~@body))
+
(defmacro ^:private with-data-analyst [& body]
`(perms.test-util/with-data-analyst-role! (mt/user->id :rasta)
(mt/with-test-user :rasta ~@body)))
-(defmacro ^:private with-workspaces-perm [db-id & body]
- `(perms.test-util/with-db-perm-for-group! (perms/all-users-group) ~db-id
- :perms/workspaces :yes
- ~@body))
-
(deftest can-read?-test
(testing "WorkspaceDatabase `mi/can-read?`"
(mt/with-temp [:model/Workspace {ws-id :id} {}
:model/WorkspaceDatabase wsd {:workspace_id ws-id}]
- (testing "non-Data-Analyst — false"
+ (testing "non-superuser — false"
(with-normal-user (is (false? (mi/can-read? wsd)))))
- (testing "Data Analyst — true (no per-database check)"
- (with-data-analyst (is (true? (mi/can-read? wsd))))))))
+ (testing "Data Analyst (non-superuser) — false"
+ (with-data-analyst (is (false? (mi/can-read? wsd)))))
+ (testing "superuser — true"
+ (with-admin (is (true? (mi/can-read? wsd))))))))
(deftest can-create?-test
(testing "WorkspaceDatabase `mi/can-create?`"
- (testing "non-Data-Analyst — false"
+ (testing "non-superuser — false"
(with-normal-user (is (false? (mi/can-create? :model/WorkspaceDatabase {:database_id (mt/id)})))))
- (testing "Data Analyst without `:perms/workspaces` for the target database — false"
+ (testing "Data Analyst (non-superuser) — false"
(with-data-analyst
(is (false? (mi/can-create? :model/WorkspaceDatabase {:database_id (mt/id)})))))
- (testing "Data Analyst with `:perms/workspaces :yes` for the target database — true"
- (with-data-analyst
- (with-workspaces-perm (mt/id)
- (is (true? (mi/can-create? :model/WorkspaceDatabase {:database_id (mt/id)}))))))))
+ (testing "superuser — true"
+ (with-admin
+ (is (true? (mi/can-create? :model/WorkspaceDatabase {:database_id (mt/id)})))))))
(deftest can-write?-test
(testing "WorkspaceDatabase `mi/can-write?`"
(mt/with-temp [:model/Workspace {ws-id :id} {}
:model/WorkspaceDatabase wsd {:workspace_id ws-id}]
- (testing "non-Data-Analyst — false"
+ (testing "non-superuser — false"
(with-normal-user (is (false? (mi/can-write? wsd)))))
- (testing "Data Analyst without `:perms/workspaces` for the row's database — false"
+ (testing "Data Analyst (non-superuser) — false"
(with-data-analyst (is (false? (mi/can-write? wsd)))))
- (testing "Data Analyst with `:perms/workspaces :yes` for the row's database — true"
- (with-data-analyst
- (with-workspaces-perm (mt/id)
- (is (true? (mi/can-write? wsd)))))))))
+ (testing "superuser — true"
+ (with-admin (is (true? (mi/can-write? wsd))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_test.clj
index 7600da79b13..aff091ab486 100644
--- a/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/workspaces/models/workspace_test.clj
@@ -3,7 +3,6 @@
[clojure.test :refer [deftest testing is]]
[metabase-enterprise.workspaces.models.workspace :as workspace]
[metabase.models.interface :as mi]
- [metabase.permissions.core :as perms]
[metabase.permissions.test-util :as perms.test-util]
[metabase.test :as mt]
[toucan2.core :as t2]))
@@ -229,69 +228,50 @@
;;; ========================================= Permission predicates =========================================
;;;
-;;; - read: Data Analyst + can-read? for every attached WorkspaceDatabase.
-;;; - create: Data Analyst + `:perms/workspaces :yes` on any database.
-;;; - write: Data Analyst + `:perms/workspaces :yes` on any database
-;;; + can-write? for every attached WorkspaceDatabase.
-;;; Admins always pass via the underlying superuser bypass.
+;;; All workspace permission predicates are superuser-only.
(defmacro ^:private with-normal-user [& body]
`(mt/with-test-user :rasta ~@body))
+(defmacro ^:private with-admin [& body]
+ `(mt/with-test-user :crowberto ~@body))
+
(defmacro ^:private with-data-analyst [& body]
`(perms.test-util/with-data-analyst-role! (mt/user->id :rasta)
(mt/with-test-user :rasta ~@body)))
-(defmacro ^:private with-workspaces-perm [db-id & body]
- `(perms.test-util/with-db-perm-for-group! (perms/all-users-group) ~db-id
- :perms/workspaces :yes
- ~@body))
-
(deftest can-read?-test
(testing "Workspace `mi/can-read?`"
(mt/with-temp [:model/Workspace ws {}]
- (testing "non-Data-Analyst — false"
+ (testing "non-superuser — false"
(with-normal-user (is (false? (mi/can-read? ws)))))
- (testing "Data Analyst, empty workspace — true"
- (with-data-analyst (is (true? (mi/can-read? ws))))))
- (mt/with-temp [:model/Workspace {ws-id :id :as ws} {}
- :model/WorkspaceDatabase _ {:workspace_id ws-id}]
- (testing "Data Analyst with attached database — every WSD `can-read?` is satisfied (analyst-level)"
- (with-data-analyst (is (true? (mi/can-read? ws))))))))
+ (testing "Data Analyst (non-superuser) — false"
+ (with-data-analyst (is (false? (mi/can-read? ws)))))
+ (testing "superuser — true"
+ (with-admin (is (true? (mi/can-read? ws))))))))
(deftest can-create?-test
(testing "Workspace `mi/can-create?`"
- (testing "non-Data-Analyst — false"
+ (testing "non-superuser — false"
(with-normal-user (is (false? (mi/can-create? :model/Workspace {})))))
- (testing "Data Analyst alone (no `:perms/workspaces` anywhere) — false"
+ (testing "Data Analyst (non-superuser) — false"
(with-data-analyst (is (false? (mi/can-create? :model/Workspace {})))))
- (testing "Data Analyst + `:perms/workspaces :yes` on any database — true"
- (with-data-analyst
- (with-workspaces-perm (mt/id)
- (is (true? (mi/can-create? :model/Workspace {}))))))))
+ (testing "superuser — true"
+ (with-admin (is (true? (mi/can-create? :model/Workspace {})))))))
(deftest can-write?-test
(testing "Workspace `mi/can-write?`"
(mt/with-temp [:model/Workspace ws {}]
- (testing "non-Data-Analyst — false"
+ (testing "non-superuser — false"
(with-normal-user (is (false? (mi/can-write? ws)))))
- (testing "Data Analyst alone, even on an empty workspace — false (need workspaces perm somewhere)"
+ (testing "Data Analyst (non-superuser) — false"
(with-data-analyst (is (false? (mi/can-write? ws)))))
- (testing "Data Analyst + `:perms/workspaces :yes` on any database, empty workspace — true"
- (with-data-analyst
- (with-workspaces-perm (mt/id)
- (is (true? (mi/can-write? ws)))))))
- (mt/with-temp [:model/Database {db1-id :id} {}
- :model/Database {db2-id :id} {}
+ (testing "superuser, empty workspace — true"
+ (with-admin (is (true? (mi/can-write? ws))))))
+ (mt/with-temp [:model/Database {db1-id :id} {}
+ :model/Database {db2-id :id} {}
:model/Workspace {ws-id :id :as ws} {}
:model/WorkspaceDatabase _ {:workspace_id ws-id, :database_id db1-id}
:model/WorkspaceDatabase _ {:workspace_id ws-id, :database_id db2-id}]
- (testing "Data Analyst + perm on ONE of two attached databases — false"
- (with-data-analyst
- (with-workspaces-perm db1-id
- (is (false? (mi/can-write? ws))))))
- (testing "Data Analyst + perm on BOTH attached databases — true"
- (with-data-analyst
- (with-workspaces-perm db1-id
- (with-workspaces-perm db2-id
- (is (true? (mi/can-write? ws))))))))))
+ (testing "superuser with attached databases — true"
+ (with-admin (is (true? (mi/can-write? ws))))))))
diff --git a/enterprise/frontend/src/metabase-enterprise/api/index.ts b/enterprise/frontend/src/metabase-enterprise/api/index.ts
index a5a2ac08a98..3fdafd66f77 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/index.ts
@@ -22,5 +22,5 @@ export * from "./table";
export * from "./tags";
export * from "./tenants";
export * from "./upload-management";
-export * from "./workspace";
+export * from "./workspace-manager";
export * from "./workspace-instance";
diff --git a/enterprise/frontend/src/metabase-enterprise/api/workspace-instance.ts b/enterprise/frontend/src/metabase-enterprise/api/workspace-instance.ts
index da9417bbb23..bb1f8064618 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/workspace-instance.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/workspace-instance.ts
@@ -1,8 +1,8 @@
import { provideTableRemappingListTags } from "metabase/api/tags";
import type {
+ CurrentWorkspace,
GetCurrentWorkspaceResponse,
TableRemapping,
- WorkspaceInstance,
} from "metabase-types/api";
import { EnterpriseApi } from "./api";
@@ -10,7 +10,7 @@ import { invalidateTags, listTag, tag } from "./tags";
export const workspaceInstanceApi = EnterpriseApi.injectEndpoints({
endpoints: (builder) => ({
- getCurrentWorkspace: builder.query<WorkspaceInstance | null, void>({
+ getCurrentWorkspace: builder.query<CurrentWorkspace | null, void>({
query: () => ({
method: "GET",
url: "/api/ee/workspace-instance/current",
@@ -19,7 +19,7 @@ export const workspaceInstanceApi = EnterpriseApi.injectEndpoints({
response.data,
providesTags: [tag("workspace")],
}),
- deleteWorkspaceInstance: builder.mutation<void, void>({
+ deleteCurrentWorkspace: builder.mutation<void, void>({
query: () => ({
method: "DELETE",
url: "/api/ee/workspace-instance/current",
@@ -40,6 +40,6 @@ export const workspaceInstanceApi = EnterpriseApi.injectEndpoints({
export const {
useGetCurrentWorkspaceQuery,
- useDeleteWorkspaceInstanceMutation,
+ useDeleteCurrentWorkspaceMutation,
useListTableRemappingsQuery,
} = workspaceInstanceApi;
diff --git a/enterprise/frontend/src/metabase-enterprise/api/workspace-manager.ts b/enterprise/frontend/src/metabase-enterprise/api/workspace-manager.ts
new file mode 100644
index 00000000000..b88945463a6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/api/workspace-manager.ts
@@ -0,0 +1,59 @@
+import type {
+ CreateWorkspaceRequest,
+ UpdateWorkspaceRequest,
+ Workspace,
+ WorkspaceId,
+} from "metabase-types/api";
+
+import { EnterpriseApi } from "./api";
+import {
+ idTag,
+ invalidateTags,
+ listTag,
+ provideWorkspaceListTags,
+} from "./tags";
+
+export const workspaceManagerApi = EnterpriseApi.injectEndpoints({
+ endpoints: (builder) => ({
+ listWorkspaces: builder.query<Workspace[], void>({
+ query: () => ({
+ method: "GET",
+ url: "/api/ee/workspace-manager",
+ }),
+ providesTags: (workspaces = []) => provideWorkspaceListTags(workspaces),
+ }),
+ createWorkspace: builder.mutation<Workspace, CreateWorkspaceRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/ee/workspace-manager",
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [listTag("workspace")]),
+ }),
+ updateWorkspace: builder.mutation<Workspace, UpdateWorkspaceRequest>({
+ query: ({ id, ...body }) => ({
+ method: "PUT",
+ url: `/api/ee/workspace-manager/${id}`,
+ body,
+ }),
+ invalidatesTags: (_, error, { id }) =>
+ invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
+ }),
+ deleteWorkspace: builder.mutation<void, WorkspaceId>({
+ query: (id) => ({
+ method: "DELETE",
+ url: `/api/ee/workspace-manager/${id}`,
+ }),
+ invalidatesTags: (_, error, id) =>
+ invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
+ }),
+ }),
+});
+
+export const {
+ useListWorkspacesQuery,
+ useCreateWorkspaceMutation,
+ useUpdateWorkspaceMutation,
+ useDeleteWorkspaceMutation,
+} = workspaceManagerApi;
diff --git a/enterprise/frontend/src/metabase-enterprise/api/workspace.ts b/enterprise/frontend/src/metabase-enterprise/api/workspace.ts
deleted file mode 100644
index 18862d794a7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/api/workspace.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import type {
- CreateWorkspaceDatabaseRequest,
- CreateWorkspaceRequest,
- DeleteWorkspaceDatabaseRequest,
- UpdateWorkspaceDatabaseRequest,
- UpdateWorkspaceRequest,
- Workspace,
- WorkspaceId,
-} from "metabase-types/api";
-
-import { EnterpriseApi } from "./api";
-import {
- idTag,
- invalidateTags,
- listTag,
- provideWorkspaceListTags,
- provideWorkspaceTags,
-} from "./tags";
-
-export const workspaceApi = EnterpriseApi.injectEndpoints({
- endpoints: (builder) => ({
- listWorkspaces: builder.query<Workspace[], void>({
- query: () => ({
- method: "GET",
- url: "/api/ee/workspace-manager",
- }),
- providesTags: (workspaces = []) => provideWorkspaceListTags(workspaces),
- }),
- getWorkspace: builder.query<Workspace, WorkspaceId>({
- query: (id) => ({
- method: "GET",
- url: `/api/ee/workspace-manager/${id}`,
- }),
- providesTags: (workspace) =>
- workspace ? provideWorkspaceTags(workspace) : [],
- }),
- createWorkspace: builder.mutation<Workspace, CreateWorkspaceRequest>({
- query: (body) => ({
- method: "POST",
- url: "/api/ee/workspace-manager",
- body,
- }),
- invalidatesTags: (_, error) =>
- invalidateTags(error, [listTag("workspace")]),
- }),
- updateWorkspace: builder.mutation<Workspace, UpdateWorkspaceRequest>({
- query: ({ id, ...body }) => ({
- method: "PUT",
- url: `/api/ee/workspace-manager/${id}`,
- body,
- }),
- invalidatesTags: (_, error, { id }) =>
- invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
- }),
- deleteWorkspace: builder.mutation<void, WorkspaceId>({
- query: (id) => ({
- method: "DELETE",
- url: `/api/ee/workspace-manager/${id}`,
- }),
- invalidatesTags: (_, error, id) =>
- invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
- }),
- createWorkspaceDatabase: builder.mutation<
- Workspace,
- CreateWorkspaceDatabaseRequest
- >({
- query: ({ id, ...body }) => ({
- method: "POST",
- url: `/api/ee/workspace-manager/${id}/database`,
- body,
- }),
- invalidatesTags: (_, error, { id }) =>
- invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
- }),
- updateWorkspaceDatabase: builder.mutation<
- Workspace,
- UpdateWorkspaceDatabaseRequest
- >({
- query: ({ id, database_id, ...body }) => ({
- method: "PUT",
- url: `/api/ee/workspace-manager/${id}/database/${database_id}`,
- body,
- }),
- invalidatesTags: (_, error, { id }) =>
- invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
- }),
- deleteWorkspaceDatabase: builder.mutation<
- Workspace,
- DeleteWorkspaceDatabaseRequest
- >({
- query: ({ id, database_id }) => ({
- method: "DELETE",
- url: `/api/ee/workspace-manager/${id}/database/${database_id}`,
- }),
- invalidatesTags: (_, error, { id }) =>
- invalidateTags(error, [listTag("workspace"), idTag("workspace", id)]),
- }),
- }),
-});
-
-export const {
- useListWorkspacesQuery,
- useGetWorkspaceQuery,
- useLazyGetWorkspaceQuery,
- useCreateWorkspaceMutation,
- useUpdateWorkspaceMutation,
- useDeleteWorkspaceMutation,
- useCreateWorkspaceDatabaseMutation,
- useUpdateWorkspaceDatabaseMutation,
- useDeleteWorkspaceDatabaseMutation,
-} = workspaceApi;
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts
index 775b699fee1..2ede375094d 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts
@@ -13,7 +13,6 @@ import { buildDataModelPermission } from "./data-model-permission";
import { buildDetailsPermission } from "./details-permission";
import { buildDownloadPermission } from "./download-permission";
import { buildTransformsPermission } from "./transforms-permission";
-import { buildWorkspacesPermission } from "./workspaces-permission";
export const getFeatureLevelDataPermissions = ({
entityId,
@@ -25,7 +24,6 @@ export const getFeatureLevelDataPermissions = ({
permissionSubject,
permissionView,
showTransformPermissions = false,
- showWorkspacesPermissions = false,
}: {
entityId: PermissionEntityId;
groupId: number;
@@ -36,7 +34,6 @@ export const getFeatureLevelDataPermissions = ({
permissionSubject: PermissionSubject;
permissionView?: "group" | "database";
showTransformPermissions?: boolean;
- showWorkspacesPermissions?: boolean;
}): PermissionSectionConfig[] => {
const isAdmin = groupType === "admin";
const isExternal = groupType === "external";
@@ -86,22 +83,10 @@ export const getFeatureLevelDataPermissions = ({
)
: null;
- const workspacesPermission = showWorkspacesPermissions
- ? buildWorkspacesPermission(
- entityId,
- groupId,
- isAdmin,
- permissions,
- defaultGroup,
- permissionSubject,
- )
- : null;
-
return [
downloadPermission,
dataModelPermission,
detailsPermission,
transformsPermission,
- workspacesPermission,
].filter(isNotNull);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/workspaces-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/workspaces-permission.ts
deleted file mode 100644
index d1ec64cf779..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/workspaces-permission.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { getIn } from "icepick";
-import { t } from "ttag";
-
-import { Messages } from "metabase/admin/permissions/constants/messages";
-import {
- getPermissionWarning,
- getPermissionWarningModal,
-} from "metabase/admin/permissions/selectors/confirmations";
-import {
- DataPermissionType,
- type PermissionOption,
- type PermissionSectionConfig,
-} from "metabase/admin/permissions/types";
-import { getSchemasPermission } from "metabase/admin/permissions/utils/graph";
-import {
- DataPermission,
- DataPermissionValue,
- type Group,
- type GroupsPermissions,
- type PermissionEntityId,
- type PermissionSubject,
-} from "metabase-types/api";
-
-export const WORKSPACES_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
- no: {
- get label() {
- return t`No`;
- },
- value: DataPermissionValue.NO,
- icon: "close",
- iconColor: "danger",
- },
- yes: {
- get label() {
- return t`Yes`;
- },
- value: DataPermissionValue.YES,
- icon: "check",
- iconColor: "success",
- },
-};
-
-const WORKSPACES_PERMISSIONS_DESC = [
- WORKSPACES_PERMISSION_OPTIONS.yes.value,
- WORKSPACES_PERMISSION_OPTIONS.no.value,
-];
-
-const getWorkspacesPermission = (
- permissions: GroupsPermissions,
- groupId: number,
- databaseId: number,
-) =>
- getIn(permissions, [groupId, databaseId, DataPermission.WORKSPACES]) ??
- WORKSPACES_PERMISSION_OPTIONS.no.value;
-
-const hasFullViewDataAccess = (viewDataValue: DataPermissionValue): boolean => {
- return viewDataValue === DataPermissionValue.UNRESTRICTED;
-};
-
-const hasFullCreateQueriesAccess = (
- createQueriesValue: DataPermissionValue,
-): boolean => {
- return createQueriesValue === DataPermissionValue.QUERY_BUILDER_AND_NATIVE;
-};
-
-const getWorkspacesDisabledTooltip = (
- isAdmin: boolean,
- hasRequiredPermissions: boolean,
-): string | null => {
- if (isAdmin) {
- return Messages.UNABLE_TO_CHANGE_ADMIN_PERMISSIONS;
- }
-
- if (!hasRequiredPermissions) {
- return t`Workspaces require "Can view" data access and "Query builder and native" for all tables in this database`;
- }
-
- return null;
-};
-
-export const buildWorkspacesPermission = (
- entityId: PermissionEntityId,
- groupId: number,
- isAdmin: boolean,
- permissions: GroupsPermissions,
- defaultGroup: Group,
- permissionSubject: PermissionSubject,
-): PermissionSectionConfig | null => {
- if (permissionSubject !== "schemas") {
- return null;
- }
-
- const viewDataValue = getSchemasPermission(
- permissions,
- groupId,
- entityId,
- DataPermission.VIEW_DATA,
- );
-
- const createQueriesValue = getSchemasPermission(
- permissions,
- groupId,
- entityId,
- DataPermission.CREATE_QUERIES,
- );
-
- const hasRequiredPermissions =
- hasFullViewDataAccess(viewDataValue) &&
- hasFullCreateQueriesAccess(createQueriesValue);
-
- const isDisabled = isAdmin || !hasRequiredPermissions;
-
- const value = hasRequiredPermissions
- ? getWorkspacesPermission(permissions, groupId, entityId.databaseId)
- : WORKSPACES_PERMISSION_OPTIONS.no.value;
-
- const defaultGroupValue = getWorkspacesPermission(
- permissions,
- defaultGroup.id,
- entityId.databaseId,
- );
-
- const warning = getPermissionWarning(
- value,
- defaultGroupValue,
- permissionSubject,
- defaultGroup,
- groupId,
- WORKSPACES_PERMISSIONS_DESC,
- );
-
- const confirmations = (newValue: DataPermissionValue) => [
- getPermissionWarningModal(
- newValue,
- defaultGroupValue,
- permissionSubject,
- defaultGroup,
- groupId,
- WORKSPACES_PERMISSIONS_DESC,
- ),
- ];
-
- return {
- permission: DataPermission.WORKSPACES,
- type: DataPermissionType.WORKSPACES,
- value,
- isDisabled,
- isHighlighted: isAdmin,
- warning,
- confirmations,
- disabledTooltip: getWorkspacesDisabledTooltip(
- isAdmin,
- hasRequiredPermissions,
- ),
- options: [
- WORKSPACES_PERMISSION_OPTIONS.no,
- WORKSPACES_PERMISSION_OPTIONS.yes,
- ],
- };
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx
index 705731fce15..7bb75e1e0ab 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx
@@ -38,13 +38,11 @@ export const getDataColumns = ({
groupType,
isExternal,
showTransformPermissions = false,
- showWorkspacesPermissions = false,
}: {
subject: PermissionSubject;
groupType?: SpecialGroupType;
isExternal?: boolean;
showTransformPermissions?: boolean;
- showWorkspacesPermissions?: boolean;
}) => {
const allSubjectsColumns: { name: string; hint?: ReactNode }[] = [
{
@@ -79,22 +77,6 @@ export const getDataColumns = ({
)} to use transforms.`,
});
}
-
- if (showWorkspacesPermissions) {
- allSubjectsColumns.push({
- name: t`Workspaces`,
- hint:
- groupType === "analyst" || groupType === "admin"
- ? null
- : jt`Users must also be a member of the ${(
- <Link
- key="link"
- to="/admin/people"
- style={{ textDecoration: "underline" }}
- >{t`Data Analysts group`}</Link>
- )} to use workspaces.`,
- });
- }
}
return allSubjectsColumns;
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/analytics.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/analytics.ts
index e08e6645905..61d43d5672f 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/analytics.ts
@@ -12,17 +12,6 @@ export function trackWorkspaceCreated({
});
}
-export function trackWorkspaceDatabaseAdded({
- workspaceId,
-}: {
- workspaceId: WorkspaceId;
-}) {
- trackSimpleEvent({
- event: "workspaces_database_added",
- target_id: workspaceId,
- });
-}
-
export function trackWorkspaceConfigDownloaded({
workspaceId,
}: {
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx
deleted file mode 100644
index b5f3ce2560b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Link } from "react-router";
-import { t } from "ttag";
-
-import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/components/DatabaseConnectionHealthInfo";
-import {
- DatabaseInfoSection,
- DatabaseInfoSectionDivider,
-} from "metabase/admin/databases/components/DatabaseInfoSection";
-import { useUpdateDatabaseMutation } from "metabase/api";
-import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { useToast } from "metabase/common/hooks/use-toast";
-import {
- hasDbRoutingEnabled,
- hasFeature,
- isDbModifiable,
-} from "metabase/common/utils/database";
-import type { AdminConnectionInfoSectionProps } from "metabase/plugins/oss/workspaces";
-import { Alert, Button, FixedSizeIcon, Group } from "metabase/ui";
-import * as Urls from "metabase/urls";
-
-export function AdminConnectionInfoSection({
- database,
-}: AdminConnectionInfoSectionProps) {
- const hasAdminConnection = database.admin_details != null;
- const [updateDatabase] = useUpdateDatabaseMutation();
- const { modalContent, show: showConfirmation } = useConfirmation();
- const [sendToast] = useToast();
- const isDbRoutingEnabled = hasDbRoutingEnabled(database);
-
- if (!isDbModifiable(database) || !hasFeature(database, "workspace")) {
- return null;
- }
-
- const handleRemove = () => {
- showConfirmation({
- title: t`Remove admin connection?`,
- message: t`This will remove the admin connection for this database. Any features that depend on it will stop working.`,
- confirmButtonText: t`Remove`,
- onConfirm: async () => {
- try {
- await updateDatabase({
- id: database.id,
- admin_details: null,
- }).unwrap();
- } catch {
- sendToast({
- message: t`Failed to remove admin connection`,
- toastColor: "error",
- icon: "warning",
- });
- }
- },
- });
- };
-
- return (
- <DatabaseInfoSection
- name={t`Admin connection`}
- description={t`Admin connection is used to create a temporary user and an isolation schema for a workspace.`}
- data-testid="admin-connection-info-section"
- >
- <Group justify="space-between" gap="lg">
- {hasAdminConnection && (
- <DatabaseConnectionHealthInfo
- databaseId={database.id}
- connectionType="admin"
- />
- )}
- <Button
- component={isDbRoutingEnabled ? undefined : Link}
- to={Urls.editDatabaseAdminConnection(database.id)}
- disabled={isDbRoutingEnabled}
- >
- {hasAdminConnection
- ? t`Edit connection details`
- : t`Add admin connection`}
- </Button>
- </Group>
-
- {isDbRoutingEnabled && (
- <>
- <DatabaseInfoSectionDivider />
- <Alert
- variant="light"
- color="info"
- icon={<FixedSizeIcon name="info" />}
- mb="md"
- >
- {t`Admin connection can't be enabled when Database Routing is enabled.`}
- </Alert>
- </>
- )}
-
- {hasAdminConnection && (
- <>
- <DatabaseInfoSectionDivider condensed />
- <Group>
- <Button variant="filled" color="error" onClick={handleRemove}>
- {t`Remove admin connection`}
- </Button>
- </Group>
- </>
- )}
- {modalContent}
- </DatabaseInfoSection>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx
deleted file mode 100644
index 7e2a59142f7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import {
- setupDatabaseHealthcheckEndpoint,
- setupUpdateDatabaseEndpoint,
- setupUpdateDatabaseEndpointError,
-} from "__support__/server-mocks/database";
-import { renderWithProviders, screen } from "__support__/ui";
-import { UndoListing } from "metabase/common/components/UndoListing";
-import type { Database } from "metabase-types/api";
-import { createMockDatabase } from "metabase-types/api/mocks";
-
-import { AdminConnectionInfoSection } from "./AdminConnectionInfoSection";
-
-interface SetupOpts {
- database?: Database;
- withError?: boolean;
-}
-
-function setup({
- database = createMockDatabase({ features: ["workspace"] }),
- withError = false,
-}: SetupOpts = {}) {
- setupDatabaseHealthcheckEndpoint(database.id);
- if (withError) {
- setupUpdateDatabaseEndpointError(database.id);
- } else {
- setupUpdateDatabaseEndpoint(database);
- }
- renderWithProviders(
- <>
- <AdminConnectionInfoSection database={database} />
- <UndoListing />
- </>,
- );
-}
-
-describe("AdminConnectionInfoSection", () => {
- it("should not render for a non-modifiable database (attached DWH)", () => {
- setup({
- database: createMockDatabase({
- is_attached_dwh: true,
- features: ["workspace"],
- }),
- });
-
- expect(
- screen.queryByTestId("admin-connection-info-section"),
- ).not.toBeInTheDocument();
- });
-
- it("should not render when the database does not support the workspace feature", () => {
- setup({ database: createMockDatabase({ features: [] }) });
-
- expect(
- screen.queryByTestId("admin-connection-info-section"),
- ).not.toBeInTheDocument();
- });
-
- it("should render for a modifiable database that supports the workspace feature", () => {
- setup({
- database: createMockDatabase({
- is_attached_dwh: false,
- features: ["workspace"],
- }),
- });
-
- expect(
- screen.getByTestId("admin-connection-info-section"),
- ).toBeInTheDocument();
- });
-
- it("should show a warning when database routing is enabled", () => {
- setup({
- database: createMockDatabase({
- router_user_attribute: "some_attribute",
- features: ["workspace"],
- }),
- });
-
- expect(
- screen.getByText(
- "Admin connection can't be enabled when Database Routing is enabled.",
- ),
- ).toBeInTheDocument();
- });
-
- it("should not show a warning when database routing is not enabled", () => {
- setup({
- database: createMockDatabase({
- router_user_attribute: null,
- features: ["workspace"],
- }),
- });
-
- expect(
- screen.queryByText(
- "Admin connection can't be enabled when Database Routing is enabled.",
- ),
- ).not.toBeInTheDocument();
- });
-
- it("should show an error toast when removing the admin connection fails", async () => {
- const database = createMockDatabase({
- features: ["workspace"],
- admin_details: { user: "admin" },
- });
- setup({ database, withError: true });
-
- await userEvent.click(
- screen.getByRole("button", { name: "Remove admin connection" }),
- );
- await userEvent.click(
- await screen.findByRole("button", { name: "Remove" }),
- );
-
- expect(
- await screen.findByText("Failed to remove admin connection"),
- ).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/index.ts
deleted file mode 100644
index 37530b80625..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./AdminConnectionInfoSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/DatabaseInfo.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/DatabaseInfo.tsx
deleted file mode 100644
index 8f39e5830b5..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/DatabaseInfo.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { c, msgid } from "ttag";
-
-import { Group, Pill, Text } from "metabase/ui";
-import type { Database, WorkspaceDatabase } from "metabase-types/api";
-
-const SCHEMAS_LIMIT = 10;
-
-export type DatabaseInfoProps = {
- workspaceDatabase: WorkspaceDatabase;
- database: Database | undefined;
-};
-
-export function DatabaseInfo({
- workspaceDatabase,
- database,
-}: DatabaseInfoProps) {
- const allSchemas = workspaceDatabase.input_schemas;
- const visibleSchemas = allSchemas.slice(0, SCHEMAS_LIMIT);
- const hasMoreSchemas = allSchemas.length > SCHEMAS_LIMIT;
- const moreSchemasCount = hasMoreSchemas
- ? allSchemas.length - SCHEMAS_LIMIT
- : 0;
-
- return (
- <Group gap="sm">
- <Text fw="bold">{database?.name}</Text>
- <Group gap="sm">
- {visibleSchemas.map((schema) => (
- <Pill key={schema}>{schema}</Pill>
- ))}
- {hasMoreSchemas && (
- <Pill c="text-secondary">
- {c(
- "text shown after a list of schemas for a database, e.g. 'And 10 more'",
- ).ngettext(
- msgid`And ${moreSchemasCount} more`,
- `And ${moreSchemasCount} more`,
- moreSchemasCount,
- )}
- </Pill>
- )}
- </Group>
- </Group>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/DatabaseInfo.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/DatabaseInfo.unit.spec.tsx
deleted file mode 100644
index bb460b9ae54..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/DatabaseInfo.unit.spec.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { renderWithProviders, screen } from "__support__/ui";
-import type { Database, WorkspaceDatabase } from "metabase-types/api";
-import {
- createMockDatabase,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { DatabaseInfo } from "./DatabaseInfo";
-
-const POSTGRES = createMockDatabase({ id: 10, name: "Postgres" });
-
-type SetupOpts = {
- workspaceDatabase?: WorkspaceDatabase;
- database?: Database;
-};
-
-function setup({
- workspaceDatabase = createMockWorkspaceDatabase({ database_id: POSTGRES.id }),
- database = POSTGRES,
-}: SetupOpts = {}) {
- renderWithProviders(
- <DatabaseInfo workspaceDatabase={workspaceDatabase} database={database} />,
- );
-}
-
-describe("DatabaseInfo", () => {
- it("renders the database name and schema pills when the database is found", () => {
- setup({
- workspaceDatabase: createMockWorkspaceDatabase({
- database_id: POSTGRES.id,
- input_schemas: ["public", "analytics"],
- }),
- });
-
- expect(screen.getByText("Postgres")).toBeInTheDocument();
- expect(screen.getByText("public")).toBeInTheDocument();
- expect(screen.getByText("analytics")).toBeInTheDocument();
- });
-
- it("shows a 'more' pill when there are more than 10 schemas", () => {
- const schemas = Array.from({ length: 13 }, (_, i) => `schema_${i + 1}`);
-
- setup({
- workspaceDatabase: createMockWorkspaceDatabase({
- database_id: POSTGRES.id,
- input_schemas: schemas,
- }),
- });
-
- expect(screen.getByText("schema_1")).toBeInTheDocument();
- expect(screen.getByText("schema_10")).toBeInTheDocument();
- expect(screen.queryByText("schema_11")).not.toBeInTheDocument();
- expect(screen.getByText("And 3 more")).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/index.ts
deleted file mode 100644
index 21e437881fe..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DatabaseInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DatabaseInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/HelpMenu.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/HelpMenu.tsx
deleted file mode 100644
index 46fa7128c50..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/HelpMenu.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Link } from "react-router";
-import { t } from "ttag";
-
-import { useDocsUrl } from "metabase/common/hooks";
-import { Button, FixedSizeIcon, Menu } from "metabase/ui";
-
-export function HelpMenu() {
- const { url: fileBasedDevDocsUrl, showMetabaseLinks: showFileBasedDevLink } =
- useDocsUrl("ai/file-based-development");
- const { url: remoteSyncDocsUrl, showMetabaseLinks: showRemoteSyncLink } =
- useDocsUrl("installation-and-operation/remote-sync");
-
- if (!showFileBasedDevLink && !showRemoteSyncLink) {
- return null;
- }
-
- return (
- <Menu>
- <Menu.Target>
- <Button
- rightSection={<FixedSizeIcon name="chevrondown" aria-hidden />}
- >{t`Help`}</Button>
- </Menu.Target>
- <Menu.Dropdown>
- {showFileBasedDevLink && (
- <Menu.Item
- component={Link}
- to={fileBasedDevDocsUrl}
- target="_blank"
- rel="noreferrer"
- leftSection={<FixedSizeIcon name="reference" aria-hidden />}
- >
- {t`File-based development`}
- </Menu.Item>
- )}
- {showRemoteSyncLink && (
- <Menu.Item
- component={Link}
- to={remoteSyncDocsUrl}
- target="_blank"
- rel="noreferrer"
- leftSection={<FixedSizeIcon name="reference" aria-hidden />}
- >
- {t`Using remote sync`}
- </Menu.Item>
- )}
- </Menu.Dropdown>
- </Menu>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/HelpMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/HelpMenu.unit.spec.tsx
deleted file mode 100644
index b0236ecdcf9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/HelpMenu.unit.spec.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
-import { createMockSettings } from "metabase-types/api/mocks";
-
-import { HelpMenu } from "./HelpMenu";
-
-function setup() {
- renderWithProviders(<Route path="*" component={HelpMenu} />, {
- withRouter: true,
- storeInitialState: {
- settings: createMockSettingsState(
- createMockSettings({ "show-metabase-links": true }),
- ),
- },
- });
-}
-
-describe("HelpMenu", () => {
- it("renders two docs links in the menu", async () => {
- setup();
-
- await userEvent.click(screen.getByRole("button", { name: /Help/ }));
-
- expect(
- await screen.findByRole("menuitem", { name: /File-based development/ }),
- ).toBeInTheDocument();
- expect(
- screen.getByRole("menuitem", { name: /Using remote sync/ }),
- ).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/index.ts
deleted file mode 100644
index 1223cd71e70..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/HelpMenu/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./HelpMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsx
new file mode 100644
index 00000000000..94087e04e43
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsx
@@ -0,0 +1,152 @@
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/components/DatabaseConnectionHealthInfo";
+import { Label } from "metabase/admin/databases/components/DatabaseFeatureComponents";
+import {
+ DatabaseInfoSection,
+ DatabaseInfoSectionDivider,
+} from "metabase/admin/databases/components/DatabaseInfoSection";
+import { useUpdateDatabaseMutation } from "metabase/api";
+import { useConfirmation } from "metabase/common/hooks/use-confirmation";
+import { useToast } from "metabase/common/hooks/use-toast";
+import {
+ hasAdminConnectionDetails,
+ hasDbRoutingEnabled,
+ hasFeature,
+ hasWorkspacesEnabled,
+ isDbModifiable,
+} from "metabase/common/utils/database";
+import type { WorkspaceDatabaseSectionProps } from "metabase/plugins/oss/workspaces";
+import {
+ Alert,
+ Box,
+ Button,
+ FixedSizeIcon,
+ Group,
+ Stack,
+ Switch,
+} from "metabase/ui";
+import * as Urls from "metabase/urls";
+
+export function WorkspaceDatabaseSection({
+ database,
+}: WorkspaceDatabaseSectionProps) {
+ const [updateDatabase] = useUpdateDatabaseMutation();
+ const { modalContent, show: showConfirmation } = useConfirmation();
+ const [sendToast] = useToast();
+
+ const isEnabled = hasWorkspacesEnabled(database);
+ const hasAdminConnection = hasAdminConnectionDetails(database);
+ const isDbRoutingEnabled = hasDbRoutingEnabled(database);
+
+ if (!isDbModifiable(database) || !hasFeature(database, "workspace")) {
+ return null;
+ }
+
+ const handleToggle = async (value: boolean) => {
+ const { error } = await updateDatabase({
+ id: database.id,
+ settings: { "database-enable-workspaces": value },
+ });
+ if (error) {
+ sendToast({
+ message: t`Failed to enable Workspaces`,
+ toastColor: "error",
+ icon: "warning",
+ });
+ }
+ };
+
+ const handleRemove = () => {
+ showConfirmation({
+ title: t`Remove connection?`,
+ message: t`Any features that depend on it will stop working.`,
+ confirmButtonText: t`Remove`,
+ onConfirm: async () => {
+ const { error } = await updateDatabase({
+ id: database.id,
+ admin_details: null,
+ });
+ if (error) {
+ sendToast({
+ message: t`Failed to remove connection`,
+ toastColor: "error",
+ });
+ }
+ },
+ });
+ };
+
+ return (
+ <DatabaseInfoSection
+ name={t`Workspaces`}
+ description={t`Workspaces isolate transformed tables into a separate schema so you can build and test changes before syncing them back to production.`}
+ data-testid="workspace-database-section"
+ >
+ <Group justify="space-between">
+ <Box>
+ <Label htmlFor="workspace-enable-toggle">{t`Enable workspaces`}</Label>
+ </Box>
+ <Switch
+ id="workspace-enable-toggle"
+ checked={isEnabled}
+ disabled={isDbRoutingEnabled}
+ onChange={(event) => handleToggle(event.currentTarget.checked)}
+ />
+ </Group>
+
+ {isDbRoutingEnabled && (
+ <>
+ <DatabaseInfoSectionDivider />
+ <Alert
+ variant="light"
+ color="info"
+ icon={<FixedSizeIcon name="info" />}
+ mb="md"
+ >
+ {t`Workspaces can't be enabled when database routing is enabled.`}
+ </Alert>
+ </>
+ )}
+
+ {isEnabled && (
+ <>
+ <DatabaseInfoSectionDivider />
+ <Stack gap={hasAdminConnection ? "md" : 0}>
+ <Box fw="bold" lh="lg">{t`Admin database connection`}</Box>
+ <Group justify="space-between">
+ {hasAdminConnection ? (
+ <DatabaseConnectionHealthInfo
+ databaseId={database.id}
+ connectionType="admin"
+ />
+ ) : (
+ <Box c="text-secondary">
+ {t`Used to create isolated schemas and temporary users for workspaces.`}
+ </Box>
+ )}
+ <Group>
+ <Button
+ component={isDbRoutingEnabled ? undefined : Link}
+ to={Urls.editDatabaseAdminConnection(database.id)}
+ disabled={isDbRoutingEnabled}
+ >
+ {hasAdminConnection
+ ? t`Edit connection details`
+ : t`Add admin connection`}
+ </Button>
+ {hasAdminConnection && (
+ <Button variant="filled" color="error" onClick={handleRemove}>
+ {t`Remove admin connection`}
+ </Button>
+ )}
+ </Group>
+ </Group>
+ </Stack>
+ </>
+ )}
+ {modalContent}
+ </DatabaseInfoSection>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.unit.spec.tsx
new file mode 100644
index 00000000000..353501578d2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.unit.spec.tsx
@@ -0,0 +1,186 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupDatabaseHealthcheckEndpoint,
+ setupUpdateDatabaseEndpoint,
+ setupUpdateDatabaseEndpointError,
+} from "__support__/server-mocks/database";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import type { Database } from "metabase-types/api";
+import { createMockDatabase } from "metabase-types/api/mocks";
+
+import { WorkspaceDatabaseSection } from "./WorkspaceDatabaseSection";
+
+interface SetupOpts {
+ database?: Database;
+ withError?: boolean;
+}
+
+function setup({
+ database = createMockDatabase({ features: ["workspace"] }),
+ withError = false,
+}: SetupOpts = {}) {
+ setupDatabaseHealthcheckEndpoint(database.id);
+ if (withError) {
+ setupUpdateDatabaseEndpointError(database.id);
+ } else {
+ setupUpdateDatabaseEndpoint(database);
+ }
+ renderWithProviders(
+ <>
+ <WorkspaceDatabaseSection database={database} />
+ <UndoListing />
+ </>,
+ );
+}
+
+function createWorkspaceDatabase(opts: Partial<Database> = {}) {
+ return createMockDatabase({
+ features: ["workspace"],
+ settings: { "database-enable-workspaces": true },
+ ...opts,
+ });
+}
+
+describe("WorkspaceDatabaseSection", () => {
+ it("should not render for a non-modifiable database (attached DWH)", () => {
+ setup({
+ database: createMockDatabase({
+ is_attached_dwh: true,
+ features: ["workspace"],
+ }),
+ });
+
+ expect(
+ screen.queryByTestId("workspace-database-section"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should not render when the database does not support the workspace feature", () => {
+ setup({ database: createMockDatabase({ features: [] }) });
+
+ expect(
+ screen.queryByTestId("workspace-database-section"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should render the enable toggle unchecked when Workspaces are disabled", () => {
+ setup({ database: createMockDatabase({ features: ["workspace"] }) });
+
+ expect(
+ screen.getByTestId("workspace-database-section"),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByRole("switch", { name: /Enable workspaces/i }),
+ ).not.toBeChecked();
+ });
+
+ it("should render the enable toggle checked when Workspaces are enabled", () => {
+ setup({ database: createWorkspaceDatabase() });
+
+ expect(
+ screen.getByRole("switch", { name: /Enable workspaces/i }),
+ ).toBeChecked();
+ });
+
+ it("should not show the connection section while Workspaces are disabled", () => {
+ setup({ database: createMockDatabase({ features: ["workspace"] }) });
+
+ expect(
+ screen.queryByText("Admin database connection"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should persist the database-enable-workspaces setting when toggling on", async () => {
+ const database = createMockDatabase({ features: ["workspace"] });
+ setup({ database });
+
+ await userEvent.click(
+ screen.getByRole("switch", { name: /Enable workspaces/i }),
+ );
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.calls(`path:/api/database/${database.id}`, {
+ method: "PUT",
+ }),
+ ).toHaveLength(1);
+ });
+ });
+
+ it("should show the description and an Add connection link when enabled without a connection", () => {
+ setup({ database: createWorkspaceDatabase() });
+
+ expect(screen.getByText("Admin database connection")).toBeInTheDocument();
+ expect(
+ screen.getByText(
+ "Used to create isolated schemas and temporary users for workspaces.",
+ ),
+ ).toBeInTheDocument();
+ expect(screen.getByText("Add admin connection")).toBeInTheDocument();
+ });
+
+ it("should show the connection status with Edit and Remove buttons when a connection exists", async () => {
+ setup({
+ database: createWorkspaceDatabase({ admin_details: { user: "admin" } }),
+ });
+
+ expect(
+ await screen.findByTestId("database-connection-health-info"),
+ ).toBeInTheDocument();
+ expect(screen.getByText("Edit connection details")).toBeInTheDocument();
+ expect(
+ screen.getByRole("button", { name: "Remove admin connection" }),
+ ).toBeInTheDocument();
+ });
+
+ it("should disable the toggle and warn when database routing is enabled", () => {
+ setup({
+ database: createMockDatabase({
+ features: ["workspace"],
+ router_user_attribute: "some_attribute",
+ }),
+ });
+
+ expect(
+ screen.getByRole("switch", { name: /Enable workspaces/i }),
+ ).toBeDisabled();
+ expect(
+ screen.getByText(
+ "Workspaces can't be enabled when database routing is enabled.",
+ ),
+ ).toBeInTheDocument();
+ });
+
+ it("should disable the Add connection button when database routing is enabled", () => {
+ setup({
+ database: createWorkspaceDatabase({
+ router_user_attribute: "some_attribute",
+ }),
+ });
+
+ expect(
+ screen.getByRole("button", { name: "Add admin connection" }),
+ ).toBeDisabled();
+ });
+
+ it("should show an error toast when removing the connection fails", async () => {
+ const database = createWorkspaceDatabase({
+ admin_details: { user: "admin" },
+ });
+ setup({ database, withError: true });
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Remove admin connection" }),
+ );
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Remove" }),
+ );
+
+ expect(
+ await screen.findByText("Failed to remove connection"),
+ ).toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/index.ts
new file mode 100644
index 00000000000..2f13dd1fde4
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/index.ts
@@ -0,0 +1 @@
+export * from "./WorkspaceDatabaseSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/index.ts
index 98a4873dfd1..4f10f6d4178 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/index.ts
@@ -1,17 +1,15 @@
import { PLUGIN_WORKSPACES } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
-import { AdminConnectionInfoSection } from "./components/AdminConnectionInfoSection";
-import { getAdminConnectionInfoRoutes, getDataStudioRoutes } from "./routes";
-import { canManageWorkspaceInstance, canManageWorkspaces } from "./selectors";
+import { WorkspaceDatabaseSection } from "./components/WorkspaceDatabaseSection";
+import { getDataStudioRoutes, getWorkspaceDatabaseRoutes } from "./routes";
+import { canManageWorkspaces } from "./selectors";
export function initializePlugin() {
if (hasPremiumFeature("workspaces")) {
PLUGIN_WORKSPACES.canManageWorkspaces = canManageWorkspaces;
- PLUGIN_WORKSPACES.canManageWorkspaceInstance = canManageWorkspaceInstance;
PLUGIN_WORKSPACES.getDataStudioRoutes = getDataStudioRoutes;
- PLUGIN_WORKSPACES.getAdminConnectionInfoRoutes =
- getAdminConnectionInfoRoutes;
- PLUGIN_WORKSPACES.AdminConnectionInfoSection = AdminConnectionInfoSection;
+ PLUGIN_WORKSPACES.getWorkspaceDatabaseRoutes = getWorkspaceDatabaseRoutes;
+ PLUGIN_WORKSPACES.WorkspaceDatabaseSection = WorkspaceDatabaseSection;
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/WorkspaceInstancePage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/WorkspaceInstancePage.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx
index 13994c4d518..c421823f855 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/WorkspaceInstancePage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx
@@ -11,18 +11,16 @@ import {
useListTableRemappingsQuery,
} from "metabase-enterprise/api";
import type {
+ CurrentWorkspace,
Database,
TableRemapping,
- WorkspaceInstance,
} from "metabase-types/api";
-import { HelpMenu } from "../../components/HelpMenu";
-
import { DeleteSection } from "./DeleteSection";
import { TableRemappingSection } from "./TableRemappingSection";
import { getDatabasesInfo } from "./utils";
-export function WorkspaceInstancePage() {
+export function CurrentWorkspacePage() {
const {
data: workspace,
isLoading: isLoadingWorkspace,
@@ -54,7 +52,7 @@ export function WorkspaceInstancePage() {
}
return (
- <WorkspaceInstancePageBody
+ <CurrentWorkspacePageBody
workspace={workspace}
remappings={remappings}
databases={databasesResponse.data}
@@ -62,27 +60,26 @@ export function WorkspaceInstancePage() {
);
}
-type WorkspaceInstancePageBodyProps = {
- workspace: WorkspaceInstance;
+type CurrentWorkspacePageBodyProps = {
+ workspace: CurrentWorkspace;
remappings: TableRemapping[];
databases: Database[];
};
-function WorkspaceInstancePageBody({
+function CurrentWorkspacePageBody({
workspace,
remappings,
databases,
-}: WorkspaceInstancePageBodyProps) {
+}: CurrentWorkspacePageBodyProps) {
const databasesInfo = getDatabasesInfo(workspace, databases, remappings);
return (
- <PageContainer data-testid="workspace-instance-page">
+ <PageContainer data-testid="current-workspace-page">
<PaneHeader
title={<Title order={3}>{workspace.name}</Title>}
breadcrumbs={
<DataStudioBreadcrumbs>{t`Workspaces`}</DataStudioBreadcrumbs>
}
- actions={<HelpMenu />}
py={0}
/>
<Stack gap="3.5rem">
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/WorkspaceInstancePage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsx
similarity index 76%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/WorkspaceInstancePage.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsx
index 4f1e0970c48..76fa825fd85 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/WorkspaceInstancePage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsx
@@ -8,22 +8,22 @@ import {
import { renderWithProviders, screen } from "__support__/ui";
import type { TableRemapping } from "metabase-types/api";
import {
+ createMockCurrentWorkspace,
+ createMockCurrentWorkspaceDatabase,
createMockDatabase,
createMockTableRemapping,
- createMockWorkspaceInstance,
- createMockWorkspaceInstanceDatabase,
} from "metabase-types/api/mocks";
-import { WorkspaceInstancePage } from "./WorkspaceInstancePage";
+import { CurrentWorkspacePage } from "./CurrentWorkspacePage";
const POSTGRES = createMockDatabase({ id: 10, name: "Postgres" });
function setup({
remappings = [] as TableRemapping[],
- workspace = createMockWorkspaceInstance({
+ workspace = createMockCurrentWorkspace({
name: "Dev workspace",
databases: {
- [POSTGRES.id]: createMockWorkspaceInstanceDatabase({
+ [POSTGRES.id]: createMockCurrentWorkspaceDatabase({
input_schemas: ["public"],
output: { schema: "ws_dev" },
}),
@@ -35,12 +35,12 @@ function setup({
setupGetCurrentWorkspaceEndpoint(workspace);
setupListTableRemappingsEndpoint(remappings);
- renderWithProviders(<Route path="*" component={WorkspaceInstancePage} />, {
+ renderWithProviders(<Route path="*" component={CurrentWorkspacePage} />, {
withRouter: true,
});
}
-describe("WorkspaceInstancePage", () => {
+describe("CurrentWorkspacePage", () => {
it("renders the empty state when there are no remappings", async () => {
setup();
@@ -69,15 +69,6 @@ describe("WorkspaceInstancePage", () => {
).toBeInTheDocument();
});
- it("shows the help menu when a workspace is set up", async () => {
- setup();
-
- expect(await screen.findByText("Dev workspace")).toBeInTheDocument();
- expect(
- await screen.findByRole("button", { name: /Help/ }),
- ).toBeInTheDocument();
- });
-
it("renders the delete section", async () => {
setup();
@@ -89,10 +80,10 @@ describe("WorkspaceInstancePage", () => {
it("hides the delete section when can_write is false", async () => {
setup({
- workspace: createMockWorkspaceInstance({
+ workspace: createMockCurrentWorkspace({
name: "Dev workspace",
databases: {
- [POSTGRES.id]: createMockWorkspaceInstanceDatabase({
+ [POSTGRES.id]: createMockCurrentWorkspaceDatabase({
input_schemas: ["public"],
output: { schema: "ws_dev" },
}),
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/DeleteSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/DeleteSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx
index a2c780f0580..e4d82224949 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/DeleteSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx
@@ -3,7 +3,7 @@ import { jt, t } from "ttag";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
import { Button, Code, Group, Text } from "metabase/ui";
-import { useDeleteWorkspaceInstanceMutation } from "metabase-enterprise/api";
+import { useDeleteCurrentWorkspaceMutation } from "metabase-enterprise/api";
import { trackWorkspaceInstanceLeave } from "../../../analytics";
@@ -11,7 +11,7 @@ const CONFIG_FILENAME = "config.yml";
export function DeleteSection() {
const { modalContent, show } = useConfirmation();
- const [deleteInstance] = useDeleteWorkspaceInstanceMutation();
+ const [deleteInstance] = useDeleteCurrentWorkspaceMutation();
const handleClick = () => {
show({
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/DeleteSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/DeleteSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsx
index b36fe98fce7..9f2808f466f 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/DeleteSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { Route } from "react-router";
-import { setupDeleteWorkspaceInstanceEndpoint } from "__support__/server-mocks";
+import { setupDeleteCurrentWorkspaceEndpoint } from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { DeleteSection } from "./DeleteSection";
@@ -10,7 +10,7 @@ import { DeleteSection } from "./DeleteSection";
const { trackSimpleEvent } = jest.requireMock("metabase/analytics");
function setup() {
- setupDeleteWorkspaceInstanceEndpoint();
+ setupDeleteCurrentWorkspaceEndpoint();
renderWithProviders(<Route path="*" component={DeleteSection} />, {
withRouter: true,
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/DeleteSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/TableRemappingTable.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/index.ts
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/utils.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/utils.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/utils.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/utils.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/utils.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/utils.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/TableRemappingTable/utils.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingTable/utils.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/TableRemappingSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/index.ts
new file mode 100644
index 00000000000..e423d287182
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/index.ts
@@ -0,0 +1 @@
+export * from "./CurrentWorkspacePage";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/utils.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/utils.ts
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/utils.ts
index 57699630467..fc615da1dfe 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/utils.ts
@@ -1,8 +1,8 @@
import type {
+ CurrentWorkspace,
Database,
DatabaseId,
TableRemapping,
- WorkspaceInstance,
} from "metabase-types/api";
export type DatabaseInfo = {
@@ -11,7 +11,7 @@ export type DatabaseInfo = {
};
export function getDatabasesInfo(
- workspace: WorkspaceInstance,
+ workspace: CurrentWorkspace,
databases: Database[],
remappings: TableRemapping[],
): DatabaseInfo[] {
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.tsx
index 9dbea58c6bb..47315529059 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.tsx
@@ -2,12 +2,12 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadin
import { useSelector } from "metabase/redux";
import { useGetCurrentWorkspaceQuery } from "metabase-enterprise/api";
-import { canManageWorkspaceInstance } from "../../selectors";
-import { WorkspaceInstancePage } from "../WorkspaceInstancePage";
+import { canManageWorkspaces } from "../../selectors";
+import { CurrentWorkspacePage } from "../CurrentWorkspacePage";
import { WorkspaceListPage } from "../WorkspaceListPage";
export function WorkspaceIndexPage() {
- const canManageInstance = useSelector(canManageWorkspaceInstance);
+ const canManageInstance = useSelector(canManageWorkspaces);
const {
data: workspace,
@@ -20,7 +20,7 @@ export function WorkspaceIndexPage() {
}
if (workspace != null && canManageInstance) {
- return <WorkspaceInstancePage />;
+ return <CurrentWorkspacePage />;
}
return <WorkspaceListPage />;
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx
index 248b1d05e2f..6ca864e72d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx
@@ -9,23 +9,23 @@ import {
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
-import type { WorkspaceInstance } from "metabase-types/api";
+import type { CurrentWorkspace } from "metabase-types/api";
import {
+ createMockCurrentWorkspace,
+ createMockCurrentWorkspaceDatabase,
createMockDatabase,
createMockTokenFeatures,
createMockUser,
- createMockWorkspaceInstance,
- createMockWorkspaceInstanceDatabase,
} from "metabase-types/api/mocks";
import { WorkspaceIndexPage } from "./WorkspaceIndexPage";
const POSTGRES = createMockDatabase({ id: 10, name: "Postgres" });
-const WORKSPACE = createMockWorkspaceInstance({
+const WORKSPACE = createMockCurrentWorkspace({
name: "Dev workspace",
databases: {
- [POSTGRES.id]: createMockWorkspaceInstanceDatabase({
+ [POSTGRES.id]: createMockCurrentWorkspaceDatabase({
input_schemas: ["public"],
output: { schema: "ws_dev" },
}),
@@ -34,15 +34,10 @@ const WORKSPACE = createMockWorkspaceInstance({
type SetupOpts = {
isAdmin?: boolean;
- canManageWorkspaces?: boolean;
- workspace?: WorkspaceInstance | null;
+ workspace?: CurrentWorkspace | null;
};
-function setup({
- isAdmin = true,
- canManageWorkspaces = false,
- workspace = null,
-}: SetupOpts = {}) {
+function setup({ isAdmin = true, workspace = null }: SetupOpts = {}) {
setupDatabasesEndpoints([POSTGRES]);
setupGetCurrentWorkspaceEndpoint(workspace);
setupListTableRemappingsEndpoint([]);
@@ -54,7 +49,6 @@ function setup({
permissions: {
can_access_data_model: isAdmin,
can_access_db_details: false,
- can_manage_workspaces: canManageWorkspaces,
},
}),
settings: mockSettings({
@@ -75,7 +69,7 @@ describe("WorkspaceIndexPage", () => {
setup({ isAdmin: true, workspace: WORKSPACE });
expect(
- await screen.findByTestId("workspace-instance-page"),
+ await screen.findByTestId("current-workspace-page"),
).toBeInTheDocument();
expect(screen.queryByTestId("workspace-list-page")).not.toBeInTheDocument();
});
@@ -87,14 +81,13 @@ describe("WorkspaceIndexPage", () => {
await screen.findByTestId("workspace-list-page"),
).toBeInTheDocument();
expect(
- screen.queryByTestId("workspace-instance-page"),
+ screen.queryByTestId("current-workspace-page"),
).not.toBeInTheDocument();
});
- it("non-admin with manage-workspaces permission skips the instance lookup and sees the list page", async () => {
+ it("non-admin skips the instance lookup and sees the list page", async () => {
setup({
isAdmin: false,
- canManageWorkspaces: true,
workspace: WORKSPACE,
});
@@ -102,7 +95,7 @@ describe("WorkspaceIndexPage", () => {
await screen.findByTestId("workspace-list-page"),
).toBeInTheDocument();
expect(
- screen.queryByTestId("workspace-instance-page"),
+ screen.queryByTestId("current-workspace-page"),
).not.toBeInTheDocument();
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/index.ts
deleted file mode 100644
index 667104e6c3b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceInstancePage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./WorkspaceInstancePage";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/DeleteWorkspaceModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/DeleteWorkspaceModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.tsx
index abbfc44a23c..09376acc35b 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.tsx
@@ -1,34 +1,53 @@
import { useDisclosure } from "@mantine/hooks";
-import { push } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/redux";
-import { Button, FixedSizeIcon } from "metabase/ui";
-import * as Urls from "metabase/urls";
-import type { Workspace } from "metabase-types/api";
+import {
+ hasFeature,
+ hasWorkspacesEnabled,
+} from "metabase/common/utils/database";
+import { Button, FixedSizeIcon, Tooltip } from "metabase/ui";
+import type { Database } from "metabase-types/api";
import { NewWorkspaceModal } from "../NewWorkspaceModal";
-export function NewWorkspaceButton() {
+export type NewWorkspaceButtonProps = {
+ databases: Database[];
+ primary?: boolean;
+};
+
+export function NewWorkspaceButton({
+ databases,
+ primary,
+}: NewWorkspaceButtonProps) {
const [opened, { open, close }] = useDisclosure(false);
- const dispatch = useDispatch();
- const handleCreate = (workspace: Workspace) => {
- close();
- dispatch(push(Urls.workspace(workspace.id)));
- };
+ const eligibleDatabases = databases.filter(
+ (database) =>
+ hasFeature(database, "workspace") && hasWorkspacesEnabled(database),
+ );
+ const hasEligibleDatabase = eligibleDatabases.length > 0;
return (
<>
- <Button
- leftSection={<FixedSizeIcon name="add" aria-hidden />}
- onClick={open}
+ <Tooltip
+ label={t`You need to enable workspaces on at least one database.`}
+ disabled={hasEligibleDatabase}
>
- {t`New`}
- </Button>
+ <Button
+ variant={primary ? "filled" : "default"}
+ leftSection={
+ primary ? undefined : <FixedSizeIcon name="add" aria-hidden />
+ }
+ disabled={!hasEligibleDatabase}
+ onClick={open}
+ >
+ {primary ? t`Create a workspace` : t`New`}
+ </Button>
+ </Tooltip>
<NewWorkspaceModal
+ databases={eligibleDatabases}
opened={opened}
- onCreate={handleCreate}
+ onCreate={close}
onClose={close}
/>
</>
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.unit.spec.tsx
index 91e051c732d..39eb7975856 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceButton/NewWorkspaceButton.unit.spec.tsx
@@ -1,19 +1,29 @@
import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
import { renderWithProviders, screen } from "__support__/ui";
+import type { Database } from "metabase-types/api";
+import { createMockDatabase } from "metabase-types/api/mocks";
import { NewWorkspaceButton } from "./NewWorkspaceButton";
-function setup() {
- renderWithProviders(<Route path="*" component={NewWorkspaceButton} />, {
- withRouter: true,
- });
+type SetupOpts = {
+ databases?: Database[];
+};
+
+function setup({ databases = [] }: SetupOpts = {}) {
+ renderWithProviders(<NewWorkspaceButton databases={databases} />);
}
describe("NewWorkspaceButton", () => {
it("opens the New workspace modal when clicked", async () => {
- setup();
+ setup({
+ databases: [
+ createMockDatabase({
+ features: ["workspace"],
+ settings: { "database-enable-workspaces": true },
+ }),
+ ],
+ });
await userEvent.click(screen.getByRole("button", { name: /New/ }));
@@ -21,4 +31,10 @@ describe("NewWorkspaceButton", () => {
await screen.findByRole("heading", { name: "Create a workspace" }),
).toBeInTheDocument();
});
+
+ it("is disabled when no database has workspaces enabled", () => {
+ setup({ databases: [createMockDatabase({ features: ["workspace"] })] });
+
+ expect(screen.getByRole("button", { name: /New/ })).toBeDisabled();
+ });
});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.tsx
index 914ea73725e..4dff986fb8c 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -3,25 +3,28 @@ import * as Yup from "yup";
import {
Form,
+ FormCheckboxGroup,
FormErrorMessage,
FormProvider,
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import { Button, Group, Modal, Stack } from "metabase/ui";
+import { Button, Checkbox, Group, Modal, Stack } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import { useCreateWorkspaceMutation } from "metabase-enterprise/api";
-import type { Workspace } from "metabase-types/api";
+import type { Database, Workspace } from "metabase-types/api";
import { trackWorkspaceCreated } from "../../../analytics";
type NewWorkspaceModalProps = {
+ databases: Database[];
opened: boolean;
onCreate: (workspace: Workspace) => void;
onClose: () => void;
};
export function NewWorkspaceModal({
+ databases,
opened,
onCreate,
onClose,
@@ -33,33 +36,51 @@ export function NewWorkspaceModal({
padding="xl"
onClose={onClose}
>
- <NewWorkspaceForm onCreate={onCreate} onClose={onClose} />
+ <NewWorkspaceForm
+ databases={databases}
+ onCreate={onCreate}
+ onClose={onClose}
+ />
</Modal>
);
}
type NewWorkspaceFormValues = {
name: string;
+ database_ids: string[];
};
const NEW_WORKSPACE_SCHEMA = Yup.object({
name: Yup.string().required(Errors.required),
+ database_ids: Yup.array().of(Yup.string()).min(1, Errors.required),
});
const INITIAL_VALUES: NewWorkspaceFormValues = {
name: "",
+ database_ids: [],
};
type NewWorkspaceFormProps = {
+ databases: Database[];
onCreate: (workspace: Workspace) => void;
onClose: () => void;
};
-function NewWorkspaceForm({ onCreate, onClose }: NewWorkspaceFormProps) {
+function NewWorkspaceForm({
+ databases,
+ onCreate,
+ onClose,
+}: NewWorkspaceFormProps) {
const [createWorkspace] = useCreateWorkspaceMutation();
- const handleSubmit = async ({ name }: NewWorkspaceFormValues) => {
- const workspace = await createWorkspace({ name }).unwrap();
+ const handleSubmit = async ({
+ name,
+ database_ids,
+ }: NewWorkspaceFormValues) => {
+ const workspace = await createWorkspace({
+ name,
+ database_ids: database_ids.map(Number),
+ }).unwrap();
trackWorkspaceCreated({ workspaceId: workspace.id });
onCreate(workspace);
};
@@ -78,10 +99,21 @@ function NewWorkspaceForm({ onCreate, onClose }: NewWorkspaceFormProps) {
placeholder={t`My workspace`}
data-autofocus
/>
+ <FormCheckboxGroup name="database_ids" label={t`Databases`}>
+ <Stack gap="sm" mt="sm">
+ {databases.map((database) => (
+ <Checkbox
+ key={database.id}
+ value={String(database.id)}
+ label={database.name}
+ />
+ ))}
+ </Stack>
+ </FormCheckboxGroup>
<FormErrorMessage />
<Group justify="flex-end">
<Button onClick={onClose}>{t`Cancel`}</Button>
- <FormSubmitButton label={t`Create`} variant="filled" />
+ <FormSubmitButton label={t`Create workspace`} variant="filled" />
</Group>
</Stack>
</Form>
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.unit.spec.tsx
index 6f93d1b4aa9..30a6eeaf916 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/NewWorkspaceModal/NewWorkspaceModal.unit.spec.tsx
@@ -3,7 +3,10 @@ import userEvent from "@testing-library/user-event";
import { setupCreateWorkspaceEndpoint } from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { Workspace } from "metabase-types/api";
-import { createMockWorkspace } from "metabase-types/api/mocks";
+import {
+ createMockDatabase,
+ createMockWorkspace,
+} from "metabase-types/api/mocks";
import { NewWorkspaceModal } from "./NewWorkspaceModal";
@@ -13,6 +16,8 @@ type SetupOpts = {
createdWorkspace?: Workspace;
};
+const DATABASE = createMockDatabase({ id: 10, name: "Postgres" });
+
function setup({
createdWorkspace = createMockWorkspace({ name: "Brand new workspace" }),
}: SetupOpts = {}) {
@@ -22,7 +27,12 @@ function setup({
setupCreateWorkspaceEndpoint(createdWorkspace);
renderWithProviders(
- <NewWorkspaceModal opened onCreate={onCreate} onClose={onClose} />,
+ <NewWorkspaceModal
+ databases={[DATABASE]}
+ opened
+ onCreate={onCreate}
+ onClose={onClose}
+ />,
);
return { onCreate, onClose, createdWorkspace };
@@ -37,18 +47,35 @@ describe("NewWorkspaceModal", () => {
const { onCreate, createdWorkspace } = setup();
await userEvent.type(screen.getByLabelText("Name"), "Brand new workspace");
- await userEvent.click(screen.getByRole("button", { name: "Create" }));
+ await userEvent.click(screen.getByRole("checkbox", { name: "Postgres" }));
+ await userEvent.click(
+ screen.getByRole("button", { name: "Create workspace" }),
+ );
await waitFor(() =>
expect(onCreate).toHaveBeenCalledWith(createdWorkspace),
);
});
+ it("requires at least one database", async () => {
+ const { onCreate } = setup();
+
+ await userEvent.type(screen.getByLabelText("Name"), "Brand new workspace");
+ await userEvent.click(
+ screen.getByRole("button", { name: "Create workspace" }),
+ );
+
+ expect(onCreate).not.toHaveBeenCalled();
+ });
+
it("tracks an analytics event when a workspace is created", async () => {
const { createdWorkspace } = setup();
await userEvent.type(screen.getByLabelText("Name"), "Brand new workspace");
- await userEvent.click(screen.getByRole("button", { name: "Create" }));
+ await userEvent.click(screen.getByRole("checkbox", { name: "Postgres" }));
+ await userEvent.click(
+ screen.getByRole("button", { name: "Create workspace" }),
+ );
await waitFor(() =>
expect(trackSimpleEvent).toHaveBeenCalledWith({
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/RenameWorkspaceModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/RenameWorkspaceModal.tsx
new file mode 100644
index 00000000000..de3697ec4bc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/RenameWorkspaceModal.tsx
@@ -0,0 +1,92 @@
+import { t } from "ttag";
+import * as Yup from "yup";
+
+import {
+ Form,
+ FormErrorMessage,
+ FormProvider,
+ FormSubmitButton,
+ FormTextInput,
+} from "metabase/forms";
+import { Button, Group, Modal, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
+import { useUpdateWorkspaceMutation } from "metabase-enterprise/api";
+import type { Workspace } from "metabase-types/api";
+
+export type RenameWorkspaceModalProps = {
+ workspace: Workspace;
+ opened: boolean;
+ onRename: (workspace: Workspace) => void;
+ onClose: () => void;
+};
+
+export function RenameWorkspaceModal({
+ workspace,
+ opened,
+ onRename,
+ onClose,
+}: RenameWorkspaceModalProps) {
+ return (
+ <Modal
+ title={t`Rename this workspace?`}
+ opened={opened}
+ padding="xl"
+ onClose={onClose}
+ >
+ <RenameWorkspaceForm
+ workspace={workspace}
+ onRename={onRename}
+ onClose={onClose}
+ />
+ </Modal>
+ );
+}
+
+type RenameWorkspaceFormValues = {
+ name: string;
+};
+
+const RENAME_WORKSPACE_SCHEMA = Yup.object({
+ name: Yup.string().required(Errors.required),
+});
+
+type RenameWorkspaceFormProps = {
+ workspace: Workspace;
+ onRename: (workspace: Workspace) => void;
+ onClose: () => void;
+};
+
+function RenameWorkspaceForm({
+ workspace,
+ onRename,
+ onClose,
+}: RenameWorkspaceFormProps) {
+ const [updateWorkspace] = useUpdateWorkspaceMutation();
+
+ const handleSubmit = async ({ name }: RenameWorkspaceFormValues) => {
+ const updatedWorkspace = await updateWorkspace({
+ id: workspace.id,
+ name,
+ }).unwrap();
+ onRename(updatedWorkspace);
+ };
+
+ return (
+ <FormProvider
+ initialValues={{ name: workspace.name }}
+ validationSchema={RENAME_WORKSPACE_SCHEMA}
+ onSubmit={handleSubmit}
+ >
+ <Form>
+ <Stack gap="lg">
+ <FormTextInput name="name" label={t`Name`} data-autofocus />
+ <FormErrorMessage />
+ <Group justify="flex-end">
+ <Button onClick={onClose}>{t`Cancel`}</Button>
+ <FormSubmitButton label={t`Rename`} variant="filled" />
+ </Group>
+ </Stack>
+ </Form>
+ </FormProvider>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/RenameWorkspaceModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/RenameWorkspaceModal.unit.spec.tsx
new file mode 100644
index 00000000000..2c9132b5ac2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/RenameWorkspaceModal.unit.spec.tsx
@@ -0,0 +1,58 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import { setupUpdateWorkspaceEndpoint } from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { createMockWorkspace } from "metabase-types/api/mocks";
+
+import { RenameWorkspaceModal } from "./RenameWorkspaceModal";
+
+const WORKSPACE = createMockWorkspace({ id: 1, name: "Old name" });
+
+function setup() {
+ setupUpdateWorkspaceEndpoint(WORKSPACE);
+
+ const onRename = jest.fn();
+ const onClose = jest.fn();
+
+ renderWithProviders(
+ <RenameWorkspaceModal
+ workspace={WORKSPACE}
+ opened
+ onRename={onRename}
+ onClose={onClose}
+ />,
+ );
+
+ return { onRename, onClose };
+}
+
+describe("RenameWorkspaceModal", () => {
+ it("prefills the current name and submits the new one", async () => {
+ const { onRename } = setup();
+
+ const input = screen.getByLabelText("Name");
+ expect(input).toHaveValue("Old name");
+
+ await userEvent.clear(input);
+ await userEvent.type(input, "New name");
+ await userEvent.click(screen.getByRole("button", { name: "Rename" }));
+
+ await waitFor(() => {
+ expect(onRename).toHaveBeenCalled();
+ });
+ const call = fetchMock.callHistory.lastCall(
+ `path:/api/ee/workspace-manager/1`,
+ );
+ expect(await call?.request?.json()).toEqual({ name: "New name" });
+ });
+
+ it("closes without renaming on Cancel", async () => {
+ const { onRename, onClose } = setup();
+
+ await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
+
+ expect(onClose).toHaveBeenCalled();
+ expect(onRename).not.toHaveBeenCalled();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/index.ts
new file mode 100644
index 00000000000..e2b61b99527
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/RenameWorkspaceModal/index.ts
@@ -0,0 +1 @@
+export { RenameWorkspaceModal } from "./RenameWorkspaceModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.unit.spec.tsx
deleted file mode 100644
index 1a22b01a418..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.unit.spec.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import { setupApplyAdvancedConfigEndpoint } from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-
-import { SetupWorkspaceModal } from "./SetupWorkspaceModal";
-
-const { trackSimpleEvent } = jest.requireMock("metabase/analytics");
-
-function setup() {
- const onClose = jest.fn();
-
- setupApplyAdvancedConfigEndpoint();
-
- renderWithProviders(
- <Route
- path="*"
- component={() => <SetupWorkspaceModal opened onClose={onClose} />}
- />,
- { withRouter: true },
- );
-
- return { onClose };
-}
-
-async function uploadConfigAndSubmit() {
- const submitButton = await screen.findByRole("button", { name: "Set up" });
- const file = new File(["name: Dev workspace"], "config.yml", {
- type: "application/yaml",
- });
- // Mantine's FileInput keeps the native file input hidden with no accessible
- // handle, so query the DOM directly to drive the upload.
- await userEvent.upload(
- // eslint-disable-next-line testing-library/no-node-access
- document.querySelector<HTMLInputElement>('input[type="file"]')!,
- file,
- );
- await userEvent.click(submitButton);
-}
-
-describe("SetupWorkspaceModal", () => {
- beforeEach(() => {
- trackSimpleEvent.mockClear();
- });
-
- it("uploads the config and closes the modal", async () => {
- const { onClose } = setup();
-
- await uploadConfigAndSubmit();
-
- await waitFor(() => expect(onClose).toHaveBeenCalled());
- });
-
- it("tracks the workspaces_instance_setup event when the config is applied", async () => {
- setup();
-
- await uploadConfigAndSubmit();
-
- await waitFor(() =>
- expect(trackSimpleEvent).toHaveBeenCalledWith({
- event: "workspaces_instance_setup",
- triggered_from: "upload",
- }),
- );
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/index.ts
index 9dbfa7cf650..66392812b9e 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/index.ts
@@ -1 +1 @@
-export * from "./SetupWorkspaceModal";
+export { SetupWorkspaceModal } from "./SetupWorkspaceModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx
index 30e07a98c93..ce1ad1f58e4 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx
@@ -1,10 +1,9 @@
import { useDisclosure } from "@mantine/hooks";
import { Link } from "react-router";
-import { push } from "react-router-redux";
import { t } from "ttag";
import { useDocsUrl } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/redux";
+import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import {
Box,
@@ -17,23 +16,21 @@ import {
Text,
Title,
} from "metabase/ui";
-import * as Urls from "metabase/urls";
-import type { Workspace } from "metabase-types/api";
+import type { Database } from "metabase-types/api";
import { trackWorkspaceSetupButtonClicked } from "../../../analytics";
-import { canManageWorkspaceInstance } from "../../../selectors";
-import { NewWorkspaceModal } from "../NewWorkspaceModal";
+import { NewWorkspaceButton } from "../NewWorkspaceButton";
import { SetupWorkspaceModal } from "../SetupWorkspaceModal";
import S from "./WorkspaceEmptyState.module.css";
-export function WorkspaceEmptyState() {
- const [isCreateOpen, { open: openCreate, close: closeCreate }] =
- useDisclosure(false);
+export type WorkspaceEmptyStateProps = {
+ databases: Database[];
+};
+
+export function WorkspaceEmptyState({ databases }: WorkspaceEmptyStateProps) {
const [isSetupOpen, { open: openSetup, close: closeSetup }] =
useDisclosure(false);
- const dispatch = useDispatch();
- const canManageInstance = useSelector(canManageWorkspaceInstance);
const applicationName = useSelector(getApplicationName);
const { url: fileBasedDevDocsUrl, showMetabaseLinks: showFileBasedDevLink } =
@@ -41,11 +38,6 @@ export function WorkspaceEmptyState() {
const { url: remoteSyncDocsUrl, showMetabaseLinks: showRemoteSyncLink } =
useDocsUrl("installation-and-operation/remote-sync");
- const handleCreate = (workspace: Workspace) => {
- closeCreate();
- dispatch(push(Urls.workspace(workspace.id)));
- };
-
const handleSetupClick = () => {
trackWorkspaceSetupButtonClicked();
openSetup();
@@ -63,19 +55,14 @@ export function WorkspaceEmptyState() {
{t`While in a workspace, ${applicationName} will remap tables created by transforms to an isolated schema, letting you test and build on top of these tables. When you're ready, use remote sync to pull your changes into your production ${applicationName}.`}
</Text>
<Text mb="lg">
- {t`If this is your production instance, create and download a workspace config here to use in a development instance.`}
- {canManageInstance &&
- ` ${t`If you're using this ${applicationName} instance for development, you can upload a workspace config file to put this instance into that workspace.`}`}
+ {t`If this is your production instance, create and download a workspace config here to use in a development instance.`}{" "}
+ {t`If you're using this ${applicationName} instance for development, you can upload a workspace config file to put this instance into that workspace.`}
</Text>
<Group gap="md">
- <Button variant="filled" onClick={openCreate}>
- {t`Create a workspace`}
+ <NewWorkspaceButton databases={databases} primary />
+ <Button variant="default" onClick={handleSetupClick}>
+ {t`Upload a workspace config`}
</Button>
- {canManageInstance && (
- <Button variant="default" onClick={handleSetupClick}>
- {t`Upload a workspace config`}
- </Button>
- )}
</Group>
{(showFileBasedDevLink || showRemoteSyncLink) && (
<>
@@ -100,11 +87,6 @@ export function WorkspaceEmptyState() {
)}
</Box>
</Card>
- <NewWorkspaceModal
- opened={isCreateOpen}
- onCreate={handleCreate}
- onClose={closeCreate}
- />
<SetupWorkspaceModal opened={isSetupOpen} onClose={closeSetup} />
</>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx
index 581eba228e1..2c962d474c8 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx
@@ -3,19 +3,20 @@ import { Route } from "react-router";
import { setupApplyAdvancedConfigEndpoint } from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
import { createMockSettingsState } from "metabase/redux/store/mocks";
-import { createMockUser } from "metabase-types/api/mocks";
import { WorkspaceEmptyState } from "./WorkspaceEmptyState";
-function setup({ isAdmin = false }: { isAdmin?: boolean } = {}) {
+function setup() {
setupApplyAdvancedConfigEndpoint();
- renderWithProviders(<Route path="*" component={WorkspaceEmptyState} />, {
- withRouter: true,
- storeInitialState: {
- currentUser: createMockUser({ is_superuser: isAdmin }),
- settings: createMockSettingsState({ "show-metabase-links": true }),
+ renderWithProviders(
+ <Route path="*" component={() => <WorkspaceEmptyState databases={[]} />} />,
+ {
+ withRouter: true,
+ storeInitialState: {
+ settings: createMockSettingsState({ "show-metabase-links": true }),
+ },
},
- });
+ );
}
describe("WorkspaceEmptyState", () => {
@@ -38,16 +39,8 @@ describe("WorkspaceEmptyState", () => {
).toBeInTheDocument();
});
- it("does not show the upload-config button for non-admins", () => {
- setup({ isAdmin: false });
-
- expect(
- screen.queryByRole("button", { name: "Upload a workspace config" }),
- ).not.toBeInTheDocument();
- });
-
- it("shows the upload-config button for admins", () => {
- setup({ isAdmin: true });
+ it("shows the upload-config button", () => {
+ setup();
expect(
screen.getByRole("button", { name: "Upload a workspace config" }),
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/index.ts
index ec1aff8d377..d35a8872ac8 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/index.ts
@@ -1 +1 @@
-export * from "./WorkspaceEmptyState";
+export { WorkspaceEmptyState } from "./WorkspaceEmptyState";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.module.css b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.module.css
deleted file mode 100644
index 619f6e0c0c3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.module.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.workspaceItem {
- color: inherit;
- text-decoration: none;
-}
-
-.workspaceItem:hover {
- background-color: var(--mb-color-background-hover);
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.tsx
index 3ff17981cec..38e5405a01b 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.tsx
@@ -1,77 +1,154 @@
-import { Link } from "react-router";
+import { useDisclosure } from "@mantine/hooks";
import { t } from "ttag";
-import { Card, Divider, Stack, Text, Title } from "metabase/ui";
-import * as Urls from "metabase/urls";
+import {
+ ActionIcon,
+ Box,
+ Card,
+ FixedSizeIcon,
+ Group,
+ Menu,
+ Stack,
+} from "metabase/ui";
import { getRelativeTime } from "metabase/utils/time-dayjs";
-import type { Database, Workspace } from "metabase-types/api";
+import { getUserName } from "metabase/utils/user";
+import type { Workspace, WorkspaceDatabase } from "metabase-types/api";
-import { DatabaseInfo } from "../../../components/DatabaseInfo";
-import { getDatabasesById } from "../../../utils";
+import { trackWorkspaceConfigDownloaded } from "../../../analytics";
+import { DeleteWorkspaceModal } from "../DeleteWorkspaceModal";
+import { RenameWorkspaceModal } from "../RenameWorkspaceModal";
-import S from "./WorkspaceItem.module.css";
+const CONFIG_FILENAME = "config.yml";
export type WorkspaceItemProps = {
workspace: Workspace;
- availableDatabases: Database[];
};
-export function WorkspaceItem({
- workspace,
- availableDatabases,
-}: WorkspaceItemProps) {
- const databaseById = getDatabasesById(availableDatabases);
- const hasDatabases = workspace.databases.length > 0;
-
+export function WorkspaceItem({ workspace }: WorkspaceItemProps) {
return (
<Card
role="region"
aria-label={workspace.name}
data-testid="workspace-item"
- className={S.workspaceItem}
- component={Link}
- to={Urls.workspace(workspace.id)}
p="lg"
shadow="none"
withBorder
>
- <Stack gap="md">
- <Stack>
- <Title order={4}>{workspace.name}</Title>
- <CreatorInfo workspace={workspace} />
+ <Group justify="space-between" align="flex-start" wrap="nowrap">
+ <Stack gap="sm">
+ <Box fw="bold" fz="1rem" lh="1rem">
+ {workspace.name}
+ </Box>
+ <WorkspaceCreatorInfo workspace={workspace} />
+ {workspace.databases?.map((workspaceDatabase) => (
+ <WorkspaceDatabaseItem
+ key={workspaceDatabase.database_id}
+ workspaceDatabase={workspaceDatabase}
+ />
+ ))}
</Stack>
- {hasDatabases && (
- <>
- <Divider />
- <Stack gap="sm">
- {workspace.databases.map((workspaceDatabase) => (
- <DatabaseInfo
- key={workspaceDatabase.database_id}
- workspaceDatabase={workspaceDatabase}
- database={databaseById.get(workspaceDatabase.database_id)}
- />
- ))}
- </Stack>
- </>
- )}
- </Stack>
+ <WorkspaceMenu workspace={workspace} />
+ </Group>
</Card>
);
}
-type CreatorInfoProps = {
+type WorkspaceCreatorInfoProps = {
workspace: Workspace;
};
-function CreatorInfo({ workspace }: CreatorInfoProps) {
+function WorkspaceCreatorInfo({ workspace }: WorkspaceCreatorInfoProps) {
+ const { creator } = workspace;
const timeAgo = getRelativeTime(workspace.created_at);
- const creatorName = workspace.creator?.common_name;
return (
- <Text c="text-secondary" size="sm">
- {creatorName != null
- ? t`Created by ${creatorName} ${timeAgo}`
+ <Box c="text-secondary" lh="1rem">
+ {creator != null
+ ? t`Created by ${getUserName(creator)} ${timeAgo}`
: t`Created ${timeAgo}`}
- </Text>
+ </Box>
+ );
+}
+
+type WorkspaceDatabaseItemProps = {
+ workspaceDatabase: WorkspaceDatabase;
+};
+
+function WorkspaceDatabaseItem({
+ workspaceDatabase,
+}: WorkspaceDatabaseItemProps) {
+ const { database } = workspaceDatabase;
+
+ if (database == null) {
+ return null;
+ }
+
+ return (
+ <Box c="text-secondary" lh="1rem">
+ <Group gap="xs" wrap="nowrap">
+ <FixedSizeIcon name="database" aria-hidden />
+ {database.name}
+ </Group>
+ </Box>
+ );
+}
+
+type WorkspaceMenuProps = {
+ workspace: Workspace;
+};
+
+function WorkspaceMenu({ workspace }: WorkspaceMenuProps) {
+ const [isRenameOpen, { open: openRename, close: closeRename }] =
+ useDisclosure(false);
+ const [isDeleteOpen, { open: openDelete, close: closeDelete }] =
+ useDisclosure(false);
+
+ return (
+ <>
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <ActionIcon aria-label={t`Workspace options`}>
+ <FixedSizeIcon name="ellipsis" aria-hidden />
+ </ActionIcon>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ component="a"
+ href={`/api/ee/workspace-manager/${workspace.id}/config`}
+ download={CONFIG_FILENAME}
+ leftSection={<FixedSizeIcon name="download" aria-hidden />}
+ onClick={() =>
+ trackWorkspaceConfigDownloaded({ workspaceId: workspace.id })
+ }
+ >
+ {t`Download ${CONFIG_FILENAME}`}
+ </Menu.Item>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="pencil" aria-hidden />}
+ onClick={openRename}
+ >
+ {t`Rename`}
+ </Menu.Item>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="trash" aria-hidden />}
+ onClick={openDelete}
+ >
+ {t`Delete`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ <RenameWorkspaceModal
+ workspace={workspace}
+ opened={isRenameOpen}
+ onRename={closeRename}
+ onClose={closeRename}
+ />
+ <DeleteWorkspaceModal
+ workspace={workspace}
+ opened={isDeleteOpen}
+ onDelete={closeDelete}
+ onClose={closeDelete}
+ />
+ </>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.unit.spec.tsx
index 8c98c74ef0f..1637e777b92 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceItem/WorkspaceItem.unit.spec.tsx
@@ -1,34 +1,111 @@
-import { Route } from "react-router";
+import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/urls";
import {
createMockDatabase,
+ createMockUserInfo,
createMockWorkspace,
+ createMockWorkspaceDatabase,
} from "metabase-types/api/mocks";
import { WorkspaceItem } from "./WorkspaceItem";
-const POSTGRES = createMockDatabase({ id: 10, name: "Postgres" });
const WORKSPACE = createMockWorkspace({ id: 1, name: "My workspace" });
-function setup() {
- renderWithProviders(
- <Route
- path="*"
- component={() => (
- <WorkspaceItem workspace={WORKSPACE} availableDatabases={[POSTGRES]} />
- )}
- />,
- { withRouter: true },
- );
+function setup({ workspace = WORKSPACE } = {}) {
+ renderWithProviders(<WorkspaceItem workspace={workspace} />);
}
describe("WorkspaceItem", () => {
- it("renders as a link to the workspace page", () => {
+ it("renders the workspace name", () => {
setup();
+ expect(screen.getByText("My workspace")).toBeInTheDocument();
+ });
+
+ it("renders the creator info when the creator is hydrated", () => {
+ setup({
+ workspace: createMockWorkspace({
+ name: "My workspace",
+ creator: createMockUserInfo({
+ first_name: "Ada",
+ last_name: "Lovelace",
+ }),
+ }),
+ });
+
+ expect(screen.getByText(/Created by Ada Lovelace/)).toBeInTheDocument();
+ });
+
+ it("renders plain creation info when the creator is missing", () => {
+ setup({
+ workspace: createMockWorkspace({ name: "My workspace", creator: null }),
+ });
+
+ expect(screen.getByText(/^Created /)).toBeInTheDocument();
+ });
+
+ it("renders only hydrated databases", () => {
+ setup({
+ workspace: createMockWorkspace({
+ id: 1,
+ name: "My workspace",
+ databases: [
+ createMockWorkspaceDatabase({
+ database_id: 10,
+ database: createMockDatabase({ id: 10, name: "Postgres" }),
+ }),
+ createMockWorkspaceDatabase({
+ database_id: 20,
+ database: null,
+ }),
+ ],
+ }),
+ });
+
+ expect(screen.getByText("Postgres")).toBeInTheDocument();
+ });
+
+ it("offers a config download link in the menu", async () => {
+ setup();
+ await userEvent.click(
+ screen.getByRole("button", { name: "Workspace options" }),
+ );
+
+ const downloadItem = await screen.findByRole("menuitem", {
+ name: /Download config\.yml/,
+ });
+ expect(downloadItem).toHaveAttribute(
+ "href",
+ `/api/ee/workspace-manager/${WORKSPACE.id}/config`,
+ );
+ expect(downloadItem).toHaveAttribute("download", "config.yml");
+ });
+
+ it("opens the rename modal from the menu", async () => {
+ setup();
+ await userEvent.click(
+ screen.getByRole("button", { name: "Workspace options" }),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: "Rename" }),
+ );
+
+ expect(
+ await screen.findByRole("heading", { name: "Rename this workspace?" }),
+ ).toBeInTheDocument();
+ });
+
+ it("opens the delete modal from the menu", async () => {
+ setup();
+ await userEvent.click(
+ screen.getByRole("button", { name: "Workspace options" }),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: "Delete" }),
+ );
+
expect(
- screen.getByRole("region", { name: "My workspace" }),
- ).toHaveAttribute("href", Urls.workspace(WORKSPACE.id));
+ await screen.findByRole("heading", { name: "Delete this workspace?" }),
+ ).toBeInTheDocument();
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
index fe6df262e28..6b8dd4291db 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
@@ -5,12 +5,10 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadin
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
-import { Group, Stack } from "metabase/ui";
+import { Stack } from "metabase/ui";
import { useListWorkspacesQuery } from "metabase-enterprise/api";
import type { Database, Workspace } from "metabase-types/api";
-import { HelpMenu } from "../../components/HelpMenu";
-
import { NewWorkspaceButton } from "./NewWorkspaceButton";
import { WorkspaceEmptyState } from "./WorkspaceEmptyState";
import { WorkspaceItem } from "./WorkspaceItem";
@@ -42,19 +40,19 @@ export function WorkspaceListPage() {
return (
<WorkspaceListPageBody
workspaces={workspaces}
- availableDatabases={databasesResponse.data}
+ databases={databasesResponse.data}
/>
);
}
type WorkspaceListPageBodyProps = {
workspaces: Workspace[];
- availableDatabases: Database[];
+ databases: Database[];
};
function WorkspaceListPageBody({
workspaces,
- availableDatabases,
+ databases,
}: WorkspaceListPageBodyProps) {
const hasWorkspaces = workspaces.length > 0;
@@ -64,28 +62,17 @@ function WorkspaceListPageBody({
breadcrumbs={
<DataStudioBreadcrumbs>{t`Workspaces`}</DataStudioBreadcrumbs>
}
- actions={
- hasWorkspaces && (
- <Group gap="sm">
- <NewWorkspaceButton />
- <HelpMenu />
- </Group>
- )
- }
+ actions={hasWorkspaces && <NewWorkspaceButton databases={databases} />}
py={0}
/>
{hasWorkspaces ? (
- <Stack data-testid="workspace-list" gap="lg">
+ <Stack data-testid="workspace-list">
{workspaces.map((workspace) => (
- <WorkspaceItem
- key={workspace.id}
- workspace={workspace}
- availableDatabases={availableDatabases}
- />
+ <WorkspaceItem key={workspace.id} workspace={workspace} />
))}
</Stack>
) : (
- <WorkspaceEmptyState />
+ <WorkspaceEmptyState databases={databases} />
)}
</PageContainer>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx
index 643f7dd0c0c..788528d2c41 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx
@@ -7,7 +7,6 @@ import {
setupListWorkspacesEndpoint,
} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/urls";
import type { Workspace } from "metabase-types/api";
import {
createMockDatabase,
@@ -16,15 +15,14 @@ import {
import { WorkspaceListPage } from "./WorkspaceListPage";
-const POSTGRES = createMockDatabase({
- id: 10,
- name: "Postgres",
+const ELIGIBLE_DATABASE = createMockDatabase({
features: ["workspace"],
+ settings: { "database-enable-workspaces": true },
});
function setup({ workspaces = [] as Workspace[] } = {}) {
- setupDatabasesEndpoints([POSTGRES]);
setupListWorkspacesEndpoint(workspaces);
+ setupDatabasesEndpoints([ELIGIBLE_DATABASE]);
setupCreateWorkspaceEndpoint(createMockWorkspace({ name: "Brand new" }));
renderWithProviders(<Route path="*" component={WorkspaceListPage} />, {
@@ -49,12 +47,14 @@ describe("WorkspaceListPage", () => {
).not.toHaveLength(0);
});
- it("when not empty, each workspace card links to its workspace page", async () => {
+ it("when not empty, renders a card with a menu for each workspace", async () => {
const workspace = createMockWorkspace({ id: 42, name: "Existing" });
setup({ workspaces: [workspace] });
+ const item = await screen.findByRole("region", { name: "Existing" });
+ expect(item).toBeInTheDocument();
expect(
- await screen.findByRole("region", { name: "Existing" }),
- ).toHaveAttribute("href", Urls.workspace(workspace.id));
+ screen.getByRole("button", { name: "Workspace options" }),
+ ).toBeInTheDocument();
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/AddDatabaseButton.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/AddDatabaseButton.tsx
deleted file mode 100644
index 3cdda6509c3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/AddDatabaseButton.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { t } from "ttag";
-
-import { Button, FixedSizeIcon, Tooltip } from "metabase/ui";
-import type { Database, Workspace } from "metabase-types/api";
-
-import { supportsWorkspaces } from "../../../../utils";
-import { NewDatabaseModal } from "../NewDatabaseModal";
-
-export type AddDatabaseButtonProps = {
- workspace: Workspace;
- availableDatabases: Database[];
-};
-
-export function AddDatabaseButton({
- workspace,
- availableDatabases,
-}: AddDatabaseButtonProps) {
- const [opened, { open, close }] = useDisclosure(false);
-
- const selectedIds = new Set(workspace.databases.map((db) => db.database_id));
- const selectableDatabases = availableDatabases.filter(
- (database) => !selectedIds.has(database.id),
- );
- const errorMessage = getErrorMessage(availableDatabases, selectableDatabases);
- const isDisabled = errorMessage != null;
- const isEmpty = workspace.databases.length === 0;
-
- return (
- <>
- <Tooltip label={errorMessage} disabled={!isDisabled}>
- <Button
- variant={isEmpty ? "filled" : "default"}
- disabled={isDisabled}
- leftSection={<FixedSizeIcon name="add" aria-hidden />}
- onClick={open}
- >
- {isEmpty ? t`Add database` : t`Add another database`}
- </Button>
- </Tooltip>
- <NewDatabaseModal
- workspace={workspace}
- availableDatabases={selectableDatabases}
- opened={opened}
- onCreate={close}
- onClose={close}
- />
- </>
- );
-}
-
-function getErrorMessage(
- availableDatabases: Database[],
- selectableDatabases: Database[],
-): string | undefined {
- if (availableDatabases.length === 0) {
- return t`There are no databases available.`;
- }
- if (selectableDatabases.length === 0) {
- return t`There are no more databases available.`;
- }
- if (!selectableDatabases.some(supportsWorkspaces)) {
- return t`None of the remaining databases support workspaces.`;
- }
- return undefined;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/AddDatabaseButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/AddDatabaseButton.unit.spec.tsx
deleted file mode 100644
index 37ba4dd09f9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/AddDatabaseButton.unit.spec.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import {
- setupCreateWorkspaceDatabaseEndpoint,
- setupDatabasesEndpoints,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { Database, Workspace } from "metabase-types/api";
-import {
- createMockDatabase,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { AddDatabaseButton } from "./AddDatabaseButton";
-
-const POSTGRES_DATABASE = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas", "workspace"],
-});
-
-const MYSQL_DATABASE = createMockDatabase({
- id: 20,
- name: "MySQL",
- features: ["workspace"],
-});
-
-const UNSUPPORTED_DATABASE = createMockDatabase({
- id: 30,
- name: "Unsupported",
- features: ["schemas"],
-});
-
-type SetupOpts = {
- workspace?: Workspace;
- availableDatabases?: Database[];
-};
-
-function setup({
- workspace = createMockWorkspace(),
- availableDatabases = [POSTGRES_DATABASE],
-}: SetupOpts = {}) {
- setupDatabasesEndpoints(availableDatabases);
- setupCreateWorkspaceDatabaseEndpoint(createMockWorkspace());
-
- renderWithProviders(
- <AddDatabaseButton
- workspace={workspace}
- availableDatabases={availableDatabases}
- />,
- );
-}
-
-describe("AddDatabaseButton", () => {
- it("disables the button when all available databases are already used", async () => {
- const workspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({ database_id: POSTGRES_DATABASE.id }),
- createMockWorkspaceDatabase({ database_id: MYSQL_DATABASE.id }),
- ],
- });
- setup({
- workspace,
- availableDatabases: [POSTGRES_DATABASE, MYSQL_DATABASE],
- });
-
- const button = screen.getByRole("button", { name: /Add another database/ });
- expect(button).toBeDisabled();
-
- await userEvent.hover(button);
- expect(
- await screen.findByText("There are no more databases available."),
- ).toBeInTheDocument();
- });
-
- it("disables the button when all unused databases do not support workspaces", async () => {
- const workspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({ database_id: POSTGRES_DATABASE.id }),
- ],
- });
- setup({
- workspace,
- availableDatabases: [POSTGRES_DATABASE, UNSUPPORTED_DATABASE],
- });
-
- const button = screen.getByRole("button", { name: /Add another database/ });
- expect(button).toBeDisabled();
-
- await userEvent.hover(button);
- expect(
- await screen.findByText(
- "None of the remaining databases support workspaces.",
- ),
- ).toBeInTheDocument();
- });
-
- it("disables the button when there are no databases at all", async () => {
- setup({ availableDatabases: [] });
-
- const button = screen.getByRole("button", { name: /Add database/ });
- expect(button).toBeDisabled();
-
- await userEvent.hover(button);
- expect(
- await screen.findByText("There are no databases available."),
- ).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/index.ts
deleted file mode 100644
index fb168cc371a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/AddDatabaseButton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./AddDatabaseButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.tsx
deleted file mode 100644
index 70e40a58129..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { t } from "ttag";
-
-import { Card, Group, Text } from "metabase/ui";
-import type { Database, Workspace } from "metabase-types/api";
-
-import { AddDatabaseButton } from "../AddDatabaseButton";
-
-export type DatabaseEmptyStateProps = {
- workspace: Workspace;
- availableDatabases: Database[];
-};
-
-export function DatabaseEmptyState({
- workspace,
- availableDatabases,
-}: DatabaseEmptyStateProps) {
- return (
- <Card p="lg" shadow="none" withBorder>
- <Group justify="space-between" align="center" wrap="nowrap">
- <Text>{t`No databases have been added to this workspace yet.`}</Text>
- <AddDatabaseButton
- workspace={workspace}
- availableDatabases={availableDatabases}
- />
- </Group>
- </Card>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx
deleted file mode 100644
index 0e263123052..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-
-import {
- setupCreateWorkspaceDatabaseEndpoint,
- setupDatabasesEndpoints,
- setupGetWorkspaceEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import type { Workspace } from "metabase-types/api";
-import {
- createMockDatabase,
- createMockTable,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { DatabaseEmptyState } from "./DatabaseEmptyState";
-
-const TEST_DATABASE = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas", "workspace"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- ],
-});
-
-function setup({
- workspace = createMockWorkspace(),
- createdWorkspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({
- database_id: TEST_DATABASE.id,
- input_schemas: ["public"],
- }),
- ],
- }),
-}: {
- workspace?: Workspace;
- createdWorkspace?: Workspace;
-} = {}) {
- setupDatabasesEndpoints([TEST_DATABASE]);
- setupCreateWorkspaceDatabaseEndpoint(createdWorkspace);
- setupGetWorkspaceEndpoint(createdWorkspace);
-
- renderWithProviders(
- <DatabaseEmptyState
- workspace={workspace}
- availableDatabases={[TEST_DATABASE]}
- />,
- );
-
- return { workspace };
-}
-
-describe("DatabaseEmptyState", () => {
- it("can add a database from the empty state", async () => {
- const { workspace } = setup();
-
- await userEvent.click(screen.getByRole("button", { name: /Add database/ }));
-
- const dialog = await screen.findByRole("dialog");
- await userEvent.click(
- await within(dialog).findByLabelText("Schemas to include"),
- );
- await userEvent.click(
- await screen.findByRole("option", { name: "public" }),
- );
- await userEvent.click(
- within(dialog).getByRole("button", { name: "Add database" }),
- );
-
- await waitFor(() => {
- const request = fetchMock.callHistory.lastCall(
- `path:/api/ee/workspace-manager/${workspace.id}/database`,
- )?.request;
- expect(request).toBeDefined();
- });
- const request = fetchMock.callHistory.lastCall(
- `path:/api/ee/workspace-manager/${workspace.id}/database`,
- )?.request;
- expect(await request?.json()).toEqual({
- database_id: TEST_DATABASE.id,
- input_schemas: ["public"],
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/index.ts
deleted file mode 100644
index 541af63b882..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DatabaseEmptyState";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx
deleted file mode 100644
index 774b2500522..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { t } from "ttag";
-
-import { hasFeature } from "metabase/common/utils/database";
-import { ActionIcon, Card, FixedSizeIcon, Group, Menu } from "metabase/ui";
-import type {
- Database,
- Workspace,
- WorkspaceDatabase,
-} from "metabase-types/api";
-
-import { DatabaseInfo } from "../../../../components/DatabaseInfo";
-import { DeleteDatabaseModal } from "../DeleteDatabaseModal";
-import { UpdateDatabaseModal } from "../UpdateDatabaseModal";
-
-export type DatabaseItemProps = {
- workspace: Workspace;
- workspaceDatabase: WorkspaceDatabase;
- database: Database | undefined;
-};
-
-export function DatabaseItem({
- workspace,
- workspaceDatabase,
- database,
-}: DatabaseItemProps) {
- const [editOpened, { open: openEdit, close: closeEdit }] =
- useDisclosure(false);
- const [deleteOpened, { open: openDelete, close: closeDelete }] =
- useDisclosure(false);
- const supportsSchemas = database != null && hasFeature(database, "schemas");
-
- return (
- <Card
- role="region"
- aria-label={database?.name}
- data-testid="workspace-database-item"
- p="lg"
- shadow="none"
- withBorder
- >
- <Group justify="space-between" align="center" wrap="nowrap">
- <DatabaseInfo
- workspaceDatabase={workspaceDatabase}
- database={database}
- />
- <Menu>
- <Menu.Target>
- <ActionIcon size="sm" aria-label={t`Database actions`}>
- <FixedSizeIcon name="ellipsis" aria-hidden />
- </ActionIcon>
- </Menu.Target>
- <Menu.Dropdown>
- {supportsSchemas && (
- <Menu.Item
- leftSection={<FixedSizeIcon name="pencil" aria-hidden />}
- onClick={openEdit}
- >{t`Edit`}</Menu.Item>
- )}
- <Menu.Item
- leftSection={<FixedSizeIcon name="trash" aria-hidden />}
- onClick={openDelete}
- >{t`Remove`}</Menu.Item>
- </Menu.Dropdown>
- </Menu>
- </Group>
- {database != null && (
- <UpdateDatabaseModal
- workspace={workspace}
- workspaceDatabase={workspaceDatabase}
- database={database}
- opened={editOpened}
- onUpdate={closeEdit}
- onClose={closeEdit}
- />
- )}
- <DeleteDatabaseModal
- workspace={workspace}
- workspaceDatabase={workspaceDatabase}
- database={database}
- opened={deleteOpened}
- onDelete={closeDelete}
- onClose={closeDelete}
- />
- </Card>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx
deleted file mode 100644
index 3962ad7aefc..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-
-import {
- setupDatabasesEndpoints,
- setupDeleteWorkspaceDatabaseEndpoint,
- setupGetWorkspaceEndpoint,
- setupUpdateWorkspaceDatabaseEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockDatabase,
- createMockTable,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { DatabaseItem } from "./DatabaseItem";
-
-const TEST_DATABASE = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- ],
-});
-
-const WORKSPACE = createMockWorkspace({
- id: 1,
- databases: [
- createMockWorkspaceDatabase({
- database_id: TEST_DATABASE.id,
- input_schemas: ["public"],
- }),
- ],
-});
-
-function setup() {
- setupDatabasesEndpoints([TEST_DATABASE]);
- setupUpdateWorkspaceDatabaseEndpoint(WORKSPACE, TEST_DATABASE.id);
- setupDeleteWorkspaceDatabaseEndpoint(WORKSPACE, TEST_DATABASE.id);
- setupGetWorkspaceEndpoint(WORKSPACE);
-
- renderWithProviders(
- <DatabaseItem
- workspace={WORKSPACE}
- workspaceDatabase={WORKSPACE.databases[0]}
- database={TEST_DATABASE}
- />,
- );
-}
-
-describe("DatabaseItem", () => {
- it("opens the edit modal from the menu when Edit is clicked", async () => {
- setup();
-
- await userEvent.click(
- screen.getByRole("button", { name: "Database actions" }),
- );
- await userEvent.click(
- await screen.findByRole("menuitem", { name: /Edit/ }),
- );
-
- expect(
- await screen.findByRole("heading", {
- name: `Edit settings for ${TEST_DATABASE.name}`,
- }),
- ).toBeInTheDocument();
- });
-
- it("calls DELETE on the database after confirming Remove", async () => {
- setup();
-
- await userEvent.click(
- screen.getByRole("button", { name: "Database actions" }),
- );
- await userEvent.click(
- await screen.findByRole("menuitem", { name: /Remove/ }),
- );
- await userEvent.click(
- await screen.findByRole("button", { name: "Remove" }),
- );
-
- await waitFor(() => {
- expect(
- fetchMock.callHistory.called(
- `path:/api/ee/workspace-manager/${WORKSPACE.id}/database/${TEST_DATABASE.id}`,
- { method: "DELETE" },
- ),
- ).toBe(true);
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/index.ts
deleted file mode 100644
index d4813704f4e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DatabaseItem";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseSection.tsx
deleted file mode 100644
index e7f8d9a5b28..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseSection.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { t } from "ttag";
-
-import { Box, Stack, Text, Title } from "metabase/ui";
-import type { Database, Workspace } from "metabase-types/api";
-
-import { getDatabasesById } from "../../../utils";
-
-import { AddDatabaseButton } from "./AddDatabaseButton";
-import { DatabaseEmptyState } from "./DatabaseEmptyState";
-import { DatabaseItem } from "./DatabaseItem";
-
-export type DatabaseSectionProps = {
- workspace: Workspace;
- availableDatabases: Database[];
-};
-
-export function DatabaseSection({
- workspace,
- availableDatabases,
-}: DatabaseSectionProps) {
- const databaseById = getDatabasesById(availableDatabases);
- const isEmpty = workspace.databases.length === 0;
-
- return (
- <Stack data-testid="workspace-database-section">
- <Stack gap="sm">
- <Title order={4}>{t`Databases to include`}</Title>
- <Text c="text-secondary">
- {t`The databases and schemas that should be accessible from this workspace`}
- </Text>
- </Stack>
- {isEmpty ? (
- <DatabaseEmptyState
- workspace={workspace}
- availableDatabases={availableDatabases}
- />
- ) : (
- <>
- <Stack gap="md">
- {workspace.databases.map((workspaceDatabase) => (
- <DatabaseItem
- key={workspaceDatabase.database_id}
- workspace={workspace}
- workspaceDatabase={workspaceDatabase}
- database={databaseById.get(workspaceDatabase.database_id)}
- />
- ))}
- </Stack>
- <Box>
- <AddDatabaseButton
- workspace={workspace}
- availableDatabases={availableDatabases}
- />
- </Box>
- </>
- )}
- </Stack>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseSection.unit.spec.tsx
deleted file mode 100644
index 4913172799a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseSection.unit.spec.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import {
- setupCreateWorkspaceDatabaseEndpoint,
- setupDatabasesEndpoints,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, within } from "__support__/ui";
-import {
- createMockDatabase,
- createMockTable,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { DatabaseSection } from "./DatabaseSection";
-
-const POSTGRES = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas", "workspace"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- ],
-});
-
-const SNOWFLAKE = createMockDatabase({
- id: 11,
- name: "Snowflake",
- features: ["schemas", "workspace"],
- tables: [
- createMockTable({ id: 200, db_id: 11, schema: "raw", name: "events" }),
- ],
-});
-
-function setup({
- workspace = createMockWorkspace(),
- availableDatabases = [POSTGRES, SNOWFLAKE],
-} = {}) {
- setupDatabasesEndpoints(availableDatabases);
- setupCreateWorkspaceDatabaseEndpoint(workspace);
-
- renderWithProviders(
- <DatabaseSection
- workspace={workspace}
- availableDatabases={availableDatabases}
- />,
- );
-}
-
-describe("DatabaseSection", () => {
- it("can open the add modal and shows both databases as select options", async () => {
- setup();
-
- await userEvent.click(screen.getByRole("button", { name: /Add database/ }));
- await userEvent.click(
- await screen.findByRole("textbox", { name: "Database" }),
- );
-
- expect(
- await screen.findByRole("option", { name: "Postgres" }),
- ).toBeInTheDocument();
- expect(
- screen.getByRole("option", { name: "Snowflake" }),
- ).toBeInTheDocument();
- });
-
- it("excludes already-selected databases from the picker", async () => {
- const workspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({
- database_id: POSTGRES.id,
- input_schemas: ["public"],
- }),
- ],
- });
- setup({ workspace });
-
- await userEvent.click(
- screen.getByRole("button", { name: /Add another database/ }),
- );
-
- const dialog = await screen.findByRole("dialog");
- expect(within(dialog).getByText("Snowflake")).toBeInTheDocument();
- expect(within(dialog).queryByText("Postgres")).not.toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.tsx
deleted file mode 100644
index c9130f9b229..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { t } from "ttag";
-
-import {
- Form,
- FormErrorMessage,
- FormProvider,
- FormSubmitButton,
-} from "metabase/forms";
-import { Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
-import {
- useDeleteWorkspaceDatabaseMutation,
- useLazyGetWorkspaceQuery,
-} from "metabase-enterprise/api";
-import type {
- Database,
- Workspace,
- WorkspaceDatabase,
-} from "metabase-types/api";
-
-export type DeleteDatabaseModalProps = {
- workspace: Workspace;
- workspaceDatabase: WorkspaceDatabase;
- database: Database | undefined;
- opened: boolean;
- onDelete: () => void;
- onClose: () => void;
-};
-
-export function DeleteDatabaseModal({
- workspace,
- workspaceDatabase,
- database,
- opened,
- onDelete,
- onClose,
-}: DeleteDatabaseModalProps) {
- return (
- <Modal
- title={t`Remove ${database?.name} from this workspace?`}
- opened={opened}
- padding="xl"
- onClose={onClose}
- >
- <FocusTrap.InitialFocus />
- <DeleteDatabaseForm
- workspace={workspace}
- workspaceDatabase={workspaceDatabase}
- onDelete={onDelete}
- onClose={onClose}
- />
- </Modal>
- );
-}
-
-type DeleteDatabaseFormProps = {
- workspace: Workspace;
- workspaceDatabase: WorkspaceDatabase;
- onDelete: () => void;
- onClose: () => void;
-};
-
-function DeleteDatabaseForm({
- workspace,
- workspaceDatabase,
- onDelete,
- onClose,
-}: DeleteDatabaseFormProps) {
- const [deleteWorkspaceDatabase] = useDeleteWorkspaceDatabaseMutation();
- const [getWorkspace] = useLazyGetWorkspaceQuery();
-
- const handleSubmit = async () => {
- await deleteWorkspaceDatabase({
- id: workspace.id,
- database_id: workspaceDatabase.database_id,
- }).unwrap();
- await getWorkspace(workspace.id).unwrap();
- onDelete();
- };
-
- return (
- <FormProvider initialValues={{}} onSubmit={handleSubmit}>
- <Form>
- <Stack gap="lg">
- <Text>
- {t`This will delete the temporary user and schema from this database.`}
- </Text>
- <FormErrorMessage />
- <Group justify="flex-end">
- <Button onClick={onClose}>{t`Cancel`}</Button>
- <FormSubmitButton
- label={t`Remove`}
- variant="filled"
- color="danger"
- />
- </Group>
- </Stack>
- </Form>
- </FormProvider>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.unit.spec.tsx
deleted file mode 100644
index 4a6b1111f70..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.unit.spec.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-
-import {
- setupDeleteWorkspaceDatabaseEndpoint,
- setupDeleteWorkspaceDatabaseEndpointError,
- setupGetWorkspaceEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockDatabase,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { DeleteDatabaseModal } from "./DeleteDatabaseModal";
-
-const DATABASE = createMockDatabase({ id: 10, name: "Postgres" });
-
-const WORKSPACE_DATABASE = createMockWorkspaceDatabase({
- database_id: DATABASE.id,
- input_schemas: ["public"],
-});
-
-const WORKSPACE = createMockWorkspace({
- id: 1,
- databases: [WORKSPACE_DATABASE],
-});
-
-function setup({ withError = false }: { withError?: boolean } = {}) {
- if (withError) {
- setupDeleteWorkspaceDatabaseEndpointError(WORKSPACE.id, DATABASE.id);
- } else {
- setupDeleteWorkspaceDatabaseEndpoint(WORKSPACE, DATABASE.id);
- }
- setupGetWorkspaceEndpoint(WORKSPACE);
-
- const onDelete = jest.fn();
- const onClose = jest.fn();
-
- renderWithProviders(
- <DeleteDatabaseModal
- workspace={WORKSPACE}
- workspaceDatabase={WORKSPACE_DATABASE}
- database={DATABASE}
- opened
- onDelete={onDelete}
- onClose={onClose}
- />,
- );
-
- return { onDelete, onClose };
-}
-
-describe("DeleteDatabaseModal", () => {
- it("should delete the workspace database and call the callback when the confirm button is clicked", async () => {
- const { onDelete } = setup();
-
- await userEvent.click(screen.getByRole("button", { name: "Remove" }));
-
- await waitFor(() => {
- expect(
- fetchMock.callHistory.called(
- `path:/api/ee/workspace-manager/${WORKSPACE.id}/database/${DATABASE.id}`,
- { method: "DELETE" },
- ),
- ).toBe(true);
- });
- await waitFor(() => expect(onDelete).toHaveBeenCalled());
- });
-
- it("should show an error message and not call the callback when the request fails", async () => {
- const { onDelete } = setup({ withError: true });
-
- await userEvent.click(screen.getByRole("button", { name: "Remove" }));
-
- expect(await screen.findByRole("alert")).toHaveTextContent(
- "An error occurred",
- );
- expect(onDelete).not.toHaveBeenCalled();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/index.ts
deleted file mode 100644
index 57029b6386e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DeleteDatabaseModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx
deleted file mode 100644
index 4ad943fd8c0..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-import { useMemo } from "react";
-import { t } from "ttag";
-import * as Yup from "yup";
-
-import { hasFeature } from "metabase/common/utils/database";
-import {
- Form,
- FormErrorMessage,
- FormProvider,
- FormSubmitButton,
-} from "metabase/forms";
-import {
- Button,
- FocusTrap,
- Group,
- Input,
- Modal,
- Select,
- Stack,
- Text,
-} from "metabase/ui";
-import * as Errors from "metabase/utils/errors";
-import {
- useCreateWorkspaceDatabaseMutation,
- useLazyGetWorkspaceQuery,
-} from "metabase-enterprise/api";
-import type { Database, DatabaseId, Workspace } from "metabase-types/api";
-
-import { trackWorkspaceDatabaseAdded } from "../../../../analytics";
-import { supportsWorkspaces } from "../../../../utils";
-import { SchemaMultiSelect } from "../SchemaMultiSelect";
-
-export type NewDatabaseModalProps = {
- workspace: Workspace;
- availableDatabases: Database[];
- opened: boolean;
- onCreate: (workspace: Workspace) => void;
- onClose: () => void;
-};
-
-export function NewDatabaseModal({
- workspace,
- availableDatabases,
- opened,
- onCreate,
- onClose,
-}: NewDatabaseModalProps) {
- return (
- <Modal
- title={t`Add a database to this workspace`}
- opened={opened}
- padding="xl"
- onClose={onClose}
- >
- <FocusTrap.InitialFocus />
- <NewDatabaseForm
- workspace={workspace}
- availableDatabases={availableDatabases}
- onCreate={onCreate}
- onClose={onClose}
- />
- </Modal>
- );
-}
-
-type NewDatabaseFormValues = {
- database_id: DatabaseId | null;
- input_schemas: string[];
-};
-
-function getValidationSchema(availableDatabases: Database[]) {
- return Yup.object({
- database_id: Yup.number().nullable().required(Errors.required),
- input_schemas: Yup.array()
- .of(Yup.string().required())
- .when("database_id", {
- is: (databaseId: DatabaseId | null | undefined) => {
- if (databaseId == null) {
- return false;
- }
- const database = availableDatabases.find(
- (db) => db.id === databaseId,
- );
- return database != null && hasFeature(database, "schemas");
- },
- then: (schema) => schema.min(1, Errors.required).required(),
- otherwise: (schema) => schema.required(),
- }),
- });
-}
-
-type NewDatabaseFormProps = {
- workspace: Workspace;
- availableDatabases: Database[];
- onCreate: (workspace: Workspace) => void;
- onClose: () => void;
-};
-
-function NewDatabaseForm({
- workspace,
- availableDatabases,
- onCreate,
- onClose,
-}: NewDatabaseFormProps) {
- const [createWorkspaceDatabase] = useCreateWorkspaceDatabaseMutation();
- const [getWorkspace] = useLazyGetWorkspaceQuery();
-
- const initialValues: NewDatabaseFormValues = {
- database_id: availableDatabases.find(supportsWorkspaces)?.id ?? null,
- input_schemas: [],
- };
-
- const validationSchema = useMemo(
- () => getValidationSchema(availableDatabases),
- [availableDatabases],
- );
-
- const handleSubmit = async (values: NewDatabaseFormValues) => {
- if (values.database_id == null) {
- return;
- }
- const updated = await createWorkspaceDatabase({
- id: workspace.id,
- database_id: values.database_id,
- input_schemas: values.input_schemas,
- }).unwrap();
- await getWorkspace(workspace.id).unwrap();
- trackWorkspaceDatabaseAdded({ workspaceId: workspace.id });
- onCreate(updated);
- };
-
- return (
- <FormProvider
- initialValues={initialValues}
- validationSchema={validationSchema}
- onSubmit={handleSubmit}
- >
- {({ values, setFieldValue }) => {
- const selectedDatabase = availableDatabases.find(
- (database) => database.id === values.database_id,
- );
- const supportsSchemas =
- selectedDatabase != null && hasFeature(selectedDatabase, "schemas");
-
- return (
- <Form>
- <Stack gap="lg">
- <Text>
- {t`This will create a temporary schema and user in this database, grant that user read access to the schemas you select, and write access to the temporary schema.`}
- </Text>
- <DatabaseSelect
- databases={availableDatabases}
- value={values.database_id}
- onChange={(databaseId) => {
- setFieldValue("database_id", databaseId);
- setFieldValue("input_schemas", []);
- }}
- />
- {values.database_id != null && supportsSchemas && (
- <SchemaMultiSelect
- databaseId={values.database_id}
- value={values.input_schemas}
- onChange={(schemas) =>
- setFieldValue("input_schemas", schemas)
- }
- />
- )}
- <FormErrorMessage />
- <Group justify="flex-end">
- <Button onClick={onClose}>{t`Cancel`}</Button>
- <FormSubmitButton label={t`Add database`} variant="filled" />
- </Group>
- </Stack>
- </Form>
- );
- }}
- </FormProvider>
- );
-}
-
-type DatabaseSelectProps = {
- databases: Database[];
- value: DatabaseId | null;
- onChange: (databaseId: DatabaseId | null) => void;
-};
-
-function DatabaseSelect({ databases, value, onChange }: DatabaseSelectProps) {
- if (databases.length === 1) {
- return (
- <Input.Wrapper label={t`Database`}>
- <Text>{databases[0].name}</Text>
- </Input.Wrapper>
- );
- }
-
- const data = databases.map((database) => ({
- value: String(database.id),
- label: database.name,
- disabled: !supportsWorkspaces(database),
- }));
-
- return (
- <Select
- label={t`Database`}
- data={data}
- value={value != null ? String(value) : null}
- onChange={(newValue) =>
- onChange(newValue != null ? Number(newValue) : null)
- }
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx
deleted file mode 100644
index 137c9b29c18..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-
-import {
- setupCreateWorkspaceDatabaseEndpoint,
- setupDatabasesEndpoints,
- setupGetWorkspaceEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import type { Database, Workspace } from "metabase-types/api";
-import {
- createMockDatabase,
- createMockTable,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { NewDatabaseModal } from "./NewDatabaseModal";
-
-const { trackSimpleEvent } = jest.requireMock("metabase/analytics");
-
-const POSTGRES_DATABASE = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas", "workspace"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- ],
-});
-
-const MYSQL_DATABASE = createMockDatabase({
- id: 20,
- name: "MySQL",
- features: ["workspace"],
- tables: [createMockTable({ id: 200, db_id: 20, schema: "", name: "people" })],
-});
-
-const UNSUPPORTED_DATABASE = createMockDatabase({
- id: 30,
- name: "Unsupported",
- features: ["schemas"],
-});
-
-type SetupOpts = {
- workspace?: Workspace;
- availableDatabases?: Database[];
- createdWorkspace?: Workspace;
-};
-
-function setup({
- workspace = createMockWorkspace(),
- availableDatabases = [POSTGRES_DATABASE],
- createdWorkspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({
- database_id: POSTGRES_DATABASE.id,
- input_schemas: ["public"],
- }),
- ],
- }),
-}: SetupOpts = {}) {
- const onCreate = jest.fn();
- const onClose = jest.fn();
-
- setupDatabasesEndpoints(availableDatabases);
- setupCreateWorkspaceDatabaseEndpoint(createdWorkspace);
- setupGetWorkspaceEndpoint(createdWorkspace);
-
- renderWithProviders(
- <NewDatabaseModal
- workspace={workspace}
- availableDatabases={availableDatabases}
- opened
- onCreate={onCreate}
- onClose={onClose}
- />,
- );
-
- return { onCreate, onClose, workspace, createdWorkspace };
-}
-
-describe("NewDatabaseModal", () => {
- beforeEach(() => {
- trackSimpleEvent.mockClear();
- });
-
- it("can create a workspace database", async () => {
- const { onCreate, createdWorkspace } = setup();
-
- await userEvent.click(await screen.findByLabelText("Schemas to include"));
- await userEvent.click(
- await screen.findByRole("option", { name: "public" }),
- );
- await userEvent.click(screen.getByRole("button", { name: "Add database" }));
-
- await waitFor(() =>
- expect(onCreate).toHaveBeenCalledWith(createdWorkspace),
- );
- });
-
- it("tracks an analytics event when a database is added", async () => {
- const { workspace } = setup();
-
- await userEvent.click(await screen.findByLabelText("Schemas to include"));
- await userEvent.click(
- await screen.findByRole("option", { name: "public" }),
- );
- await userEvent.click(screen.getByRole("button", { name: "Add database" }));
-
- await waitFor(() =>
- expect(trackSimpleEvent).toHaveBeenCalledWith({
- event: "workspaces_database_added",
- target_id: workspace.id,
- }),
- );
- });
-
- it("renders a single database as text without a select", () => {
- setup({ availableDatabases: [POSTGRES_DATABASE] });
-
- expect(screen.getByText("Postgres")).toBeInTheDocument();
- expect(screen.queryByRole("combobox")).not.toBeInTheDocument();
- });
-
- it("disables options for databases that do not support workspaces", async () => {
- setup({ availableDatabases: [POSTGRES_DATABASE, UNSUPPORTED_DATABASE] });
-
- await userEvent.click(screen.getByRole("textbox", { name: "Database" }));
-
- expect(
- screen.getByRole("option", { name: "Postgres" }),
- ).not.toHaveAttribute("data-combobox-disabled");
- expect(screen.getByRole("option", { name: "Unsupported" })).toHaveAttribute(
- "data-combobox-disabled",
- );
- });
-
- it("requires at least one schema when the database supports schemas", async () => {
- const { onCreate } = setup({ availableDatabases: [POSTGRES_DATABASE] });
-
- await userEvent.click(screen.getByRole("button", { name: "Add database" }));
-
- expect(onCreate).not.toHaveBeenCalled();
- expect(
- fetchMock.callHistory.lastCall(
- "path:/api/ee/workspace-manager/1/database",
- ),
- ).toBeUndefined();
- });
-
- it("allows submitting without schemas when the database does not support schemas", async () => {
- const createdWorkspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({
- database_id: MYSQL_DATABASE.id,
- input_schemas: [],
- }),
- ],
- });
- const { onCreate } = setup({
- availableDatabases: [MYSQL_DATABASE],
- createdWorkspace,
- });
-
- expect(
- screen.queryByLabelText("Schemas to include"),
- ).not.toBeInTheDocument();
-
- await userEvent.click(screen.getByRole("button", { name: "Add database" }));
-
- await waitFor(() =>
- expect(onCreate).toHaveBeenCalledWith(createdWorkspace),
- );
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/index.ts
deleted file mode 100644
index 3c53504ceb5..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./NewDatabaseModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/SchemaMultiSelect.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/SchemaMultiSelect.tsx
deleted file mode 100644
index ab775b883c9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/SchemaMultiSelect.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useId } from "react";
-import { t } from "ttag";
-
-import { useListDatabaseSchemasQuery } from "metabase/api";
-import { Button, Group, Input, MultiSelect, Stack } from "metabase/ui";
-import type { DatabaseId } from "metabase-types/api";
-
-// to not cover the add database button
-const DROPDOWN_WIDTH = 432;
-
-export type SchemaMultiSelectProps = {
- databaseId: DatabaseId;
- value: string[];
- onChange: (schemas: string[]) => void;
-};
-
-export function SchemaMultiSelect({
- databaseId,
- value,
- onChange,
-}: SchemaMultiSelectProps) {
- const { data: schemas = [] } = useListDatabaseSchemasQuery({
- id: databaseId,
- });
- const inputId = useId();
-
- const isAll = schemas.length > 0 && value.length === schemas.length;
-
- const handleToggleAll = () => {
- onChange(isAll ? [] : schemas);
- };
-
- return (
- <Stack gap="xs">
- <Group justify="space-between" align="center">
- <Input.Label htmlFor={inputId}>{t`Schemas to include`}</Input.Label>
- {schemas.length > 0 && (
- <Button variant="subtle" size="compact-xs" onClick={handleToggleAll}>
- {isAll ? t`Select none` : t`Select all`}
- </Button>
- )}
- </Group>
- <MultiSelect
- id={inputId}
- data={schemas.map((schema) => ({ value: schema, label: schema }))}
- value={value}
- placeholder={isAll ? t`All schemas selected` : t`Select schemas`}
- comboboxProps={{ width: DROPDOWN_WIDTH, position: "bottom-start" }}
- onChange={onChange}
- />
- </Stack>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/SchemaMultiSelect.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/SchemaMultiSelect.unit.spec.tsx
deleted file mode 100644
index f68e3959a51..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/SchemaMultiSelect.unit.spec.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { setupDatabasesEndpoints } from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
-
-import { SchemaMultiSelect } from "./SchemaMultiSelect";
-
-const TEST_DATABASE = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- createMockTable({
- id: 101,
- db_id: 10,
- schema: "analytics",
- name: "events",
- }),
- ],
-});
-
-function setup({ value = [] as string[] } = {}) {
- const onChange = jest.fn();
- setupDatabasesEndpoints([TEST_DATABASE]);
- renderWithProviders(
- <SchemaMultiSelect
- databaseId={TEST_DATABASE.id}
- value={value}
- onChange={onChange}
- />,
- );
- return { onChange };
-}
-
-describe("SchemaMultiSelect", () => {
- it("can select the first schema", async () => {
- const { onChange } = setup();
-
- await userEvent.click(await screen.findByLabelText("Schemas to include"));
- await userEvent.click(
- await screen.findByRole("option", { name: "public" }),
- );
-
- expect(onChange).toHaveBeenCalledWith(["public"]);
- });
-
- it("can select the second schema", async () => {
- const { onChange } = setup({ value: ["public"] });
-
- await userEvent.click(await screen.findByLabelText("Schemas to include"));
- await userEvent.click(
- await screen.findByRole("option", { name: "analytics" }),
- );
-
- expect(onChange).toHaveBeenCalledWith(["public", "analytics"]);
- });
-
- it("selects all schemas via the Select all button", async () => {
- const { onChange } = setup({ value: ["public"] });
-
- await userEvent.click(
- await screen.findByRole("button", { name: "Select all" }),
- );
-
- expect(onChange).toHaveBeenCalledWith(["public", "analytics"]);
- });
-
- it("clears all schemas when all are already selected", async () => {
- const { onChange } = setup({ value: ["public", "analytics"] });
-
- await userEvent.click(
- await screen.findByRole("button", { name: "Select none" }),
- );
-
- expect(onChange).toHaveBeenCalledWith([]);
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/index.ts
deleted file mode 100644
index 166d9e78787..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/SchemaMultiSelect/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SchemaMultiSelect";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx
deleted file mode 100644
index bb4c4f680e3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { t } from "ttag";
-import * as Yup from "yup";
-
-import {
- Form,
- FormErrorMessage,
- FormProvider,
- FormSubmitButton,
-} from "metabase/forms";
-import { Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
-import {
- useLazyGetWorkspaceQuery,
- useUpdateWorkspaceDatabaseMutation,
-} from "metabase-enterprise/api";
-import type {
- Database,
- Workspace,
- WorkspaceDatabase,
-} from "metabase-types/api";
-
-import { SchemaMultiSelect } from "../SchemaMultiSelect";
-
-export type UpdateDatabaseModalProps = {
- workspace: Workspace;
- workspaceDatabase: WorkspaceDatabase;
- database: Database;
- opened: boolean;
- onUpdate: (workspace: Workspace) => void;
- onClose: () => void;
-};
-
-export function UpdateDatabaseModal({
- workspace,
- workspaceDatabase,
- database,
- opened,
- onUpdate,
- onClose,
-}: UpdateDatabaseModalProps) {
- return (
- <Modal
- title={t`Edit settings for ${database.name}`}
- opened={opened}
- padding="xl"
- onClose={onClose}
- >
- <FocusTrap.InitialFocus />
- <UpdateDatabaseForm
- workspace={workspace}
- workspaceDatabase={workspaceDatabase}
- onUpdate={onUpdate}
- onClose={onClose}
- />
- </Modal>
- );
-}
-
-type UpdateDatabaseFormValues = {
- input_schemas: string[];
-};
-
-const UPDATE_DATABASE_SCHEMA = Yup.object({
- input_schemas: Yup.array().of(Yup.string().required()).required(),
-});
-
-type UpdateDatabaseFormProps = {
- workspace: Workspace;
- workspaceDatabase: WorkspaceDatabase;
- onUpdate: (workspace: Workspace) => void;
- onClose: () => void;
-};
-
-function UpdateDatabaseForm({
- workspace,
- workspaceDatabase,
- onUpdate,
- onClose,
-}: UpdateDatabaseFormProps) {
- const [updateWorkspaceDatabase] = useUpdateWorkspaceDatabaseMutation();
- const [getWorkspace] = useLazyGetWorkspaceQuery();
-
- const initialValues: UpdateDatabaseFormValues = {
- input_schemas: workspaceDatabase.input_schemas,
- };
-
- const handleSubmit = async (values: UpdateDatabaseFormValues) => {
- const updated = await updateWorkspaceDatabase({
- id: workspace.id,
- database_id: workspaceDatabase.database_id,
- input_schemas: values.input_schemas,
- }).unwrap();
- await getWorkspace(workspace.id).unwrap();
- onUpdate(updated);
- };
-
- return (
- <FormProvider
- initialValues={initialValues}
- validationSchema={UPDATE_DATABASE_SCHEMA}
- onSubmit={handleSubmit}
- >
- {({ values, setFieldValue, dirty }) => (
- <Form>
- <Stack gap="lg">
- <Text>
- {t`Changing these settings will first delete the temporary user and schema, then recreate them with your new settings.`}
- </Text>
- <SchemaMultiSelect
- databaseId={workspaceDatabase.database_id}
- value={values.input_schemas}
- onChange={(schemas) => setFieldValue("input_schemas", schemas)}
- />
- <FormErrorMessage />
- <Group justify="flex-end">
- <Button onClick={onClose}>{t`Cancel`}</Button>
- <FormSubmitButton
- label={t`Save changes`}
- variant="filled"
- disabled={!dirty}
- />
- </Group>
- </Stack>
- </Form>
- )}
- </FormProvider>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx
deleted file mode 100644
index ee9bfc5209c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import {
- setupDatabasesEndpoints,
- setupGetWorkspaceEndpoint,
- setupUpdateWorkspaceDatabaseEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import type {
- Database,
- Workspace,
- WorkspaceDatabase,
-} from "metabase-types/api";
-import {
- createMockDatabase,
- createMockTable,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { UpdateDatabaseModal } from "./UpdateDatabaseModal";
-
-const TEST_DATABASE = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- createMockTable({
- id: 101,
- db_id: 10,
- schema: "analytics",
- name: "events",
- }),
- ],
-});
-
-type SetupOpts = {
- workspace?: Workspace;
- workspaceDatabase?: WorkspaceDatabase;
- database?: Database;
- updatedWorkspace?: Workspace;
-};
-
-function setup({
- workspace = createMockWorkspace(),
- workspaceDatabase = createMockWorkspaceDatabase({
- database_id: TEST_DATABASE.id,
- input_schemas: ["public"],
- }),
- database = TEST_DATABASE,
- updatedWorkspace = createMockWorkspace({
- databases: [
- createMockWorkspaceDatabase({
- database_id: TEST_DATABASE.id,
- input_schemas: ["public", "analytics"],
- }),
- ],
- }),
-}: SetupOpts = {}) {
- const onUpdate = jest.fn();
- const onClose = jest.fn();
-
- setupDatabasesEndpoints([TEST_DATABASE]);
- setupUpdateWorkspaceDatabaseEndpoint(updatedWorkspace, TEST_DATABASE.id);
- setupGetWorkspaceEndpoint(updatedWorkspace);
-
- renderWithProviders(
- <UpdateDatabaseModal
- workspace={workspace}
- workspaceDatabase={workspaceDatabase}
- database={database}
- opened
- onUpdate={onUpdate}
- onClose={onClose}
- />,
- );
-
- return { onUpdate, onClose, updatedWorkspace };
-}
-
-describe("UpdateDatabaseModal", () => {
- it("can update a workspace database", async () => {
- const { onUpdate, updatedWorkspace } = setup();
-
- await userEvent.click(await screen.findByLabelText("Schemas to include"));
- await userEvent.click(
- await screen.findByRole("option", { name: "analytics" }),
- );
- await userEvent.click(screen.getByRole("button", { name: "Save changes" }));
-
- await waitFor(() =>
- expect(onUpdate).toHaveBeenCalledWith(updatedWorkspace),
- );
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/index.ts
deleted file mode 100644
index 350dc2200f4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./UpdateDatabaseModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/index.ts
deleted file mode 100644
index a7f46d3eb67..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DatabaseSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/SetupSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/SetupSection.tsx
deleted file mode 100644
index 61139caaac4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/SetupSection.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { jt, t } from "ttag";
-
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
-import { Button, Code, FixedSizeIcon, Group, Text, Tooltip } from "metabase/ui";
-import type { Workspace } from "metabase-types/api";
-
-import { trackWorkspaceConfigDownloaded } from "../../../analytics";
-
-const CONFIG_FILENAME = "config.yml";
-
-export type SetupSectionProps = {
- workspace: Workspace;
-};
-
-export function SetupSection({ workspace }: SetupSectionProps) {
- // eslint-disable-next-line metabase/no-literal-metabase-strings -- referring to the product name is intentional
- const description = jt`Run a local Metabase instance backed by this workspace's data so you can make changes safely. Pass this ${<Code key="config">{CONFIG_FILENAME}</Code>} file, containing the database credentials, when starting the instance.`;
- const isDisabled = workspace.databases.length === 0;
-
- return (
- <TitleSection
- data-testid="workspace-setup-section"
- label={t`How to set up a development instance`}
- >
- <Group p="lg" justify="space-between" align="center">
- <Text maw="40rem">{description}</Text>
- {isDisabled ? (
- <Tooltip label={t`You need to add at least one database.`}>
- <Button
- disabled
- leftSection={<FixedSizeIcon name="download" aria-hidden />}
- >
- {t`Download ${CONFIG_FILENAME}`}
- </Button>
- </Tooltip>
- ) : (
- <Button
- component="a"
- href={`/api/ee/workspace-manager/${workspace.id}/config`}
- download={CONFIG_FILENAME}
- onClick={() =>
- trackWorkspaceConfigDownloaded({ workspaceId: workspace.id })
- }
- leftSection={<FixedSizeIcon name="download" aria-hidden />}
- >
- {t`Download ${CONFIG_FILENAME}`}
- </Button>
- )}
- </Group>
- </TitleSection>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/SetupSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/SetupSection.unit.spec.tsx
deleted file mode 100644
index f1665490e30..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/SetupSection.unit.spec.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { SetupSection } from "./SetupSection";
-
-const { trackSimpleEvent } = jest.requireMock("metabase/analytics");
-
-function setup({ workspace = createMockWorkspace() } = {}) {
- renderWithProviders(<SetupSection workspace={workspace} />);
-}
-
-describe("SetupSection", () => {
- beforeEach(() => {
- trackSimpleEvent.mockClear();
- });
-
- it("renders an enabled download link when the workspace has databases", () => {
- const workspace = createMockWorkspace({
- databases: [createMockWorkspaceDatabase()],
- });
- setup({ workspace });
-
- const button = screen.getByRole("link", { name: /Download config\.yml/ });
- expect(button).toBeEnabled();
- expect(button).toHaveAttribute(
- "href",
- `/api/ee/workspace-manager/${workspace.id}/config`,
- );
- });
-
- it("tracks an analytics event when the config is downloaded", async () => {
- const workspace = createMockWorkspace({
- databases: [createMockWorkspaceDatabase()],
- });
- setup({ workspace });
-
- await userEvent.click(
- screen.getByRole("link", { name: /Download config\.yml/ }),
- );
-
- expect(trackSimpleEvent).toHaveBeenCalledWith({
- event: "workspaces_config_downloaded",
- target_id: workspace.id,
- });
- });
-
- it("disables the download button and shows a tooltip when the workspace has no databases", async () => {
- setup({ workspace: createMockWorkspace({ databases: [] }) });
-
- const button = screen.getByRole("button", { name: /Download config\.yml/ });
- expect(button).toBeDisabled();
- expect(
- screen.queryByRole("link", { name: /Download config\.yml/ }),
- ).not.toBeInTheDocument();
-
- await userEvent.hover(button);
- expect(
- await screen.findByText("You need to add at least one database."),
- ).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/index.ts
deleted file mode 100644
index aa90fcb4034..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/SetupSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SetupSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx
deleted file mode 100644
index a8684a74126..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import type { ReactNode } from "react";
-import { Link } from "react-router";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import {
- PaneHeader,
- PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { useDispatch } from "metabase/redux";
-import { ActionIcon, FixedSizeIcon, Menu } from "metabase/ui";
-import * as Urls from "metabase/urls";
-import { useUpdateWorkspaceMutation } from "metabase-enterprise/api";
-import type { Workspace } from "metabase-types/api";
-
-import { DeleteWorkspaceModal } from "../../../components/DeleteWorkspaceModal";
-
-export type WorkspaceHeaderProps = {
- workspace: Workspace;
- actions?: ReactNode;
-};
-
-export function WorkspaceHeader({ workspace, actions }: WorkspaceHeaderProps) {
- const [updateWorkspace] = useUpdateWorkspaceMutation();
- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
-
- const handleNameChange = async (newName: string) => {
- const { error } = await updateWorkspace({
- id: workspace.id,
- name: newName,
- });
- if (error) {
- sendErrorToast(t`Failed to update workspace name`);
- } else {
- sendSuccessToast(t`Workspace name updated`);
- }
- };
-
- return (
- <PaneHeader
- title={
- <PaneHeaderInput
- data-testid="workspace-name-input"
- initialValue={workspace.name}
- onChange={handleNameChange}
- />
- }
- breadcrumbs={
- <DataStudioBreadcrumbs>
- <Link key="workspace-list" to={Urls.workspaces()}>
- {t`Workspaces`}
- </Link>
- {workspace.name}
- </DataStudioBreadcrumbs>
- }
- menu={<WorkspaceHeaderMenu workspace={workspace} />}
- actions={actions}
- py={0}
- />
- );
-}
-
-type WorkspaceHeaderMenuProps = {
- workspace: Workspace;
-};
-
-function WorkspaceHeaderMenu({ workspace }: WorkspaceHeaderMenuProps) {
- const dispatch = useDispatch();
- const [modalOpened, { open: openModal, close: closeModal }] =
- useDisclosure(false);
-
- return (
- <>
- <Menu>
- <Menu.Target>
- <ActionIcon size="sm" aria-label={t`Workspace actions`}>
- <FixedSizeIcon name="ellipsis" aria-hidden />
- </ActionIcon>
- </Menu.Target>
- <Menu.Dropdown>
- <Menu.Item
- leftSection={<FixedSizeIcon name="trash" aria-hidden />}
- onClick={openModal}
- >
- {t`Delete`}
- </Menu.Item>
- </Menu.Dropdown>
- </Menu>
- <DeleteWorkspaceModal
- workspace={workspace}
- opened={modalOpened}
- onDelete={() => {
- closeModal();
- dispatch(push(Urls.workspaces()));
- }}
- onClose={closeModal}
- />
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.unit.spec.tsx
deleted file mode 100644
index ac6e1af9e7e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.unit.spec.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-import { Route } from "react-router";
-
-import {
- setupDeleteWorkspaceEndpoint,
- setupUpdateWorkspaceEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockWorkspace } from "metabase-types/api/mocks";
-
-import { WorkspaceHeader } from "./WorkspaceHeader";
-
-const WORKSPACE = createMockWorkspace({ id: 1, name: "My workspace" });
-
-function setup() {
- setupUpdateWorkspaceEndpoint({ ...WORKSPACE, name: "Renamed" });
- setupDeleteWorkspaceEndpoint(WORKSPACE.id);
-
- renderWithProviders(
- <Route
- path="*"
- component={() => <WorkspaceHeader workspace={WORKSPACE} />}
- />,
- {
- withRouter: true,
- },
- );
-}
-
-describe("WorkspaceHeader", () => {
- it("renames the workspace via PUT when the title input changes", async () => {
- setup();
-
- await userEvent.click(screen.getByTestId("workspace-name-input"));
- const input = screen.getByRole("textbox");
- await userEvent.clear(input);
- await userEvent.type(input, "Renamed");
- await userEvent.tab();
-
- await waitFor(() => {
- expect(
- fetchMock.callHistory.called(
- `path:/api/ee/workspace-manager/${WORKSPACE.id}`,
- { method: "PUT" },
- ),
- ).toBe(true);
- });
- const request = fetchMock.callHistory.lastCall(
- `path:/api/ee/workspace-manager/${WORKSPACE.id}`,
- { method: "PUT" },
- )?.request;
- expect(await request?.json()).toEqual({ name: "Renamed" });
- });
-
- it("deletes the workspace via DELETE after confirming from the menu", async () => {
- setup();
-
- await userEvent.click(
- screen.getByRole("button", { name: "Workspace actions" }),
- );
- await userEvent.click(
- await screen.findByRole("menuitem", { name: /Delete/ }),
- );
- await userEvent.click(
- await screen.findByRole("button", { name: "Delete workspace" }),
- );
-
- await waitFor(() => {
- expect(
- fetchMock.callHistory.called(
- `path:/api/ee/workspace-manager/${WORKSPACE.id}`,
- { method: "DELETE" },
- ),
- ).toBe(true);
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/index.ts
deleted file mode 100644
index 7f076e6913e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./WorkspaceHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspacePage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspacePage.tsx
deleted file mode 100644
index ccb57e2ac2f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspacePage.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { useListDatabasesQuery } from "metabase/api";
-import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { Stack } from "metabase/ui";
-import * as Urls from "metabase/urls";
-import { useGetWorkspaceQuery } from "metabase-enterprise/api";
-import type { Database, Workspace, WorkspaceId } from "metabase-types/api";
-
-import { HelpMenu } from "../../components/HelpMenu";
-
-import { DatabaseSection } from "./DatabaseSection";
-import { SetupSection } from "./SetupSection";
-import { WorkspaceHeader } from "./WorkspaceHeader";
-
-type WorkspacePageParams = {
- workspaceId: string;
-};
-
-type WorkspacePageProps = {
- params: WorkspacePageParams;
-};
-
-export function WorkspacePage({ params }: WorkspacePageProps) {
- const workspaceId = Urls.extractEntityId(params.workspaceId);
-
- const {
- data: workspace,
- isLoading: isLoadingWorkspace,
- error: workspaceError,
- } = useGetWorkspaceQuery(workspaceId as WorkspaceId, {
- skip: workspaceId == null,
- });
-
- const {
- data: databasesResponse,
- isLoading: isLoadingDatabases,
- error: databasesError,
- } = useListDatabasesQuery();
-
- const isLoading = isLoadingWorkspace || isLoadingDatabases;
- const error = workspaceError ?? databasesError;
-
- if (
- isLoading ||
- error != null ||
- workspace == null ||
- databasesResponse == null
- ) {
- return <DelayedLoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- return (
- <WorkspacePageBody
- workspace={workspace}
- availableDatabases={databasesResponse.data}
- />
- );
-}
-
-type WorkspacePageBodyProps = {
- workspace: Workspace;
- availableDatabases: Database[];
-};
-
-function WorkspacePageBody({
- workspace,
- availableDatabases,
-}: WorkspacePageBodyProps) {
- return (
- <PageContainer data-testid="workspace-page">
- <WorkspaceHeader workspace={workspace} actions={<HelpMenu />} />
- <Stack gap="3.5rem">
- <DatabaseSection
- workspace={workspace}
- availableDatabases={availableDatabases}
- />
- <SetupSection workspace={workspace} />
- </Stack>
- </PageContainer>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspacePage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspacePage.unit.spec.tsx
deleted file mode 100644
index 09c7d3b9bdb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspacePage.unit.spec.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-import { Route } from "react-router";
-
-import {
- setupCreateWorkspaceDatabaseEndpoint,
- setupDatabasesEndpoints,
- setupGetWorkspaceEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import {
- createMockDatabase,
- createMockTable,
- createMockWorkspace,
- createMockWorkspaceDatabase,
-} from "metabase-types/api/mocks";
-
-import { WorkspacePage } from "./WorkspacePage";
-
-const POSTGRES = createMockDatabase({
- id: 10,
- name: "Postgres",
- features: ["schemas", "workspace"],
- tables: [
- createMockTable({ id: 100, db_id: 10, schema: "public", name: "orders" }),
- ],
-});
-
-const WORKSPACE = createMockWorkspace({ id: 1, name: "My workspace" });
-
-function setup() {
- setupGetWorkspaceEndpoint(WORKSPACE);
- setupDatabasesEndpoints([POSTGRES]);
- setupCreateWorkspaceDatabaseEndpoint(
- createMockWorkspace({
- ...WORKSPACE,
- databases: [
- createMockWorkspaceDatabase({
- database_id: POSTGRES.id,
- input_schemas: ["public"],
- }),
- ],
- }),
- );
-
- renderWithProviders(
- <Route
- path="*"
- component={() => <WorkspacePage params={{ workspaceId: "1" }} />}
- />,
- {
- withRouter: true,
- },
- );
-}
-
-describe("WorkspacePage", () => {
- it("loads the workspace and lets you add a database", async () => {
- setup();
-
- expect(await screen.findByTestId("workspace-name-input")).toHaveValue(
- "My workspace",
- );
-
- await userEvent.click(screen.getByRole("button", { name: /Add database/ }));
-
- const dialog = await screen.findByRole("dialog");
- await userEvent.click(
- await within(dialog).findByLabelText("Schemas to include"),
- );
- await userEvent.click(
- await screen.findByRole("option", { name: "public" }),
- );
- await userEvent.click(
- within(dialog).getByRole("button", { name: "Add database" }),
- );
-
- await waitFor(() => {
- expect(
- fetchMock.callHistory.called(
- `path:/api/ee/workspace-manager/${WORKSPACE.id}/database`,
- { method: "POST" },
- ),
- ).toBe(true);
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/index.ts
deleted file mode 100644
index d625d77d99a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./WorkspacePage";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx
index 72c87914d5a..6d896b2c0fb 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx
@@ -2,18 +2,16 @@ import { IndexRoute, Route, type RouteComponent } from "react-router";
import { AdminConnectionInfoPage } from "./pages/AdminConnectionInfoPage";
import { WorkspaceIndexPage } from "./pages/WorkspaceIndexPage";
-import { WorkspacePage } from "./pages/WorkspacePage";
export function getDataStudioRoutes() {
return (
<Route path="workspaces">
<IndexRoute component={WorkspaceIndexPage} />
- <Route path=":workspaceId" component={WorkspacePage} />
</Route>
);
}
-export function getAdminConnectionInfoRoutes(IsAdmin: RouteComponent) {
+export function getWorkspaceDatabaseRoutes(IsAdmin: RouteComponent) {
return (
<Route component={IsAdmin}>
<Route path=":databaseId/admin" component={AdminConnectionInfoPage} />
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/selectors.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/selectors.ts
index ef01cf098b7..6efae4c4bd3 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/selectors.ts
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/selectors.ts
@@ -1,14 +1,6 @@
import type { State } from "metabase/redux/store";
-import { getUser, getUserIsAdmin } from "metabase/selectors/user";
+import { getUserIsAdmin } from "metabase/selectors/user";
export function canManageWorkspaces(state: State): boolean {
- if (getUserIsAdmin(state)) {
- return true;
- }
- const user = getUser(state);
- return user?.permissions?.can_manage_workspaces ?? false;
-}
-
-export function canManageWorkspaceInstance(state: State): boolean {
return getUserIsAdmin(state);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/utils.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/utils.ts
deleted file mode 100644
index 21e8268dc3d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/utils.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { hasFeature } from "metabase/common/utils/database";
-import type { Database, DatabaseId } from "metabase-types/api";
-
-export function getDatabasesById(
- databases: Database[],
-): Map<DatabaseId, Database> {
- return new Map(databases.map((database) => [database.id, database]));
-}
-
-export function supportsWorkspaces(database: Database): boolean {
- return (
- hasFeature(database, "workspace") &&
- !database.is_sample &&
- !database.is_audit
- );
-}
diff --git a/frontend/src/metabase-types/api/advanced-config.ts b/frontend/src/metabase-types/api/advanced-config.ts
index 2c0bcfd7e7f..ac4d17fa56c 100644
--- a/frontend/src/metabase-types/api/advanced-config.ts
+++ b/frontend/src/metabase-types/api/advanced-config.ts
@@ -1,4 +1,4 @@
-import type { WorkspaceInstanceDatabase } from "./workspace-instance";
+import type { CurrentWorkspaceDatabase } from "./workspace-instance";
export type AdvancedConfigDatabase = {
name: string;
@@ -8,7 +8,7 @@ export type AdvancedConfigDatabase = {
export type AdvancedConfigWorkspace = {
name: string;
- databases: Record<string, WorkspaceInstanceDatabase>;
+ databases: Record<string, CurrentWorkspaceDatabase>;
};
export type AdvancedConfigContent = {
diff --git a/frontend/src/metabase-types/api/database.ts b/frontend/src/metabase-types/api/database.ts
index aa008bfb56d..d4bdcbde8d4 100644
--- a/frontend/src/metabase-types/api/database.ts
+++ b/frontend/src/metabase-types/api/database.ts
@@ -10,6 +10,7 @@ export type InitialSyncStatus = LongTaskStatus;
export type DatabaseSettings = {
[key: string]: any;
"database-enable-actions"?: boolean;
+ "database-enable-workspaces"?: boolean;
};
export type DatabaseFeature =
diff --git a/frontend/src/metabase-types/api/icon.ts b/frontend/src/metabase-types/api/icon.ts
index 98d74ce0080..80e99ba3751 100644
--- a/frontend/src/metabase-types/api/icon.ts
+++ b/frontend/src/metabase-types/api/icon.ts
@@ -287,6 +287,7 @@ export type IconName =
| "warning_triangle_filled"
| "waterfall"
| "webhook"
+ | "workspace"
| "10k"
| "1m"
| "zap"
diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.ts
index 9a7e35c1371..af0e8cf07cf 100644
--- a/frontend/src/metabase-types/api/index.ts
+++ b/frontend/src/metabase-types/api/index.ts
@@ -73,7 +73,7 @@ export * from "./util";
export * from "./visualization";
export * from "./visualization-settings";
export * from "./visualizer";
-export * from "./workspace";
+export * from "./workspace-manager";
export * from "./workspace-instance";
// ISO8601 timestamp
diff --git a/frontend/src/metabase-types/api/mocks/workspace-instance.ts b/frontend/src/metabase-types/api/mocks/workspace-instance.ts
index f17fb42d9d0..a900d36b0ab 100644
--- a/frontend/src/metabase-types/api/mocks/workspace-instance.ts
+++ b/frontend/src/metabase-types/api/mocks/workspace-instance.ts
@@ -1,12 +1,12 @@
import type {
+ CurrentWorkspace,
+ CurrentWorkspaceDatabase,
TableRemapping,
- WorkspaceInstance,
- WorkspaceInstanceDatabase,
} from "../workspace-instance";
-export function createMockWorkspaceInstanceDatabase(
- opts?: Partial<WorkspaceInstanceDatabase>,
-): WorkspaceInstanceDatabase {
+export function createMockCurrentWorkspaceDatabase(
+ opts?: Partial<CurrentWorkspaceDatabase>,
+): CurrentWorkspaceDatabase {
return {
input_schemas: [],
output: { schema: null, db: null },
@@ -14,15 +14,15 @@ export function createMockWorkspaceInstanceDatabase(
};
}
-export function createMockWorkspaceInstance(
- opts?: Partial<WorkspaceInstance>,
-): WorkspaceInstance {
+export function createMockCurrentWorkspace(
+ opts?: Partial<CurrentWorkspace>,
+): CurrentWorkspace {
return {
name: "Test workspace",
databases: {},
// Default to a non-writable workspace so tests that don't care about
// lock state behave like a deployment-managed instance. Opt into the
- // editable case with createMockWorkspaceInstance({ can_write: true }).
+ // editable case with createMockCurrentWorkspace({ can_write: true }).
can_write: false,
...opts,
};
diff --git a/frontend/src/metabase-types/api/mocks/workspace.ts b/frontend/src/metabase-types/api/mocks/workspace.ts
index fe5a407525b..137e2a1480b 100644
--- a/frontend/src/metabase-types/api/mocks/workspace.ts
+++ b/frontend/src/metabase-types/api/mocks/workspace.ts
@@ -1,4 +1,4 @@
-import type { Workspace, WorkspaceDatabase } from "../workspace";
+import type { Workspace, WorkspaceDatabase } from "../workspace-manager";
export function createMockWorkspaceDatabase(
opts?: Partial<WorkspaceDatabase>,
diff --git a/frontend/src/metabase-types/api/permissions.ts b/frontend/src/metabase-types/api/permissions.ts
index 1be31ee2297..2aa044d4197 100644
--- a/frontend/src/metabase-types/api/permissions.ts
+++ b/frontend/src/metabase-types/api/permissions.ts
@@ -16,7 +16,6 @@ export enum DataPermission {
DATA_MODEL = "data-model",
DETAILS = "details",
TRANSFORMS = "transforms",
- WORKSPACES = "workspaces",
COLLECTIONS = "collections",
}
@@ -87,10 +86,6 @@ export type TransformsPermission =
| DataPermissionValue.NO
| DataPermissionValue.YES;
-export type WorkspacesPermission =
- | DataPermissionValue.NO
- | DataPermissionValue.YES;
-
export type DatabasePermissions = {
[DataPermission.VIEW_DATA]: SchemasPermissions;
[DataPermission.CREATE_QUERIES]?: NativePermissions;
@@ -98,7 +93,6 @@ export type DatabasePermissions = {
[DataPermission.DOWNLOAD]?: DownloadAccessPermission;
[DataPermission.DETAILS]?: DetailsPermissions;
[DataPermission.TRANSFORMS]?: TransformsPermission;
- [DataPermission.WORKSPACES]?: WorkspacesPermission;
};
export type DataModelPermissions = {
diff --git a/frontend/src/metabase-types/api/user.ts b/frontend/src/metabase-types/api/user.ts
index c5be1d4dad5..0d5b2f1f079 100644
--- a/frontend/src/metabase-types/api/user.ts
+++ b/frontend/src/metabase-types/api/user.ts
@@ -61,7 +61,6 @@ export interface UserPermissions {
can_access_data_studio?: boolean;
can_access_transforms?: boolean;
can_access_workspaces?: boolean;
- can_manage_workspaces?: boolean;
}
export interface User extends BaseUser {
diff --git a/frontend/src/metabase-types/api/workspace-instance.ts b/frontend/src/metabase-types/api/workspace-instance.ts
index 4c384ff8976..da6714e279e 100644
--- a/frontend/src/metabase-types/api/workspace-instance.ts
+++ b/frontend/src/metabase-types/api/workspace-instance.ts
@@ -5,19 +5,19 @@ export type TableNamespace = {
schema?: string | null;
};
-export type WorkspaceInstanceDatabase = {
+export type CurrentWorkspaceDatabase = {
input_schemas: string[];
output: TableNamespace;
};
-export type WorkspaceInstance = {
+export type CurrentWorkspace = {
name: string;
- databases: Record<DatabaseId, WorkspaceInstanceDatabase>;
+ databases: Record<DatabaseId, CurrentWorkspaceDatabase>;
can_write: boolean;
};
export type GetCurrentWorkspaceResponse = {
- data: WorkspaceInstance | null;
+ data: CurrentWorkspace | null;
};
export type TableRemappingId = number;
diff --git a/frontend/src/metabase-types/api/workspace.ts b/frontend/src/metabase-types/api/workspace-manager.ts
similarity index 56%
rename from frontend/src/metabase-types/api/workspace.ts
rename to frontend/src/metabase-types/api/workspace-manager.ts
index c1f449e3b59..6e7f9d6bd2d 100644
--- a/frontend/src/metabase-types/api/workspace.ts
+++ b/frontend/src/metabase-types/api/workspace-manager.ts
@@ -1,4 +1,4 @@
-import type { DatabaseId } from "./database";
+import type { Database, DatabaseId } from "./database";
import type { UserId, UserInfo } from "./user";
export type WorkspaceId = number;
@@ -13,40 +13,26 @@ export type WorkspaceDatabase = {
database_id: DatabaseId;
input_schemas: string[];
status: WorkspaceDatabaseStatus;
+
+ database?: Database | null;
};
export type Workspace = {
id: WorkspaceId;
name: string;
- databases: WorkspaceDatabase[];
created_at: string;
creator_id: UserId;
- creator?: UserInfo;
+ creator?: UserInfo | null;
+ databases?: WorkspaceDatabase[];
};
export type CreateWorkspaceRequest = {
name: string;
+ database_ids: DatabaseId[];
};
export type UpdateWorkspaceRequest = {
id: WorkspaceId;
name?: string;
};
-
-export type CreateWorkspaceDatabaseRequest = {
- id: WorkspaceId;
- database_id: DatabaseId;
- input_schemas: string[];
-};
-
-export type UpdateWorkspaceDatabaseRequest = {
- id: WorkspaceId;
- database_id: DatabaseId;
- input_schemas: string[];
-};
-
-export type DeleteWorkspaceDatabaseRequest = {
- id: WorkspaceId;
- database_id: DatabaseId;
-};
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
index 74b4d284077..ebcf56b3514 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
@@ -121,7 +121,7 @@ function DatabaseEditAppInner({
database={database}
/>
- <PLUGIN_WORKSPACES.AdminConnectionInfoSection
+ <PLUGIN_WORKSPACES.WorkspaceDatabaseSection
database={database}
/>
diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx
index 10ee749e6e8..7cf6a171e08 100644
--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx
+++ b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx
@@ -26,10 +26,6 @@ export const DataPermissionsHelp = () => {
(state) => getSetting(state, "token-features").advanced_permissions,
);
- const isWorkspacesFeatureEnabled = useSelector(
- (state) => getSetting(state, "token-features").workspaces,
- );
-
const shouldShowLegacyNoSelfServiceInfo = useSelector((state) =>
hasPermissionValueInGraph(
state.admin.permissions.originalDataPermissions,
@@ -211,13 +207,6 @@ export const DataPermissionsHelp = () => {
)} The group can create, edit, and run Transforms for a given database.`}
</Text>
)}
- {isWorkspacesFeatureEnabled && (
- <Text>
- {jt`${(
- <strong key="permission">{t`Workspaces:`}</strong>
- )} The group can add, edit, and remove the database from Workspaces.`}
- </Text>
- )}
</Stack>
</Accordion.Panel>
</Accordion.Item>
diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/admin/permissions/permissions.ts
index 644ce43c223..90df05384cc 100644
--- a/frontend/src/metabase/admin/permissions/permissions.ts
+++ b/frontend/src/metabase/admin/permissions/permissions.ts
@@ -12,7 +12,6 @@ import {
inferAndUpdateEntityPermissions,
restrictCreateQueriesPermissionsIfNeeded,
revokeTransformsPermissionIfNeeded,
- revokeWorkspacesPermissionIfNeeded,
updateFieldsPermission,
updatePermission,
updateSchemasPermission,
@@ -638,17 +637,6 @@ const dataPermissions = createReducer<GroupsPermissions | null>(
);
}
- if (permissionInfo.type === DataPermissionType.WORKSPACES) {
- return updatePermission(
- state,
- groupId,
- entityId.databaseId,
- DataPermission.WORKSPACES,
- [],
- value,
- );
- }
-
if (
permissionInfo.type === DataPermissionType.NATIVE &&
PLUGIN_DATA_PERMISSIONS.upgradeViewPermissionsIfNeeded
@@ -680,14 +668,6 @@ const dataPermissions = createReducer<GroupsPermissions | null>(
value,
);
- state = revokeWorkspacesPermissionIfNeeded(
- state,
- groupId,
- entityId,
- permissionInfo.permission,
- value,
- );
-
if (isTableEntityId(entityId)) {
const updatedPermissions = updateFieldsPermission(
state,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts
index 6ff38b3ee82..8dc8a749c8a 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts
@@ -201,7 +201,6 @@ export const buildFieldsPermissions = ({
defaultGroup,
database,
showTransformPermissions,
- showWorkspacesPermissions,
}: {
entityId: TableEntityId;
groupId: number;
@@ -211,7 +210,6 @@ export const buildFieldsPermissions = ({
defaultGroup: Group;
database: Database;
showTransformPermissions: boolean;
- showWorkspacesPermissions: boolean;
}): PermissionSectionConfig[] => {
const isAdmin = groupType === "admin";
@@ -249,7 +247,6 @@ export const buildFieldsPermissions = ({
defaultGroup,
permissionSubject: "fields",
showTransformPermissions,
- showWorkspacesPermissions,
}),
]);
};
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
index 2bb8cb30251..4149e878731 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
@@ -213,17 +213,6 @@ export const getShouldShowTransformPermissions = createSelector(
},
);
-export const getShouldShowWorkspacesPermissions = createSelector(
- (state: State) => getPlan(getSetting(state, "token-features")),
- (state: State) => getTokenFeature(state, "workspaces"),
- (plan, workspacesFeatureEnabled) => {
- if (plan === "oss") {
- return false;
- }
- return Boolean(workspacesFeatureEnabled);
- },
-);
-
export const getDatabasesPermissionEditor = createSelector(
getMetadataWithHiddenTables,
getGroupRouteParams,
@@ -233,7 +222,6 @@ export const getDatabasesPermissionEditor = createSelector(
selectGroupList,
getIsLoadingDatabaseTables,
getShouldShowTransformPermissions,
- getShouldShowWorkspacesPermissions,
(
metadata,
params,
@@ -243,7 +231,6 @@ export const getDatabasesPermissionEditor = createSelector(
groups: Group[],
isLoading,
showTransformPermissions,
- showWorkspacesPermissions,
): PermissionEditorType | null => {
const { groupId, databaseId, schemaName } = params;
@@ -299,7 +286,6 @@ export const getDatabasesPermissionEditor = createSelector(
defaultGroup: isExternal ? externalUsersGroup : defaultGroup,
database,
showTransformPermissions,
- showWorkspacesPermissions,
}),
};
});
@@ -324,7 +310,6 @@ export const getDatabasesPermissionEditor = createSelector(
defaultGroup: isExternal ? externalUsersGroup : defaultGroup,
database,
showTransformPermissions,
- showWorkspacesPermissions,
}),
};
});
@@ -358,7 +343,6 @@ export const getDatabasesPermissionEditor = createSelector(
database,
permissionView: "group",
showTransformPermissions,
- showWorkspacesPermissions,
}),
};
});
@@ -376,7 +360,6 @@ export const getDatabasesPermissionEditor = createSelector(
groupType,
isExternal,
showTransformPermissions,
- showWorkspacesPermissions,
})
: []),
]);
@@ -430,7 +413,6 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
getOriginalDataPermissions,
getOrderedGroups,
getShouldShowTransformPermissions,
- getShouldShowWorkspacesPermissions,
(
metadata,
params,
@@ -438,7 +420,6 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
originalPermissions,
groups,
showTransformPermissions,
- showWorkspacesPermissions,
) => {
const { databaseId, schemaName, tableId } = params;
const database = metadata?.database(databaseId);
@@ -490,7 +471,6 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
: defaultGroup,
database,
showTransformPermissions,
- showWorkspacesPermissions,
});
} else if (schemaName != null) {
groupPermissions = buildTablesPermissions({
@@ -507,7 +487,6 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
: defaultGroup,
database,
showTransformPermissions,
- showWorkspacesPermissions,
});
} else if (databaseId != null) {
groupPermissions = buildSchemasPermissions({
@@ -524,7 +503,6 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
database,
permissionView: "database",
showTransformPermissions,
- showWorkspacesPermissions,
});
}
@@ -553,7 +531,6 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
...PLUGIN_FEATURE_LEVEL_PERMISSIONS.getDataColumns({
subject: permissionSubject,
showTransformPermissions,
- showWorkspacesPermissions,
}),
]);
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts
index 6bdacda62fc..236add1e4a4 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts
@@ -202,7 +202,6 @@ export const buildSchemasPermissions = ({
database,
permissionView,
showTransformPermissions,
- showWorkspacesPermissions,
}: {
entityId: DatabaseEntityId;
groupId: number;
@@ -213,7 +212,6 @@ export const buildSchemasPermissions = ({
database: Database;
permissionView: "group" | "database";
showTransformPermissions: boolean;
- showWorkspacesPermissions: boolean;
}): PermissionSectionConfig[] => {
const isAdmin = groupType === "admin";
@@ -254,7 +252,6 @@ export const buildSchemasPermissions = ({
permissionSubject: "schemas",
permissionView,
showTransformPermissions,
- showWorkspacesPermissions,
}),
]);
};
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts
index 385da0075e9..2559e8062cc 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts
@@ -194,7 +194,6 @@ export const buildTablesPermissions = ({
defaultGroup,
database,
showTransformPermissions,
- showWorkspacesPermissions,
}: {
entityId: SchemaEntityId;
groupId: number;
@@ -204,7 +203,6 @@ export const buildTablesPermissions = ({
defaultGroup: Group;
database: Database;
showTransformPermissions: boolean;
- showWorkspacesPermissions: boolean;
}): PermissionSectionConfig[] => {
const isAdmin = groupType === "admin";
@@ -243,7 +241,6 @@ export const buildTablesPermissions = ({
defaultGroup,
permissionSubject: "tables",
showTransformPermissions,
- showWorkspacesPermissions,
}),
]);
};
diff --git a/frontend/src/metabase/admin/permissions/types.ts b/frontend/src/metabase/admin/permissions/types.ts
index 506bc1238d4..53361be27d9 100644
--- a/frontend/src/metabase/admin/permissions/types.ts
+++ b/frontend/src/metabase/admin/permissions/types.ts
@@ -61,7 +61,6 @@ export enum DataPermissionType {
DOWNLOAD = "download",
DATA_MODEL = "data-model",
TRANSFORMS = "transforms",
- WORKSPACES = "workspaces",
COLLECTIONS = "collections",
}
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts
index c1b0dd59190..1300d12064d 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts
@@ -17,7 +17,6 @@ const flatPermissions = new Set([
DataPermission.VIEW_DATA,
DataPermission.CREATE_QUERIES,
DataPermission.TRANSFORMS,
- DataPermission.WORKSPACES,
]);
// util to ease migration of perms attributes into a flatter structure
@@ -43,7 +42,6 @@ const omittedDefaultValues: Record<DataPermission, DataPermissionValue> = {
[DataPermission.DATA_MODEL]: DataPermissionValue.NONE,
[DataPermission.DETAILS]: DataPermissionValue.NO,
[DataPermission.TRANSFORMS]: DataPermissionValue.NO,
- [DataPermission.WORKSPACES]: DataPermissionValue.NO,
[DataPermission.COLLECTIONS]: DataPermissionValue.NONE,
};
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts
index 51a97fdb89e..de7e58cd7d0 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts
@@ -329,60 +329,6 @@ export function revokeTransformsPermissionIfNeeded(
return permissions;
}
-export function revokeWorkspacesPermissionIfNeeded(
- permissions: GroupsPermissions,
- groupId: number,
- entityId: PermissionEntityId,
- permission: DataPermission,
- value: DataPermissionValue,
-): GroupsPermissions {
- if (
- permission !== DataPermission.VIEW_DATA &&
- permission !== DataPermission.CREATE_QUERIES
- ) {
- return permissions;
- }
-
- const { databaseId } = entityId;
-
- const viewDataValue =
- permission === DataPermission.VIEW_DATA
- ? value
- : getSchemasPermission(
- permissions,
- groupId,
- { databaseId },
- DataPermission.VIEW_DATA,
- );
-
- const createQueriesValue =
- permission === DataPermission.CREATE_QUERIES
- ? value
- : getSchemasPermission(
- permissions,
- groupId,
- { databaseId },
- DataPermission.CREATE_QUERIES,
- );
-
- const hasRequiredPermissions =
- hasFullViewDataAccess(viewDataValue) &&
- hasFullCreateQueriesAccess(createQueriesValue);
-
- if (!hasRequiredPermissions) {
- return updatePermission(
- permissions,
- groupId,
- databaseId,
- DataPermission.WORKSPACES,
- [],
- DataPermissionValue.NO,
- );
- }
-
- return permissions;
-}
-
function inferEntityPermissionValueFromChildTables(
permissions: GroupsPermissions,
groupId: number,
diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsx
index a5265ccb3ed..a85a4afea44 100644
--- a/frontend/src/metabase/admin/routes.tsx
+++ b/frontend/src/metabase/admin/routes.tsx
@@ -102,7 +102,7 @@ export const getRoutes = (
</Route>
<Route path=":databaseId/edit" component={DatabasePage} />
{PLUGIN_WRITABLE_CONNECTION.getWritableConnectionInfoRoutes(IsAdmin)}
- {PLUGIN_WORKSPACES.getAdminConnectionInfoRoutes(IsAdmin)}
+ {PLUGIN_WORKSPACES.getWorkspaceDatabaseRoutes(IsAdmin)}
<Route path=":databaseId" component={DatabaseEditApp}>
{PLUGIN_DB_ROUTING.getDestinationDatabaseRoutes(IsAdmin)}
</Route>
diff --git a/frontend/src/metabase/common/utils/database.ts b/frontend/src/metabase/common/utils/database.ts
index 0e674b2027e..9e16fdf12f0 100644
--- a/frontend/src/metabase/common/utils/database.ts
+++ b/frontend/src/metabase/common/utils/database.ts
@@ -23,12 +23,22 @@ export const hasActionsEnabled = (database: Pick<Database, "settings">) => {
return Boolean(database.settings?.["database-enable-actions"]);
};
+export const hasWorkspacesEnabled = (database: Pick<Database, "settings">) => {
+ return Boolean(database.settings?.["database-enable-workspaces"]);
+};
+
export const hasWritableConnectionDetails = (
database: Pick<Database, "write_data_details">,
) => {
return database.write_data_details != null;
};
+export const hasAdminConnectionDetails = (
+ database: Pick<Database, "admin_details">,
+) => {
+ return database.admin_details != null;
+};
+
export const hasDbRoutingEnabled = (
database: Pick<Database, "router_user_attribute">,
) => {
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
index 81256383419..7767e61e054 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -207,7 +207,7 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
{canManageWorkspaces && (
<DataStudioTab
label={t`Workspaces`}
- icon="folder"
+ icon="workspace"
to={Urls.workspaces()}
isSelected={currentTab === "workspaces"}
showLabel={isNavbarOpened}
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
index 23b2ac00b8e..a69a37ecf28 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
@@ -214,22 +214,10 @@ describe("DataStudioLayout", () => {
expect(tab).toHaveAttribute("href", Urls.workspaces());
});
- it("non-admin with manage-workspaces permission sees the tab linking to the workspaces index", async () => {
+ it("non-admin does not see the tab", async () => {
setup({
...DEFAULT_EE_SETTINGS,
isAdmin: false,
- canManageWorkspaces: true,
- });
-
- const tab = await screen.findByLabelText("Workspaces");
- expect(tab).toHaveAttribute("href", Urls.workspaces());
- });
-
- it("non-admin without manage-workspaces permission does not see the tab", async () => {
- setup({
- ...DEFAULT_EE_SETTINGS,
- isAdmin: false,
- canManageWorkspaces: false,
});
expect(await screen.findByTestId("data-studio-nav")).toBeInTheDocument();
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
index 403f3328149..fb6a4e11893 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
@@ -15,9 +15,9 @@ import { renderWithProviders } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
import type {
Collection,
+ CurrentWorkspace,
RemoteSyncEntity,
TokenFeatures,
- WorkspaceInstance,
} from "metabase-types/api";
import {
createMockDirtyCardEntity,
@@ -100,14 +100,12 @@ const setupNavbarEndpoints = (isOpened = true) => {
interface StoreStateOptions {
isAdmin?: boolean;
- canManageWorkspaces?: boolean;
remoteSyncSettings?: Partial<RemoteSyncSettings>;
tokenFeatures?: Partial<TokenFeatures>;
}
const createStoreState = ({
isAdmin = true,
- canManageWorkspaces = false,
remoteSyncSettings = {},
tokenFeatures,
}: StoreStateOptions = {}) => {
@@ -119,7 +117,6 @@ const createStoreState = ({
permissions: {
can_access_data_model: isAdmin,
can_access_db_details: false,
- can_manage_workspaces: canManageWorkspaces,
},
}),
settings: mockSettings({
@@ -133,8 +130,7 @@ interface SetupOpts {
remoteSyncEnabled?: boolean;
remoteSyncBranch?: string | null;
isAdmin?: boolean;
- canManageWorkspaces?: boolean;
- currentWorkspace?: WorkspaceInstance | null;
+ currentWorkspace?: CurrentWorkspace | null;
hasDirtyChanges?: boolean;
hasTransformDirtyChanges?: boolean;
remoteSyncTransforms?: boolean;
@@ -147,7 +143,6 @@ export const setup = ({
remoteSyncEnabled = true,
remoteSyncBranch = null,
isAdmin = true,
- canManageWorkspaces = false,
currentWorkspace = null,
hasDirtyChanges = false,
hasTransformDirtyChanges = false,
@@ -195,7 +190,6 @@ export const setup = ({
const state = createStoreState({
isAdmin,
- canManageWorkspaces,
remoteSyncSettings,
tokenFeatures,
});
diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
index cf51eab3cac..f1691d2f6c0 100644
--- a/frontend/src/metabase/plugins/index.ts
+++ b/frontend/src/metabase/plugins/index.ts
@@ -160,7 +160,7 @@ export {
} from "./oss/writable-connection";
export {
PLUGIN_WORKSPACES,
- type AdminConnectionInfoSectionProps,
+ type WorkspaceDatabaseSectionProps,
} from "./oss/workspaces";
export { PLUGIN_SECURITY_CENTER } from "./oss/security-center";
export { PLUGIN_AI_CONTROLS, type AiControlsPlugin } from "./oss/ai-controls";
diff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.ts
index 30ed65d56c8..44d1909ee5b 100644
--- a/frontend/src/metabase/plugins/oss/permissions.ts
+++ b/frontend/src/metabase/plugins/oss/permissions.ts
@@ -140,7 +140,6 @@ const getDefaultFeatureLevelPermissions = () => ({
permissionSubject: _permissionSubject,
permissionView: _permissionView,
showTransformPermissions: _showTransformPermissions,
- showWorkspacesPermissions: _showWorkspacesPermissions,
}: {
entityId: DatabaseEntityId;
groupId: number;
@@ -151,7 +150,6 @@ const getDefaultFeatureLevelPermissions = () => ({
permissionSubject: PermissionSubject;
permissionView?: "group" | "database";
showTransformPermissions?: boolean;
- showWorkspacesPermissions?: boolean;
}) => {
return [] as any;
},
@@ -160,13 +158,11 @@ const getDefaultFeatureLevelPermissions = () => ({
groupType: _groupType,
isExternal: _isExternal,
showTransformPermissions: _showTransformPermissions,
- showWorkspacesPermissions: _showWorkspacesPermissions,
}: {
subject: PermissionSubject;
groupType?: SpecialGroupType;
isExternal?: boolean;
showTransformPermissions?: boolean;
- showWorkspacesPermissions?: boolean;
}) => [] as any,
getDownloadWidgetMessageOverride: (_result: Dataset): string | null => null,
canDownloadResults: (_result: Dataset): boolean => true,
diff --git a/frontend/src/metabase/plugins/oss/workspaces.ts b/frontend/src/metabase/plugins/oss/workspaces.ts
index c80d518ae0f..6beec4a4058 100644
--- a/frontend/src/metabase/plugins/oss/workspaces.ts
+++ b/frontend/src/metabase/plugins/oss/workspaces.ts
@@ -6,17 +6,15 @@ import type { Database } from "metabase-types/api";
import { PluginPlaceholder } from "../components/PluginPlaceholder";
-export type AdminConnectionInfoSectionProps = {
+export type WorkspaceDatabaseSectionProps = {
database: Database;
};
const getDefaultWorkspaces = () => ({
canManageWorkspaces: (_state: State): boolean => false,
- canManageWorkspaceInstance: (_state: State): boolean => false,
getDataStudioRoutes: (): ReactNode => null,
- getAdminConnectionInfoRoutes: (_IsAdmin: RouteComponent): ReactNode => null,
- AdminConnectionInfoSection:
- PluginPlaceholder<AdminConnectionInfoSectionProps>,
+ getWorkspaceDatabaseRoutes: (_IsAdmin: RouteComponent): ReactNode => null,
+ WorkspaceDatabaseSection: PluginPlaceholder<WorkspaceDatabaseSectionProps>,
});
export const PLUGIN_WORKSPACES = getDefaultWorkspaces();
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index 582ab053e63..dd4d2d0c4c4 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -576,6 +576,8 @@ import waterfall_component from "./waterfall.svg?component";
import waterfall_source from "./waterfall.svg?source";
import webhook_component from "./webhook.svg?component";
import webhook_source from "./webhook.svg?source";
+import workspace_component from "./workspace.svg?component";
+import workspace_source from "./workspace.svg?source";
import zap_component from "./zap.svg?component";
import zap_source from "./zap.svg?source";
import zoom_in_component from "./zoom_in.svg?component";
@@ -1723,6 +1725,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: webhook_component,
source: webhook_source,
},
+ workspace: {
+ component: workspace_component,
+ source: workspace_source,
+ },
"10k": {
component: ten_thousand_component,
source: ten_thousand_source,
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/workspace.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/workspace.svg
new file mode 100644
index 00000000000..550c0030291
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/workspace.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill="currentColor" d="M9.366.717c.275 0 .546.063.792.182l.105.055.021.013 4.2 2.6.05.034c.22.166.447.428.603.744q.02.026.04.054.069.122.085.253.07.23.071.482v4.333c0 .324-.121.642-.268.89-.149.252-.37.511-.656.682l-.007.004-6.867 4-.006.004a1.82 1.82 0 0 1-1.813-.013l-4.2-2.6-.05-.034a2.1 2.1 0 0 1-.552-.664c-.128-.235-.248-.548-.248-.869v-4.4q0-.245.073-.482a.7.7 0 0 1 .095-.27q.02-.03.042-.056c.169-.312.43-.572.748-.718L8.464.958 8.47.954c.274-.155.582-.237.896-.237M2 10.867a.3.3 0 0 0 .016.07 1 1 0 0 0 .069.16.9.9 0 0 0 .173.228L6 13.641V9.703L2 7.222zm5.334-1.15v3.9l1.332-.777V8.944zM10 8.17v3.892l1.333-.777V7.397zm2.667-1.547v3.886l1.063-.62a.7.7 0 0 0 .187-.212.8.8 0 0 0 .068-.147c.013-.04.015-.062.015-.064V5.852zm-3.3-4.573a.5.5 0 0 0-.238.062h-.001l-6.62 3.856 4.17 2.587 6.885-3.993L9.599 2.11a.5.5 0 0 0-.233-.06"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/frontend/src/metabase/urls/workspaces.ts b/frontend/src/metabase/urls/workspaces.ts
index 9f174352aaf..42e2762ce9e 100644
--- a/frontend/src/metabase/urls/workspaces.ts
+++ b/frontend/src/metabase/urls/workspaces.ts
@@ -1,11 +1,5 @@
-import type { WorkspaceId } from "metabase-types/api";
-
const WORKSPACES_ROOT_URL = `/data-studio/workspaces`;
export function workspaces() {
return WORKSPACES_ROOT_URL;
}
-
-export function workspace(id: WorkspaceId) {
- return `${WORKSPACES_ROOT_URL}/${id}`;
-}
diff --git a/frontend/test/__support__/server-mocks/workspace-instance.ts b/frontend/test/__support__/server-mocks/workspace-instance.ts
index 3b80e065087..69a00dae6da 100644
--- a/frontend/test/__support__/server-mocks/workspace-instance.ts
+++ b/frontend/test/__support__/server-mocks/workspace-instance.ts
@@ -1,16 +1,16 @@
import fetchMock from "fetch-mock";
-import type { TableRemapping, WorkspaceInstance } from "metabase-types/api";
+import type { CurrentWorkspace, TableRemapping } from "metabase-types/api";
const BASE_URL = "path:/api/ee/workspace-instance";
export function setupGetCurrentWorkspaceEndpoint(
- workspace: WorkspaceInstance | null,
+ workspace: CurrentWorkspace | null,
) {
fetchMock.get(`${BASE_URL}/current`, { data: workspace });
}
-export function setupDeleteWorkspaceInstanceEndpoint() {
+export function setupDeleteCurrentWorkspaceEndpoint() {
fetchMock.delete(`${BASE_URL}/current`, 204);
}
diff --git a/frontend/test/__support__/server-mocks/workspace-manager.ts b/frontend/test/__support__/server-mocks/workspace-manager.ts
index ffeda820af6..f1b4bdc631f 100644
--- a/frontend/test/__support__/server-mocks/workspace-manager.ts
+++ b/frontend/test/__support__/server-mocks/workspace-manager.ts
@@ -1,6 +1,6 @@
import fetchMock from "fetch-mock";
-import type { DatabaseId, Workspace, WorkspaceId } from "metabase-types/api";
+import type { Workspace, WorkspaceId } from "metabase-types/api";
const BASE_URL = "path:/api/ee/workspace-manager";
@@ -8,10 +8,6 @@ export function setupListWorkspacesEndpoint(workspaces: Workspace[]) {
fetchMock.get(BASE_URL, workspaces);
}
-export function setupGetWorkspaceEndpoint(workspace: Workspace) {
- fetchMock.get(`${BASE_URL}/${workspace.id}`, workspace);
-}
-
export function setupCreateWorkspaceEndpoint(workspace: Workspace) {
fetchMock.post(BASE_URL, workspace);
}
@@ -30,36 +26,3 @@ export function setupDeleteWorkspaceEndpoint(workspaceId: WorkspaceId) {
export function setupDeleteWorkspaceEndpointError(workspaceId: WorkspaceId) {
fetchMock.delete(`${BASE_URL}/${workspaceId}`, { status: 500 });
}
-
-export function setupCreateWorkspaceDatabaseEndpoint(workspace: Workspace) {
- fetchMock.post(`${BASE_URL}/${workspace.id}/database`, workspace);
-}
-
-export function setupUpdateWorkspaceDatabaseEndpoint(
- workspace: Workspace,
- databaseId: DatabaseId,
-) {
- fetchMock.put(
- `${BASE_URL}/${workspace.id}/database/${databaseId}`,
- workspace,
- );
-}
-
-export function setupDeleteWorkspaceDatabaseEndpoint(
- workspace: Workspace,
- databaseId: DatabaseId,
-) {
- fetchMock.delete(
- `${BASE_URL}/${workspace.id}/database/${databaseId}`,
- workspace,
- );
-}
-
-export function setupDeleteWorkspaceDatabaseEndpointError(
- workspaceId: WorkspaceId,
- databaseId: DatabaseId,
-) {
- fetchMock.delete(`${BASE_URL}/${workspaceId}/database/${databaseId}`, {
- status: 500,
- });
-}
diff --git a/resources/migrations/063/20260610_remove_workspaces_permission.yaml b/resources/migrations/063/20260610_remove_workspaces_permission.yaml
new file mode 100644
index 00000000000..32b5f35819f
--- /dev/null
+++ b/resources/migrations/063/20260610_remove_workspaces_permission.yaml
@@ -0,0 +1,14 @@
+## The perms/workspaces data permission was removed; workspace management is now superuser-only.
+## Delete any rows for it left in data_permissions.
+
+databaseChangeLog:
+
+ - changeSet:
+ id: v63.2026-06-10T00:00:00
+ author: ranquild
+ comment: Remove perms/workspaces rows from data_permissions
+ changes:
+ - sql:
+ sql: >-
+ DELETE FROM data_permissions WHERE perm_type = 'perms/workspaces'
+ rollback: # nothing to do; the permission type no longer exists
diff --git a/src/metabase/permissions/core.clj b/src/metabase/permissions/core.clj
index ed98bc2314f..1b770465944 100644
--- a/src/metabase/permissions/core.clj
+++ b/src/metabase/permissions/core.clj
@@ -67,8 +67,6 @@
with-relevant-permissions-for-user
has-any-transforms-permission?
has-db-transforms-permission?
- has-any-workspaces-permission?
- has-db-workspaces-permission?
set-default-group-permissions!
set-default-database-permissions!
set-default-table-permissions!
diff --git a/src/metabase/permissions/models/data_permissions.clj b/src/metabase/permissions/models/data_permissions.clj
index ad4e9391eb6..d709537c54a 100644
--- a/src/metabase/permissions/models/data_permissions.clj
+++ b/src/metabase/permissions/models/data_permissions.clj
@@ -712,12 +712,10 @@
(build-database-permission perms group-or-id db-or-id :perms/download-results :no)])
(and (= perm-type :perms/view-data) (not= value :unrestricted))
- (into [(build-database-permission perms group-or-id db-or-id :perms/transforms :no)
- (build-database-permission perms group-or-id db-or-id :perms/workspaces :no)])
+ (conj (build-database-permission perms group-or-id db-or-id :perms/transforms :no))
(and (= perm-type :perms/create-queries) (not= value :query-builder-and-native))
- (into [(build-database-permission perms group-or-id db-or-id :perms/transforms :no)
- (build-database-permission perms group-or-id db-or-id :perms/workspaces :no)]))]
+ (conj (build-database-permission perms group-or-id db-or-id :perms/transforms :no)))]
(apply merge-with concat
{:to-delete existing-perms
:to-insert [new-perm]}
@@ -1043,8 +1041,7 @@
:perms/manage-database :no}
(or (not= view-data-level :unrestricted)
(not= cq-level :query-builder-and-native))
- (assoc :perms/transforms :no
- :perms/workspaces :no))]
+ (assoc :perms/transforms :no))]
[perm-type perm-value] perm-map]
{:perm_type perm-type
:group_id group-id
@@ -1095,8 +1092,7 @@
:perms/download-results :one-million-rows
:perms/manage-table-metadata :no
:perms/manage-database :no
- :perms/transforms :no
- :perms/workspaces :no}
+ :perms/transforms :no}
;; Normal: compute based on group's lowest existing perm level
:else
@@ -1119,8 +1115,7 @@
:perms/manage-database :no}
(or (not= view-data-level :unrestricted)
(not= cq-level :query-builder-and-native))
- (assoc :perms/transforms :no
- :perms/workspaces :no))))]
+ (assoc :perms/transforms :no))))]
(for [[perm-type perm-value] perm-map]
{:perm_type perm-type
:group_id group-id
@@ -1255,17 +1250,3 @@
"Returns true if the current user has the transforms permission for _any_ source db."
[user-id]
(user-has-any-perms-of-type? user-id :perms/transforms))
-
-(defn has-db-workspaces-permission?
- "Returns true if the given user has the workspaces permission for the given database."
- [user-id database-id]
- (and (not= database-id audit/audit-db-id)
- (user-has-permission-for-database? user-id
- :perms/workspaces
- :yes
- database-id)))
-
-(defn has-any-workspaces-permission?
- "Returns true if the given user has the workspaces permission for _any_ source db."
- [user-id]
- (user-has-any-perms-of-type? user-id :perms/workspaces))
diff --git a/src/metabase/permissions/schema.clj b/src/metabase/permissions/schema.clj
index 0afb7685e26..4cf7280d201 100644
--- a/src/metabase/permissions/schema.clj
+++ b/src/metabase/permissions/schema.clj
@@ -21,8 +21,7 @@
:perms/download-results {:model :model/Table, :values [:one-million-rows :ten-thousand-rows :no]}
:perms/manage-table-metadata {:model :model/Table, :values [:yes :no]}
:perms/manage-database {:model :model/Database, :values [:yes :no]}
- :perms/transforms {:model :model/Database, :values [:yes :no]}
- :perms/workspaces {:model :model/Database, :values [:yes :no]}})
+ :perms/transforms {:model :model/Database, :values [:yes :no]}})
(mr/def ::data-permission-type
"Malli spec for valid permission types."
diff --git a/src/metabase/permissions_rest/data_permissions/graph.clj b/src/metabase/permissions_rest/data_permissions/graph.clj
index 462b4244b68..46b6108af41 100644
--- a/src/metabase/permissions_rest/data_permissions/graph.clj
+++ b/src/metabase/permissions_rest/data_permissions/graph.clj
@@ -27,8 +27,7 @@
:perms/download-results :download
:perms/manage-table-metadata :data-model
:perms/manage-database :details
- :perms/transforms :transforms
- :perms/workspaces :workspaces})
+ :perms/transforms :transforms})
(def ^:private ->api-vals
{:perms/view-data {:unrestricted :unrestricted
@@ -42,8 +41,7 @@
:no nil}
:perms/manage-table-metadata {:yes :all :no nil}
:perms/manage-database {:yes :yes :no :no}
- :perms/transforms {:yes :yes :no :no}
- :perms/workspaces {:yes :yes :no :no}})
+ :perms/transforms {:yes :yes :no :no}})
(defenterprise add-impersonations-to-permissions-graph
"Augment the permissions graph with active connection impersonation policies. OSS implementation returns graph as-is."
@@ -123,8 +121,7 @@
:download {:schemas :full}
:data-model {:schemas :all}
:details :yes
- :transforms :yes
- :workspaces :yes})
+ :transforms :yes})
(def ^:private data-analyst-perms
"Data Analysts have implicit manage-table-metadata permission for all databases."
@@ -315,8 +312,7 @@
:data-model {:all :yes
:none :no}
:details {:yes :yes :no :no}
- :transforms {:yes :yes :no :no}
- :workspaces {:yes :yes :no :no}})
+ :transforms {:yes :yes :no :no}})
(def ^:private api-key->perm-type
{:view-data :perms/view-data
@@ -324,8 +320,7 @@
:download :perms/download-results
:data-model :perms/manage-table-metadata
:details :perms/manage-database
- :transforms :perms/transforms
- :workspaces :perms/workspaces})
+ :transforms :perms/transforms})
(defn- resolve-api-value
"Translates an API permission value for a single [group-id db-id api-key] into a map of
@@ -366,16 +361,12 @@
#(merge % {nil {:perm_value :no :schema_name nil}})))
(and (= perm-type :perms/view-data) (not= db-value :unrestricted))
- (-> (update [group-id db-id :perms/transforms]
- #(merge % {nil {:perm_value :no :schema_name nil}}))
- (update [group-id db-id :perms/workspaces]
- #(merge % {nil {:perm_value :no :schema_name nil}})))
+ (update [group-id db-id :perms/transforms]
+ #(merge % {nil {:perm_value :no :schema_name nil}}))
(and (= perm-type :perms/create-queries) (not= db-value :query-builder-and-native))
- (-> (update [group-id db-id :perms/transforms]
- #(merge % {nil {:perm_value :no :schema_name nil}}))
- (update [group-id db-id :perms/workspaces]
- #(merge % {nil {:perm_value :no :schema_name nil}})))))
+ (update [group-id db-id :perms/transforms]
+ #(merge % {nil {:perm_value :no :schema_name nil}}))))
(defn- add-implications:table-level
[desired group-id db-id perm-type table-entries]
@@ -431,7 +422,7 @@
{}
(for [[group-id group-changes] graph
[db-id db-changes] group-changes
- api-key [:details :data-model :download :transforms :workspaces :create-queries :view-data]
+ api-key [:details :data-model :download :transforms :create-queries :view-data]
:let [api-value (get db-changes api-key)]
:when api-value]
[group-id db-id api-key api-value])))
diff --git a/src/metabase/permissions_rest/schema.clj b/src/metabase/permissions_rest/schema.clj
index 40c3180b6b5..6c826d2af3b 100644
--- a/src/metabase/permissions_rest/schema.clj
+++ b/src/metabase/permissions_rest/schema.clj
@@ -97,8 +97,7 @@
[:download {:optional true} [:ref ::strict-data-perms]]
[:data-model {:optional true} [:ref ::strict-data-perms]]
[:details {:optional true} [:enum :yes :no]]
- [:transforms {:optional true} [:enum :yes :no]]
- [:workspaces {:optional true} [:enum :yes :no]]]
+ [:transforms {:optional true} [:enum :yes :no]]]
[:fn {:error/fn (fn [_ _] (trs "Invalid DB permissions: If you have write access for native queries, you must have data access to all schemas."))}
(fn [db-entry]
(let [{:keys [create-queries view-data]} db-entry]
diff --git a/test/metabase/permissions/models/data_permissions_test.clj b/test/metabase/permissions/models/data_permissions_test.clj
index 0997603c519..20529e5a6fa 100644
--- a/test/metabase/permissions/models/data_permissions_test.clj
+++ b/test/metabase/permissions/models/data_permissions_test.clj
@@ -382,7 +382,6 @@
{table-id-3 :one-million-rows}}
:perms/manage-database :yes
:perms/transforms :no
- :perms/workspaces :no
:perms/create-queries :no}}}
(data-perms.graph/data-permissions-graph :group-id group-id-1)))
(is (= {group-id-1
diff --git a/test/metabase/permissions/models/permissions_group_test.clj b/test/metabase/permissions/models/permissions_group_test.clj
index 5d67d8b291c..37c33f3c3d7 100644
--- a/test/metabase/permissions/models/permissions_group_test.clj
+++ b/test/metabase/permissions/models/permissions_group_test.clj
@@ -169,8 +169,7 @@
:perms/download-results :no
:perms/manage-table-metadata :no
:perms/manage-database :no
- :perms/transforms :no
- :perms/workspaces :no}}}
+ :perms/transforms :no}}}
(data-perms.graph/data-permissions-graph :group-id group-id :db-id db-id)))))))))
(deftest hydrate-members-tests
diff --git a/test/metabase/permissions_rest/data_permissions/graph_test.clj b/test/metabase/permissions_rest/data_permissions/graph_test.clj
index 269a7a8f0dd..bfc40261961 100644
--- a/test/metabase/permissions_rest/data_permissions/graph_test.clj
+++ b/test/metabase/permissions_rest/data_permissions/graph_test.clj
@@ -52,7 +52,6 @@
{:perms/view-data :blocked
:perms/create-queries :no
:perms/transforms :no
- :perms/workspaces :no
:perms/download-results :no}}})))))
(deftest update-db-level-create-queries-permissions!-test
@@ -83,8 +82,7 @@
{database-id-1
{:perms/create-queries :query-builder
:perms/view-data :unrestricted
- :perms/transforms :no
- :perms/workspaces :no}}}
+ :perms/transforms :no}}}
{group-id-1
{database-id-1
@@ -92,8 +90,7 @@
{group-id-1
{database-id-1
{:perms/create-queries :no
- :perms/transforms :no
- :perms/workspaces :no}}}
+ :perms/transforms :no}}}
{group-id-1
{database-id-1
@@ -155,7 +152,6 @@
{database-id-1
{:perms/create-queries :no
:perms/transforms :no
- :perms/workspaces :no
:perms/view-data {"PUBLIC"
{table-id-1 :unrestricted
table-id-2 :legacy-no-self-service}
@@ -163,9 +159,6 @@
{table-id-3 :unrestricted}}}}}
;; Restoring full data access and native query permissions
- ;; Note: :perms/workspaces persists from the previous step (which forced it to :no when
- ;; create-queries was :no). It would be cleared explicitly by a graph entry setting
- ;; :workspaces :yes; we just exercise the cascade-clearance for transforms here.
{group-id-1
{database-id-1
{:create-queries :query-builder-and-native
@@ -175,8 +168,7 @@
{database-id-1
{:perms/create-queries :query-builder-and-native
:perms/view-data :unrestricted
- :perms/transforms :yes
- :perms/workspaces :no}}}
+ :perms/transforms :yes}}}
;; Setting data access permissions at the schema-level
{group-id-1
@@ -188,7 +180,6 @@
{database-id-1
{:perms/create-queries :no
:perms/transforms :no
- :perms/workspaces :no
:perms/view-data {"PUBLIC"
{table-id-1 :unrestricted
table-id-2 :unrestricted}
@@ -204,7 +195,6 @@
{:perms/create-queries :no
:perms/view-data :blocked
:perms/transforms :no
- :perms/workspaces :no
:perms/download-results :no}}})))))
(deftest update-db-level-download-permissions!-test