Skip to content

[Fix]: Calendar links breaking status #3376

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.

Sign up for GitHub

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

Merged
lvachon1 merged 4 commits into from
Jul 30, 2026
Merged

[Fix]: Calendar links breaking status #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fc71f8
Adjusted \r\n replacement to add a space so our token separator doesn…
lvachon1 Jul 30, 2026
ad75394
More whitespace in the formatter to allow token separation
lvachon1 Jul 30, 2026
4bf304d
Updated tests to expect the spaces I added
lvachon1 Jul 30, 2026
2f04faa
Updated more tests to look for the new space
lvachon1 Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/ts/components/Alerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const htmlInsertFormatting = (str: string): string => {
return str
.replace(/^(.*:)\s/, "<strong>$1</strong>\n")
.replace(/\n(.*:)\s/, "<br /><strong>$1</strong>\n")
.replace(/\s*\n/g, "<br />");
.replace(/\s*\n/g, " <br />");
};

// Strips off trailing periods of URLs (i guess the regex above matches the period if the URL is at the end of the sentence.)
Expand Down
4 changes: 2 additions & 2 deletions assets/ts/components/__tests__/__snapshots__/AlertsTest.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ exports[`it renders 1`] = `
<div
dangerouslySetInnerHTML={
Object {
"__html": "<strong>Affected direction:</strong><br />Inbound<br />
<br /><strong>Affected stops:</strong><br />Meridian St @ West Eagle St",
"__html": "<strong>Affected direction:</strong> <br />Inbound <br />
<br /><strong>Affected stops:</strong> <br />Meridian St @ West Eagle St",
}
}
/>
Expand Down
4 changes: 2 additions & 2 deletions lib/dotcom_web/views/alert_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ defmodule DotcomWeb.AlertView do
# an initial header
|> String.replace(~r/^(.*:)(\r\n|\r|\n)/, "<strong>\\1</strong>\n")
# all other start with a line break
|> String.replace(~r/\n(.*:)(\r\n|\r|\n)/, "<br /><strong>\\1</strong>\n")
|> String.replace(~r/\s*\n/s, "<br />")
|> String.replace(~r/\n(.*:)(\r\n|\r|\n)/, " <br /><strong>\\1</strong>\n")
|> String.replace(~r/\s*\n/s, " <br />")
|> replace_urls_with_links
end

Expand Down
10 changes: 5 additions & 5 deletions test/dotcom_web/views/alert_view_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,35 @@ defmodule DotcomWeb.AlertViewTest do
end

test "replaces newlines with breaks" do
expected = {:safe, "hi<br />there"}
expected = {:safe, "hi <br />there"}
actual = format_alert_description("hi\nthere")

assert expected == actual
end

test "combines multiple newlines" do
expected = {:safe, "hi<br />there"}
expected = {:safe, "hi <br />there"}
actual = format_alert_description("hi\n\n\nthere")

assert expected == actual
end

test "combines multiple Windows newlines" do
expected = {:safe, "hi<br />there"}
expected = {:safe, "hi <br />there"}
actual = format_alert_description("hi\r\n\r\nthere")

assert expected == actual
end

test "<strong>ifies a header" do
expected = {:safe, "hi<br /><strong>Header:</strong><br />7:30"}
expected = {:safe, "hi <br /><strong>Header:</strong> <br />7:30"}
actual = format_alert_description("hi\nHeader:\n7:30")

assert expected == actual
end

test "<strong>ifies a starting long header" do
expected = {:safe, "<strong>Long Header:</strong><br />7:30"}
expected = {:safe, "<strong>Long Header:</strong> <br />7:30"}
actual = format_alert_description("Long Header:\n7:30")

assert expected == actual
Expand Down
Loading