Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🐛 Reset participant selection when a participant is deleted on mobile poll (#2862)

Luke Vella6d6d65b8af9b
diff --git a/apps/web/src/features/poll/components/mobile-poll.tsx b/apps/web/src/features/poll/components/mobile-poll.tsx
index 6540b2148..7f9946f2c 100644
--- a/apps/web/src/features/poll/components/mobile-poll.tsx
+++ b/apps/web/src/features/poll/components/mobile-poll.tsx
@@ -59,10 +59,10 @@ const MobilePoll: React.FunctionComponent = () => {
const { canEditParticipant, canAddNewParticipant } = usePermissions();
- const { t } = useTranslation();
-
const isEditing = votingForm.watch("mode") !== "view";
+ const { t } = useTranslation();
+
const participantOptions = [
{
value: "all",
@@ -117,7 +117,10 @@ const MobilePoll: React.FunctionComponent = () => {
}}
disabled={isEditing}
>
- <SelectTrigger className="flex-1">
+ <SelectTrigger
+ className="flex-1"
+ data-testid="participant-selector"
+ >
<SelectValue />
</SelectTrigger>
<SelectContent>
@@ -170,6 +173,9 @@ const MobilePoll: React.FunctionComponent = () => {
onEdit={() => {
votingForm.setEditingParticipantId(selectedParticipant.id);
}}
+ onDelete={() => {
+ votingForm.setValue("participantId", "all");
+ }}
>
<Button
aria-label={t("moreOptions", {
diff --git a/apps/web/src/features/poll/components/participant-dropdown.tsx b/apps/web/src/features/poll/components/participant-dropdown.tsx
index 8b9084da7..f673fc2f1 100644
--- a/apps/web/src/features/poll/components/participant-dropdown.tsx
+++ b/apps/web/src/features/poll/components/participant-dropdown.tsx
@@ -44,6 +44,7 @@ import { trpc } from "@/trpc/client";
export const ParticipantDropdown = ({
participant,
onEdit,
+ onDelete,
children,
disabled,
align,
@@ -57,6 +58,7 @@ export const ParticipantDropdown = ({
};
align?: "start" | "end";
onEdit: () => void;
+ onDelete?: () => void;
children: React.ReactElement;
}) => {
const [isChangeNameModalVisible, setIsChangeNameModalVisible] =
@@ -115,6 +117,7 @@ export const ParticipantDropdown = ({
onOpenChange={setIsDeleteParticipantModalVisible}
participantId={participant.id}
participantName={participant.name}
+ onDelete={onDelete}
/>
</>
);
@@ -125,11 +128,13 @@ const DeleteParticipantModal = ({
onOpenChange,
participantId,
participantName,
+ onDelete,
}: {
open: boolean;
onOpenChange: (open: boolean) => void;
participantId: string;
participantName: string;
+ onDelete?: () => void;
}) => {
const deleteParticipant = useDeleteParticipantMutation();
const token = useEditToken();
@@ -163,6 +168,7 @@ const DeleteParticipantModal = ({
participantId,
token,
});
+ onDelete?.();
onOpenChange(false);
}}
>
diff --git a/apps/web/tests/mobile-test.spec.ts b/apps/web/tests/mobile-test.spec.ts
index a4f878162..e71649e2a 100644
--- a/apps/web/tests/mobile-test.spec.ts
+++ b/apps/web/tests/mobile-test.spec.ts
@@ -1,34 +1,51 @@
+import type { Page } from "@playwright/test";
import { expect, test } from "@playwright/test";
-
-test.skip("should be able to vote and comment on a poll", async ({ page }) => {
- await page.setViewportSize({ width: 375, height: 667 });
- await page.goto("/demo");
-
- await expect(page.locator('text="Lunch Meeting"')).toBeVisible();
-
- await page.click('text="New"');
- await page.click("data-testid=poll-option >> nth=0");
- await page.click("data-testid=poll-option >> nth=1");
- await page.click("data-testid=poll-option >> nth=3");
-
- await page.getByText("Continue").click();
-
- await page.getByPlaceholder("Jessie Smith").type("Test user");
- await page.getByText(/^Save availability$/).click();
-
- await expect(page.locator("data-testid=user")).toBeVisible();
- await expect(
- page.locator("data-testid=participant-selector").locator("text=You"),
- ).toBeVisible();
-
- await page.getByTestId("participant-menu").click();
- await page.getByText("Edit votes").click();
- await page.click("data-testid=poll-option >> nth=1");
- await page.click("text=Save");
-
- await page.getByTestId("participant-menu").click();
- await page.locator("button", { hasText: "Delete" }).click();
- const modal = page.getByTestId("modal");
- await modal.locator("button", { hasText: "Delete" }).click();
- await expect(page.locator("text='Test user'")).not.toBeVisible();
+import { NewPollPage } from "./new-poll-page";
+
+test.describe(() => {
+ let inviteUrl: string;
+
+ test.beforeAll(async ({ browser }) => {
+ const page = await browser.newPage();
+ const newPollPage = new NewPollPage(page);
+ await newPollPage.goto();
+ const dialog = await newPollPage.create({ name: "Mobile Meetup" });
+ const pollPage = await dialog.goToPollPage();
+ inviteUrl = await pollPage.copyInviteLink();
+ await page.close();
+ });
+
+ const voteAsNewParticipant = async (page: Page, name: string) => {
+ await page.getByTestId("poll-option").first().click();
+ await page.getByRole("button", { name: "Continue" }).click();
+ await page.getByPlaceholder("Jessie Smith").fill(name);
+ await page.getByRole("button", { name: "Save availability" }).click();
+ await page.getByRole("button", { name: "Back to poll" }).click();
+ };
+
+ test("deleting a participant resets the participant selector", async ({
+ browser,
+ }) => {
+ const context = await browser.newContext({
+ viewport: { width: 375, height: 667 },
+ });
+ const page = await context.newPage();
+ await page.goto(inviteUrl);
+
+ await voteAsNewParticipant(page, "Test user");
+
+ const selector = page.getByTestId("participant-selector");
+ await expect(selector).toContainText("Test user");
+
+ await page.getByTestId("participant-menu").click();
+ await page.getByRole("menuitem", { name: "Delete" }).click();
+ await page
+ .getByRole("dialog")
+ .getByRole("button", { name: "Delete" })
+ .click();
+
+ await expect(selector).toContainText("All Participants");
+
+ await context.close();
+ });
});