Merge remote-tracking branch 'origin/main' into fix/CAL-3578

.github/workflows/cache-clean.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
  cleanup:
- runs-on: buildjet-4vcpu-ubuntu-2204
+ runs-on: buildjet-2vcpu-ubuntu-2204
  steps:
  - name: Check out code
  uses: actions/checkout@v3
@@ -21,7 +21,7 @@ jobs:
  echo "Fetching list of cache key"
  cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
 
- ## Setting this to not fail the workflow while deleting cache keys. 
+ ## Setting this to not fail the workflow while deleting cache keys.
  set +e
  echo "Deleting caches..."
  for cacheKey in $cacheKeysForPR

.github/workflows/e2e.yml

@@ -7,7 +7,7 @@ jobs:
  e2e:
  timeout-minutes: 20
  name: E2E tests (${{ matrix.shard }}/${{ strategy.job-total }})
- runs-on: buildjet-4vcpu-ubuntu-2204
+ runs-on: buildjet-8vcpu-ubuntu-2204
  services:
  postgres:
  image: postgres:13

.github/workflows/nextjs-bundle-analysis.yml

@@ -16,7 +16,7 @@ jobs:
  analyze:
  needs: build
  if: always()
- runs-on: buildjet-4vcpu-ubuntu-2204
+ runs-on: buildjet-2vcpu-ubuntu-2204
  steps:
  - uses: actions/checkout@v3
  - uses: ./.github/actions/dangerous-git-checkout

.github/workflows/pr.yml

@@ -14,7 +14,7 @@ concurrency:
 jobs:
  changes:
  name: Detect changes
- runs-on: buildjet-4vcpu-ubuntu-2204
+ runs-on: buildjet-2vcpu-ubuntu-2204
  permissions:
  pull-requests: read
  outputs:
@@ -108,7 +108,7 @@ jobs:
  required:
  needs: [changes, lint, type-check, test, build, build-api-v1, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
  if: always()
- runs-on: buildjet-4vcpu-ubuntu-2204
+ runs-on: buildjet-2vcpu-ubuntu-2204
  steps:
  - name: fail if conditional jobs failed
  if: needs.changes.outputs.has-files-requiring-all-checks == 'true' && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled'))

.github/workflows/unit-tests.yml

@@ -7,7 +7,7 @@ on:
 jobs:
  test:
  timeout-minutes: 20
- runs-on: buildjet-4vcpu-ubuntu-2204
+ runs-on: buildjet-2vcpu-ubuntu-2204
  steps:
  - uses: actions/checkout@v3
  - uses: ./.github/actions/dangerous-git-checkout

apps/api/v1/lib/validations/booking.ts

@@ -82,4 +82,5 @@ export const schemaBookingReadPublic = Booking.extend({
  metadata: true,
  status: true,
  responses: true,
+ fromReschedule: true,
 });

apps/api/v1/pages/api/docs.ts

@@ -57,6 +57,11 @@ const swaggerHandler = withSwagger({
  type: "string",
  example: "Europe/London",
  },
+ fromReschedule: {
+ type: "string",
+ nullable: true,
+ format: "uuid",
+ },
  attendees: {
  type: "array",
  items: {

apps/api/v2/package.json

@@ -13,7 +13,7 @@
  "dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build && yarn workspace @calcom/platform-libraries build",
  "dev": "yarn dev:build && docker-compose up -d && yarn copy-swagger-module && yarn start --watch",
  "start:debug": "nest start --debug --watch",
- "start:prod": "SKIP_DOCS_GENERATION=1 node ./dist/apps/api/v2/src/main.js",
+ "start:prod": "node ./dist/apps/api/v2/src/main.js",
  "test": "yarn dev:build && jest",
  "test:watch": "yarn dev:build && jest --watch",
  "test:cov": "yarn dev:build && jest --coverage",

apps/api/v2/src/main.ts

@@ -24,9 +24,7 @@ const run = async () => {
  try {
  bootstrap(app);
  const port = app.get(ConfigService<AppConfig, true>).get("api.port", { infer: true });
- if (process.env.SKIP_DOCS_GENERATION !== "1") {
- void generateSwagger(app);
- }
+ void generateSwagger(app);
  await app.listen(port);
  logger.log(`Application started on port: ${port}`);
  } catch (error) {

apps/api/v2/src/modules/timezones/services/timezones.service.ts

@@ -1,10 +1,24 @@
+import { RedisService } from "@/modules/redis/redis.service";
 import { Injectable } from "@nestjs/common";
 
 import { cityTimezonesHandler } from "@calcom/platform-libraries";
+import type { CityTimezones } from "@calcom/platform-libraries";
 
 @Injectable()
 export class TimezonesService {
- async getCityTimeZones() {
- return cityTimezonesHandler();
+ private cacheKey = "cityTimezones";
+
+ constructor(private readonly redisService: RedisService) {}
+
+ async getCityTimeZones(): Promise<CityTimezones> {
+ const cachedTimezones = await this.redisService.redis.get(this.cacheKey);
+ if (!cachedTimezones) {
+ const timezones = await cityTimezonesHandler();
+ await this.redisService.redis.set(this.cacheKey, JSON.stringify(timezones), "EX", 60 * 60 * 24);
+
+ return timezones;
+ } else {
+ return JSON.parse(cachedTimezones) as CityTimezones;
+ }
  }
 }

apps/api/v2/src/modules/timezones/timezones.module.ts

@@ -1,9 +1,10 @@
+import { RedisModule } from "@/modules/redis/redis.module";
 import { TimezonesController } from "@/modules/timezones/controllers/timezones.controller";
 import { TimezonesService } from "@/modules/timezones/services/timezones.service";
 import { Module } from "@nestjs/common";
 
 @Module({
- imports: [],
+ imports: [RedisModule],
  providers: [TimezonesService],
  controllers: [TimezonesController],
  exports: [TimezonesService],

apps/web/app/layout.tsx

@@ -85,7 +85,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
  `}</style>
  </head>
  <body
- className="dark:bg-darkgray-50 todesktop:!bg-transparent bg-subtle antialiased"
+ className="dark:bg-darkgray-50 bg-subtle antialiased"
  style={
  isEmbed
  ? {

apps/web/modules/videos/views/videos-single-view.tsx

@@ -101,12 +101,12 @@ export default function JoinCall(props: PageProps) {
  />
  ) : (
  <img
- className="fixed z-10 hidden sm:inline-block"
+ className="fixed z-10 inline-block h-4"
  src={`${WEBSITE_URL}/cal-logo-word-dark.svg`}
  alt="Logo"
  style={{
- top: 32,
- left: 32,
+ top: 9,
+ left: "calc(50% - 45px)",
  }}
  />
  )}

apps/web/package.json

@@ -65,6 +65,7 @@
  "@tremor/react": "^2.0.0",
  "@types/turndown": "^5.0.1",
  "@unkey/ratelimit": "^0.1.1",
+ "@upstash/redis": "^1.21.0",
  "@vercel/edge-config": "^0.1.1",
  "@vercel/edge-functions-ui": "^0.2.1",
  "@vercel/og": "^0.5.0",

apps/web/pages/_document.tsx

@@ -88,7 +88,7 @@ class MyDocument extends Document<Props> {
  </Head>
 
  <body
- className="dark:bg-darkgray-50 todesktop:!bg-transparent bg-subtle antialiased"
+ className="dark:bg-darkgray-50 bg-subtle antialiased"
  style={
  isEmbed
  ? {

apps/web/playwright/organization/booking.e2e.ts

@@ -2,7 +2,6 @@ import type { Page } from "@playwright/test";
 import { expect } from "@playwright/test";
 
 import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
-import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
 
 import { test } from "../lib/fixtures";
@@ -14,6 +13,7 @@ import {
  testName,
 } from "../lib/testUtils";
 import { expectExistingUserToBeInvitedToOrganization } from "../team/expects";
+import { gotoPathAndExpectRedirectToOrgDomain } from "./lib/gotoPathAndExpectRedirectToOrgDomain";
 import { acceptTeamOrOrgInvite, inviteExistingUserToOrganization } from "./lib/inviteUser";
 
 test.describe("Bookings", () => {
@@ -380,11 +380,11 @@ test.describe("Bookings", () => {
 
  await test.step("Booking through old link redirects to new link on org domain", async () => {
  const event = await userOutsideOrganization.getFirstEventAsOwner();
- await expectRedirectToOrgDomain({
+ await gotoPathAndExpectRedirectToOrgDomain({
  page,
  org,
- eventSlug: `/${usernameOutsideOrg}/${event.slug}`,
- expectedEventSlug: `/${usernameInOrg}/${event.slug}`,
+ path: `/${usernameOutsideOrg}/${event.slug}`,
+ expectedPath: `/${usernameInOrg}/${event.slug}`,
  });
  // As the redirection correctly happens, the booking would work too which we have verified in previous step. But we can't test that with org domain as that domain doesn't exist.
  });
@@ -463,39 +463,3 @@ async function expectPageToBeNotFound({ page, url }: { page: Page; url: string }
  await page.goto(`${url}`);
  await expect(page.locator(`text=${NotFoundPageTextAppDir}`)).toBeVisible();
 }
-
-async function expectRedirectToOrgDomain({
- page,
- org,
- eventSlug,
- expectedEventSlug,
-}: {
- page: Page;
- org: { slug: string | null };
- eventSlug: string;
- expectedEventSlug: string;
-}) {
- if (!org.slug) {
- throw new Error("Org slug is not defined");
- }
- page.goto(eventSlug).catch((e) => {
- console.log("Expected navigation error to happen");
- });
-
- const orgSlug = org.slug;
-
- const orgRedirectUrl = await new Promise(async (resolve) => {
- page.on("request", (request) => {
- if (request.isNavigationRequest()) {
- const requestedUrl = request.url();
- console.log("Requested navigation to", requestedUrl);
- // Resolve on redirection to org domain
- if (requestedUrl.includes(orgSlug)) {
- resolve(requestedUrl);
- }
- }
- });
- });
-
- expect(orgRedirectUrl).toContain(`${getOrgFullOrigin(org.slug)}${expectedEventSlug}`);
-}

apps/web/playwright/organization/lib/gotoPathAndExpectRedirectToOrgDomain.ts

@@ -0,0 +1,40 @@
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
+
+import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
+
+export async function gotoPathAndExpectRedirectToOrgDomain({
+ page,
+ org,
+ path,
+ expectedPath,
+}: {
+ page: Page;
+ org: { slug: string | null };
+ path: string;
+ expectedPath: string;
+}) {
+ if (!org.slug) {
+ throw new Error("Org slug is not defined");
+ }
+ page.goto(path).catch((e) => {
+ console.log("Expected navigation error to happen");
+ });
+
+ const orgSlug = org.slug;
+
+ const orgRedirectUrl = await new Promise(async (resolve) => {
+ page.on("request", (request) => {
+ if (request.isNavigationRequest()) {
+ const requestedUrl = request.url();
+ console.log("Requested navigation to", requestedUrl);
+ // Resolve on redirection to org domain
+ if (requestedUrl.includes(orgSlug)) {
+ resolve(requestedUrl);
+ }
+ }
+ });
+ });
+
+ expect(orgRedirectUrl).toContain(`${getOrgFullOrigin(org.slug)}${expectedPath}`);
+}