From d4644f5920ff2eedb363d373680d89af35b36359 Mon Sep 17 00:00:00 2001 From: Dominik Henneke Date: Mon, 14 Jun 2021 17:11:09 +0200 Subject: [PATCH 1/3] Use the Backstage `Link` component in the `Button` Signed-off-by: Dominik Henneke --- .changeset/yellow-schools-matter.md | 5 +++++ packages/core/src/components/Button/Button.tsx | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 .changeset/yellow-schools-matter.md diff --git a/.changeset/yellow-schools-matter.md b/.changeset/yellow-schools-matter.md new file mode 100644 index 0000000000..b159828b88 --- /dev/null +++ b/.changeset/yellow-schools-matter.md @@ -0,0 +1,5 @@ +--- +'@backstage/core': patch +--- + +Use the Backstage `Link` component in the `Button` diff --git a/packages/core/src/components/Button/Button.tsx b/packages/core/src/components/Button/Button.tsx index ca45b3da7f..c678b9a9db 100644 --- a/packages/core/src/components/Button/Button.tsx +++ b/packages/core/src/components/Button/Button.tsx @@ -14,17 +14,19 @@ * limitations under the License. */ -import React, { ComponentProps } from 'react'; -import { Button as MaterialButton } from '@material-ui/core'; -import { Link as RouterLink } from 'react-router-dom'; +import { + Button as MaterialButton, + ButtonProps as MaterialButtonProps, +} from '@material-ui/core'; +import React from 'react'; +import { Link, LinkProps } from '../Link'; -type Props = ComponentProps & - ComponentProps; +type Props = MaterialButtonProps & Omit; /** * Thin wrapper on top of material-ui's Button component * Makes the Button to utilise react-router */ export const Button = React.forwardRef((props, ref) => ( - + )); From 938aee2fbdd79c1a1faca1ef0b78316ccf837505 Mon Sep 17 00:00:00 2001 From: Dominik Henneke Date: Mon, 14 Jun 2021 17:11:25 +0200 Subject: [PATCH 2/3] Fix the link to the documentation page when no owned documents are displayed Signed-off-by: Dominik Henneke --- .changeset/honest-rabbits-divide.md | 5 +++++ plugins/techdocs/src/home/components/DocsTable.tsx | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .changeset/honest-rabbits-divide.md diff --git a/.changeset/honest-rabbits-divide.md b/.changeset/honest-rabbits-divide.md new file mode 100644 index 0000000000..bf4b457383 --- /dev/null +++ b/.changeset/honest-rabbits-divide.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-techdocs': patch +--- + +Fix the link to the documentation page when no owned documents are displayed diff --git a/plugins/techdocs/src/home/components/DocsTable.tsx b/plugins/techdocs/src/home/components/DocsTable.tsx index e62435fbe9..e964a9cf00 100644 --- a/plugins/techdocs/src/home/components/DocsTable.tsx +++ b/plugins/techdocs/src/home/components/DocsTable.tsx @@ -111,7 +111,6 @@ export const DocsTable = ({ action={