From fea89d1e5778b49457102e78128c7f719d7a526c Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 25 Oct 2021 09:10:18 -0700 Subject: [PATCH 1/4] Fixed placeholder text problems --- .../resources/dynamic-http-metadata-provider.schema.json | 2 +- .../resources/file-system-metadata-provider.schema.json | 2 +- .../resources/filebacked-http-metadata-provider.schema.json | 2 +- backend/src/main/resources/i18n/messages.properties | 6 ++++-- backend/src/main/resources/i18n/messages_en.properties | 2 +- .../resources/local-dynamic-metadata-provider.schema.json | 2 +- ui/src/app/form/component/fields/FilterTargetField.js | 2 +- .../domain/filter/definition/BaseFilterDefinition.js | 2 +- 8 files changed, 11 insertions(+), 9 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 index 8be8bbf9b..dd03b63da 100644 --- 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 index d238018b9..7969495f2 100644 --- 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 index 9ce22ca94..f678ee306 100644 --- 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 index 4c22a97ff..d77f9be0f 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -662,7 +662,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. @@ -718,4 +718,6 @@ tooltip.group-name=Group Name tooltip.group-description=Group Description tooltip.role-name=Role Name -tooltip.role-description=Role Description \ No newline at end of file +tooltip.role-description=Role Description + +tooltip.contact-information=Contact Information \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties index 2fa33ffa9..f9f64d4d2 100644 --- 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 index 1b1951dac..6e81a0a90 100644 --- 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 index b9d44c725..49f3663e2 100644 --- a/ui/src/app/form/component/fields/FilterTargetField.js +++ b/ui/src/app/form/component/fields/FilterTargetField.js @@ -162,7 +162,7 @@ const FilterTargetField = ({ - +
diff --git a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js index 8bdf9bfab..c0e04a5ac 100644 --- 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)) { From 3b06ce7dd12b0a335ad346adb500e7344d6fa468 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 28 Oct 2021 08:58:11 -0700 Subject: [PATCH 2/4] Fixed placeholder text --- backend/src/main/resources/i18n/messages.properties | 2 ++ ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js | 2 +- ui/src/testing/dynamic-http.schema.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index d77f9be0f..f4bf44a8b 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -75,6 +75,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 diff --git a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js index 5a091b2d2..4c91bcf23 100644 --- a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js +++ b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js @@ -82,7 +82,7 @@ export function MetadataProviderTypeSelector({ type, types = [], children}) { - + Date: Thu, 28 Oct 2021 12:10:36 -0700 Subject: [PATCH 3/4] Removed logging --- backend/src/main/resources/application.properties | 2 ++ ui/src/app/form/component/widgets/AttributeReleaseWidget.js | 2 -- ui/src/app/metadata/view/MetadataWizard.js | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 0556e5b45..ac72fcc21 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1,6 +1,8 @@ # Server Configuration #server.port=8080 +server.servlet.session.timeout=1m + # Logging Configuration #logging.config=classpath:log4j2.xml diff --git a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js index a4f13eead..e8f5956aa 100644 --- 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/view/MetadataWizard.js b/ui/src/app/metadata/view/MetadataWizard.js index 4a4b4b5c7..2b3753412 100644 --- a/ui/src/app/metadata/view/MetadataWizard.js +++ b/ui/src/app/metadata/view/MetadataWizard.js @@ -19,7 +19,6 @@ export function MetadataWizard ({type, data, onCallback}) { const [blocking, setBlocking] = React.useState(false); async function save(metadata) { - console.log(metadata); await post('', metadata); if (response.ok) { setBlocking(false); From 9fc2a1e13a2b6a37159b09b5da254bd726a8f2e1 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 28 Oct 2021 14:54:43 -0700 Subject: [PATCH 4/4] reverted property change --- backend/src/main/resources/application.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index ac72fcc21..0556e5b45 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1,8 +1,6 @@ # Server Configuration #server.port=8080 -server.servlet.session.timeout=1m - # Logging Configuration #logging.config=classpath:log4j2.xml