Merge branch 'fix-custom-event-redirect-routing-forms' of https://github.com/calcom/cal.com into fix-custom-event-redirect-routing-forms

Author: hariombalhara

packages/app-store/routing-forms/__tests__/TestFormDialog.test.tsx

@@ -256,12 +256,6 @@ describe("TestFormDialog", () => {
 
     it("submits the form and shows test results for Event Type", async () => {
       mockEventTypeRedirectUrlMatchingRoute();
-      mockFindTeamMembersMatchingAttributeLogicResponse({
-        result: {
-          users: [{ email: "[email protected]" }],
-        },
-        checkedFallback: false,
-      });
       render(
         <TestFormRenderer
           isMobile={true}

packages/app-store/routing-forms/components/_components/TestForm.tsx

@@ -16,7 +16,6 @@ import { showToast } from "@calcom/ui/components/toast";
 
 import { TRPCClientError } from "@trpc/react-query";
 
-import { getAbsoluteEventTypeRedirectUrl } from "../../getEventTypeRedirectUrl";
 import { findMatchingRoute } from "../../lib/processRoute";
 import { substituteVariables } from "../../lib/substituteVariables";
 import type { SingleFormComponentProps } from "../../types/shared";
@@ -93,7 +92,6 @@ export const TestForm = ({
   const { t } = useLocale();
   const [response, setResponse] = useState<FormResponse>({});
   const [chosenRoute, setChosenRoute] = useState<NonRouterRoute | null>(null);
-  const [eventTypeUrlWithoutParams, setEventTypeUrlWithoutParams] = useState("");
   const searchParams = useCompatSearchParams();
   const [membersMatchResult, setMembersMatchResult] = useState<MembersMatchResultType | null>(null);
   const [showResults, setShowResults] = useState(false);
@@ -129,7 +127,6 @@ export const TestForm = ({
 
   function testRouting() {
     const route = findMatchingRoute({ form, response });
-    let eventTypeRedirectUrl: string | null = null;
 
     // Create a copy of the route with substituted variables for display
     let displayRoute = route;
@@ -142,22 +139,14 @@ export const TestForm = ({
           value: substitutedUrl,
         },
       };
-
-      if ("team" in form) {
-        eventTypeRedirectUrl = getAbsoluteEventTypeRedirectUrl({
-          eventTypeRedirectUrl: substitutedUrl,
-          form,
-          allURLSearchParams: new URLSearchParams(),
-        });
-        setEventTypeUrlWithoutParams(eventTypeRedirectUrl);
-      }
     }
 
     setChosenRoute(displayRoute || null);
     setShowResults(true);
 
     if (!route) return;
 
+    // Custom Event Type Redirect URL has eventTypeId=0. Also, findTeamMembersMatchingAttributeLogicMutation can't work without eventTypeId
     if (supportsTeamMembersMatchingLogic && route.action.eventTypeId) {
       findTeamMembersMatchingAttributeLogicMutation.mutate({
         formId: form.id,

packages/app-store/routing-forms/lib/reportingUtils.ts

@@ -137,11 +137,7 @@ function RoutingForm({ form, profile, ...restProps }: Props) {
       if (decidedAction.type === "customPageMessage") {
         setCustomPageMessage(decidedAction.value);
       } else if (decidedAction.type === "eventTypeRedirectUrl") {
-        const eventTypeUrlWithResolvedVariables = substituteVariables(
-          decidedAction.value,
-          chosenRouteWithFormResponse.response,
-          fields
-        );
+        const eventTypeUrlWithResolvedVariables = substituteVariables(decidedAction.value, response, fields);
         router.push(
           getAbsoluteEventTypeRedirectUrlWithEmbedSupport({
             form,

packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx

@@ -9,7 +9,6 @@ import { ZFormQueryInputSchema } from "./formQuery.schema";
 import { ZGetAttributesForTeamInputSchema } from "./getAttributesForTeam.schema";
 import { ZGetIncompleteBookingSettingsInputSchema } from "./getIncompleteBookingSettings.schema";
 import { forms } from "./procedures/forms";
-import { ZReportInputSchema } from "./report.schema";
 import { ZSaveIncompleteBookingSettingsInputSchema } from "./saveIncompleteBookingSettings.schema";
 
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -76,11 +75,6 @@ const appRoutingForms = router({
     return handler({ ctx, input });
   }),
 
-  report: authedProcedure.input(ZReportInputSchema).query(async ({ ctx, input }) => {
-    const handler = await getHandler("report", () => import("./report.handler"));
-    return handler({ ctx, input });
-  }),
-
   getAttributesForTeam: authedProcedure
     .input(ZGetAttributesForTeamInputSchema)
     .query(async ({ ctx, input }) => {

packages/app-store/routing-forms/trpc/_router.ts

@@ -1,7 +1,57 @@
 import type { Field, FormResponse } from "@calcom/app-store/routing-forms/types/types";
 
-import { ensureStringOrStringArray } from "./ensureStringOrStringArray";
-import { getLabelsFromOptionIds } from "./getLabelsFromOptionIds";
+/**
+ * Ensures a value is either a string or string array.
+ * Converts numbers to strings.
+ *
+ * @param value - The value to normalize
+ * @returns String or string array
+ */
+
+function ensureStringOrStringArray(value: string | number | (string | number)[]): string | string[] {
+  if (typeof value === "string") {
+    return value;
+  } else if (value instanceof Array) {
+    return value.map((v) => v.toString());
+  }
+  return [value.toString()];
+}
+
+/**
+ * Get labels from option IDs for fields with options (select, multiselect, radio).
+ * Handles legacy cases where the value might already be a label.
+ *
+ * @param options - The field options array
+ * @param optionIds - The option ID(s) to get labels for
+ * @returns The label(s) corresponding to the option ID(s)
+ */
+
+function getLabelsFromOptionIds({
+  options,
+  optionIds,
+}: {
+  options: NonNullable<Field["options"]>;
+  optionIds: string | string[];
+}) {
+  if (optionIds instanceof Array) {
+    const labels = optionIds.map((optionId) => {
+      const foundOption = options.find((option) => option.id === optionId);
+      // It would mean that the optionId is actually a label which is why it isn't matching any option id.
+      // Fallback to optionId(i.e. label) which was the case with legacy options
+      if (!foundOption) {
+        return optionId;
+      }
+      return foundOption.label;
+    });
+    return labels;
+  } else {
+    const foundOption = options.find((option) => option.id === optionIds);
+    if (!foundOption) {
+      return [optionIds];
+    }
+    return [foundOption.label];
+  }
+}
 
 /**
  * Get the human-readable value for a field response.