@@ -17,6 +17,7 @@ import React from "react";
17
17
import { useSelector } from "react-redux" ;
18
18
import { Box } from "@mui/material" ;
19
19
import CertificateIcon from "../../../../icons/CertificateIcon" ;
20
+ import { useParams } from "react-router-dom" ;
20
21
import { AppState } from "../../../../store" ;
21
22
22
23
const FeatureItem = ( {
@@ -46,12 +47,30 @@ const FeatureItem = ({
46
47
) ;
47
48
} ;
48
49
const TLSHelpBox = ( ) => {
50
+ const params = useParams ( ) ;
51
+ const tenantNameParam = params . tenantName || "" ;
52
+ const tenantNamespaceParam = params . tenantNamespace || "" ;
49
53
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 ;
51
62
} ) ;
52
63
53
64
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 ;
55
74
} ) ;
56
75
57
76
return (
0 commit comments