{
+ const targetD = e.target;
+ const checked = targetD.checked;
+ updateField("kesSecurityContext", {
+ ...kesSecurityContext,
+ runAsNonRoot: checked,
+ });
+ }}
+ label={"Do not run as Root"}
+ />
+
+
+ )}
+
);
};
-export default withStyles(styles)(Encryption);
+export default Encryption;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx
index 5528f30429c..d7afdf21d72 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx
@@ -15,19 +15,9 @@
// along with this program. If not, see
-
- ) => {
+ updateField("awsEndpoint", e.target.value);
+ cleanValidation("aws_endpoint");
+ }}
+ label="Endpoint"
+ tooltip="Endpoint is the AWS SecretsManager endpoint. AWS SecretsManager endpoints have the following schema: secrestmanager[-fips]..amanzonaws.com"
+ value={awsEndpoint}
+ error={validationErrors["aws_endpoint"] || ""}
+ required
+ />
+ ) => {
+ updateField("awsRegion", e.target.value);
+ cleanValidation("aws_region");
+ }}
+ label="Region"
+ tooltip="Region is the AWS region the SecretsManager is located"
+ value={awsRegion}
+ error={validationErrors["aws_region"] || ""}
+ required
+ />
+ ) => {
+ updateField("awsKMSKey", e.target.value);
+ }}
+ label="KMS Key"
+ tooltip="KMSKey is the AWS-KMS key ID (CMK-ID) used to en/decrypt secrets managed by the SecretsManager. If empty, the default AWS KMS key is used"
+ value={awsKMSKey}
+ />
+
+ Credentials
+ ) => {
- updateField("awsEndpoint", e.target.value);
- cleanValidation("aws_endpoint");
+ updateField("awsAccessKey", e.target.value);
+ cleanValidation("aws_accessKey");
}}
- label="Endpoint"
- tooltip="Endpoint is the AWS SecretsManager endpoint. AWS SecretsManager endpoints have the following schema: secrestmanager[-fips]..amanzonaws.com"
- value={awsEndpoint}
- error={validationErrors["aws_endpoint"] || ""}
+ label="Access Key"
+ tooltip="AccessKey is the access key for authenticating to AWS"
+ value={awsAccessKey}
+ error={validationErrors["aws_accessKey"] || ""}
required
/>
-
-
- ) => {
- updateField("awsRegion", e.target.value);
- cleanValidation("aws_region");
+ updateField("awsSecretKey", e.target.value);
+ cleanValidation("aws_secretKey");
}}
- label="Region"
- tooltip="Region is the AWS region the SecretsManager is located"
- value={awsRegion}
- error={validationErrors["aws_region"] || ""}
+ label="Secret Key"
+ tooltip="SecretKey is the secret key for authenticating to AWS"
+ value={awsSecretKey}
+ error={validationErrors["aws_secretKey"] || ""}
required
/>
-
-
- ) => {
- updateField("awsKMSKey", e.target.value);
+ updateField("awsToken", e.target.value);
}}
- label="KMS Key"
- tooltip="KMSKey is the AWS-KMS key ID (CMK-ID) used to en/decrypt secrets managed by the SecretsManager. If empty, the default AWS KMS key is used"
- value={awsKMSKey}
+ label="Token"
+ value={awsToken}
/>
-
-
-
- Credentials
-
- ) => {
- updateField("awsAccessKey", e.target.value);
- cleanValidation("aws_accessKey");
- }}
- label="Access Key"
- tooltip="AccessKey is the access key for authenticating to AWS"
- value={awsAccessKey}
- error={validationErrors["aws_accessKey"] || ""}
- required
- />
-
-
- ) => {
- updateField("awsSecretKey", e.target.value);
- cleanValidation("aws_secretKey");
- }}
- label="Secret Key"
- tooltip="SecretKey is the secret key for authenticating to AWS"
- value={awsSecretKey}
- error={validationErrors["aws_secretKey"] || ""}
- required
- />
-
-
- ) => {
- updateField("awsToken", e.target.value);
- }}
- label="Token"
- value={awsToken}
- />
-
-
-
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx
index a969eb12e38..4c301c6ec75 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx
@@ -15,19 +15,9 @@
// along with this program. If not, see
-
- ) => {
+ updateField("azureEndpoint", e.target.value);
+ cleanValidation("azure_endpoint");
+ }}
+ label="Endpoint"
+ tooltip="Endpoint is the Azure KeyVault endpoint"
+ value={azureEndpoint}
+ error={validationErrors["azure_endpoint"] || ""}
+ />
+
+ Credentials
+ ) => {
+ updateField("azureTenantID", e.target.value);
+ cleanValidation("azure_tenant_id");
+ }}
+ label="Tenant ID"
+ tooltip="TenantID is the ID of the Azure KeyVault tenant"
+ value={azureTenantID}
+ error={validationErrors["azure_tenant_id"] || ""}
+ />
+ ) => {
+ updateField("azureClientID", e.target.value);
+ cleanValidation("azure_client_id");
+ }}
+ label="Client ID"
+ tooltip="ClientID is the ID of the client accessing Azure KeyVault"
+ value={azureClientID}
+ error={validationErrors["azure_client_id"] || ""}
+ />
+ ) => {
- updateField("azureEndpoint", e.target.value);
- cleanValidation("azure_endpoint");
+ updateField("azureClientSecret", e.target.value);
+ cleanValidation("azure_client_secret");
}}
- label="Endpoint"
- tooltip="Endpoint is the Azure KeyVault endpoint"
- value={azureEndpoint}
- error={validationErrors["azure_endpoint"] || ""}
+ label="Client Secret"
+ tooltip="ClientSecret is the client secret accessing the Azure KeyVault"
+ value={azureClientSecret}
+ error={validationErrors["azure_client_secret"] || ""}
/>
-
-
-
- Credentials
-
- ) => {
- updateField("azureTenantID", e.target.value);
- cleanValidation("azure_tenant_id");
- }}
- label="Tenant ID"
- tooltip="TenantID is the ID of the Azure KeyVault tenant"
- value={azureTenantID}
- error={validationErrors["azure_tenant_id"] || ""}
- />
-
-
- ) => {
- updateField("azureClientID", e.target.value);
- cleanValidation("azure_client_id");
- }}
- label="Client ID"
- tooltip="ClientID is the ID of the client accessing Azure KeyVault"
- value={azureClientID}
- error={validationErrors["azure_client_id"] || ""}
- />
-
-
- ) => {
- updateField("azureClientSecret", e.target.value);
- cleanValidation("azure_client_secret");
- }}
- label="Client Secret"
- tooltip="ClientSecret is the client secret accessing the Azure KeyVault"
- value={azureClientSecret}
- error={validationErrors["azure_client_secret"] || ""}
- />
-
-
-
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx
index 58877ac5297..0d10be6971b 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx
@@ -15,32 +15,12 @@
// along with this program. If not, see
-
- ) => {
+ updateField("gcpProjectID", e.target.value);
+ }}
+ label="Project ID"
+ tooltip="ProjectID is the GCP project ID."
+ value={gcpProjectID}
+ />
+ ) => {
+ updateField("gcpEndpoint", e.target.value);
+ }}
+ label="Endpoint"
+ tooltip="Endpoint is the GCP project ID. If empty defaults to: secretmanager.googleapis.com:443"
+ value={gcpEndpoint}
+ />
+
+ Credentials
+ ) => {
+ updateField("gcpClientEmail", e.target.value);
+ }}
+ label="Client Email"
+ tooltip="Is the Client email of the GCP service account used to access the SecretManager"
+ value={gcpClientEmail}
+ />
+ ) => {
+ updateField("gcpClientID", e.target.value);
+ }}
+ label="Client ID"
+ tooltip="Is the Client ID of the GCP service account used to access the SecretManager"
+ value={gcpClientID}
+ />
+ ) => {
- updateField("gcpProjectID", e.target.value);
+ updateField("gcpPrivateKeyID", e.target.value);
}}
- label="Project ID"
- tooltip="ProjectID is the GCP project ID."
- value={gcpProjectID}
+ label="Private Key ID"
+ tooltip="Is the private key ID of the GCP service account used to access the SecretManager"
+ value={gcpPrivateKeyID}
/>
-
-
- ) => {
- updateField("gcpEndpoint", e.target.value);
+ updateField("gcpPrivateKey", e.target.value);
}}
- label="Endpoint"
- tooltip="Endpoint is the GCP project ID. If empty defaults to: secretmanager.googleapis.com:443"
- value={gcpEndpoint}
+ label="Private Key"
+ tooltip="Is the private key of the GCP service account used to access the SecretManager"
+ value={gcpPrivateKey}
/>
-
-
-
- Credentials
-
- ) => {
- updateField("gcpClientEmail", e.target.value);
- }}
- label="Client Email"
- tooltip="Is the Client email of the GCP service account used to access the SecretManager"
- value={gcpClientEmail}
- />
-
-
- ) => {
- updateField("gcpClientID", e.target.value);
- }}
- label="Client ID"
- tooltip="Is the Client ID of the GCP service account used to access the SecretManager"
- value={gcpClientID}
- />
-
-
- ) => {
- updateField("gcpPrivateKeyID", e.target.value);
- }}
- label="Private Key ID"
- tooltip="Is the private key ID of the GCP service account used to access the SecretManager"
- value={gcpPrivateKeyID}
- />
-
-
- ) => {
- updateField("gcpPrivateKey", e.target.value);
- }}
- label="Private Key"
- tooltip="Is the private key of the GCP service account used to access the SecretManager"
- value={gcpPrivateKey}
- />
-
-
-
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx
index 0457fc78fd9..418ff4bc482 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx
@@ -15,19 +15,9 @@
// along with this program. If not, see
-
- ) => {
+ updateField("gemaltoEndpoint", e.target.value);
+ cleanValidation("gemalto_endpoint");
+ }}
+ label="Endpoint"
+ tooltip="Endpoint is the endpoint to the KeySecure server"
+ value={gemaltoEndpoint}
+ error={validationErrors["gemalto_endpoint"] || ""}
+ required
+ />
+
+ Credentials
+ ) => {
- updateField("gemaltoEndpoint", e.target.value);
- cleanValidation("gemalto_endpoint");
+ updateField("gemaltoToken", e.target.value);
+ cleanValidation("gemalto_token");
}}
- label="Endpoint"
- tooltip="Endpoint is the endpoint to the KeySecure server"
- value={gemaltoEndpoint}
- error={validationErrors["gemalto_endpoint"] || ""}
+ label="Token"
+ tooltip="Token is the refresh authentication token to access the KeySecure server"
+ value={gemaltoToken}
+ error={validationErrors["gemalto_token"] || ""}
required
/>
-
-
-
- Credentials
-
- ) => {
- updateField("gemaltoToken", e.target.value);
- cleanValidation("gemalto_token");
- }}
- label="Token"
- tooltip="Token is the refresh authentication token to access the KeySecure server"
- value={gemaltoToken}
- error={validationErrors["gemalto_token"] || ""}
- required
- />
-
-
- ) => {
- updateField("gemaltoDomain", e.target.value);
- cleanValidation("gemalto_domain");
- }}
- label="Domain"
- tooltip="Domain is the isolated namespace within the KeySecure server. If empty, defaults to the top-level / root domain"
- value={gemaltoDomain}
- error={validationErrors["gemalto_domain"] || ""}
- required
- />
-
-
- ) => {
- updateField("gemaltoRetry", e.target.value);
- cleanValidation("gemalto_retry");
- }}
- label="Retry (seconds)"
- value={gemaltoRetry}
- error={validationErrors["gemalto_retry"] || ""}
- />
-
-
-
+ ) => {
+ updateField("gemaltoDomain", e.target.value);
+ cleanValidation("gemalto_domain");
+ }}
+ label="Domain"
+ tooltip="Domain is the isolated namespace within the KeySecure server. If empty, defaults to the top-level / root domain"
+ value={gemaltoDomain}
+ error={validationErrors["gemalto_domain"] || ""}
+ required
+ />
+ ) => {
+ updateField("gemaltoRetry", e.target.value);
+ cleanValidation("gemalto_retry");
+ }}
+ label="Retry (seconds)"
+ value={gemaltoRetry}
+ error={validationErrors["gemalto_retry"] || ""}
+ />
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx
index 948009f872b..bfce98ba47b 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx
@@ -15,39 +15,18 @@
// along with this program. If not, see
-
- ) => {
+ updateField("vaultEndpoint", e.target.value);
+ cleanValidation("vault_endpoint");
+ }}
+ label="Endpoint"
+ tooltip="Endpoint is the Hashicorp Vault endpoint"
+ value={vaultEndpoint}
+ error={validationErrors["vault_endpoint"] || ""}
+ required
+ />
+ ) => {
+ updateField("vaultEngine", e.target.value);
+ cleanValidation("vault_engine");
+ }}
+ label="Engine"
+ tooltip="Engine is the Hashicorp Vault K/V engine path. If empty, defaults to 'kv'"
+ value={vaultEngine}
+ />
+ ) => {
+ updateField("vaultNamespace", e.target.value);
+ }}
+ label="Namespace"
+ tooltip="Namespace is an optional Hashicorp Vault namespace. An empty namespace means no particular namespace is used."
+ value={vaultNamespace}
+ />
+ ) => {
+ updateField("vaultPrefix", e.target.value);
+ }}
+ label="Prefix"
+ tooltip="Prefix is an optional prefix / directory within the K/V engine. If empty, keys will be stored at the K/V engine top level"
+ value={vaultPrefix}
+ />
+
+ App Role
+ ) => {
+ updateField("vaultAppRoleEngine", e.target.value);
+ }}
+ label="Engine"
+ tooltip="AppRoleEngine is the AppRole authentication engine path. If empty, defaults to 'approle'"
+ value={vaultAppRoleEngine}
+ />
+ ) => {
- updateField("vaultEndpoint", e.target.value);
- cleanValidation("vault_endpoint");
+ updateField("vaultId", e.target.value);
+ cleanValidation("vault_id");
}}
- label="Endpoint"
- tooltip="Endpoint is the Hashicorp Vault endpoint"
- value={vaultEndpoint}
- error={validationErrors["vault_endpoint"] || ""}
+ label="AppRole ID"
+ tooltip="AppRoleSecret is the AppRole access secret for authenticating to Hashicorp Vault via the AppRole method"
+ value={vaultId}
+ error={validationErrors["vault_id"] || ""}
required
/>
-
-
- ) => {
- updateField("vaultEngine", e.target.value);
- cleanValidation("vault_engine");
+ updateField("vaultSecret", e.target.value);
+ cleanValidation("vault_secret");
}}
- label="Engine"
- tooltip="Engine is the Hashicorp Vault K/V engine path. If empty, defaults to 'kv'"
- value={vaultEngine}
+ label="AppRole Secret"
+ tooltip="AppRoleSecret is the AppRole access secret for authenticating to Hashicorp Vault via the AppRole method"
+ value={vaultSecret}
+ error={validationErrors["vault_secret"] || ""}
+ required
/>
-
-
- ) => {
- updateField("vaultNamespace", e.target.value);
+ updateField("vaultRetry", e.target.value);
+ cleanValidation("vault_retry");
}}
- label="Namespace"
- tooltip="Namespace is an optional Hashicorp Vault namespace. An empty namespace means no particular namespace is used."
- value={vaultNamespace}
+ label="Retry (Seconds)"
+ value={vaultRetry}
+ error={validationErrors["vault_retry"] || ""}
/>
-
-
-
+
+ Status
+ ) => {
- updateField("vaultPrefix", e.target.value);
+ updateField("vaultPing", e.target.value);
+ cleanValidation("vault_ping");
}}
- label="Prefix"
- tooltip="Prefix is an optional prefix / directory within the K/V engine. If empty, keys will be stored at the K/V engine top level"
- value={vaultPrefix}
+ label="Ping (Seconds)"
+ value={vaultPing}
+ error={validationErrors["vault_ping"] || ""}
/>
-
-
-
-
- App Role
-
- ) => {
- updateField("vaultAppRoleEngine", e.target.value);
- }}
- label="Engine"
- tooltip="AppRoleEngine is the AppRole authentication engine path. If empty, defaults to 'approle'"
- value={vaultAppRoleEngine}
- />
-
-
- ) => {
- updateField("vaultId", e.target.value);
- cleanValidation("vault_id");
- }}
- label="AppRole ID"
- tooltip="AppRoleSecret is the AppRole access secret for authenticating to Hashicorp Vault via the AppRole method"
- value={vaultId}
- error={validationErrors["vault_id"] || ""}
- required
- />
-
-
- ) => {
- updateField("vaultSecret", e.target.value);
- cleanValidation("vault_secret");
- }}
- label="AppRole Secret"
- tooltip="AppRoleSecret is the AppRole access secret for authenticating to Hashicorp Vault via the AppRole method"
- value={vaultSecret}
- error={validationErrors["vault_secret"] || ""}
- required
- />
-
-
- ) => {
- updateField("vaultRetry", e.target.value);
- cleanValidation("vault_retry");
- }}
- label="Retry (Seconds)"
- value={vaultRetry}
- error={validationErrors["vault_retry"] || ""}
- />
-
-
-
-
-
- Status
- ) => {
- updateField("vaultPing", e.target.value);
- cleanValidation("vault_ping");
- }}
- label="Ping (Seconds)"
- value={vaultPing}
- error={validationErrors["vault_ping"] || ""}
- />
-
-
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx
index 94d7dd3bdd7..be184937997 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx
@@ -15,55 +15,25 @@
// along with this program. If not, see
-
+
+
Identity Provider
-
+
Access to the tenant can be controlled via an external Identity
Manager.
-
-
-
+
+ {
dispatch(setIDP(e.target.value));
}}
selectorOptions={[
- { label:
{idpSelection === "Built-in" &&
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx
index 6a88dc2d0c4..bb099e815bc 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx
@@ -14,19 +14,17 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see
-
- ) => {
- updateField("ADURL", e.target.value);
- cleanValidation("AD_URL");
- }}
- label="LDAP Server Address"
- value={ADURL}
- placeholder="ldap-server:636"
- error={validationErrors["AD_URL"] || ""}
- required
- />
-
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
- updateField("ADSkipTLS", checked);
- }}
- label={"Skip TLS Verification"}
- />
-
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
- updateField("ADServerInsecure", checked);
- }}
- label={"Server Insecure"}
- />
-
+
+ ) => {
+ updateField("ADURL", e.target.value);
+ cleanValidation("AD_URL");
+ }}
+ label="LDAP Server Address"
+ value={ADURL}
+ placeholder="ldap-server:636"
+ error={validationErrors["AD_URL"] || ""}
+ required
+ />
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+ updateField("ADSkipTLS", checked);
+ }}
+ label={"Skip TLS Verification"}
+ />
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+ updateField("ADServerInsecure", checked);
+ }}
+ label={"Server Insecure"}
+ />
{ADServerInsecure ? (
-
-
+
+
Warning: All traffic with Active Directory will be unencrypted
-
+
+
) : null}
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
- updateField("ADServerStartTLS", checked);
- }}
- label={"Start TLS connection to AD/LDAP server"}
- />
-
-
- ) => {
- updateField("ADLookupBindDN", e.target.value);
- cleanValidation("ad_lookupBindDN");
- }}
- label="Lookup Bind DN"
- value={ADLookupBindDN}
- placeholder="cn=admin,dc=min,dc=io"
- error={validationErrors["ad_lookupBindDN"] || ""}
- required
- />
-
-
- ) => {
- updateField("ADLookupBindPassword", e.target.value);
- }}
- label="Lookup Bind Password"
- value={ADLookupBindPassword}
- placeholder="admin"
- />
-
-
- ) => {
- updateField("ADUserDNSearchBaseDN", e.target.value);
- }}
- label="User DN Search Base DN"
- value={ADUserDNSearchBaseDN}
- placeholder="dc=min,dc=io"
- />
-
-
- ) => {
- updateField("ADUserDNSearchFilter", e.target.value);
- }}
- label="User DN Search Filter"
- value={ADUserDNSearchFilter}
- placeholder="(sAMAcountName=%s)"
- />
-
-
- ) => {
- updateField("ADGroupSearchBaseDN", e.target.value);
- }}
- label="Group Search Base DN"
- value={ADGroupSearchBaseDN}
- placeholder="ou=hwengg,dc=min,dc=io;ou=swengg,dc=min,dc=io"
- />
-
-
- ) => {
- updateField("ADGroupSearchFilter", e.target.value);
- }}
- label="Group Search Filter"
- value={ADGroupSearchFilter}
- placeholder="(&(objectclass=groupOfNames)(member=%s))"
- />
-
-
-
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+ updateField("ADServerStartTLS", checked);
+ }}
+ label={"Start TLS connection to AD/LDAP server"}
+ />
+ ) => {
+ updateField("ADLookupBindDN", e.target.value);
+ cleanValidation("ad_lookupBindDN");
+ }}
+ label="Lookup Bind DN"
+ value={ADLookupBindDN}
+ placeholder="cn=admin,dc=min,dc=io"
+ error={validationErrors["ad_lookupBindDN"] || ""}
+ required
+ />
+ ) => {
+ updateField("ADLookupBindPassword", e.target.value);
+ }}
+ label="Lookup Bind Password"
+ value={ADLookupBindPassword}
+ placeholder="admin"
+ />
+ ) => {
+ updateField("ADUserDNSearchBaseDN", e.target.value);
+ }}
+ label="User DN Search Base DN"
+ value={ADUserDNSearchBaseDN}
+ placeholder="dc=min,dc=io"
+ />
+ ) => {
+ updateField("ADUserDNSearchFilter", e.target.value);
+ }}
+ label="User DN Search Filter"
+ value={ADUserDNSearchFilter}
+ placeholder="(sAMAcountName=%s)"
+ />
+ ) => {
+ updateField("ADGroupSearchBaseDN", e.target.value);
+ }}
+ label="Group Search Base DN"
+ value={ADGroupSearchBaseDN}
+ placeholder="ou=hwengg,dc=min,dc=io;ou=swengg,dc=min,dc=io"
+ />
+ ) => {
+ updateField("ADGroupSearchFilter", e.target.value);
+ }}
+ label="Group Search Filter"
+ value={ADGroupSearchFilter}
+ placeholder="(&(objectclass=groupOfNames)(member=%s))"
+ />
+
+
List of user DNs (Distinguished Names) to be Tenant Administrators
-
- {ADUserDNs.map((_, index) => {
- return (
-
-
-
) => {
- dispatch(
- setIDPADUsrAtIndex({
- index: index,
- userDN: e.target.value,
- }),
- );
- cleanValidation(`ad-userdn-${index.toString()}`);
- }}
- index={index}
- key={`csv-ad-userdn-${index.toString()}`}
- error={
- validationErrors[`ad-userdn-${index.toString()}`] || ""
- }
- />
-
-
- {
- dispatch(addIDPADUsrAtIndex());
- }}
- >
-
-
-
- {
- if (ADUserDNs.length > 1) {
- dispatch(removeIDPADUsrAtIndex(index));
- }
- }}
- >
-
-
-
- );
- })}
-
+ {ADUserDNs.map((_, index) => {
+ return (
+
+
+ ) => {
+ dispatch(
+ setIDPADUsrAtIndex({
+ index: index,
+ userDN: e.target.value,
+ }),
+ );
+ cleanValidation(`ad-userdn-${index.toString()}`);
+ }}
+ index={index}
+ key={`csv-ad-userdn-${index.toString()}`}
+ error={
+ validationErrors[`ad-userdn-${index.toString()}`] || ""
+ }
+ />
+
+
+ {
+ dispatch(addIDPADUsrAtIndex());
+ }}
+ >
+
+
+
+ {
+ if (ADUserDNs.length > 1) {
+ dispatch(removeIDPADUsrAtIndex(index));
+ }
+ }}
+ >
+
+
+
+
+
+ );
+ })}
-
-
+
+
List of group DNs (Distinguished Names) to be Tenant Administrators
-
- {ADGroupDNs.map((_, index) => {
- return (
-
-
-
) => {
- dispatch(
- setIDPADGroupAtIndex({
- index: index,
- userDN: e.target.value,
- }),
- );
- cleanValidation(`ad-groupdn-${index.toString()}`);
- }}
- index={index}
- key={`csv-ad-groupdn-${index.toString()}`}
- error={
- validationErrors[`ad-groupdn-${index.toString()}`] || ""
- }
- />
-
-
- {
- dispatch(addIDPADGroupAtIndex());
- }}
- >
-
-
-
- {
- if (ADGroupDNs.length > 1) {
- dispatch(removeIDPADGroupAtIndex(index));
- }
- }}
- >
-
-
-
- );
- })}
-
+ {ADGroupDNs.map((_, index) => {
+ return (
+
+
+ ) => {
+ dispatch(
+ setIDPADGroupAtIndex({
+ index: index,
+ userDN: e.target.value,
+ }),
+ );
+ cleanValidation(`ad-groupdn-${index.toString()}`);
+ }}
+ index={index}
+ key={`csv-ad-groupdn-${index.toString()}`}
+ error={
+ validationErrors[`ad-groupdn-${index.toString()}`] || ""
+ }
+ />
+
+
+ {
+ dispatch(addIDPADGroupAtIndex());
+ }}
+ >
+
+
+
+ {
+ if (ADGroupDNs.length > 1) {
+ dispatch(removeIDPADGroupAtIndex(index));
+ }
+ }}
+ >
+
+
+
+
+
+ );
+ })}
-
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx
index dd57ee5f84e..eb6c7e9721e 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx
@@ -15,7 +15,9 @@
// along with this program. If not, see
-
-
+ {
key={`csv-accesskey-${index.toString()}`}
error={validationErrors[`accesskey-${index.toString()}`] || ""}
/>
- {
key={`csv-secretkey-${index.toString()}`}
error={validationErrors[`secretkey-${index.toString()}`] || ""}
/>
-
-
+
+ {
+ dispatch(addIDPNewKeyPair());
+ }}
+ disabled={index !== accessKeys.length - 1}
+ >
+
+ {
+ dispatch(removeIDPKeyPairAtIndex(index));
+ }}
+ disabled={accessKeys.length <= 1}
+ >
+
+
{
- dispatch(addIDPNewKeyPair());
+ dispatch(
+ setIDPUsrAtIndex({
+ index,
+ accessKey: getRandomString(16),
+ }),
+ );
+ dispatch(
+ setIDPPwdAtIndex({
+ index,
+ secretKey: getRandomString(16),
+ }),
+ );
}}
- disabled={index !== accessKeys.length - 1}
- >
-
-
-
- {
- dispatch(removeIDPKeyPairAtIndex(index));
- }}
- disabled={accessKeys.length <= 1}
>
-
-
-
-
- {
- dispatch(
- setIDPUsrAtIndex({
- index,
- accessKey: getRandomString(16),
- }),
- );
- dispatch(
- setIDPPwdAtIndex({
- index,
- secretKey: getRandomString(16),
- }),
- );
- }}
- size={"small"}
- >
-
-
-
);
})}
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx
index 1fe7d9ffffa..5c7f09201aa 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx
@@ -14,18 +14,8 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see
-
- ) => {
- updateField("openIDConfigurationURL", e.target.value);
- cleanValidation("openID_CONFIGURATION_URL");
- }}
- label="Configuration URL"
- value={openIDConfigurationURL}
- placeholder="https://your-identity-provider.com/.well-known/openid-configuration"
- error={validationErrors["openID_CONFIGURATION_URL"] || ""}
- required
- />
-
-
- ) => {
- updateField("openIDClientID", e.target.value);
- cleanValidation("openID_clientID");
- }}
- label="Client ID"
- value={openIDClientID}
- error={validationErrors["openID_clientID"] || ""}
- required
- />
-
-
- ) => {
- updateField("openIDSecretID", e.target.value);
- cleanValidation("openID_secretID");
- }}
- label="Secret ID"
- value={openIDSecretID}
- error={validationErrors["openID_secretID"] || ""}
- required
- />
-
-
- ) => {
- updateField("openIDClaimName", e.target.value);
- cleanValidation("openID_claimName");
- }}
- label="Claim Name"
- value={openIDClaimName}
- placeholder="policy"
- error={validationErrors["openID_claimName"] || ""}
- />
-
-
- ) => {
- updateField("openIDScopes", e.target.value);
- cleanValidation("openID_scopes");
- }}
- label="Scopes"
- value={openIDScopes}
- />
-
-
+
+ ) => {
+ updateField("openIDConfigurationURL", e.target.value);
+ cleanValidation("openID_CONFIGURATION_URL");
+ }}
+ label="Configuration URL"
+ value={openIDConfigurationURL}
+ placeholder="https://your-identity-provider.com/.well-known/openid-configuration"
+ error={validationErrors["openID_CONFIGURATION_URL"] || ""}
+ required
+ />
+ ) => {
+ updateField("openIDClientID", e.target.value);
+ cleanValidation("openID_clientID");
+ }}
+ label="Client ID"
+ value={openIDClientID}
+ error={validationErrors["openID_clientID"] || ""}
+ required
+ />
+ ) => {
+ updateField("openIDSecretID", e.target.value);
+ cleanValidation("openID_secretID");
+ }}
+ label="Secret ID"
+ value={openIDSecretID}
+ error={validationErrors["openID_secretID"] || ""}
+ required
+ />
+ ) => {
+ updateField("openIDClaimName", e.target.value);
+ cleanValidation("openID_claimName");
+ }}
+ label="Claim Name"
+ value={openIDClaimName}
+ placeholder="policy"
+ error={validationErrors["openID_claimName"] || ""}
+ />
+ ) => {
+ updateField("openIDScopes", e.target.value);
+ cleanValidation("openID_scopes");
+ }}
+ label="Scopes"
+ value={openIDScopes}
+ />
+
);
};
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx
index 22c47445830..d5e49cdbcc9 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx
@@ -16,36 +16,17 @@
import React, { Fragment, useCallback, useEffect, useState } from "react";
import { useSelector } from "react-redux";
-import { Theme } from "@mui/material/styles";
-import createStyles from "@mui/styles/createStyles";
-import withStyles from "@mui/styles/withStyles";
-import { Grid, Paper } from "@mui/material";
-import {
- formFieldStyles,
- wizardCommon,
-} from "../../../Common/FormComponents/common/styleLibrary";
+import { Box, FormLayout, InputBox, Switch } from "mds";
import { AppState, useAppDispatch } from "../../../../../store";
import { clearValidationError } from "../../utils";
import {
commonFormValidation,
IValidation,
} from "../../../../../utils/validationFunctions";
-import FormSwitchWrapper from "../../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
-import InputBoxWrapper from "../../../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
import { isPageValid, updateAddField } from "../createTenantSlice";
import H3Section from "../../../Common/H3Section";
-interface IImagesProps {
- classes: any;
-}
-
-const styles = (theme: Theme) =>
- createStyles({
- ...formFieldStyles,
- ...wizardCommon,
- });
-
-const Images = ({ classes }: IImagesProps) => {
+const Images = () => {
const dispatch = useAppDispatch();
const customImage = useSelector(
@@ -160,114 +141,99 @@ const Images = ({ classes }: IImagesProps) => {
};
return (
-
-
+
+
Container Images
-
+
Specify the container images used by the Tenant and its features.
-
-
-
-
- ) => {
- updateField("imageName", e.target.value);
- cleanValidation("image");
- }}
- label="MinIO"
- value={imageName}
- error={validationErrors["image"] || ""}
- placeholder="minio/minio:RELEASE.2023-11-15T20-43-25Z"
- />
-
-
-
- ) => {
- updateField("kesImage", e.target.value);
- cleanValidation("kesImage");
- }}
- label="KES"
- value={kesImage}
- error={validationErrors["kesImage"] || ""}
- placeholder="minio/kes:2023-11-10T10-44-28Z"
- />
-
-
+
+
+ ) => {
+ updateField("imageName", e.target.value);
+ cleanValidation("image");
+ }}
+ label="MinIO"
+ value={imageName}
+ error={validationErrors["image"] || ""}
+ placeholder="minio/minio:RELEASE.2023-11-15T20-43-25Z"
+ />
+ ) => {
+ updateField("kesImage", e.target.value);
+ cleanValidation("kesImage");
+ }}
+ label="KES"
+ value={kesImage}
+ error={validationErrors["kesImage"] || ""}
+ placeholder="minio/kes:2023-11-10T10-44-28Z"
+ />
{customImage && (
-
+
Custom Container Registry
-
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
-
- updateField("customDockerhub", checked);
- }}
- label={"Use a private container registry"}
- />
-
+
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+
+ updateField("customDockerhub", checked);
+ }}
+ label={"Use a private container registry"}
+ />
)}
{customDockerhub && (
-
- ) => {
- updateField("imageRegistry", e.target.value);
- }}
- label="Endpoint"
- value={imageRegistry}
- error={validationErrors["registry"] || ""}
- placeholder="https://index.docker.io/v1/"
- required
- />
-
-
- ) => {
- updateField("imageRegistryUsername", e.target.value);
- }}
- label="Username"
- value={imageRegistryUsername}
- error={validationErrors["registryUsername"] || ""}
- required
- />
-
-
- ) => {
- updateField("imageRegistryPassword", e.target.value);
- }}
- label="Password"
- value={imageRegistryPassword}
- error={validationErrors["registryPassword"] || ""}
- required
- />
-
+ ) => {
+ updateField("imageRegistry", e.target.value);
+ }}
+ label="Endpoint"
+ value={imageRegistry}
+ error={validationErrors["registry"] || ""}
+ placeholder="https://index.docker.io/v1/"
+ required
+ />
+ ) => {
+ updateField("imageRegistryUsername", e.target.value);
+ }}
+ label="Username"
+ value={imageRegistryUsername}
+ error={validationErrors["registryUsername"] || ""}
+ required
+ />
+ ) => {
+ updateField("imageRegistryPassword", e.target.value);
+ }}
+ label="Password"
+ value={imageRegistryPassword}
+ error={validationErrors["registryPassword"] || ""}
+ required
+ />
)}
-
+
);
};
-export default withStyles(styles)(Images);
+export default Images;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx
index d593fbe2fe2..54b35ed093c 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx
@@ -15,23 +15,22 @@
// along with this program. If not, see
-
+
+
Security
-
-
-
-
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+
+ updateField("enableTLS", checked);
+ }}
+ label={"TLS"}
+ description={
+ "Securing all the traffic using TLS. This is required for Encryption Configuration"
+ }
+ />
+ {enableTLS && (
+
+ {
const targetD = e.target;
const checked = targetD.checked;
-
- updateField("enableTLS", checked);
+ updateField("enableAutoCert", checked);
}}
- label={"TLS"}
+ label={"AutoCert"}
description={
- "Securing all the traffic using TLS. This is required for Encryption Configuration"
+ "The internode certificates will be generated and managed by MinIO Operator"
}
/>
-
- {enableTLS && (
-
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
- updateField("enableAutoCert", checked);
- }}
- label={"AutoCert"}
- description={
- "The internode certificates will be generated and managed by MinIO Operator"
- }
- />
-
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
- updateField("enableCustomCerts", checked);
- }}
- label={"Custom Certificates"}
- description={"Certificates used to terminated TLS at MinIO"}
- />
-
- {enableCustomCerts && (
-
- {!enableAutoCert && (
-
-
- )}
-
- MinIO Server Certificates
- {minioCertificates.map((keyPair: KeyPair, index) => (
-
-
- {
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+ updateField("enableCustomCerts", checked);
+ }}
+ label={"Custom Certificates"}
+ description={"Certificates used to terminated TLS at MinIO"}
+ />
+ {enableCustomCerts && (
+
+ {!enableAutoCert &&
+ MinIO Server Certificates
+
+ {minioCertificates.map((keyPair: KeyPair, index) => (
+
+
+ {
+ if (encodedValue) {
dispatch(
addFileToKeyPair({
id: keyPair.id,
@@ -257,15 +199,18 @@ const Security = ({ classes }: ISecurityProps) => {
value: encodedValue,
}),
);
- }}
- accept=".cer,.crt,.cert,.pem"
- id="tlsCert"
- name="tlsCert"
- label="Cert"
- value={keyPair.cert}
- />
- {
+ }
+ }}
+ accept=".cer,.crt,.cert,.pem"
+ id="tlsCert"
+ name="tlsCert"
+ label="Cert"
+ value={keyPair.cert}
+ returnEncodedData
+ />
+ {
+ if (encodedValue) {
dispatch(
addFileToKeyPair({
id: keyPair.id,
@@ -274,54 +219,48 @@ const Security = ({ classes }: ISecurityProps) => {
value: encodedValue,
}),
);
- }}
- accept=".key,.pem"
- id="tlsKey"
- name="tlsKey"
- label="Key"
- value={keyPair.key}
- />
-
+ }
+ }}
+ accept=".key,.pem"
+ id="tlsKey"
+ name="tlsKey"
+ label="Key"
+ value={keyPair.key}
+ returnEncodedData
+ />
+
-
-
-
{
- dispatch(addKeyPair());
- }}
- disabled={index !== minioCertificates.length - 1}
- >
-
-
- {
- dispatch(deleteKeyPair(keyPair.id));
- }}
- disabled={minioCertificates.length <= 1}
- >
-
-
-
+
+ {
+ dispatch(addKeyPair());
+ }}
+ disabled={index !== minioCertificates.length - 1}
+ >
+
+ {
+ dispatch(deleteKeyPair(keyPair.id));
+ }}
+ disabled={minioCertificates.length <= 1}
+ >
+
- ))}
-
-
- MinIO Client Certificates
- {minioClientCertificates.map((keyPair: KeyPair, index) => (
-
-
- {
+
+ ))}
+
+
+ MinIO Client Certificates
+ {minioClientCertificates.map((keyPair: KeyPair, index) => (
+
+
+ {
+ if (encodedValue) {
dispatch(
addFileToClientKeyPair({
id: keyPair.id,
@@ -330,15 +269,18 @@ const Security = ({ classes }: ISecurityProps) => {
value: encodedValue,
}),
);
- }}
- accept=".cer,.crt,.cert,.pem"
- id="tlsCert"
- name="tlsCert"
- label="Cert"
- value={keyPair.cert}
- />
- {
+ }
+ }}
+ accept=".cer,.crt,.cert,.pem"
+ id="tlsCert"
+ name="tlsCert"
+ label="Cert"
+ value={keyPair.cert}
+ returnEncodedData
+ />
+ {
+ if (encodedValue) {
dispatch(
addFileToClientKeyPair({
id: keyPair.id,
@@ -347,56 +289,48 @@ const Security = ({ classes }: ISecurityProps) => {
value: encodedValue,
}),
);
- }}
- accept=".key,.pem"
- id="tlsKey"
- name="tlsKey"
- label="Key"
- value={keyPair.key}
- />
-
+ }
+ }}
+ accept=".key,.pem"
+ id="tlsKey"
+ name="tlsKey"
+ label="Key"
+ value={keyPair.key}
+ returnEncodedData
+ />
+
-
-
-
{
- dispatch(addClientKeyPair());
- }}
- disabled={
- index !== minioClientCertificates.length - 1
- }
- >
-
-
- {
- dispatch(deleteClientKeyPair(keyPair.id));
- }}
- disabled={minioClientCertificates.length <= 1}
- >
-
-
-
+
+ {
+ dispatch(addClientKeyPair());
+ }}
+ disabled={index !== minioClientCertificates.length - 1}
+ >
+
+ {
+ dispatch(deleteClientKeyPair(keyPair.id));
+ }}
+ disabled={minioClientCertificates.length <= 1}
+ >
+
- ))}
-
-
- MinIO CA Certificates
- {caCertificates.map((keyPair: KeyPair, index) => (
-
-
- {
+
+ ))}
+
+
+ MinIO CA Certificates
+ {caCertificates.map((keyPair: KeyPair, index) => (
+
+
+ {
+ if (encodedValue) {
dispatch(
addFileToCaCertificates({
id: keyPair.id,
@@ -405,50 +339,47 @@ const Security = ({ classes }: ISecurityProps) => {
value: encodedValue,
}),
);
+ }
+ }}
+ accept=".cer,.crt,.cert,.pem"
+ id="tlsCert"
+ name="tlsCert"
+ label="Cert"
+ value={keyPair.cert}
+ returnEncodedData
+ />
+
+
+
+
{
+ dispatch(addCaCertificate());
+ }}
+ disabled={index !== caCertificates.length - 1}
+ >
+
+
{
+ dispatch(deleteCaCertificate(keyPair.id));
}}
- accept=".cer,.crt,.cert,.pem"
- id="tlsCert"
- name="tlsCert"
- label="Cert"
- value={keyPair.cert}
- />
-
-
-
-
-
{
- dispatch(addCaCertificate());
- }}
- disabled={index !== caCertificates.length - 1}
- >
-
-
-
- {
- dispatch(deleteCaCertificate(keyPair.id));
- }}
- disabled={caCertificates.length <= 1}
- >
-
-
-
+ disabled={caCertificates.length <= 1}
+ >
+
+
- ))}
-
-
- )}
-
- )}
-
-
+
+ ))}
+
+
+ )}
+
+ )}
+
);
};
-export default withStyles(styles)(Security);
+export default Security;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx
index 7c80365a97a..80d49411713 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx
@@ -15,42 +15,12 @@
// along with this program. If not, see
-
Resource Allocation
-
-
+
+
Number of Servers
-
+
{parseInt(nodes) > 0 ? nodes : "-"}
@@ -99,13 +73,13 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Drives per Server
-
+
{distribution ? distribution.disks : "-"}
Drive Capacity
-
+
{distribution ? niceBytes(distribution.pvSize) : "-"}
@@ -114,7 +88,7 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Total Volumes
-
+
{distribution ? distribution.persistentVolumes : "-"}
@@ -123,13 +97,18 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Memory per Node
- {memoryNode} Gi
+
+ {memoryNode} Gi
+
CPU Selection
-
+
{cpuToUse}
@@ -139,29 +118,27 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
{ecParityCalc.error === 0 && usableInformation && (
- Erasure Code Configuration
-
+
EC Parity
-
+
{ecParity !== "" ? ecParity : "-"}
Raw Capacity
-
+
{niceBytes(ecParityCalc.rawCapacity)}
Usable Capacity
-
+
{niceBytes(usableInformation.maxCapacity)}
@@ -169,7 +146,10 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Server Failures Tolerated
-
+
{distribution
? Math.floor(
usableInformation.maxFailureTolerations /
@@ -185,17 +165,15 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
{integrationSelection.typeSelection !== "" &&
integrationSelection.storageClass !== "" && (
- Single Instance Configuration
-
+
CPU
-
+
{integrationSelection.CPU !== 0
? integrationSelection.CPU
: "-"}
@@ -203,7 +181,7 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Memory
-
+
{integrationSelection.memory !== 0
? `${integrationSelection.memory} Gi`
: "-"}
@@ -211,7 +189,7 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Drives per Server
-
+
{integrationSelection.drivesPerServer !== 0
? `${integrationSelection.drivesPerServer}`
: "-"}
@@ -221,7 +199,10 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
Drive Size
-
+
{integrationSelection.driveSize.driveSize}
{integrationSelection.driveSize.sizeUnit}
@@ -230,8 +211,8 @@ const SizePreview = ({ classes }: ISizePreviewProps) => {
)}
-
+
);
};
-export default withStyles(styles)(SizePreview);
+export default SizePreview;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx
index d0e5d1e761a..6487ce67b07 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx
@@ -16,22 +16,9 @@
import React, { Fragment, useCallback, useEffect } from "react";
import { useSelector } from "react-redux";
-import { Theme } from "@mui/material/styles";
-import createStyles from "@mui/styles/createStyles";
-import withStyles from "@mui/styles/withStyles";
+import { Box, FormLayout, Grid, InputBox, Select } from "mds";
import get from "lodash/get";
-import Grid from "@mui/material/Grid";
-import {
- formFieldStyles,
- modalBasic,
- wizardCommon,
-} from "../../../../Common/FormComponents/common/styleLibrary";
import { AppState, useAppDispatch } from "../../../../../../store";
-import InputBoxWrapper from "../../../../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
-import SelectWrapper from "../../../../Common/FormComponents/SelectWrapper/SelectWrapper";
-import SizePreview from "../SizePreview";
-import TenantSize from "./TenantSize";
-import { Paper, SelectChangeEvent } from "@mui/material";
import { IMkEnvs, mkPanelConfigurations } from "./utils";
import {
isPageValid,
@@ -40,23 +27,11 @@ import {
updateAddField,
} from "../../createTenantSlice";
import { selFeatures } from "../../../../consoleSlice";
+import SizePreview from "../SizePreview";
+import TenantSize from "./TenantSize";
import NamespaceSelector from "./NamespaceSelector";
import H3Section from "../../../../Common/H3Section";
-const styles = (theme: Theme) =>
- createStyles({
- sizePreview: {
- marginLeft: 10,
- background: "#FFFFFF",
- border: "1px solid #EAEAEA",
- padding: 2,
- marginTop: 20,
- },
- ...formFieldStyles,
- ...modalBasic,
- ...wizardCommon,
- });
-
const NameTenantField = () => {
const dispatch = useAppDispatch();
const tenantName = useSelector(
@@ -68,7 +43,7 @@ const NameTenantField = () => {
);
return (
- ) => {
@@ -83,11 +58,10 @@ const NameTenantField = () => {
};
interface INameTenantMainScreen {
- classes: any;
formToRender?: IMkEnvs;
}
-const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => {
+const NameTenantMain = ({ formToRender }: INameTenantMainScreen) => {
const dispatch = useAppDispatch();
const selectedStorageClass = useSelector(
@@ -124,67 +98,54 @@ const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => {
return (
-
+
-
-
-
-
- Name
-
- How would you like to name this new tenant?
-
-
-
-
-
-
-
+
+
+
+ Name
+
+ How would you like to name this new tenant?
+
+
+
- ) => {
- updateField(
- "selectedStorageClass",
- e.target.value as string,
- );
- }}
- label="Storage Class"
- value={selectedStorageClass}
- options={storageClasses}
- disabled={storageClasses.length < 1}
- />
-
+ {
+ updateField("selectedStorageClass", value);
+ }}
+ label="Storage Class"
+ value={selectedStorageClass}
+ options={storageClasses}
+ disabled={storageClasses.length < 1}
+ />
) : (
-
- ) => {
- dispatch(
- setStorageType({
- storageType: e.target.value as string,
- features: features,
- }),
- );
- }}
- label={get(
- mkPanelConfigurations,
- `${formToRender}.variantSelectorLabel`,
- "Storage Type",
- )}
- value={selectedStorageType}
- options={get(
- mkPanelConfigurations,
- `${formToRender}.variantSelectorValues`,
- [],
- )}
- />
-
+ {
+ dispatch(
+ setStorageType({
+ storageType: value,
+ features: features,
+ }),
+ );
+ }}
+ label={get(
+ mkPanelConfigurations,
+ `${formToRender}.variantSelectorLabel`,
+ "Storage Type",
+ )}
+ value={selectedStorageType}
+ options={get(
+ mkPanelConfigurations,
+ `${formToRender}.variantSelectorValues`,
+ [],
+ )}
+ />
)}
{formToRender === IMkEnvs.default ? (
-
+
+
-
-
+
+
+
);
};
-export default withStyles(styles)(NameTenantMain);
+export default NameTenantMain;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx
index 8b55e5b2a07..5e34ef2a657 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx
@@ -15,15 +15,14 @@
// along with this program. If not, see
{openAddNSConfirm && ) => {
@@ -75,7 +74,6 @@ const NamespaceSelector = ({ formToRender }: { formToRender?: IMkEnvs }) => {
label="Namespace"
value={namespace}
error={namespaceError || ""}
- overlayId={"add-namespace"}
overlayIcon={showNSCreateButton ?
-
-
- Capacity
-
- Please select the desired capacity
-
-
-
+
+ Capacity
+ Please select the desired capacity
+
{distribution.error !== "" && (
-
- {distribution.error}
-
+ {distribution.error}
)}
-
- ) => {
- if (e.target.validity.valid) {
- updateField("nodes", e.target.value);
- cleanValidation("nodes");
- }
- }}
- label="Number of Servers"
- disabled={selectedStorageClass === ""}
- value={nodes}
- min="4"
- required
- error={validationErrors["nodes"] || ""}
- pattern={"[0-9]*"}
- />
-
-
- ) => {
- if (e.target.validity.valid) {
- updateField("drivesPerServer", e.target.value);
- cleanValidation("drivesps");
- }
- }}
- label="Drives per Server"
- value={drivesPerServer}
- disabled={selectedStorageClass === ""}
- min="1"
- required
- error={validationErrors["drivesps"] || ""}
- pattern={"[0-9]*"}
- />
-
-
-
- ) => {
- updateField("volumeSize", e.target.value);
- cleanValidation("volume_size");
+ ) => {
+ if (e.target.validity.valid) {
+ updateField("nodes", e.target.value);
+ cleanValidation("nodes");
+ }
+ }}
+ label="Number of Servers"
+ disabled={selectedStorageClass === ""}
+ value={nodes}
+ min="4"
+ required
+ error={validationErrors["nodes"] || ""}
+ pattern={"[0-9]*"}
+ />
+ ) => {
+ if (e.target.validity.valid) {
+ updateField("drivesPerServer", e.target.value);
+ cleanValidation("drivesps");
+ }
+ }}
+ label="Drives per Server"
+ value={drivesPerServer}
+ disabled={selectedStorageClass === ""}
+ min="1"
+ required
+ error={validationErrors["drivesps"] || ""}
+ pattern={"[0-9]*"}
+ />
+ ) => {
+ updateField("volumeSize", e.target.value);
+ cleanValidation("volume_size");
+ }}
+ label="Total Size"
+ value={volumeSize}
+ disabled={selectedStorageClass === ""}
+ required
+ error={validationErrors["volume_size"] || ""}
+ min="0"
+ overlayObject={
+ {
+ updateField("sizeFactor", newValue);
}}
- label="Total Size"
- value={volumeSize}
+ unitSelected={sizeFactor}
+ unitsList={k8sScalarUnitsExcluding(["Ki", "Mi"])}
disabled={selectedStorageClass === ""}
- required
- error={validationErrors["volume_size"] || ""}
- min="0"
- overlayObject={
- {
- updateField("sizeFactor", newValue);
- }}
- unitSelected={sizeFactor}
- unitsList={k8sScalarUnitsExcluding(["Ki", "Mi"])}
- disabled={selectedStorageClass === ""}
- />
- }
/>
-
-
-
-
- ) => {
- updateField("ecParity", e.target.value as string);
- }}
- label="Erasure Code Parity"
- disabled={selectedStorageClass === ""}
- value={ecParity}
- options={ecParityChoices}
- />
-
- Please select the desired parity. This setting will change the max
- usable capacity in the cluster
-
-
+ }
+ />
+ {
+ updateField("ecParity", value);
+ }}
+ label="Erasure Code Parity"
+ disabled={selectedStorageClass === ""}
+ value={ecParity}
+ options={ecParityChoices}
+ />
+
+ Please select the desired parity. This setting will change the max
+ usable capacity in the cluster
+
);
};
-export default withStyles(styles)(TenantSize);
+export default TenantSize;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx
index e1be5da6222..1dc1e38b00f 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx
@@ -15,44 +15,18 @@
// along with this program. If not, see
-
-
- Resources
-
- You may specify the amount of CPU and Memory that MinIO servers
- should reserve on each node.
-
-
-
+
+ Resources
+
+ You may specify the amount of CPU and Memory that MinIO servers should
+ reserve on each node.
+
+
{resourcesSize.error !== "" && (
-
- {resourcesSize.error}
-
+ {resourcesSize.error}
)}
-
-
- {
- let value = parseInt(e.target.value);
- if (e.target.value === "") {
- updateField("resourcesCPURequestError", "");
- } else if (isNaN(value)) {
- updateField("resourcesCPURequestError", "Invalid number");
- } else if (value > parseInt(maxCPUsUse)) {
- updateField(
- "resourcesCPURequestError",
- `Request exceeds available cores (${maxCPUsUse})`,
- );
- } else if (e.target.validity.valid) {
- updateField("resourcesCPURequestError", "");
- } else {
- updateField("resourcesCPURequestError", "Invalid configuration");
- }
- updateField("resourcesCPURequest", e.target.value);
- }}
- value={resourcesCPURequest}
- disabled={selectedStorageClass === ""}
- max={maxCPUsUse}
- error={resourcesCPURequestError}
- pattern={"[0-9]*"}
- />
-
-
-
- ) => {
- let value = parseInt(e.target.value);
- if (e.target.value === "") {
- updateField("resourcesMemoryRequestError", "");
- } else if (isNaN(value)) {
- updateField("resourcesMemoryRequestError", "Invalid number");
- } else if (value > parseInt(maxMemorySize)) {
- updateField(
- "resourcesMemoryRequestError",
- `Request exceeds available memory across ${nodes} nodes (${maxMemorySize}Gi)`,
- );
- } else if (value < 2) {
- updateField(
- "resourcesMemoryRequestError",
- "At least 2Gi must be requested",
- );
- } else if (e.target.validity.valid) {
- updateField("resourcesMemoryRequestError", "");
- } else {
- updateField(
- "resourcesMemoryRequestError",
- "Invalid configuration",
- );
- }
- updateField("resourcesMemoryRequest", e.target.value);
- }}
- label="Memory Request"
- overlayObject={
- {}}
- unitSelected={"Gi"}
- unitsList={[{ label: "Gi", value: "Gi" }]}
- disabled={true}
- />
+ {
+ let value = parseInt(e.target.value);
+ if (e.target.value === "") {
+ updateField("resourcesCPURequestError", "");
+ } else if (isNaN(value)) {
+ updateField("resourcesCPURequestError", "Invalid number");
+ } else if (value > parseInt(maxCPUsUse)) {
+ updateField(
+ "resourcesCPURequestError",
+ `Request exceeds available cores (${maxCPUsUse})`,
+ );
+ } else if (e.target.validity.valid) {
+ updateField("resourcesCPURequestError", "");
+ } else {
+ updateField("resourcesCPURequestError", "Invalid configuration");
}
- value={resourcesMemoryRequest}
- disabled={selectedStorageClass === ""}
- error={resourcesMemoryRequestError}
- pattern={"[0-9]*"}
- />
-
-
-
- {
- const targetD = e.target;
- const checked = targetD.checked;
-
- updateField("resourcesSpecifyLimit", checked);
- }}
- label={"Specify Limit"}
- />
-
+ updateField("resourcesCPURequest", e.target.value);
+ }}
+ value={resourcesCPURequest}
+ disabled={selectedStorageClass === ""}
+ max={maxCPUsUse}
+ error={resourcesCPURequestError}
+ pattern={"[0-9]*"}
+ />
+ ) => {
+ let value = parseInt(e.target.value);
+ if (e.target.value === "") {
+ updateField("resourcesMemoryRequestError", "");
+ } else if (isNaN(value)) {
+ updateField("resourcesMemoryRequestError", "Invalid number");
+ } else if (value > parseInt(maxMemorySize)) {
+ updateField(
+ "resourcesMemoryRequestError",
+ `Request exceeds available memory across ${nodes} nodes (${maxMemorySize}Gi)`,
+ );
+ } else if (value < 2) {
+ updateField(
+ "resourcesMemoryRequestError",
+ "At least 2Gi must be requested",
+ );
+ } else if (e.target.validity.valid) {
+ updateField("resourcesMemoryRequestError", "");
+ } else {
+ updateField("resourcesMemoryRequestError", "Invalid configuration");
+ }
+ updateField("resourcesMemoryRequest", e.target.value);
+ }}
+ label="Memory Request"
+ overlayObject={
+ {}}
+ unitSelected={"Gi"}
+ unitsList={[{ label: "Gi", value: "Gi" }]}
+ disabled={true}
+ />
+ }
+ value={resourcesMemoryRequest}
+ disabled={selectedStorageClass === ""}
+ error={resourcesMemoryRequestError}
+ pattern={"[0-9]*"}
+ />
+ {
+ const targetD = e.target;
+ const checked = targetD.checked;
+
+ updateField("resourcesSpecifyLimit", checked);
+ }}
+ label={"Specify Limit"}
+ />
{resourcesSpecifyLimit && (
-
- {
- let value = parseInt(e.target.value);
- if (e.target.value === "") {
- updateField("resourcesCPULimitError", "");
- } else if (isNaN(value)) {
- updateField("resourcesCPULimitError", "Invalid number");
- } else if (e.target.validity.valid) {
- updateField("resourcesCPULimitError", "");
- } else {
- updateField(
- "resourcesCPULimitError",
- "Invalid configuration",
- );
- }
- updateField("resourcesCPULimit", e.target.value);
- }}
- value={resourcesCPULimit}
- disabled={selectedStorageClass === ""}
- max={maxCPUsUse}
- error={resourcesCPULimitError}
- pattern={"[0-9]*"}
- />
-
-
-
- ) => {
- let value = parseInt(e.target.value);
- if (e.target.value === "") {
- updateField("resourcesMemoryLimitError", "");
- } else if (isNaN(value)) {
- updateField("resourcesMemoryLimitError", "Invalid number");
- } else if (e.target.validity.valid) {
- updateField("resourcesMemoryLimitError", "");
- } else {
- updateField(
- "resourcesMemoryLimitError",
- "Invalid configuration",
- );
- }
- updateField("resourcesMemoryLimit", e.target.value);
- }}
- label="Memory Limit"
- overlayObject={
- {}}
- unitSelected={"Gi"}
- unitsList={[{ label: "Gi", value: "Gi" }]}
- disabled={true}
- />
+ {
+ let value = parseInt(e.target.value);
+ if (e.target.value === "") {
+ updateField("resourcesCPULimitError", "");
+ } else if (isNaN(value)) {
+ updateField("resourcesCPULimitError", "Invalid number");
+ } else if (e.target.validity.valid) {
+ updateField("resourcesCPULimitError", "");
+ } else {
+ updateField("resourcesCPULimitError", "Invalid configuration");
}
- value={resourcesMemoryLimit}
- disabled={selectedStorageClass === ""}
- error={resourcesMemoryLimitError}
- pattern={"[0-9]*"}
- />
-
+ updateField("resourcesCPULimit", e.target.value);
+ }}
+ value={resourcesCPULimit}
+ disabled={selectedStorageClass === ""}
+ max={maxCPUsUse}
+ error={resourcesCPULimitError}
+ pattern={"[0-9]*"}
+ />
+ ) => {
+ let value = parseInt(e.target.value);
+ if (e.target.value === "") {
+ updateField("resourcesMemoryLimitError", "");
+ } else if (isNaN(value)) {
+ updateField("resourcesMemoryLimitError", "Invalid number");
+ } else if (e.target.validity.valid) {
+ updateField("resourcesMemoryLimitError", "");
+ } else {
+ updateField(
+ "resourcesMemoryLimitError",
+ "Invalid configuration",
+ );
+ }
+ updateField("resourcesMemoryLimit", e.target.value);
+ }}
+ label="Memory Limit"
+ overlayObject={
+ {}}
+ unitSelected={"Gi"}
+ unitsList={[{ label: "Gi", value: "Gi" }]}
+ disabled={true}
+ />
+ }
+ value={resourcesMemoryLimit}
+ disabled={selectedStorageClass === ""}
+ error={resourcesMemoryLimitError}
+ pattern={"[0-9]*"}
+ />
)}
);
};
-export default withStyles(styles)(TenantSizeResources);
+export default TenantSizeResources;
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx
index ecf768591e2..15976c67443 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx
+++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx
@@ -14,37 +14,16 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see
- {addNamespaceLoading &&
- Are you sure you want to add a namespace called
- {namespace} ?
-
-
+
+ {addNamespaceLoading &&
+ {namespace}
+
+ ?
+
}
/>
);
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts b/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts
index a748e18f721..241fb94560d 100644
--- a/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts
+++ b/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts
@@ -149,7 +149,7 @@ const initialState: ICreateTenant = {
},
encryption: {
rawConfiguration: "",
- encryptionTab: 0,
+ encryptionTab: "kms-options",
enableEncryption: false,
encryptionType: "vault",
gemaltoEndpoint: "",
diff --git a/web-app/src/screens/Console/Tenants/HelpBox/TLSHelpBox.tsx b/web-app/src/screens/Console/Tenants/HelpBox/TLSHelpBox.tsx
index b5ad7528816..52a4b1f9968 100644
--- a/web-app/src/screens/Console/Tenants/HelpBox/TLSHelpBox.tsx
+++ b/web-app/src/screens/Console/Tenants/HelpBox/TLSHelpBox.tsx
@@ -39,9 +39,9 @@ const FeatureItem = ({
}}
>
{icon}{" "}
-
+
{description}
-
+
);
};
@@ -50,7 +50,7 @@ const TLSHelpBox = () => {
const tenantNameParam = params.tenantName || "";
const tenantNamespaceParam = params.tenantNamespace || "";
const namespace = useSelector((state: AppState) => {
- var defaultNamespace = "";
+ let defaultNamespace = "";
if (tenantNamespaceParam !== "") {
return tenantNamespaceParam;
}
@@ -61,7 +61,7 @@ const TLSHelpBox = () => {
});
const tenantName = useSelector((state: AppState) => {
- var defaultTenantName = "";
+ let defaultTenantName = "";
if (tenantNameParam !== "") {
return tenantNameParam;
}
@@ -104,8 +104,9 @@ const TLSHelpBox = () => {
they are valid for the following internode hostnames, i.e.:
minio.{namespace}
+
<tenant-name> ,{" "}
<namespace> and
diff --git a/web-app/src/screens/Console/Tenants/LogoComponents.tsx b/web-app/src/screens/Console/Tenants/LogoComponents.tsx
deleted file mode 100644
index b36fc64860c..00000000000
--- a/web-app/src/screens/Console/Tenants/LogoComponents.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file is part of MinIO Operator
-// Copyright (c) 2022 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see
-
-
- Open ID
-
- );
-};
-
-export const LDAPLogoElement = () => {
- return (
-
-
-
- LDAP / Active Directory
-
- );
-};
-
-export const BuiltInLogoElement = () => {
- return (
-
-
-
- Built-in
-
- );
-};
diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx
index 8f1195398b6..e28c34ac892 100644
--- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx
+++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx
@@ -15,6 +15,7 @@
// along with this program. If not, see {
setIdpSelection(e.target.value);
}}
selectorOptions={[
- { label: