From 1de71f97f774822414be6e1e827470d231822d34 Mon Sep 17 00:00:00 2001 From: Bret Hubbard Date: Mon, 24 Jan 2022 14:34:39 -0700 Subject: [PATCH 1/4] Make linkTarget configurable for MarkdownContent Signed-off-by: Bret Hubbard --- .../src/components/MarkdownContent/MarkdownContent.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx b/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx index 6728c48580..df4ad56776 100644 --- a/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx +++ b/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx @@ -67,6 +67,7 @@ const useStyles = makeStyles( type Props = { content: string; dialect?: 'gfm' | 'common-mark'; + linkTarget?: Options['linkTarget']; }; const components: Options['components'] = { @@ -90,7 +91,7 @@ const components: Options['components'] = { * If you just want to render to plain [CommonMark](https://commonmark.org/), set the dialect to `'common-mark'` */ export function MarkdownContent(props: Props) { - const { content, dialect = 'gfm' } = props; + const { content, dialect = 'gfm', linkTarget } = props; const classes = useStyles(); return ( ); } From ba1d635ebb3d84ce709a421b545a9235245c7207 Mon Sep 17 00:00:00 2001 From: Bret Hubbard Date: Mon, 24 Jan 2022 14:36:58 -0700 Subject: [PATCH 2/4] software-templates: configure links in markdown to open in new tab Signed-off-by: Bret Hubbard --- .../MultistepJsonForm/FieldOverrides/DescriptionField.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/FieldOverrides/DescriptionField.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/FieldOverrides/DescriptionField.tsx index 6d116cc52b..3c592860ef 100644 --- a/plugins/scaffolder/src/components/MultistepJsonForm/FieldOverrides/DescriptionField.tsx +++ b/plugins/scaffolder/src/components/MultistepJsonForm/FieldOverrides/DescriptionField.tsx @@ -19,4 +19,4 @@ import { MarkdownContent } from '@backstage/core-components'; import { FieldProps } from '@rjsf/core'; export const DescriptionField = ({ description }: FieldProps) => - description && ; + description && ; From a681cb9c2fb48c90d29974e80b0af83a069617dc Mon Sep 17 00:00:00 2001 From: Bret Hubbard Date: Mon, 24 Jan 2022 14:40:27 -0700 Subject: [PATCH 3/4] add changeset Signed-off-by: Bret Hubbard --- .changeset/tiny-buses-compete.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/tiny-buses-compete.md diff --git a/.changeset/tiny-buses-compete.md b/.changeset/tiny-buses-compete.md new file mode 100644 index 0000000000..2cb8d1a87f --- /dev/null +++ b/.changeset/tiny-buses-compete.md @@ -0,0 +1,6 @@ +--- +'@backstage/core-components': patch +'@backstage/plugin-scaffolder': patch +--- + +Make linkTarget configurable for MarkdownContent component From 46795c9be04502522a0f4c2075c731f6850a720b Mon Sep 17 00:00:00 2001 From: Bret Hubbard Date: Wed, 26 Jan 2022 11:54:18 -0700 Subject: [PATCH 4/4] update api report Signed-off-by: Bret Hubbard --- packages/core-components/api-report.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md index d8aef17007..6046113dd2 100644 --- a/packages/core-components/api-report.md +++ b/packages/core-components/api-report.md @@ -29,6 +29,7 @@ import { LinkProps as LinkProps_3 } from 'react-router-dom'; import MaterialBreadcrumbs from '@material-ui/core/Breadcrumbs'; import { MaterialTableProps } from '@material-table/core'; import { NavLinkProps } from 'react-router-dom'; +import { Options } from 'react-markdown'; import { Overrides } from '@material-ui/core/styles/overrides'; import { ProfileInfo } from '@backstage/core-plugin-api'; import { ProfileInfoApi } from '@backstage/core-plugin-api';