From b8122ec2bdc69be9fca2f04befb1f61374d41051 Mon Sep 17 00:00:00 2001 From: adfost Date: Wed, 23 Feb 2022 09:37:26 -0800 Subject: [PATCH] Pods Summary UI improvements (#1449) --- .../screens/Console/Storage/StoragePVCs.tsx | 2 +- .../Tenants/TenantDetails/PodsSummary.tsx | 35 ++++++++++++++++--- .../Tenants/TenantDetails/VolumesSummary.tsx | 23 ++++-------- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/portal-ui/src/screens/Console/Storage/StoragePVCs.tsx b/portal-ui/src/screens/Console/Storage/StoragePVCs.tsx index d1fd14a3f..503d864a8 100644 --- a/portal-ui/src/screens/Console/Storage/StoragePVCs.tsx +++ b/portal-ui/src/screens/Console/Storage/StoragePVCs.tsx @@ -77,7 +77,7 @@ const StorageVolumes = ({ }, [loading, setErrorSnackMessage]); const filteredRecords: IStoragePVCs[] = records.filter((elementItem) => - elementItem.name.includes(filter) + elementItem.name.toLowerCase().includes(filter.toLowerCase()) ); const confirmDeletePVC = (pvcItem: IStoragePVCs) => { diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx index 670cab89c..0d8791796 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx @@ -33,7 +33,8 @@ import { AppState } from "../../../../store"; import { setTenantDetailsLoad } from "../actions"; import { ErrorResponseHandler } from "../../../../common/types"; import DeletePod from "./DeletePod"; -import { Grid } from "@mui/material"; +import {Grid, InputAdornment, TextField} from "@mui/material"; +import SearchIcon from "../../../../icons/SearchIcon"; interface IPodsSummary { classes: any; @@ -60,7 +61,7 @@ const PodsSummary = ({ const [loadingPods, setLoadingPods] = useState(true); const [deleteOpen, setDeleteOpen] = useState(false); const [selectedPod, setSelectedPod] = useState(null); - + const [filter, setFilter] = useState(""); const tenantName = match.params["tenantName"]; const tenantNamespace = match.params["tenantNamespace"]; @@ -83,6 +84,10 @@ const PodsSummary = ({ setDeleteOpen(true); }; + const filteredRecords: IPodListElement[] = pods.filter((elementItem) => + elementItem.name.toLowerCase().includes(filter.toLowerCase()) + ); + const podTableActions = [ { type: "view", onClick: podViewAction }, { type: "delete", onClick: confirmDeletePod }, @@ -130,10 +135,30 @@ const PodsSummary = ({ /> )}

Pods

+ + + + + ), + }} + onChange={(e) => { + setFilter(e.target.value); + }} + variant="standard" + /> + diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx index b1cb09f80..e65a79ee2 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx @@ -22,10 +22,8 @@ import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; import { Grid, InputAdornment, TextField } from "@mui/material"; import { - actionsTray, containerForHeader, - searchField, - tableStyles, + tableStyles, tenantDetailsStyles, } from "../../Common/FormComponents/common/styleLibrary"; import { IStoragePVCs } from "../../Storage/types"; import { setErrorSnackMessage } from "../../../../actions"; @@ -50,15 +48,11 @@ interface ITenantVolumesProps { } const styles = (theme: Theme) => - createStyles({ - tableWrapper: { - height: "450px", - }, - ...actionsTray, - ...searchField, - ...tableStyles, - ...containerForHeader(theme.spacing(4)), - }); + createStyles({ + ...tenantDetailsStyles, + ...tableStyles, + ...containerForHeader(theme.spacing(4)), + }); const TenantVolumes = ({ classes, @@ -106,7 +100,7 @@ const TenantVolumes = ({ }; const filteredRecords: IStoragePVCs[] = records.filter((elementItem) => - elementItem.name.includes(filter) + elementItem.name.toLowerCase().includes(filter.toLowerCase()) ); const PVCViewAction = (PVC: IPodListElement) => { @@ -157,9 +151,6 @@ const TenantVolumes = ({ variant="standard" /> - -
-