From 5bf0c17bae372ff6fdf0868fe2138edc156dda31 Mon Sep 17 00:00:00 2001 From: Jamie Klassen Date: Wed, 24 Jan 2024 12:06:19 -0500 Subject: [PATCH] pod dialogs display cluster title Signed-off-by: Jamie Klassen --- .changeset/forty-eagles-kick.md | 5 +++++ .github/vale/config/vocabularies/Backstage/accept.txt | 1 + .../components/PodExecTerminal/PodExecTerminalDialog.tsx | 4 +++- .../src/components/Pods/PodLogs/PodLogsDialog.tsx | 6 +++++- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .changeset/forty-eagles-kick.md diff --git a/.changeset/forty-eagles-kick.md b/.changeset/forty-eagles-kick.md new file mode 100644 index 0000000000..4d701a729b --- /dev/null +++ b/.changeset/forty-eagles-kick.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-kubernetes-react': patch +--- + +Pod dialogs display cluster title when specified. diff --git a/.github/vale/config/vocabularies/Backstage/accept.txt b/.github/vale/config/vocabularies/Backstage/accept.txt index 9bb4a52cf4..525e24d251 100644 --- a/.github/vale/config/vocabularies/Backstage/accept.txt +++ b/.github/vale/config/vocabularies/Backstage/accept.txt @@ -92,6 +92,7 @@ Deutsche dev devops devs +dialogs discoverability Discoverability dls diff --git a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx index a073ad7525..e67c2c8bb4 100644 --- a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx +++ b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx @@ -42,7 +42,9 @@ export const PodExecTerminalDialog = (props: PodExecTerminalProps) => { isPodExecTerminalSupported.loading || !isPodExecTerminalSupported.value } - title={`${podName} - ${containerName} terminal shell on cluster ${cluster.name}`} + title={`${podName} - ${containerName} terminal shell on cluster ${ + cluster.title || cluster.name + }`} > diff --git a/plugins/kubernetes-react/src/components/Pods/PodLogs/PodLogsDialog.tsx b/plugins/kubernetes-react/src/components/Pods/PodLogs/PodLogsDialog.tsx index fbce4c4853..b8b2cbdf42 100644 --- a/plugins/kubernetes-react/src/components/Pods/PodLogs/PodLogsDialog.tsx +++ b/plugins/kubernetes-react/src/components/Pods/PodLogs/PodLogsDialog.tsx @@ -42,7 +42,11 @@ export const PodLogsDialog = ({ containerScope }: PodLogsDialogProps) => { buttonIcon={} buttonText="Logs" disabled={false} - title={`${containerScope.podName} - ${containerScope.containerName} logs on cluster ${containerScope.cluster.name}`} + title={`${containerScope.podName} - ${ + containerScope.containerName + } logs on cluster ${ + containerScope.cluster.title || containerScope.cluster.name + }`} >