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

feat: added banner for orgs #13644

Merged
merged 10 commits into from
Mar 6, 2024
Merged

Conversation

PeerRich
Copy link
Member

@PeerRich PeerRich commented Feb 12, 2024

Use this banner to test https://pbs.twimg.com/profile_banners/1063089191565905920/1685635865/1500x500

  • add backend
  • add file upload (require 1500x500px) in Organization/Appearance
  • for now, apply this to all Org event types. later we could think about sub-team overwrites, but for now org is enough
  1. Upload Banner Screen
Screenshot 2024-02-15 at 10 26 36 PM
Screenshot 2024-02-15 at 10 27 02 PM
  1. Go to Org Team Event Types
Screenshot 2024-02-15 at 10 27 21 PM

DESIGNS

CleanShot 2024-02-12 at 15 02 37@2x

__

CleanShot 2024-02-12 at 14 55 23@2x

CleanShot 2024-02-12 at 14 55 34@2x

mobile:
CleanShot 2024-02-12 at 14 56 00@2x

@PeerRich PeerRich linked an issue Feb 12, 2024 that may be closed by this pull request
Copy link

linear bot commented Feb 12, 2024

Copy link

vercel bot commented Feb 12, 2024

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 Mar 5, 2024 1:34pm
api 🔄 Building (Inspect) Visit Preview Mar 5, 2024 1:34pm
5 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Mar 5, 2024 1:34pm
cal-demo ⬜️ Ignored (Inspect) Mar 5, 2024 1:34pm
calcom-web-canary ⬜️ Ignored (Inspect) Visit Preview Mar 5, 2024 1:34pm
qa ⬜️ Ignored (Inspect) Visit Preview Mar 5, 2024 1:34pm
ui ⬜️ Ignored (Inspect) Visit Preview Mar 5, 2024 1:34pm

@github-actions github-actions bot added Medium priority Created by Linear-GitHub Sync organizations area: organizations, orgs ✨ feature New feature or request labels Feb 12, 2024
Copy link
Contributor

github-actions bot commented Feb 12, 2024

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

@keithwillcode keithwillcode added the core area: core, team members only label Feb 12, 2024
Copy link
Contributor

github-actions bot commented Feb 12, 2024

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

One Page Changed Size

The following page changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load % of Budget (350 KB)
/settings/organizations/profile 400.06 KB 588.43 KB 168.12% (🟡 +0.16%)
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.

Copy link

deploysentinel bot commented Feb 12, 2024

Current Playwright Test Results Summary

✅ 286 Passing - ⚠️ 26 Flaky

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

(Last updated on 03/05/2024 01:46:18pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: da2440b

Started: 03/05/2024 01:42:34pm UTC

⚠️ Flakes

📄   apps/web/playwright/locale.e2e.ts • 13 Flakes

Top 1 Common Error Messages

null

13 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
unauthorized user sees correct translations (de) should use correct translations and html attributes
Retry 1Initial Attempt
-8.02% (-17) -17 / 212 runs
failed over last 7 days
8.49% (18) 18 / 212 runs
flaked over last 7 days
unauthorized user sees correct translations (ar) should use correct translations and html attributes
Retry 1Initial Attempt
-8.53% (-18) -18 / 211 runs
failed over last 7 days
8.53% (18) 18 / 211 runs
flaked over last 7 days
unauthorized user sees correct translations (zh) should use correct translations and html attributes
Retry 1Initial Attempt
-8.53% (-18) -18 / 211 runs
failed over last 7 days
8.53% (18) 18 / 211 runs
flaked over last 7 days
unauthorized user sees correct translations (zh-CN) should use correct translations and html attributes
Retry 1Initial Attempt
-8.06% (-17) -17 / 211 runs
failed over last 7 days
8.53% (18) 18 / 211 runs
flaked over last 7 days
unauthorized user sees correct translations (zh-TW) should use correct translations and html attributes
Retry 1Initial Attempt
-8.57% (-18) -18 / 210 runs
failed over last 7 days
8.57% (18) 18 / 210 runs
flaked over last 7 days
unauthorized user sees correct translations (pt) should use correct translations and html attributes
Retry 1Initial Attempt
-8.57% (-18) -18 / 210 runs
failed over last 7 days
8.57% (18) 18 / 210 runs
flaked over last 7 days
unauthorized user sees correct translations (pt-br) should use correct translations and html attributes
Retry 1Initial Attempt
-8.57% (-18) -18 / 210 runs
failed over last 7 days
8.57% (18) 18 / 210 runs
flaked over last 7 days
unauthorized user sees correct translations (es-419) should use correct translations and html attributes
Retry 1Initial Attempt
-8.57% (-18) -18 / 210 runs
failed over last 7 days
8.57% (18) 18 / 210 runs
flaked over last 7 days
authorized user sees correct translations (de) should return correct translations and html attributes
Retry 1Initial Attempt
-7.62% (-16) -16 / 210 runs
failed over last 7 days
8.57% (18) 18 / 210 runs
flaked over last 7 days
authorized user sees correct translations (pt-br) should return correct translations and html attributes
Retry 1Initial Attempt
-8.65% (-18) -18 / 208 runs
failed over last 7 days
8.65% (18) 18 / 208 runs
flaked over last 7 days
authorized user sees correct translations (ar) should return correct translations and html attributes
Retry 1Initial Attempt
-8.65% (-18) -18 / 208 runs
failed over last 7 days
8.65% (18) 18 / 208 runs
flaked over last 7 days
authorized user sees changed translations (de->ar) should return correct translations and html attributes
Retry 1Initial Attempt
-5.77% (-12) -12 / 208 runs
failed over last 7 days
8.65% (18) 18 / 208 runs
flaked over last 7 days
authorized user sees changed translations (de->pt-BR) [locale1] should return correct translations and html attributes
Retry 1Initial Attempt
-4.46% (-9) -9 / 202 runs
failed over last 7 days
8.91% (18) 18 / 202 runs
flaked over last 7 days

📄   apps/web/playwright/event-types.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
Event Types tests -- future user can add multiple organizer address
Retry 1Initial Attempt
2.27% (5) 5 / 220 runs
failed over last 7 days
13.64% (30) 30 / 220 runs
flaked over last 7 days
Event Types tests -- future user Different Locations Tests can select 'display on booking page' option when multiple organizer input type are present
Retry 1Initial Attempt
0.47% (1) 1 / 215 run
failed over last 7 days
3.26% (7) 7 / 215 runs
flaked over last 7 days
Event Types tests -- legacy user Different Locations Tests Can remove location from multiple locations that are saved
Retry 1Initial Attempt
1.40% (3) 3 / 214 runs
failed over last 7 days
14.95% (32) 32 / 214 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Organization Email not matching orgAutoAcceptEmail Team invitation
Retry 1Initial Attempt
0.88% (2) 2 / 226 runs
failed over last 7 days
11.06% (25) 25 / 226 runs
flaked over last 7 days

📄   packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 8 Flakes

Top 1 Common Error Messages

null

8 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Popup Tests should open embed iframe on click - Configured with light theme
Retry 1Initial Attempt
-0.45% (-1) -1 / 224 runs
failed over last 7 days
46.88% (105) 105 / 224 runs
flaked over last 7 days
Popup Tests should be able to reschedule
Retry 1Initial Attempt
-87.50% (-105) -105 / 120 runs
failed over last 7 days
87.50% (105) 105 / 120 runs
flaked over last 7 days
Popup Tests should open Routing Forms embed on click
Retry 1Initial Attempt
-88.14% (-104) -104 / 118 runs
failed over last 7 days
88.14% (104) 104 / 118 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when configured with 'auto' theme using Embed API
Retry 1Initial Attempt
-88.03% (-103) -103 / 117 runs
failed over last 7 days
88.03% (103) 103 / 117 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API
Retry 1Initial Attempt
-86.44% (-102) -102 / 118 runs
failed over last 7 days
87.29% (103) 103 / 118 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe(Booker Profile Page) with dark theme when configured with dark theme using Embed API
Retry 1Initial Attempt
-88.03% (-103) -103 / 117 runs
failed over last 7 days
88.03% (103) 103 / 117 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe(Event Booking Page) with dark theme when configured with dark theme using Embed API
Retry 1Initial Attempt
-88.03% (-103) -103 / 117 runs
failed over last 7 days
88.03% (103) 103 / 117 runs
flaked over last 7 days
Popup Tests prendered embed should be loaded and apply the config given to it
Retry 1Initial Attempt
-88.03% (-103) -103 / 117 runs
failed over last 7 days
88.03% (103) 103 / 117 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Inline Iframe Inline Iframe - Configured with Dark Theme
Retry 1Initial Attempt
0% (0) 0 / 223 runs
failed over last 7 days
47.98% (107) 107 / 223 runs
flaked over last 7 days

View Detailed Build Results


@keithwillcode
Copy link
Contributor

Moving back to draft since backend needs to be built

@@ -341,6 +341,7 @@ model Team {
brandColor String?
darkBrandColor String?
verifiedNumbers VerifiedNumber[]
bannerUrl String?
Copy link
Member

Choose a reason for hiding this comment

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

We need to modify the Avatar model to accept a new relationship for banners specifically asl well

Copy link
Contributor

Choose a reason for hiding this comment

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

why exactly? we also use Avatar model to store team logo/ org logo without any relation

/api/avatar/[uuid] -> gets image based on objectKey.

Copy link
Contributor

Choose a reason for hiding this comment

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

cc: @zomars

@ciaranha
Copy link
Member

ciaranha commented Mar 5, 2024

@keithwillcode @zomars do we have a timeline on when we can get this out? Priority is still only medium, just trying to align with some customer requests.

@PeerRich PeerRich added High priority Created by Linear-GitHub Sync and removed Medium priority Created by Linear-GitHub Sync labels Mar 5, 2024
@Udit-takkar
Copy link
Contributor

Udit-takkar commented Mar 5, 2024

@keithwillcode @zomars do we have a timeline on when we can get this out? Priority is still only medium, just trying to align with some customer requests.

I have fixed all the conflicts let me ask someone to review

Screenshot 2024-03-05 at 7 07 56 PM

Copy link
Member

@zomars zomars left a comment

Choose a reason for hiding this comment

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

I'm getting this error when trying to upload the banner locally in Firefox

image.png

Copy link
Member

@zomars zomars left a comment

Choose a reason for hiding this comment

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

It works but still needs some work. We don't handle size limit errors properly. Also we display the banner as an avatar. Some designs are missing. Will approve due to the urgency but we should follow up.

@zomars zomars merged commit dfd683f into main Mar 6, 2024
38 of 39 checks passed
@zomars zomars deleted the 13643-cal-3120-add-a-banner-to-org-links branch March 6, 2024 23:18
@zomars
Copy link
Member

zomars commented Mar 6, 2024

Merge activity

@Udit-takkar
Copy link
Contributor

I'm getting this error when trying to upload the banner locally in Firefox

@zomars can you share what size file you were trying to upload?

@zomars
Copy link
Member

zomars commented Mar 7, 2024

I'm getting this error when trying to upload the banner locally in Firefox

@zomars can you share what size file you were trying to upload?

It was a 800kb file. But even then shouldn't the cropper handle resizing before upload?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core area: core, team members only ✨ feature New feature or request High priority Created by Linear-GitHub Sync Medium priority Created by Linear-GitHub Sync ❗️ migrations contains migration files organizations area: organizations, orgs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-3120] add a banner to org links
5 participants