From 6e829e23f9114e1d5596b8816b19e4267b24594b Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:51:38 +0530 Subject: [PATCH] fix: type error (#12808) * fix: type error * chore * Dont run future tests * Skip more tests * Fix 404 text * Fix more tests --------- Co-authored-by: Hariom --- apps/web/_app/_trpc/HydrateClient.tsx | 2 +- apps/web/_app/_trpc/trpc-provider.tsx | 4 ++-- .../future/(individual-page-wrapper)/apps/[slug]/page.tsx | 2 +- .../(individual-page-wrapper)/apps/[slug]/setup/page.tsx | 2 +- .../apps/categories/[category]/page.tsx | 2 +- .../(individual-page-wrapper)/apps/categories/page.tsx | 4 ++-- .../apps/installed/[category]/page.tsx | 2 +- .../(admin-layout)/settings/admin/apps/[category]/page.tsx | 2 +- .../(admin-layout)/settings/admin/apps/page.tsx | 2 +- .../(admin-layout)/settings/admin/flags/page.tsx | 2 +- .../(admin-layout)/settings/admin/impersonation/page.tsx | 2 +- .../(admin-layout)/settings/admin/oAuth/page.tsx | 2 +- .../(admin-layout)/settings/admin/page.tsx | 2 +- .../(shared-page-wrapper)/(layout)/event-types/page.tsx | 2 +- .../(no-layout)/settings/admin/oAuth/oAuthView/page.tsx | 2 +- .../(settings-layout)/settings/admin/organizations/page.tsx | 2 +- .../settings/admin/users/[id]/edit/page.tsx | 6 +++--- .../(settings-layout)/settings/admin/users/add/page.tsx | 2 +- .../(settings-layout)/settings/admin/users/page.tsx | 2 +- apps/web/lib/app-providers-app-dir.tsx | 2 +- apps/web/playwright/ab-tests-redirect.e2e.ts | 2 +- apps/web/playwright/event-types.e2e.ts | 2 +- apps/web/playwright/lib/future-legacy-routes.ts | 2 +- apps/web/playwright/lib/testUtils.ts | 4 ++++ apps/web/playwright/settings-admin.e2e.ts | 2 +- apps/web/playwright/teams.e2e.ts | 3 ++- .../app-store/routing-forms/playwright/tests/basic.e2e.ts | 4 ++-- 27 files changed, 36 insertions(+), 31 deletions(-) diff --git a/apps/web/_app/_trpc/HydrateClient.tsx b/apps/web/_app/_trpc/HydrateClient.tsx index 16cbeb6b9a..2e9bb72af6 100644 --- a/apps/web/_app/_trpc/HydrateClient.tsx +++ b/apps/web/_app/_trpc/HydrateClient.tsx @@ -1,6 +1,6 @@ "use client"; -import { createHydrateClient } from "app/_trpc/createHydrateClient"; +import { createHydrateClient } from "_app/_trpc/createHydrateClient"; import superjson from "superjson"; export const HydrateClient = createHydrateClient({ diff --git a/apps/web/_app/_trpc/trpc-provider.tsx b/apps/web/_app/_trpc/trpc-provider.tsx index 6e81d2996a..99cc8ef1f8 100644 --- a/apps/web/_app/_trpc/trpc-provider.tsx +++ b/apps/web/_app/_trpc/trpc-provider.tsx @@ -1,6 +1,6 @@ import { type DehydratedState, QueryClient, QueryClientProvider } from "@tanstack/react-query"; -import { HydrateClient } from "app/_trpc/HydrateClient"; -import { trpc } from "app/_trpc/client"; +import { HydrateClient } from "_app/_trpc/HydrateClient"; +import { trpc } from "_app/_trpc/client"; import { useState } from "react"; import superjson from "superjson"; diff --git a/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx index ec1121c949..81bfe6b543 100644 --- a/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx +++ b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx @@ -1,6 +1,6 @@ import AppPage from "@pages/apps/[slug]/index"; import { Prisma } from "@prisma/client"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import fs from "fs"; import matter from "gray-matter"; import { notFound } from "next/navigation"; diff --git a/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx index ce6abc75ba..f971696338 100644 --- a/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx +++ b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx @@ -1,5 +1,5 @@ import SetupPage from "@pages/apps/[slug]/setup"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import type { GetServerSidePropsContext } from "next"; import { cookies, headers } from "next/headers"; import { notFound, redirect } from "next/navigation"; diff --git a/apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx index b58e845d83..7dd4eba749 100644 --- a/apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx +++ b/apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx @@ -1,6 +1,6 @@ import CategoryPage from "@pages/apps/categories/[category]"; import { Prisma } from "@prisma/client"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import { notFound } from "next/navigation"; import z from "zod"; diff --git a/apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx index c0d6c3d15e..a8fa80fb0e 100644 --- a/apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx +++ b/apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx @@ -1,6 +1,6 @@ import LegacyPage from "@pages/apps/categories/index"; -import { ssrInit } from "app/_trpc/ssrInit"; -import { _generateMetadata } from "app/_utils"; +import { ssrInit } from "_app/_trpc/ssrInit"; +import { _generateMetadata } from "_app/_utils"; import { cookies, headers } from "next/headers"; import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry"; diff --git a/apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx index 203ad830b5..9cc2e40e98 100644 --- a/apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx +++ b/apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx @@ -1,5 +1,5 @@ import LegacyPage from "@pages/apps/installed/[category]"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import { notFound } from "next/navigation"; import { z } from "zod"; diff --git a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx index 0805169a9e..387a7cfda4 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/apps/[category]"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx index c53f6eb9f9..77639c5ee4 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/apps/index"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx index adf10ecbc3..acaa1a3d2e 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/flags"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx index f18a6df858..bbcebd98fa 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/impersonation"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx index 61cb362dba..5b8a766c3e 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/oAuth/index"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx index a45fe0a58d..84ede7fb05 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/index"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx index 246bcc5c90..fbac8bf7bd 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx @@ -1,5 +1,5 @@ import EventTypes from "@pages/event-types"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx index 165622e62a..30f6fac4e1 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx @@ -1,5 +1,5 @@ import Page from "@pages/settings/admin/oAuth/oAuthView"; -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx index 7ec2b7fa6b..a8738daf39 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx @@ -1,4 +1,4 @@ -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import Page from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage"; diff --git a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx index ae354725f6..76a88936b8 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx @@ -1,6 +1,6 @@ -import { getServerCaller } from "app/_trpc/serverClient"; -import { type Params } from "app/_types"; -import { _generateMetadata } from "app/_utils"; +import { getServerCaller } from "_app/_trpc/serverClient"; +import { type Params } from "_app/_types"; +import { _generateMetadata } from "_app/_utils"; import { cookies, headers } from "next/headers"; import { z } from "zod"; diff --git a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx index 511ad02a7d..bbcd1b8640 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx @@ -1,4 +1,4 @@ -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import Page from "@calcom/features/ee/users/pages/users-add-view"; diff --git a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx index 0bd414f599..eeebbbdaa5 100644 --- a/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx +++ b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx @@ -1,4 +1,4 @@ -import { _generateMetadata } from "app/_utils"; +import { _generateMetadata } from "_app/_utils"; import Page from "@calcom/features/ee/users/pages/users-listing-view"; diff --git a/apps/web/lib/app-providers-app-dir.tsx b/apps/web/lib/app-providers-app-dir.tsx index 0b6c8f009c..25241fd80d 100644 --- a/apps/web/lib/app-providers-app-dir.tsx +++ b/apps/web/lib/app-providers-app-dir.tsx @@ -1,5 +1,5 @@ import { TooltipProvider } from "@radix-ui/react-tooltip"; -import { TrpcProvider } from "app/_trpc/trpc-provider"; +import { TrpcProvider } from "_app/_trpc/trpc-provider"; import { dir } from "i18next"; import type { Session } from "next-auth"; import { SessionProvider, useSession } from "next-auth/react"; diff --git a/apps/web/playwright/ab-tests-redirect.e2e.ts b/apps/web/playwright/ab-tests-redirect.e2e.ts index 330da414c1..0973f4b58c 100644 --- a/apps/web/playwright/ab-tests-redirect.e2e.ts +++ b/apps/web/playwright/ab-tests-redirect.e2e.ts @@ -4,7 +4,7 @@ import { test } from "./lib/fixtures"; test.describe.configure({ mode: "parallel" }); -test.describe("apps/ A/B tests", () => { +test.describe.skip("apps/ A/B tests", () => { test("should point to the /future/apps/installed/[category]", async ({ page, users, context }) => { await context.addCookies([ { diff --git a/apps/web/playwright/event-types.e2e.ts b/apps/web/playwright/event-types.e2e.ts index 0358f4ee9f..20663f6d2a 100644 --- a/apps/web/playwright/event-types.e2e.ts +++ b/apps/web/playwright/event-types.e2e.ts @@ -11,7 +11,7 @@ import { bookTimeSlot, createNewEventType, selectFirstAvailableTimeSlotNextMonth test.describe.configure({ mode: "parallel" }); test.describe("Event Types A/B tests", () => { - test("should point to the /future/event-types page", async ({ page, users, context }) => { + test.skip("should point to the /future/event-types page", async ({ page, users, context }) => { await context.addCookies([ { name: "x-calcom-future-routes-override", diff --git a/apps/web/playwright/lib/future-legacy-routes.ts b/apps/web/playwright/lib/future-legacy-routes.ts index d9a76b4eda..842f59d022 100644 --- a/apps/web/playwright/lib/future-legacy-routes.ts +++ b/apps/web/playwright/lib/future-legacy-routes.ts @@ -2,7 +2,7 @@ import { test } from "./fixtures"; export type RouteVariant = "future" | "legacy"; -const routeVariants = ["future", "legacy"]; +const routeVariants = [/*"future",*/ "legacy"]; /** * Small wrapper around test.describe(). diff --git a/apps/web/playwright/lib/testUtils.ts b/apps/web/playwright/lib/testUtils.ts index c334eb5d05..25c6d1a3fa 100644 --- a/apps/web/playwright/lib/testUtils.ts +++ b/apps/web/playwright/lib/testUtils.ts @@ -336,3 +336,7 @@ export async function fillStripeTestCheckout(page: Page) { await page.fill("[name=billingName]", "Stripe Stripeson"); await page.click(".SubmitButton--complete-Shimmer"); } + +// When App directory is there, this is the 404 page text. It is commented till it's disabled +// export const NotFoundPageText = "This page could not be found"; +export const NotFoundPageText = "ERROR 404"; diff --git a/apps/web/playwright/settings-admin.e2e.ts b/apps/web/playwright/settings-admin.e2e.ts index d1f15f281c..e35cc13068 100644 --- a/apps/web/playwright/settings-admin.e2e.ts +++ b/apps/web/playwright/settings-admin.e2e.ts @@ -5,7 +5,7 @@ import { test } from "./lib/fixtures"; test.describe.configure({ mode: "parallel" }); test.describe("Settings/admin A/B tests", () => { - test("should point to the /future/settings/admin page", async ({ page, users, context }) => { + test.skip("should point to the /future/settings/admin page", async ({ page, users, context }) => { await context.addCookies([ { name: "x-calcom-future-routes-override", diff --git a/apps/web/playwright/teams.e2e.ts b/apps/web/playwright/teams.e2e.ts index 9a8010236b..a7723dc163 100644 --- a/apps/web/playwright/teams.e2e.ts +++ b/apps/web/playwright/teams.e2e.ts @@ -7,6 +7,7 @@ import { MembershipRole, SchedulingType } from "@calcom/prisma/enums"; import { test } from "./lib/fixtures"; import { + NotFoundPageText, bookTimeSlot, fillStripeTestCheckout, selectFirstAvailableTimeSlotNextMonth, @@ -352,7 +353,7 @@ test.describe("Teams - Org", () => { await page.goto(`/team/${team.slug}/${teamEventSlug}`); - await expect(page.locator("text=This page could not be found")).toBeVisible(); + await expect(page.locator(`text=${NotFoundPageText}`)).toBeVisible(); await doOnOrgDomain( { orgSlug: org.slug, 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 f09d5f8345..7ee5e15737 100644 --- a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts +++ b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts @@ -3,7 +3,7 @@ import { expect } from "@playwright/test"; import type { Fixtures } from "@calcom/web/playwright/lib/fixtures"; import { test } from "@calcom/web/playwright/lib/fixtures"; -import { gotoRoutingLink } from "@calcom/web/playwright/lib/testUtils"; +import { NotFoundPageText, gotoRoutingLink } from "@calcom/web/playwright/lib/testUtils"; import { addForm, @@ -36,7 +36,7 @@ test.describe("Routing Forms", () => { await page.goto(`apps/routing-forms/route-builder/${formId}`); await disableForm(page); await gotoRoutingLink({ page, formId }); - await expect(page.locator("text=This page could not be found")).toBeVisible(); + await expect(page.locator(`text=${NotFoundPageText}`)).toBeVisible(); }); test("should be able to edit the form", async ({ page }) => {