feat: Implement global booking limits #14243

asadath1395 · 2024-03-28T07:04:11Z

What does this PR do?

Fixes #8985

Type of change

New feature (non-breaking change which adds functionality)

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2024-03-28T07:04:17Z

@asadath1395 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2024-03-28T07:04:22Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

graphite-app · 2024-03-28T07:05:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (03/28/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add community label" took an action on this PR • (03/28/24)

1 label was added to this PR based on Keith Williams's automation.

"Add foundation team as reviewer" took an action on this PR • (04/16/24)

1 reviewer was added to this PR based on Keith Williams's automation.

github-actions · 2024-03-28T07:14:12Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

New Page Added

The following page was added to the bundle from the code in this PR:

Page	Size (compressed)	First Load	% of Budget (`350 KB`)
`/settings/my-account/bookings`	`311.71 KB`	540.14 KB	154.33%

…ed API

…pecified for individual events

…values are copied

… set individually

…5/cal.com into booking-global-limits

keithwillcode · 2024-07-29T03:43:49Z

This PR is being closed due to a lack of activity. Please reopen if work is to continue.

asadath1395 · 2024-09-13T09:28:58Z

@CarinaWolli Since you are working on global booking limits for teams #16557, 2nd point here #14243 (review) is not applicable for this PR, right?

… are reached

asadath1395 · 2024-09-13T12:27:38Z

@keithwillcode Could you please re-open this PR? I would like to continue the work here

CarinaWolli · 2024-09-17T20:32:34Z

@CarinaWolli Since you are working on global booking limits for teams #16557, 2nd point here #14243 (review) is not applicable for this PR, right?

Yes you are right, we changed that. We only want to count the user's bookings including bookings from managed event types, but not bookings from other team event types (collective, round-robin)

…d events

CarinaWolli

Didn't test this yet, but I found some issues in the code that need to be addressed first. We also need to add tests for this, probably best inside global-booking-limits.test.ts

CarinaWolli · 2024-09-25T14:05:58Z

packages/features/settings/layouts/SettingsLayout.tsx

@@ -30,6 +30,7 @@ const tabs: VerticalTabItemProps[] = [
      { name: "general", href: "/settings/my-account/general" },
      { name: "calendars", href: "/settings/my-account/calendars" },
      { name: "conferencing", href: "/settings/my-account/conferencing" },
+      { name: "bookings", href: "/settings/my-account/bookings" },


Should be my-account/bookingLimits and tab also should be shown as 'Booking Limits'

CarinaWolli · 2024-09-25T14:18:45Z

packages/features/bookings/lib/handleNewBooking.ts

+      undefined,
+      rescheduleUid,
+      eventType.schedule?.timeZone,
+      userId


userId isn't a parameter of checkBookingLimits

CarinaWolli · 2024-09-25T14:25:01Z

apps/web/pages/settings/my-account/bookings.tsx

+        title={t("bookings")}
+        description={t("bookings_settings_description", { appName: APP_NAME })}


title: Booking Limits
description: Set global limits for when and how often you can be booked

CarinaWolli · 2024-09-25T14:26:57Z

apps/web/pages/settings/my-account/bookings.tsx

+                  } else {
+                    bookingsLimitFormMethods.setValue("bookingLimits", {});
+                  }
+                  handleSubmit(bookingsLimitFormMethods.getValues());


toast is missing when enabling/disabling toggle

CarinaWolli · 2024-09-25T14:58:47Z

packages/core/getBusyTimes.ts

+    rescheduleUid,
+    bookingLimits,
+    durationLimits,
+    globalBookingLimits,


globalBookingLimits isn't in of params

CarinaWolli · 2024-09-25T15:00:34Z

packages/core/getBusyTimes.ts

+  let eventTypeIdFilter: Prisma.BookingWhereInput = { eventTypeId };
+  if (globalBookingLimits) {
+    if (bookingLimits && Object.keys(bookingLimits).length > 0) {
+      eventTypeIdFilter = { eventTypeId: { not: eventTypeId } };


what's that filter for?

This was added earlier as i had a different implementation in place, removed it now as implementation has changed.

asadath1395 · 2024-09-25T18:11:06Z

@CarinaWolli Added tests and addressed all the comments from above. Could you please review this PR again?

Thanks!!

asadath1395 · 2024-10-08T08:25:27Z

@CarinaWolli Please review this PR once you are free. Thanks!

Setup UI for global booking limits

0762d3f

asadath1395 marked this pull request as draft March 28, 2024 07:04

graphite-app bot added the community Created by Linear-GitHub Sync label Mar 28, 2024

graphite-app bot requested a review from a team March 28, 2024 07:04

github-actions bot added event-types area: event types, event-types Medium priority Created by Linear-GitHub Sync ✨ feature New feature or request labels Mar 28, 2024

Refactor code to reuse existing code block

1c81a92

keithwillcode added this to the v4.0 milestone Mar 28, 2024

Add new table GlobalSettings, setup API to save the values from UI to DB

5be79a2

github-actions bot added the ❗️ migrations contains migration files label Mar 29, 2024

asadath1395 added 9 commits April 4, 2024 17:26

Added modal to sync event settings with global settings and its relat…

b2aee6f

…ed API

Add falling back to global settings for booking limits when its not s…

0d8d828

…pecified for individual events

Add ability to sync future booking with global settings

dc3109e

Fix all future booking event types returned even when global setting …

5f9157b

…values are copied

Revert global settings taken into consideration when limits where not…

f0014ca

… set individually

Add ability to disable global limit settings

646b6f0

Fix type errors

a98e1fb

Fix type errors

de1fe21

Merge branch 'booking-global-limits' of https://github.com/asadath139…

60d98ee

…5/cal.com into booking-global-limits

dosubot bot modified the milestones: v4.0, v4.1 Apr 15, 2024

keithwillcode modified the milestones: v4.0, v4.1 Apr 15, 2024

asadath1395 added 2 commits April 16, 2024 12:01

Merge with upstream

a55fd2c

Fix failing to sync events with global settings

95df261

github-actions bot added the Stale label Jul 4, 2024

dosubot bot removed this from the v4.4 milestone Jul 16, 2024

Amit91848 added the high-risk Requires approval by Foundation team label Jul 22, 2024

keithwillcode closed this Jul 29, 2024

dosubot bot added this to the v4.5 milestone Aug 19, 2024

dosubot bot modified the milestones: v4.5, v4.6 Sep 9, 2024

Fix availablity showing slots as open even when global booking limits…

d13ab8b

… are reached

keithwillcode modified the milestones: v4.6, v4.5 Sep 15, 2024

Amit91848 reopened this Sep 17, 2024

asadath1395 added 4 commits September 23, 2024 15:32

Fix global booking limits to be applied to only individual and manage…

aa5a782

…d events

Merge with upstream

0aa2883

Remove yarn.lock changes

f78862b

Merge with upstream

820d316

asadath1395 marked this pull request as ready for review September 25, 2024 12:09

CarinaWolli requested changes Sep 25, 2024

View reviewed changes

asadath1395 added 2 commits September 25, 2024 22:28

Address PR comments

8d8635b

Add tests

bb6749a

asadath1395 requested a review from CarinaWolli September 25, 2024 18:11

asadath1395 force-pushed the booking-global-limits branch from 85553a3 to f109a4a Compare October 8, 2024 08:01

Merge with upstream

6cf0a97

asadath1395 force-pushed the booking-global-limits branch from f109a4a to 6cf0a97 Compare October 8, 2024 08:16

Merge branch 'main' into booking-global-limits

ad4d4ed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Implement global booking limits #14243

feat: Implement global booking limits #14243

asadath1395 commented Mar 28, 2024 •

edited

Loading

vercel bot commented Mar 28, 2024

github-actions bot commented Mar 28, 2024 •

edited

Loading

graphite-app bot commented Mar 28, 2024 •

edited

Loading

github-actions bot commented Mar 28, 2024 •

edited

Loading

keithwillcode commented Jul 29, 2024

asadath1395 commented Sep 13, 2024

asadath1395 commented Sep 13, 2024

CarinaWolli commented Sep 17, 2024

CarinaWolli left a comment

CarinaWolli Sep 25, 2024

CarinaWolli Sep 25, 2024

CarinaWolli Sep 25, 2024

CarinaWolli Sep 25, 2024

CarinaWolli Sep 25, 2024

CarinaWolli Sep 25, 2024

asadath1395 Sep 25, 2024

asadath1395 commented Sep 25, 2024

asadath1395 commented Oct 8, 2024

		title={t("bookings")}
		description={t("bookings_settings_description", { appName: APP_NAME })}

feat: Implement global booking limits #14243

Are you sure you want to change the base?

feat: Implement global booking limits #14243

Conversation

asadath1395 commented Mar 28, 2024 • edited Loading

What does this PR do?

Type of change

Mandatory Tasks

vercel bot commented Mar 28, 2024

github-actions bot commented Mar 28, 2024 • edited Loading

graphite-app bot commented Mar 28, 2024 • edited Loading

Graphite Automations

github-actions bot commented Mar 28, 2024 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

New Page Added

keithwillcode commented Jul 29, 2024

asadath1395 commented Sep 13, 2024

asadath1395 commented Sep 13, 2024

CarinaWolli commented Sep 17, 2024

CarinaWolli left a comment

Choose a reason for hiding this comment

CarinaWolli Sep 25, 2024

Choose a reason for hiding this comment

CarinaWolli Sep 25, 2024

Choose a reason for hiding this comment

CarinaWolli Sep 25, 2024

Choose a reason for hiding this comment

CarinaWolli Sep 25, 2024

Choose a reason for hiding this comment

CarinaWolli Sep 25, 2024

Choose a reason for hiding this comment

CarinaWolli Sep 25, 2024

Choose a reason for hiding this comment

asadath1395 Sep 25, 2024

Choose a reason for hiding this comment

asadath1395 commented Sep 25, 2024

asadath1395 commented Oct 8, 2024

asadath1395 commented Mar 28, 2024 •

edited

Loading

github-actions bot commented Mar 28, 2024 •

edited

Loading

graphite-app bot commented Mar 28, 2024 •

edited

Loading

github-actions bot commented Mar 28, 2024 •

edited

Loading