Skip to content

Commit 0cf2f2e

Browse files
dc143cdc143c
authored
Merge branch 'dc143c:main' into main
2 parents dc0e949 + 3a7e611 commit 0cf2f2e

File tree

110 files changed

+1281
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1281
-282
lines changed

‎.github/workflows/i18n.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818
steps:
1919
- uses: actions/checkout@v4
20-
- uses: replexica/replexica@main
20+
- uses: lingodotdev/lingo.dev@main
2121
env:
2222
GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
2323
with:

‎__checks__/organization.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test.describe("Org", () => {
1414
test("Org User(Rick) Page should be embeddable", async ({ page }) => {
1515
const response = await page.goto("https://i.cal.com/team-rick/embed");
1616
expect(response?.status()).toBe(200);
17-
await expect(page.locator("text=Rick in i.cal.com")).toBeVisible();
17+
await expect(page.locator("text=Used by Checkly")).toBeVisible();
1818
await expectPageToBeRenderedWithEmbedSsr(page);
1919
});
2020

@@ -58,10 +58,10 @@ test.describe("Org", () => {
5858
expect(response?.status()).toBe(200);
5959
expect(await page.locator('[data-testid="event-title"]').textContent()).toBe("Group Meeting");
6060

61-
expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(users[0].name);
62-
expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(users[1].name);
63-
// 2 users and 1 for the organization(2+1)
64-
expect((await page.locator('[data-testid="event-meta"] [data-testid="avatar"]').all()).length).toBe(3);
61+
expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(
62+
"Join us for a meeting with multiple people"
63+
);
64+
expect((await page.locator('[data-testid="event-meta"] [data-testid="avatar"]').all()).length).toBe(2);
6565
});
6666
});
6767

‎apps/web/app/(use-page-wrapper)/apps/page.tsx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { withAppDirSsr } from "app/WithAppDirSsr";
2+
import type { PageProps } from "app/_types";
3+
import { _generateMetadata } from "app/_utils";
4+
import { cookies, headers } from "next/headers";
5+
6+
import { getServerSideProps } from "@lib/apps/getServerSideProps";
7+
import { buildLegacyCtx } from "@lib/buildLegacyCtx";
8+
9+
import AppsPage from "~/apps/apps-view";
10+
11+
export const generateMetadata = async () => {
12+
return await _generateMetadata(
13+
(t) => t("app_store"),
14+
(t) => t("app_store_description")
15+
);
16+
};
17+
18+
const getData = withAppDirSsr(getServerSideProps);
19+
20+
const ServerPage = async ({ params, searchParams }: PageProps) => {
21+
const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
22+
23+
const props = await getData(context);
24+
return <AppsPage {...props} />;
25+
};
26+
27+
export default ServerPage;

apps/web/app/availability/[schedule]/page.tsx renamed to apps/web/app/(use-page-wrapper)/availability/[schedule]/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { PageProps } from "app/_types";
22
import { _generateMetadata } from "app/_utils";
3-
import { WithLayout } from "app/layoutHOC";
43
import { notFound } from "next/navigation";
54
import { cache } from "react";
65
import { z } from "zod";
@@ -89,4 +88,4 @@ const Page = async ({ params }: PageProps) => {
8988
);
9089
};
9190

92-
export default WithLayout({ ServerPage: Page });
91+
export default Page;

apps/web/app/availability/page.tsx renamed to apps/web/app/(use-page-wrapper)/availability/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { _generateMetadata } from "app/_utils";
2-
import { WithLayout } from "app/layoutHOC";
32
import { notFound } from "next/navigation";
43

54
// import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
@@ -36,4 +35,4 @@ const Page = async () => {
3635
}
3736
};
3837

39-
export default WithLayout({ ServerPage: Page });
38+
export default Page;

‎apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
"use client";
2+
3+
import React, { Suspense } from "react";
4+
5+
import { ErrorBoundary, Icon } from "@calcom/ui";
6+
7+
export default function TroubleshooterLayout({ children }: { children: React.ReactNode }) {
8+
return (
9+
<div className="flex flex-1 [&>*]:flex-1">
10+
<ErrorBoundary>
11+
<Suspense fallback={<Icon name="loader" />}>{children}</Suspense>
12+
</ErrorBoundary>
13+
</div>
14+
);
15+
}

apps/web/app/availability/troubleshoot/page.tsx renamed to apps/web/app/(use-page-wrapper)/availability/troubleshoot/page.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { _generateMetadata } from "app/_utils";
2-
import { WithLayout } from "app/layoutHOC";
32

4-
import Troubleshoot, { getLayout } from "~/availability/troubleshoot/troubleshoot-view";
3+
import Troubleshoot from "~/availability/troubleshoot/troubleshoot-view";
54

65
export const generateMetadata = async () => {
76
return await _generateMetadata(
@@ -10,4 +9,4 @@ export const generateMetadata = async () => {
109
);
1110
};
1211

13-
export default WithLayout({ getLayout, Page: Troubleshoot });
12+
export default Troubleshoot;

‎apps/web/app/(use-page-wrapper)/bookings/[status]/page.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ export const generateMetadata = async () =>
1616
(t) => t("bookings_description")
1717
);
1818

19-
export const generateStaticParams = async () => {
20-
return validStatuses.map((status) => ({ status }));
21-
};
22-
2319
const Page = ({ params }: PageProps) => {
2420
const parsed = querySchema.safeParse(params);
2521
if (!parsed.success) {

apps/web/app/event-types/[type]/page.tsx renamed to apps/web/app/(use-page-wrapper)/event-types/[type]/page.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { withAppDirSsr } from "app/WithAppDirSsr";
2-
import type { PageProps } from "app/_types";
2+
import type { PageProps as _PageProps } from "app/_types";
33
import { _generateMetadata } from "app/_utils";
4-
import { WithLayout } from "app/layoutHOC";
54
import { cookies, headers } from "next/headers";
65

76
import { buildLegacyCtx } from "@lib/buildLegacyCtx";
7+
import type { PageProps as EventTypePageProps } from "@lib/event-types/[type]/getServerSideProps";
88
import { getServerSideProps } from "@lib/event-types/[type]/getServerSideProps";
99

1010
import EventTypePageWrapper from "~/event-types/views/event-types-single-view";
1111

12-
export const generateMetadata = async ({ params, searchParams }: PageProps) => {
12+
export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
1313
const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
1414
const { eventType } = await getData(legacyCtx);
1515

@@ -19,6 +19,13 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
1919
);
2020
};
2121

22-
const getData = withAppDirSsr(getServerSideProps);
22+
const getData = withAppDirSsr<EventTypePageProps>(getServerSideProps);
2323

24-
export default WithLayout({ getLayout: null, getData, Page: EventTypePageWrapper })<"P">;
24+
const ServerPage = async ({ params, searchParams }: _PageProps) => {
25+
const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
26+
const props = await getData(legacyCtx);
27+
28+
return <EventTypePageWrapper {...props} />;
29+
};
30+
31+
export default ServerPage;

apps/web/app/event-types/page.tsx renamed to apps/web/app/(use-page-wrapper)/event-types/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { PageProps } from "app/_types";
22
import { _generateMetadata } from "app/_utils";
3-
import { WithLayout } from "app/layoutHOC";
43
import { cookies, headers } from "next/headers";
54
import { redirect } from "next/navigation";
65

@@ -30,4 +29,4 @@ const Page = async ({ params, searchParams }: PageProps) => {
3029
return <EventTypes />;
3130
};
3231

33-
export default WithLayout({ ServerPage: Page })<"P">;
32+
export default Page;

0 commit comments

Comments
 (0)