@backstage/plugin-kubernetes 0.9.0 → 0.9.2-next.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @backstage/plugin-kubernetes
 
+## 0.9.2-next.0
+
+### Patch Changes
+
+- dc3cddf51ab5: Fix cyclical dependency in built output
+- 4b230b97660d: Add errors to PodDrawer
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.7.0-next.0
+  - @backstage/theme@0.4.0-next.0
+  - @backstage/config@1.0.7
+  - @backstage/core-components@0.13.2-next.0
+  - @backstage/core-plugin-api@1.5.1
+  - @backstage/catalog-model@1.3.0
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-kubernetes-common@0.6.3
+
 ## 0.9.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -8,6 +8,7 @@ import { V1Pod, V1ReplicaSet, V1Deployment, V1HorizontalPodAutoscaler, V1Service
 import React from 'react';
 import { IObjectMeta } from '@kubernetes-models/apimachinery/apis/meta/v1/ObjectMeta';
 import { Pod } from 'kubernetes-models/v1';
+import { Pod as Pod$1 } from 'kubernetes-models/v1/Pod';
 
 declare const kubernetesPlugin: _backstage_core_plugin_api.BackstagePlugin<{
     entityContent: _backstage_core_plugin_api.RouteRef<undefined>;
@@ -335,7 +336,7 @@ declare const KubernetesDrawer: ({ open, label, drawerContentsHeader, kubernetes
 interface PodAndErrors {
     clusterName: string;
     pod: Pod;
-    errors: any[];
+    errors: DetectedError[];
 }
 
 interface PodDrawerProps {
@@ -346,7 +347,7 @@ declare const PodDrawer: ({ podAndErrors, open }: PodDrawerProps) => JSX.Element
 
 type PodColumns = 'READY' | 'RESOURCE';
 type PodsTablesProps = {
-    pods: V1Pod[];
+    pods: Pod$1 | V1Pod[];
     extraColumns?: PodColumns[];
     children?: React.ReactNode;
 };

package/dist/index.esm.js

@@ -5,13 +5,12 @@ import * as React from 'react';
 import React__default, { useState, useCallback, useContext, Fragment } from 'react';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Routes, Route } from 'react-router-dom';
-import { Typography, Paper, makeStyles, createStyles, Dialog, DialogTitle, IconButton, DialogContent, Button, Card, CardHeader, CardContent, Grid, CardActions, FormControlLabel, Switch, Drawer, withStyles as withStyles$1, List, ListItem, Chip, Accordion, AccordionSummary, AccordionDetails, Stepper, Step, StepLabel } from '@material-ui/core';
+import { Typography, Paper, makeStyles, createStyles, Dialog, DialogTitle, IconButton, DialogContent, Button, Card, CardHeader, CardContent, Grid, CardActions, FormControlLabel, Switch, Drawer, withStyles as withStyles$1, List, ListItem, Divider, ListItemText, Chip, Accordion, AccordionSummary, AccordionDetails, Stepper, Step, StepLabel } from '@material-ui/core';
 import { WarningPanel, Table, DismissableBanner, LogViewer, StructuredMetadataTable, CodeSnippet, LinkButton, StatusError, StatusOK, StatusWarning, ItemCardGrid, SubvalueCell, StatusAborted, StatusPending, Page, Content, Progress, MissingAnnotationEmptyState } from '@backstage/core-components';
 import lodash from 'lodash';
 import { DateTime } from 'luxon';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import { Skeleton } from '@material-ui/lab';
-import { kubernetesProxyApiRef as kubernetesProxyApiRef$1 } from '@backstage/plugin-kubernetes';
 import useAsync from 'react-use/lib/useAsync';
 import SubjectIcon from '@material-ui/icons/Subject';
 import CloseIcon from '@material-ui/icons/Close';
@@ -705,7 +704,7 @@ const detectErrors = (objects) => {
 };
 
 const usePodLogs = ({ podScope }) => {
-  const kubernetesProxyApi = useApi(kubernetesProxyApiRef$1);
+  const kubernetesProxyApi = useApi(kubernetesProxyApiRef);
   return useAsync(async () => {
     return await kubernetesProxyApi.getPodLogs({
       podName: podScope.podName,
@@ -741,7 +740,7 @@ const PodLogs = ({ podScope }) => {
   ));
 };
 
-const useStyles = makeStyles(
+const useStyles$1 = makeStyles(
   (theme) => createStyles({
     closeButton: {
       position: "absolute",
@@ -752,7 +751,7 @@ const useStyles = makeStyles(
   })
 );
 const PodLogsDialog = ({ podScope }) => {
-  const classes = useStyles();
+  const classes = useStyles$1();
   const [open, setOpen] = useState(false);
   const openDialog = () => {
     setOpen(true);
@@ -1508,6 +1507,39 @@ const PendingPodContent = ({ pod }) => {
   return /* @__PURE__ */ React__default.createElement(Grid, { container: true, spacing: 2 }, /* @__PURE__ */ React__default.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React__default.createElement(Typography, { variant: "h5" }, "Pod is Pending. Conditions:"), /* @__PURE__ */ React__default.createElement(List, null, startupConditions.map((c) => /* @__PURE__ */ React__default.createElement(ListItem, { key: c.type }, /* @__PURE__ */ React__default.createElement(PodCondition, { condition: c }))))));
 };
 
+const useStyles = makeStyles(
+  (_theme) => createStyles({
+    root: {
+      overflow: "auto"
+    },
+    list: {
+      width: "100%"
+    }
+  })
+);
+const ErrorList = ({ podAndErrors }) => {
+  const classes = useStyles();
+  return /* @__PURE__ */ React__default.createElement(Paper, { className: classes.root }, /* @__PURE__ */ React__default.createElement(List, { className: classes.list }, podAndErrors.filter((pae) => pae.errors.length > 0).flatMap((onlyPodWithErrors) => {
+    return onlyPodWithErrors.errors.map((error, i) => {
+      var _a, _b, _c;
+      return /* @__PURE__ */ React__default.createElement(
+        React__default.Fragment,
+        {
+          key: `${(_b = (_a = onlyPodWithErrors.pod.metadata) == null ? void 0 : _a.name) != null ? _b : "unknown"}-eli-${i}`
+        },
+        i > 0 && /* @__PURE__ */ React__default.createElement(Divider, { key: `error-divider${i}` }),
+        /* @__PURE__ */ React__default.createElement(ListItem, null, /* @__PURE__ */ React__default.createElement(
+          ListItemText,
+          {
+            primary: error.message,
+            secondary: (_c = onlyPodWithErrors.pod.metadata) == null ? void 0 : _c.name
+          }
+        ))
+      );
+    });
+  })));
+};
+
 const useDrawerContentStyles = makeStyles(
   (_theme) => createStyles({
     header: {
@@ -1564,7 +1596,7 @@ const PodDrawer = ({ podAndErrors, open }) => {
           }
         );
       }
-    )))))
+    ))), podAndErrors.errors.length > 0 && /* @__PURE__ */ React__default.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React__default.createElement(Typography, { variant: "h5" }, "Errors:")), podAndErrors.errors.length > 0 && /* @__PURE__ */ React__default.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React__default.createElement(ErrorList, { podAndErrors: [podAndErrors] }))))
   );
 };
 
@@ -1683,6 +1715,22 @@ const podStatusToMemoryUtil = (podStatus) => {
   );
 };
 
+const DetectedErrorsContext = React__default.createContext([]);
+const useMatchingErrors = (matcher) => {
+  var _a, _b, _c, _d;
+  const targetRef = {
+    name: (_b = (_a = matcher.metadata) == null ? void 0 : _a.name) != null ? _b : "",
+    namespace: (_d = (_c = matcher.metadata) == null ? void 0 : _c.namespace) != null ? _d : "",
+    kind: matcher.kind,
+    apiGroup: matcher.apiVersion
+  };
+  const errors = useContext(DetectedErrorsContext);
+  return errors.filter((e) => {
+    const r = e.sourceRef;
+    return targetRef.apiGroup === r.apiGroup && targetRef.kind === r.kind && targetRef.name === r.name && targetRef.namespace === r.namespace;
+  });
+};
+
 const READY_COLUMNS = "READY";
 const RESOURCE_COLUMNS = "RESOURCE";
 const READY = [
@@ -1700,23 +1748,33 @@ const READY = [
     width: "auto"
   }
 ];
+const PodDrawerTrigger = ({ pod }) => {
+  const cluster = useContext(ClusterContext);
+  const errors = useMatchingErrors({
+    kind: "Pod",
+    apiVersion: "v1",
+    metadata: pod.metadata
+  });
+  return /* @__PURE__ */ React__default.createElement(
+    PodDrawer,
+    {
+      podAndErrors: {
+        pod,
+        clusterName: cluster.name,
+        errors
+      }
+    }
+  );
+};
 const PodsTable = ({ pods, extraColumns = [] }) => {
   const podNamesWithMetrics = useContext(PodNamesWithMetricsContext);
-  const cluster = useContext(ClusterContext);
   const defaultColumns = [
     {
       title: "name",
       highlight: true,
-      render: (pod) => /* @__PURE__ */ React__default.createElement(
-        PodDrawer,
-        {
-          podAndErrors: {
-            pod,
-            clusterName: cluster.name,
-            errors: []
-          }
-        }
-      )
+      render: (pod) => {
+        return /* @__PURE__ */ React__default.createElement(PodDrawerTrigger, { pod });
+      }
     },
     {
       title: "phase",
@@ -1768,15 +1826,11 @@ const PodsTable = ({ pods, extraColumns = [] }) => {
     minWidth: "0",
     width: "100%"
   };
-  const usePods = pods.map((p) => {
-    var _a;
-    return { ...p, id: (_a = p.metadata) == null ? void 0 : _a.uid };
-  });
   return /* @__PURE__ */ React__default.createElement("div", { style: tableStyle }, /* @__PURE__ */ React__default.createElement(
     Table,
     {
       options: { paging: true, search: false, emptyRowsWhenPaging: false },
-      data: usePods,
+      data: pods,
       columns
     }
   ));
@@ -2906,7 +2960,7 @@ const KubernetesContent = ({
   );
   const clustersWithErrors = (_a = kubernetesObjects == null ? void 0 : kubernetesObjects.items.filter((r) => r.errors.length > 0)) != null ? _a : [];
   const detectedErrors = kubernetesObjects !== void 0 ? detectErrors(kubernetesObjects) : /* @__PURE__ */ new Map();
-  return /* @__PURE__ */ React__default.createElement(Page, { themeId: "tool" }, /* @__PURE__ */ React__default.createElement(Content, null, kubernetesObjects === void 0 && error === void 0 && /* @__PURE__ */ React__default.createElement(Progress, null), clustersWithErrors.length > 0 && /* @__PURE__ */ React__default.createElement(Grid, { container: true, spacing: 3, direction: "column" }, /* @__PURE__ */ React__default.createElement(Grid, { item: true }, /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement(DetectedErrorsContext.Provider, { value: [...detectedErrors.values()].flat() }, /* @__PURE__ */ React__default.createElement(Page, { themeId: "tool" }, /* @__PURE__ */ React__default.createElement(Content, null, kubernetesObjects === void 0 && error === void 0 && /* @__PURE__ */ React__default.createElement(Progress, null), clustersWithErrors.length > 0 && /* @__PURE__ */ React__default.createElement(Grid, { container: true, spacing: 3, direction: "column" }, /* @__PURE__ */ React__default.createElement(Grid, { item: true }, /* @__PURE__ */ React__default.createElement(
     ErrorPanel,
     {
       entityName: entity.metadata.name,
@@ -2948,7 +3002,7 @@ const KubernetesContent = ({
         podsWithErrors
       }
     ));
-  }))))));
+  })))))));
 };
 
 const KUBERNETES_ANNOTATION = "backstage.io/kubernetes-id";