From 41850c7f59f3b4f290babda567f64f9fb65e1b03 Mon Sep 17 00:00:00 2001 From: Meet Patel Date: Mon, 24 Jul 2023 19:44:28 +0530 Subject: [PATCH] fix: routing-forms protected with LicenseRequired (#9521) --- .../routing-forms/components/SingleForm.tsx | 7 +- .../pages/forms/[...appPages].tsx | 330 +++++++++--------- 2 files changed, 173 insertions(+), 164 deletions(-) diff --git a/packages/app-store/routing-forms/components/SingleForm.tsx b/packages/app-store/routing-forms/components/SingleForm.tsx index f3fb4031f3..2c965fffee 100644 --- a/packages/app-store/routing-forms/components/SingleForm.tsx +++ b/packages/app-store/routing-forms/components/SingleForm.tsx @@ -4,6 +4,7 @@ import { useEffect, useState } from "react"; import type { UseFormReturn } from "react-hook-form"; import { Controller, useFormContext } from "react-hook-form"; +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import { ShellMain } from "@calcom/features/shell/Shell"; import useApp from "@calcom/lib/hooks/useApp"; import { useLocale } from "@calcom/lib/hooks/useLocale"; @@ -540,7 +541,11 @@ export default function SingleFormWrapper({ form: _form, ...props }: SingleFormC if (!form) { throw new Error(t("something_went_wrong")); } - return ; + return ( + + + + ); } export const getServerSidePropsForSingleFormView = async function getServerSidePropsForSingleFormView( diff --git a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx index bd5c23a0ce..54345f2012 100644 --- a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx +++ b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx @@ -3,6 +3,7 @@ import { useRouter } from "next/router"; import { useEffect } from "react"; import { useFormContext } from "react-hook-form"; +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList"; import { FilterResults } from "@calcom/features/filters/components/FilterResults"; import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter"; @@ -119,182 +120,185 @@ export default function RoutingForms({ ]; return ( - : null} - subtitle={t("routing_forms_description")}> - } - buttons={ -
- - - - -
- }> - -
-
-
- -
- } - /> - } - noResultsScreen={ - - } - SkeletonLoader={SkeletonLoaderTeamList}> -
- - {forms?.map(({ form, readOnly }) => { - if (!form) { - return null; - } + + : null} + subtitle={t("routing_forms_description")}> + } + buttons={ +
+ + + + +
+ }> + +
+
+
+ +
+ } + /> + } + noResultsScreen={ + + } + SkeletonLoader={SkeletonLoaderTeamList}> +
+ + {forms?.map(({ form, readOnly }) => { + if (!form) { + return null; + } - const description = form.description || ""; - form.routes = form.routes || []; - const fields = form.fields || []; - const userRoutes = form.routes.filter((route) => !isFallbackRoute(route)); - return ( - - {form.team?.name && ( -
- - {form.team.name} - -
- )} - - - + const description = form.description || ""; + form.routes = form.routes || []; + const fields = form.fields || []; + const userRoutes = form.routes.filter((route) => !isFallbackRoute(route)); + return ( + + {form.team?.name && ( +
+ + {form.team.name} + +
+ )} + + + + + -
- - - - {t("edit")} - - - {t("download_responses")} - - - {t("duplicate")} - - {typeformApp?.isInstalled ? ( + action="embed" + color="secondary" + variant="icon" + StartIcon={Code} + tooltip={t("embed")} + /> + - {t("Copy Typeform Redirect Url")} + className="!flex" + StartIcon={Edit}> + {t("edit")} - ) : null} - - {t("delete")} - - -
- - }> -
- - {fields.length} {fields.length === 1 ? "field" : "fields"} - - - {userRoutes.length} {userRoutes.length === 1 ? "route" : "routes"} - - - {form._count.responses} {form._count.responses === 1 ? "response" : "responses"} - -
-
- ); - })} -
-
-
+ + {t("download_responses")} + + + {t("duplicate")} + + {typeformApp?.isInstalled ? ( + + {t("Copy Typeform Redirect Url")} + + ) : null} + + {t("delete")} + + + + + }> +
+ + {fields.length} {fields.length === 1 ? "field" : "fields"} + + + {userRoutes.length} {userRoutes.length === 1 ? "route" : "routes"} + + + {form._count.responses}{" "} + {form._count.responses === 1 ? "response" : "responses"} + +
+ + ); + })} + +
+ +
-
- - - + + + + ); }