From b1ee86710147fac0b2383ef5aa7de956277ad44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linn=C3=A9a=20Ivansson?= Date: Mon, 21 Nov 2022 14:42:01 +0100 Subject: [PATCH 1/6] Remove conditional rendering for ErrorEmptyState. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Linnéa Ivansson --- .../src/components/ErrorReporting/ErrorReporting.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx index 0dbf889fab..3bb1a81b1d 100644 --- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx +++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx @@ -123,18 +123,14 @@ export const ErrorReporting = ({ detectedErrors }: ErrorReportingProps) => { return ( <> - {errors.length === 0 ? ( - - - - ) : ( + {errors.length !== 0 && - )} + } ); }; From 54017517f9ddc54e02e5fa6c4a18c6fada86beb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linn=C3=A9a=20Ivansson?= Date: Mon, 21 Nov 2022 14:49:34 +0100 Subject: [PATCH 2/6] Remove the no longer used ErrorEmptyState component. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Linnéa Ivansson --- .../ErrorReporting/ErrorReporting.tsx | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx index 3bb1a81b1d..b87fa3b104 100644 --- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx +++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx @@ -91,31 +91,6 @@ const sortBySeverity = (a: DetectedError, b: DetectedError) => { return 0; }; -export const ErrorEmptyState = () => { - return ( - - - - Nice! There are no errors to report! - - - - EmptyState - - - ); -}; - export const ErrorReporting = ({ detectedErrors }: ErrorReportingProps) => { const errors = Array.from(detectedErrors.values()) .flat() @@ -123,7 +98,7 @@ export const ErrorReporting = ({ detectedErrors }: ErrorReportingProps) => { return ( <> - {errors.length !== 0 && + {errors.length !== 0 &&
Date: Mon, 21 Nov 2022 14:54:29 +0100 Subject: [PATCH 3/6] Remove unused imports. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Linnéa Ivansson --- .../src/components/ErrorReporting/ErrorReporting.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx index b87fa3b104..6105f29ba8 100644 --- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx +++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx @@ -15,9 +15,8 @@ */ import * as React from 'react'; import { DetectedError, DetectedErrorsByCluster } from '../../error-detection'; -import { Chip, Typography, Grid } from '@material-ui/core'; -import EmptyStateImage from '../../assets/emptystate.svg'; -import { Table, TableColumn, InfoCard } from '@backstage/core-components'; +import { Chip } from '@material-ui/core'; +import { Table, TableColumn } from '@backstage/core-components'; type ErrorReportingProps = { detectedErrors: DetectedErrorsByCluster; From fd0b42cb27d5643e70d7c557de4c09a6686f352a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linn=C3=A9a=20Ivansson?= Date: Wed, 23 Nov 2022 10:17:48 +0100 Subject: [PATCH 4/6] Removed Devider generaly between grid items. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Linnéa Ivansson --- plugins/kubernetes/src/components/KubernetesContent.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/kubernetes/src/components/KubernetesContent.tsx b/plugins/kubernetes/src/components/KubernetesContent.tsx index 3fabfae604..a42e9fbb0b 100644 --- a/plugins/kubernetes/src/components/KubernetesContent.tsx +++ b/plugins/kubernetes/src/components/KubernetesContent.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; -import { Divider, Grid, Typography } from '@material-ui/core'; +import { Grid, Typography } from '@material-ui/core'; import { Entity } from '@backstage/catalog-model'; import { ErrorPanel } from './ErrorPanel'; import { ErrorReporting } from './ErrorReporting'; @@ -82,9 +82,6 @@ export const KubernetesContent = ({ - - - Your Clusters From 365f887717c9cdf3e503fc26e397bf0a6d8389aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linn=C3=A9a=20Ivansson?= Date: Wed, 23 Nov 2022 10:35:46 +0100 Subject: [PATCH 5/6] Add changeset. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Linnéa Ivansson --- .changeset/chilly-flies-nail.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/chilly-flies-nail.md diff --git a/.changeset/chilly-flies-nail.md b/.changeset/chilly-flies-nail.md new file mode 100644 index 0000000000..ffc9627b79 --- /dev/null +++ b/.changeset/chilly-flies-nail.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-kubernetes': patch +--- + +Removed rendering for ErrorEmptyState in ErrorReporting component, so nothing is rendered when there are no errors. Also removed Divider on Kubernetes page. From ae8234d3918d1298038a526232ecae4926832562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linn=C3=A9a=20Ivansson?= Date: Tue, 6 Dec 2022 20:15:33 +0100 Subject: [PATCH 6/6] Fix prettier and tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Linnéa Ivansson --- .../src/components/ErrorReporting/ErrorReporting.tsx | 4 ++-- .../src/components/KubernetesContent.test.tsx | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx index 6105f29ba8..ed51b7d21d 100644 --- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx +++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx @@ -97,14 +97,14 @@ export const ErrorReporting = ({ detectedErrors }: ErrorReportingProps) => { return ( <> - {errors.length !== 0 && + {errors.length !== 0 && (
- } + )} ); }; diff --git a/plugins/kubernetes/src/components/KubernetesContent.test.tsx b/plugins/kubernetes/src/components/KubernetesContent.test.tsx index 231eb3b37a..ffa5358537 100644 --- a/plugins/kubernetes/src/components/KubernetesContent.test.tsx +++ b/plugins/kubernetes/src/components/KubernetesContent.test.tsx @@ -45,11 +45,6 @@ describe('KubernetesContent', () => { />, ), ); - - expect(getByText('Error Reporting')).toBeInTheDocument(); - expect( - getByText('Nice! There are no errors to report!'), - ).toBeInTheDocument(); expect(getByText('Your Clusters')).toBeInTheDocument(); // TODO add a prompt for the user to configure their clusters }); @@ -94,9 +89,6 @@ describe('KubernetesContent', () => { ), ); - expect( - getByText('Nice! There are no errors to report!'), - ).toBeInTheDocument(); expect(getByText('cluster-1')).toBeInTheDocument(); expect(getByText('Cluster')).toBeInTheDocument(); expect(getByText('10 pods')).toBeInTheDocument(); @@ -148,7 +140,7 @@ describe('KubernetesContent', () => { }, error: undefined, }); - const { getByText, getAllByText, queryByText } = render( + const { getByText, getAllByText } = render( wrapInTestApp( { />, ), ); - - expect(queryByText('Nice! There are no errors to report!')).toBeNull(); expect(getAllByText('Cluster')).toHaveLength(2); expect(getByText('cluster-a')).toBeInTheDocument(); expect(getByText('10 pods')).toBeInTheDocument();