From 759f149c991922cd104a80917a6f9a552712188d Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Thu, 12 Oct 2023 09:37:42 -0700 Subject: [PATCH] Fix Tenant Usage Text Size Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- .../Tenants/ListTenants/ListTenants.tsx | 70 ++++++++----------- .../Tenants/ListTenants/TenantCapacity.tsx | 2 +- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx b/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx index f1d685f7351..d388b5c31fe 100644 --- a/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx +++ b/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx @@ -18,13 +18,7 @@ import React, { Fragment, useEffect, useState } from "react"; import { AddIcon, Button, HelpBox, RefreshIcon, TenantsIcon } from "mds"; import Grid from "@mui/material/Grid"; import { LinearProgress, SelectChangeEvent } from "@mui/material"; -import { Theme } from "@mui/material/styles"; import { NewServiceAccount } from "../../Common/CredentialsPrompt/types"; -import { - actionsTray, - containerForHeader, - searchField, -} from "../../Common/FormComponents/common/styleLibrary"; import TenantListItem from "./TenantListItem"; import AButton from "../../Common/AButton/AButton"; @@ -38,7 +32,6 @@ import { useNavigate } from "react-router-dom"; import { useAppDispatch } from "../../../../store"; import TooltipWrapper from "../../Common/TooltipWrapper/TooltipWrapper"; import PageHeaderWrapper from "../../Common/PageHeaderWrapper/PageHeaderWrapper"; -import makeStyles from "@mui/styles/makeStyles"; import { api } from "../../../../api"; import { Error, @@ -51,38 +44,9 @@ const CredentialsPrompt = withSuspense( React.lazy(() => import("../../Common/CredentialsPrompt/CredentialsPrompt")), ); -const useStyles = makeStyles((theme: Theme) => ({ - ...actionsTray, - ...searchField, - ...containerForHeader, - tenantsList: { - height: "calc(100vh - 195px)", - }, - sortByContainer: { - display: "flex", - justifyContent: "flex-end", - marginBottom: 10, - }, - innerSort: { - maxWidth: 200, - width: "95%", - display: "flex", - flexDirection: "row", - alignItems: "center", - }, - sortByLabel: { - whiteSpace: "nowrap", - fontSize: 14, - color: "#838383", - fontWeight: "bold", - marginRight: 10, - }, -})); - const ListTenants = () => { const dispatch = useAppDispatch(); const navigate = useNavigate(); - const classes = useStyles(); const [isLoading, setIsLoading] = useState(false); const [filterTenants, setFilterTenants] = useState(""); @@ -263,15 +227,41 @@ const ListTenants = () => { } /> - + {isLoading && } {!isLoading && ( {filteredRecords.length !== 0 && ( - -
- Sort by + +
+ + Sort by + {!isNaN(totalUsedSpace) ? niceBytesInt(totalUsedSpace) : "N/A"}