feat: Implement orgs/teams logoUrls #13699

emrysal · 2024-02-15T03:36:55Z

What does this PR do?

Starts uploading the organisation logo + using it.
Various optimisation tweaks here and there

vercel · 2024-02-15T03:36:57Z

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

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Feb 15, 2024 10:14pm
cal	⬜️ Ignored (Inspect)	Visit Preview	Feb 15, 2024 10:14pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview	Feb 15, 2024 10:14pm
qa	⬜️ Ignored (Inspect)	Visit Preview	Feb 15, 2024 10:14pm

github-actions · 2024-02-15T03:37:07Z

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

emrysal · 2024-02-15T03:37:51Z

packages/features/ee/teams/pages/team-profile-view.tsx

@@ -325,7 +325,7 @@ const TeamProfileForm = ({ team }: TeamProfileFormProps) => {
            <Controller
              control={form.control}
              name="logo"
-              render={({ field: { value } }) => {
+              render={({ field: { value, onChange } }) => {


Utilise RHF

emrysal · 2024-02-15T03:38:40Z

packages/lib/server/repository/eventType.ts

@@ -99,12 +99,6 @@ export class EventTypeRepository {
    const profileId = lookupTarget.type === LookupTarget.User ? null : lookupTarget.id;
    const select = {
      ...eventTypeSelect,
-      // TODO:  As required by getByViewHandler - Make it configurable
-      team: {


Cleanup: Redundant subQuery, teamId already available in eventTypeSelect (does extra query)

emrysal · 2024-02-15T03:38:53Z

packages/lib/server/resizeBase64Image.ts

@@ -1,4 +1,5 @@
 import jimp from "jimp";
+import "server-only";


Bit of safe-guarding.

emrysal · 2024-02-15T03:39:12Z

packages/trpc/server/routers/viewer/organizations/update.handler.ts

@@ -20,6 +21,30 @@ type UpdateOptions = {
  input: TUpdateInputSchema;
 };

+export const uploadLogo = async ({ teamId, logo: data }: { teamId: number; logo: string }) => {


TODO, extract to lib fn

emrysal · 2024-02-15T03:40:04Z

packages/trpc/server/routers/viewer/organizations/update.schema.ts

@@ -13,9 +14,9 @@ export const ZUpdateInputSchema = z.object({
  bio: z.string().optional(),
  logo: z
    .string()
+    .transform(async (val) => await resizeBase64Image(val))


Add resize (before, the actual full size image was used, was potentially huge)

github-actions · 2024-02-15T03:48:20Z

📦 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 · 2024-02-15T03:49:47Z

Current Playwright Test Results Summary

✅ 447 Passing - ⚠️ 13 Flaky

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

(Last updated on 02/15/2024 10:34:26pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: a0d455c

Started: 02/15/2024 10:24:03pm UTC

⚠️ Flakes

📄 apps/web/playwright/booking/selectQuestion.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Booking With Phone Question and Each Other Question Booking With Select Question and multiselect Question Select and multiselect text not required Retry 1 • Initial Attempt	0% (0) 0 / 254 runs failed over last 7 days	6.30% (16) 16 / 254 runs flaked over last 7 days

📄 apps/web/playwright/booking/radioGroupQuestion.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Booking With Radio Question and Each Other Question Booking With Radio Question and Address Question Booking With Radio Question and multiselect Question Radio and multiselect text not required Retry 1 • Initial Attempt	0% (0) 0 / 255 runs failed over last 7 days	4.31% (11) 11 / 255 runs flaked over last 7 days
Booking With Radio Question and Each Other Question Booking With Radio Question and Address Question Booking With Radio Question and Phone Question Radio and Phone not required Retry 1 • Initial Attempt	0% (0) 0 / 254 runs failed over last 7 days	7.09% (18) 18 / 254 runs flaked over last 7 days

📄 apps/web/playwright/login.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
user can login & logout succesfully -- future login flow user & logout using dashboard Retry 1 • Initial Attempt	0.78% (2) 2 / 255 runs failed over last 7 days	45.49% (116) 116 / 255 runs flaked over last 7 days

📄 apps/web/playwright/booking/addressQuestione2e/addressQuestion.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Booking With Address Question and Each Other Question Booking With Address Question and Number Question Address required and Number required Retry 1 • Initial Attempt	0% (0) 0 / 258 runs failed over last 7 days	5.81% (15) 15 / 258 runs flaked over last 7 days
Booking With Address Question and Each Other Question Booking With Address Question and Short text question Address and Short text not required Retry 2 • Retry 1 • Initial Attempt	0% (0) 0 / 258 runs failed over last 7 days	5.43% (14) 14 / 258 runs flaked over last 7 days

📄 apps/web/playwright/booking/phoneQuestion.e2e.ts • 3 Flakes

Top 1 Common Error Messages

`null`	3 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Booking With Phone Question and Each Other Question Booking With Phone Question and Address Question Phone and Address required Retry 1 • Initial Attempt	2.26% (6) 6 / 266 runs failed over last 7 days	5.64% (15) 15 / 266 runs flaked over last 7 days
Booking With Phone Question and Each Other Question Booking With Phone Question and Address Question Booking With Phone Question and multiselect Question Phone required and multiselect text not required Retry 1 • Initial Attempt	0% (0) 0 / 257 runs failed over last 7 days	5.06% (13) 13 / 257 runs flaked over last 7 days
Booking With Phone Question and Each Other Question Booking With Phone Question and Address Question Booking With Phone Question and Short text question Phone and Short text required Retry 1 • Initial Attempt	0% (0) 0 / 256 runs failed over last 7 days	5.08% (13) 13 / 256 runs flaked over last 7 days

📄 apps/web/playwright/insights.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Insights should have all option in team-and-self filter as admin Retry 1 • Initial Attempt	0.38% (1) 1 / 262 run failed over last 7 days	0.76% (2) 2 / 262 runs flaked over last 7 days
Insights should be able to switch between memberUsers Retry 1 • Initial Attempt	0.38% (1) 1 / 262 run failed over last 7 days	0.38% (1) 1 / 262 run flaked over last 7 days

📄 apps/web/playwright/event-types.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Event Types tests -- future user Different Locations Tests Can add Link Meeting as location and book with it Retry 1 • Initial Attempt	0% (0) 0 / 263 runs failed over last 7 days	6.84% (18) 18 / 263 runs flaked over last 7 days

📄 apps/web/playwright/organization/team-management.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Teams Can create teams via Wizard Retry 1 • Initial Attempt	0% (0) 0 / 236 runs failed over last 7 days	0.85% (2) 2 / 236 runs flaked over last 7 days

View Detailed Build Results

graphite-app · 2024-02-15T04:40:14Z

Graphite Automations

A Graphite automation took an action on this PR • (02/15/24)

1 reviewer was added based on Keith Williams's automation, 'Add foundation team as reviewer'

Udit-takkar · 2024-02-15T10:05:29Z

packages/trpc/server/routers/viewer/organizations/update.handler.ts

+  if (input.logo) {
+    data.logo = input.logo;
+    data.logoUrl = await uploadLogo({
+      logo: input.logo,
+      teamId: currentOrgId,
+    });
+  }
+


There should be an option to remove the logo also like we do in profile page of user

the UI already has remove button so you just have to add logic here

Good spot, missed the else in case of a "null" value.

Udit-takkar · 2024-02-15T12:22:17Z

packages/lib/server/queries/teams/index.ts

@@ -87,6 +87,7 @@ export async function getTeamWithMembers(args: {
      name: true,
      slug: true,
      ...(!!includeTeamLogo ? { logo: true } : {}),


@emrysal do we need to use includeTeamLogo now?

We'll remove that - for this PR we still need logo

Udit-takkar

LGTM

emrysal · 2024-02-15T15:24:18Z

Converted to draft as we don't want to merge this before 3.8 - will be released as part of 3.8.1 to ensure we don't release big changes right now.

keithwillcode

Any tests we can add here?

keithwillcode · 2024-02-16T13:35:38Z

@emrysal In a follow-up PR, let's add tests for

save new org avatar and then verify it is shown correctly
pull the Head data from https://github.com/calcom/cal.com/pull/13699/files#diff-c33dfbf2b29b15f2a8eb4acc3d81f325aa87b8ebc4a4e596aa707096ad9325efR174 and verify the logo is correctly set as expected

feat: Implement orgs/teams logoUrls

8ecbc37

emrysal requested a review from hariombalhara February 15, 2024 03:36

keithwillcode added core area: core, team members only foundation labels Feb 15, 2024

Merge branch 'main' into feat/logo-url-team-members-orgs-and-teams

9ca4a7f

emrysal commented Feb 15, 2024

View reviewed changes

vercel bot deployed to Preview – ai February 15, 2024 03:41 View deployment

vercel bot had a problem deploying to Preview – api February 15, 2024 03:42 Failure

Use getAvatarUrl in team/[slug]

2ff0ac7

vercel bot had a problem deploying to Preview – api February 15, 2024 04:08 Failure

Extract uploadLogo to standalone file for reuse

58e1818

vercel bot had a problem deploying to Preview – api February 15, 2024 04:20 Failure

vercel bot deployed to Preview – dev February 15, 2024 04:36 View deployment

emrysal marked this pull request as ready for review February 15, 2024 04:38

graphite-app bot requested a review from a team February 15, 2024 04:38

Udit-takkar reviewed Feb 15, 2024

View reviewed changes

keithwillcode added this to the v3.9 milestone Feb 15, 2024

emrysal added 2 commits February 15, 2024 12:09

Allow removing the team/organisation logo

05eb06d

Merge branch 'main' into feat/logo-url-team-members-orgs-and-teams

828db0b

vercel bot had a problem deploying to Preview – api February 15, 2024 12:15 Failure

Udit-takkar reviewed Feb 15, 2024

View reviewed changes

Udit-takkar previously approved these changes Feb 15, 2024

View reviewed changes

vercel bot deployed to Preview – dev February 15, 2024 12:39 View deployment

emrysal marked this pull request as draft February 15, 2024 15:23

fix: API build fail due to server-only, removed

ba581e7

emrysal dismissed Udit-takkar’s stale review via ba581e7 February 15, 2024 15:33

vercel bot deployed to Preview – api February 15, 2024 15:40 View deployment

vercel bot deployed to Preview – dev February 15, 2024 15:49 View deployment

Merge branch 'main' into feat/logo-url-team-members-orgs-and-teams

a0d455c

emrysal marked this pull request as ready for review February 15, 2024 22:13

vercel bot deployed to Preview – api February 15, 2024 22:19 View deployment

keithwillcode reviewed Feb 15, 2024

View reviewed changes

vercel bot deployed to Preview – dev February 15, 2024 22:30 View deployment

keithwillcode approved these changes Feb 16, 2024

View reviewed changes

keithwillcode merged commit c08365f into main Feb 16, 2024
39 checks passed

keithwillcode deleted the feat/logo-url-team-members-orgs-and-teams branch February 16, 2024 13:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Implement orgs/teams logoUrls #13699

feat: Implement orgs/teams logoUrls #13699

emrysal commented Feb 15, 2024 •

edited

Loading

vercel bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

emrysal Feb 15, 2024

emrysal Feb 15, 2024

emrysal Feb 15, 2024

emrysal Feb 15, 2024

emrysal Feb 15, 2024

github-actions bot commented Feb 15, 2024 •

edited

Loading

deploysentinel bot commented Feb 15, 2024 •

edited

Loading

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

graphite-app bot commented Feb 15, 2024

Udit-takkar Feb 15, 2024

Udit-takkar Feb 15, 2024

emrysal Feb 15, 2024

Udit-takkar Feb 15, 2024

emrysal Feb 15, 2024 •

edited

Loading

Udit-takkar left a comment

emrysal commented Feb 15, 2024 •

edited

Loading

keithwillcode left a comment

keithwillcode commented Feb 16, 2024

		@@ -1,4 +1,5 @@
		import jimp from "jimp";
		import "server-only";

feat: Implement orgs/teams logoUrls #13699

feat: Implement orgs/teams logoUrls #13699

Conversation

emrysal commented Feb 15, 2024 • edited Loading

What does this PR do?

vercel bot commented Feb 15, 2024 • edited Loading

github-actions bot commented Feb 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 15, 2024 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Feb 15, 2024 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

graphite-app bot commented Feb 15, 2024

Graphite Automations

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emrysal Feb 15, 2024 • edited Loading

Choose a reason for hiding this comment

Udit-takkar left a comment

Choose a reason for hiding this comment

emrysal commented Feb 15, 2024 • edited Loading

keithwillcode left a comment

Choose a reason for hiding this comment

keithwillcode commented Feb 16, 2024

emrysal commented Feb 15, 2024 •

edited

Loading

vercel bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

deploysentinel bot commented Feb 15, 2024 •

edited

Loading

emrysal Feb 15, 2024 •

edited

Loading

emrysal commented Feb 15, 2024 •

edited

Loading