Skip to content

fix: Assignment reminder modal appears when deleting a team event type#15544

Merged
hariombalhara merged 12 commits intocalcom:mainfrom
anikdhabal:asignment_reminder_dialog_visibility
Jul 29, 2024
Merged

fix: Assignment reminder modal appears when deleting a team event type#15544
hariombalhara merged 12 commits intocalcom:mainfrom
anikdhabal:asignment_reminder_dialog_visibility

Conversation

@anikdhabal
Copy link
Copy Markdown
Contributor

@anikdhabal anikdhabal commented Jun 23, 2024

What does this PR do?

  • Fixes #XXXX (GitHub issue number)
  • Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Problem:-
Screenshot 2024-06-23 171204

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected)
  • I have added a Docs issue here if this PR makes changes that would require a documentation change
  • I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)

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

@vercel
Copy link
Copy Markdown

vercel bot commented Jun 23, 2024

@anikdhabal 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 Jun 23, 2024
@graphite-app graphite-app bot requested a review from a team June 23, 2024 11:39
@dosubot dosubot bot added event-types area: event types, event-types ui area: UI, frontend, button, form, input 🐛 bug Something isn't working labels Jun 23, 2024
@graphite-app
Copy link
Copy Markdown

graphite-app bot commented Jun 23, 2024

Graphite Automations

"Add community label" took an action on this PR • (06/23/24)

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

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

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 23, 2024

📦 Next.js Bundle Analysis for @calcom/web

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

Eighty-five Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load % of Budget (350 KB)
/apps 277.5 KB 505.16 KB 144.33% (🟢 -1.91%)
/apps/[slug] 294.88 KB 522.54 KB 149.30% (🟢 -1.97%)
/apps/[slug]/[...pages] 587.32 KB 814.97 KB 232.85% (🟢 -1.52%)
/apps/categories 254.55 KB 482.2 KB 137.77% (🟢 -1.71%)
/apps/categories/[category] 259.36 KB 487.01 KB 139.15% (🟢 -1.99%)
/apps/installation/[[...step]] 467.42 KB 695.08 KB 198.59% (🔴 +85.65%)
/apps/installed/[category] 278.5 KB 506.15 KB 144.61% (🟢 -1.74%)
/auth/saml-idp 12.22 KB 239.88 KB 68.54% (🟢 -20.80%)
/availability 426.9 KB 654.56 KB 187.02% (🟢 -1.58%)
/availability/[schedule] 410.77 KB 638.43 KB 182.41% (🟢 -1.59%)
/booking/[uid] 236.87 KB 464.52 KB 132.72% (🟡 +0.25%)
/booking/[uid]/embed 236.87 KB 464.53 KB 132.72% (🟡 +0.26%)
/bookings/[status] 324.57 KB 552.23 KB 157.78% (🟢 -1.61%)
/enterprise 254.6 KB 482.26 KB 137.79% (🟢 -1.71%)
/event-types 559.92 KB 787.58 KB 225.02% (🟢 -1.55%)
/event-types/[type] 435.72 KB 663.38 KB 189.54% (🟢 -1.66%)
/getting-started/[[...step]] 448.15 KB 675.8 KB 193.09% (🟡 +10.72%)
/insights 474.55 KB 702.2 KB 200.63% (🟢 -1.71%)
/more 254.11 KB 481.76 KB 137.65% (🟢 -1.72%)
/payment/[uid] 121.27 KB 348.92 KB 99.69% (🟡 +0.20%)
/settings/admin 260.58 KB 488.24 KB 139.50% (🟢 -1.69%)
/settings/admin/apps 273.96 KB 501.62 KB 143.32% (🟢 -1.68%)
/settings/admin/apps/[category] 273.95 KB 501.6 KB 143.32% (🟢 -1.68%)
/settings/admin/flags 264.41 KB 492.07 KB 140.59% (🟢 -1.69%)
/settings/admin/impersonation 260.97 KB 488.63 KB 139.61% (🟢 -1.69%)
/settings/admin/lockedSMS 282.07 KB 509.72 KB 145.63% (🟢 -1.66%)
/settings/admin/lockedSMS/lockedSMSView 119.52 KB 347.17 KB 99.19% (🟢 -0.15%)
/settings/admin/oAuth 272.69 KB 500.34 KB 142.96% (🟢 -1.69%)
/settings/admin/oAuth/oAuthView 95.41 KB 323.07 KB 92.30% (🟢 -0.20%)
/settings/admin/orgMigrations/_OrgMigrationLayout 249.36 KB 477.02 KB 136.29% (🟢 -1.73%)
/settings/admin/orgMigrations/moveTeamToOrg 299.28 KB 526.94 KB 150.55% (🟢 -1.66%)
/settings/admin/orgMigrations/moveUserToOrg 319.11 KB 546.77 KB 156.22% (🟢 -1.64%)
/settings/admin/orgMigrations/removeTeamFromOrg 299.05 KB 526.7 KB 150.49% (🟢 -1.67%)
/settings/admin/orgMigrations/removeUserFromOrg 299.06 KB 526.71 KB 150.49% (🟢 -1.66%)
/settings/admin/organizations 262.47 KB 490.12 KB 140.03% (🟢 -1.68%)
/settings/admin/organizations/[id]/edit 261.13 KB 488.78 KB 139.65% (🟢 -1.69%)
/settings/admin/users 263.24 KB 490.89 KB 140.25% (🟢 -1.68%)
/settings/admin/users/[id]/edit 392.44 KB 620.1 KB 177.17% (🟢 -1.65%)
/settings/admin/users/add 392.11 KB 619.76 KB 177.08% (🟢 -1.66%)
/settings/billing 260.79 KB 488.44 KB 139.55% (🟢 -1.69%)
/settings/developer/api-keys 265.18 KB 492.84 KB 140.81% (🟢 -1.69%)
/settings/developer/webhooks 265.36 KB 493.01 KB 140.86% (🟢 -1.69%)
/settings/developer/webhooks/[id] 266.34 KB 493.99 KB 141.14% (🟢 -1.67%)
/settings/developer/webhooks/new 266.36 KB 494.02 KB 141.15% (🟢 -1.67%)
/settings/my-account/appearance 313.8 KB 541.46 KB 154.70% (🟢 -1.68%)
/settings/my-account/calendars 272.21 KB 499.86 KB 142.82% (🟢 -1.73%)
/settings/my-account/conferencing 273.12 KB 500.78 KB 143.08% (🟢 -1.72%)
/settings/my-account/general 376.29 KB 603.95 KB 172.56% (🟢 -1.69%)
/settings/my-account/out-of-office 265.82 KB 493.47 KB 140.99% (🟢 -1.69%)
/settings/my-account/profile 408.81 KB 636.46 KB 181.85% (🟢 -1.66%)
/settings/organizations/[id]/about 159.7 KB 387.36 KB 110.67% (🟡 +0.49%)
/settings/organizations/[id]/add-teams 159.7 KB 387.35 KB 110.67% (🟡 +0.49%)
/settings/organizations/admin-api 260.74 KB 488.39 KB 139.54% (🟢 -1.69%)
/settings/organizations/appearance 122.37 KB 350.03 KB 100.01% (🟢 -48.01%)
/settings/organizations/billing 260.82 KB 488.48 KB 139.57% (🟢 -1.69%)
/settings/organizations/dsync 293.44 KB 521.1 KB 148.89% (🟢 -1.69%)
/settings/organizations/general 349.13 KB 576.79 KB 164.80% (🟢 -1.69%)
/settings/organizations/members 400.3 KB 627.96 KB 179.42% (🟢 -1.68%)
/settings/organizations/new 159.71 KB 387.36 KB 110.68% (🟡 +0.48%)
/settings/organizations/privacy 266.34 KB 493.99 KB 141.14% (🟢 -1.69%)
/settings/organizations/profile 417.35 KB 645 KB 184.29% (🟡 +2.92%)
/settings/organizations/sso 271.41 KB 499.07 KB 142.59% (🟢 -1.69%)
/settings/organizations/teams/other 261.65 KB 489.3 KB 139.80% (🟢 -1.69%)
/settings/organizations/teams/other/[id]/appearance 273.56 KB 501.21 KB 143.20% (🟢 -1.63%)
/settings/organizations/teams/other/[id]/members 268.25 KB 495.9 KB 141.69% (🟢 -1.69%)
/settings/organizations/teams/other/[id]/profile 472.03 KB 699.68 KB 199.91% (🟢 -1.67%)
/settings/platform 259.21 KB 486.87 KB 139.10% (🟢 -1.71%)
/settings/platform/new 120.72 KB 348.37 KB 99.53% (🟡 +0.52%)
/settings/platform/oauth-clients/[clientId]/edit 257.52 KB 485.17 KB 138.62% (🟢 -1.71%)
/settings/platform/oauth-clients/create 256.66 KB 484.31 KB 138.38% (🟢 -1.72%)
/settings/security/impersonation 265.99 KB 493.65 KB 141.04% (🟢 -1.69%)
/settings/security/password 304.18 KB 531.83 KB 151.95% (🟢 -1.66%)
/settings/security/sso 270.86 KB 498.52 KB 142.43% (🟢 -1.69%)
/settings/security/two-factor-auth 269.47 KB 497.13 KB 142.04% (🟢 -1.69%)
/settings/teams 260.32 KB 487.97 KB 139.42% (🟢 -1.69%)
/settings/teams/[id]/appearance 273.54 KB 501.2 KB 143.20% (🟢 -1.64%)
/settings/teams/[id]/billing 260.82 KB 488.48 KB 139.57% (🟢 -1.69%)
/settings/teams/[id]/members 378.37 KB 606.03 KB 173.15% (🟢 -1.68%)
/settings/teams/[id]/profile 472.86 KB 700.51 KB 200.15% (🟢 -1.66%)
/settings/teams/new 193.05 KB 420.71 KB 120.20% (🟢 -1.81%)
/teams 254.34 KB 481.99 KB 137.71% (🟢 -1.71%)
/upgrade 254.46 KB 482.12 KB 137.75% (🟢 -1.71%)
/video/[uid] 291.31 KB 518.97 KB 148.28% (🟢 -0.15%)
/workflows 286.36 KB 514.02 KB 146.86% (🟢 -1.65%)
/workflows/[workflow] 414.66 KB 642.31 KB 183.52% (🟢 -1.43%)
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.

Comment thread apps/web/components/eventtype/EventTypeSingleLayout.tsx Outdated
Comment thread apps/web/modules/event-types/views/event-types-single-view.tsx Outdated
Copy link
Copy Markdown
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @anikdhabal 🙏

I have suggested a different approach to solve the problem, let me know how that sounds.

@anikdhabal
Copy link
Copy Markdown
Contributor Author

@hariombalhara thanks for the review. I've updated the code.

@anikdhabal anikdhabal requested a review from hariombalhara June 24, 2024 09:38
@keithwillcode keithwillcode added the community-interns The team responsible for reviewing, testing and shipping low/medium community PRs label Jun 27, 2024
Comment thread apps/web/components/eventtype/EventTypeSingleLayout.tsx Outdated
Comment thread apps/web/components/eventtype/EventTypeSingleLayout.tsx Outdated
Comment thread apps/web/modules/event-types/views/event-types-single-view.tsx Outdated
Copy link
Copy Markdown
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

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

Suggested some more improvements

@keithwillcode keithwillcode added this to the v4.3 milestone Jul 8, 2024
@Udit-takkar Udit-takkar marked this pull request as draft July 15, 2024 08:50
@keithwillcode keithwillcode modified the milestones: v4.3, v4.4 Jul 16, 2024
@anikdhabal anikdhabal marked this pull request as ready for review July 29, 2024 04:35
@anikdhabal anikdhabal requested a review from hariombalhara July 29, 2024 04:35
Copy link
Copy Markdown
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

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

LGTM now !! Made a small change.

@hariombalhara hariombalhara enabled auto-merge (squash) July 29, 2024 09:24
@hariombalhara hariombalhara merged commit 6e66f7f into calcom:main Jul 29, 2024
zomars pushed a commit that referenced this pull request Jul 29, 2024
#15544)

* fix: Assignment reminder modal appears when deleting a team event type

* update

* Update EventTypeSingleLayout.tsx

* Update event-types-single-view.tsx

* update

* Early return https://handbook.cal.com/engineering/best-practices/prefer-early-returns

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>
zomars added a commit that referenced this pull request Oct 4, 2024
* WIP: Billing service

* WIP

* Update __handler.ts

* Update index.ts

* WIP

* WIP

Signed-off-by: zomars <zomars@me.com>

* WIP

Signed-off-by: zomars <zomars@me.com>

* Update delete.handler.ts

* Update delete.handler.ts

* Update internal-team-billing.ts

* WIP

* Type fixes

Signed-off-by: zomars <zomars@me.com>

* WIP

Signed-off-by: zomars <zomars@me.com>

* Discard changes to apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.ts

* Discard changes to packages/app-store/skype/config.json

* style: update text area (#15934)

* chore: update text-editor input

* chore: update text-editor input

* final update

* Update Editor.tsx

---------

Co-authored-by: unknown <adhabal2002@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

* fix: #15697 Assignment warning modal poping up ,even when hosts are added . (#15699)

* removed reduntand check on assignedusers

* update for managed eventtype

* formatted

* comments

* Updated comments

* extracted checkForEmptyAssignment and added tests

* updated comments

* updated to show dialog also when not yet saved

* update translations

* updated comments

* updated translation

* updated types

* chore: update naming and comments

* Delete apps/web/lib/checkForEmptyAssignment.ts

deleted since file was renamed

* Delete apps/web/test/lib/checkForEmptyAssignment.test.ts

deleted as the file is renamed to be more descriptive

* update to do teamcheck before

* chore: revert name to CheckForEmptyAssignment

* updated check conditions

* updated useEffect dependencies

---------

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

* fix: getting an error when a team member tries to leave (#15925)

a team

Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>
Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>

* feat: add transitions to more components (#15916)

* add transitions to more components

* chore: Remove duplicate class

* fix: Change minimum number of teams required for org self-serve (#15955)

* fix: Change minimum number of teams required for org self-serve

Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

* refactor: Use a new constant for displaying org helper text dialogue

Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

* Update packages/lib/constants.ts

* Update turbo.json

---------

Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>

* feat: pwa ready and add shortcut for quick access (#15957)

* chore: Update site.webmanifest with additional display properties

* chore: Update site.webmanifest with additional display properties

* Update apps/web/public/site.webmanifest

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>

* i18n: update translations for "by proceeding, ..." (#15921)

* feat: Add title attribute to iframe in embed.ts (#15944)

* feat: Add title attribute to iframe in embed.ts

* Update packages/embeds/embed-core/src/embed.ts

---------

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

* fix: Assignment reminder modal appears when deleting a team event type (#15544)

* fix: Assignment reminder modal appears when deleting a team event type

* update

* Update EventTypeSingleLayout.tsx

* Update event-types-single-view.tsx

* update

* Early return https://handbook.cal.com/engineering/best-practices/prefer-early-returns

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>

* fix: Add CORP and COEP headers to embedded pages (#15275)

* Add CORP headers

* Improve test

* Add unit tests as well

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>

* feat: No-show bookings - do not count towards a member's round robin assignment (#15323)

* feat: No-show bookings - do not count towards a member's round robin assignment

* filter no show organizer

* remove logs

* fix: filter bookings where host attendee is no show

* fix: use not condition for noShow

* chore: test

* add default false for noShowHost

* Revert "chore: test"

This reverts commit c914a8f.

* chore: integration test

* fix: noShowHost not working for null

* Update packages/lib/server/getLuckyUser.ts

* chore: update test description

---------

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: gh0st91848 <gh0st91848@gmail.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

* refactor: v1 orgs unlimited teams (#15908)

* refactor: v1 orgs unlimited teams

* fix: response message ownerId

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>

* fix: refresh connect atoms on token change (#15933)

* added dropdown

* change comment

* fix: added types

---------

Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>

* fix: Next.js bundle analysis (#15903)

* fix: Next.js bundle analysis

* Added the main checkout back

* fix: type in webhook payload (#15912)

Co-authored-by: CarinaWolli <wollencarina@gmail.com>

* fix: auto accept (#15975)

* fix: auto accept

* Update packages/lib/server/repository/organization.ts

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

---------

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

* fix: Broken GitHub workflows (#15979)

* test: Delete credential endpoint (#15322)

* Init

* Add mock trpc context

* Intro mockDatabaseClient

* Introduce mockDatabaseClient class

* Add delete video app test

* Add calendar test

* Remove unused func from bookingScenario

* Remove console.log

* Add app repository

* Add createMany method to event type repository

* Remove instance of MockDatabaseClient from video test

* Add destination calendar repository

* Remove instances of MockDatabaseClient

* abstract logic to own handler

* Remove dev dependency

* Clean up

* Type fix

* Pull yarn.lock from main

---------

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

* fix: #15967 Show better error when wrong variable is used in custom event name (#15974)

* update to show exact err msg with custom event name

* updated tests for validateCustomEventName

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

* WIP

Signed-off-by: zomars <zomars@me.com>

* Update yarn.lock

* Update publish.handler.ts

* Update internal-team-billing.test.ts

* rename create to init

* remove sync services

* wip tests for delete team

* wip tets

* wip tests

* tests/internal-test

* remove return that is inaccessable

* remove team calls to use repository

* remove redudant file

* update team repo

* add stripe mocks and test

* fix constants

* tests to main stripe handler

* remove logs

* fix constants

* Update packages/features/ee/billing/api/webhook/_customer.subscription.deleted.team-plan.ts

Co-authored-by: Omar López <zomars@me.com>

* move workflow logic to a service

* use static method > creating new class

* fix: remove http code deep in repo + tests

* Feedback

* Update index.ts

* Type fix

* Lazy load fixes

---------

Signed-off-by: zomars <zomars@me.com>
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
Co-authored-by: Rohan Advani <122167726+RNAdvani@users.noreply.github.com>
Co-authored-by: unknown <adhabal2002@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Vijay <vijayraghav22@gmail.com>
Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>
Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Co-authored-by: Hichem Fantar <hichemfantar2049@gmail.com>
Co-authored-by: Souptik Datta <souptikdatta2001@gmail.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>
Co-authored-by: Johannes Maendle <141119154+jomaendle2@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: gh0st91848 <gh0st91848@gmail.com>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: sean-brydon <sean@cal.com>
Co-authored-by: sean <sean@brydon.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🐛 bug Something isn't working community Created by Linear-GitHub Sync community-interns The team responsible for reviewing, testing and shipping low/medium community PRs event-types area: event types, event-types ready-for-e2e ui area: UI, frontend, button, form, input

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants