From 668ea088ef13d13b881f30b2f34bf02bfba11103 Mon Sep 17 00:00:00 2001 From: Nafees Nazik <84864519+G3root@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:13:23 +0530 Subject: [PATCH 01/41] fix: password not updatable after an api error (#8514) * fix: error clearance * changes --------- Co-authored-by: Peer Richelsen Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> --- apps/web/pages/settings/security/password.tsx | 1 + packages/ui/components/form/inputs/Input.tsx | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/web/pages/settings/security/password.tsx b/apps/web/pages/settings/security/password.tsx index e57d853e0d..28c0326087 100644 --- a/apps/web/pages/settings/security/password.tsx +++ b/apps/web/pages/settings/security/password.tsx @@ -199,6 +199,7 @@ const PasswordView = () => { color="primary" className="mt-8" type="submit" + onClick={() => formMethods.clearErrors("apiError")} disabled={isDisabled || passwordMutation.isLoading || sessionMutation.isLoading}> {t("update")} diff --git a/packages/ui/components/form/inputs/Input.tsx b/packages/ui/components/form/inputs/Input.tsx index 0e188cb506..c581617fc2 100644 --- a/packages/ui/components/form/inputs/Input.tsx +++ b/packages/ui/components/form/inputs/Input.tsx @@ -347,10 +347,6 @@ const PlainForm = (props: FormProps, ref: Ref { From 5b9b7ab22dac72cc93949f0eb4de4f71d92175ac Mon Sep 17 00:00:00 2001 From: "GitStart-Cal.com" <121884634+gitstart-calcom@users.noreply.github.com> Date: Thu, 27 Apr 2023 19:51:20 +0200 Subject: [PATCH 02/41] [CAL-1530] Assigned members to managed event types missing preview URL (#8552) Co-authored-by: gitstart-calcom --- apps/web/pages/event-types/[type]/index.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/web/pages/event-types/[type]/index.tsx b/apps/web/pages/event-types/[type]/index.tsx index c40404e61d..6786481aed 100644 --- a/apps/web/pages/event-types/[type]/index.tsx +++ b/apps/web/pages/event-types/[type]/index.tsx @@ -136,6 +136,13 @@ const EventTypePage = (props: EventTypeSetupProps) => { const updateMutation = trpc.viewer.eventTypes.update.useMutation({ onSuccess: async () => { + formMethods.setValue( + "children", + formMethods.getValues().children.map((child) => ({ + ...child, + created: true, + })) + ); showToast( t("event_type_updated_successfully", { eventTypeTitle: eventType.title, From 221c8b75bcdc4b0a0384be755a82c3c43cd72421 Mon Sep 17 00:00:00 2001 From: hallidayo <22655069+Hallidayo@users.noreply.github.com> Date: Fri, 28 Apr 2023 12:26:31 +0100 Subject: [PATCH 03/41] added alignment on items (#8544) --- packages/features/ee/workflows/components/TimeTimeUnitInput.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx b/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx index 81783bff28..d5e8e35611 100644 --- a/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx +++ b/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx @@ -39,7 +39,7 @@ export const TimeTimeUnitInput = (props: Props) => { addOnSuffix={ - {embed.title} -

{embed.subtitle}

+

{embed.subtitle}

{/*TODO: Add Auto/Fixed toggle from Figma */}
Window sizing
-
+
-
Button Text
+
Button text
{/* Default Values should come from preview iframe */}
@@ -935,14 +930,14 @@ const EmbedTypeCodeAndPreviewDialogContent = ({ }); }} /> -
Display Calendar Icon Button
+
Display calendar icon
-
Position of Button
+
Position of button
null, + }} + onChange={(option) => { + if (!option) { + return; + } + setPreviewState((previewState) => { + return { + ...previewState, + theme: option.value, + }; + }); + }} + options={ThemeOptions} + /> +
))} -