diff --git a/.env.example b/.env.example index f832808a1c..70c5d0805e 100644 --- a/.env.example +++ b/.env.example @@ -357,7 +357,6 @@ APP_ROUTER_APPS_CATEGORIES_ENABLED=0 APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0 APP_ROUTER_BOOKING_ENABLED=0 APP_ROUTER_BOOKINGS_STATUS_ENABLED=0 -APP_ROUTER_WORKFLOWS_ENABLED=0 APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0 APP_ROUTER_VIDEO_ENABLED=0 APP_ROUTER_TEAM_ENABLED=0 diff --git a/apps/web/abTest/middlewareFactory.ts b/apps/web/abTest/middlewareFactory.ts index 7cedf24458..ae9d7d49cc 100644 --- a/apps/web/abTest/middlewareFactory.ts +++ b/apps/web/abTest/middlewareFactory.ts @@ -20,7 +20,6 @@ const ROUTES: [URLPattern, boolean][] = [ ["/auth/error", process.env.APP_ROUTER_AUTH_ERROR_ENABLED === "1"] as const, ["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const, ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const, - ["/workflows/:path*", process.env.APP_ROUTER_WORKFLOWS_ENABLED === "1"] as const, ["/getting-started/:step", process.env.APP_ROUTER_GETTING_STARTED_STEP_ENABLED === "1"] as const, ["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const, ["/booking/:path*", process.env.APP_ROUTER_BOOKING_ENABLED === "1"] as const, diff --git a/apps/web/app/future/workflows/page.tsx b/apps/web/app/future/workflows/page.tsx deleted file mode 100644 index 7c869e031d..0000000000 --- a/apps/web/app/future/workflows/page.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import type { PageProps } from "app/_types"; -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; -import LegacyPage from "@calcom/features/ee/workflows/pages/index"; -import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; -import { WorkflowRepository } from "@calcom/lib/server/repository/workflow"; - -export const generateMetadata = async () => - await _generateMetadata( - (t) => t("workflows"), - (t) => t("workflows_to_automate_notifications") - ); - -const Page = async ({ params, searchParams }: PageProps) => { - // FIXME: Refactor me once next-auth endpoint is migrated to App Router - const session = await getServerSessionForAppDir(); - const user = session?.user; - - const filters = getTeamsFiltersFromQuery({ ...searchParams, ...params }); - - let filteredList; - try { - filteredList = await WorkflowRepository.getFilteredList({ - userId: user?.id, - input: { - filters, - }, - }); - } catch (err) {} - - return ; -}; - -export default WithLayout({ getLayout: null, ServerPage: Page })<"P">; diff --git a/apps/web/app/future/workflows/[workflow]/page.tsx b/apps/web/app/workflows/[workflow]/page.tsx similarity index 57% rename from apps/web/app/future/workflows/[workflow]/page.tsx rename to apps/web/app/workflows/[workflow]/page.tsx index e09a9562f9..b388976106 100644 --- a/apps/web/app/future/workflows/[workflow]/page.tsx +++ b/apps/web/app/workflows/[workflow]/page.tsx @@ -4,7 +4,7 @@ import { WithLayout } from "app/layoutHOC"; import { notFound } from "next/navigation"; import { z } from "zod"; -import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; +// import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import LegacyPage from "@calcom/features/ee/workflows/pages/workflow"; import { WorkflowRepository } from "@calcom/lib/server/repository/workflow"; @@ -21,7 +21,7 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => { const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow }); return await _generateMetadata( - () => (workflow && workflow.name ? workflow.name : "Untitled"), + (t) => (workflow && workflow.name ? workflow.name : t("untitled")), () => "" ); }; @@ -30,31 +30,33 @@ export const generateStaticParams = () => []; const Page = async ({ params, searchParams }: PageProps) => { // FIXME: Refactor me once next-auth endpoint is migrated to App Router - const session = await getServerSessionForAppDir(); - const user = session?.user; + // const session = await getServerSessionForAppDir(); + // const user = session?.user; const parsed = querySchema.safeParse({ ...params, ...searchParams }); if (!parsed.success) { notFound(); } - const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow }); - let verifiedEmails, verifiedNumbers; - try { - verifiedEmails = await WorkflowRepository.getVerifiedEmails({ - userEmail: user?.email ?? null, - userId: user?.id ?? null, - teamId: workflow?.team?.id, - }); - } catch (err) {} - try { - verifiedNumbers = await WorkflowRepository.getVerifiedNumbers({ - userId: user?.id ?? null, - teamId: workflow?.team?.id, - }); - } catch (err) {} + // const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow }); + // let verifiedEmails, verifiedNumbers; + // try { + // verifiedEmails = await WorkflowRepository.getVerifiedEmails({ + // userEmail: user?.email ?? null, + // userId: user?.id ?? null, + // teamId: workflow?.team?.id, + // }); + // } catch (err) {} + // try { + // verifiedNumbers = await WorkflowRepository.getVerifiedNumbers({ + // userId: user?.id ?? null, + // teamId: workflow?.team?.id, + // }); + // } catch (err) {} return ( - + ); }; diff --git a/apps/web/app/workflows/page.tsx b/apps/web/app/workflows/page.tsx new file mode 100644 index 0000000000..2397d58adf --- /dev/null +++ b/apps/web/app/workflows/page.tsx @@ -0,0 +1,40 @@ +import type { PageProps } from "app/_types"; +import { _generateMetadata } from "app/_utils"; +import { WithLayout } from "app/layoutHOC"; + +// import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; +// import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; +// import { WorkflowRepository } from "@calcom/lib/server/repository/workflow"; +import LegacyPage from "@calcom/features/ee/workflows/pages/index"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("workflows"), + (t) => t("workflows_to_automate_notifications") + ); + +const Page = async ({ params, searchParams }: PageProps) => { + // FIXME: Refactor me once next-auth endpoint is migrated to App Router + // const session = await getServerSessionForAppDir(); + // const user = session?.user; + + // const filters = getTeamsFiltersFromQuery({ ...searchParams, ...params }); + + // let filteredList; + // try { + // filteredList = await WorkflowRepository.getFilteredList({ + // userId: user?.id, + // input: { + // filters, + // }, + // }); + // } catch (err) {} + + return ( + + ); +}; + +export default WithLayout({ getLayout: null, ServerPage: Page })<"P">; diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index dbcd774eda..651855f607 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -177,7 +177,6 @@ export const config = { "/apps/categories/:category/", "/future/apps/categories/:category/", "/workflows/:path*", - "/future/workflows/:path*", "/getting-started/:step/", "/future/getting-started/:step/", "/apps", diff --git a/apps/web/pages/workflows/[workflow].tsx b/apps/web/pages/workflows/[workflow].tsx deleted file mode 100644 index 0ecfc1b7eb..0000000000 --- a/apps/web/pages/workflows/[workflow].tsx +++ /dev/null @@ -1,21 +0,0 @@ -import type { GetStaticPaths } from "next"; - -import Workflow from "@calcom/features/ee/workflows/pages/workflow"; - -import { getStaticProps } from "@lib/workflows/[workflow]/getStaticProps"; - -import PageWrapper from "@components/PageWrapper"; -import type { CalPageWrapper } from "@components/PageWrapper"; - -export const getStaticPaths: GetStaticPaths = () => { - return { - paths: [], - fallback: "blocking", - }; -}; - -const WorkflowsPage = Workflow as CalPageWrapper; -WorkflowsPage.PageWrapper = PageWrapper; - -export default WorkflowsPage; -export { getStaticProps }; diff --git a/apps/web/pages/workflows/index.tsx b/apps/web/pages/workflows/index.tsx deleted file mode 100644 index 6112df1592..0000000000 --- a/apps/web/pages/workflows/index.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import Workflows from "@calcom/features/ee/workflows/pages/index"; - -import PageWrapper from "@components/PageWrapper"; -import type { CalPageWrapper } from "@components/PageWrapper"; - -const WorkflowsPage = Workflows as CalPageWrapper; -WorkflowsPage.PageWrapper = PageWrapper; - -export default WorkflowsPage; diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 70cd3e6bd9..4c7119fe76 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -6,6 +6,7 @@ "second_one": "{{count}} second", "second_other": "{{count}} seconds", "upgrade_now": "Upgrade now", + "untitled": "Untitled", "accept_invitation": "Accept Invitation", "max_characters": "Max. Characters", "min_characters": "Min. Characters", diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh index 2942c04061..464c79f929 100755 --- a/apps/web/scripts/vercel-app-router-deploy.sh +++ b/apps/web/scripts/vercel-app-router-deploy.sh @@ -21,7 +21,6 @@ checkRoute "$APP_ROUTER_AUTH_SAML_ENABLED" app/future/auth/saml-idp checkRoute "$APP_ROUTER_AUTH_ERROR_ENABLED" app/future/auth/error checkRoute "$APP_ROUTER_AUTH_PLATFORM_ENABLED" app/future/auth/platform checkRoute "$APP_ROUTER_AUTH_OAUTH2_ENABLED" app/future/auth/oauth2 -checkRoute "$APP_ROUTER_WORKFLOWS_ENABLED" app/future/workflows checkRoute "$APP_ROUTER_GETTING_STARTED_STEP_ENABLED" app/future/getting-started checkRoute "$APP_ROUTER_BOOKINGS_STATUS_ENABLED" app/future/bookings checkRoute "$APP_ROUTER_BOOKING_ENABLED" app/future/booking diff --git a/turbo.json b/turbo.json index 2080fdc2c2..578a80ac50 100644 --- a/turbo.json +++ b/turbo.json @@ -241,7 +241,6 @@ "APP_ROUTER_BOOKINGS_STATUS_ENABLED", "APP_ROUTER_EVENT_TYPES_ENABLED", "APP_ROUTER_GETTING_STARTED_STEP_ENABLED", - "APP_ROUTER_WORKFLOWS_ENABLED", "APP_ROUTER_VIDEO_ENABLED", "APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED", "APP_ROUTER_AUTH_LOGIN_ENABLED",