From c232f7acfcae3461da83a3ffc372a8bd4c547330 Mon Sep 17 00:00:00 2001
From: Hariom Balhara <hariombalhara@gmail.com>
Date: Mon, 13 Feb 2023 12:02:41 +0530
Subject: [PATCH] More fixes discovered during review

---
 .../config/config.tsx                         |  2 +-
 .../react-awesome-query-builder/widgets.tsx   |  5 +----
 .../embeds/embed-core/src/embed-iframe.ts     |  3 +--
 .../features/bookings/lib/getBookingFields.ts | 19 +++++++++----------
 .../components/EventWorkflowsTab.tsx          |  2 --
 .../features/form-builder/FormBuilder.tsx     |  7 ++++++-
 packages/types/Calendar.d.ts                  |  4 ++++
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx b/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx
index 9c982b1576..808bdcee30 100644
--- a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx
+++ b/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx
@@ -92,7 +92,7 @@ const widgets: Widgets & { [key in keyof Widgets]: Widgets[key] & { type: string
       if (!props) {
         return <div />;
       }
-      // TODO: Use EmailField component
+      // TODO: Use EmailField component for Routing Form Email field
       return <TextWidget type="email" {...props} />;
     },
   },
diff --git a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets.tsx b/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets.tsx
index 80c8ee08d6..dbd40adafa 100644
--- a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets.tsx
+++ b/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets.tsx
@@ -4,10 +4,7 @@ import {
   ButtonProps,
   ConjsProps,
   FieldProps,
-  NumberWidgetProps,
   ProviderProps,
-  SelectWidgetProps,
-  TextWidgetProps,
 } from "react-awesome-query-builder";
 
 import { Button as CalButton, Input, SelectWithValidation as Select, TextArea, TextField } from "@calcom/ui";
@@ -82,7 +79,7 @@ const TextAreaWidget = (props: TextLikeComponentPropsRAQB) => {
 
   const textValue = value || "";
   return (
-    <TextArea
+    <textarea
       value={textValue}
       placeholder={placeholder}
       disabled={readOnly}
diff --git a/packages/embeds/embed-core/src/embed-iframe.ts b/packages/embeds/embed-core/src/embed-iframe.ts
index 69736eb9ef..8db779b22b 100644
--- a/packages/embeds/embed-core/src/embed-iframe.ts
+++ b/packages/embeds/embed-core/src/embed-iframe.ts
@@ -230,8 +230,7 @@ export const useIsEmbed = (embedSsr?: boolean) => {
     const _isValidNamespace = isValidNamespace(namespace);
     if (parent !== window && !_isValidNamespace) {
       log(
-        `Looks like you have iframed cal.com but not using Embed Snippet. 
-        Directly using an iframe isn't recommended.`
+        `Looks like you have iframed cal.com but not using Embed Snippet. Directly using an iframe isn't recommended.`
       );
     }
     setIsEmbed(window?.isEmbed?.() || false);
diff --git a/packages/features/bookings/lib/getBookingFields.ts b/packages/features/bookings/lib/getBookingFields.ts
index 0395407612..dcd1b790b0 100644
--- a/packages/features/bookings/lib/getBookingFields.ts
+++ b/packages/features/bookings/lib/getBookingFields.ts
@@ -62,7 +62,7 @@ export const ensureBookingInputsHaveSystemFields = ({
   additionalNotesRequired: boolean;
   customInputs: z.infer<typeof customInputSchema>[];
 }) => {
-  // If bookingFields is set already, the migration is done. The very first time for an EventType bookingFields would be empty
+  // If bookingFields is set already, the migration is done.
   const handleMigration = !bookingFields.length;
   const CustomInputTypeToFieldType = {
     [EventTypeCustomInputType.TEXT]: BookingFieldType.text,
@@ -189,7 +189,7 @@ export const ensureBookingInputsHaveSystemFields = ({
 
   bookingFields = missingSystemBeforeFields.concat(bookingFields);
 
-  // If we are migrating from old system, we need to add custom inputs to the end of the list
+  // Backward Compatibility: If we are migrating from old system, we need to map `customInputs` to `bookingFields`
   if (handleMigration) {
     customInputs.forEach((input) => {
       bookingFields.push({
@@ -201,13 +201,13 @@ export const ensureBookingInputsHaveSystemFields = ({
         type: CustomInputTypeToFieldType[input.type],
         required: input.required,
         options: input.options
-          ? input.options.reduce((newOptions, o) => {
-              newOptions.push({
+          ? input.options.map((o) => {
+              return {
                 ...o,
-                value: `${newOptions.length + 1}`,
-              });
-              return newOptions;
-            }, [] as NonNullable<Fields[number]["options"]>)
+                // Send the label as the value without any trimming or lowercase as this is what customInput are doing. It maintains backward compatibility
+                value: o.label,
+              };
+            })
           : [],
       });
     });
@@ -228,8 +228,7 @@ export const ensureBookingInputsHaveSystemFields = ({
     if (!foundEditableMap) {
       return field;
     }
-    // Ensure that system fields editability, even if modified to something else, get's reset to what's in the code.
-    // This allows us to change the editability of any system field easily in future
+    // Ensure that system fields editability, even if modified to something else in DB(accidentally), get's reset to what's in the code.
     return {
       ...field,
       editable: foundEditableMap,
diff --git a/packages/features/ee/workflows/components/EventWorkflowsTab.tsx b/packages/features/ee/workflows/components/EventWorkflowsTab.tsx
index 6ed3d576b1..d6c5ca975e 100644
--- a/packages/features/ee/workflows/components/EventWorkflowsTab.tsx
+++ b/packages/features/ee/workflows/components/EventWorkflowsTab.tsx
@@ -54,8 +54,6 @@ const WorkflowListItem = (props: ItemProps) => {
         offOn = "on";
       }
       await utils.viewer.eventTypes.get.invalidate({ id: eventType.id });
-      await utils.viewer.eventTypes.get.invalidate();
-      await utils.viewer.eventTypes.getByViewer.invalidate();
       showToast(
         t("workflow_turned_on_successfully", {
           workflowName: workflow.name,
diff --git a/packages/features/form-builder/FormBuilder.tsx b/packages/features/form-builder/FormBuilder.tsx
index 4ade5571d0..47a5642181 100644
--- a/packages/features/form-builder/FormBuilder.tsx
+++ b/packages/features/form-builder/FormBuilder.tsx
@@ -176,7 +176,12 @@ export const FormBuilder = function FormBuilder({
                     required
                     value={option.label}
                     onChange={(e) => {
-                      value.splice(index, 1, { label: e.target.value, value: e.target.value.trim() });
+                      // Right now we use label of the option as the value of the option. It allows us to not separately lookup the optionId to know the optionValue
+                      // It has the same drawback that if the label is changed, the value of the option will change. It is not a big deal for now.
+                      value.splice(index, 1, {
+                        label: e.target.value,
+                        value: e.target.value.toLowerCase().trim(),
+                      });
                       onChange(value);
                     }}
                     readOnly={readOnly}
diff --git a/packages/types/Calendar.d.ts b/packages/types/Calendar.d.ts
index c94c4ea060..0ae5b88315 100644
--- a/packages/types/Calendar.d.ts
+++ b/packages/types/Calendar.d.ts
@@ -156,7 +156,11 @@ export interface CalendarEvent {
   appsStatus?: AppsStatus[];
   seatsShowAttendees?: boolean | null;
   seatsPerTimeSlot?: number | null;
+
+  // It has responses to all the fields(system + user)
   responses?: Prisma.JsonObject | null;
+
+  // It maps to customInputs to get access to only the user fields. It allows to easily iterate over to show only user fields
   userFieldsResponses?: Prisma.JsonObject | null;
 }