Hide other attendees on event types with seats by joeauyeung · Pull Request #4766 · calcom/cal.diy

joeauyeung · 2022-09-29T19:00:26Z

What does this PR do?

This PR allows hiding attendee information from other attendees on event types with seats. The .ics file that is generated for attendees will also not contain other attendee information as well.

Fixes # (issue)

Environment: Staging(main branch) / Production

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Edit an event type to contain seats and check the box to hide attendee information
Book at least two seats in one time slot
- In the second email you should see the .ics file for the organizer contains two attendees while the .ics file to the attendee should only contain their information and the organizer'
Now disable hide attendee information
When booking seats in the same time slot the attendee information should stack

Checklist

I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

vercel · 2022-09-29T19:00:30Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
cal	✅ Ready (Inspect)	Visit Preview	Oct 18, 2022 at 6:38PM (UTC)

joeauyeung · 2022-09-29T19:22:03Z

+            name: bookingForm.getValues("name"),
+            email: bookingForm.getValues("email"),


Future proofing if someone wants payments for event types with seats

joeauyeung · 2022-09-29T19:22:28Z

+          name: bookingForm.getValues("name"),
+          email: bookingForm.getValues("email"),


For seats we want to pass the current attendee to the success page

joeauyeung · 2022-09-29T19:22:46Z

+                    <Icon.FiUser
+                      className={`mr-[10px] ml-[2px] mt-[2px] inline-block h-4 w-4 ${
+                        booking && booking.attendees.length / eventType.seatsPerTimeSlot >= 0.5
+                          ? "text-rose-600"
+                          : booking && booking.attendees.length / eventType.seatsPerTimeSlot >= 0.33
+                          ? "text-yellow-500"
+                          : "text-bookinghighlight"
+                      }`}
+                    />


Change the seats color along with the number of seats left

joeauyeung · 2022-09-29T19:23:30Z

+  const {
+    location: _location,
+    name,
+    email,


The change is that we are reading the email that is in the URL params

joeauyeung · 2022-09-29T19:26:12Z

+                            ? bookingInfo?.attendees
+                                .filter((attendee) => attendee.email === email)
+                                .map((attendee) => (
+                                  <div key={attendee.name} className="mb-3">
+                                    <p>{attendee.name}</p>
+                                    <p className="text-bookinglight">{attendee.email}</p>
+                                  </div>
+                                ))


Since emails are unique across attendees, we can filter to display just the current attendee if seatsHideAttendees is true

joeauyeung · 2022-09-29T19:26:48Z

        reminders: {
          useDefault: true,
        },
+        guestsCanSeeOtherGuests: !calEventRaw.seatsHideAttendees,


Google Cal is the only calendar service we integrate right now that can natively hide the guest list

joeauyeung · 2022-09-29T19:27:20Z

    new Promise((resolve, reject) => {
      try {
-        const scheduledEmail = new AttendeeScheduledEmail(calEvent, invitee);
+        const scheduledEmail = new AttendeeScheduledEmail(calEvent, invitee, hideAttendees);


Only pass hideAttendees to the email being sent out to the attendee

joeauyeung · 2022-09-29T19:29:12Z

+    if (this.hideAttendees) {
+      this.calEvent.attendees = [
+        {
+          ...this.attendee,
+        },
+      ];
+    }


Only pass the current attendee as the event attendee

joeauyeung · 2022-09-29T19:29:36Z

+  id?: number;
+  bookingId?: number;
+  locale?: string;


Current attendees have these fields

joeauyeung · 2022-09-30T16:44:55Z

+          ...calEventRaw.attendees.map(({ id, ...rest }) => ({
+            rest,
+            responseStatus: "accepted",


We don't need id here and not all attendees will have an id if they are new to the event

Let's add a eslint-ignore comment then

joeauyeung · 2022-09-30T16:45:06Z

+          ...event.attendees.map(({ id, ...rest }) => ({
+            rest,
+            responseStatus: "accepted",
+          })),


We don't need id here and not all attendees will have an id if they are new to the event

joeauyeung · 2022-10-17T16:52:39Z

@@ -1,4 +1,5 @@
 import CloseCom from "@calcom/lib/CloseCom";
+import type { CloseComAttendees, CloseComCalendarEvent } from "@calcom/lib/CloseCom";


@leog heads up, not sure why these tests were failing but I had to create Close.com specific types

joeauyeung · 2022-10-17T16:52:56Z

+export type CloseComAttendees = {
+  attendees: { email: string; id: string; timeZone?: string }[];
+};
+
+export type CloseComCalendarEvent = {
+  attendees?: CloseComAttendees["attendees"];
+  startTime: string;
+  additionalNotes?: string;
+};
+


@leog here are the new types

into seats-hide-attendees

joeauyeung · 2022-10-17T18:21:31Z

  const event = {
    attendees,
-  } as CalendarEvent;
+  } as { attendees: { email: string; name: string | null; id: string }[] };


Simplify this type to pass test

joeauyeung · 2022-10-17T18:22:28Z

    startTime: now.toISOString(),
    additionalNotes: "Some comment!",
-  } as CalendarEvent;
+  } as any;


Even though this is similar to line 171 it was still failing. Passes when cast as any type. This variable is declared anyways and does not rely on any external calls

* Add seatsHideAttendees to schema * Add migration * Add frontend option to hide attendees * Pass hide attendees to email * Hide attendee names on success email * Add types for existing attendees * Hide other attendees if hidden * Pass seatsHideAttendees to Google Cal * Add translation * Reduce redundancy * Fix type error * Change toggle to show attendee information * Minor text change * Fix type errors * Update snapshots * Merge branch 'main' into seats-hide-attendees * Add back email * Add close.com specific types * Add eslint ignore comments * Merge branch 'seats-hide-attendees' of https://github.com/calcom/cal.com into seats-hide-attendees * Simplify tests Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com>

joeauyeung added 9 commits September 29, 2022 08:11

Add seatsHideAttendees to schema

1b3519d

Add migration

d9b2f32

Add frontend option to hide attendees

3c1d9ac

Pass hide attendees to email

24b7b1b

Hide attendee names on success email

b55ef91

Add types for existing attendees

1c63ec1

Hide other attendees if hidden

7d177d0

Pass seatsHideAttendees to Google Cal

92f2c2d

Add translation

09a9e46

Reduce redundancy

1b3aaa8

joeauyeung commented Sep 29, 2022

View reviewed changes

Merge branch 'main' into seats-hide-attendees

345c218

vercel Bot deployed to Preview September 29, 2022 19:41 View deployment

vercel Bot deployed to Preview September 29, 2022 19:51 View deployment

Merge branch 'main' into seats-hide-attendees

4d1317c

joeauyeung requested a review from a team September 30, 2022 14:04

vercel Bot deployed to Preview September 30, 2022 14:13 View deployment

joeauyeung and others added 2 commits September 30, 2022 12:42

Fix type error

acf6718

Merge branch 'main' into seats-hide-attendees

88317de

joeauyeung commented Sep 30, 2022

View reviewed changes

vercel Bot deployed to Preview September 30, 2022 17:00 View deployment

joeauyeung added the ❗️ migrations contains migration files label Sep 30, 2022

Merge branch 'main' into seats-hide-attendees

1d103c9

vercel Bot deployed to Preview September 30, 2022 19:23 View deployment

Merge branch 'main' into seats-hide-attendees

54b7ef0

vercel Bot deployed to Preview October 3, 2022 13:33 View deployment

Merge branch 'main' into seats-hide-attendees

e5161b5

vercel Bot deployed to Preview October 4, 2022 14:41 View deployment

Add close.com specific types

779d70c

joeauyeung commented Oct 17, 2022

View reviewed changes

vercel Bot deployed to Preview October 17, 2022 16:56 View deployment

joeauyeung and others added 5 commits October 17, 2022 13:32

Merge branch 'main' into seats-hide-attendees

e9200eb

Add eslint ignore comments

898c849

Merge branch 'seats-hide-attendees' of https://github.com/calcom/cal.com

029cfd9

into seats-hide-attendees

Merge branch 'seats-hide-attendees' of https://github.com/calcom/cal.com

3fb076d

into seats-hide-attendees

Merge branch 'main' into seats-hide-attendees

be3b18f

vercel Bot deployed to Preview October 17, 2022 17:49 View deployment

joeauyeung added 2 commits October 17, 2022 14:20

Simplify tests

1b1dbea

Merge branch 'seats-hide-attendees' of https://github.com/calcom/cal.com

e1404c9

into seats-hide-attendees

joeauyeung commented Oct 17, 2022

View reviewed changes

Merge branch 'main' into seats-hide-attendees

dd46953

joeauyeung requested a review from zomars October 17, 2022 18:22

vercel Bot deployed to Preview October 17, 2022 18:39 View deployment

Merge branch 'main' into seats-hide-attendees

852e8dd

vercel Bot deployed to Preview October 18, 2022 01:44 View deployment

Merge branch 'main' into seats-hide-attendees

f33c3ad

vercel Bot deployed to Preview October 18, 2022 13:58 View deployment

Merge branch 'main' into seats-hide-attendees

cc8e617

vercel Bot deployed to Preview October 18, 2022 15:32 View deployment

Merge branch 'main' into seats-hide-attendees

2bdaffc

vercel Bot deployed to Preview October 18, 2022 18:03 View deployment

Merge branch 'main' into seats-hide-attendees

e9bf29b

vercel Bot deployed to Preview October 18, 2022 18:38 View deployment

zomars disabled auto-merge October 18, 2022 19:41

zomars merged commit 8fc4d34 into main Oct 18, 2022

zomars deleted the seats-hide-attendees branch October 18, 2022 19:41

		name: bookingForm.getValues("name"),
		email: bookingForm.getValues("email"),

		@@ -1,4 +1,5 @@
		import CloseCom from "@calcom/lib/CloseCom";
		import type { CloseComAttendees, CloseComCalendarEvent } from "@calcom/lib/CloseCom";

Conversation

joeauyeung commented Sep 29, 2022

What does this PR do?

Type of change

How should this be tested?

Checklist

Uh oh!

vercel Bot commented Sep 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vercel Bot commented Sep 29, 2022 •

edited

Loading