Merge branch 'main' into chore/event-type-app-router

calcom · Dec 30, 2024 · ef08a5a · ef08a5a
2 parents 4d083f5 + d8027fe
commit ef08a5a
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 82 deletions.
diff --git a/.yarn/versions/d1e07a23.yml b/.yarn/versions/d1e07a23.yml
diff --git a/apps/web/lib/plain/plainChat.tsx b/apps/web/lib/plain/plainChat.tsx
@@ -79,11 +79,16 @@ const PlainChat = () => {
   const userEmail = session?.user?.email;
 
   const isAppDomain = useMemo(() => {
-    const restrictedPaths = process.env.NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS?.split(",") || [];
+    const restrictedPathsSet = new Set(
+      (process.env.NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS?.split(",") || []).map((path) => path.trim())
+    );
+
+    const pathSegments = pathname?.split("/").filter(Boolean) || [];
+
     return (
       typeof window !== "undefined" &&
       window.location.origin === process.env.NEXT_PUBLIC_WEBAPP_URL &&
-      !restrictedPaths.some((path) => pathname?.startsWith(path.trim()))
+      !pathSegments.some((segment) => restrictedPathsSet.has(segment))
     );
   }, [pathname]);
 

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "4.8.10",
+  "version": "4.8.11",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",

diff --git a/apps/web/playwright/lib/testUtils.ts b/apps/web/playwright/lib/testUtils.ts
@@ -1,4 +1,4 @@
-import type { Frame, Locator, Page, Request as PlaywrightRequest } from "@playwright/test";
+import type { Frame, Page, Request as PlaywrightRequest } from "@playwright/test";
 import { expect } from "@playwright/test";
 import { createHash } from "crypto";
 import EventEmitter from "events";
@@ -538,31 +538,3 @@ export async function expectPageToBeNotFound({ page, url }: { page: Page; url: s
   await page.goto(`${url}`);
   await expect(page.getByTestId(`404-page`)).toBeVisible();
 }
-
-export async function clickUntilDialogVisible(
-  dialogOpenButton: Locator,
-  visibleLocatorOnDialog: Locator,
-  page: Page,
-  matchUrl: string,
-  retries = 3,
-  delay = 2000
-) {
-  for (let i = 0; i < retries; i++) {
-    try {
-      const responsePromise = page.waitForResponse(
-        (response) => response.url().includes(matchUrl) && response.status() === 200
-      );
-      await dialogOpenButton.click();
-      await responsePromise;
-      await visibleLocatorOnDialog.waitFor({ state: "visible", timeout: delay });
-      return;
-    } catch {
-      console.warn(`clickUntilDialogVisible: Attempt ${i + 1} failed to open dialog`);
-      if (i === retries - 1) {
-        console.log("clickUntilDialogVisible: Dialog did not appear after multiple attempts.");
-        return;
-      }
-      await new Promise((resolve) => setTimeout(resolve, delay));
-    }
-  }
-}
diff --git a/apps/web/playwright/out-of-office.e2e.ts b/apps/web/playwright/out-of-office.e2e.ts
@@ -7,7 +7,7 @@ import { randomString } from "@calcom/lib/random";
 import prisma from "@calcom/prisma";
 
 import { test } from "./lib/fixtures";
-import { submitAndWaitForResponse, localize, clickUntilDialogVisible } from "./lib/testUtils";
+import { submitAndWaitForResponse, localize } from "./lib/testUtils";
 
 test.describe.configure({ mode: "parallel" });
 test.afterEach(async ({ users }) => {
@@ -20,12 +20,18 @@ test.describe("Out of office", () => {
 
     await user.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
     await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = page.getByTestId("add_entry_ooo");
-    const dateButton = page.locator('[data-testid="date-range"]');
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
 
     await page.getByTestId("reason_select").click();
 
@@ -71,12 +77,18 @@ test.describe("Out of office", () => {
 
     await user.apiLogin();
 
-    await page.goto(`/settings/my-account/out-of-office`);
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
+    await page.goto("/settings/my-account/out-of-office");
     await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = page.getByTestId("add_entry_ooo");
-    const dateButton = page.locator('[data-testid="date-range"]');
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
 
     await page.getByTestId("reason_select").click();
 
@@ -152,7 +164,12 @@ test.describe("Out of office", () => {
 
     await user.apiLogin();
 
-    await page.goto(`/settings/my-account/out-of-office`);
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
+    await page.goto("/settings/my-account/out-of-office");
+    await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
     // expect table-redirect-toUserId to be visible
     await expect(page.locator(`data-testid=table-redirect-${userTo.username}`)).toBeVisible();
@@ -211,14 +228,20 @@ test.describe("Out of office", () => {
 
     await user.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
     await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = page.getByTestId("add_entry_ooo");
-    const dateButton = page.locator('[data-testid="date-range"]');
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
 
-    await dateButton.click();
+    await page.locator('[data-testid="date-range"]').click();
 
     await selectToAndFromDates(page, "13", "22", true);
 
@@ -254,14 +277,20 @@ test.describe("Out of office", () => {
 
     await user.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
     await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = page.getByTestId("add_entry_ooo");
-    const dateButton = page.locator('[data-testid="date-range"]');
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
 
-    await dateButton.click();
+    await page.locator('[data-testid="date-range"]').click();
 
     await selectToAndFromDates(page, "13", "22");
 
@@ -270,8 +299,11 @@ test.describe("Out of office", () => {
     await expect(page.locator(`data-testid=table-redirect-n-a`)).toBeVisible();
 
     // add another entry
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
-    await dateButton.click();
+    await entriesListRespPromise;
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
+
+    await page.locator('[data-testid="date-range"]').click();
 
     await selectToAndFromDates(page, "11", "24");
 
@@ -286,14 +318,20 @@ test.describe("Out of office", () => {
 
     await user.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
     await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = page.getByTestId("add_entry_ooo");
-    const dateButton = page.locator('[data-testid="date-range"]');
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
 
-    await dateButton.click();
+    await page.locator('[data-testid="date-range"]').click();
 
     await selectToAndFromDates(page, "13", "22");
 
@@ -302,8 +340,11 @@ test.describe("Out of office", () => {
     await expect(page.locator(`data-testid=table-redirect-n-a`)).toBeVisible();
 
     // add another entry
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
-    await dateButton.click();
+    await entriesListRespPromise;
+    await page.getByTestId("add_entry_ooo").click();
+    await reasonListRespPromise;
+
+    await page.locator('[data-testid="date-range"]').click();
 
     await selectToAndFromDates(page, "13", "22");
 
@@ -315,21 +356,31 @@ test.describe("Out of office", () => {
     const user = await users.create({ name: "userOne" });
     await user.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
-    await page.waitForLoadState();
+    await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = await page.getByTestId("add_entry_ooo");
-    const dateButton = await page.locator('[data-testid="date-range"]');
+    const addOOOButton = page.getByTestId("add_entry_ooo");
+    const dateButton = page.locator('[data-testid="date-range"]');
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await addOOOButton.click();
+    await reasonListRespPromise;
 
     //Creates 2 OOO entries:
     //First OOO is created on Next month 1st - 3rd
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
     await dateButton.click();
     await selectDateAndCreateOOO(page, "1", "3");
     await expect(page.locator(`data-testid=table-redirect-n-a`).nth(0)).toBeVisible();
 
     //Second OOO is created on Next month 4th - 6th
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    await entriesListRespPromise;
+    await addOOOButton.click();
+    await reasonListRespPromise;
     await dateButton.click();
     await selectDateAndCreateOOO(page, "4", "6");
     await expect(page.locator(`data-testid=table-redirect-n-a`).nth(1)).toBeVisible();
@@ -349,14 +400,22 @@ test.describe("Out of office", () => {
 
     await owner.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
-    await page.waitForLoadState();
+    await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = await page.getByTestId("add_entry_ooo");
-    const dateButton = await page.locator('[data-testid="date-range"]');
+    const addOOOButton = page.getByTestId("add_entry_ooo");
+    const dateButton = page.locator('[data-testid="date-range"]');
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await addOOOButton.click();
+    await reasonListRespPromise;
 
     //As owner,OOO is created on Next month 1st - 3rd, forwarding to 'member-1'
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
     await dateButton.click();
     await selectDateAndCreateOOO(page, "1", "3", "member-1");
     await expect(
@@ -366,8 +425,10 @@ test.describe("Out of office", () => {
     //As member1, OOO is created on Next month 4th - 5th, forwarding to 'owner'
     await member1User?.apiLogin();
     await page.goto("/settings/my-account/out-of-office");
-    await page.waitForLoadState();
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
+    await addOOOButton.click();
+    await reasonListRespPromise;
     await dateButton.click();
     await selectDateAndCreateOOO(page, "4", "5", "owner");
     await expect(page.locator(`data-testid=table-redirect-${owner.username ?? "n-a"}`).nth(0)).toBeVisible();
@@ -388,14 +449,22 @@ test.describe("Out of office", () => {
 
     await owner.apiLogin();
 
+    const entriesListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
+    );
     await page.goto("/settings/my-account/out-of-office");
-    await page.waitForLoadState();
+    await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
 
-    const addOOOButton = await page.getByTestId("add_entry_ooo");
-    const dateButton = await page.locator('[data-testid="date-range"]');
+    const addOOOButton = page.getByTestId("add_entry_ooo");
+    const dateButton = page.locator('[data-testid="date-range"]');
+    const reasonListRespPromise = page.waitForResponse(
+      (response) => response.url().includes("outOfOfficeReasonList?batch=1") && response.status() === 200
+    );
+    await addOOOButton.click();
+    await reasonListRespPromise;
 
     //As owner,OOO is created on Next month 1st - 3rd, forwarding to 'member-1'
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
     await dateButton.click();
     await selectDateAndCreateOOO(page, "1", "3", "member-1");
     await expect(
@@ -405,8 +474,10 @@ test.describe("Out of office", () => {
     //As member1, expect error while OOO is created on Next month 2nd - 5th, forwarding to 'owner'
     await member1User?.apiLogin();
     await page.goto("/settings/my-account/out-of-office");
-    await page.waitForLoadState();
-    await clickUntilDialogVisible(addOOOButton, dateButton, page, "outOfOfficeReasonList?batch=1");
+    await page.waitForLoadState("domcontentloaded");
+    await entriesListRespPromise;
+    await addOOOButton.click();
+    await reasonListRespPromise;
     await dateButton.click();
     await selectDateAndCreateOOO(page, "2", "5", "owner", 400);
     await expect(page.locator(`text=${t("booking_redirect_infinite_not_allowed")}`)).toBeTruthy();

diff --git a/packages/app-store/typeform/pages/how-to-use/[...appPages].tsx b/packages/app-store/typeform/pages/how-to-use/[...appPages].tsx
@@ -10,7 +10,7 @@ export default function HowToUse() {
       <div className="bg-default m-auto rounded p-10">
         <div className="flex flex-row">
           <div className="mr-5">
-            <img className="w-11" src="/api/app-store/typeform/icon.svg" alt="Zapier Logo" />
+            <img className="w-11" src="/api/app-store/typeform/icon.svg" alt="Typeform Logo" />
           </div>
           <div className="ml-5">
             <div className="text-md text-default">How to route a Typeform with Cal.com Routing</div>

diff --git a/packages/app-store/typeform/static/icon.svg b/packages/app-store/typeform/static/icon.svg
diff --git a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts
@@ -67,9 +67,7 @@ async function getTeamMembers({
     },
     cursor: cursor ? { id: cursor } : undefined,
     take: limit + 1, // We take +1 as itll be used for the next cursor
-    orderBy: {
-      id: "asc",
-    },
+    orderBy: [{ userId: "asc" }, { id: "asc" }], // Prisma require a unique field for tie breaking duplicate value for pagination
     distinct: ["userId"],
   });