fix: Use constants.ts for brand colours > db DEFAULT #13167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sean-brydon
added
❗️ migrations
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
5 Ignored Deployments
|
|
Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link. |
sean-brydon
commented
Jan 11, 2024
Comment on lines
+12
to
+16
| UPDATE "Team" SET "brandColor" = NULL WHERE "brandColor" = '#292929'; | ||
| UPDATE "Team" SET "darkBrandColor" = NULL WHERE "darkBrandColor" = '#fafafa'; | ||
|
|
||
| UPDATE "users" SET "brandColor" = NULL WHERE "brandColor" = '#292929'; | ||
| UPDATE "users" SET "darkBrandColor" = NULL WHERE "darkBrandColor" = '#fafafa'; |
There was a problem hiding this comment.
Set our brand colours to NULL -> we will only now set this if a user overrides these in settings
sean-brydon
commented
Jan 11, 2024
Comment on lines
+5
to
+6
| const BRAND_COLOR = DEFAULT_LIGHT_BRAND_COLOR; | ||
| const DARK_BRAND_COLOR = DEFAULT_DARK_BRAND_COLOR; |
There was a problem hiding this comment.
Use the values from constants -> These colours get loaded here https://github.com/calcom/cal.com/pull/13167/files#diff-abbbafbce3959191cbdfce95ed71dc38466b75d1695dd78dc81a66e4117e1d76L171-L172 if there is no brand colour passed in
Current Playwright Test Results Summary✅ 381 Passing - Run may still be in progress, this comment will be updated as current testing workflow or job completes... (Last updated on 01/11/2024 09:22:08am UTC) Run DetailsRunning Workflow PR Update on Github Actions Commit: b0d36ad Started: 01/11/2024 09:10:58am UTC
|
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Booking With Phone Question and Each Other Question Booking With Select Question and Short text question Select and Short text not required
Retry 1 • Initial Attempt |
0% (0)0 / 197 runsfailed over last 7 days |
3.05% (6)6 / 197 runsflaked over last 7 days |
📄 apps/web/playwright/booking/radioGroupQuestion.e2e.ts • 1 Flake
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 Multi email Question Radio and Multi email not required
Retry 1 • Initial Attempt |
0% (0)0 / 202 runsfailed over last 7 days |
2.97% (6)6 / 202 runsflaked over last 7 days |
📄 apps/web/playwright/booking/checkboxGroupQuestion.e2e.ts • 1 Flake
Test Case Results
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Booking With Checkbox Group Question and Each Other Question Booking With Checkbox Group Question and Address Question Booking With Checkbox Group Question and Short text question Checkbox Group and Short Text not required
Retry 1 • Initial Attempt |
0% (0)0 / 199 runsfailed over last 7 days |
2.51% (5)5 / 199 runsflaked 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 1 • Initial Attempt |
3.40% (7)7 / 206 runsfailed over last 7 days |
27.67% (57)57 / 206 runsflaked over last 7 days |
📄 apps/web/playwright/signup.e2e.ts • 1 Flake
Test Case Results
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Signup Flow Test Signup with valid (non premium) username
Retry 1 • Initial Attempt |
0% (0)0 / 209 runsfailed over last 7 days |
5.26% (11)11 / 209 runsflaked over last 7 days |
📄 packages/embeds/embed-core/playwright/tests/preview.e2e.ts • 1 Flake
Test Case Results
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Preview Preview - embed-core should load
Retry 1 • Initial Attempt |
0% (0)0 / 208 runsfailed over last 7 days |
20.19% (42)42 / 208 runsflaked over last 7 days |
📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 2 Flakes
Top 1 Common Error Messages
|
|
2 Test Cases Affected |
Test Case Results
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Popup Tests should be able to reschedule
Retry 1 • Initial Attempt |
11.96% (25)25 / 209 runsfailed over last 7 days |
85.65% (179)179 / 209 runsflaked 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 1 • Initial Attempt |
0.48% (1)1 / 207 runfailed over last 7 days |
85.51% (177)177 / 207 runsflaked over last 7 days |
📄 packages/app-store/routing-forms/playwright/tests/basic.e2e.ts • 1 Flake
Test Case Results
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Routing Forms Seeded Routing Form Routing Link - Reporting and CSV Download
Retry 1 • Initial Attempt |
0% (0)0 / 209 runsfailed over last 7 days |
2.39% (5)5 / 209 runsflaked 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 1 • Initial Attempt |
0.48% (1)1 / 208 runfailed over last 7 days |
35.10% (73)73 / 208 runsflaked over last 7 days |
emrysal
pushed a commit
that referenced
this pull request
Jan 12, 2024
* fix: user proper default values if no brand colour is set. * fix:default value * fix: more ?? to defined default as color is possibly null
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Removes the default and not null constraint in the users -> brandColor and darkBrandColour
This allows us to rely on the values defined in constants to use APP wide. This is useful for self hosted instances.
How should this be tested?
Start up the app and run the migrations
Change the value of the brand colours in constants.ts and notice the app wide colours change.