Merge remote-tracking branch 'origin/feature/SHIBUI-703' into feature…

…/SHIBUI-703
TIER · Nov 12, 2018 · 66ef837 · 66ef837
2 parents ecbfcb7 + 4e6c571
commit 66ef837
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -278,7 +278,7 @@ label.duration=Duration
 label.real-number=Real Number (between 0.0 and 1.0)
 label.min-refresh-delay=Min Refresh Delay
 label.max-refresh-delay=Max Refresh Delay
-label.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
+label.refresh-delay-factor=Refresh Delay Factor
 label.resolve-via-predicates-only=Resolve Via Predicates Only?
 label.expiration-warning-threshold=Expiration Warning Threshold
 

diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
@@ -55,7 +55,7 @@
             "type": "boolean",
             "default": false
         },
-        "reloadableMetadataResolverAttributes": {
+        "dynamicMetadataResolverAttributes": {
             "type": "object",
             "properties": {
                 "refreshDelayFactor": {
@@ -68,7 +68,7 @@
                     },
                     "placeholder": "label.real-number",
                     "minimum": 0,
-                    "maximum": 1,
+                    "maximum": 0.99,
                     "default": null
                 },
                 "minCacheDuration": {

diff --git a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
@@ -25,7 +25,7 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
             label: 'label.common-attributes',
             index: 2,
             initialValues: [],
-            schema: 'assets/schema/provider/local-dynamic.schema.json',
+            schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
             fields: [
                 'xmlId',
                 'sourceDirectory'
@@ -46,16 +46,16 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
             label: 'label.reloading-attributes',
             index: 3,
             initialValues: [],
-            schema: 'assets/schema/provider/local-dynamic.schema.json',
+            schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
             fields: [
-                'reloadableMetadataResolverAttributes'
+                'dynamicMetadataResolverAttributes'
             ],
             fieldsets: [
                 {
                     type: 'group-lg',
                     class: ['col-12'],
                     fields: [
-                        'reloadableMetadataResolverAttributes'
+                        'dynamicMetadataResolverAttributes'
                     ]
                 }
             ]
@@ -65,7 +65,7 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
             label: 'label.finished',
             index: 4,
             initialValues: [],
-            schema: 'assets/schema/provider/local-dynamic.schema.json',
+            schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
             fields: [
                 'enabled'
             ],
@@ -91,7 +91,7 @@ export const LocalDynamicMetadataProviderEditor: Wizard<LocalDynamicMetadataProv
             label: 'label.common-attributes',
             index: 1,
             initialValues: [],
-            schema: 'assets/schema/provider/local-dynamic.schema.json',
+            schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
             fields: [
                 'enabled',
                 'xmlId',
@@ -103,9 +103,9 @@ export const LocalDynamicMetadataProviderEditor: Wizard<LocalDynamicMetadataProv
             label: 'label.reloading-attributes',
             index: 2,
             initialValues: [],
-            schema: 'assets/schema/provider/local-dynamic.schema.json',
+            schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
             fields: [
-                'reloadableMetadataResolverAttributes'
+                'dynamicMetadataResolverAttributes'
             ]
         }
     ]