fix: Org Seeder - to better represent production scenario and fix admin org delete cleanup #15157

hariombalhara · 2024-05-22T14:17:01Z

What does this PR do?

Fixes CAL-3788
On org delete

Do better messaging
cleanup redirects

Fix seeder

Create redirects
Set movedFromUser

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected)
N/A 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) - It is a straightforward change testing a flow that is seldom used and only by admins.

How should this be tested?

Delete seeded Acme org and test that app.cal.local:3000/owner1-acme doesn't redirect any more

…cation

github-actions · 2024-05-22T14:17:14Z

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

vercel · 2024-05-22T14:17:17Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 23, 2024 4:56pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		May 23, 2024 4:56pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		May 23, 2024 4:56pm

hariombalhara · 2024-05-22T14:17:22Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @hariombalhara and the rest of your teammates on Graphite

hariombalhara · 2024-05-22T14:19:16Z

packages/prisma/seed.ts

Updated seeder to create TempOrgRedirect entries and set movedFromUser column

github-actions · 2024-05-22T14:26:01Z

📦 Next.js Bundle Analysis for @calcom/web

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

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2024-05-22T14:27:01Z

Current Playwright Test Results Summary

✅ 0 Passing - ❌ 2 Failing

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 05/23/2024 04:27:36pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 8f1c35b

Started: 05/23/2024 04:25:46pm UTC

❌ Failures

📄 apps/web/playwright/booking-limits.e2e.ts • 2 Failures

Top 1 Common Error Messages

`Timed out 30000ms waiting for expect(received).toBeVisible()`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Duration limits day Retry 2 • Retry 1 • Initial Attempt Error: Timed out 30000ms waiting for expect(received).toBeVisible()... `Timed out 30000ms waiting for expect(received).toBeVisible() Call log: - expect.toBeVisible with timeout 30000ms - waiting for getByTestId('success-page') - waiting for getByTestId('success-page')`	4.78% (11) 11 / 230 runs failed over last 7 days	0.43% (1) 1 / 230 run flaked over last 7 days
Duration limits week Retry 2 • Retry 1 • Initial Attempt Error: Timed out 30000ms waiting for expect(received).toBeVisible()... `Timed out 30000ms waiting for expect(received).toBeVisible() Call log: - expect.toBeVisible with timeout 30000ms - waiting for getByTestId('success-page') - waiting for getByTestId('success-page')`	4.78% (11) 11 / 230 runs failed over last 7 days	0% (0) 0 / 230 runs flaked over last 7 days

View Detailed Build Results

graphite-app · 2024-05-23T03:00:11Z

Graphite Automations

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

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

linear · 2024-05-23T03:48:30Z

CAL-3788 Org deletion doesn't remove redirect in TempOrgRedirect

keithwillcode

Ran seed locally and everything looks good.

keithwillcode · 2024-05-23T17:42:44Z

Will merge once #15161 goes in

…in org delete cleanup (calcom#15157) * Fix seeder and update message to inform well about org deletion implication * Cleanup tempOrgRedirect as well --------- Co-authored-by: Keith Williams <[email protected]>

Fix seeder and update message to inform well about org deletion impli…

2543b4a

…cation

keithwillcode added consumer core area: core, team members only labels May 22, 2024

hariombalhara commented May 22, 2024

View reviewed changes

packages/prisma/seed.ts

Copy link

Member Author

hariombalhara May 22, 2024

Choose a reason for hiding this comment

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

Updated seeder to create TempOrgRedirect entries and set movedFromUser column

vercel bot deployed to Preview – ai May 22, 2024 14:19 View deployment

vercel bot deployed to Preview – api May 22, 2024 14:23 View deployment

vercel bot deployed to Preview – dev May 22, 2024 14:28 View deployment

hariombalhara changed the title ~~Fix seeder and update message to inform well about org deletion implication~~ fix: Org Seeder - to better represent production scenario May 23, 2024

hariombalhara changed the title ~~fix: Org Seeder - to better represent production scenario~~ fix: Org Seeder - to better represent production scenario and fix admin org delete cleanup May 23, 2024

Cleanup tempOrgRedirect as well

8f1c35b

hariombalhara force-pushed the fix-seed-show-migrated-event branch from 2415f37 to 8f1c35b Compare May 23, 2024 02:51

vercel bot deployed to Preview – ai May 23, 2024 02:53 View deployment

hariombalhara added this to the v4.2 milestone May 23, 2024

hariombalhara marked this pull request as ready for review May 23, 2024 02:57

graphite-app bot requested a review from a team May 23, 2024 02:57

dosubot bot added organizations area: organizations, orgs 🐛 bug Something isn't working labels May 23, 2024

vercel bot deployed to Preview – api May 23, 2024 02:57 View deployment

hariombalhara marked this pull request as draft May 23, 2024 02:57

vercel bot deployed to Preview – dev May 23, 2024 03:02 View deployment

hariombalhara marked this pull request as ready for review May 23, 2024 03:15

keithwillcode approved these changes May 23, 2024

View reviewed changes

keithwillcode enabled auto-merge (squash) May 23, 2024 13:00

auto-merge was automatically disabled May 23, 2024 16:50
Merge queue setting changed

keithwillcode enabled auto-merge May 23, 2024 16:53

Merge branch 'main' into fix-seed-show-migrated-event

7048995

vercel bot deployed to Preview – ai May 23, 2024 16:56 View deployment

keithwillcode disabled auto-merge May 23, 2024 16:57

keithwillcode enabled auto-merge May 23, 2024 16:57

keithwillcode added this pull request to the merge queue May 23, 2024

vercel bot deployed to Preview – api May 23, 2024 17:02 View deployment

vercel bot deployed to Preview – dev May 23, 2024 17:05 View deployment

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 23, 2024

keithwillcode added this pull request to the merge queue May 23, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 23, 2024

keithwillcode added this pull request to the merge queue May 23, 2024

Merged via the queue into main with commit 1a38169 May 23, 2024
23 of 36 checks passed

keithwillcode deleted the fix-seed-show-migrated-event branch May 23, 2024 18:16

p6l-richard mentioned this pull request Jul 24, 2024

fix(marketing): move the sitemap for search engines to core app #15893

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Org Seeder - to better represent production scenario and fix admin org delete cleanup #15157

fix: Org Seeder - to better represent production scenario and fix admin org delete cleanup #15157

hariombalhara commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

vercel bot commented May 22, 2024 •

edited

Loading

hariombalhara commented May 22, 2024

hariombalhara May 22, 2024

github-actions bot commented May 22, 2024 •

edited

Loading

deploysentinel bot commented May 22, 2024 •

edited

Loading

Top 1 Common Error Messages

Test Case Results

graphite-app bot commented May 23, 2024

linear bot commented May 23, 2024

keithwillcode left a comment

keithwillcode commented May 23, 2024

fix: Org Seeder - to better represent production scenario and fix admin org delete cleanup #15157

fix: Org Seeder - to better represent production scenario and fix admin org delete cleanup #15157

Conversation

hariombalhara commented May 22, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

github-actions bot commented May 22, 2024 • edited Loading

vercel bot commented May 22, 2024 • edited Loading

hariombalhara commented May 22, 2024

hariombalhara May 22, 2024

Choose a reason for hiding this comment

github-actions bot commented May 22, 2024 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented May 22, 2024 • edited Loading

Current Playwright Test Results Summary

❌ Failures

Top 1 Common Error Messages

Test Case Results

graphite-app bot commented May 23, 2024

Graphite Automations

linear bot commented May 23, 2024

keithwillcode left a comment

Choose a reason for hiding this comment

keithwillcode commented May 23, 2024

hariombalhara commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

vercel bot commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

deploysentinel bot commented May 22, 2024 •

edited

Loading