feat: User Avatar and Org Logo by joeauyeung · Pull Request #10700 · calcom/cal.diy

joeauyeung · 2023-08-10T14:10:10Z

What does this PR do?

This PR adds the organization logo to the user user avatars where the "lg" size was used.

-User onboarding step

User public page

User profile settings

Fixes # (issue)

Requirement/Documentation

If there is a requirement document, please, share it here.
If there is ab UI/UX design document, please, share it here.

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Create an org and add a member
Go to that memeber's public page. The organization logo should be displayed with the avatar
Go to the member's profile setting's page. The organization logo should be displayed with the avatar
Go to those two pages with a normal user. The avatar should render itself

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
I haven't checked if new and existing unit tests pass locally with my changes

vercel · 2023-08-10T14:10:18Z

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

Name	Status	Preview	Comments	Updated (UTC)
ai	❌ Failed (Inspect)			Sep 7, 2023 2:21pm
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 7, 2023 2:21pm
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 7, 2023 2:21pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 7, 2023 2:21pm
qa	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Sep 7, 2023 2:21pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 7, 2023 2:21pm

1 Ignored Deployment

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Sep 7, 2023 2:21pm

github-actions · 2023-08-10T14:10:27Z

Thank you for following the naming conventions! 🙏

alwaysmeticulous · 2023-08-10T14:12:32Z

🤖 Meticulous spotted visual differences in 60 of 171 screens tested: view and approve differences detected.

_{Last updated for commit 95a92c4. This comment will update as new commits are pushed.}

github-actions · 2023-08-10T14:17:38Z

📦 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 · 2023-08-10T14:18:37Z

Current Playwright Test Results Summary

✅ 117 Passing - ⚠️ 1 Flaky

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

(Last updated on 09/07/2023 02:21:43pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 57aee32

Started: 09/07/2023 02:19:41pm UTC

⚠️ Flakes

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	2.31% (7) 7 / 303 runs failed over last 7 days	96.37% (292) 292 / 303 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-08-21T09:30:49Z

-              size === "lg" ? "h-5 w-5" : "h-2 w-2"
-            )}>
-            <div className="flex h-full items-center justify-center p-[2px]">
-              {size === "lg" && <Check />}


Where are we handling this now?

This wasn't being used anywhere in the app so removed for now. #10788

joeauyeung · 2023-08-21T17:40:45Z

 }
+
+export function getUserOrgDomain(organization: RouterOutputs["viewer"]["me"]["organization"]): string {
+  const orgSlug = organization.slug ?? organization.metadata?.requestedSlug;


@hariombalhara would this satisfy this comment?
#10700 (comment)

CLAassistant · 2023-08-28T09:18:46Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ alannnc
✅ joeauyeung
❌ crowdin-bot
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

…thor names (#11164)

Co-authored-by: alannnc <alannnc@gmail.com>

sean-brydon · 2023-09-07T08:09:45Z

Overall LGTM - Noticed one weird case in /profile where the team logo is tiny. This can be handled in a follow up tho.

Nice job

Pass organization name & logo

58f9cb3

zomars added the core area: core, team members only label Aug 10, 2023

vercel Bot deployed to Preview – api August 10, 2023 14:11 View deployment

vercel Bot deployed to Preview – dev August 10, 2023 14:12 View deployment

vercel Bot deployed to Preview – cal-demo August 10, 2023 14:12 View deployment

Overflow hidden

f578d41

vercel Bot deployed to Preview – ui August 10, 2023 15:00 View deployment

vercel Bot deployed to Preview – api August 10, 2023 15:02 View deployment

vercel Bot deployed to Preview – dev August 10, 2023 15:02 View deployment

vercel Bot deployed to Preview – cal-demo August 10, 2023 15:02 View deployment

joeauyeung added 3 commits August 10, 2023 15:05

Show org icon on public page

a6913c4

Add org logo to large user avatars

8461b62

Clean up

8c95c58

vercel Bot deployed to Preview – ui August 11, 2023 00:43 View deployment

joeauyeung requested a review from a team August 11, 2023 00:45

joeauyeung self-assigned this Aug 11, 2023

joeauyeung added organizations area: organizations, orgs and removed core area: core, team members only labels Aug 11, 2023

joeauyeung marked this pull request as ready for review August 11, 2023 00:45

Merge branch 'main' into feat/user-org-avatar

68359a8

zomars added the core area: core, team members only label Aug 11, 2023

vercel Bot deployed to Preview – ui August 11, 2023 00:49 View deployment

vercel Bot deployed to Preview – dev August 11, 2023 00:54 View deployment

vercel Bot deployed to Preview – cal-demo August 11, 2023 00:54 View deployment

Add org name and logo to context

33d2785

hariombalhara reviewed Aug 21, 2023

View reviewed changes

Merge branch 'main' into feat/user-org-avatar

039001e

vercel Bot deployed to Preview – ui August 21, 2023 17:12 View deployment

vercel Bot deployed to Preview – api August 21, 2023 17:14 View deployment

vercel Bot deployed to Preview – cal-demo August 21, 2023 17:15 View deployment

vercel Bot deployed to Preview – dev August 21, 2023 17:16 View deployment

Address feedback

bdf5a54

joeauyeung commented Aug 21, 2023

View reviewed changes

vercel Bot had a problem deploying to Preview – api August 21, 2023 17:40 Failure

joeauyeung and others added 16 commits September 1, 2023 13:11

Merge branch 'main' into feat/user-org-avatar

20d6830

Merge branch 'main' into feat/user-org-avatar

752000f

Merge branch 'main' into feat/user-org-avatar

d696846

Clean up

7929dde

Clean up

76d7707

Type fix

c017da1

Merge branch 'main' into feat/user-org-avatar

85b497c

fix: set avatar cache control (#11163)

1759fb4

test: Integration tests for handleNewBooking (#11044)

e05aa12

Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

fix: booking_paid webhook and added new payment metadata (#11093)

e150071

app store improvements, logos, dark mode, added screenshots, fixed au…

54df4c0

…thor names (#11164)

fix: mobile event types and avatars (#11184)

d8ca27d

New Crowdin translations by Github Action

2727272

fix: updateProfile metadata overwrite (#11188)

e3d887e

Co-authored-by: alannnc <alannnc@gmail.com>

New Crowdin translations by Github Action

67ab509

Merge branch 'main' into feat/user-org-avatar

95507f2

sean-brydon approved these changes Sep 7, 2023

View reviewed changes

Merge branch 'main' into feat/user-org-avatar

57aee32

leog mentioned this pull request Sep 7, 2023

[CAL-2424] Can't see if the sub-team or member belongs to an org #11214

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: User Avatar and Org Logo#10700

feat: User Avatar and Org Logo#10700
sean-brydon merged 42 commits intomainfrom
feat/user-org-avatar

joeauyeung commented Aug 10, 2023 •

edited

Loading

Uh oh!

vercel Bot commented Aug 10, 2023 •

edited

Loading

Uh oh!

github-actions Bot commented Aug 10, 2023 •

edited

Loading

Uh oh!

alwaysmeticulous Bot commented Aug 10, 2023 •

edited

Loading

Uh oh!

github-actions Bot commented Aug 10, 2023 •

edited

Loading

Uh oh!

deploysentinel Bot commented Aug 10, 2023 •

edited

Loading

Test Case Results

Uh oh!

hariombalhara Aug 21, 2023

Uh oh!

joeauyeung Aug 21, 2023

Uh oh!

joeauyeung Aug 21, 2023

Uh oh!

CLAassistant commented Aug 28, 2023 •

edited

Loading

Uh oh!

sean-brydon commented Sep 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Conversation

joeauyeung commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Checklist

Uh oh!

vercel Bot commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alwaysmeticulous Bot commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

deploysentinel Bot commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Uh oh!

hariombalhara Aug 21, 2023

Choose a reason for hiding this comment

Uh oh!

joeauyeung Aug 21, 2023

Choose a reason for hiding this comment

Uh oh!

joeauyeung Aug 21, 2023

Choose a reason for hiding this comment

Uh oh!

CLAassistant commented Aug 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sean-brydon commented Sep 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

joeauyeung commented Aug 10, 2023 •

edited

Loading

vercel Bot commented Aug 10, 2023 •

edited

Loading

github-actions Bot commented Aug 10, 2023 •

edited

Loading

alwaysmeticulous Bot commented Aug 10, 2023 •

edited

Loading

github-actions Bot commented Aug 10, 2023 •

edited

Loading

deploysentinel Bot commented Aug 10, 2023 •

edited

Loading

CLAassistant commented Aug 28, 2023 •

edited

Loading