Merge pull request #73 from SamoKopecky/upgrade-indicator-frontend

Resolves operate-first/service-catalog#179
janus-idp · Jan 18, 2023 · 1829123 · 1829123
2 parents dc4d503 + a9c0b73
commit 1829123
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/plugins/ocm/src/components/ClusterInfoCard/ClusterInfoCard.tsx b/plugins/ocm/src/components/ClusterInfoCard/ClusterInfoCard.tsx
@@ -1,15 +1,53 @@
 import React from 'react';
-
+import { Button, Grid, makeStyles, Tooltip } from '@material-ui/core';
+import ArrowUpwardRoundedIcon from '@material-ui/icons/ArrowUpwardRounded';
 import { useCluster } from '../ClusterContext';
 import { TableCardFromData } from '../TableCardFromData';
 
+const useStyles = makeStyles({
+  button: {
+    textTransform: 'none',
+    borderRadius: 16,
+    margin: '0px',
+    paddingLeft: '4px',
+    paddingRight: '4px',
+  },
+});
+
 export const ClusterInfoCard = () => {
   const { data } = useCluster();
+  const classes = useStyles();
 
   if (!data) {
     return null;
   }
 
+  data.openshiftVersion = (
+    <>
+      {data.update?.available ? (
+        <Grid container direction="column" spacing={0}>
+          <Grid item>{data.openshiftVersion}</Grid>
+          <Grid item>
+            <Tooltip title={`Version ${data.update?.version!} available`}>
+              <Button
+                variant="text"
+                color="primary"
+                startIcon={<ArrowUpwardRoundedIcon style={{ fontSize: 22 }} />}
+                className={classes.button}
+                href={data.update?.url}
+                size="small"
+              >
+                Upgrade available
+              </Button>
+            </Tooltip>
+          </Grid>
+        </Grid>
+      ) : (
+        data.openshiftVersion
+      )}
+    </>
+  ) as any;
+
   const nameMap = new Map<string, string>([
     ['name', 'Name'],
     ['kubernetesVersion', 'Kubernetes version'],

diff --git a/plugins/ocm/src/components/TableCardFromData/TableCardFromData.tsx b/plugins/ocm/src/components/TableCardFromData/TableCardFromData.tsx
@@ -18,7 +18,7 @@ const valueFormatter = (value: any): any => {
       return <Link to={value}>{value}</Link>;
     }
   }
-  return value.toString();
+  return value;
 };
 
 export const TableCardFromData = ({
@@ -30,12 +30,12 @@ export const TableCardFromData = ({
   title: string;
   nameMap: Map<string, string>;
 }) => {
-  const parsedData: { name: string; value: string }[] = [];
+  const parsedData: { name: string; value: any }[] = [];
   const entries = Object.entries(data);
 
   nameMap.forEach((_, key) => {
     const entry = entries.find(e => e[0] === key)!;
-    // If key of the map doesnt have an prop in the cluster object, continue
+    // If key of the map doesn't have an prop in the cluster object, continue
     if (entry === undefined) {
       return;
     }