Skip to content

fix: Fix links in Announcements #1934

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
merged 16 commits into from
Aug 11, 2022
Merged

fix: Fix links in Announcements #1934

Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
558b227
fix: Fix links in Announcements
ozandogrultan Jul 19, 2022
7567b09
fix: Fix betterer errors
ozandogrultan Jul 19, 2022
cd12807
fix: Fix build
ozandogrultan Jul 19, 2022
34096c4
fix: Use pointer-events instead of event handler
ozandogrultan Aug 9, 2022
bde1674
Revert: fix: Use pointer-events instead of event handler
ozandogrultan Aug 9, 2022
95d7a94
Merge branch 'main' into fix/links-in-announcements
ozandogrultan Aug 9, 2022
fb11312
fix: Stop propagation in Announcement component
ozandogrultan Aug 10, 2022
118f9df
fix: databuilder build
ozandogrultan Aug 10, 2022
7ab143f
fix: Revert last commits
ozandogrultan Aug 10, 2022
fd8b506
fix: Stop propagation in Announcement component
ozandogrultan Aug 11, 2022
dcc6e7a
fix: Stop propagation in Announcement component
ozandogrultan Aug 11, 2022
14b89a2
Revert fix: Stop propagation in Announcement component
ozandogrultan Aug 11, 2022
fafc68b
fix: Add onclick to Announcements allowed attributes
ozandogrultan Aug 11, 2022
073d9a7
fix: Revert some changes
ozandogrultan Aug 11, 2022
094b51d
fix: Use push instead of concat
ozandogrultan Aug 11, 2022
792e89b
fix: Frontend tests
ozandogrultan Aug 11, 2022
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
13 changes: 12 additions & 1 deletion frontend/amundsen_application/static/js/components/Announcements/AnnouncementsList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import * as React from 'react';
import { Link } from 'react-router-dom';
import SanitizedHTML from 'react-sanitized-html';
import sanitizeHtml from 'sanitize-html';

import { AnnouncementPost } from 'interfaces';
import { logClick } from 'utils/analytics';
Expand Down Expand Up @@ -34,6 +35,12 @@ const getLatestsAnnouncements = (announcements: AnnouncementPost[]) =>

const times = (numItems: number) => new Array(numItems).fill(0);

const allowedAttributes = () => {
const attributes = sanitizeHtml.defaults.allowedAttributes;
attributes.a.push('onclick');
return attributes;
};

const AnnouncementItem: React.FC<AnnouncementPost> = ({
date,
title,
Expand All @@ -46,7 +53,11 @@ const AnnouncementItem: React.FC<AnnouncementPost> = ({
href={ANNOUNCEMENTS_PAGE_PATH}
onClick={logClick}
copy={
<SanitizedHTML className="announcement-content" html={html_content} />
<SanitizedHTML
className="announcement-content"
html={html_content}
allowedAttributes={allowedAttributes()}
/>
}
/>
</li>
Expand Down