Skip to content

Rename Access & IAM to Access #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-crespo merged 1 commit into from
Apr 25, 2024
Merged

Rename Access & IAM to Access #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/layouts/ProjectLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function ProjectLayout({ overrideContentPane }: ProjectLayoutProps) {
{ value: 'Images', path: pb.projectImages(projectSelector) },
{ value: 'VPCs', path: pb.vpcs(projectSelector) },
{ value: 'Floating IPs', path: pb.floatingIps(projectSelector) },
{ value: 'Access & IAM', path: pb.projectAccess(projectSelector) },
{ value: 'Access', path: pb.projectAccess(projectSelector) },
]
// filter out the entry for the path we're currently on
.filter((i) => i.path !== pathname)
Expand Down Expand Up @@ -115,7 +115,7 @@ export function ProjectLayout({ overrideContentPane }: ProjectLayoutProps) {
<IpGlobal16Icon /> Floating IPs
</NavLinkItem>
<NavLinkItem to={pb.projectAccess(projectSelector)}>
<Access16Icon title="Access & IAM" /> Access &amp; IAM
<Access16Icon title="Access" /> Access &amp; IAM
</NavLinkItem>
</Sidebar.Nav>
</Sidebar>
Expand Down
4 changes: 2 additions & 2 deletions app/layouts/SiloLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function SiloLayout() {
{ value: 'Projects', path: pb.projects() },
{ value: 'Images', path: pb.siloImages() },
{ value: 'Utilization', path: pb.siloUtilization() },
{ value: 'Access & IAM', path: pb.siloAccess() },
{ value: 'Access', path: pb.siloAccess() },
]
// filter out the entry for the path we're currently on
.filter((i) => i.path !== pathname)
Expand Down Expand Up @@ -72,7 +72,7 @@ export function SiloLayout() {
<Metrics16Icon /> Utilization
</NavLinkItem>
<NavLinkItem to={pb.siloAccess()}>
<Access16Icon /> Access & IAM
<Access16Icon /> Access
</NavLinkItem>
</Sidebar.Nav>
</Sidebar>
Expand Down
4 changes: 2 additions & 2 deletions app/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export const routes = createRoutesFromElements(
path="access"
element={<SiloAccessPage />}
loader={SiloAccessPage.loader}
handle={{ crumb: 'Access & IAM' }}
handle={{ crumb: 'Access' }}
/>
</Route>

Expand Down Expand Up @@ -413,7 +413,7 @@ export const routes = createRoutesFromElements(
path="access"
element={<ProjectAccessPage />}
loader={ProjectAccessPage.loader}
handle={{ crumb: 'Access & IAM' }}
handle={{ crumb: 'Access' }}
/>
</Route>
</Route>
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/project-access.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import { expect, expectNotVisible, expectRowVisible, expectVisible, test } from

test('Click through project access page', async ({ page }) => {
await page.goto('/projects/mock-project')
await page.click('role=link[name*="Access & IAM"]')
await page.click('role=link[name*="Access"]')

// page is there, we see user 1 and 3 but not 2 or 4
await expectVisible(page, ['role=heading[name*="Access & IAM"]'])
await expectVisible(page, ['role=heading[name*="Access"]'])
const table = page.locator('table')
await expectRowVisible(table, {
Name: 'Hannah Arendt',
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/silo-access.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ test('Click through silo access page', async ({ page }) => {
const table = page.locator('role=table')

// page is there, we see user 1 and 2 but not 3
await page.click('role=link[name*="Access & IAM"]')
await page.click('role=link[name*="Access"]')

await expectVisible(page, ['role=heading[name*="Access & IAM"]'])
await expectVisible(page, ['role=heading[name*="Access"]'])
await expectRowVisible(table, {
Name: 'real-estate-devs',
Type: 'Group',
Expand Down