From 2f9beed4503b53ac526ab84cc66c58e5f6c03d86 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sun, 26 Jan 2025 22:04:30 +0000
Subject: [PATCH] chore: migrate /apps/installation pages (#18870)

* migrate apps/installation pages

* fix test
---
 .../apps/installation/[[...step]]/page.tsx           |  7 +++++--
 apps/web/middleware.ts                               |  4 +---
 .../apps/installation/[[...step]]/step-view.tsx      |  7 -------
 apps/web/pages/apps/installation/[[...step]].tsx     | 12 ------------
 .../playwright/apps/analytics/analyticsApps.e2e.ts   |  3 ++-
 5 files changed, 8 insertions(+), 25 deletions(-)
 rename apps/web/app/{future => (use-page-wrapper)}/apps/installation/[[...step]]/page.tsx (80%)
 delete mode 100644 apps/web/pages/apps/installation/[[...step]].tsx

diff --git a/apps/web/app/future/apps/installation/[[...step]]/page.tsx b/apps/web/app/(use-page-wrapper)/apps/installation/[[...step]]/page.tsx
similarity index 80%
rename from apps/web/app/future/apps/installation/[[...step]]/page.tsx
rename to apps/web/app/(use-page-wrapper)/apps/installation/[[...step]]/page.tsx
index 650f732d9a..591b0d52d7 100644
--- a/apps/web/app/future/apps/installation/[[...step]]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/apps/installation/[[...step]]/page.tsx
@@ -1,7 +1,6 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
 import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import { cookies, headers } from "next/headers";
 
 import { getServerSideProps } from "@lib/apps/installation/[[...step]]/getServerSideProps";
@@ -22,4 +21,8 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
 
 const getData = withAppDirSsr<OnboardingPageProps>(getServerSideProps);
 
-export default WithLayout({ getLayout: null, getData, Page });
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return <Page {...props} />;
+};
+export default ServerPage;
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 9d1f39ecfd..827a91c761 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -171,11 +171,9 @@ export const config = {
 
     "/event-types/:path*",
     "/apps/installed/:category/",
-    "/future/apps/installed/:category/",
+    "/apps/installation/:path*",
     "/apps/:slug/",
-    "/future/apps/:slug/",
     "/apps/:slug/setup/",
-    "/future/apps/:slug/setup/",
     "/apps/categories/",
     "/apps/categories/:category/",
     "/workflows/:path*",
diff --git a/apps/web/modules/apps/installation/[[...step]]/step-view.tsx b/apps/web/modules/apps/installation/[[...step]]/step-view.tsx
index d5937d3251..6245054a03 100644
--- a/apps/web/modules/apps/installation/[[...step]]/step-view.tsx
+++ b/apps/web/modules/apps/installation/[[...step]]/step-view.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import Head from "next/head";
 import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -226,12 +225,6 @@ const OnboardingPage = ({
       key={pathname}
       className="dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen px-4"
       data-testid="onboarding">
-      <Head>
-        <title>
-          {t("install")} {appMetadata?.name ?? ""}
-        </title>
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
       <div className="mx-auto py-6 sm:px-4 md:py-24">
         <div className="relative">
           <div className="sm:mx-auto sm:w-full sm:max-w-[600px]" ref={formPortalRef}>
diff --git a/apps/web/pages/apps/installation/[[...step]].tsx b/apps/web/pages/apps/installation/[[...step]].tsx
deleted file mode 100644
index d50152f1be..0000000000
--- a/apps/web/pages/apps/installation/[[...step]].tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import PageWrapper from "@components/PageWrapper";
-
-import type { OnboardingPageProps } from "~/apps/installation/[[...step]]/step-view";
-import StepView from "~/apps/installation/[[...step]]/step-view";
-
-const Page = (props: OnboardingPageProps) => <StepView {...props} />;
-
-Page.PageWrapper = PageWrapper;
-
-export { getServerSideProps } from "@lib/apps/installation/[[...step]]/getServerSideProps";
-
-export default Page;
diff --git a/apps/web/playwright/apps/analytics/analyticsApps.e2e.ts b/apps/web/playwright/apps/analytics/analyticsApps.e2e.ts
index b0838416d9..7dff3a5e19 100644
--- a/apps/web/playwright/apps/analytics/analyticsApps.e2e.ts
+++ b/apps/web/playwright/apps/analytics/analyticsApps.e2e.ts
@@ -17,7 +17,8 @@ test.describe("check analytics Apps", () => {
         await user.apiLogin();
         await page.goto("apps/categories/analytics");
         await appsPage.installAnalyticsAppSkipConfigure(app);
-
+        // eslint-disable-next-line playwright/no-wait-for-timeout
+        await page.waitForTimeout(1000); // waits for 1 second
         await page.goto("/event-types");
         await appsPage.goToEventType("30 min");
         await appsPage.goToAppsTab();