paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Merge pull request #30490 from Sarabadu/fix-double-padding-k8s

Browse Source
This commit is contained in:
Fredrik Adelöw
2025-08-11 17:23:48 +02:00
committed by GitHub
parent 8c2445acaa 06f0e6e0ec
commit e2a5195b20
2 changed files with 83 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kubernetes/src/KubernetesContent.tsx
+78 -89
View File
@@ -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>
<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>
);
};