maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <hariombalhara@gmail.com>
This commit is contained in:
Udit Takkar 2023-12-15 18:51:38 +05:30 committed by GitHub
parent b778b2962a
commit 6e829e23f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/_app/_trpc/HydrateClient.tsx
View File

@ -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({

4
apps/web/_app/_trpc/trpc-provider.tsx
View File

@ -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";

2
apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx
View File

@ -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";

2
apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx
View File

@ -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";

2
apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx
View File

@ -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";

4
apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx
View File

@ -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";

2
apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx
View File

@ -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";

2
apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx
View File

@ -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(

2
apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
View File

@ -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";

6
apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
View File

@ -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";

2
apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
View File

@ -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";

2
apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
View File

@ -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";

2
apps/web/lib/app-providers-app-dir.tsx
View File

@ -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";

2
apps/web/playwright/ab-tests-redirect.e2e.ts
View File

@ -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([
{

2
apps/web/playwright/event-types.e2e.ts
View File

@ -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",

2
apps/web/playwright/lib/future-legacy-routes.ts
View File

@ -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().

4
apps/web/playwright/lib/testUtils.ts
View File

@ -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";

2
apps/web/playwright/settings-admin.e2e.ts
View File

@ -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",

3
apps/web/playwright/teams.e2e.ts
View File

@ -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,

4
packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
View File

@ -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 }) => {