@backstage-community/plugin-ocm 5.14.0 → 5.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @backstage-community/plugin-ocm
2
2
 
3
+ ## 5.15.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 5f6f816: Backstage version bump to v1.48.4
8
+
9
+ ### Patch Changes
10
+
11
+ - 926c09e: Show loading indicator and error panel if needed on the cluster info and cluster resource cards.
12
+ - 13684ea: ClusterAvailableResourceCard components returns now a JSX element instead of any but this should be fine in most cases.
13
+ - 926c09e: Fix crash when cluster entity and cluster resources doesn't match.
14
+ - 926c09e: Improve OCM cluster page when an error is displayed and removed unnecessary home plugin dependency.
15
+ - Updated dependencies [5f6f816]
16
+ - @backstage-community/plugin-ocm-common@3.19.0
17
+
3
18
  ## 5.14.0
4
19
 
5
20
  ### Minor Changes
@@ -1,16 +1,20 @@
1
1
  import { jsx } from 'react/jsx-runtime';
2
+ import { Progress, ErrorPanel, WarningPanel } from '@backstage/core-components';
2
3
  import { RequirePermission } from '@backstage/plugin-permission-react';
3
4
  import { ocmEntityReadPermission } from '@backstage-community/plugin-ocm-common';
4
5
  import { useCluster } from '../ClusterContext/ClusterContext.esm.js';
5
6
  import { TableCardFromData } from '../TableCardFromData/TableCardFromData.esm.js';
6
7
 
7
8
  const ClusterAvailableResourceCard = () => {
8
- const { data } = useCluster();
9
- if (!data) {
10
- return null;
9
+ const { loading, data, error } = useCluster();
10
+ if (loading) {
11
+ return /* @__PURE__ */ jsx(Progress, {});
11
12
  }
12
- if (!("availableResources" in data)) {
13
- return null;
13
+ if (error) {
14
+ return /* @__PURE__ */ jsx(ErrorPanel, { error });
15
+ }
16
+ if (!data || !("availableResources" in data)) {
17
+ return /* @__PURE__ */ jsx(WarningPanel, { severity: "error", title: "No cluster data available" });
14
18
  }
15
19
  const nameMap = /* @__PURE__ */ new Map([
16
20
  ["cpuCores", "CPU cores"],
@@ -1 +1 @@
1
- {"version":3,"file":"ClusterAvailableResourcesCard.esm.js","sources":["../../../src/components/ClusterAvailableResourcesCard/ClusterAvailableResourcesCard.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { RequirePermission } from '@backstage/plugin-permission-react';\n\nimport { ocmEntityReadPermission } from '@backstage-community/plugin-ocm-common';\n\nimport { useCluster } from '../ClusterContext';\nimport { TableCardFromData } from '../TableCardFromData';\n\n/**\n * @public\n */\nexport const ClusterAvailableResourceCard = (): any => {\n const { data } = useCluster();\n\n if (!data) {\n return null;\n }\n\n if (!('availableResources' in data!)) {\n return null;\n }\n\n const nameMap = new Map<string, string>([\n ['cpuCores', 'CPU cores'],\n ['memorySize', 'Memory size'],\n ['numberOfPods', 'Number of pods'],\n ]);\n return (\n <RequirePermission permission={ocmEntityReadPermission}>\n <TableCardFromData\n data={data.availableResources}\n title=\"Available\"\n nameMap={nameMap}\n />\n </RequirePermission>\n );\n};\n"],"names":[],"mappings":";;;;;;AAyBO,MAAM,+BAA+B,MAAW;AACrD,EAAM,MAAA,EAAE,IAAK,EAAA,GAAI,UAAW,EAAA;AAE5B,EAAA,IAAI,CAAC,IAAM,EAAA;AACT,IAAO,OAAA,IAAA;AAAA;AAGT,EAAI,IAAA,EAAE,wBAAwB,IAAQ,CAAA,EAAA;AACpC,IAAO,OAAA,IAAA;AAAA;AAGT,EAAM,MAAA,OAAA,uBAAc,GAAoB,CAAA;AAAA,IACtC,CAAC,YAAY,WAAW,CAAA;AAAA,IACxB,CAAC,cAAc,aAAa,CAAA;AAAA,IAC5B,CAAC,gBAAgB,gBAAgB;AAAA,GAClC,CAAA;AACD,EACE,uBAAA,GAAA,CAAC,iBAAkB,EAAA,EAAA,UAAA,EAAY,uBAC7B,EAAA,QAAA,kBAAA,GAAA;AAAA,IAAC,iBAAA;AAAA,IAAA;AAAA,MACC,MAAM,IAAK,CAAA,kBAAA;AAAA,MACX,KAAM,EAAA,WAAA;AAAA,MACN;AAAA;AAAA,GAEJ,EAAA,CAAA;AAEJ;;;;"}
1
+ {"version":3,"file":"ClusterAvailableResourcesCard.esm.js","sources":["../../../src/components/ClusterAvailableResourcesCard/ClusterAvailableResourcesCard.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { ErrorPanel, Progress, WarningPanel } from '@backstage/core-components';\nimport { RequirePermission } from '@backstage/plugin-permission-react';\n\nimport { ocmEntityReadPermission } from '@backstage-community/plugin-ocm-common';\n\nimport { useCluster } from '../ClusterContext';\nimport { TableCardFromData } from '../TableCardFromData';\n\n/**\n * @public\n */\nexport const ClusterAvailableResourceCard = () => {\n const { loading, data, error } = useCluster();\n\n if (loading) {\n return <Progress />;\n }\n if (error) {\n return <ErrorPanel error={error} />;\n }\n\n if (!data || !('availableResources' in data)) {\n return <WarningPanel severity=\"error\" title=\"No cluster data available\" />;\n }\n\n const nameMap = new Map<string, string>([\n ['cpuCores', 'CPU cores'],\n ['memorySize', 'Memory size'],\n ['numberOfPods', 'Number of pods'],\n ]);\n return (\n <RequirePermission permission={ocmEntityReadPermission}>\n <TableCardFromData\n data={data.availableResources}\n title=\"Available\"\n nameMap={nameMap}\n />\n </RequirePermission>\n );\n};\n"],"names":[],"mappings":";;;;;;;AA0BO,MAAM,+BAA+B,MAAM;AAChD,EAAA,MAAM,EAAE,OAAA,EAAS,IAAM,EAAA,KAAA,KAAU,UAAW,EAAA;AAE5C,EAAA,IAAI,OAAS,EAAA;AACX,IAAA,2BAAQ,QAAS,EAAA,EAAA,CAAA;AAAA;AAEnB,EAAA,IAAI,KAAO,EAAA;AACT,IAAO,uBAAA,GAAA,CAAC,cAAW,KAAc,EAAA,CAAA;AAAA;AAGnC,EAAA,IAAI,CAAC,IAAA,IAAQ,EAAE,oBAAA,IAAwB,IAAO,CAAA,EAAA;AAC5C,IAAA,uBAAQ,GAAA,CAAA,YAAA,EAAA,EAAa,QAAS,EAAA,OAAA,EAAQ,OAAM,2BAA4B,EAAA,CAAA;AAAA;AAG1E,EAAM,MAAA,OAAA,uBAAc,GAAoB,CAAA;AAAA,IACtC,CAAC,YAAY,WAAW,CAAA;AAAA,IACxB,CAAC,cAAc,aAAa,CAAA;AAAA,IAC5B,CAAC,gBAAgB,gBAAgB;AAAA,GAClC,CAAA;AACD,EACE,uBAAA,GAAA,CAAC,iBAAkB,EAAA,EAAA,UAAA,EAAY,uBAC7B,EAAA,QAAA,kBAAA,GAAA;AAAA,IAAC,iBAAA;AAAA,IAAA;AAAA,MACC,MAAM,IAAK,CAAA,kBAAA;AAAA,MACX,KAAM,EAAA,WAAA;AAAA,MACN;AAAA;AAAA,GAEJ,EAAA,CAAA;AAEJ;;;;"}
@@ -1,4 +1,5 @@
1
1
  import { jsx } from 'react/jsx-runtime';
2
+ import { Progress, ErrorPanel, WarningPanel } from '@backstage/core-components';
2
3
  import { RequirePermission } from '@backstage/plugin-permission-react';
3
4
  import { ocmEntityReadPermission } from '@backstage-community/plugin-ocm-common';
4
5
  import { useCluster } from '../ClusterContext/ClusterContext.esm.js';
@@ -6,9 +7,15 @@ import { Update, Status } from '../common.esm.js';
6
7
  import { TableCardFromData } from '../TableCardFromData/TableCardFromData.esm.js';
7
8
 
8
9
  const ClusterInfoCard = () => {
9
- const { data } = useCluster();
10
+ const { loading, data, error } = useCluster();
11
+ if (loading) {
12
+ return /* @__PURE__ */ jsx(Progress, {});
13
+ }
14
+ if (error) {
15
+ return /* @__PURE__ */ jsx(ErrorPanel, { error });
16
+ }
10
17
  if (!data) {
11
- return null;
18
+ return /* @__PURE__ */ jsx(WarningPanel, { severity: "error", title: "No cluster data available" });
12
19
  }
13
20
  data.openshiftVersion = /* @__PURE__ */ jsx(Update, { data: { version: data.openshiftVersion, update: data.update } });
14
21
  data.status = /* @__PURE__ */ jsx(Status, { status: data.status });
@@ -1 +1 @@
1
- {"version":3,"file":"ClusterInfoCard.esm.js","sources":["../../../src/components/ClusterInfoCard/ClusterInfoCard.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { RequirePermission } from '@backstage/plugin-permission-react';\n\nimport { ocmEntityReadPermission } from '@backstage-community/plugin-ocm-common';\n\nimport { useCluster } from '../ClusterContext';\nimport { Status, Update } from '../common';\nimport { TableCardFromData } from '../TableCardFromData';\n\n/**\n * @public\n */\nexport const ClusterInfoCard = () => {\n const { data } = useCluster();\n\n if (!data) {\n return null;\n }\n\n data.openshiftVersion = (\n <Update data={{ version: data.openshiftVersion!, update: data.update! }} />\n ) as any;\n data.status = (<Status status={data.status} />) as any;\n const nameMap = new Map<string, string>([\n ['name', 'Name'],\n ['status', 'Status'],\n ['kubernetesVersion', 'Kubernetes version'],\n ['openshiftId', 'OpenShift ID'],\n ['openshiftVersion', 'OpenShift version'],\n ['platform', 'Platform'],\n ]);\n return (\n <RequirePermission permission={ocmEntityReadPermission}>\n <TableCardFromData data={data} title=\"Cluster Info\" nameMap={nameMap} />\n </RequirePermission>\n );\n};\n"],"names":[],"mappings":";;;;;;;AA0BO,MAAM,kBAAkB,MAAM;AACnC,EAAM,MAAA,EAAE,IAAK,EAAA,GAAI,UAAW,EAAA;AAE5B,EAAA,IAAI,CAAC,IAAM,EAAA;AACT,IAAO,OAAA,IAAA;AAAA;AAGT,EAAK,IAAA,CAAA,gBAAA,mBACF,GAAA,CAAA,MAAA,EAAA,EAAO,IAAM,EAAA,EAAE,OAAS,EAAA,IAAA,CAAK,gBAAmB,EAAA,MAAA,EAAQ,IAAK,CAAA,MAAA,EAAW,EAAA,CAAA;AAE3E,EAAA,IAAA,CAAK,MAAU,mBAAA,GAAA,CAAC,MAAO,EAAA,EAAA,MAAA,EAAQ,KAAK,MAAQ,EAAA,CAAA;AAC5C,EAAM,MAAA,OAAA,uBAAc,GAAoB,CAAA;AAAA,IACtC,CAAC,QAAQ,MAAM,CAAA;AAAA,IACf,CAAC,UAAU,QAAQ,CAAA;AAAA,IACnB,CAAC,qBAAqB,oBAAoB,CAAA;AAAA,IAC1C,CAAC,eAAe,cAAc,CAAA;AAAA,IAC9B,CAAC,oBAAoB,mBAAmB,CAAA;AAAA,IACxC,CAAC,YAAY,UAAU;AAAA,GACxB,CAAA;AACD,EACE,uBAAA,GAAA,CAAC,iBAAkB,EAAA,EAAA,UAAA,EAAY,uBAC7B,EAAA,QAAA,kBAAA,GAAA,CAAC,qBAAkB,IAAY,EAAA,KAAA,EAAM,cAAe,EAAA,OAAA,EAAkB,CACxE,EAAA,CAAA;AAEJ;;;;"}
1
+ {"version":3,"file":"ClusterInfoCard.esm.js","sources":["../../../src/components/ClusterInfoCard/ClusterInfoCard.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { ErrorPanel, Progress, WarningPanel } from '@backstage/core-components';\nimport { RequirePermission } from '@backstage/plugin-permission-react';\n\nimport { ocmEntityReadPermission } from '@backstage-community/plugin-ocm-common';\n\nimport { useCluster } from '../ClusterContext';\nimport { Status, Update } from '../common';\nimport { TableCardFromData } from '../TableCardFromData';\n\n/**\n * @public\n */\nexport const ClusterInfoCard = () => {\n const { loading, data, error } = useCluster();\n\n if (loading) {\n return <Progress />;\n }\n if (error) {\n return <ErrorPanel error={error} />;\n }\n if (!data) {\n return <WarningPanel severity=\"error\" title=\"No cluster data available\" />;\n }\n\n data.openshiftVersion = (\n <Update data={{ version: data.openshiftVersion!, update: data.update! }} />\n ) as any;\n data.status = (<Status status={data.status} />) as any;\n const nameMap = new Map<string, string>([\n ['name', 'Name'],\n ['status', 'Status'],\n ['kubernetesVersion', 'Kubernetes version'],\n ['openshiftId', 'OpenShift ID'],\n ['openshiftVersion', 'OpenShift version'],\n ['platform', 'Platform'],\n ]);\n return (\n <RequirePermission permission={ocmEntityReadPermission}>\n <TableCardFromData data={data} title=\"Cluster Info\" nameMap={nameMap} />\n </RequirePermission>\n );\n};\n"],"names":[],"mappings":";;;;;;;;AA2BO,MAAM,kBAAkB,MAAM;AACnC,EAAA,MAAM,EAAE,OAAA,EAAS,IAAM,EAAA,KAAA,KAAU,UAAW,EAAA;AAE5C,EAAA,IAAI,OAAS,EAAA;AACX,IAAA,2BAAQ,QAAS,EAAA,EAAA,CAAA;AAAA;AAEnB,EAAA,IAAI,KAAO,EAAA;AACT,IAAO,uBAAA,GAAA,CAAC,cAAW,KAAc,EAAA,CAAA;AAAA;AAEnC,EAAA,IAAI,CAAC,IAAM,EAAA;AACT,IAAA,uBAAQ,GAAA,CAAA,YAAA,EAAA,EAAa,QAAS,EAAA,OAAA,EAAQ,OAAM,2BAA4B,EAAA,CAAA;AAAA;AAG1E,EAAK,IAAA,CAAA,gBAAA,mBACF,GAAA,CAAA,MAAA,EAAA,EAAO,IAAM,EAAA,EAAE,OAAS,EAAA,IAAA,CAAK,gBAAmB,EAAA,MAAA,EAAQ,IAAK,CAAA,MAAA,EAAW,EAAA,CAAA;AAE3E,EAAA,IAAA,CAAK,MAAU,mBAAA,GAAA,CAAC,MAAO,EAAA,EAAA,MAAA,EAAQ,KAAK,MAAQ,EAAA,CAAA;AAC5C,EAAM,MAAA,OAAA,uBAAc,GAAoB,CAAA;AAAA,IACtC,CAAC,QAAQ,MAAM,CAAA;AAAA,IACf,CAAC,UAAU,QAAQ,CAAA;AAAA,IACnB,CAAC,qBAAqB,oBAAoB,CAAA;AAAA,IAC1C,CAAC,eAAe,cAAc,CAAA;AAAA,IAC9B,CAAC,oBAAoB,mBAAmB,CAAA;AAAA,IACxC,CAAC,YAAY,UAAU;AAAA,GACxB,CAAA;AACD,EACE,uBAAA,GAAA,CAAC,iBAAkB,EAAA,EAAA,UAAA,EAAY,uBAC7B,EAAA,QAAA,kBAAA,GAAA,CAAC,qBAAkB,IAAY,EAAA,KAAA,EAAM,cAAe,EAAA,OAAA,EAAkB,CACxE,EAAA,CAAA;AAEJ;;;;"}
@@ -1,32 +1,17 @@
1
1
  import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
2
2
  import useAsyncFn from 'react-use/lib/useAsyncFn';
3
3
  import useDebounce from 'react-use/lib/useDebounce';
4
- import { Page, Header, Content, WarningPanel, CodeSnippet, Table, StatusOK, StatusError, StatusAborted } from '@backstage/core-components';
4
+ import { Page, Header, Content, ErrorPanel, Table, StatusOK, StatusError, StatusAborted } from '@backstage/core-components';
5
5
  import { useApi } from '@backstage/core-plugin-api';
6
6
  import { catalogApiRef, EntityRefLink } from '@backstage/plugin-catalog-react';
7
- import { HomePageCompanyLogo } from '@backstage/plugin-home';
8
7
  import { RequirePermission } from '@backstage/plugin-permission-react';
9
8
  import { SearchContextProvider } from '@backstage/plugin-search-react';
10
- import { makeStyles, Grid, CircularProgress, Chip } from '@material-ui/core';
9
+ import { Box, CircularProgress, Chip } from '@material-ui/core';
11
10
  import { ocmClusterReadPermission } from '@backstage-community/plugin-ocm-common';
12
11
  import { OcmApiRef } from '../../api/index.esm.js';
13
12
  import { Status, Update } from '../common.esm.js';
14
13
  import { columns } from './tableHeading.esm.js';
15
14
 
16
- const useStylesTwo = makeStyles({
17
- container: {
18
- width: "100%"
19
- }
20
- });
21
- const useStyles = makeStyles((theme) => ({
22
- container: {
23
- margin: theme.spacing(5, 0),
24
- "& > svg": {
25
- width: "auto",
26
- height: 150
27
- }
28
- }
29
- }));
30
15
  const NodeChip = ({
31
16
  count,
32
17
  indicatorComponent: IndicatorComponent
@@ -65,7 +50,6 @@ const NodeChips = ({ nodes }) => {
65
50
  const CatalogClusters = () => {
66
51
  const catalogApi = useApi(catalogApiRef);
67
52
  const ocmApi = useApi(OcmApiRef);
68
- const classes = useStylesTwo();
69
53
  const [{ value: clusterEntities, loading, error }, refresh] = useAsyncFn(
70
54
  async () => {
71
55
  const clusterResourceEntities = await catalogApi.getEntities({
@@ -75,17 +59,18 @@ const CatalogClusters = () => {
75
59
  if ("error" in clusters) {
76
60
  throw new Error(clusters.error.message);
77
61
  }
78
- const clusterEntityMappings = clusterResourceEntities.items.map(
79
- (entity) => {
80
- const cluster = clusters.find(
81
- (cd) => cd.name === entity.metadata.name
82
- );
83
- return {
62
+ const clusterEntityMappings = [];
63
+ clusterResourceEntities.items.forEach((entity) => {
64
+ const cluster = clusters.find(
65
+ (cd) => cd.name === entity.metadata.name
66
+ );
67
+ if (cluster) {
68
+ clusterEntityMappings.push({
84
69
  cluster,
85
70
  entity
86
- };
71
+ });
87
72
  }
88
- );
73
+ });
89
74
  return clusterEntityMappings;
90
75
  },
91
76
  [catalogApi],
@@ -93,10 +78,17 @@ const CatalogClusters = () => {
93
78
  );
94
79
  useDebounce(refresh, 10);
95
80
  if (error) {
96
- return /* @__PURE__ */ jsx(WarningPanel, { severity: "error", title: "Could not fetch clusters from Hub.", children: /* @__PURE__ */ jsx(CodeSnippet, { language: "text", text: error.toString() }) });
81
+ return /* @__PURE__ */ jsx(
82
+ ErrorPanel,
83
+ {
84
+ title: "Could not fetch clusters from Hub.",
85
+ error,
86
+ defaultExpanded: true
87
+ }
88
+ );
97
89
  }
98
90
  if (loading) {
99
- return /* @__PURE__ */ jsx(CircularProgress, {});
91
+ return /* @__PURE__ */ jsx("div", { style: { textAlign: "center" }, children: /* @__PURE__ */ jsx(CircularProgress, {}) });
100
92
  }
101
93
  const data = clusterEntities ? clusterEntities.map((ce) => {
102
94
  return {
@@ -115,7 +107,7 @@ const CatalogClusters = () => {
115
107
  nodes: /* @__PURE__ */ jsx(NodeChips, { nodes: ce.cluster.nodes })
116
108
  };
117
109
  }) : [];
118
- return /* @__PURE__ */ jsx("div", { className: classes.container, children: /* @__PURE__ */ jsx(
110
+ return /* @__PURE__ */ jsx(
119
111
  Table,
120
112
  {
121
113
  options: { paging: false },
@@ -123,16 +115,15 @@ const CatalogClusters = () => {
123
115
  columns,
124
116
  title: "All"
125
117
  }
126
- ) });
118
+ );
127
119
  };
128
120
  const ClusterStatusPage = ({ logo }) => {
129
- const { container } = useStyles();
130
121
  return /* @__PURE__ */ jsx(SearchContextProvider, { children: /* @__PURE__ */ jsx(RequirePermission, { permission: ocmClusterReadPermission, children: /* @__PURE__ */ jsxs(Page, { themeId: "clusters", children: [
131
122
  /* @__PURE__ */ jsx(Header, { title: "Your Managed Clusters" }),
132
- /* @__PURE__ */ jsx(Content, { children: /* @__PURE__ */ jsxs(Grid, { container: true, justifyContent: "center", spacing: 6, children: [
133
- logo && /* @__PURE__ */ jsx(HomePageCompanyLogo, { className: container, logo }),
134
- /* @__PURE__ */ jsx(Grid, { container: true, item: true, xs: 12, justifyContent: "center", children: /* @__PURE__ */ jsx(CatalogClusters, {}) })
135
- ] }) })
123
+ /* @__PURE__ */ jsxs(Content, { children: [
124
+ logo && /* @__PURE__ */ jsx(Box, { sx: { textAlign: "center", maxHeight: 150, mt: 5, mb: 5 }, children: logo }),
125
+ /* @__PURE__ */ jsx(CatalogClusters, {})
126
+ ] })
136
127
  ] }) }) });
137
128
  };
138
129
 
@@ -1 +1 @@
1
- {"version":3,"file":"ClusterStatusPage.esm.js","sources":["../../../src/components/ClusterStatusPage/ClusterStatusPage.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport type { FC, PropsWithChildren, ReactNode } from 'react';\nimport useAsyncFn from 'react-use/lib/useAsyncFn';\nimport useDebounce from 'react-use/lib/useDebounce';\n\nimport {\n CodeSnippet,\n Content,\n Header,\n Page,\n StatusAborted,\n StatusError,\n StatusOK,\n Table,\n WarningPanel,\n} from '@backstage/core-components';\nimport { useApi } from '@backstage/core-plugin-api';\nimport { catalogApiRef, EntityRefLink } from '@backstage/plugin-catalog-react';\nimport { HomePageCompanyLogo } from '@backstage/plugin-home';\nimport { RequirePermission } from '@backstage/plugin-permission-react';\nimport { SearchContextProvider } from '@backstage/plugin-search-react';\n\nimport { Chip, CircularProgress, Grid, makeStyles } from '@material-ui/core';\n\nimport {\n ClusterNodesStatus,\n ClusterOverview,\n ocmClusterReadPermission,\n} from '@backstage-community/plugin-ocm-common';\n\nimport { OcmApiRef } from '../../api';\nimport { ClusterStatusRowData } from '../../types';\nimport { Status, Update } from '../common';\nimport { columns } from './tableHeading';\n\nconst useStylesTwo = makeStyles({\n container: {\n width: '100%',\n },\n});\n\nconst useStyles = makeStyles(theme => ({\n container: {\n margin: theme.spacing(5, 0),\n '& > svg': {\n width: 'auto',\n height: 150,\n },\n },\n}));\n\nconst NodeChip = ({\n count,\n indicatorComponent: IndicatorComponent,\n}: {\n count: number;\n indicatorComponent: FC<PropsWithChildren<{}>>;\n}) => {\n if (!count) {\n return null;\n }\n return (\n <Chip\n label={<IndicatorComponent>{count}</IndicatorComponent>}\n variant=\"outlined\"\n />\n );\n};\n\nconst NodeChips = ({ nodes }: { nodes: ClusterNodesStatus[] }) => {\n const readyChipsNodes = nodes.filter(node => node.status === 'True').length;\n // TODO: Check if not ready correctly\n const notReadyNodesCount = nodes.filter(\n node => node.status === 'False',\n ).length;\n\n if (nodes.length === 0) {\n return <>-</>;\n }\n\n return (\n <>\n <NodeChip count={readyChipsNodes} indicatorComponent={StatusOK} />\n <NodeChip count={notReadyNodesCount} indicatorComponent={StatusError} />\n <NodeChip\n count={nodes.length - readyChipsNodes - notReadyNodesCount}\n indicatorComponent={StatusAborted}\n />\n </>\n );\n};\n\nconst CatalogClusters = () => {\n const catalogApi = useApi(catalogApiRef);\n const ocmApi = useApi(OcmApiRef);\n const classes = useStylesTwo();\n\n const [{ value: clusterEntities, loading, error }, refresh] = useAsyncFn(\n async () => {\n const clusterResourceEntities = await catalogApi.getEntities({\n filter: { kind: 'Resource', 'spec.type': 'kubernetes-cluster' },\n });\n\n const clusters = await ocmApi.getClusters();\n\n if ('error' in clusters) {\n throw new Error(clusters.error.message);\n }\n\n const clusterEntityMappings = clusterResourceEntities.items.map(\n entity => {\n const cluster = (clusters as ClusterOverview[]).find(\n cd => cd.name === entity.metadata.name,\n );\n return {\n cluster: cluster!,\n entity: entity,\n };\n },\n );\n return clusterEntityMappings;\n },\n [catalogApi],\n { loading: true },\n );\n useDebounce(refresh, 10);\n\n if (error) {\n return (\n <WarningPanel severity=\"error\" title=\"Could not fetch clusters from Hub.\">\n <CodeSnippet language=\"text\" text={error.toString()} />\n </WarningPanel>\n );\n }\n\n if (loading) {\n return <CircularProgress />;\n }\n\n const data: ClusterStatusRowData[] = clusterEntities\n ? clusterEntities.map(ce => {\n return {\n name: (\n <EntityRefLink entityRef={ce.entity}>\n {ce.cluster.name}\n </EntityRefLink>\n ),\n status: <Status status={ce.cluster.status} />,\n infrastructure: ce.cluster.platform,\n version: (\n <Update\n data={{\n version: ce.cluster.openshiftVersion,\n update: ce.cluster.update,\n }}\n />\n ),\n nodes: <NodeChips nodes={ce.cluster.nodes} />,\n };\n })\n : [];\n\n return (\n <div className={classes.container}>\n <Table\n options={{ paging: false }}\n data={data}\n columns={columns}\n title=\"All\"\n />\n </div>\n );\n};\n\nexport const ClusterStatusPage = ({ logo }: { logo?: ReactNode }) => {\n const { container } = useStyles();\n\n return (\n <SearchContextProvider>\n <RequirePermission permission={ocmClusterReadPermission}>\n <Page themeId=\"clusters\">\n <Header title=\"Your Managed Clusters\" />\n <Content>\n <Grid container justifyContent=\"center\" spacing={6}>\n {logo && (\n <HomePageCompanyLogo className={container} logo={logo} />\n )}\n <Grid container item xs={12} justifyContent=\"center\">\n <CatalogClusters />\n </Grid>\n </Grid>\n </Content>\n </Page>\n </RequirePermission>\n </SearchContextProvider>\n );\n};\n\nexport default ClusterStatusPage;\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ClusterStatusPage.esm.js","sources":["../../../src/components/ClusterStatusPage/ClusterStatusPage.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport type { FC, PropsWithChildren, ReactNode } from 'react';\nimport useAsyncFn from 'react-use/lib/useAsyncFn';\nimport useDebounce from 'react-use/lib/useDebounce';\n\nimport { Entity } from '@backstage/catalog-model';\nimport {\n Content,\n ErrorPanel,\n Header,\n Page,\n StatusAborted,\n StatusError,\n StatusOK,\n Table,\n} from '@backstage/core-components';\nimport { useApi } from '@backstage/core-plugin-api';\nimport { catalogApiRef, EntityRefLink } from '@backstage/plugin-catalog-react';\nimport { RequirePermission } from '@backstage/plugin-permission-react';\nimport { SearchContextProvider } from '@backstage/plugin-search-react';\n\nimport { Box, Chip, CircularProgress } from '@material-ui/core';\n\nimport {\n ClusterNodesStatus,\n ClusterOverview,\n ocmClusterReadPermission,\n} from '@backstage-community/plugin-ocm-common';\n\nimport { OcmApiRef } from '../../api';\nimport { ClusterStatusRowData } from '../../types';\nimport { Status, Update } from '../common';\nimport { columns } from './tableHeading';\n\nconst NodeChip = ({\n count,\n indicatorComponent: IndicatorComponent,\n}: {\n count: number;\n indicatorComponent: FC<PropsWithChildren<{}>>;\n}) => {\n if (!count) {\n return null;\n }\n return (\n <Chip\n label={<IndicatorComponent>{count}</IndicatorComponent>}\n variant=\"outlined\"\n />\n );\n};\n\nconst NodeChips = ({ nodes }: { nodes: ClusterNodesStatus[] }) => {\n const readyChipsNodes = nodes.filter(node => node.status === 'True').length;\n // TODO: Check if not ready correctly\n const notReadyNodesCount = nodes.filter(\n node => node.status === 'False',\n ).length;\n\n if (nodes.length === 0) {\n return <>-</>;\n }\n\n return (\n <>\n <NodeChip count={readyChipsNodes} indicatorComponent={StatusOK} />\n <NodeChip count={notReadyNodesCount} indicatorComponent={StatusError} />\n <NodeChip\n count={nodes.length - readyChipsNodes - notReadyNodesCount}\n indicatorComponent={StatusAborted}\n />\n </>\n );\n};\n\nconst CatalogClusters = () => {\n const catalogApi = useApi(catalogApiRef);\n const ocmApi = useApi(OcmApiRef);\n\n const [{ value: clusterEntities, loading, error }, refresh] = useAsyncFn(\n async () => {\n const clusterResourceEntities = await catalogApi.getEntities({\n filter: { kind: 'Resource', 'spec.type': 'kubernetes-cluster' },\n });\n\n const clusters = await ocmApi.getClusters();\n\n if ('error' in clusters) {\n throw new Error(clusters.error.message);\n }\n\n const clusterEntityMappings: Array<{\n cluster: ClusterOverview;\n entity: Entity;\n }> = [];\n clusterResourceEntities.items.forEach(entity => {\n const cluster = (clusters as ClusterOverview[]).find(\n cd => cd.name === entity.metadata.name,\n );\n if (cluster) {\n clusterEntityMappings.push({\n cluster,\n entity,\n });\n }\n });\n return clusterEntityMappings;\n },\n [catalogApi],\n { loading: true },\n );\n useDebounce(refresh, 10);\n\n if (error) {\n return (\n <ErrorPanel\n title=\"Could not fetch clusters from Hub.\"\n error={error}\n defaultExpanded\n />\n );\n }\n\n if (loading) {\n return (\n <div style={{ textAlign: 'center' }}>\n <CircularProgress />\n </div>\n );\n }\n\n const data: ClusterStatusRowData[] = clusterEntities\n ? clusterEntities.map(ce => {\n return {\n name: (\n <EntityRefLink entityRef={ce.entity}>\n {ce.cluster.name}\n </EntityRefLink>\n ),\n status: <Status status={ce.cluster.status} />,\n infrastructure: ce.cluster.platform,\n version: (\n <Update\n data={{\n version: ce.cluster.openshiftVersion,\n update: ce.cluster.update,\n }}\n />\n ),\n nodes: <NodeChips nodes={ce.cluster.nodes} />,\n };\n })\n : [];\n\n return (\n <Table\n options={{ paging: false }}\n data={data}\n columns={columns}\n title=\"All\"\n />\n );\n};\n\nexport const ClusterStatusPage = ({ logo }: { logo?: ReactNode }) => {\n return (\n <SearchContextProvider>\n <RequirePermission permission={ocmClusterReadPermission}>\n <Page themeId=\"clusters\">\n <Header title=\"Your Managed Clusters\" />\n <Content>\n {logo && (\n <Box sx={{ textAlign: 'center', maxHeight: 150, mt: 5, mb: 5 }}>\n {logo}\n </Box>\n )}\n <CatalogClusters />\n </Content>\n </Page>\n </RequirePermission>\n </SearchContextProvider>\n );\n};\n\nexport default ClusterStatusPage;\n"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,8 +1,7 @@
1
- /// <reference types="react" />
2
1
  import * as react_jsx_runtime from 'react/jsx-runtime';
3
2
  import * as react from 'react';
3
+ import { ComponentType } from 'react';
4
4
  import * as _backstage_core_plugin_api from '@backstage/core-plugin-api';
5
- import { IconComponent } from '@backstage/core-plugin-api';
6
5
  import { Cluster } from '@backstage-community/plugin-ocm-common';
7
6
 
8
7
  /**
@@ -20,12 +19,14 @@ declare const OcmPage: ({ logo }: {
20
19
  /**
21
20
  * @public
22
21
  */
23
- declare const OcmIcon: IconComponent;
22
+ declare const OcmIcon: ComponentType<{
23
+ fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
24
+ }>;
24
25
 
25
26
  /**
26
27
  * @public
27
28
  */
28
- declare const ClusterAvailableResourceCard: () => any;
29
+ declare const ClusterAvailableResourceCard: () => react_jsx_runtime.JSX.Element;
29
30
 
30
31
  /**
31
32
  * @public
@@ -47,6 +48,6 @@ declare const useCluster: () => ClusterContextType;
47
48
  /**
48
49
  * @public
49
50
  */
50
- declare const ClusterInfoCard: () => react_jsx_runtime.JSX.Element | null;
51
+ declare const ClusterInfoCard: () => react_jsx_runtime.JSX.Element;
51
52
 
52
53
  export { ClusterAvailableResourceCard, ClusterContextProvider, type ClusterContextType, ClusterInfoCard, OcmIcon, OcmPage, ocmPlugin, useCluster };
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.esm.js","sources":["../src/plugin.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n configApiRef,\n createApiFactory,\n createPlugin,\n createRoutableExtension,\n IconComponent,\n identityApiRef,\n} from '@backstage/core-plugin-api';\n\nimport HubOutlinedIcon from '@mui/icons-material/HubOutlined';\n\nimport { OcmApiClient, OcmApiRef } from './api';\nimport { rootRouteRef } from './routes';\n\n/**\n * @public\n */\nexport const ocmPlugin = createPlugin({\n id: 'ocm',\n routes: {\n root: rootRouteRef,\n },\n apis: [\n createApiFactory({\n api: OcmApiRef,\n deps: {\n configApi: configApiRef,\n identityApi: identityApiRef,\n },\n factory: ({ configApi, identityApi }) =>\n new OcmApiClient({ configApi, identityApi }),\n }),\n ],\n});\n\n/**\n * @public\n */\nexport const OcmPage = ocmPlugin.provide(\n createRoutableExtension({\n name: 'OcmPage',\n component: () =>\n import('./components/ClusterStatusPage').then(m => m.ClusterStatusPage),\n mountPoint: rootRouteRef,\n }),\n);\n\n/**\n * @public\n */\nexport const OcmIcon = HubOutlinedIcon as IconComponent;\n"],"names":[],"mappings":";;;;;AAgCO,MAAM,YAAY,YAAa,CAAA;AAAA,EACpC,EAAI,EAAA,KAAA;AAAA,EACJ,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA;AAAA,GACR;AAAA,EACA,IAAM,EAAA;AAAA,IACJ,gBAAiB,CAAA;AAAA,MACf,GAAK,EAAA,SAAA;AAAA,MACL,IAAM,EAAA;AAAA,QACJ,SAAW,EAAA,YAAA;AAAA,QACX,WAAa,EAAA;AAAA,OACf;AAAA,MACA,OAAA,EAAS,CAAC,EAAE,SAAW,EAAA,WAAA,EACrB,KAAA,IAAI,YAAa,CAAA,EAAE,SAAW,EAAA,WAAA,EAAa;AAAA,KAC9C;AAAA;AAEL,CAAC;AAKM,MAAM,UAAU,SAAU,CAAA,OAAA;AAAA,EAC/B,uBAAwB,CAAA;AAAA,IACtB,IAAM,EAAA,SAAA;AAAA,IACN,SAAA,EAAW,MACT,OAAO,6CAAgC,EAAE,IAAK,CAAA,CAAA,CAAA,KAAK,EAAE,iBAAiB,CAAA;AAAA,IACxE,UAAY,EAAA;AAAA,GACb;AACH;AAKO,MAAM,OAAU,GAAA;;;;"}
1
+ {"version":3,"file":"plugin.esm.js","sources":["../src/plugin.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { ComponentType } from 'react';\n\nimport {\n configApiRef,\n createApiFactory,\n createPlugin,\n createRoutableExtension,\n identityApiRef,\n} from '@backstage/core-plugin-api';\n\nimport HubOutlinedIcon from '@mui/icons-material/HubOutlined';\n\nimport { OcmApiClient, OcmApiRef } from './api';\nimport { rootRouteRef } from './routes';\n\n/**\n * @public\n */\nexport const ocmPlugin = createPlugin({\n id: 'ocm',\n routes: {\n root: rootRouteRef,\n },\n apis: [\n createApiFactory({\n api: OcmApiRef,\n deps: {\n configApi: configApiRef,\n identityApi: identityApiRef,\n },\n factory: ({ configApi, identityApi }) =>\n new OcmApiClient({ configApi, identityApi }),\n }),\n ],\n});\n\n/**\n * @public\n */\nexport const OcmPage = ocmPlugin.provide(\n createRoutableExtension({\n name: 'OcmPage',\n component: () =>\n import('./components/ClusterStatusPage').then(m => m.ClusterStatusPage),\n mountPoint: rootRouteRef,\n }),\n);\n\n/**\n * @public\n */\nexport const OcmIcon = HubOutlinedIcon as ComponentType<{\n fontSize?: 'medium' | 'large' | 'small' | 'inherit';\n}>;\n"],"names":[],"mappings":";;;;;AAiCO,MAAM,YAAY,YAAa,CAAA;AAAA,EACpC,EAAI,EAAA,KAAA;AAAA,EACJ,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA;AAAA,GACR;AAAA,EACA,IAAM,EAAA;AAAA,IACJ,gBAAiB,CAAA;AAAA,MACf,GAAK,EAAA,SAAA;AAAA,MACL,IAAM,EAAA;AAAA,QACJ,SAAW,EAAA,YAAA;AAAA,QACX,WAAa,EAAA;AAAA,OACf;AAAA,MACA,OAAA,EAAS,CAAC,EAAE,SAAW,EAAA,WAAA,EACrB,KAAA,IAAI,YAAa,CAAA,EAAE,SAAW,EAAA,WAAA,EAAa;AAAA,KAC9C;AAAA;AAEL,CAAC;AAKM,MAAM,UAAU,SAAU,CAAA,OAAA;AAAA,EAC/B,uBAAwB,CAAA;AAAA,IACtB,IAAM,EAAA,SAAA;AAAA,IACN,SAAA,EAAW,MACT,OAAO,6CAAgC,EAAE,IAAK,CAAA,CAAA,CAAA,KAAK,EAAE,iBAAiB,CAAA;AAAA,IACxE,UAAY,EAAA;AAAA,GACb;AACH;AAKO,MAAM,OAAU,GAAA;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@backstage-community/plugin-ocm",
3
- "version": "5.14.0",
3
+ "version": "5.15.0",
4
4
  "main": "dist/index.esm.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "license": "Apache-2.0",
@@ -33,16 +33,15 @@
33
33
  "prettier:fix": "prettier --ignore-unknown --write ."
34
34
  },
35
35
  "dependencies": {
36
- "@backstage-community/plugin-ocm-common": "^3.18.0",
36
+ "@backstage-community/plugin-ocm-common": "^3.19.0",
37
37
  "@backstage/catalog-model": "^1.7.6",
38
- "@backstage/core-components": "^0.18.6",
39
- "@backstage/core-plugin-api": "^1.12.2",
38
+ "@backstage/core-components": "^0.18.7",
39
+ "@backstage/core-plugin-api": "^1.12.3",
40
40
  "@backstage/errors": "^1.2.7",
41
- "@backstage/plugin-catalog-react": "^1.21.6",
42
- "@backstage/plugin-home": "^0.9.1",
43
- "@backstage/plugin-permission-react": "^0.4.39",
44
- "@backstage/plugin-search-react": "^1.10.2",
45
- "@backstage/theme": "^0.7.1",
41
+ "@backstage/plugin-catalog-react": "^2.0.0",
42
+ "@backstage/plugin-permission-react": "^0.4.40",
43
+ "@backstage/plugin-search-react": "^1.10.4",
44
+ "@backstage/theme": "^0.7.2",
46
45
  "@material-ui/core": "^4.9.13",
47
46
  "@material-ui/icons": "^4.11.3",
48
47
  "@mui/icons-material": "^5.16.4",
@@ -55,11 +54,11 @@
55
54
  "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
56
55
  },
57
56
  "devDependencies": {
58
- "@backstage/cli": "^0.35.3",
59
- "@backstage/core-app-api": "^1.19.4",
60
- "@backstage/dev-utils": "^1.1.19",
61
- "@backstage/plugin-catalog": "^1.32.2",
62
- "@backstage/test-utils": "^1.7.14",
57
+ "@backstage/cli": "^0.35.4",
58
+ "@backstage/core-app-api": "^1.19.5",
59
+ "@backstage/dev-utils": "^1.1.20",
60
+ "@backstage/plugin-catalog": "^1.33.1",
61
+ "@backstage/test-utils": "^1.7.15",
63
62
  "@testing-library/dom": "^10.0.0",
64
63
  "@testing-library/jest-dom": "^6.0.0",
65
64
  "@testing-library/react": "^15.0.0",