Skip to content

fix: [CAL-2040] add spinner when bookerState is loading#9873

Merged
CarinaWolli merged 2 commits into
calcom:mainfrom
afrieirham:fix/booker-shows-monthly-when-default-is-weekly-or-column
Jul 24, 2023
Merged

fix: [CAL-2040] add spinner when bookerState is loading#9873
CarinaWolli merged 2 commits into
calcom:mainfrom
afrieirham:fix/booker-shows-monthly-when-default-is-weekly-or-column

Conversation

@afrieirham
Copy link
Copy Markdown
Contributor

@afrieirham afrieirham commented Jul 1, 2023

What does this PR do?

Add loading spinner when bookerState is loading to avoid showing monthly view if the default is set to weekly or column.

Fixes #9758

Screen.Recording.2023-07-02.at.12.31.05.AM.mp4

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How should this be tested?

  • Use user free@example.com and choose weekly or column view in appearance. Then visit booker's page.

Mandatory Tasks

  • Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

Checklist

  • I haven't added tests that prove my fix is effective or that my feature works

@vercel
Copy link
Copy Markdown

vercel Bot commented Jul 1, 2023 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
ui ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 24, 2023 6:12am

@vercel
Copy link
Copy Markdown

vercel Bot commented Jul 1, 2023

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

A member of the Team first needs to authorize it.

@github-actions github-actions Bot added booking-page area: booking page, public booking page, booker Medium priority Created by Linear-GitHub Sync new-booker 🐛 bug Something isn't working labels Jul 1, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jul 1, 2023 •
edited
Loading

Thank you for following the naming conventions! 🙏

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jul 1, 2023 •
edited
Loading

📦 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! 🙌

@afrieirham afrieirham force-pushed the fix/booker-shows-monthly-when-default-is-weekly-or-column branch from 31f8692 to fab6f79 Compare July 2, 2023 15:43
@afrieirham afrieirham mentioned this pull request Jul 2, 2023
Closed
CarinaWolli
CarinaWolli requested changes Jul 6, 2023
View reviewed changes
Comment thread packages/features/bookings/Booker/Booker.tsx Outdated
const shouldShowFormInDialog = shouldShowFormInDialogMap[layout];

if (bookerState === "loading") {
return <Spinner />;
Copy link
Copy Markdown
Member

@CarinaWolli CarinaWolli Jul 6, 2023

Choose a reason for hiding this comment

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

I don't think we want to show a spinner. I would prefer to return null if bookerState is still loading.

Let me know in case I am missing something and it was mentioned somewhere to use a spinner here (cc @Jaibles )

Copy link
Copy Markdown
Contributor Author

@afrieirham afrieirham Jul 9, 2023

Choose a reason for hiding this comment

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

updated

Screen.Recording.2023-07-09.at.2.02.47.PM.mp4

@afrieirham afrieirham force-pushed the fix/booker-shows-monthly-when-default-is-weekly-or-column branch from 0caa3e0 to 1d4fb6e Compare July 9, 2023 06:07
@afrieirham afrieirham requested a review from CarinaWolli July 9, 2023 06:08
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jul 24, 2023

This PR is being marked as stale due to inactivity.

@github-actions github-actions Bot added the Stale label Jul 24, 2023
@afrieirham afrieirham force-pushed the fix/booker-shows-monthly-when-default-is-weekly-or-column branch from 1d4fb6e to 0a25a34 Compare July 24, 2023 06:08
CarinaWolli
CarinaWolli approved these changes Jul 24, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@CarinaWolli CarinaWolli left a comment

Choose a reason for hiding this comment

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

Looks good to me now. Thank you 🙏

@CarinaWolli CarinaWolli merged commit f168ec8 into calcom:main Jul 24, 2023
@hariombalhara hariombalhara mentioned this pull request Jul 25, 2023
Merged
2 tasks
fritterhoff pushed a commit to hm-edu/cal.com that referenced this pull request Jul 25, 2023
@afrieirham @fritterhoff
fix: [CAL-2040] add spinner when bookerState is loading (calcom#9873)
181ef38
@hariombalhara hariombalhara mentioned this pull request Aug 7, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CarinaWolli CarinaWolli CarinaWolli approved these changes

Assignees

No one assigned

Labels

booking-page area: booking page, public booking page, booker 🐛 bug Something isn't working Medium priority Created by Linear-GitHub Sync Stale

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[CAL-2040] Booker shows loading of monthly, if only view is weekly or column

3 participants

@afrieirham @CarinaWolli @PeerRich