Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use org logo for organization's teams #12961

Closed

Conversation

hariombalhara
Copy link
Member

@hariombalhara hariombalhara commented Dec 29, 2023

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.
image

Create Event Type Dropdown
image

Teams listing
image

New Webhook dropdown
image

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

When organization has logo uploaded.

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

Create Event Type Dropdown
image

Teams listing
image

New Webhook dropdown
image

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

Seeded Team booking Page
image

Type of change

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

How should this be tested?

See the screenshots

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

Copy link

vercel bot commented Dec 29, 2023

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
Copy link
Member Author

Current dependencies on/for this PR:

This stack of pull requests is managed by Graphite.

Copy link
Contributor

github-actions bot commented Dec 29, 2023

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

Copy link
Contributor

github-actions bot commented Dec 29, 2023

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

Copy link
Member

@PeerRich PeerRich left a comment

Choose a reason for hiding this comment

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

about to be deprecated according to @emrysal

@PeerRich PeerRich added enterprise area: enterprise, audit log, organisation, SAML, SSO organizations area: organizations, orgs labels Dec 29, 2023
@PeerRich PeerRich added the Medium priority Created by Linear-GitHub Sync label Dec 29, 2023
@sean-brydon
Copy link
Member

I think #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
Copy link
Member Author

@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

@keithwillcode keithwillcode added this to the v3.7 milestone Jan 10, 2024
@github-actions github-actions bot added the 🧹 Improvements Improvements to existing features. Mostly UX/UI label Jan 15, 2024
@sean-brydon
Copy link
Member

@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

Copy link
Contributor

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

@github-actions github-actions bot added the 🚨 merge conflict This PR has a merge conflict that has to be addressed label Jan 28, 2024
@hariombalhara hariombalhara marked this pull request as draft January 31, 2024 18:45
@keithwillcode
Copy link
Contributor

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

@keithwillcode keithwillcode modified the milestones: v3.8, v3.9 Feb 15, 2024
@hariombalhara
Copy link
Member Author

Yeah I think someone fixed it already.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
consumer core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO 🧹 Improvements Improvements to existing features. Mostly UX/UI Medium priority Created by Linear-GitHub Sync 🚨 merge conflict This PR has a merge conflict that has to be addressed organizations area: organizations, orgs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-2844] organisation subteams should have org logo
5 participants