diff --git a/apps/web/playwright/embed-code-generator.e2e.ts b/apps/web/playwright/embed-code-generator.e2e.ts index f7ced620e0..548b6121a0 100644 --- a/apps/web/playwright/embed-code-generator.e2e.ts +++ b/apps/web/playwright/embed-code-generator.e2e.ts @@ -64,7 +64,7 @@ test.describe("Embed Code Generator Tests", () => { await page.waitForTimeout(1000); await expectToContainValidPreviewIframe(page, { embedType: "inline", - calLink: `${pro.username}/30-min`, + calLink: `${pro.username}/multiple-duration`, }); }); @@ -102,7 +102,7 @@ test.describe("Embed Code Generator Tests", () => { await page.waitForTimeout(1000); await expectToContainValidPreviewIframe(page, { embedType: "floating-popup", - calLink: `${pro.username}/30-min`, + calLink: `${pro.username}/multiple-duration`, }); }); @@ -140,7 +140,7 @@ test.describe("Embed Code Generator Tests", () => { await page.waitForTimeout(1000); await expectToContainValidPreviewIframe(page, { embedType: "element-click", - calLink: `${pro.username}/30-min`, + calLink: `${pro.username}/multiple-duration`, }); }); }); @@ -238,7 +238,7 @@ test.describe("Embed Code Generator Tests", () => { await page.waitForTimeout(1000); await expectToContainValidPreviewIframe(page, { embedType: "inline", - calLink: `${user.username}/30-min`, + calLink: `${user.username}/multiple-duration`, bookerUrl: getOrgFullOrigin(org?.slug ?? ""), }); }); @@ -279,7 +279,7 @@ test.describe("Embed Code Generator Tests", () => { await page.waitForTimeout(1000); await expectToContainValidPreviewIframe(page, { embedType: "floating-popup", - calLink: `${user.username}/30-min`, + calLink: `${user.username}/multiple-duration`, bookerUrl: getOrgFullOrigin(org?.slug ?? ""), }); }); @@ -319,7 +319,7 @@ test.describe("Embed Code Generator Tests", () => { await page.waitForTimeout(1000); await expectToContainValidPreviewIframe(page, { embedType: "element-click", - calLink: `${user.username}/30-min`, + calLink: `${user.username}/multiple-duration`, bookerUrl: getOrgFullOrigin(org?.slug ?? ""), }); }); diff --git a/apps/web/playwright/event-types.e2e.ts b/apps/web/playwright/event-types.e2e.ts index 4b20305c5c..396b745eb6 100644 --- a/apps/web/playwright/event-types.e2e.ts +++ b/apps/web/playwright/event-types.e2e.ts @@ -61,6 +61,16 @@ testBothFutureAndLegacyRoutes.describe("Event Types tests", () => { await expect(page.locator(`text='${eventTitle}'`)).toBeVisible(); }); + test("new event type appears first in the list", async ({ page }) => { + const nonce = randomString(3); + const eventTitle = `hello ${nonce}`; + await createNewEventType(page, { eventTitle }); + await page.goto("/event-types"); + const firstEvent = page.locator("[data-testid=event-types] > li a").first(); + const firstEventTitle = await firstEvent.getAttribute("title"); + await expect(firstEventTitle).toBe(eventTitle); + }); + test("enabling recurring event comes with default options", async ({ page }) => { const nonce = randomString(3); const eventTitle = `my recurring event ${nonce}`; diff --git a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts index f25589cd57..ce421eee54 100644 --- a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts +++ b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts @@ -99,6 +99,21 @@ test.describe("Routing Forms", () => { await expect(page.getByTestId(`404-page`)).toBeVisible(); }); + test("recently added form appears first in the list", async ({ page }) => { + await addForm(page, { name: "Test Form 1" }); + await page.goto(`apps/routing-forms/forms`); + await page.waitForSelector('[data-testid="routing-forms-list"]'); + await expect(page.locator('[data-testid="routing-forms-list"] > div h1')).toHaveCount(1); + + await addForm(page, { name: "Test Form 2" }); + await page.goto(`apps/routing-forms/forms`); + await page.waitForSelector('[data-testid="routing-forms-list"]'); + await expect(page.locator('[data-testid="routing-forms-list"] > div h1')).toHaveCount(2); + + const firstForm = page.locator('[data-testid="routing-forms-list"] > div h1').first(); + await expect(firstForm).toHaveText("Test Form 2"); + }); + test("should be able to edit a newly created form", async ({ page }) => { const formId = await addForm(page); const description = "Test Description"; diff --git a/packages/app-store/routing-forms/trpc/forms.handler.ts b/packages/app-store/routing-forms/trpc/forms.handler.ts index 5b5b237935..907f3c5a8b 100644 --- a/packages/app-store/routing-forms/trpc/forms.handler.ts +++ b/packages/app-store/routing-forms/trpc/forms.handler.ts @@ -31,7 +31,7 @@ export const formsHandler = async ({ ctx, input }: FormsHandlerOptions) => { position: "desc", }, { - createdAt: "asc", + createdAt: "desc", }, ], include: { diff --git a/packages/lib/server/repository/workflow.ts b/packages/lib/server/repository/workflow.ts index 76df469856..a5fa26d34a 100644 --- a/packages/lib/server/repository/workflow.ts +++ b/packages/lib/server/repository/workflow.ts @@ -213,7 +213,7 @@ export class WorkflowRepository { position: "desc", }, { - id: "asc", + id: "desc", }, ], }); @@ -267,7 +267,7 @@ export class WorkflowRepository { where, include: includedFields, orderBy: { - id: "asc", + id: "desc", }, }); diff --git a/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts index 0709c361ab..d7928dc77b 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts @@ -71,7 +71,7 @@ export const getEventTypesFromGroup = async ({ position: "desc", }, { - id: "asc", + id: "desc", }, ], limit, @@ -94,7 +94,7 @@ export const getEventTypesFromGroup = async ({ position: "desc", }, { - id: "asc", + id: "desc", }, ], limit, @@ -108,8 +108,8 @@ export const getEventTypesFromGroup = async ({ if (a.position !== b.position) { return b.position - a.position; } - // Then by id in ascending order - return a.id - b.id; + // Then by id in descending order + return b.id - a.id; }); eventTypes.push(...userEventTypes); @@ -136,7 +136,7 @@ export const getEventTypesFromGroup = async ({ position: "desc", }, { - id: "asc", + id: "desc", }, ], })) ?? [];