From 7b6499e9750b334ba3d7e1e89f4f5e7f7dc6d220 Mon Sep 17 00:00:00 2001 From: Sharon Gratch Date: Tue, 30 Jan 2024 20:55:47 +0200 Subject: [PATCH] Fix few text fields based on doc team review, replace reminded Trans texts to Obj Reference: #646 Reference: https://github.com/kubev2v/forklift-console-plugin/pull/854#issuecomment-1916452272 Reference: https://github.com/kubev2v/forklift-console-plugin/pull/861#discussion_r1471854078 A follow up for #854 and #861 that includes the following fixes: 1. Fix vSphere and oVirt help text fields and code comments, based on doc team review. 2. Replace all reminded text appearances from String to React Obj. Signed-off-by: Sharon Gratch --- .../en/plugin__forklift-console-plugin.json | 42 +++++++++---------- .../EditProviderURL/OpenshiftEditURLModal.tsx | 4 +- .../EditProviderURL/VSphereEditURLModal.tsx | 31 ++++++++------ .../EditProviderVDDKImage.tsx | 17 ++++---- .../ovirtSecretFieldValidator.ts | 2 +- .../vsphereSecretFieldValidator.ts | 4 +- .../components/OVAProviderCreateForm.tsx | 12 +++--- .../OpenshiftProviderCreateForm.tsx | 16 +++---- .../OpenstackProviderCreateForm.tsx | 4 +- .../components/VSphereProviderCreateForm.tsx | 41 ++++++++++-------- .../edit/OpenshiftCredentialsEdit.tsx | 15 +++---- .../edit/OpenstackCredentialsEdit.tsx | 8 ++-- ...ionCredentialNameSecretFieldsFormGroup.tsx | 2 +- .../ApplicationWithCredentialsIDFormGroup.tsx | 2 +- .../components/edit/OvirtCredentialsEdit.tsx | 20 +++++---- .../edit/VSphereCredentialsEdit.tsx | 25 ++++++----- .../list/OpenshiftCredentialsList.tsx | 5 +-- .../list/OpenstackCredentialsList.tsx | 15 ++++--- .../components/list/OvirtCredentialsList.tsx | 15 ++++--- .../list/VSphereCredentialsList.tsx | 6 +-- .../OpenstackDetailsSection.tsx | 4 +- .../DetailsSection/VSphereDetailsSection.tsx | 2 +- 22 files changed, 157 insertions(+), 135 deletions(-) diff --git a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json index 60c3706b8..0a82cfed7 100644 --- a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json +++ b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json @@ -18,7 +18,7 @@ "A user ID for connecting to the OpenStack Identity (Keystone) endpoint.": "A user ID for connecting to the OpenStack Identity (Keystone) endpoint.", "A user name for connecting to the OpenStack Identity (Keystone) endpoint.": "A user name for connecting to the OpenStack Identity (Keystone) endpoint.", "A user name for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the user name is in the format of username@user-domain. For example: admin@internal.": "A user name for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the user name is in the format of username@user-domain. For example: admin@internal.", - "A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .": "A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .", + "A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of <1>username@user-domain. For example: <4>user@vsphere.local.": "A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of <1>username@user-domain. For example: <4>user@vsphere.local.", "A user password for connecting to the OpenStack Identity (Keystone) endpoint.": "A user password for connecting to the OpenStack Identity (Keystone) endpoint.", "A user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.": "A user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.", "A user password for connecting to the vCenter API endpoint.": "A user password for connecting to the vCenter API endpoint.", @@ -126,14 +126,14 @@ "Empty": "Empty", "Endpoint": "Endpoint", "Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.": "Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.", - "Ensure the URL includes the \"/sdk\" path. For example: https://vCenter-host-example.com/sdk .": "Ensure the URL includes the \"/sdk\" path. For example: https://vCenter-host-example.com/sdk .", + "Ensure the URL includes the <2>\"/sdk\" path. For example: <5>https://vCenter-host-example.com/sdk.": "Ensure the URL includes the <2>\"/sdk\" path. For example: <5>https://vCenter-host-example.com/sdk.", "Error": "Error", "Error: Fingerprint is required and must be valid.": "Error: Fingerprint is required and must be valid.", "Error: Insecure Skip Verify must be a boolean value.": "Error: Insecure Skip Verify must be a boolean value.", "Error: Name is required and must be a unique within a namespace and valid Kubernetes name (i.e., must contain no more than 253 characters, consists of lower case alphanumeric characters , '-' or '.' and starts and ends with an alphanumeric character).": "Error: Name is required and must be a unique within a namespace and valid Kubernetes name (i.e., must contain no more than 253 characters, consists of lower case alphanumeric characters , '-' or '.' and starts and ends with an alphanumeric character).", "Error: The format of the provided application credential ID is invalid. Ensure the ID doesn't include whitespace characters.": "Error: The format of the provided application credential ID is invalid. Ensure the ID doesn't include whitespace characters.", "Error: The format of the provided application credential name is invalid. Ensure the name doesn't include whitespace characters.": "Error: The format of the provided application credential name is invalid. Ensure the name doesn't include whitespace characters.", - "Error: The format of the provided application credential Secret is invalid. Ensure the secret doesn't include whitespace characters.": "Error: The format of the provided application credential Secret is invalid. Ensure the secret doesn't include whitespace characters.", + "Error: The format of the provided application credential secret is invalid. Ensure the secret doesn't include whitespace characters.": "Error: The format of the provided application credential secret is invalid. Ensure the secret doesn't include whitespace characters.", "Error: The format of the provided CA Certificate is invalid. Ensure the CA certificate format is in a PEM encoded X.509 format.": "Error: The format of the provided CA Certificate is invalid. Ensure the CA certificate format is in a PEM encoded X.509 format.", "Error: The format of the provided CA Certificate is invalid. Ensure the CA certificate format is valid.": "Error: The format of the provided CA Certificate is invalid. Ensure the CA certificate format is valid.", "Error: The format of the provided domain name is invalid. Ensure the domain name doesn't include whitespace characters.": "Error: The format of the provided domain name is invalid. Ensure the domain name doesn't include whitespace characters.", @@ -143,14 +143,16 @@ "Error: The format of the provided token is invalid. Ensure the token doesn't include whitespace characters.": "Error: The format of the provided token is invalid. Ensure the token doesn't include whitespace characters.", "Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes service account token.": "Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes service account token.", "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://identity_service.com:5000/v3.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://identity_service.com:5000/v3.", - "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://vCenter-host-example.com/sdk .": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://vCenter-host-example.com/sdk .", + "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://vCenter-host-example.com/sdk.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://vCenter-host-example.com/sdk.", "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://rhv-host-example.com/ovirt-engine/api.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://rhv-host-example.com/ovirt-engine/api.", - "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and, optionally, a port. For example: https://api.‹your-openshift-domain›:6443.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and, optionally, a port. For example: https://api.‹your-openshift-domain›:6443.", - "Error: The format of the provided URL is invalid. Ensure the URL is in the following format: ip_or_hostname_of_nfs_server:/nfs_path. For example: 10.10.0.10:/ova .": "Error: The format of the provided URL is invalid. Ensure the URL is in the following format: ip_or_hostname_of_nfs_server:/nfs_path. For example: 10.10.0.10:/ova .", + "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and, optionally, a port. For example: <2>https://api.‹your-openshift-domain›:6443.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and, optionally, a port. For example: <2>https://api.‹your-openshift-domain›:6443.", + "Error: The format of the provided URL is invalid. Ensure the URL is in the following format: <1>ip_or_hostname_of_nfs_server:/nfs_path. For example: <4>10.10.0.10:/ova.": "Error: The format of the provided URL is invalid. Ensure the URL is in the following format: <1>ip_or_hostname_of_nfs_server:/nfs_path. For example: <4>10.10.0.10:/ova.", "Error: The format of the provided user ID is invalid. Ensure the user ID doesn't include whitespace characters.": "Error: The format of the provided user ID is invalid. Ensure the user ID doesn't include whitespace characters.", + "Error: The format of the provided user name is invalid. Ensure the user name does not include whitespace characters.": "Error: The format of the provided user name is invalid. Ensure the user name does not include whitespace characters.", "Error: The format of the provided user name is invalid. Ensure the user name doesn't include whitespace characters.": "Error: The format of the provided user name is invalid. Ensure the user name doesn't include whitespace characters.", + "Error: The format of the provided user password is invalid. Ensure the user password does not include whitespace characters.": "Error: The format of the provided user password is invalid. Ensure the user password does not include whitespace characters.", "Error: The format of the provided user password is invalid. Ensure the user password doesn't include whitespace characters.": "Error: The format of the provided user password is invalid. Ensure the user password doesn't include whitespace characters.", - "Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid container image path. For example: quay.io/kubev2v/vddk:latest.": "Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid container image path. For example: quay.io/kubev2v/vddk:latest.", + "Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest.": "Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest.", "Error: This field must be a boolean.": "Error: This field must be a boolean.", "Error: this field must be set to a boolean value.": "Error: this field must be set to a boolean value.", "Failed": "Failed", @@ -255,11 +257,10 @@ "No StorageMaps found.": "No StorageMaps found.", "No storages in this category": "No storages in this category", "Not Ready": "Not Ready", - "Note: If 'Skip certificate validation' is selected, migrations from this provider will not be secure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If 'Skip certificate validation' is selected, migrations from this provider will not be secure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.", - "Note: If 'Skip certificate validation' is selected, migrations from this provider will not be secure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If 'Skip certificate validation' is selected, migrations from this provider will not be secure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.", - "Note: If this field is checked/true, the migration from this provider will be insecure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If this field is checked/true, the migration from this provider will be insecure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.", + "Note: If <1>Skip certificate validation is selected, migrations from this provider will not be secure.<3><4> Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If <1>Skip certificate validation is selected, migrations from this provider will not be secure.<3><4> Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.", + "Note: If this field is checked/true, the migration from this provider will be insecure.<1><2> Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If this field is checked/true, the migration from this provider will be insecure.<1><2> Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.", "Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.": "Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.", - "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.

You can retrieve the Manager CA certificate at:
<1>https://‹rhv-host-example.com›/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA .": "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.

You can retrieve the Manager CA certificate at:
<1>https://‹rhv-host-example.com›/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA .", + "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate. <1><2>You can retrieve the Manager CA certificate at:<4><5>https://‹rhv-host-example.com›/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA .": "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate. <1><2>You can retrieve the Manager CA certificate at:<4><5>https://‹rhv-host-example.com›/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA .", "NUMA": "NUMA", "Number of cluster in provider": "Number of cluster in provider", "Number of data centers in provider": "Number of data centers in provider", @@ -383,7 +384,7 @@ "The limit for memory usage by the controller, specified in Megabytes (Mi). Default value is 800Mi.": "The limit for memory usage by the controller, specified in Megabytes (Mi). Default value is 800Mi.", "The maximum age in hours for must gather cleanup. Default value is -1, which implies never.": "The maximum age in hours for must gather cleanup. Default value is -1, which implies never.", "The password for the ESXi host admin": "The password for the ESXi host admin", - "The path must be empty or a valid container image path. For example: quay.io/kubev2v/vddk:latest.": "The path must be empty or a valid container image path. For example: quay.io/kubev2v/vddk:latest.", + "The path must be empty or a valid container image path. For example: <2>quay.io/kubev2v/vddk:latest.": "The path must be empty or a valid container image path. For example: <2>quay.io/kubev2v/vddk:latest.", "The provider currently requires the SHA-1 fingerprint of the vCenter Server's TLS certificate in all circumstances. vSphere calls this the server's thumbprint.": "The provider currently requires the SHA-1 fingerprint of the vCenter Server's TLS certificate in all circumstances. vSphere calls this the server's thumbprint.", "The provider is not ready - ": "The provider is not ready - ", "The provider is not ready.": "The provider is not ready.", @@ -422,20 +423,19 @@ "Updated": "Updated", "URL": "URL", "URL of the API endpoint of the Red Hat Virtualization Manager (RHVM) on which the source VM is mounted. Ensure that the URL includes the path leading to the RHVM API server, usually /ovirt-engine/api. For example, https://rhv-host-example.com/ovirt-engine/api.": "URL of the API endpoint of the Red Hat Virtualization Manager (RHVM) on which the source VM is mounted. Ensure that the URL includes the path leading to the RHVM API server, usually /ovirt-engine/api. For example, https://rhv-host-example.com/ovirt-engine/api.", - "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk.<3><4>For example, <6>https://vCenter-host-example.com/sdk.<8><9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.": "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk.<3><4>For example, <6>https://vCenter-host-example.com/sdk.<8><9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.", - "URL of the NFS file share that serves the OVA. Ensure the URL is in the following format: ip_or_hostname_of_nfs_server:/nfs_path. For example: 10.10.0.10:/ova .": "URL of the NFS file share that serves the OVA. Ensure the URL is in the following format: ip_or_hostname_of_nfs_server:/nfs_path. For example: 10.10.0.10:/ova .", + "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk.<3><4>For example: <6>https://vCenter-host-example.com/sdk.<8><9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.": "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk.<3><4>For example: <6>https://vCenter-host-example.com/sdk.<8><9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.", + "URL of the NFS file share that serves the OVA. Ensure the URL is in the following format: <2>ip_or_hostname_of_nfs_server:/nfs_path. For example: <5>10.10.0.10:/ova .": "URL of the NFS file share that serves the OVA. Ensure the URL is in the following format: <2>ip_or_hostname_of_nfs_server:/nfs_path. For example: <5>10.10.0.10:/ova .", "URL of the NFS file share that serves the OVA., for example, 10.10.0.10:/ova": "URL of the NFS file share that serves the OVA., for example, 10.10.0.10:/ova", "URL of the Openshift Virtualization API endpoint.": "URL of the Openshift Virtualization API endpoint.", "URL of the Openshift Virtualization API endpoint. Empty may be used for the host provider.": "URL of the Openshift Virtualization API endpoint. Empty may be used for the host provider.", - "URL of the Openshift Virtualization API endpoint. If both URL and Service account bearer token are left blank, the local OpenShift cluster is used.": "URL of the Openshift Virtualization API endpoint. If both URL and Service account bearer token are left blank, the local OpenShift cluster is used.", + "URL of the Openshift Virtualization API endpoint. If both <1>URL and <4>Service account bearer token are left blank, the local OpenShift cluster is used.": "URL of the Openshift Virtualization API endpoint. If both <1>URL and <4>Service account bearer token are left blank, the local OpenShift cluster is used.", "URL of the OpenStack Identity (Keystone) endpoint.": "URL of the OpenStack Identity (Keystone) endpoint.", "URL of the OpenStack Identity (Keystone) endpoint. For example: <2>https://identity_service.com:5000/v3.": "URL of the OpenStack Identity (Keystone) endpoint. For example: <2>https://identity_service.com:5000/v3.", - "URL of the OpenStack Identity (Keystone) endpoint. For example: https://identity_service.com:5000/v3.": "URL of the OpenStack Identity (Keystone) endpoint. For example: https://identity_service.com:5000/v3.", "URL of the providers API endpoint. The URL must be a valid endpoint for the provider type, see\n the documentation for each provider type to learn more about the URL format.": "URL of the providers API endpoint. The URL must be a valid endpoint for the provider type, see\n the documentation for each provider type to learn more about the URL format.", "URL of the Red Hat Virtualization Manager (RHVM) API endpoint.": "URL of the Red Hat Virtualization Manager (RHVM) API endpoint.", "URL of the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.": "URL of the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.", "URL of the vCenter API endpoint.": "URL of the vCenter API endpoint.", - "URL of the vCenter API endpoint. Ensure the URL includes the \"/sdk\" path. For example: https://vCenter-host-example.com/sdk .": "URL of the vCenter API endpoint. Ensure the URL includes the \"/sdk\" path. For example: https://vCenter-host-example.com/sdk .", + "URL of the vCenter API endpoint. Ensure the URL includes the <2>\"/sdk\" path. For example: <5>https://vCenter-host-example.com/sdk.": "URL of the vCenter API endpoint. Ensure the URL includes the <2>\"/sdk\" path. For example: <5>https://vCenter-host-example.com/sdk.", "User ID": "User ID", "Username": "Username", "Validation Failed": "Validation Failed", @@ -444,8 +444,8 @@ "View details": "View details", "View provider details": "View provider details", "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path in the format of <2>registry_route_or_server_path/vddk:‹tag›.<4><5>For example: <7>quay.io/kubev2v/example:latest.<9><10>It is strongly recommended to specify a VDDK init image to accelerate migrations.": "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path in the format of <2>registry_route_or_server_path/vddk:‹tag›.<4><5>For example: <7>quay.io/kubev2v/example:latest.<9><10>It is strongly recommended to specify a VDDK init image to accelerate migrations.", - "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path. For example: quay.io/kubev2v/vddk:latest.": "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path. For example: quay.io/kubev2v/vddk:latest.", - "Virtual Disk Development Kit (VDDK) container init image path.

Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.": "Virtual Disk Development Kit (VDDK) container init image path.

Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.", + "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest.": "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest.", + "Virtual Disk Development Kit (VDDK) container init image path.<1><2>Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.": "Virtual Disk Development Kit (VDDK) container init image path.<1><2>Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.", "Virtual Machine Migrations": "Virtual Machine Migrations", "Virtual machines": "Virtual machines", "Virtual Machines": "Virtual Machines", @@ -458,8 +458,8 @@ "Warning: The provided URL does not end with the API endpoint path: <2>\"/v3\". Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3.": "Warning: The provided URL does not end with the API endpoint path: <2>\"/v3\". Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3.", "Warning: The provided URL does not end with the API endpoint path:<1>\"/v3\". Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3.": "Warning: The provided URL does not end with the API endpoint path:<1>\"/v3\". Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3.", "Warning: The provided URL does not end with the RHVM API endpoint path: \"/ovirt-engine/api\". Ensure the URL includes the correct path. For example: https://rhv-host-example.com/ovirt-engine/api.": "Warning: The provided URL does not end with the RHVM API endpoint path: \"/ovirt-engine/api\". Ensure the URL includes the correct path. For example: https://rhv-host-example.com/ovirt-engine/api.", - "Warning: The provided URL does not end with the SDK endpoint path: \"/sdk\". Ensure the URL includes the correct path. For example: https://vCenter-host-example.com/sdk .": "Warning: The provided URL does not end with the SDK endpoint path: \"/sdk\". Ensure the URL includes the correct path. For example: https://vCenter-host-example.com/sdk .", - "Warning: The provided user name does not include the user domain. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .": "Warning: The provided user name does not include the user domain. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .", + "Warning: The provided URL does not end with the SDK endpoint path: <2>\"/sdk\". Ensure the URL includes the correct path. For example: <5>https://vCenter-host-example.com/sdk.": "Warning: The provided URL does not end with the SDK endpoint path: <2>\"/sdk\". Ensure the URL includes the correct path. For example: <5>https://vCenter-host-example.com/sdk.", + "Warning: The provided user name does not include the user domain. Ensure the user name is in the format of <1>username@user-domain. For example: <4>user@vsphere.local.": "Warning: The provided user name does not include the user domain. Ensure the user name is in the format of <1>username@user-domain. For example: <4>user@vsphere.local.", "Warning: The provided user name does not include the user domain. Ensure the user name is in the format of username@user-domain. For example: admin@internal.": "Warning: The provided user name does not include the user domain. Ensure the user name is in the format of username@user-domain. For example: admin@internal.", "Welcome": "Welcome", "When a plan is archived, its history, metadata, and logs are deleted. The plan cannot be edited or restarted but it can be viewed.": "When a plan is archived, its history, metadata, and logs are deleted. The plan cannot be edited or restarted but it can be viewed.", diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx index 9815cad16..5136619cd 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx @@ -19,8 +19,8 @@ export const OpenshiftEditURLModal: React.FC = (props
Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a - domain name, and, optionally, a port. For example: {''} - https://api.‹your-openshift-domain›:6443{''}. + domain name, and, optionally, a port. For example:{' '} + https://api.‹your-openshift-domain›:6443.
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx index 267b6e39b..79b49a4bc 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx @@ -18,36 +18,43 @@ export const VSphereEditURLModal: React.FC = (props) error: (
- { - 'Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://vCenter-host-example.com/sdk .' - } + Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a + domain name, and a path. For example:{' '} + https://vCenter-host-example.com/sdk.
), warning: (
- { - 'Warning: The provided URL does not end with the SDK endpoint path: "/sdk". Ensure the URL includes the correct path. For example: https://vCenter-host-example.com/sdk .' - } + Warning: The provided URL does not end with the SDK endpoint path:{' '} + + {'"'}/sdk{'"'} + + . Ensure the URL includes the correct path. For example:{' '} + https://vCenter-host-example.com/sdk.
), success: (
- { - 'Ensure the URL includes the "/sdk" path. For example: https://vCenter-host-example.com/sdk .' - } + Ensure the URL includes the{' '} + + {'"'}/sdk{'"'} + {' '} + path. For example: https://vCenter-host-example.com/sdk.
), default: (
- { - 'Ensure the URL includes the "/sdk" path. For example: https://vCenter-host-example.com/sdk .' - } + Ensure the URL includes the{' '} + + {'"'}/sdk{'"'} + {' '} + path. For example: https://vCenter-host-example.com/sdk.
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx index a63e47f09..0c5b2f4f5 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx @@ -62,23 +62,23 @@ const EditProviderVDDKImage_: React.FC = (props) =>
Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid - container image path. For example: {''}quay.io/kubev2v/vddk:latest{''}. + container image path. For example: quay.io/kubev2v/vddk:latest.
), success: (
- The path must be empty or a valid container image path. For example: {''} - quay.io/kubev2v/vddk:latest{''}. + The path must be empty or a valid container image path. For example:{' '} + quay.io/kubev2v/vddk:latest.
), default: (
- The path must be empty or a valid container image path. For example: {''} - quay.io/kubev2v/vddk:latest{''}. + The path must be empty or a valid container image path. For example:{' '} + quay.io/kubev2v/vddk:latest.
), @@ -108,9 +108,10 @@ const EditProviderVDDKImage_: React.FC = (props) => model={ProviderModel} body={ - { - 'Virtual Disk Development Kit (VDDK) container init image path.

Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.' - } + Virtual Disk Development Kit (VDDK) container init image path. +
+
+ Note: It is strongly recommended to specify a VDDK init image to accelerate migrations. } helperText={vddkHelperTextMsgs.default} diff --git a/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/ovirtSecretFieldValidator.ts b/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/ovirtSecretFieldValidator.ts index 3614a8856..ab6067e83 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/ovirtSecretFieldValidator.ts +++ b/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/ovirtSecretFieldValidator.ts @@ -10,7 +10,7 @@ import { validateNoSpaces, validatePublicCert, validateUsernameAndDomain } from * @return {Validation} - The validation state of the form field. Can be one of the following: * 'default' - The default state of the form field, used when the field is empty or a value hasn't been entered yet. * 'success' - The field's value has passed validation. - * 'warning' - The field's value might fail the validation, but it's not mandatory and not disabling the form saving. + * 'warning' - The field's value has passed validation but does not fit the standard format, it's the user's choice if to accept that value. * 'error' - The field's value has failed validation. */ export const ovirtSecretFieldValidator = (id: string, value: string) => { diff --git a/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/vsphereSecretFieldValidator.ts b/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/vsphereSecretFieldValidator.ts index d6225d888..ac9057380 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/vsphereSecretFieldValidator.ts +++ b/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret-fields/vsphereSecretFieldValidator.ts @@ -8,10 +8,10 @@ import { validateFingerprint, validateNoSpaces, validateUsernameAndDomain } from * @param {string} value - The value of the form field. * * @return {Validation} - The validation state of the form field. Can be one of the following: - * 'default' - The default state of the form field, used when the field is empty or a value hasn't been entered yet. + * 'default' - The default state of the form field, used when the field is empty or a value has not been entered yet. * 'success' - The field's value has passed validation. * 'error' - The field's value has failed validation. - * 'warning' - The field's value might fail the validation, but it's not mandatory and not disabling the form saving. + * 'warning' - The field's value has passed validation but does not fit the standard format, it's the user's choice if to accept that value. */ export const vsphereSecretFieldValidator = (id: string, value: string) => { const trimmedValue = value.trim(); diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx index b3743c2c7..e12d68364 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx @@ -24,8 +24,8 @@ export const OVAProviderCreateForm: React.FC = ({
Error: The format of the provided URL is invalid. Ensure the URL is in the following - format: {''}ip_or_hostname_of_nfs_server:/nfs_path{''}. For example:{' '} - {''}10.10.0.10:/ova{''} . + format: ip_or_hostname_of_nfs_server:/nfs_path. For example:{' '} + 10.10.0.10:/ova.
), @@ -33,8 +33,8 @@ export const OVAProviderCreateForm: React.FC = ({
URL of the NFS file share that serves the OVA. Ensure the URL is in the following format:{' '} - {''}ip_or_hostname_of_nfs_server:/nfs_path{''}. For example: {''} - 10.10.0.10:/ova{''} . + ip_or_hostname_of_nfs_server:/nfs_path. For example:{' '} + 10.10.0.10:/ova .
), @@ -42,8 +42,8 @@ export const OVAProviderCreateForm: React.FC = ({
URL of the NFS file share that serves the OVA. Ensure the URL is in the following format:{' '} - {''}ip_or_hostname_of_nfs_server:/nfs_path{''}. For example: {''} - 10.10.0.10:/ova{''} . + ip_or_hostname_of_nfs_server:/nfs_path. For example:{' '} + 10.10.0.10:/ova .
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx index c7f33c26e..829f9eccc 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx @@ -24,26 +24,26 @@ export const OpenshiftProviderFormCreate: React.FC Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a - domain name, and, optionally, a port. For example: {''} - https://api.‹your-openshift-domain›:6443{''}. + domain name, and, optionally, a port. For example:{' '} + https://api.‹your-openshift-domain›:6443. ), success: (
- { - 'URL of the Openshift Virtualization API endpoint. If both URL and Service account bearer token are left blank, the local OpenShift cluster is used.' - } + URL of the Openshift Virtualization API endpoint. If both URL and{' '} + Service account bearer token are left blank, the local OpenShift cluster + is used.
), default: (
- { - 'URL of the Openshift Virtualization API endpoint. If both URL and Service account bearer token are left blank, the local OpenShift cluster is used.' - } + URL of the Openshift Virtualization API endpoint. If both URL and{' '} + Service account bearer token are left blank, the local OpenShift cluster + is used.
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx index da9fe8988..f922069f6 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx @@ -52,8 +52,8 @@ export const OpenstackProviderCreateForm: React.FC - URL of the OpenStack Identity (Keystone) endpoint. For example: {''} - https://identity_service.com:5000/v3{''}. + URL of the OpenStack Identity (Keystone) endpoint. For example:{' '} + https://identity_service.com:5000/v3. ), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx index 687505a6f..1a7fb994e 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx @@ -25,36 +25,43 @@ export const VSphereProviderCreateForm: React.FC error: (
- { - 'Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://vCenter-host-example.com/sdk .' - } + Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a + domain name, and a path. For example:{' '} + https://vCenter-host-example.com/sdk.
), warning: (
- { - 'Warning: The provided URL does not end with the SDK endpoint path: "/sdk". Ensure the URL includes the correct path. For example: https://vCenter-host-example.com/sdk .' - } + Warning: The provided URL does not end with the SDK endpoint path:{' '} + + {'"'}/sdk{'"'} + + . Ensure the URL includes the correct path. For example:{' '} + https://vCenter-host-example.com/sdk.
), success: (
- { - 'URL of the vCenter API endpoint. Ensure the URL includes the "/sdk" path. For example: https://vCenter-host-example.com/sdk .' - } + URL of the vCenter API endpoint. Ensure the URL includes the{' '} + + {'"'}/sdk{'"'} + {' '} + path. For example: https://vCenter-host-example.com/sdk.
), default: (
- { - 'URL of the vCenter API endpoint. Ensure the URL includes the "/sdk" path. For example: https://vCenter-host-example.com/sdk .' - } + URL of the vCenter API endpoint. Ensure the URL includes the{' '} + + {'"'}/sdk{'"'} + {' '} + path. For example: https://vCenter-host-example.com/sdk.
), @@ -65,7 +72,7 @@ export const VSphereProviderCreateForm: React.FC
Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid - container image path. For example: {''}quay.io/kubev2v/vddk:latest{''}. + container image path. For example: quay.io/kubev2v/vddk:latest.
), @@ -73,8 +80,7 @@ export const VSphereProviderCreateForm: React.FC
Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a - valid container image path. For example: {''}quay.io/kubev2v/vddk:latest - {''}. + valid container image path. For example: quay.io/kubev2v/vddk:latest.
), @@ -82,8 +88,7 @@ export const VSphereProviderCreateForm: React.FC
Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a - valid container image path. For example: {''}quay.io/kubev2v/vddk:latest - {''}. + valid container image path. For example: quay.io/kubev2v/vddk:latest.
), @@ -91,7 +96,7 @@ export const VSphereProviderCreateForm: React.FC const vddkHelperTextPopover = ( - {'Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.'} + Note: It is strongly recommended to specify a VDDK init image to accelerate migrations. ); diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx index 4f5d90124..9cce2c45a 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx @@ -23,27 +23,24 @@ export const OpenshiftCredentialsEdit: React.FC = ({ secret, error: (
- { - 'Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes service account token.' - } + Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes + service account token.
), success: (
- { - 'A service account token with cluster admin privileges, required for authenticating the connection to the API server.' - } + A service account token with cluster admin privileges, required for authenticating the + connection to the API server.
), default: (
- { - 'A service account token with cluster admin privileges, required for authenticating the connection to the API server.' - } + A service account token with cluster admin privileges, required for authenticating the + connection to the API server.
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx index 4f341b5d1..e723be74a 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx @@ -49,9 +49,11 @@ export const OpenstackCredentialsEdit: React.FC = ({ secret, const insecureSkipVerifyHelperTextPopover = ( - Note: If {"'"}Skip certificate validation{"'"} is selected, migrations from this provider will - not be secure.{'

'}Insecure migration means that the transferred data is sent over an - insecure connection and potentially sensitive data could be exposed. + Note: If Skip certificate validation is selected, migrations from this + provider will not be secure. +
+
Insecure migration means that the transferred data is sent over an insecure connection + and potentially sensitive data could be exposed. ); diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx index e79fcdae7..6c67cb934 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx @@ -108,7 +108,7 @@ export const ApplicationCredentialNameSecretFieldsFormGroup: React.FC diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx index 6fa8f9083..123028e77 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx @@ -104,7 +104,7 @@ export const ApplicationWithCredentialsIDFormGroup: React.FC 'OpenStack application credential Secret needed for the application credential authentication.', )} helperTextInvalid={t( - "Error: The format of the provided application credential Secret is invalid. Ensure the secret doesn't include whitespace characters.", + "Error: The format of the provided application credential secret is invalid. Ensure the secret doesn't include whitespace characters.", )} validated={state.validation.applicationCredentialSecret} > diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx index e90d21151..871029f84 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx @@ -35,7 +35,7 @@ export const OvirtCredentialsEdit: React.FC = ({ secret, onC const usernameHelperTextMsgs = { error: t( - "Error: The format of the provided user name is invalid. Ensure the user name doesn't include whitespace characters.", + 'Error: The format of the provided user name is invalid. Ensure the user name does not include whitespace characters.', ), warning: t( 'Warning: The provided user name does not include the user domain. Ensure the user name is in the format of username@user-domain. For example: admin@internal.', @@ -47,7 +47,7 @@ export const OvirtCredentialsEdit: React.FC = ({ secret, onC const passwordHelperTextMsgs = { error: t( - "Error: The format of the provided user password is invalid. Ensure the user password doesn't include whitespace characters.", + 'Error: The format of the provided user password is invalid. Ensure the user password does not include whitespace characters.', ), success: t( 'A user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.', @@ -71,17 +71,21 @@ export const OvirtCredentialsEdit: React.FC = ({ secret, onC const insecureSkipVerifyHelperTextPopover = ( - { - "Note: If 'Skip certificate validation' is selected, migrations from this provider will not be secure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed." - } + Note: If Skip certificate validation is selected, migrations from this + provider will not be secure. +
+
Insecure migration means that the transferred data is sent over an insecure connection + and potentially sensitive data could be exposed. ); const cacertHelperTextPopover = ( - { - 'Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.

You can retrieve the Manager CA certificate at:
' - } + Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in + which case use the Manager Apache CA certificate.
+
+ You can retrieve the Manager CA certificate at: +
= ({ secret, o error: (
- { - "Error: The format of the provided user name is invalid. Ensure the user name doesn't include whitespace characters." - } + Error: The format of the provided user name is invalid. Ensure the user name does not + include whitespace characters.
), warning: (
- { - 'Warning: The provided user name does not include the user domain. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .' - } + Warning: The provided user name does not include the user domain. Ensure the user name is + in the format of username@user-domain. For example:{' '} + user@vsphere.local.
), success: (
- { - 'A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .' - } + A user name for connecting to the vCenter API endpoint. Ensure the user name is in the + format of username@user-domain. For example:{' '} + user@vsphere.local.
), default: (
- { - 'A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .' - } + A user name for connecting to the vCenter API endpoint. Ensure the user name is in the + format of username@user-domain. For example:{' '} + user@vsphere.local.
), @@ -63,7 +62,7 @@ export const VSphereCredentialsEdit: React.FC = ({ secret, o const passwordHelperTextMsgs = { error: t( - "Error: The format of the provided user password is invalid. Ensure the user password doesn't include whitespace characters.", + 'Error: The format of the provided user password is invalid. Ensure the user password does not include whitespace characters.', ), success: t('A user password for connecting to the vCenter API endpoint.'), }; diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx index 329870525..1d9c27112 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx @@ -19,9 +19,8 @@ export const OpenshiftCredentialsList: React.FC = ({ secret, description: (
- { - 'A service account token with cluster admin privileges, required for authenticating the connection to the API server.' - } + A service account token with cluster admin privileges, required for authenticating the + connection to the API server.
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx index 8df2ef067..47c48b856 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx @@ -65,7 +65,8 @@ export const OpenstackCredentialsList: React.FC = ({ secret, helperTextPopover: ( Note: If this field is checked/true, the migration from this provider will be insecure. - {'

'} Insecure migration means that the transferred data is sent over an insecure +
+
Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed. ), @@ -97,7 +98,8 @@ export const OpenstackCredentialsList: React.FC = ({ secret, helperTextPopover: ( Note: If this field is checked/true, the migration from this provider will be insecure. - {'

'} Insecure migration means that the transferred data is sent over an insecure +
+
Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed. ), @@ -130,7 +132,8 @@ export const OpenstackCredentialsList: React.FC = ({ secret, helperTextPopover: ( Note: If this field is checked/true, the migration from this provider will be insecure. - {'

'} Insecure migration means that the transferred data is sent over an insecure +
+
Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed. ), @@ -168,7 +171,8 @@ export const OpenstackCredentialsList: React.FC = ({ secret, helperTextPopover: ( Note: If this field is checked/true, the migration from this provider will be insecure. - {'

'} Insecure migration means that the transferred data is sent over an insecure +
+
Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed. ), @@ -208,7 +212,8 @@ export const OpenstackCredentialsList: React.FC = ({ secret, helperTextPopover: ( Note: If this field is checked/true, the migration from this provider will be insecure. - {'

'} Insecure migration means that the transferred data is sent over an insecure +
+
Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed. ), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx index 0de70c421..e33232afb 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx @@ -39,9 +39,10 @@ export const OvirtCredentialsList: React.FC = ({ secret, rev description: t("If true, the provider's CA certificate won't be validated."), helperTextPopover: ( - { - "Note: If 'Skip certificate validation' is selected, migrations from this provider will not be secure.

Insecure migration means that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed." - } + Note: If this field is checked/true, the migration from this provider will be insecure. +
+
Insecure migration means that the transferred data is sent over an insecure + connection and potentially sensitive data could be exposed. ), }, @@ -52,9 +53,11 @@ export const OvirtCredentialsList: React.FC = ({ secret, rev ), helperTextPopover: ( - { - 'Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.

You can retrieve the Manager CA certificate at:
' - } + Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, + in which case use the Manager Apache CA certificate.
+
+ You can retrieve the Manager CA certificate at: +
= ({ secret, r description: (
- { - 'A user name for connecting to the vCenter API endpoint. Ensure the user name is in the format of username@user-domain. For example: user@vsphere.local .' - } + A user name for connecting to the vCenter API endpoint. Ensure the user name is in the + format of username@user-domain. For example:{' '} + user@vsphere.local.
), diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx index 82434eafb..3f187aba1 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx @@ -41,8 +41,8 @@ export const OpenstackDetailsSection: React.FC = ({ data }) canPatch={permissions.canPatch} helpContent={ - URL of the OpenStack Identity (Keystone) endpoint. For example: {''} - https://identity_service.com:5000/v3{''}. + URL of the OpenStack Identity (Keystone) endpoint. For example:{' '} + https://identity_service.com:5000/v3. } /> diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx index e8f7c0248..b09b9c57d 100644 --- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx +++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx @@ -50,7 +50,7 @@ export const VSphereDetailsSection: React.FC = ({ data }) = URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually /sdk.

- For example, https://vCenter-host-example.com/sdk.
+ For example: https://vCenter-host-example.com/sdk.

If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.