Skip to content

Commit c14442c

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Merge branch 'main' of https://github.com/coder/coder into bq/add-base-actions
2 parents 766463d + d9ef6ed commit c14442c

File tree

22 files changed

+385
-505
lines changed

22 files changed

+385
-505
lines changed

‎site/e2e/tests/groups/removeMember.spec.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ test("remove member", async ({ page, baseURL }) => {
3333
await expect(page).toHaveTitle(`${group.display_name} - Coder`);
3434

3535
const userRow = page.getByRole("row", { name: member.username });
36-
await userRow.getByRole("button", { name: "More options" }).click();
37-
38-
const menu = page.locator("#more-options");
36+
await userRow.getByRole("button", { name: "Open menu" }).click();
37+
const menu = page.getByRole("menu");
3938
await menu.getByText("Remove").click({ timeout: 1_000 });
4039

4140
await expect(page.getByText("Member removed successfully.")).toBeVisible();

‎site/e2e/tests/organizationGroups.spec.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ test("create group", async ({ page }) => {
7979
await expect(page.getByText("No users found")).toBeVisible();
8080

8181
// Remove someone from the group
82-
await addedRow.getByLabel("More options").click();
83-
await page.getByText("Remove").click();
82+
await addedRow.getByRole("button", { name: "Open menu" }).click();
83+
const menu = page.getByRole("menu");
84+
await menu.getByText("Remove").click();
85+
8486
await expect(addedRow).not.toBeVisible();
8587

8688
// Delete the group

‎site/e2e/tests/organizationMembers.spec.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ test("add and remove organization member", async ({ page }) => {
3939
await expect(addedRow.getByText("+1 more")).toBeVisible();
4040

4141
// Remove them from the org
42-
await addedRow.getByLabel("More options").click();
43-
await page.getByText("Remove").click(); // Click the "Remove" option
42+
await addedRow.getByRole("button", { name: "Open menu" }).click();
43+
const menu = page.getByRole("menu");
44+
await menu.getByText("Remove").click();
4445
await page.getByRole("button", { name: "Remove" }).click(); // Click "Remove" in the confirmation dialog
4546
await expect(addedRow).not.toBeVisible();
4647
});

‎site/e2e/tests/organizations/customRoles/customRoles.spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ test.describe("CustomRolesPage", () => {
3737
await expect(roleRow.getByText(customRole.display_name)).toBeVisible();
3838
await expect(roleRow.getByText("organization_member")).toBeVisible();
3939

40-
await roleRow.getByRole("button", { name: "More options" }).click();
41-
const menu = page.locator("#more-options");
40+
await roleRow.getByRole("button", { name: "Open menu" }).click();
41+
const menu = page.getByRole("menu");
4242
await menu.getByText("Edit").click();
4343

4444
await expect(page).toHaveURL(
@@ -118,7 +118,7 @@ test.describe("CustomRolesPage", () => {
118118

119119
// Verify that the more menu (three dots) is not present for built-in roles
120120
await expect(
121-
roleRow.getByRole("button", { name: "More options" }),
121+
roleRow.getByRole("button", { name: "Open menu" }),
122122
).not.toBeVisible();
123123

124124
await deleteOrganization(org.name);
@@ -175,9 +175,9 @@ test.describe("CustomRolesPage", () => {
175175
await page.goto(`/organizations/${org.name}/roles`);
176176

177177
const roleRow = page.getByTestId(`role-${customRole.name}`);
178-
await roleRow.getByRole("button", { name: "More options" }).click();
178+
await roleRow.getByRole("button", { name: "Open menu" }).click();
179179

180-
const menu = page.locator("#more-options");
180+
const menu = page.getByRole("menu");
181181
await menu.getByText("Delete…").click();
182182

183183
const input = page.getByRole("textbox");

‎site/e2e/tests/updateTemplate.spec.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ test("add and remove a group", async ({ page }) => {
5353
await expect(row).toBeVisible();
5454

5555
// Now remove the group
56-
await row.getByLabel("More options").click();
57-
await page.getByText("Remove").click();
56+
await row.getByRole("button", { name: "Open menu" }).click();
57+
const menu = page.getByRole("menu");
58+
await menu.getByText("Remove").click();
59+
5860
await expect(page.getByText("Group removed successfully!")).toBeVisible();
5961
await expect(row).not.toBeVisible();
6062
});

‎site/e2e/tests/users/removeUser.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ test("remove user", async ({ page, baseURL }) => {
1717
await expect(page).toHaveTitle("Users - Coder");
1818

1919
const userRow = page.getByRole("row", { name: user.email });
20-
await userRow.getByRole("button", { name: "More options" }).click();
21-
const menu = page.locator("#more-options");
22-
await menu.getByText("Delete").click();
20+
await userRow.getByRole("button", { name: "Open menu" }).click();
21+
const menu = page.getByRole("menu");
22+
await menu.getByText("Delete…").click();
2323

2424
const dialog = page.getByTestId("dialog");
2525
await dialog.getByLabel("Name of the user to delete").fill(user.username);

‎site/src/components/DropdownMenu/DropdownMenu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export const DropdownMenuSeparator = forwardRef<
196196
>(({ className, ...props }, ref) => (
197197
<DropdownMenuPrimitive.Separator
198198
ref={ref}
199-
className={cn(["-mx-1 my-3 h-px bg-border"], className)}
199+
className={cn(["-mx-1 my-2 h-px bg-border"], className)}
200200
{...props}
201201
/>
202202
));

‎site/src/components/MoreMenu/MoreMenu.stories.tsx

-59
This file was deleted.

‎site/src/components/MoreMenu/MoreMenu.tsx

-135
This file was deleted.

‎site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerItem.tsx

+25-16
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import Checkbox from "@mui/material/Checkbox";
33
import TableCell from "@mui/material/TableCell";
44
import TableRow from "@mui/material/TableRow";
55
import type { BannerConfig } from "api/typesGenerated";
6+
import { Button } from "components/Button/Button";
67
import {
7-
MoreMenu,
8-
MoreMenuContent,
9-
MoreMenuItem,
10-
MoreMenuTrigger,
11-
ThreeDotsButton,
12-
} from "components/MoreMenu/MoreMenu";
8+
DropdownMenu,
9+
DropdownMenuContent,
10+
DropdownMenuItem,
11+
DropdownMenuTrigger,
12+
} from "components/DropdownMenu/DropdownMenu";
13+
import { EllipsisVertical } from "lucide-react";
1314
import type { FC } from "react";
1415

1516
interface AnnouncementBannerItemProps {
@@ -48,17 +49,25 @@ export const AnnouncementBannerItem: FC<AnnouncementBannerItemProps> = ({
4849
</TableCell>
4950

5051
<TableCell>
51-
<MoreMenu>
52-
<MoreMenuTrigger>
53-
<ThreeDotsButton />
54-
</MoreMenuTrigger>
55-
<MoreMenuContent>
56-
<MoreMenuItem onClick={() => onEdit()}>Edit&hellip;</MoreMenuItem>
57-
<MoreMenuItem onClick={() => onDelete()} danger>
52+
<DropdownMenu>
53+
<DropdownMenuTrigger asChild>
54+
<Button size="icon-lg" variant="subtle" aria-label="Open menu">
55+
<EllipsisVertical aria-hidden="true" />
56+
<span className="sr-only">Open menu</span>
57+
</Button>
58+
</DropdownMenuTrigger>
59+
<DropdownMenuContent align="end">
60+
<DropdownMenuItem onClick={() => onEdit()}>
61+
Edit&hellip;
62+
</DropdownMenuItem>
63+
<DropdownMenuItem
64+
className="text-content-destructive focus:text-content-destructive"
65+
onClick={() => onDelete()}
66+
>
5867
Delete&hellip;
59-
</MoreMenuItem>
60-
</MoreMenuContent>
61-
</MoreMenu>
68+
</DropdownMenuItem>
69+
</DropdownMenuContent>
70+
</DropdownMenu>
6271
</TableCell>
6372
</TableRow>
6473
);

0 commit comments

Comments
 (0)