Scheduling infrastructure for absolutely everyone.
fix: UI improvements for team-wide limits (#27133)
Carina Wollendorferff6fa64b638c
diff --git a/apps/web/modules/event-types/components/tabs/limits/EventLimitsTab.tsx b/apps/web/modules/event-types/components/tabs/limits/EventLimitsTab.tsxindex bf29cd3b72f..d0a0a8815d1 100644--- a/apps/web/modules/event-types/components/tabs/limits/EventLimitsTab.tsx+++ b/apps/web/modules/event-types/components/tabs/limits/EventLimitsTab.tsx@@ -15,7 +15,7 @@ import findDurationType from "@calcom/lib/findDurationType";import { useLocale } from "@calcom/lib/hooks/useLocale";import { ascendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";-import { PeriodType } from "@calcom/prisma/enums";+import { PeriodType, SchedulingType } from "@calcom/prisma/enums";import classNames from "@calcom/ui/classNames";import { Button } from "@calcom/ui/components/button";import {@@ -28,6 +28,7 @@ import {} from "@calcom/ui/components/form";import { Icon } from "@calcom/ui/components/icon";import { Tooltip } from "@calcom/ui/components/tooltip";+import { Badge } from "@calcom/ui/components/badge";import { LearnMoreLink } from "@calcom/web/modules/event-types/components/LearnMoreLink";import { useAutoAnimate } from "@formkit/auto-animate/react";import * as RadioGroup from "@radix-ui/react-radio-group";@@ -36,6 +37,7 @@ import React, { useEffect, useState } from "react";import type { UseFormRegisterReturn, UseFormReturn } from "react-hook-form";import { Controller, useFormContext } from "react-hook-form";import type { SingleValue } from "react-select";+import Link from "next/link";import MaxActiveBookingsPerBookerController from "./MaxActiveBookingsPerBookerController";@@ -135,13 +137,13 @@ function RangeLimitRadioItem({"text-default mb-2 flex flex-col items-start text-sm sm:flex-row sm:items-center",customClassNames?.wrapper)}>- <div className="flex w-full items-center sm:w-auto">+ <div className="flex items-center w-full sm:w-auto">{!isDisabled && (<RadioGroup.Itemid={radioValue}value={radioValue}- className="bg-default border-default flex h-4 w-4 min-w-4 cursor-pointer items-center rounded-full border focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">- <RadioGroup.Indicator className="after:bg-inverted relative flex h-4 w-4 items-center justify-center after:block after:h-2 after:w-2 after:rounded-full" />+ className="flex items-center w-4 h-4 rounded-full border cursor-pointer bg-default border-default min-w-4 focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">+ <RadioGroup.Indicator className="flex relative justify-center items-center w-4 h-4 after:bg-inverted after:block after:h-2 after:w-2 after:rounded-full" /></RadioGroup.Item>)}<span>{t("within_date_range")}</span>@@ -223,8 +225,8 @@ function RollingLimitRadioItem({<RadioGroup.Itemid={radioValue}value={radioValue}- className="bg-default border-default flex h-4 w-4 min-w-4 cursor-pointer items-center rounded-full border focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">- <RadioGroup.Indicator className="after:bg-inverted relative flex h-4 w-4 items-center justify-center after:block after:h-2 after:w-2 after:rounded-full" />+ className="flex items-center w-4 h-4 rounded-full border cursor-pointer bg-default border-default min-w-4 focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">+ <RadioGroup.Indicator className="flex relative justify-center items-center w-4 h-4 after:bg-inverted after:block after:h-2 after:w-2 after:rounded-full" /></RadioGroup.Item>)}@@ -259,7 +261,7 @@ function RollingLimitRadioItem({/><span className="me-2 ms-2"> {t("into_the_future")}</span></div>- <div className="-ml-6 flex flex-col py-2">+ <div className="flex flex-col py-2 -ml-6"><div className="flex items-center"><CheckboxFieldchecked={!!rollingExcludeUnavailableDays}@@ -289,7 +291,7 @@ function RollingLimitRadioItem({})}><Iconname="info"- className="text-default hover:text-attention hover:bg-attention ms-1 inline h-4 w-4 rounded-md"+ className="inline w-4 h-4 rounded-md text-default hover:text-attention hover:bg-attention ms-1"/></Tooltip></div>@@ -350,7 +352,7 @@ const MinimumBookingNoticeInput = React.forwardRef<}, [minimumBookingNoticeDisplayValues, setValue, passThroughProps.name]);return (- <div className="flex items-end justify-end">+ <div className="flex justify-end items-end"><div className="w-1/2 md:w-full"><InputFieldrequired@@ -399,7 +401,54 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPrconst { t, i18n } = useLocale();const formMethods = useFormContext<FormValues>();- const isRecurringEvent = !!formMethods.getValues("recurringEvent");++ const hasTeamLimits = () => {+ const team = eventType.team as { bookingLimits?: IntervalLimit | null; includeManagedEventsInLimits?: boolean } | null | undefined;+ const parentTeam = (eventType.parent as { team?: { bookingLimits?: IntervalLimit | null; includeManagedEventsInLimits?: boolean } } | null | undefined)?.team;++ const teamHasLimits =+ !!team?.bookingLimits && Object.keys(team.bookingLimits).length > 0;++ const parentTeamHasLimits =+ !!parentTeam?.bookingLimits &&+ Object.keys(parentTeam.bookingLimits).length > 0;++ const includeManaged =+ !!parentTeam?.includeManagedEventsInLimits ||+ !!team?.includeManagedEventsInLimits;++ if (teamHasLimits) {+ if(eventType.schedulingType === SchedulingType.MANAGED) return includeManaged;+ return true;+ }++ return parentTeamHasLimits && includeManaged;+ };++ const TeamLimitsBadge = ({ isManagedChild, teamId }: { isManagedChild: boolean, teamId?: number | null }) => {+ const badge = (+ <Badge variant="blue" className="text-xs cursor-pointer hover:opacity-80">+ {t("team_limits_apply")}+ </Badge>+ );++ if (isManagedChild) {+ return <Tooltip content={t("managed_by_team_admins")}>{badge}</Tooltip>;+ }++ if (teamId) {+ return (+ <Link+ href={`/settings/teams/${teamId}/settings`}+ target="_blank"+ rel="noopener noreferrer"+ >+ {badge}+ </Link>+ );+ }+ return null;+ };const { shouldLockIndicator, shouldLockDisableProps } = useLockedFieldsManager({eventType,@@ -432,7 +481,7 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPr"border-subtle stack-y-6 rounded-lg border p-6",customClassNames?.bufferAndNoticeSection?.container)}>- <div className="stack-y-4 lg:stack-y-0 flex flex-col lg:flex-row lg:space-x-4">+ <div className="flex flex-col stack-y-4 lg:stack-y-0 lg:flex-row lg:space-x-4"><divclassName={classNames("w-full",@@ -526,7 +575,7 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPr/></div></div>- <div className="stack-y-4 lg:stack-y-0 flex flex-col lg:flex-row lg:space-x-4">+ <div className="flex flex-col stack-y-4 lg:stack-y-0 lg:flex-row lg:space-x-4"><divclassName={classNames("w-full",@@ -603,6 +652,10 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPrtoggleSwitchAtTheEnd={true}labelClassName={classNames("text-sm", customClassNames?.bookingFrequencyLimit?.label)}title={t("limit_booking_frequency")}+ Badge={+ hasTeamLimits()+ ? TeamLimitsBadge({ isManagedChild: !!eventType.parent, teamId: eventType.team?.id }) : null+ }{...bookingLimitsLocked}description={<LearnMoreLink@@ -703,7 +756,7 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPronChange({});}}}>- <div className="border-subtle rounded-b-lg border border-t-0 p-6">+ <div className="p-6 rounded-b-lg border border-t-0 border-subtle"><IntervalLimitsManagerpropertyName="durationLimits"defaultLimit={60}@@ -756,7 +809,7 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPr}return onChange(isEnabled ? PeriodType.ROLLING : PeriodType.UNLIMITED);}}>- <div className="border-subtle rounded-b-lg border border-t-0 p-6">+ <div className="p-6 rounded-b-lg border border-t-0 border-subtle"><RadioGroup.Rootvalue={watchPeriodTypeUiValue}onValueChange={(val) => {@@ -821,7 +874,7 @@ export const EventLimitsTab = ({ eventType, customClassNames }: EventLimitsTabPrformMethods.setValue("offsetStart", 0, { shouldDirty: true });}}}>- <div className={classNames("border-subtle rounded-b-lg border border-t-0 p-6")}>+ <div className={classNames("p-6 rounded-b-lg border border-t-0 border-subtle")}><TextFieldrequiredtype="number"diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.jsonindex 8fa7b7c7985..3d8f5c74ee7 100644--- a/apps/web/public/static/locales/en/common.json+++ b/apps/web/public/static/locales/en/common.json@@ -3328,6 +3328,8 @@"booking_limits": "Booking limits","booking_limits_team_description": "Booking limits for team members across all team event types","limit_team_booking_frequency_description": "Limit how many times members can be booked across all team event types",+ "team_limits_apply": "Team limits apply",+ "managed_by_team_admins": "Managed by team admins","booking_limits_updated_successfully": "Booking limits updated successfully","you_are_unauthorized_to_make_this_change_to_the_booking": "You are unauthorized to make this change to the booking","delegation_credential_disabled": "Delegation credential disabled",diff --git a/packages/features/eventtypes/repositories/eventTypeRepository.ts b/packages/features/eventtypes/repositories/eventTypeRepository.tsindex 0f6d551c8d9..8282eba0470 100644--- a/packages/features/eventtypes/repositories/eventTypeRepository.ts+++ b/packages/features/eventtypes/repositories/eventTypeRepository.ts@@ -637,6 +637,13 @@ export class EventTypeRepository implements IEventTypesRepository {select: {id: true,teamId: true,+ team: {+ select: {+ id: true,+ bookingLimits: true,+ includeManagedEventsInLimits: true,+ },+ },},},teamId: true,@@ -653,6 +660,8 @@ export class EventTypeRepository implements IEventTypesRepository {slug: true,parentId: true,rrTimestampBasis: true,+ bookingLimits: true,+ includeManagedEventsInLimits: true,parent: {select: {slug: true,@@ -943,6 +952,13 @@ export class EventTypeRepository implements IEventTypesRepository {select: {id: true,teamId: true,+ team: {+ select: {+ id: true,+ bookingLimits: true,+ includeManagedEventsInLimits: true,+ },+ },},},teamId: true,@@ -959,6 +975,8 @@ export class EventTypeRepository implements IEventTypesRepository {slug: true,parentId: true,rrTimestampBasis: true,+ bookingLimits: true,+ includeManagedEventsInLimits: true,parent: {select: {slug: true,