Merged in bugfix/SHIBUI-2178 (pull request #548)

Fixed placeholder text problems Approved-by: Bill Smith Approved-by: Jonathan Johnson
TIER · Nov 1, 2021 · e9f6a8c · e9f6a8c
2 parents bc8ea11 + 9fc2a1e
commit e9f6a8c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 deletions.
diff --git a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json
@@ -9,7 +9,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string"
         },
         "@type": {

diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json
@@ -9,7 +9,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",

diff --git a/backend/src/main/resources/filebacked-http-metadata-provider.schema.json b/backend/src/main/resources/filebacked-http-metadata-provider.schema.json
@@ -28,7 +28,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -76,6 +76,8 @@ action.roles=Roles
 action.source-role=Role
 action.select-bundle=Select Bundle
 
+action.get-latest=Get latest
+
 value.enabled=Enabled
 value.disabled=Disabled
 value.current=Current
@@ -664,7 +666,7 @@ tooltip.max-cache-entry-size=The maximum response body size that may be cached,
 tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
 tooltip.metadata-provider-type=Metadata Provider Type
 tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
-tooltip.metadata-url=Identifier for logging, identification for command line reload, etc.
+tooltip.metadata-url=The URL that the metadata is served from.
 tooltip.metadata-file=The absolute path to the local metadata file to be loaded.
 tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file.  If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size.
 tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.
@@ -720,4 +722,6 @@ tooltip.group-name=Group Name
 tooltip.group-description=Group Description
 
 tooltip.role-name=Role Name
-tooltip.role-description=Role Description
+tooltip.role-description=Role Description
+
+tooltip.contact-information=Contact Information
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -513,7 +513,7 @@ tooltip.max-cache-entry-size=The maximum response body size that may be cached,
 tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
 tooltip.metadata-provider-type=Metadata Provider Type
 tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
-tooltip.metadata-url=Identifier for logging, identification for command line reload, etc.
+tooltip.metadata-url=The URL that the metadata is served from.
 tooltip.metadata-file=The absolute path to the local metadata file to be loaded.
 tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file.  If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size.
 tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.

diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
@@ -9,7 +9,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",

diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -162,7 +162,7 @@ const FilterTargetField = ({
                                 <i className="fa fa-asterisk text-danger" aria-hidden="true"></i>
                             </span>
                             <span>
-                                <InfoIcon value={translate('label.search-criteria-by', translate(displayType))}></InfoIcon>
+                                <InfoIcon value={translate('label.search-criteria-by')} params={{ displayType: translate(displayType) }}></InfoIcon>
                             </span>
                         </label>
                         <div className="d-flex justify-content-between">

diff --git a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js
@@ -98,8 +98,6 @@ const AttributeReleaseWidget = ({
 
     const [bundle, setBundle] = React.useState();
 
-    React.useEffect(() => console.log(bundle), [bundle]);
-
     const onMouseOver = (opt) => setBundle(opt);
     const onMouseOut = () => setBundle(null);
 

diff --git a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js
@@ -11,7 +11,7 @@ export const BaseFilterDefinition = {
 
         return (formData, errors) => {
             if (names.indexOf(formData.name) > -1) {
-                errors.name.addError('message.name-unique');
+                errors.name.addError('message.name-must-be-unique');
             }
 
             if (formData.hasOwnProperty(targetProp)) {

diff --git a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js
@@ -84,7 +84,7 @@ export function MetadataProviderTypeSelector({ type, types = [], children}) {
                                 <Form.Group className={errors.name ? 'text-danger' : ''}>
                                     <Form.Label>
                                         <span><Translate value={'label.metadata-provider-name-dashboard-display-only'} /></span>
-                                        <InfoIcon value="tooltip.metadata-provider-name-dashboard-display-only" />
+                                        <InfoIcon value="tooltip.metadata-provider-name" />
                                     </Form.Label>
                                     <Form.Control
                                         isInvalid={errors.name}

diff --git a/ui/src/testing/dynamic-http.schema.js b/ui/src/testing/dynamic-http.schema.js