fix: location change during rescheduling

calcom · Jul 17, 2024 · 9bd23d4 · 9bd23d4
1 parent af3d2e6
commit 9bd23d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/apps/web/modules/event-types/views/event-types-single-view.tsx b/apps/web/modules/event-types/views/event-types-single-view.tsx
@@ -227,6 +227,7 @@ const EventTypePage = (props: EventTypeSetupProps & { allActiveWorkflows?: Workf
  const [pendingRoute, setPendingRoute] = useState("");
  const leaveWithoutAssigningHosts = useRef(false);
  const [animationParentRef] = useAutoAnimate<HTMLDivElement>();
+
  const updateMutation = trpc.viewer.eventTypes.update.useMutation({
  onSuccess: async () => {
  const currentValues = formMethods.getValues();

diff --git a/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx b/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx
@@ -56,6 +56,7 @@ export type SelectLikeComponentProps<
  }
  ? TVal["value"]
  : TVal;
+ optionValue?: string;
  }[];
 } & CommonProps<TVal>;
 

diff --git a/packages/features/bookings/lib/getLocationOptionsForSelect.ts b/packages/features/bookings/lib/getLocationOptionsForSelect.ts
@@ -26,6 +26,7 @@ export default function getLocationsOptionsForSelect(
  label: translatedLocation || locationString,
  value: type,
  inputPlaceholder: t(eventLocation?.attendeeInputPlaceholder || ""),
+ optionValue: location?.link || location?.address || "",
  };
  })
  .filter(notEmpty);

diff --git a/packages/features/form-builder/Components.tsx b/packages/features/form-builder/Components.tsx
@@ -391,7 +391,7 @@ export const Components: Record<FieldType, Component> = {
  if (!value) {
  setValue({
  value: options[0]?.value,
- optionValue: "",
+ optionValue: options[0]?.optionValue || "",
  });
  }
  }, [options, setValue, value]);
@@ -429,7 +429,7 @@ export const Components: Record<FieldType, Component> = {
  onChange={(e) => {
  setValue({
  value: e.target.value,
- optionValue: "",
+ optionValue: option?.optionValue || "",
  });
  }}
  checked={value?.value === option.value}