Skip to content

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

Use sentence case for people tab pages in admin settings (#67048)

Phoomparin Mano650c2c232d85
diff --git a/e2e/test/scenarios/admin-2/tenants.cy.spec.ts b/e2e/test/scenarios/admin-2/tenants.cy.spec.ts
index d9f892224b0..8a7a8a5d202 100644
--- a/e2e/test/scenarios/admin-2/tenants.cy.spec.ts
+++ b/e2e/test/scenarios/admin-2/tenants.cy.spec.ts
@@ -287,9 +287,7 @@ describe("Tenants - management", () => {
});
cy.findByRole("navigation", { name: "people-nav" })
- .findAllByRole("link", { name: /Groups/ })
- .should("have.length", 2)
- .first()
+ .findByRole("link", { name: /Internal groups/ })
.click();
cy.findByTestId("admin-content-table").within(() => {
@@ -300,7 +298,7 @@ describe("Tenants - management", () => {
});
cy.findByRole("navigation", { name: "people-nav" })
- .findAllByRole("link", { name: /Tenant Groups/ })
+ .findAllByRole("link", { name: /Tenant groups/ })
.click();
cy.findByTestId("admin-content-table").within(() => {
@@ -768,14 +766,14 @@ describe("tenant users", () => {
H.popover().findByText("Edit user").click();
H.modal().within(() => {
- cy.findByText("Tenant Groups");
+ cy.findByText("Tenant groups");
cy.findByText("All tenant users").click();
});
H.popover().findByText(GROUP_NAME).click();
H.modal().within(() => {
- cy.findByText("Tenant Groups").click(); // trigger blur
+ cy.findByText("Tenant groups").click(); // trigger blur
cy.findByText("2 other groups").should("be.visible");
cy.button("Update").click();
});
@@ -802,7 +800,7 @@ describe("tenant users", () => {
H.popover().findByText(GROUP_NAME).click();
H.modal().within(() => {
- cy.findByText("Tenant Groups").click(); // trigger blur
+ cy.findByText("Tenant groups").click(); // trigger blur
cy.findByText("2 other groups").should("be.visible");
cy.button("Create").click();
});
@@ -917,11 +915,11 @@ const createTenantGroupFromUI = (groupName: string) => {
// FIXME shouldn't be necessary - caused by slow route guard
cy.findByTestId("admin-layout-sidebar")
- .findByText(/Tenant Groups/)
+ .findByText(/Tenant groups/)
.click();
cy.findByTestId("admin-layout-content")
- .findByRole("heading", { name: /Tenant Groups/ })
+ .findByRole("heading", { name: /Tenant groups/ })
.should("be.visible");
cy.button("Create a group").click();
diff --git a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
index 41a67f11b45..6ee2c67d5bd 100644
--- a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
+++ b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
@@ -281,7 +281,7 @@ describe("scenarios - embedding hub", () => {
cy.log("the internal prefix should show up on the page");
H.main()
- .findAllByText("Internal Users")
+ .findAllByText("Internal users")
.should("have.length", 2)
.should("be.visible");
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalGroupDetailApp/ExternalGroupDetailApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalGroupDetailApp/ExternalGroupDetailApp.tsx
index 5cfd472aebe..b5a915f4495 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalGroupDetailApp/ExternalGroupDetailApp.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalGroupDetailApp/ExternalGroupDetailApp.tsx
@@ -5,5 +5,5 @@ import { GroupDetailApp } from "metabase/admin/people/containers/GroupDetailApp"
export const ExternalGroupDetailApp = (props: {
params: { groupId: number };
}) => {
- return <GroupDetailApp title={t`Tenant Groups`} {...props} />;
+ return <GroupDetailApp title={t`Tenant groups`} {...props} />;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
index 997fae998d6..514c2530058 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
@@ -241,7 +241,7 @@ export function initializePlugin() {
};
PLUGIN_TENANTS.getFormGroupsTitle = (isExternal: boolean) => {
- return isExternal ? t`Tenant Groups` : null;
+ return isExternal ? t`Tenant groups` : null;
};
// Category 2: Collection namespace utilities
diff --git a/frontend/src/metabase/admin/people/components/PeopleNav.tsx b/frontend/src/metabase/admin/people/components/PeopleNav.tsx
index 0c198643e74..637c7416904 100644
--- a/frontend/src/metabase/admin/people/components/PeopleNav.tsx
+++ b/frontend/src/metabase/admin/people/components/PeopleNav.tsx
@@ -22,13 +22,13 @@ export function PeopleNav() {
<PeopleNavItem
path="/admin/people"
data-testid="nav-item"
- label={isUsingTenants ? t`Internal Users` : t`People`}
+ label={isUsingTenants ? t`Internal users` : t`People`}
icon="person"
/>
<PeopleNavItem
path="/admin/people/groups"
data-testid="nav-item"
- label={isUsingTenants ? t`Internal Groups` : t`Groups`}
+ label={isUsingTenants ? t`Internal groups` : t`Groups`}
icon="group"
/>
{isUsingTenants && (
@@ -43,7 +43,7 @@ export function PeopleNav() {
<PeopleNavItem
path="/admin/tenants/groups"
data-testid="nav-item-tenant-groups"
- label={t`Tenant Groups`}
+ label={t`Tenant groups`}
icon="group"
/>
<PeopleNavItem
diff --git a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
index 5c4c96e1e02..36e8385f6c8 100644
--- a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
@@ -64,8 +64,8 @@ describe("AdminPeopleApp", () => {
it("should render both internal and external people links if tenants is enabled", async () => {
await setup({ useTenants: true });
- assertNavLink("Internal Users", "/admin/people");
- assertNavLink("Internal Groups", "/admin/people/groups");
+ assertNavLink("Internal users", "/admin/people");
+ assertNavLink("Internal groups", "/admin/people/groups");
assertNavLink("Tenants", "/admin/tenants");
assertNavLink("Tenant users", "/admin/tenants/people");
});
diff --git a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx
index d7b6d72fffd..0bbd0cfa1a5 100644
--- a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx
@@ -72,7 +72,7 @@ export const GroupsListingApp = ({
return t`Groups`;
}
- return external ? t`Tenant Groups` : t`Internal Groups`;
+ return external ? t`Tenant groups` : t`Internal groups`;
}, [external, isUsingTenants]);
return (
diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
index f7c859dc09c..7a0e9501f06 100644
--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
@@ -93,7 +93,7 @@ export function PeopleListingApp({
return t`People`;
}
- return external ? t`Tenant users` : t`Internal Users`;
+ return external ? t`Tenant users` : t`Internal users`;
}, [external, isUsingTenants]);
return (
diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx
index ccc54ff59c0..63cd69d7c33 100644
--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx
@@ -85,11 +85,11 @@ describe("page title", () => {
).toBeInTheDocument();
});
- it("should show 'Internal Users' when tenants is enabled and viewing internal users", async () => {
+ it("should show 'Internal users' when tenants is enabled and viewing internal users", async () => {
setup({ useTenants: true, external: false });
expect(
- await screen.findByRole("heading", { name: "Internal Users", level: 1 }),
+ await screen.findByRole("heading", { name: "Internal users", level: 1 }),
).toBeInTheDocument();
});