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/lib/reportingUtils.ts

@@ -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,61 @@
 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()];
+}
+
+
+import type { Field } from "@calcom/app-store/routing-forms/types/types";
+
+/**
+ * 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.