Skip to content

feat: Allow dangerous html based on config variable #1459

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 6 commits into from
May 20, 2022
Merged

feat: Allow dangerous html based on config variable #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6e3c8a
For table page's programmatic descriptions, allow dangerous html base…
MrwanBaghdad Aug 25, 2021
42f7f3b
Merge branch 'main' into DCAT-209_allow_dangerous_html_based_on_confi…
ozandogrultan Apr 28, 2022
e4274b0
feat: PR review
ozandogrultan Apr 28, 2022
0497060
feat: Always allowDangerousHtml in programmatic descriptions
ozandogrultan Apr 29, 2022
3c91e16
feat: Remove unused imports
ozandogrultan Apr 29, 2022
29696ed
feat: Remove unrelated changes
ozandogrultan Apr 29, 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
7 changes: 5 additions & 2 deletions frontend/amundsen_application/static/js/components/EditableText/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export interface ComponentProps {
editable?: boolean;
maxLength?: number;
value?: string;
allowDangerousHtml?: boolean;
}

export type EditableTextProps = ComponentProps &
Expand Down Expand Up @@ -117,14 +118,16 @@ class EditableText extends React.Component<
};

render() {
const { isEditing, editable, maxLength } = this.props;
const { isEditing, editable, maxLength, allowDangerousHtml } = this.props;
const { value = '', isDisabled } = this.state;

if (!isEditing) {
return (
<div className="editable-text">
<div className="markdown-wrapper">
<ReactMarkdown allowDangerousHtml={false}>{value}</ReactMarkdown>
<ReactMarkdown allowDangerousHtml={!!allowDangerousHtml}>
{value}
</ReactMarkdown>
</div>
{editable && !value && (
<a
Expand Down
7 changes: 6 additions & 1 deletion frontend/amundsen_application/static/js/pages/TableDetailPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,12 @@ export class TableDetail extends React.Component<

return descriptions.map((d) => (
<EditableSection key={`prog_desc:${d.source}`} title={d.source} readOnly>
<EditableText maxLength={999999} value={d.text} editable={false} />
<EditableText
maxLength={999999}
value={d.text}
editable={false}
allowDangerousHtml
/>
</EditableSection>
));
};
Expand Down