Skip to content

Commit 37ff8bb

Browse files
authored
Fix Tenant Details header (#420)
Also renames zones to servers
1 parent b6ac055 commit 37ff8bb

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
import React, { useState, useEffect } from "react";
1818
import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
19-
import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
19+
import {
20+
containerForHeader,
21+
modalBasic,
22+
} from "../../Common/FormComponents/common/styleLibrary";
2023
import Grid from "@material-ui/core/Grid";
2124
import Typography from "@material-ui/core/Typography";
2225
import { Button } from "@material-ui/core";
@@ -34,6 +37,7 @@ import api from "../../../../common/api";
3437
import { ITenant, IZone } from "../ListTenants/types";
3538
import Logs from "./Logs/Logs";
3639
import Trace from "./Trace/Trace";
40+
import PageHeader from "../../Common/PageHeader/PageHeader";
3741

3842
interface ITenantDetailsProps {
3943
classes: any;
@@ -90,13 +94,14 @@ const styles = (theme: Theme) =>
9094
textAlign: "right",
9195
},
9296
...modalBasic,
97+
...containerForHeader(theme.spacing(4)),
9398
});
9499

95100
const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
96101
const [selectedTab, setSelectedTab] = useState<number>(0);
97102
const [capacity, setCapacity] = useState<number>(0);
98103
const [zoneCount, setZoneCount] = useState<number>(0);
99-
const [zones, setZones] = useState<IZone[]>([]);
104+
const [serverSets, setServerSets] = useState<IZone[]>([]);
100105
const [instances, setInstances] = useState<number>(0);
101106
const [volumes, setVolumes] = useState<number>(0);
102107
const [addZoneOpen, setAddZone] = useState<boolean>(false);
@@ -157,7 +162,7 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
157162
setVolumes(totalVolumes);
158163
setInstances(totalInstances);
159164

160-
setZones(resZones);
165+
setServerSets(resZones);
161166

162167
setTenant(res);
163168
setError("");
@@ -193,12 +198,9 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
193198
closeModalAndRefresh={closeReplicationAndRefresh}
194199
/>
195200
)}
201+
<PageHeader label={`Tenant > ${match.params["tenantName"]}`} />
202+
<Grid item xs={12} className={classes.container} />
196203
<Grid container>
197-
<Grid item xs={12}>
198-
<Typography variant="h6">
199-
{`Tenant > ${match.params["tenantName"]}`}
200-
</Typography>
201-
</Grid>
202204
{error !== "" && (
203205
<Grid item xs={12}>
204206
{error}
@@ -214,7 +216,7 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
214216
<div>{niceBytes(capacity.toString(10))}</div>
215217
<div>Minio:</div>
216218
<div>{tenant ? tenant.image : ""}</div>
217-
<div>Zones:</div>
219+
<div>Clusters:</div>
218220
<div>{zoneCount}</div>
219221
<div>Console:</div>
220222
<div>{tenant ? tenant.console_image : ""}</div>
@@ -238,7 +240,7 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
238240
}}
239241
aria-label="tenant-tabs"
240242
>
241-
<Tab label="Zones" />
243+
<Tab label="Clusters" />
242244
<Tab label="Logs" />
243245
<Tab label="Trace" />
244246
</Tabs>
@@ -252,7 +254,7 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
252254
setAddZone(true);
253255
}}
254256
>
255-
Add Zone
257+
Expand Tenant
256258
</Button>
257259
</Grid>
258260
<Grid item xs={12}>
@@ -277,8 +279,8 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
277279
{ label: "# of Drives", elementKey: "volumes" },
278280
]}
279281
isLoading={false}
280-
records={zones}
281-
entityName="Zones"
282+
records={serverSets}
283+
entityName="Servers"
282284
idField="name"
283285
/>
284286
)}

0 commit comments

Comments
 (0)