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

Fixes formatted description in email #7696

Merged
merged 24 commits into from
Mar 23, 2023
Merged

Conversation

CarinaWolli
Copy link
Member

What does this PR do?

Adds formatting to event-type description in email:

Screenshot 2023-03-13 at 12 03 15

Fixes #7686

Type of change

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

@CarinaWolli CarinaWolli requested a review from a team March 13, 2023 16:07
@vercel
Copy link

vercel bot commented Mar 13, 2023

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

Name Status Preview Comments Updated
cal ❌ Failed (Inspect) Mar 23, 2023 at 0:00AM (UTC)
ui ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Mar 23, 2023 at 0:00AM (UTC)

@github-actions
Copy link
Contributor

github-actions bot commented Mar 13, 2023

📦 Next.js Bundle Analysis

This analysis was generated by the next.js bundle analysis action 🤖

🎉 Global Bundle Size Decreased

Page Size (compressed)
global 210.9 KB (-1 B)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

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

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Nineteen Pages Changed Size

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

Page Size (compressed) First Load % of Budget (350 KB)
/[user] 78.09 KB 288.99 KB 82.57% (🟢 -9.50%)
/[user]/[type] 99.83 KB 310.73 KB 88.78% (+/- <0.01%)
/[user]/[type]/embed 99.86 KB 310.75 KB 88.79% (+/- <0.01%)
/[user]/book 191.24 KB 402.14 KB 114.90% (+/- <0.01%)
/[user]/embed 78.16 KB 289.06 KB 82.59% (🟢 -9.50%)
/d/[link]/[slug] 99.48 KB 310.38 KB 88.68% (+/- <0.01%)
/d/[link]/[slug]/embed 99.51 KB 310.41 KB 88.69% (+/- <0.01%)
/d/[link]/book 190.89 KB 401.79 KB 114.80% (+/- <0.01%)
/event-types 354.14 KB 565.03 KB 161.44% (🟡 +0.03%)
/event-types/[type] 386.68 KB 597.58 KB 170.74% (🟢 -0.02%)
/getting-started/[[...step]] 334.14 KB 545.04 KB 155.73% (🟢 -0.02%)
/settings/my-account/profile 429.06 KB 639.96 KB 182.85% (🟢 -0.02%)
/settings/teams/[id]/profile 273.75 KB 484.65 KB 138.47% (🟡 +0.03%)
/team/[slug] 80.63 KB 291.53 KB 83.29% (🟢 -9.50%)
/team/[slug]/[type] 99.48 KB 310.38 KB 88.68% (+/- <0.01%)
/team/[slug]/[type]/embed 99.51 KB 310.41 KB 88.69% (+/- <0.01%)
/team/[slug]/book 190.89 KB 401.79 KB 114.80% (+/- <0.01%)
/team/[slug]/embed 80.69 KB 291.59 KB 83.31% (🟢 -9.50%)
/workflows/[workflow] 298.8 KB 509.7 KB 145.63% (🟡 +0.01%)
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.

@deploysentinel
Copy link

deploysentinel bot commented Mar 13, 2023

Current Playwright Test Results Summary

✅ 66 Passing - ⚠️ 2 Flaky

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

(Last updated on 03/23/2023 11:59:54am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: d5ebcd6

Started: 03/23/2023 11:52:01am UTC

⚠️ Flakes

📄   packages/app-store/routing-forms/playwright/tests/basic.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
Routing Forms Seeded Routing Form Routing Link - Reporting and CSV Download
Retry 1Initial Attempt
2.81% (5) 5 / 178 runs
failed over last 7 days
25.28% (45) 45 / 178 runs
flaked over last 7 days
Routing Forms Seeded Routing Form Router URL should work
Retry 2Retry 1Initial Attempt
0.56% (1) 1 / 179 run
failed over last 7 days
7.26% (13) 13 / 179 runs
flaked over last 7 days

View Detailed Build Results


Copy link
Contributor

@roae roae left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

@CarinaWolli CarinaWolli marked this pull request as draft March 14, 2023 15:40
@CarinaWolli
Copy link
Member Author

converted to draft as some more adjustments are needed

lists in email need to be fixed:
Screenshot 2023-03-14 at 11 41 17

@socket-security
Copy link

Socket Security Pull Request Report

Dependency issues detected: If you merge this pull request, you will not be alerted to the instances of these issues again.

📜 Install scripts

Install scripts are run when the package is installed. The majority of malware in npm is hidden in install scripts.

Packages should not be running non-essential scripts during install and there are often solutions to problems people solve with install scripts that can be run at publish time instead.

Package Script field Source
canvas@2.11.0 (added) install apps/web/package.json via jsdom@21.1.1
🫣 Native code

Contains native code which could be a vector to obscure malicious code, and generally decrease the likelihood of reproducible or reliable installs.

Ensure that native code bindings are expected. Consumers may consider pure JS and functionally similar alternatives to avoid the challenges and risks associated with native code bindings.

Package Location Source
canvas@2.11.0 (added) binding.gyp apps/web/package.json via jsdom@21.1.1
Pull request report summary
Issue Status
Install scripts ⚠️ 1 issue
Native code ⚠️ 1 issue
Bin script shell injection ✅ 0 issues
Unresolved require ✅ 0 issues
Invalid package.json ✅ 0 issues
HTTP dependency ✅ 0 issues
Git dependency ✅ 0 issues
Potential typo squat ✅ 0 issues
Known Malware ✅ 0 issues
Telemetry ✅ 0 issues
Protestware/Troll package ✅ 0 issues
Bot Commands

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@* or ignore all packages with @SocketSecurity ignore-all

  • @SocketSecurity ignore canvas@2.11.0

Powered by socket.dev

@CarinaWolli CarinaWolli requested a review from roae March 20, 2023 07:45
@CarinaWolli CarinaWolli marked this pull request as ready for review March 20, 2023 07:45
@CarinaWolli CarinaWolli requested a review from a team March 20, 2023 07:45
@CarinaWolli
Copy link
Member Author

Thank you for our review @hariombalhara 🙏 I implemented your feedback and bundle size looks good now as well

@@ -67,6 +67,7 @@
"accept-language-parser": "^1.5.0",
"async": "^3.2.4",
"bcryptjs": "^2.4.3",
"canvas": "^2.11.0",
Copy link
Member

Choose a reason for hiding this comment

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

It doesn't seem to be used.

Suggested change
"canvas": "^2.11.0",

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure why, but without canvas, it was throwing an error. I think it is required with jsdom

…places, we can do away with ts-ignore and get type safety
@@ -0,0 +1,21 @@
import DOMPurify from "dompurify";
Copy link
Member

Choose a reason for hiding this comment

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

I think we can remove this duplicate by call markdownAndSanitize in tRPC calls and avoiding to do it on client side.

@hariombalhara
Copy link
Member

Calendar Invite still has the similar problem as email. It shows markdown, we can fix that in a followup.
Screenshot 2023-03-22 at 9 41 19 AM

Copy link
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

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

Looks good to merge now. Left some comments that can be addressed as a followup.
Also, fixed 1-2 ts issues.

@CarinaWolli
Copy link
Member Author

I think it needs @zomars approval as a code owner before it can be merged

@hariombalhara
Copy link
Member

@CarinaWolli It needs review from UI team which would be @sean-brydon @PeerRich or @baileypumfleet

@PeerRich PeerRich enabled auto-merge (squash) March 23, 2023 11:41
@PeerRich PeerRich merged commit f6d7568 into main Mar 23, 2023
@PeerRich PeerRich deleted the fix/event-type-description-in-email branch March 23, 2023 12:00
zomars added a commit that referenced this pull request Mar 23, 2023
@PeerRich PeerRich added the core area: core, team members only label Jul 24, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-1237] html formatting in E-Mail wrong (description)
4 participants