Skip to content
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

Jump to bottom

fix: filter booking in upcoming #6406

Merged
merged 6 commits into from
Feb 3, 2023
Merged

fix: filter booking in upcoming #6406

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43e7886
fix: filter booking in upcoming
Jan 11, 2023
afbf0e5
Merge branch 'main' into fix/duplicate-events
PeerRich Jan 12, 2023
c459b46
fix: test
Jan 12, 2023
cb6ec77
Merge branch 'main' into fix/duplicate-events
PeerRich Jan 12, 2023
bdf6f27
Merge branch 'main' into fix/duplicate-events
PeerRich Jan 22, 2023
e45e9d7
fix: wipe-my-cal failing test
Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/web/pages/bookings/[status].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ export default function Bookings() {
return false;
}
shownBookings[booking.recurringEventId] = [booking];
} else if (status === "upcoming") {
return new Date(booking.startTime).toDateString() !== new Date().toDateString();
}
return true;
};
Expand Down Expand Up @@ -137,7 +139,6 @@ export default function Bookings() {
</div>
)}
<div className="pt-2 xl:pt-0">
{/* <p className="mb-2 text-xs font-medium uppercase leading-4 text-gray-500">{t("all")}</p> */}
<div className="overflow-hidden rounded-md border border-gray-200">
<table className="w-full max-w-full table-fixed">
<tbody className="divide-y divide-gray-200 bg-white" data-testid="bookings">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/playwright/wipe-my-cal.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test.describe("Wipe my Cal App Test", () => {
await expect(page.locator("data-testid=wipe-today-button")).toBeVisible();

const $openBookingCount = await page.locator('[data-testid="bookings"] > *').count();
expect($openBookingCount).toBe(3);
expect($openBookingCount).toBe(2);

await page.locator("data-testid=wipe-today-button").click();

Expand Down