Updated tooltips for Metadata Sources and filters

Former-commit-id: 82ba43969aae58b68c4453931bcf4470949dcf16

backend/src/main/resources/i18n/messages.properties

@@ -615,56 +615,57 @@ message.session-timeout-heading=Session timed out
 message.session-timeout-body=Your session has timed out. Please login again.
 message.session-timeout=An error has occurred while saving. Your session may have timed out.
 
-tooltip.entity-id=Entity ID
+tooltip.entity-id=An entityID is the SAML identifier that uniquely names a service provider.
 tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
-tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process
+tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process.
 tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
 tooltip.service-provider-entity-id=Service Provider Entity ID
-tooltip.organization-name=Organization Name
-tooltip.organization-display-name=Organization Display Name
-tooltip.organization-url=Organization URL
+tooltip.organization-name=Name of the organization standing up the entity.
+tooltip.organization-display-name=Name of the organization standing up the entity to be used for display purposes.
+tooltip.organization-url=URL of the organization standing up the entity.
 tooltip.name=Name
 tooltip.type=Type
 tooltip.email-address=Email Address
-tooltip.assertion-consumer-service-location=Assertion Consumer Service Location
-tooltip.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
-tooltip.mark-as-default=Mark as Default
-tooltip.protocol-support-enumeration=Protocol Support Enumeration
-tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
-tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+tooltip.assertion-consumer-service-location=Path used to invoke handler (when appended to the base handlerURL).
+tooltip.assertion-consumer-service-location-binding=The binding attribute of the <md:AssertionConsumerService> element is a standard URI specified in the SAML 2.0 Binding specification.
+tooltip.assertion-consumer-service-endpoints=An Assertion Consumer Service (or ACS) is SAML terminology for the location at a ServiceProvider that accepts <samlp:Response> messages (or SAML artifacts) for the purpose of establishing a session based on an assertion.
+tooltip.mark-as-default=Whether to mark this endpoint as the default by setting the "isDefault" property.
+tooltip.protocol-support-enumeration=This attribute contains a space-delimited collection of URIs that represent general classes of protocol support for the role in question. There are URIs defined by the various standards and profiles to represent the fact that an entity acting in a role "supports" a particular protocol family, such as SAML 2.0 or the Shibboleth profile of SAML 1.1.
+tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or <ConditionRef> elements.
+tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata is enabled for integration with the IdP
 tooltip.is-there-a-x509-certificate=Is there a X509 Certificate?
-tooltip.authentication-requests-signed=Authentication Requests Signed
-tooltip.want-assertions-signed=Want Assertions Signed
-tooltip.certificate-name=Certificate Name
-tooltip.certificate-type=Certificate Type
-tooltip.certificate=Certificate
-tooltip.logout-endpoints=Logout Endpoints
-tooltip.logout-endpoints-url=Logout Endpoints Url
-tooltip.logout-endpoints-binding-type=Logout Endpoints Binding Type
-tooltip.url=Logout Endpoints Url
-tooltip.binding-type=Logout Endpoints Binding Type
+tooltip.authentication-requests-signed=Whether to sign requests.
+tooltip.want-assertions-signed=Whether to sign assertions. Element declares that the service provider wants the <saml:Assertion> element to be digitally signed.
+tooltip.certificate-name=Value used by the IDP UI to identify certificates.
+tooltip.certificate-type=Describes the use to which the credential will be put (as defined by the SAML standard)
+tooltip.certificate=A certificate containing a public key to use to require and verify an XML signature over the resource.
+tooltip.logout-endpoints=If your SP supports SAML 2.0 Single Logout, you will need to include one or more <md:SingleLogoutService> endpoint elements in the metadata.
+tooltip.logout-endpoints-url=The location of the handler (when combined with the base handlerURL). This is the location to which an IdP sends messages using whatever protocol and binding it shares with the SP. Each combination of SLO protocol and binding is installed at a unique location to improve efficiency.
+tooltip.logout-endpoints-binding-type=Identifies the protocol binding supported by the handler. Bindings describe how the message is packaged by the IdP (or by the browser in some cases) for consumption by the handler.
+tooltip.url=The location of the handler (when combined with the base handlerURL). This is the location to which an IdP sends messages using whatever protocol and binding it shares with the SP. Each combination of SLO protocol and binding is installed at a unique location to improve efficiency.
+tooltip.binding-type=Identifies the protocol binding supported by the handler. Bindings describe how the message is packaged by the IdP (or by the browser in some cases) for consumption by the handler.
 tooltip.mdui-display-name=Typically, the IdP Display Name field will be presented on IdP discovery service interfaces.
 tooltip.mdui-information-url=The IdP Information URL is a link to a comprehensive information page about the IdP. This page should expand on the content of the IdP Description field.
 tooltip.mdui-description=The IdP Description is a brief description of the IdP service. On a well-designed discovery interface, the IdP Description will be presented to the user in addition to the IdP Display Name, and so the IdP Description helps disambiguate duplicate or similar IdP Display Names.
 tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to the IdP\u0027s Privacy Statement. The content of the Privacy Statement should be targeted at end users.
 tooltip.mdui-logo-url=The IdP Logo URL in metadata points to an image file on a remote server. A discovery service, for example, may rely on a visual cue (i.e., a logo) instead of or in addition to the IdP Display Name.
 tooltip.mdui-logo-width=The logo should have a minimum width of 100 pixels
 tooltip.mdui-logo-height=The logo should have a minimum height of 75 pixels and a maximum height of 150 pixels (or the application will scale it proportionally)
-tooltip.contact-name=Contact Name
-tooltip.contact-type=Contact Type
-tooltip.contact-email=Contact Email
-tooltip.sign-assertion=Sign Assertion
-tooltip.dont-sign-response=Don\u0027t Sign Response
-tooltip.turn-off-encryption=Turn Off Encryption of Response
-tooltip.usa-sha-algorithm=Use SHA1 Signing Algorithm
-tooltip.authentication-methods-to-use=Authentication Methods to Use
-tooltip.ignore-auth-method=Ignore any SP-Requested Authentication Method
-tooltip.omit-not-before-condition=Omit Not Before Condition
-tooltip.responder-id=ResponderId
+tooltip.contact-name=The given name of the contact.
+tooltip.contact-type=Type / role of the contact.
+tooltip.contact-email=Email address of the contact.
+tooltip.sign-assertion=Sign Assertion declares that the service provider wants the <saml:Assertion> element to be digitally signed.
+tooltip.dont-sign-response=Don\u0027t Sign Response.
+tooltip.turn-off-encryption=Whether to turn off encryption of the response.
+tooltip.usa-sha-algorithm=Whether to use the SHA1 Signing Algorithm.
+tooltip.authentication-methods-to-use=The method used to authenticate the subject.
+tooltip.ignore-auth-method=Whether to ignore any SP-Requested Authentication Method.
+tooltip.omit-not-before-condition=Whether to include a NotBefore attribute in assertions.
+tooltip.responder-id=Identifier of the selected SAML IdP entity.
 tooltip.instruction=Information icon
 tooltip.attribute-release-table=Attribute release table - select the attributes you want to release (default unchecked)
 tooltip.metadata-filter-name=Metadata Filter Name
-tooltip.metadata-filter-type=Metadata Filter Type
+tooltip.metadata-filter-type=The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute.
 tooltip.connection-request-timeout=The maximum amount of time to wait for a connection to be returned from the HTTP client\u0027s connection pool manager. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
 tooltip.connection-timeout=The maximum amount of time to wait to establish a connection with the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
 tooltip.socket-timeout=The maximum amount of time to wait between two consecutive packets while reading from the socket connected to the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
@@ -690,7 +691,7 @@ tooltip.require-valid-metadata=Whether candidate metadata found by the resolver
 tooltip.fail-fast-init=Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
 tooltip.use-default-predicate-reg=Flag which determines whether the default CriterionPredicateRegistry will be used if a custom one is not supplied explicitly.
 tooltip.satisfy-any-predicates=Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).
-tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP.
 
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
@@ -706,9 +707,9 @@ tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be pe
 tooltip.expiration-warning-threshold=For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.
 
 tooltip.filter-name=Filter Name
-tooltip.enable-filter=Enable Filter?
+tooltip.enable-filter=If checkbox is clicked, the metadata filter is enabled for integration with the IdP.
 tooltip.enable-service=A boolean value representing whether or not this metadata should be enabled within the Shibboleth IDP UI.
-
+tooltip.search-by=Indicates the type of search to be performed.
 tooltip.min-cache-duration=The minimum duration for which metadata will be cached before it is refreshed.
 tooltip.max-cache-duration=The maximum duration for which metadata will be cached before it is refreshed.
 tooltip.max-idle-entity-data=The maximum duration for which metadata will be allowed to be idle (no requests for it) before it is removed from the cache.
@@ -739,4 +740,4 @@ tooltip.group-description=Group Description
 tooltip.role-name=Role Name
 tooltip.role-description=Role Description
 
-tooltip.contact-information=Contact Information
+tooltip.contact-information=Contacts provide information about how to contact the organization responsible for standing up the entity.

backend/src/main/resources/metadata-sources-ui-schema.json

@@ -102,7 +102,7 @@
         },
         "assertionConsumerServices": {
             "title": "label.assertion-consumer-service-endpoints",
-            "description": "",
+            "description": "tooltip.assertion-consumer-service-endpoints",
             "type": "array",
             "items": {
                 "$ref": "#/definitions/AssertionConsumerService"

ui/src/app/form/component/fields/FilterTargetField.js

@@ -145,7 +145,7 @@ const FilterTargetField = ({
                         <label htmlFor={id} className="d-flex justify-content-start align-items-center control-label">
                             <Translate value="action.search-by">Search By</Translate>
                             <FontAwesomeIcon icon={faAsterisk} className="text-danger ms-1 me-2" />
-                            <InfoIcon value={translate('action.search-by')}></InfoIcon>
+                            <InfoIcon value={translate('tooltip.search-by')}></InfoIcon>
                         </label>
                         <Dropdown>
                             <Dropdown.Toggle variant="outline-secondary" id={`dropdown-${type.title}`}>
@@ -170,7 +170,7 @@ const FilterTargetField = ({
                                 <i className="fa fa-asterisk text-danger" aria-hidden="true"></i>
                             </span>
                             <span>
-                                <InfoIcon value={translate('label.search-criteria-by')} params={{ displayType: translate(displayType) }}></InfoIcon>
+                                <InfoIcon value={translate('label.search-criteria-by', { displayType: translate(displayType) })}></InfoIcon>
                             </span>
                         </label>
                         <div className="d-flex justify-content-between">

ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js

@@ -41,8 +41,8 @@ export function MetadataFilterTypeSelector({ types = [], children, actions}) {
                             <Form onSubmit={handleSubmit()}>
                                 <Form.Group className="mb-0">
                                     <Form.Label>
-                                        <span><Translate value={'label.metadata-provider-type'} /></span>
-                                        <InfoIcon value="tooltip.metadata-provider-type" />
+                                        <span><Translate value={'label.metadata-filter-type'} /></span>
+                                        <InfoIcon value="tooltip.metadata-filter-type" />
                                     </Form.Label>
                                     <Form.Select
                                         defaultValue={''}