Added version card to BasicDashboard (minio#1013)

* Added version card to BasicDashboard * Added length check for servers array on version card render Co-authored-by: Daniel Valdivia <[email protected]> Co-authored-by: Alex <[email protected]>
bexsoft · Sep 8, 2021 · f229fee · f229fee
1 parent 21b3ed6
commit f229fee
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 296 deletions.
diff --git a/portal-ui/build/asset-manifest.json b/portal-ui/build/asset-manifest.json
@@ -1,23 +1,23 @@
 {
   "files": {
     "main.css": "./static/css/main.8cfac526.chunk.css",
-    "main.js": "./static/js/main.61c4f512.chunk.js",
-    "main.js.map": "./static/js/main.61c4f512.chunk.js.map",
+    "main.js": "./static/js/main.b5bda04a.chunk.js",
+    "main.js.map": "./static/js/main.b5bda04a.chunk.js.map",
     "runtime-main.js": "./static/js/runtime-main.3fe0c1ac.js",
     "runtime-main.js.map": "./static/js/runtime-main.3fe0c1ac.js.map",
     "static/css/2.c5a51b70.chunk.css": "./static/css/2.c5a51b70.chunk.css",
-    "static/js/2.13f2adb3.chunk.js": "./static/js/2.13f2adb3.chunk.js",
-    "static/js/2.13f2adb3.chunk.js.map": "./static/js/2.13f2adb3.chunk.js.map",
+    "static/js/2.258e3af7.chunk.js": "./static/js/2.258e3af7.chunk.js",
+    "static/js/2.258e3af7.chunk.js.map": "./static/js/2.258e3af7.chunk.js.map",
     "index.html": "./index.html",
     "static/css/2.c5a51b70.chunk.css.map": "./static/css/2.c5a51b70.chunk.css.map",
     "static/css/main.8cfac526.chunk.css.map": "./static/css/main.8cfac526.chunk.css.map",
-    "static/js/2.13f2adb3.chunk.js.LICENSE.txt": "./static/js/2.13f2adb3.chunk.js.LICENSE.txt"
+    "static/js/2.258e3af7.chunk.js.LICENSE.txt": "./static/js/2.258e3af7.chunk.js.LICENSE.txt"
   },
   "entrypoints": [
     "static/js/runtime-main.3fe0c1ac.js",
     "static/css/2.c5a51b70.chunk.css",
-    "static/js/2.13f2adb3.chunk.js",
+    "static/js/2.258e3af7.chunk.js",
     "static/css/main.8cfac526.chunk.css",
-    "static/js/main.61c4f512.chunk.js"
+    "static/js/main.b5bda04a.chunk.js"
   ]
 }
diff --git a/portal-ui/build/index.html b/portal-ui/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MinIO Console"/><link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet"/><link href="./styles/root-styles.css" rel="stylesheet"/><link rel="apple-touch-icon" sizes="180x180" href="./apple-icon-180x180.png"/><link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png"/><link rel="icon" type="image/png" sizes="96x96" href="./favicon-96x96.png"/><link rel="icon" type="image/png" sizes="16x16" href="./favicon-16x16.png"/><link rel="manifest" href="./manifest.json"/><link rel="mask-icon" href="./safari-pinned-tab.svg" color="#3a4e54"/><title>MinIO Console</title><link href="./static/css/2.c5a51b70.chunk.css" rel="stylesheet"><link href="./static/css/main.8cfac526.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"><div id="loader-block"><svg class="loader-svg-container" viewBox="22 22 44 44"><circle class="loader-style MuiCircularProgress-circle MuiCircularProgress-circleIndeterminate" cx="44" cy="44" r="20.2" fill="none" stroke-width="3.6"></circle></svg></div></div><script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="./";var i=this["webpackJsonpportal-ui"]=this["webpackJsonpportal-ui"]||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="./static/js/2.13f2adb3.chunk.js"></script><script src="./static/js/main.61c4f512.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MinIO Console"/><link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet"/><link href="./styles/root-styles.css" rel="stylesheet"/><link rel="apple-touch-icon" sizes="180x180" href="./apple-icon-180x180.png"/><link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png"/><link rel="icon" type="image/png" sizes="96x96" href="./favicon-96x96.png"/><link rel="icon" type="image/png" sizes="16x16" href="./favicon-16x16.png"/><link rel="manifest" href="./manifest.json"/><link rel="mask-icon" href="./safari-pinned-tab.svg" color="#3a4e54"/><title>MinIO Console</title><link href="./static/css/2.c5a51b70.chunk.css" rel="stylesheet"><link href="./static/css/main.8cfac526.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"><div id="loader-block"><svg class="loader-svg-container" viewBox="22 22 44 44"><circle class="loader-style MuiCircularProgress-circle MuiCircularProgress-circleIndeterminate" cx="44" cy="44" r="20.2" fill="none" stroke-width="3.6"></circle></svg></div></div><script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="./";var i=this["webpackJsonpportal-ui"]=this["webpackJsonpportal-ui"]||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="./static/js/2.258e3af7.chunk.js"></script><script src="./static/js/main.b5bda04a.chunk.js"></script></body></html>
diff --git a/portal-ui/build/static/js/2.13f2adb3.chunk.js b/portal-ui/build/static/js/2.13f2adb3.chunk.js
diff --git a/portal-ui/build/static/js/2.13f2adb3.chunk.js.LICENSE.txt b/portal-ui/build/static/js/2.13f2adb3.chunk.js.LICENSE.txt
diff --git a/portal-ui/build/static/js/2.13f2adb3.chunk.js.map b/portal-ui/build/static/js/2.13f2adb3.chunk.js.map
diff --git a/portal-ui/build/static/js/main.61c4f512.chunk.js b/portal-ui/build/static/js/main.61c4f512.chunk.js
diff --git a/portal-ui/build/static/js/main.61c4f512.chunk.js.map b/portal-ui/build/static/js/main.61c4f512.chunk.js.map
diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx
@@ -87,6 +87,7 @@ const BasicDashboard = ({ classes, usage }: IDashboardProps) => {
     return usage.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
   };
 
+
   const makeServerArray = (usage: Usage | null) => {
     if (usage != null) {
       return usage.servers.sort(function (a, b) {
@@ -138,9 +139,20 @@ const BasicDashboard = ({ classes, usage }: IDashboardProps) => {
                 />
               </Card>
             </Grid>
+
+            <Grid item xs={6}>
+              <Card className={classes.cardRoot}>
+                {usage ? usage.servers.length !== 0 && 
+                <CardHeader
+                  avatar={<TotalObjectsIcon />}
+                  title="MinIO Version"
+                  subheader={usage ? usage.servers[0].version : 0}
+                /> : 0}
+              </Card>
+            </Grid>
             <Grid item xs={6} />
           </Grid>
-
+          
           <Grid item xs={12}>
             <Grid container alignItems="center" spacing={2}>
               <Grid item>