From ba816e45a54d7e1dae266230f5bd4edb4c2829db Mon Sep 17 00:00:00 2001
From: Dominika Zemanovicova <dzemanov@redhat.com>
Date: Fri, 10 Jan 2025 10:16:09 +0100
Subject: [PATCH] Move page and content

Signed-off-by: Dominika Zemanovicova <dzemanov@redhat.com>
---
 plugins/kubernetes/src/KubernetesContent.tsx  | 20 +++++++++----------
 .../src/RequireKubernetesPermissions.tsx      | 14 +++++--------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/plugins/kubernetes/src/KubernetesContent.tsx b/plugins/kubernetes/src/KubernetesContent.tsx
index 633d6b2a5a..f980e87f0b 100644
--- a/plugins/kubernetes/src/KubernetesContent.tsx
+++ b/plugins/kubernetes/src/KubernetesContent.tsx
@@ -63,12 +63,12 @@ export const KubernetesContent = ({
       : new Map<string, DetectedError[]>();
 
   return (
-    <RequireKubernetesPermissions>
-      <DetectedErrorsContext.Provider
-        value={[...detectedErrors.values()].flat()}
-      >
-        <Page themeId="tool">
-          <Content>
+    <Page themeId="tool">
+      <Content>
+        <RequireKubernetesPermissions>
+          <DetectedErrorsContext.Provider
+            value={[...detectedErrors.values()].flat()}
+          >
             {kubernetesObjects === undefined && error === undefined && (
               <Progress />
             )}
@@ -147,9 +147,9 @@ export const KubernetesContent = ({
                 </Grid>
               </Grid>
             )}
-          </Content>
-        </Page>
-      </DetectedErrorsContext.Provider>
-    </RequireKubernetesPermissions>
+          </DetectedErrorsContext.Provider>
+        </RequireKubernetesPermissions>
+      </Content>
+    </Page>
   );
 };
diff --git a/plugins/kubernetes/src/RequireKubernetesPermissions.tsx b/plugins/kubernetes/src/RequireKubernetesPermissions.tsx
index 071a5aa4f9..7912393303 100644
--- a/plugins/kubernetes/src/RequireKubernetesPermissions.tsx
+++ b/plugins/kubernetes/src/RequireKubernetesPermissions.tsx
@@ -19,7 +19,7 @@ import {
   kubernetesResourcesReadPermission,
 } from '@backstage/plugin-kubernetes-common';
 import { usePermission } from '@backstage/plugin-permission-react';
-import { Content, Page, WarningPanel } from '@backstage/core-components';
+import { WarningPanel } from '@backstage/core-components';
 
 export type RequireKubernetesPermissionProps = {
   children: ReactNode;
@@ -50,14 +50,10 @@ export function RequireKubernetesPermissions(
   }
 
   return (
-    <Page themeId="tool">
-      <Content>
-        <WarningPanel
-          title="Permission required"
-          message={`To view Kubernetes objects, contact your administrator to give you the 
+    <WarningPanel
+      title="Permission required"
+      message={`To view Kubernetes objects, contact your administrator to give you the 
               '${kubernetesClustersReadPermission.name}' and '${kubernetesResourcesReadPermission.name}' permission.`}
-        />
-      </Content>
-    </Page>
+    />
   );
 }