fix: link escaping in booking page by G3root · Pull Request #10360 · calcom/cal.com

G3root · 2023-07-25T09:03:48Z

What does this PR do?

Fixes #10352

Requirement/Documentation

before:

after:

Type of change

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

vercel · 2023-07-25T09:03:53Z

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

Name	Status	Preview	Comments	Updated (UTC)
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 12, 2023 9:26pm

vercel · 2023-07-25T09:03:55Z

@G3root is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2023-07-25T09:04:00Z

Thank you for following the naming conventions! 🙏

github-actions · 2023-07-25T09:12:02Z

📦 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! 🙌

hariombalhara · 2023-07-25T10:59:33Z

packages/features/bookings/lib/getLocationOptionsForSelect.ts

+        label: shouldLinkDisplayedPublicly ? locationString : t(locationString),
        value: type,
-        inputPlaceholder: t(eventLocation?.attendeeInputPlaceholder || ""),
+        inputPlaceholder: t(eventLocation?.attendeeInputPlaceholder || "", {


@G3root Does t fn remove http: ?

hariombalhara · 2023-07-25T11:07:07Z

packages/features/bookings/lib/getLocationOptionsForSelect.ts

      const type = eventLocation.type;

+      // to prevent escaping of "http" when the link is displayed in the booking page
+      const shouldLinkDisplayedPublicly = type === "link" && locationString !== "link_meeting";


It is easy to make a typo here. Can we use constants in place of these literal strings. Wherever they are used we can just use that constant.

link can already be referred to as DefaultEventLocationTypeEnum.Link

Also, wouldn't this interpolation: {escapeValue:false} approach work here ?

hariombalhara

Thanks @G3root 🙏 Left some comments

G3root · 2023-07-27T08:11:35Z

@hariombalhara pushed some changes to make it typesafe. tried interpolation: {escapeValue:false} but it didn't work out

github-actions · 2023-08-11T00:14:27Z

This PR is being marked as stale due to inactivity.

hariombalhara

Fixed the root cause @G3root . Left a comment in the code as it was super weird.

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

* Init + get timezone + offset data agh * Add 12/24h mode - style correctly * User users timezone + working hours. Still some stuff to figure out * Multiple working hours * move calc to once per day * Demo with two users and differnt timezones * availabillity control tab via search params * WIP hover overlay * THIS WORKS ISH * fix: multiple duration getSchedule calls [CAL-2336] (#10709) Co-authored-by: Omar López <zomars@me.com> * New Crowdin translations by Github Action * fix: If the input type "Name" is selected, the label can't be changed from our default label "Your Name" (#10618) Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> * New Crowdin translations by Github Action * test: Create unit tests for react components in packages/ui/components/form/step (#10442) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * feat: element call app added (#10585) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * New Crowdin translations by Github Action * New Crowdin translations by Github Action * fix: e2e test for rescheduling overlapping time (#10721) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * feat: mailhog fixture (#10606) * feat: mailhog fixture * fix: nodemailer to dispatch emails with e2e env * fix: remove space from email subject * feat: fixture getFirstEventAsOwner * feat: assert email subjects * fix: and enable dynamic booking test (#10642) * fix and enable dynamic booking test * remove page pause --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * fix: Broken team events if a user with the same name exists (#10724) * fix: Broken team events if a user with the same name exists * Fix tests + fix usernameList optionality * Try to list calendars, if not continue (#10720) Co-authored-by: Omar López <zomars@me.com> * v3.1.9 * link to org settings (#10718) * feat: app paypal payment (#8797) Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> * fix: RTL issues on booking pages + email confirmation (#10526) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: merge conflict * Fixing org slug (#10538) * fix: paypal build fixes * Fix avatar for org in Shell top (#10712) * feat: add range of dates for availability over-ride (#10462) * feat: add range of dates for availability over-ride * chore: changed range select to multiple select --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * fix: border issue for time slots (#10577) Co-authored-by: Raghul D <v-raghuld@microsoft.com> * style: Fix text wrapping issue in button (#10725) Co-authored-by: Omar López <zomars@me.com> * New Crowdin translations by Github Action * fix: App Install Dropdown Sort Properly [CAL-2285] (#10672) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: link escaping in booking page (#10360) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * chore: fix refund i18n message (#10731) * chore: remove tailwind-scrollbar warning (#10523) Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * New Crowdin translations by Github Action * chore: Simplified date overrides (#10728) * chore: Simplified date overrides * Fixed a test that had a date override that wasn't at midnight utc * Wrote test that showed a fixed Europe/Brussels * Lint fix * New Crowdin translations by Github Action * Fix offset time + fetching correct dates * Deal with awkward minute offsets * remove store overhead * Format H based on tz * Cleanup store logic * Cleanup * Remove comments * Remove comments * Remove yarn.lock * Dark mode & v-align text fixes * Move ButtonGroup to the left to prevent chevron from jumping * Shift based on timezone (non-hour) and have 15min granularity in hour display background color --------- Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Zain Gulbaz <zaingulbaz8@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: GitStart-Cal.com <121884634+gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Suyash Srivastava <suyashsrivastava5053@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com> Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Pradumn Kumar <pradumn@tealfeed.com> Co-authored-by: Raghul <123321540+Raghul18@users.noreply.github.com> Co-authored-by: Raghul D <v-raghuld@microsoft.com> Co-authored-by: ABDERRAHMANI IDRISSI HAMZA <97639117+idrissi-hamza@users.noreply.github.com> Co-authored-by: Nafees Nazik <84864519+G3root@users.noreply.github.com> Co-authored-by: Danila <daniil.demidovich@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

fix: link escape

9538998

github-actions bot added booking-page area: booking page, public booking page, booker 🐛 bug Something isn't working labels Jul 25, 2023

vercel bot deployed to Preview – ui July 25, 2023 09:07 View deployment

hariombalhara reviewed Jul 25, 2023

View reviewed changes

hariombalhara requested changes Jul 25, 2023

View reviewed changes

fix: make typesafe

f6caccd

Merge branch 'main' into fix-link-escape

2430c6c

vercel bot deployed to Preview – ui July 27, 2023 08:17 View deployment

github-actions bot added the Stale label Aug 11, 2023

Merge remote-tracking branch 'origin/main' into fix-link-escape

86d14ed

vercel bot deployed to Preview – ui August 11, 2023 07:19 View deployment

Fix the root cause

3e5170b

hariombalhara approved these changes Aug 11, 2023

View reviewed changes

hariombalhara enabled auto-merge (squash) August 11, 2023 08:06

hariombalhara removed the Stale label Aug 11, 2023

vercel bot deployed to Preview – ui August 11, 2023 08:06 View deployment

Merge branch 'main' into fix-link-escape

ff6376d

vercel bot deployed to Preview – ui August 11, 2023 09:00 View deployment

Merge branch 'main' into fix-link-escape

bb4ae6f

vercel bot deployed to Preview – ui August 12, 2023 21:26 View deployment

hariombalhara merged commit 9c8dc1b into calcom:main Aug 12, 2023

sean-brydon pushed a commit that referenced this pull request Aug 14, 2023

fix: link escaping in booking page (#10360)

8146593

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

G3root deleted the fix-link-escape branch August 24, 2023 10:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: link escaping in booking page#10360

fix: link escaping in booking page#10360
hariombalhara merged 7 commits intocalcom:mainfrom
G3root:fix-link-escape

G3root commented Jul 25, 2023

Uh oh!

vercel bot commented Jul 25, 2023 •

edited

Loading

Uh oh!

vercel bot commented Jul 25, 2023

Uh oh!

github-actions bot commented Jul 25, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Jul 25, 2023 •

edited

Loading

Uh oh!

hariombalhara Jul 25, 2023

Uh oh!

hariombalhara Jul 25, 2023

Uh oh!

hariombalhara left a comment

Uh oh!

G3root commented Jul 27, 2023

Uh oh!

github-actions bot commented Aug 11, 2023

Uh oh!

hariombalhara left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

G3root commented Jul 25, 2023

What does this PR do?

Requirement/Documentation

Type of change

Uh oh!

vercel bot commented Jul 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel bot commented Jul 25, 2023

Uh oh!

github-actions bot commented Jul 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jul 25, 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!

hariombalhara Jul 25, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Jul 25, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

G3root commented Jul 27, 2023

Uh oh!

github-actions bot commented Aug 11, 2023

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vercel bot commented Jul 25, 2023 •

edited

Loading

github-actions bot commented Jul 25, 2023 •

edited

Loading

github-actions bot commented Jul 25, 2023 •

edited

Loading