Skip to content

Commit 68ffd08

Browse files
authored
Rework Tenant Details as two columns (#1360)
* Rework Tenant Details as two columns Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> * remove placeholder Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent 9b12f5a commit 68ffd08

File tree

1 file changed

+124
-109
lines changed

1 file changed

+124
-109
lines changed

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

Lines changed: 124 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
containerForHeader,
2525
tenantDetailsStyles,
2626
} from "../../Common/FormComponents/common/styleLibrary";
27-
import { Box, Button, Stack } from "@mui/material";
27+
import { Box, Button, Grid, Stack } from "@mui/material";
2828
import Paper from "@mui/material/Paper";
2929
import { niceBytes } from "../../../../common/utils";
3030
import { ITenant } from "../ListTenants/types";
@@ -36,8 +36,8 @@ import AButton from "../../Common/AButton/AButton";
3636
import { styled } from "@mui/styles";
3737
import SummaryUsageBar from "../../Common/UsageBarWrapper/SummaryUsageBar";
3838
import LabelValuePair from "../../Common/UsageBarWrapper/LabelValuePair";
39-
import StackRow from "../../Common/UsageBarWrapper/StackRow";
4039
import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
40+
import StackRow from "../../Common/UsageBarWrapper/StackRow";
4141

4242
interface ITenantsSummary {
4343
classes: any;
@@ -257,113 +257,128 @@ const TenantSummary = ({
257257

258258
<StorageSummary tenant={tenant} classes={classes} />
259259

260-
<Stack>
261-
<StackRow>
262-
<LabelValuePair label={"Instances:"} value={instances} />
263-
<LabelValuePair
264-
label={"Clusters:"}
265-
value={poolCount}
266-
stkProps={{
267-
style: {
268-
marginRight: 47,
269-
},
270-
}}
271-
/>
272-
</StackRow>
273-
<StackRow>
274-
<LabelValuePair
275-
label={"Endpoint:"}
276-
value={
277-
<a
278-
href={tenant?.endpoints?.minio}
279-
target="_blank"
280-
rel="noopener noreferrer"
281-
className={classes.linkedSection}
282-
>
283-
{tenant?.endpoints?.minio || "-"}
284-
</a>
285-
}
286-
/>
287-
288-
<LabelValuePair
289-
label="Volumes:"
290-
value={volumes}
291-
stkProps={{
292-
style: {
293-
marginRight: 43,
294-
},
295-
}}
296-
/>
297-
</StackRow>
298-
<StackRow>
299-
<LabelValuePair
300-
label="MinIO:"
301-
value={
302-
<AButton
303-
style={{
304-
overflow: "hidden",
305-
textOverflow: "ellipsis",
306-
whiteSpace: "normal",
307-
wordBreak: "break-all",
308-
}}
309-
onClick={() => {
310-
setUpdateMinioVersion(true);
311-
}}
312-
>
313-
{tenant ? tenant.image : ""}
314-
</AButton>
315-
}
316-
/>
317-
<LabelValuePair
318-
label={"Drives Online:"}
319-
value={
320-
tenant?.status?.drives_online ? tenant?.status?.drives_online : 0
321-
}
322-
stkProps={{
323-
style: {
324-
marginRight: 8,
325-
},
326-
}}
327-
/>
328-
</StackRow>
329-
<StackRow>
330-
<LabelValuePair
331-
label={"Console:"}
332-
value={
333-
<a
334-
href={tenant?.endpoints?.console}
335-
target="_blank"
336-
rel="noopener noreferrer"
337-
className={classes.linkedSection}
338-
>
339-
{tenant?.endpoints?.console || "-"}
340-
</a>
341-
}
342-
/>
343-
<LabelValuePair
344-
label={"Drives Offline:"}
345-
value={
346-
tenant?.status?.drives_offline
347-
? tenant?.status?.drives_offline
348-
: 0
349-
}
350-
stkProps={{
351-
style: {
352-
marginRight: 7,
353-
},
354-
}}
355-
/>
356-
</StackRow>
357-
<StackRow>
358-
<LabelValuePair label={"State:"} value={tenant?.currentState} />
359-
<LabelValuePair
360-
label={"Write Quorum:"}
361-
value={
362-
tenant?.status?.write_quorum ? tenant?.status?.write_quorum : 0
363-
}
364-
/>
365-
</StackRow>
366-
</Stack>
260+
<Grid container>
261+
<Grid xs={12} sm={12} md={8} container>
262+
<Grid xs={12}>
263+
<LabelValuePair label={"State:"} value={tenant?.currentState} />
264+
</Grid>
265+
<Grid xs={12}>
266+
<LabelValuePair
267+
label="MinIO:"
268+
value={
269+
<AButton
270+
style={{
271+
overflow: "hidden",
272+
textOverflow: "ellipsis",
273+
whiteSpace: "normal",
274+
wordBreak: "break-all",
275+
}}
276+
onClick={() => {
277+
setUpdateMinioVersion(true);
278+
}}
279+
>
280+
{tenant ? tenant.image : ""}
281+
</AButton>
282+
}
283+
/>
284+
</Grid>
285+
<Grid xs={12}>
286+
<LabelValuePair
287+
label={"Endpoint:"}
288+
value={
289+
<a
290+
href={tenant?.endpoints?.minio}
291+
target="_blank"
292+
rel="noopener noreferrer"
293+
className={classes.linkedSection}
294+
>
295+
{tenant?.endpoints?.minio || "-"}
296+
</a>
297+
}
298+
/>
299+
</Grid>
300+
<Grid xs={12}>
301+
<LabelValuePair
302+
label={"Console:"}
303+
value={
304+
<a
305+
href={tenant?.endpoints?.console}
306+
target="_blank"
307+
rel="noopener noreferrer"
308+
className={classes.linkedSection}
309+
>
310+
{tenant?.endpoints?.console || "-"}
311+
</a>
312+
}
313+
/>
314+
</Grid>
315+
</Grid>
316+
<Grid xs={12} sm={12} md={4} container>
317+
<Grid xs={12}>
318+
<LabelValuePair label={"Instances:"} value={instances} />
319+
</Grid>
320+
<Grid xs={12}>
321+
<LabelValuePair
322+
label={"Clusters:"}
323+
value={poolCount}
324+
stkProps={{
325+
style: {
326+
marginRight: 47,
327+
},
328+
}}
329+
/>
330+
</Grid>
331+
<Grid xs={12}>
332+
<LabelValuePair
333+
label="Total Drives:"
334+
value={volumes}
335+
stkProps={{
336+
style: {
337+
marginRight: 43,
338+
},
339+
}}
340+
/>
341+
</Grid>
342+
<Grid xs={12}>
343+
<LabelValuePair
344+
label={"Write Quorum:"}
345+
value={
346+
tenant?.status?.write_quorum ? tenant?.status?.write_quorum : 0
347+
}
348+
/>
349+
</Grid>
350+
<Grid xs={12}>
351+
<LabelValuePair
352+
label={"Drives Online:"}
353+
value={
354+
tenant?.status?.drives_online
355+
? tenant?.status?.drives_online
356+
: 0
357+
}
358+
stkProps={{
359+
style: {
360+
marginRight: 8,
361+
},
362+
}}
363+
/>
364+
</Grid>
365+
<Grid xs={12}>
366+
<LabelValuePair
367+
label={"Drives Offline:"}
368+
value={
369+
tenant?.status?.drives_offline
370+
? tenant?.status?.drives_offline
371+
: 0
372+
}
373+
stkProps={{
374+
style: {
375+
marginRight: 7,
376+
},
377+
}}
378+
/>
379+
</Grid>
380+
</Grid>
381+
</Grid>
367382

368383
<Stack>
369384
<StackRow

0 commit comments

Comments
 (0)