fix: Use org logo for organization's teams

[hariombalhara]

trafficstars

What does this PR do?

Fixes #12956 #12957

When organization has no logo uploaded

Non-Org teams still show their logo but org sub-teams now show the logo of the org.

Create Event Type Dropdown

Teams listing

New Webhook dropdown

Engineering Team Booking Page - Engineering Team is a team inside Org1

When organization has logo uploaded.

Non-Org teams still show their logo but org sub-teams now show the logo of the org.

Create Event Type Dropdown

Teams listing

New Webhook dropdown

Engineering Team Booking Page - Engineering Team is a team inside Org1

Seeded Team booking Page

Type of change

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

How should this be tested?

See the screenshots

Mandatory Tasks

• [x] 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[bot]]

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	Jan 25, 2024 10:09am
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 25, 2024 10:09am
cal-demo	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Jan 25, 2024 10:09am
dev	❌ Failed (Inspect)			Jan 25, 2024 10:09am
qa	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Jan 25, 2024 10:09am
ui	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Jan 25, 2024 10:09am

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jan 25, 2024 10:09am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 25, 2024 10:09am

[hariombalhara]

Current dependencies on/for this PR:

• main
  • PR #12961 👈

This stack of pull requests is managed by Graphite.

[github-actions[bot]]

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

[github-actions[bot]]

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

[sean-brydon]

I think https://github.com/calcom/cal.com/pull/12716 Should do this and it is also a bit cleaner. I need to fix e2e tests when i get a chance but i think this is a better approach?

Let me know if there is something i am missing here

[hariombalhara]

@sean-brydon your PR is certainly cleaning things up and would be happy to merge it but I don't think it's fixing the bugs(didn't test though).

I can clearly see that there are no changes in event-types/index.tsx and TeamListItem.tsx in that PR

[sean-brydon]

@sean-brydon your PR is certainly cleaning things up and would be happy to merge it but I don't think it's fixing the bugs(didn't test though).

I can clearly see that there are no changes in event-types/index.tsx and TeamListItem.tsx in that PR

Yeah youre right - that PR did not fix any bugs just cleaned up the approach to handle the orgLogo. Would you be up for migrating this PR over to that approach? It does require fetching more info for the orgs other than just the organizationID - but i think we should have that in session.

Just ping me if you want me to take this over instead

[github-actions[bot]]

Hey there, there is a merge conflict, can you take a look?

[keithwillcode]

@sean-brydon @hariombalhara should we close this one?

[hariombalhara]

Yeah I think someone fixed it already.