Skip to content

Comments

feat: Add cancelledBy input to cancellation page#18770

Merged
anikdhabal merged 17 commits intocalcom:mainfrom
iharsh02:fix-cal-5045
Jul 14, 2025
Merged

feat: Add cancelledBy input to cancellation page#18770
anikdhabal merged 17 commits intocalcom:mainfrom
iharsh02:fix-cal-5045

Conversation

@iharsh02
Copy link
Contributor

@iharsh02 iharsh02 commented Jan 20, 2025

What does this PR do?

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.

How should this be tested?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my changes generate no new warnings
cal-5045.mp4

@vercel
Copy link

vercel bot commented Jan 20, 2025

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

A member of the Team first needs to authorize it.

@graphite-app graphite-app bot added the community Created by Linear-GitHub Sync label Jan 20, 2025
@graphite-app graphite-app bot requested a review from a team January 20, 2025 17:57
@github-actions
Copy link
Contributor

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Fix cal 5045". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

@github-actions github-actions bot added Medium priority Created by Linear-GitHub Sync ✨ feature New feature or request labels Jan 20, 2025
@dosubot dosubot bot added bookings area: bookings, availability, timezones, double booking i18n area: i18n, translations labels Jan 20, 2025
@iharsh02 iharsh02 changed the title Fix cal 5045 feat: Add cancelledBy input to cancellation page Jan 20, 2025
@graphite-app
Copy link

graphite-app bot commented Jan 20, 2025

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (01/20/25)

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

"Add community label" took an action on this PR • (01/20/25)

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

"Add ready-for-e2e label" took an action on this PR • (07/14/25)

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

@iharsh02
Copy link
Contributor Author

@Praashh sorry for the last PR , what happened their was not suppose to happen truly embarrassing 🙏

@Praashh Praashh self-assigned this Jan 20, 2025
Copy link
Contributor

@Praashh Praashh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! tagging @anikdhabal for a final touch..

@github-actions
Copy link
Contributor

github-actions bot commented Feb 8, 2025

This PR is being marked as stale due to inactivity.

@github-actions github-actions bot added the Stale label Feb 8, 2025
@dosubot dosubot bot added this to the v5.1 milestone Feb 17, 2025
@github-actions github-actions bot removed the Stale label Feb 18, 2025
@anikdhabal
Copy link
Contributor

@iharsh02 thanks for your work. Could you pls fix the conflicts

@iharsh02 iharsh02 requested a review from a team February 19, 2025 14:36
@iharsh02
Copy link
Contributor Author

@anikdhabal fixed the merge conflicts 🙏

@kart1ka
Copy link
Contributor

kart1ka commented Jul 2, 2025

@iharsh02 Pls resolve the conflicts and address the cubic comments.

@kart1ka kart1ka assigned kart1ka and unassigned Praashh Jul 3, 2025
@kart1ka kart1ka marked this pull request as ready for review July 5, 2025 18:07
Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cubic found 1 issue across 3 files. Review it in cubic.dev

React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.

@kart1ka kart1ka requested a review from anikdhabal July 9, 2025 03:04
@anikdhabal anikdhabal enabled auto-merge (squash) July 14, 2025 06:37
Copy link
Contributor

@kart1ka kart1ka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@anikdhabal anikdhabal merged commit 2838053 into calcom:main Jul 14, 2025
70 of 78 checks passed
anikdhabal added a commit that referenced this pull request Jul 14, 2025
@anikdhabal
Copy link
Contributor

anikdhabal commented Jul 14, 2025

Reverted the pr for now, because tests are failing in many prs. We need to handle the tests along with this. @iharsh02 let's fix it the whole thing in a follow-up pr.
This test failing now:-
apps/web/playwright/booking-seats.e2e.ts:122:7 › Reschedule for booking with seats › If rescheduled/cancelled booking with seats it should display the correct number of seats

@iharsh02
Copy link
Contributor Author

Reverted the pr for now, because tests are failing in many prs. We need to handle the tests along with this. @iharsh02 let's fix it the whole thing in a follow-up pr. This test failing now:- apps/web/playwright/booking-seats.e2e.ts:122:7 › Reschedule for booking with seats › If rescheduled/cancelled booking with seats it should display the correct number of seats

apps/web/playwright/booking-seats.e2e.ts:122:7 › Reschedule for booking with seats › If rescheduled/cancelled booking with seats it should display the correct number of seats

The tests are failing because they’re not configured to handle the cancellation dialog box.
To fix this, we need to update the test so it can properly handle the cancellation dialog box.

@anikdhabal, could you take a look at this? Also, please let me know if you’d like me to proceed further with this PR.

@anikdhabal
Copy link
Contributor

yes @iharsh02 pls go ahead

alishaz-polymath pushed a commit that referenced this pull request Jul 16, 2025
* feat: Add cancelledBy input to cancellation page

* fix: Update email verification error message

* Update safe-parse.ts

* fix: check attendees and booking owner email

* fix: minor ui

* Update CancelBooking.tsx

* Update common.json

---------

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com>
@iharsh02
Copy link
Contributor Author

@anikdhabal fixed the test would you like me to make another PR ?

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bookings area: bookings, availability, timezones, double booking community Created by Linear-GitHub Sync ✨ feature New feature or request i18n area: i18n, translations Medium priority Created by Linear-GitHub Sync ready-for-e2e

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CAL-5045] Add email input dialog to /booking/uid page

4 participants