8000 chore: Remove Pages Router / Use App Router - `/workflows` (#16519) · calcom/cal.com@ce9df65 · GitHub
[go: up one dir, main page]
Skip to content

Commit ce9df65

Browse files
hbjORbjhbjORbj
authored
chore: Remove Pages Router / Use App Router - /workflows (#16519)
* /workflows: Remove Pages Router / Render App Router * fix * unneeded changes * disable server side fetching for now * revert unneeded changes
1 parent fc6e39c commit ce9df65

File tree

11 files changed

+63
-91
lines changed

11 files changed

+63
-91
lines changed

‎.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ APP_ROUTER_APPS_CATEGORIES_ENABLED=0
357357
APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
358358
APP_ROUTER_BOOKING_ENABLED=0
359359
APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
360-
APP_ROUTER_WORKFLOWS_ENABLED=0
361360
APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
362361
APP_ROUTER_VIDEO_ENABLED=0
363362
APP_ROUTER_TEAM_ENABLED=0

‎apps/web/abTest/middlewareFactory.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const ROUTES: [URLPattern, boolean][] = [
2020
["/auth/error", process.env.APP_ROUTER_AUTH_ERROR_ENABLED === "1"] as const,
2121
["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const,
2222
["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const,
23-
["/workflows/:path*", process.env.APP_ROUTER_WORKFLOWS_ENABLED === "1"] as const,
2423
["/getting-started/:step", process.env.APP_ROUTER_GETTING_STARTED_STEP_ENABLED === "1"] as const,
2524
["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const,
2625
["/booking/:path*", process.env.APP_ROUTER_BOOKING_ENABLED === "1"] as const,

‎apps/web/app/future/workflows/page.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎apps/web/app/future/workflows/[workflow]/page.tsx renamed to ‎apps/web/app/workflows/[workflow]/page.tsx

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { WithLayout } from "app/layoutHOC";
44
import { notFound } from "next/navigation";
55
import { z } from "zod";
66

7-
import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
7+
// import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
88
import LegacyPage from "@calcom/features/ee/workflows/pages/workflow";
99
import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
1010

@@ -21,7 +21,7 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
2121
const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow });
2222

2323
return await _generateMetadata(
24-
() => (workflow && workflow.name ? workflow.name : "Untitled"),
24+
(t) => (workflow && workflow.name ? workflow.name : t("untitled")),
2525
() => ""
2626
);
2727
};
@@ -30,31 +30,33 @@ export const generateStaticParams = () => [];
3030

3131
const Page = async ({ params, searchParams }: PageProps) => {
3232
// FIXME: Refactor me once next-auth endpoint is migrated to App Router
33-
const session = await getServerSessionForAppDir();
34-
const user = session?.user;
33+
// const session = await getServerSessionForAppDir();
34+
// const user = session?.user;
3535
const parsed = querySchema.safeParse({ ...params, ...searchParams });
3636
if (!parsed.success) {
3737
notFound();
3838
}
3939

40-
const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow });
41-
let verifiedEmails, verifiedNumbers;
42-
try {
43-
verifiedEmails = await WorkflowRepository.getVerifiedEmails({
44-
userEmail: user?.email ?? null,
45-
userId: user?.id ?? null,
46-
teamId: workflow?.team?.id,
47-
});
48-
} catch (err) {}
49-
try {
50-
verifiedNumbers = await WorkflowRepository.getVerifiedNumbers({
51-
userId: user?.id ?? null,
52-
teamId: workflow?.team?.id,
53-
});
54-
} catch (err) {}
40+
// const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow });
41+
// let verifiedEmails, verifiedNumbers;
42+
// try {
43+
// verifiedEmails = await WorkflowRepository.getVerifiedEmails({
44+
// userEmail: user?.email ?? null,
45+
// userId: user?.id ?? null,
46+
// teamId: workflow?.team?.id,
47+
// });
48+
// } catch (err) {}
49+
// try {
50+
// verifiedNumbers = await WorkflowRepository.getVerifiedNumbers({
51+
// userId: user?.id ?? null,
52+
// teamId: workflow?.team?.id,
53+
// });
54+
// } catch (err) {}
5555

5656
return (
57-
<LegacyPage workflowData={workflow} verifiedEmails={verifiedEmails} verifiedNumbers={verifiedNumbers} />
57+
<LegacyPage
58+
// workflowData={workflow} verifiedEmails={verifiedEmails} verifiedNumbers={verifiedNumbers}
59+
/>
5860
);
5961
};
6062

‎apps/web/app/workflows/page.tsx

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import type { PageProps } from "app/_types";
2+
import { _generateMetadata } from "app/_utils";
3+
import { WithLayout } from "app/layoutHOC";
4+
5+
// import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
6+
// import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
7+
// import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
8+
import LegacyPage from "@calcom/features/ee/workflows/pages/index";
9+
10+
export const generateMetadata = async () =>
11+
await _generateMetadata(
12+
(t) => t("workflows"),
13+
(t) => t("workflows_to_automate_notifications")
14+
);
15+
16+
const Page = async ({ params, searchParams }: PageProps) => {
17+
// FIXME: Refactor me once next-auth endpoint is migrated to App Router
18+
// const session = await getServerSessionForAppDir();
19+
// const user = session?.user;
20+
21+
// const filters = getTeamsFiltersFromQuery({ ...searchParams, ...params });
22+
23+
// let filteredList;
24+
// try {
25+
// filteredList = await WorkflowRepository.getFilteredList({
26+
// userId: user?.id,
27+
// input: {
28+
// filters,
29+
// },
30+
// });
31+
// } catch (err) {}
32+
33+
return (
34+
<LegacyPage
35+
// filteredList={filteredList}
36+
/>
37+
);
38+
};
39+
40+
export default WithLayout({ getLayout: null, ServerPage: Page })<"P">;

‎apps/web/middleware.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ export const config = {
177177
"/apps/categories/:category/",
178178
"/future/apps/categories/:category/",
179179
"/workflows/:path*",
180-
"/future/workflows/:path*",
181180
"/getting-started/:step/",
182181
"/future/getting-started/:step/",
183182
"/apps",

‎apps/web/pages/workflows/[workflow].tsx

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎apps/web/pages/workflows/index.tsx

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎apps/web/public/static/locales/en/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"second_one": "{{count}} second",
77
"second_other": "{{count}} seconds",
88
"upgrade_now": "Upgrade now",
9+
"untitled": "Untitled",
910
"accept_invitation": "Accept Invitation",
1011
"max_characters": "Max. Characters",
1112
"min_characters": "Min. Characters",

‎apps/web/scripts/vercel-app-router-deploy.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ checkRoute "$APP_ROUTER_AUTH_SAML_ENABLED" app/future/auth/saml-idp
2121
checkRoute "$APP_ROUTER_AUTH_ERROR_ENABLED" app/future/auth/error
2222
checkRoute "$APP_ROUTER_AUTH_PLATFORM_ENABLED" app/future/auth/platform
2323
checkRoute "$APP_ROUTER_AUTH_OAUTH2_ENABLED" app/future/auth/oauth2
24-
checkRoute "$APP_ROUTER_WORKFLOWS_ENABLED" app/future/workflows
2524
checkRoute "$APP_ROUTER_GETTING_STARTED_STEP_ENABLED" app/future/getting-started
2625
checkRoute "$APP_ROUTER_BOOKINGS_STATUS_ENABLED" app/future/bookings
2726
checkRoute "$APP_ROUTER_BOOKING_ENABLED" app/future/booking

0 commit comments

Comments
 (0)
0