Revert "feat: new App install flow (#11975)" (#14540)

calcom · Apr 11, 2024 · 5071e65 · 5071e65
1 parent ac77fe3
commit 5071e65
Show file tree

Hide file tree

Showing 146 changed files with 698 additions and 2,151 deletions.
diff --git a/apps/api/v2/tsconfig.json b/apps/api/v2/tsconfig.json
@@ -23,6 +23,6 @@
     "forceConsistentCasingInFileNames": false,
     "noFallthroughCasesInSwitch": false
   },
-  "exclude": ["./dist"],
-  "include": ["./**/*.ts", "../../../packages/types/*.d.ts", "next-i18next.config.js"]
+  "exclude": ["./dist", "next-i18next.config.js"],
+  "include": ["./**/*.ts", "../../../packages/types/*.d.ts"]
 }
diff --git a/apps/web/components/apps/AppPage.tsx b/apps/web/components/apps/AppPage.tsx
@@ -21,7 +21,6 @@ export type AppPageProps = {
   isGlobal?: AppType["isGlobal"];
   logo: string;
   slug: string;
-  dirName: string | undefined;
   variant: string;
   body: React.ReactNode;
   categories: string[];
@@ -69,7 +68,6 @@ export const AppPage = ({
   dependencies,
   concurrentMeetings,
   paid,
-  dirName,
 }: AppPageProps) => {
   const { t, i18n } = useLocale();
   const hasDescriptionItems = descriptionItems && descriptionItems.length > 0;
@@ -225,7 +223,6 @@ export const AppPage = ({
                         multiInstall
                         concurrentMeetings={concurrentMeetings}
                         paid={paid}
-                        dirName={dirName}
                         {...props}
                       />
                     );
@@ -265,7 +262,6 @@ export const AppPage = ({
                     credentials={appDbQuery.data?.credentials}
                     concurrentMeetings={concurrentMeetings}
                     paid={paid}
-                    dirName={dirName}
                     {...props}
                   />
                 );

diff --git a/apps/web/components/apps/InstallAppButtonChild.tsx b/apps/web/components/apps/InstallAppButtonChild.tsx
@@ -1,14 +1,7 @@
-import { useRouter } from "next/navigation";
-import { useMemo } from "react";
-
 import useAddAppMutation from "@calcom/app-store/_utils/useAddAppMutation";
-import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
 import { doesAppSupportTeamInstall } from "@calcom/app-store/utils";
 import { Spinner } from "@calcom/features/calendars/weeklyview/components/spinner/Spinner";
 import type { UserAdminTeams } from "@calcom/features/ee/teams/lib/getUserAdminTeams";
-import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
-import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl";
-import { shouldRedirectToAppOnboarding } from "@calcom/lib/apps/shouldRedirectToAppOnboarding";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RouterOutputs } from "@calcom/trpc/react";
@@ -33,9 +26,7 @@ export const InstallAppButtonChild = ({
   multiInstall,
   credentials,
   concurrentMeetings,
-  dirName,
   paid,
-  onClick,
   ...props
 }: {
   userAdminTeams?: UserAdminTeams;
@@ -45,10 +36,8 @@ export const InstallAppButtonChild = ({
   credentials?: RouterOutputs["viewer"]["appCredentialsByType"]["credentials"];
   concurrentMeetings?: boolean;
   paid?: AppFrontendPayload["paid"];
-  dirName: string | undefined;
 } & ButtonProps) => {
   const { t } = useLocale();
-  const router = useRouter();
 
   const mutation = useAddAppMutation(null, {
     onSuccess: (data) => {
@@ -60,26 +49,13 @@ export const InstallAppButtonChild = ({
     },
   });
   const shouldDisableInstallation = !multiInstall ? !!(credentials && credentials.length) : false;
-  const appMetadata = appStoreMetadata[dirName as keyof typeof appStoreMetadata];
-  const redirectToAppOnboarding = useMemo(() => shouldRedirectToAppOnboarding(appMetadata), [appMetadata]);
-
-  const _onClick = (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
-    if (redirectToAppOnboarding) {
-      router.push(
-        getAppOnboardingUrl({ slug: addAppMutationInput.slug, step: AppOnboardingSteps.ACCOUNTS_STEP })
-      );
-    } else if (onClick) {
-      onClick(e);
-    }
-  };
 
   // Paid apps don't support team installs at the moment
   // Also, cal.ai(the only paid app at the moment) doesn't support team install either
   if (paid) {
     return (
       <Button
         data-testid="install-app-button"
-        onClick={_onClick}
         {...props}
         disabled={shouldDisableInstallation}
         color="primary"
@@ -96,7 +72,6 @@ export const InstallAppButtonChild = ({
     return (
       <Button
         data-testid="install-app-button"
-        onClick={_onClick}
         {...props}
         // @TODO: Overriding color and size prevent us from
         // having to duplicate InstallAppButton for now.
@@ -108,19 +83,6 @@ export const InstallAppButtonChild = ({
     );
   }
 
-  if (redirectToAppOnboarding) {
-    return (
-      <Button
-        data-testid="install-app-button"
-        disabled={shouldDisableInstallation}
-        onClick={_onClick}
-        color="primary"
-        size="base"
-        {...props}>
-        {multiInstall ? t("install_another") : t("install_app")}
-      </Button>
-    );
-  }
   return (
     <Dropdown>
       <DropdownMenuTrigger asChild>

diff --git a/apps/web/components/apps/installation/AccountsStepCard.tsx b/apps/web/components/apps/installation/AccountsStepCard.tsx