From d2e3bf67375300165d8eadf5fc83dff539063bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20R=C3=A4ntil=C3=A4?= Date: Wed, 30 Nov 2022 11:24:09 +0100 Subject: [PATCH 1/4] Make AlertDisplay not crash on undefined error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gustaf Räntilä --- .changeset/modern-jokes-attack.md | 5 +++++ .../src/components/AlertDisplay/AlertDisplay.tsx | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/modern-jokes-attack.md diff --git a/.changeset/modern-jokes-attack.md b/.changeset/modern-jokes-attack.md new file mode 100644 index 0000000000..34b4741d14 --- /dev/null +++ b/.changeset/modern-jokes-attack.md @@ -0,0 +1,5 @@ +--- +'@backstage/core-components': patch +--- + +Made AlertDisplay not crash on undefined error messages diff --git a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx index 3af261da23..48cc4aba1d 100644 --- a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx +++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx @@ -42,7 +42,7 @@ export type AlertDisplayProps = { /** @public */ export function AlertDisplay(props: AlertDisplayProps) { - const [messages, setMessages] = useState>([]); + const [messages, setMessages] = useState>>([]); const alertApi = useApi(alertApiRef); const { anchorOrigin = { vertical: 'top', horizontal: 'center' } } = props; @@ -83,7 +83,7 @@ export function AlertDisplay(props: AlertDisplayProps) { severity={firstMessage.severity} > - {firstMessage.message.toString()} + {`${firstMessage?.message}`} {messages.length > 1 && ( {` (${messages.length - 1} older ${pluralize( 'message', From bdb8b2a143178d4c3bed641b7ff7db1aa3ada6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20R=C3=A4ntil=C3=A4?= Date: Wed, 30 Nov 2022 12:03:02 +0100 Subject: [PATCH 2/4] Update .changeset/modern-jokes-attack.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Patrik Oldsberg Signed-off-by: Gustaf Räntilä --- .changeset/modern-jokes-attack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/modern-jokes-attack.md b/.changeset/modern-jokes-attack.md index 34b4741d14..3cb3143f05 100644 --- a/.changeset/modern-jokes-attack.md +++ b/.changeset/modern-jokes-attack.md @@ -2,4 +2,4 @@ '@backstage/core-components': patch --- -Made AlertDisplay not crash on undefined error messages +Made AlertDisplay not crash on undefined messages From e4103e44388583b5fef0e39c38135288a8e4f1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20R=C3=A4ntil=C3=A4?= Date: Wed, 30 Nov 2022 12:07:41 +0100 Subject: [PATCH 3/4] Update packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Patrik Oldsberg Signed-off-by: Gustaf Räntilä --- .../src/components/AlertDisplay/AlertDisplay.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx index 48cc4aba1d..0e74595f97 100644 --- a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx +++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx @@ -83,7 +83,7 @@ export function AlertDisplay(props: AlertDisplayProps) { severity={firstMessage.severity} > - {`${firstMessage?.message}`} + {String(firstMessage.message)} {messages.length > 1 && ( {` (${messages.length - 1} older ${pluralize( 'message', From f42a6c0190de8289c49469025b1ae9eb5e89d254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20R=C3=A4ntil=C3=A4?= Date: Wed, 30 Nov 2022 13:46:32 +0100 Subject: [PATCH 4/4] No Partial MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gustaf Räntilä --- .../src/components/AlertDisplay/AlertDisplay.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx index 0e74595f97..c1f8f51db0 100644 --- a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx +++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx @@ -42,7 +42,7 @@ export type AlertDisplayProps = { /** @public */ export function AlertDisplay(props: AlertDisplayProps) { - const [messages, setMessages] = useState>>([]); + const [messages, setMessages] = useState>([]); const alertApi = useApi(alertApiRef); const { anchorOrigin = { vertical: 'top', horizontal: 'center' } } = props;