Skip to content

fix: add org avatar to org booking pages [CAL-2333]#10847

Merged
leog merged 11 commits intomainfrom
fix/org-event-booking-avatar
Aug 23, 2023
Merged

fix: add org avatar to org booking pages [CAL-2333]#10847
leog merged 11 commits intomainfrom
fix/org-event-booking-avatar

Conversation

@leog
Copy link
Copy Markdown
Contributor

@leog leog commented Aug 18, 2023

What does this PR do?

Added the org avatar in booking pages under the org. Also fixed link of user avatars'.

image

Fixes #10689

Type of change

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

How should this be tested?

Go to an event type belonging to a user or team within an org and see the org avatar in the list of members as well as checking the links of those avatars to be correct now.

Mandatory Tasks

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

@leog leog added this to the v3.3 milestone Aug 18, 2023
@leog leog requested a review from a team August 18, 2023 19:31
@leog leog self-assigned this Aug 18, 2023
@linear
Copy link
Copy Markdown

linear Bot commented Aug 18, 2023

CAL-2333 Orgs: Public booking page for an individual doesn't show team or org context

Public booking page looks like a regular individual booking page:

CleanShot 2023-08-10 at 09.30.412x.png

Should be.

CleanShot 2023-08-10 at 09.34.002x.png

View in Figma

@vercel
Copy link
Copy Markdown

vercel Bot commented Aug 18, 2023 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 23, 2023 7:36pm
cal-demo ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 23, 2023 7:36pm
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 23, 2023 7:36pm
ui ❌ Failed (Inspect) Aug 23, 2023 7:36pm
2 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Aug 23, 2023 7:36pm
qa ⬜️ Ignored (Inspect) Visit Preview Aug 23, 2023 7:36pm

@github-actions github-actions Bot added app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar Medium priority Created by Linear-GitHub Sync organizations area: organizations, orgs 🐛 bug Something isn't working labels Aug 18, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 18, 2023 •
edited
Loading

Thank you for following the naming conventions! 🙏

@zomars zomars added the core area: core, team members only label Aug 18, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 18, 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! 🙌

@deploysentinel
Copy link
Copy Markdown

deploysentinel Bot commented Aug 18, 2023 •
edited
Loading

No failed tests 🎉

@leog leog requested review from a team and removed request for a team August 19, 2023 16:35
joeauyeung
joeauyeung requested changes Aug 20, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

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

Heads up this isn't working with org avatars that are not the default one

On Shell

CleanShot 2023-08-19 at 21 57 13@2x

On booking page

CleanShot 2023-08-19 at 21 58 06@2x

hariombalhara
hariombalhara reviewed Aug 21, 2023
View reviewed changes
Comment thread packages/features/bookings/components/event-meta/Members.tsx Outdated
hariombalhara
hariombalhara previously requested changes Aug 21, 2023
View reviewed changes
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.

Left a comment, otherwise looks good to me.

@leog
Copy link
Copy Markdown
Contributor Author

leog commented Aug 21, 2023

Heads up this isn't working with org avatars that are not the default one

@joeauyeung nice catch! using web app URL to reference the org avatar, now it's working as expected, thanks!

joeauyeung
joeauyeung previously approved these changes Aug 21, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

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

LGTM. Tested with user and team events.

@leog leog dismissed hariombalhara’s stale review August 23, 2023 17:30

Changes addressed

@leog leog enabled auto-merge (squash) August 23, 2023 17:30
@leog leog merged commit 68ec946 into main Aug 23, 2023
@leog leog deleted the fix/org-event-booking-avatar branch August 23, 2023 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joeauyeung joeauyeung joeauyeung approved these changes

@hariombalhara hariombalhara Awaiting requested review from hariombalhara

Assignees

@leog leog

Labels

app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar 🐛 bug Something isn't working core area: core, team members only Medium priority Created by Linear-GitHub Sync organizations area: organizations, orgs

Projects

None yet

Milestone

v3.3

Development

Successfully merging this pull request may close these issues.

[CAL-2333] Orgs: Public booking page for an individual doesn't show team or org context

4 participants

@leog @hariombalhara @joeauyeung @zomars