feat: past and overlapping ooo #17373

Amit91848 · 2024-10-28T15:59:53Z

What does this PR do?

Fixes [CAL-4631] allow OOO of the past and overlapping #17368
Fixes CAL-4631
/claim [CAL-4631] allow OOO of the past and overlapping #17368
Fixes [CAL-4769] currently cant have overlapping OOO #17772

Screencast.from.2024-10-28.21-26-38.webm

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

vercel · 2024-10-28T15:59:59Z

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

A member of the Team first needs to authorize it.

graphite-app · 2024-10-28T16:05:30Z

Graphite Automations

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

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

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

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

emrysal · 2024-10-30T13:24:07Z

packages/ui/components/form/date-range-picker/Calendar.tsx


 function Calendar({
  className,
  classNames,
  fromDate,
  toDate,
  showOutsideDays = true,
+  disablePastDates = true,


would prefer this to be a minDate option (set by default to new Date()) - and nullable to allow all dates enabled.

Edit: This can be implemented to a minor tweak to the fromDate instead of introducing a new param.

emrysal

https://github.com/calcom/cal.com/pull/17373/files#r1822623987

packages/ui/components/form/date-range-picker/Calendar.tsx

packages/ui/components/form/date-range-picker/DateRangePicker.tsx

Praashh

changes looks correct to me, tested in local as well. Thank you @Amit91848

github-actions · 2024-11-01T10:16:39Z

E2E results are ready!

Workflow #39073.1 latest results

anikdhabal

Pls add test to verify this

…st_and_overlapping_ooo

Amit91848 · 2024-11-18T07:55:32Z

Recording.2024-11-18.132444.mp4

Is something up with ooo page? I cannot load it and it straight up crashes the server without any error message. I have the latest pull from upstream

Praashh · 2024-11-20T08:03:08Z

Recording.2024-11-18.132444.mp4
Is something up with ooo page? I cannot load it and it straight up crashes the server without any error message. I have the latest pull from upstream

nope, working for me

Praashh

All good, can you please add a test case for overlapping OOOs?

Amit91848 · 2024-11-20T15:27:17Z

Added tests, sorry for the delay.

Pretty sure there is a memory leak in ooo page. Also maybe in other sub pages under /my-account

Praashh · 2024-11-20T16:05:17Z

I'll check that

Praashh

I notice that I don't think we need duplicate OOO, we only need overlapping OOOs.

packages/trpc/server/routers/loggedInViewer/outOfOffice.handler.ts

Amit91848 · 2024-11-23T16:06:04Z

I notice that I don't think we need duplicate OOO, we only need overlapping OOOs.

Nice catch, made changes and updated tests

Praashh

LGTM!!

rereview please

feat: past and overlapping ooo

0b6d9a3

github-actions bot added 💎 Bounty A bounty on Algora.io 🧹 Improvements Improvements to existing features. Mostly UX/UI labels Oct 28, 2024

dosubot bot added the ✨ feature New feature or request label Oct 28, 2024

dosubot bot added this to the Community Only milestone Oct 28, 2024

graphite-app bot requested a review from a team October 28, 2024 16:01

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

Praashh self-assigned this Oct 28, 2024

emrysal reviewed Oct 30, 2024

View reviewed changes

emrysal previously requested changes Oct 30, 2024

View reviewed changes

use existing props

719bd4c

Amit91848 commented Oct 31, 2024

View reviewed changes

packages/ui/components/form/date-range-picker/Calendar.tsx Show resolved Hide resolved

packages/ui/components/form/date-range-picker/DateRangePicker.tsx Show resolved Hide resolved

Amit91848 requested a review from emrysal October 31, 2024 08:28

Praashh approved these changes Nov 1, 2024

View reviewed changes

Praashh added the ready-for-e2e label Nov 1, 2024

Praashh mentioned this pull request Nov 1, 2024

feat: Added OutOfOfficeEntry date overlapping field and switch #17397

Closed

3 tasks

anikdhabal previously requested changes Nov 6, 2024

View reviewed changes

Amit91848 added 2 commits November 9, 2024 19:28

Merge branch 'main' into feat/past_and_overlapping_ooo

d5cbbda

Merge branch 'main' of https://github.com/calcom/cal.com into feat/pa…

e1b2c9c

…st_and_overlapping_ooo

Praashh requested changes Nov 20, 2024

View reviewed changes

Amit91848 and others added 2 commits November 20, 2024 18:23

Merge branch 'main' into feat/past_and_overlapping_ooo

42ae888

added e2e test

67dab9b

Amit91848 requested review from anikdhabal and Praashh November 20, 2024 15:26

Praashh requested changes Nov 20, 2024

View reviewed changes

Praashh reviewed Nov 20, 2024

View reviewed changes

packages/trpc/server/routers/loggedInViewer/outOfOffice.handler.ts Show resolved Hide resolved

itsalam mentioned this pull request Nov 20, 2024

[CAL-4769] currently cant have overlapping OOO #17772

Closed

disallow duplicates added tests

8481e96

Amit91848 requested a review from Praashh November 23, 2024 16:06

algora-pbc bot mentioned this pull request Nov 23, 2024

[CAL-4631] allow OOO of the past and overlapping #17368

Closed

algora-pbc bot added the 🙋 Bounty claim label Nov 23, 2024

Praashh approved these changes Nov 23, 2024

View reviewed changes

Merge branch 'main' into feat/past_and_overlapping_ooo

34935fc

github-actions bot added Medium priority Created by Linear-GitHub Sync 🐛 bug Something isn't working labels Nov 24, 2024

PeerRich enabled auto-merge (squash) November 24, 2024 18:37

PeerRich merged commit 5af10a2 into calcom:main Nov 24, 2024
33 of 37 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: past and overlapping ooo #17373

feat: past and overlapping ooo #17373

Amit91848 commented Oct 28, 2024 •

edited

Loading

vercel bot commented Oct 28, 2024

graphite-app bot commented Oct 28, 2024

emrysal Oct 30, 2024 •

edited

Loading

emrysal left a comment

Praashh left a comment

github-actions bot commented Nov 1, 2024 •

edited

Loading

anikdhabal left a comment •

edited

Loading

Amit91848 commented Nov 18, 2024

Praashh commented Nov 20, 2024

Praashh left a comment

Amit91848 commented Nov 20, 2024

Praashh commented Nov 20, 2024

Praashh left a comment

Amit91848 commented Nov 23, 2024

Praashh left a comment

feat: past and overlapping ooo #17373

feat: past and overlapping ooo #17373

Conversation

Amit91848 commented Oct 28, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

vercel bot commented Oct 28, 2024

graphite-app bot commented Oct 28, 2024

Graphite Automations

emrysal Oct 30, 2024 • edited Loading

Choose a reason for hiding this comment

emrysal left a comment

Choose a reason for hiding this comment

Praashh left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 1, 2024 • edited Loading

E2E results are ready!

anikdhabal left a comment • edited Loading

Choose a reason for hiding this comment

Amit91848 commented Nov 18, 2024

Praashh commented Nov 20, 2024

Praashh left a comment

Choose a reason for hiding this comment

Amit91848 commented Nov 20, 2024

Praashh commented Nov 20, 2024

Praashh left a comment

Choose a reason for hiding this comment

Amit91848 commented Nov 23, 2024

Praashh left a comment

Choose a reason for hiding this comment

Amit91848 commented Oct 28, 2024 •

edited

Loading

emrysal Oct 30, 2024 •

edited

Loading

github-actions bot commented Nov 1, 2024 •

edited

Loading

anikdhabal left a comment •

edited

Loading