From 06f0e6e0ec2d3493fdf3b56361c44b32e5c07b60 Mon Sep 17 00:00:00 2001
From: Juan Pablo Garcia Ripa <sarabadu@gmail.com>
Date: Wed, 9 Jul 2025 23:30:18 +0200
Subject: [PATCH] remove page and content as its already part of the entity
 page layout

Signed-off-by: Juan Pablo Garcia Ripa <sarabadu@gmail.com>
---
 plugins/kubernetes/src/KubernetesContent.tsx | 167 +++++++++----------
 1 file changed, 78 insertions(+), 89 deletions(-)

diff --git a/plugins/kubernetes/src/KubernetesContent.tsx b/plugins/kubernetes/src/KubernetesContent.tsx
index 71f58fa3a3..a8d62a5a3d 100644
--- a/plugins/kubernetes/src/KubernetesContent.tsx
+++ b/plugins/kubernetes/src/KubernetesContent.tsx
@@ -29,12 +29,7 @@ import {
   DetectedError,
   detectErrors,
 } from '@backstage/plugin-kubernetes-common';
-import {
-  Content,
-  EmptyState,
-  Page,
-  Progress,
-} from '@backstage/core-components';
+import { EmptyState, Progress } from '@backstage/core-components';
 import { RequireKubernetesPermissions } from './RequireKubernetesPermissions';
 
 type KubernetesContentProps = {
@@ -63,93 +58,87 @@ export const KubernetesContent = ({
       : new Map<string, DetectedError[]>();
 
   return (
-    <Page themeId="tool">
-      <Content noPadding>
-        <RequireKubernetesPermissions>
-          <DetectedErrorsContext.Provider
-            value={[...detectedErrors.values()].flat()}
-          >
-            {kubernetesObjects === undefined && error === undefined && (
-              <Progress />
-            )}
+    <RequireKubernetesPermissions>
+      <DetectedErrorsContext.Provider
+        value={[...detectedErrors.values()].flat()}
+      >
+        {kubernetesObjects === undefined && error === undefined && <Progress />}
 
-            {/* errors retrieved from the kubernetes clusters */}
-            {clustersWithErrors.length > 0 && (
-              <Grid container spacing={3} direction="column">
-                <Grid item>
-                  <ErrorPanel
-                    entityName={entity.metadata.name}
-                    clustersWithErrors={clustersWithErrors}
-                  />
-                </Grid>
-              </Grid>
-            )}
+        {/* errors retrieved from the kubernetes clusters */}
+        {clustersWithErrors.length > 0 && (
+          <Grid container spacing={3} direction="column">
+            <Grid item>
+              <ErrorPanel
+                entityName={entity.metadata.name}
+                clustersWithErrors={clustersWithErrors}
+              />
+            </Grid>
+          </Grid>
+        )}
 
-            {/* other errors */}
-            {error !== undefined && (
-              <Grid container spacing={3} direction="column">
-                <Grid item>
-                  <ErrorPanel
-                    entityName={entity.metadata.name}
-                    errorMessage={error}
-                  />
-                </Grid>
-              </Grid>
-            )}
+        {/* other errors */}
+        {error !== undefined && (
+          <Grid container spacing={3} direction="column">
+            <Grid item>
+              <ErrorPanel
+                entityName={entity.metadata.name}
+                errorMessage={error}
+              />
+            </Grid>
+          </Grid>
+        )}
 
-            {kubernetesObjects && (
-              <Grid container spacing={3} direction="column">
-                <Grid item>
-                  <ErrorReporting
-                    detectedErrors={detectedErrors}
-                    clusters={clusters}
-                  />
+        {kubernetesObjects && (
+          <Grid container spacing={3} direction="column">
+            <Grid item>
+              <ErrorReporting
+                detectedErrors={detectedErrors}
+                clusters={clusters}
+              />
+            </Grid>
+            <Grid item>
+              <Typography variant="h3">Your Clusters</Typography>
+            </Grid>
+            <Grid item container>
+              {kubernetesObjects?.items.length <= 0 && (
+                <Grid
+                  container
+                  justifyContent="space-around"
+                  direction="row"
+                  alignItems="center"
+                  spacing={2}
+                >
+                  <Grid item xs={8}>
+                    <EmptyState
+                      missing="data"
+                      title="No Kubernetes resources"
+                      description={`No resources on any known clusters for ${entity.metadata.name}`}
+                    />
+                  </Grid>
                 </Grid>
-                <Grid item>
-                  <Typography variant="h3">Your Clusters</Typography>
-                </Grid>
-                <Grid item container>
-                  {kubernetesObjects?.items.length <= 0 && (
-                    <Grid
-                      container
-                      justifyContent="space-around"
-                      direction="row"
-                      alignItems="center"
-                      spacing={2}
-                    >
-                      <Grid item xs={8}>
-                        <EmptyState
-                          missing="data"
-                          title="No Kubernetes resources"
-                          description={`No resources on any known clusters for ${entity.metadata.name}`}
-                        />
-                      </Grid>
+              )}
+              {kubernetesObjects?.items.length > 0 &&
+                kubernetesObjects?.items.map((item, i) => {
+                  const podsWithErrors = new Set<string>(
+                    detectedErrors
+                      .get(item.cluster.name)
+                      ?.filter(de => de.sourceRef.kind === 'Pod')
+                      .map(de => de.sourceRef.name),
+                  );
+
+                  return (
+                    <Grid item key={i} xs={12}>
+                      <Cluster
+                        clusterObjects={item}
+                        podsWithErrors={podsWithErrors}
+                      />
                     </Grid>
-                  )}
-                  {kubernetesObjects?.items.length > 0 &&
-                    kubernetesObjects?.items.map((item, i) => {
-                      const podsWithErrors = new Set<string>(
-                        detectedErrors
-                          .get(item.cluster.name)
-                          ?.filter(de => de.sourceRef.kind === 'Pod')
-                          .map(de => de.sourceRef.name),
-                      );
-
-                      return (
-                        <Grid item key={i} xs={12}>
-                          <Cluster
-                            clusterObjects={item}
-                            podsWithErrors={podsWithErrors}
-                          />
-                        </Grid>
-                      );
-                    })}
-                </Grid>
-              </Grid>
-            )}
-          </DetectedErrorsContext.Provider>
-        </RequireKubernetesPermissions>
-      </Content>
-    </Page>
+                  );
+                })}
+            </Grid>
+          </Grid>
+        )}
+      </DetectedErrorsContext.Provider>
+    </RequireKubernetesPermissions>
   );
 };