Fixed #1015 - Teams user registration is broken #1090

emrysal · 2021-10-31T22:03:07Z

The necessary check got removed in https://github.com/calendso/calendso/commit/13486d9988a11a93eeee85b0396a57c0dbad43d4#diff-bc80461208be7df84b92ad01439aea7d4dcee60b443e1ba998a77cebed65c1e2

Continued expanding the fields.tsx file with additional features; deprecating UsernameInput in the process. I tried to keep the implementation side as lean as possible.

As soon as /availability is merged we can replace <form> with <Form> and we'll no longer need to manually import FormProvider, neatening it up further.

Note: This refactor focusses on react-hook-forms, it does not remove the fetch (one step at a time..)

vercel · 2021-10-31T22:03:10Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/cal/calendso/3cqx2x1H6pFujyXWjarjTZMCEAPA
✅ Preview: https://calendso-git-bugfix-signup-page-email-already-registered-cal.vercel.app

baileypumfleet

Looks good to me. Hopefully we can get the /availability revamp merged today, so you can update this PR to use

and then merge

baileypumfleet · 2021-11-10T23:20:58Z

Now that the /availability PR is merged, the modification for this PR can be made

…dy-registered # Conflicts: # components/form/fields.tsx # pages/auth/signup.tsx # public/static/locales/en/common.json

zomars

Made some fixes to the onboarding. I think this is ready to merge.

zomars · 2021-11-11T04:42:28Z

components/form/fields.tsx

+type FormProps<T> = { form: UseFormReturn<T>; handleSubmit: SubmitHandler<T> } & Omit<
+  JSX.IntrinsicElements["form"],
+  "onSubmit"
+>;
+
+const PlainForm = <T extends FieldValues>(props: FormProps<T>, ref: Ref<HTMLFormElement>) => {
+  const { form, handleSubmit, ...passThrough } = props;

  return (
    <FormProvider {...form}>
      <form
-        onSubmit={
-          handleSubmit
-            ? form.handleSubmit(async (...args) => {
-                try {
-                  await handleSubmit(...args);
-                } catch (_err) {
-                  const err = getErrorFromUnknown(_err);
-                  handleError(err);
-                }
-              })
-            : undefined
-        }
+        ref={ref}
+        onSubmit={(event) => {
+          form
+            .handleSubmit(handleSubmit)(event)
+            .catch((err) => {
+              showToast(`${getErrorFromUnknown(err).message}`, "error");
+            });
+        }}
        {...passThrough}>
        {props.children}
      </form>
    </FormProvider>
  );
-}
+};
+
+export const Form = forwardRef(PlainForm) as <T extends FieldValues>(
+  p: FormProps<T> & { ref?: Ref<HTMLFormElement> }
+) => ReactElement;


Preserve form value types from generics

zomars · 2021-11-11T04:42:56Z

pages/getting-started.tsx

@@ -313,7 +313,7 @@ export default function Onboarding(props: inferSSRProps<typeof getServerSideProp
      title: t("set_availability"),
      description: t("set_availability_instructions"),
      Component: (
-        <Form
+        <Form<ScheduleFormValues>


So our values in handleSubmit are typed.

Tested and working correctly

zomars · 2021-11-11T05:10:30Z

pages/api/schedule/index.ts

+      await prisma.user.update({
        where: {
-          userId,
+          id: userId,
        },
-      });
-      await Promise.all(
-        availability.map((schedule: Availability) =>
-          prisma.availability.create({
-            data: {
-              days: schedule.days,
-              startTime: schedule.startTime,
-              endTime: schedule.endTime,
-              user: {
-                connect: {
-                  id: userId,
-                },
+        data: {
+          availability: {
+            /* We delete user availabilty */
+            deleteMany: {
+              userId: {
+                equals: userId,
              },
            },
-          })
-        )
-      );
+            /* So we can replace it */
+            createMany: {
+              data: availability.map((schedule) => ({
+                days: schedule.days,
+                startTime: schedule.startTime,
+                endTime: schedule.endTime,
+              })),
+            },
+          },
+        },
+      });


Made this query safer and more legible (IMO) Tested and working 👍🏽

emrysal · 2021-11-11T05:15:05Z

Feel free to merge when ready @zomars - most of the content in this PR has been discussed at length and I'll tweak using the fields.tsx modifications later.

zomars · 2021-11-11T05:41:39Z

components/ui/form/Schedule.tsx

-// sets the desired time in current date, needs to be current date for proper DST translation
-const defaultDayRange: TimeRange = {
-  start: new Date(new Date().setHours(9, 0, 0, 0)),
-  end: new Date(new Date().setHours(17, 0, 0, 0)),
-};
-
-export const DEFAULT_SCHEDULE: ScheduleType = [
-  [],
-  [defaultDayRange],
-  [defaultDayRange],
-  [defaultDayRange],
-  [defaultDayRange],
-  [defaultDayRange],
-  [],
-];
-


Moved so we can reuse in the seeder

zomars · 2021-11-11T05:42:08Z

pages/api/schedule/index.ts

-  const availability = req.body.schedule.reduce(
-    (availability: Availability[], times: TimeRange[], day: number) => {
-      const addNewTime = (time: TimeRange) =>
-        ({
-          days: [day],
-          startTime: time.start,
-          endTime: time.end,
-        } as Availability);
-
-      const filteredTimes = times.filter((time) => {
-        let idx;
-        if (
-          (idx = availability.findIndex(
-            (schedule) => schedule.startTime === time.start && schedule.endTime === time.end
-          )) !== -1
-        ) {
-          availability[idx].days.push(day);
-          return false;
-        }
-        return true;
-      });
-      filteredTimes.forEach((time) => {
-        availability.push(addNewTime(time));
-      });
-      return availability;
-    },
-    [] as Availability[]
-  );


Moved so we can reuse the logic in the seeder

zomars · 2021-11-11T05:42:57Z

scripts/seed.ts

+    availability: {
+      createMany: {
+        data: getAvailabilityFromSchedule(DEFAULT_SCHEDULE),
+      },
+    },


Tests were failing because there were no availability in a fresh DB

zomars · 2021-11-11T05:45:47Z

Merged and going to sleep 👍🏽

* Fixed #1015 - Teams user registration is broken * Type fixes for avilability form in onboarding * Re adds missing strings * Updates user availability in one query Tested and working correctly * Fixes seeder and tests Co-authored-by: Omar López <zomars@me.com>

Fixed #1015 - Teams user registration is broken

f2362ed

emrysal requested a review from KATT October 31, 2021 22:03

Merge branch 'main' into bugfix/signup-page-email-already-registered

3f4cf68

vercel bot temporarily deployed to Preview October 31, 2021 22:05 Inactive

emrysal linked an issue Oct 31, 2021 that may be closed by this pull request

Registration upon user invite through Teams is broken #1015

Closed

PeerRich requested review from zomars and baileypumfleet October 31, 2021 23:01

baileypumfleet approved these changes Nov 1, 2021

View reviewed changes

zomars added 2 commits November 10, 2021 20:50

Merge branch 'upstream-open-main' into bugfix/signup-page-email-alrea…

395c5c7

…dy-registered # Conflicts: # components/form/fields.tsx # pages/auth/signup.tsx # public/static/locales/en/common.json

Type fixes for avilability form in onboarding

d3879c6

vercel bot temporarily deployed to Preview November 11, 2021 04:40 Inactive

Re adds missing strings

c9d7e67

vercel bot temporarily deployed to Preview November 11, 2021 04:46 Inactive

zomars approved these changes Nov 11, 2021

View reviewed changes

Updates user availability in one query

5498c7f

Tested and working correctly

vercel bot temporarily deployed to Preview November 11, 2021 05:07 Inactive

zomars approved these changes Nov 11, 2021

View reviewed changes

Fixes seeder and tests

00dda19

vercel bot temporarily deployed to Preview November 11, 2021 05:40 Inactive

zomars added ♻️ autoupdate tells kodiak to keep this branch up-to-date 👀 ready for review labels Nov 11, 2021

zomars enabled auto-merge (squash) November 11, 2021 05:41

zomars approved these changes Nov 11, 2021

View reviewed changes

zomars merged commit bf659c0 into main Nov 11, 2021

zomars deleted the bugfix/signup-page-email-already-registered branch November 11, 2021 05:44

PeerRich added the core area: core, team members only label Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed #1015 - Teams user registration is broken #1090

Fixed #1015 - Teams user registration is broken #1090

emrysal commented Oct 31, 2021 •

edited

vercel bot commented Oct 31, 2021 •

edited

baileypumfleet left a comment

baileypumfleet commented Nov 10, 2021

zomars left a comment

zomars Nov 11, 2021

zomars Nov 11, 2021

zomars Nov 11, 2021 •

edited

emrysal commented Nov 11, 2021

zomars Nov 11, 2021

zomars Nov 11, 2021

zomars Nov 11, 2021

zomars commented Nov 11, 2021

Fixed #1015 - Teams user registration is broken #1090

Fixed #1015 - Teams user registration is broken #1090

Conversation

emrysal commented Oct 31, 2021 • edited

vercel bot commented Oct 31, 2021 • edited

baileypumfleet left a comment

Choose a reason for hiding this comment

baileypumfleet commented Nov 10, 2021

zomars left a comment

Choose a reason for hiding this comment

zomars Nov 11, 2021

Choose a reason for hiding this comment

zomars Nov 11, 2021

Choose a reason for hiding this comment

zomars Nov 11, 2021 • edited

Choose a reason for hiding this comment

emrysal commented Nov 11, 2021

zomars Nov 11, 2021

Choose a reason for hiding this comment

zomars Nov 11, 2021

Choose a reason for hiding this comment

zomars Nov 11, 2021

Choose a reason for hiding this comment

zomars commented Nov 11, 2021

emrysal commented Oct 31, 2021 •

edited

vercel bot commented Oct 31, 2021 •

edited

zomars Nov 11, 2021 •

edited