From 1bb7012d536f03214386f0518798225cd87e56a5 Mon Sep 17 00:00:00 2001
From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
Date: Thu, 4 Nov 2021 13:07:34 -0700
Subject: [PATCH] License Tweaks (#1188)
* License Tweaks
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
* Address comments
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
* Fix react tests
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>
---
portal-ui/src/common/__tests__/utils.test.ts | 12 ++---
portal-ui/src/common/utils.ts | 12 +----
.../src/screens/Console/License/License.tsx | 46 ++++++++++---------
.../src/screens/Console/License/utils.ts | 6 +--
.../TenantDetails/SubnetLicenseTenant.tsx | 2 +-
5 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/portal-ui/src/common/__tests__/utils.test.ts b/portal-ui/src/common/__tests__/utils.test.ts
index 6f6b3f00f..13e6778aa 100644
--- a/portal-ui/src/common/__tests__/utils.test.ts
+++ b/portal-ui/src/common/__tests__/utils.test.ts
@@ -22,15 +22,15 @@ import {
} from "../utils";
test("A variety of formatting results", () => {
- expect(niceBytes("1024")).toBe("1.0 KiB");
- expect(niceBytes("1048576")).toBe("1.0 MiB");
- expect(niceBytes("1073741824")).toBe("1.0 GiB");
+ expect(niceBytes("1024")).toBe("1.0 KB");
+ expect(niceBytes("1048576")).toBe("1.0 MB");
+ expect(niceBytes("1073741824")).toBe("1.0 GB");
});
test("From value and unit to a number of bytes", () => {
- expect(getBytes("1", "KiB")).toBe("1024");
- expect(getBytes("1", "MiB")).toBe("1048576");
- expect(getBytes("1", "GiB")).toBe("1073741824");
+ expect(getBytes("1", "KB")).toBe("1024");
+ expect(getBytes("1", "MB")).toBe("1048576");
+ expect(getBytes("1", "GB")).toBe("1073741824");
});
test("From value and unit to a number of bytes for kubernetes", () => {
diff --git a/portal-ui/src/common/utils.ts b/portal-ui/src/common/utils.ts
index 8a7c884ca..6ff4e1c1e 100644
--- a/portal-ui/src/common/utils.ts
+++ b/portal-ui/src/common/utils.ts
@@ -21,17 +21,7 @@ import { IPool } from "../screens/Console/Tenants/ListTenants/types";
const minStReq = 1073741824; // Minimal Space required for MinIO
const minMemReq = 2147483648; // Minimal Memory required for MinIO in bytes
-export const units = [
- "B",
- "KiB",
- "MiB",
- "GiB",
- "TiB",
- "PiB",
- "EiB",
- "ZiB",
- "YiB",
-];
+export const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
export const k8sUnits = ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei"];
export const k8sCalcUnits = ["B", ...k8sUnits];
diff --git a/portal-ui/src/screens/Console/License/License.tsx b/portal-ui/src/screens/Console/License/License.tsx
index 420132399..04c765446 100644
--- a/portal-ui/src/screens/Console/License/License.tsx
+++ b/portal-ui/src/screens/Console/License/License.tsx
@@ -479,27 +479,10 @@ const License = ({ classes, operatorMode }: ILicenseProps) => {
>
{niceBytes(
(licenseInfo.storage_capacity * 1099511627776) // 1 Terabyte = 1099511627776 Bytes
- .toString(10)
+ .toString(10),
+ false
)}
-
- Expiry Date
-
-
-
- {licenseInfo.expires_at}
-
-
{
gutterBottom
className={classes.licenseInfoTitle}
>
- Requester
+ Requestor
{
>
{licenseInfo.email}
+
+ Expiry Date
+
+
+
+ {licenseInfo.expires_at
+ .split(" ")
+ .slice(0, 1)
+ .join(" ")}
+
+
![]()
{
refreshLicense();
}}
>
- Refresh Licence
+ Refresh License
{loadingRefreshLicense && (
- Requester
+ Requestor