fix: type error in `settings/admin` in app router (#12638)

This commit is contained in:
Benny Joo 2023-12-04 23:31:36 +00:00 committed by GitHub
parent d185d7f7d8
commit bb7057ea04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 19 additions and 28 deletions

View File

@ -1,13 +1,11 @@
import Page from "@pages/settings/admin/organizations/index";
import { _generateMetadata } from "app/_utils"; import { _generateMetadata } from "app/_utils";
import Page from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
export const generateMetadata = async () => export const generateMetadata = async () =>
await _generateMetadata( await _generateMetadata(
(t) => t("organizations"), (t) => t("organizations"),
(t) => t("orgs_page_description") (t) => t("orgs_page_description")
); );
export default function AppPage() { export default Page;
// @ts-expect-error FIXME Property 'Component' is incompatible with index signature
return <Page />;
}

View File

@ -1,10 +1,10 @@
import Page from "@pages/settings/admin/users/[id]/edit";
import { getServerCaller } from "app/_trpc/serverClient"; import { getServerCaller } from "app/_trpc/serverClient";
import { type Params } from "app/_types"; import { type Params } from "app/_types";
import { _generateMetadata } from "app/_utils"; import { _generateMetadata } from "app/_utils";
import { cookies, headers } from "next/headers"; import { cookies, headers } from "next/headers";
import { z } from "zod"; import { z } from "zod";
import Page from "@calcom/features/ee/users/pages/users-edit-view";
import prisma from "@calcom/prisma"; import prisma from "@calcom/prisma";
const userIdSchema = z.object({ id: z.coerce.number() }); const userIdSchema = z.object({ id: z.coerce.number() });
@ -33,7 +33,4 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
); );
}; };
export default function AppPage() { export default Page;
// @ts-expect-error FIXME AppProps | undefined' does not satisfy the constraint 'PageProps'
return <Page />;
}

View File

@ -1,13 +1,11 @@
import Page from "@pages/settings/admin/users/add";
import { _generateMetadata } from "app/_utils"; import { _generateMetadata } from "app/_utils";
import Page from "@calcom/features/ee/users/pages/users-add-view";
export const generateMetadata = async () => export const generateMetadata = async () =>
await _generateMetadata( await _generateMetadata(
() => "Add new user", () => "Add new user",
() => "Here you can add a new user." () => "Here you can add a new user."
); );
export default function AppPage() { export default Page;
// @ts-expect-error FIXME AppProps | undefined' does not satisfy the constraint 'PageProps'
return <Page />;
}

View File

@ -1,13 +1,11 @@
import Page from "@pages/settings/admin/users/index";
import { _generateMetadata } from "app/_utils"; import { _generateMetadata } from "app/_utils";
import Page from "@calcom/features/ee/users/pages/users-listing-view";
export const generateMetadata = async () => export const generateMetadata = async () =>
await _generateMetadata( await _generateMetadata(
() => "Users", () => "Users",
() => "A list of all the users in your account including their name, title, email and role." () => "A list of all the users in your account including their name, title, email and role."
); );
export default function AppPage() { export default Page;
// @ts-expect-error FIXME Property 'Component' is incompatible with index signature
return <Page />;
}

View File

@ -1,5 +1,3 @@
"use client";
import AdminOrgsPage from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage"; import AdminOrgsPage from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
import type { CalPageWrapper } from "@components/PageWrapper"; import type { CalPageWrapper } from "@components/PageWrapper";

View File

@ -1,5 +1,3 @@
"use client";
import UsersEditView from "@calcom/features/ee/users/pages/users-edit-view"; import UsersEditView from "@calcom/features/ee/users/pages/users-edit-view";
import type { CalPageWrapper } from "@components/PageWrapper"; import type { CalPageWrapper } from "@components/PageWrapper";

View File

@ -1,5 +1,3 @@
"use client";
import UsersAddView from "@calcom/features/ee/users/pages/users-add-view"; import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
import type { CalPageWrapper } from "@components/PageWrapper"; import type { CalPageWrapper } from "@components/PageWrapper";

View File

@ -1,5 +1,3 @@
"use client";
import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view"; import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
import type { CalPageWrapper } from "@components/PageWrapper"; import type { CalPageWrapper } from "@components/PageWrapper";

View File

@ -1,3 +1,5 @@
"use client";
import NoSSR from "@calcom/core/components/NoSSR"; import NoSSR from "@calcom/core/components/NoSSR";
import LicenseRequired from "@calcom/ee/common/components/LicenseRequired"; import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
import { extractDomainFromWebsiteUrl } from "@calcom/ee/organizations/lib/utils"; import { extractDomainFromWebsiteUrl } from "@calcom/ee/organizations/lib/utils";

View File

@ -1,3 +1,5 @@
"use client";
import { usePathname, useRouter } from "next/navigation"; import { usePathname, useRouter } from "next/navigation";
import { getParserWithGeneric } from "@calcom/prisma/zod-utils"; import { getParserWithGeneric } from "@calcom/prisma/zod-utils";

View File

@ -1,3 +1,5 @@
"use client";
import { usePathname, useRouter } from "next/navigation"; import { usePathname, useRouter } from "next/navigation";
import { z } from "zod"; import { z } from "zod";

View File

@ -1,3 +1,5 @@
"use client";
import NoSSR from "@calcom/core/components/NoSSR"; import NoSSR from "@calcom/core/components/NoSSR";
import { Button, Meta } from "@calcom/ui"; import { Button, Meta } from "@calcom/ui";