Skip to content

Commit c9e5354

Browse files
authored
Show the DNS helpbox on tenant edit, as is shown in tenant create (#2545)
1 parent 7001067 commit c9e5354

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

portal-ui/src/screens/Console/Tenants/HelpBox/TLSHelpBox.tsx

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import React from "react";
1717
import { useSelector } from "react-redux";
1818
import { Box } from "@mui/material";
1919
import CertificateIcon from "../../../../icons/CertificateIcon";
20+
import { useParams } from "react-router-dom";
2021
import { AppState } from "../../../../store";
2122

2223
const FeatureItem = ({
@@ -46,12 +47,30 @@ const FeatureItem = ({
4647
);
4748
};
4849
const TLSHelpBox = () => {
50+
const params = useParams();
51+
const tenantNameParam = params.tenantName || "";
52+
const tenantNamespaceParam = params.tenantNamespace || "";
4953
const namespace = useSelector((state: AppState) => {
50-
return state.createTenant.fields.nameTenant.namespace || "<namespace>";
54+
var defaultNamespace = "<namespace>";
55+
if (tenantNamespaceParam !== "") {
56+
return tenantNamespaceParam;
57+
}
58+
if (state.createTenant.fields.nameTenant.namespace !== "") {
59+
return state.createTenant.fields.nameTenant.namespace;
60+
}
61+
return defaultNamespace;
5162
});
5263

5364
const tenantName = useSelector((state: AppState) => {
54-
return state.createTenant.fields.nameTenant.tenantName || "<tenant-name>";
65+
var defaultTenantName = "<tenant-name>";
66+
if (tenantNameParam !== "") {
67+
return tenantNameParam;
68+
}
69+
70+
if (state.createTenant.fields.nameTenant.tenantName !== "") {
71+
return state.createTenant.fields.nameTenant.tenantName;
72+
}
73+
return defaultTenantName;
5574
});
5675

5776
return (

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import {
5656
setRunAsNonRoot,
5757
setFSGroupChangePolicy,
5858
} from "../tenantSecurityContextSlice";
59+
import TLSHelpBox from "../HelpBox/TLSHelpBox";
5960
import RemoveIcon from "../../../../icons/RemoveIcon";
6061

6162
interface ITenantSecurity {
@@ -556,6 +557,11 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => {
556557

557558
{enableCustomCerts && (
558559
<Fragment>
560+
{!enableAutoCert && (
561+
<Grid item xs={12}>
562+
<TLSHelpBox />
563+
</Grid>
564+
)}
559565
<Grid item xs={12} className={classes.formFieldRow}>
560566
<h5>MinIO Server Certificates</h5>
561567
</Grid>

0 commit comments

Comments
 (0)