From 56531d13b0e5b6d02328b860018838db1bd2aac6 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 10 Jul 2018 10:01:56 -0700
Subject: [PATCH] SHIBUI-578 Added required field markers

---
 ui/src/app/schema-form/registry.ts            |  7 +--
 ui/src/app/schema-form/schema-form.module.ts  |  4 +-
 .../app/schema-form/service/schema.service.ts | 17 +++++++
 .../widget/datalist/datalist.component.html   |  6 ++-
 .../widget/datalist/datalist.component.ts     | 14 +++++-
 .../widget/number/number.component.html       | 21 ++++++++
 .../widget/number/number.component.ts         | 21 ++++++++
 .../widget/select/select.component.html       | 13 +++--
 .../widget/select/select.component.ts         | 15 +++++-
 .../widget/text/string.component.html         |  6 +--
 .../widget/text/string.component.ts           | 14 +++++-
 .../widget/textarea/textarea.component.html   |  5 +-
 .../widget/textarea/textarea.component.ts     | 13 ++++-
 .../autocomplete/autocomplete.component.html  |  1 +
 .../autocomplete/autocomplete.component.ts    |  1 +
 .../filebacked-http-common.schema.json        | 48 ++++++++++++++-----
 .../filebacked-http-filters.schema.json       | 13 ++---
 .../filebacked-http-reloading.schema.json     | 16 +++++--
 .../provider/metadata-provider.schema.json    |  4 +-
 19 files changed, 197 insertions(+), 42 deletions(-)
 create mode 100644 ui/src/app/schema-form/widget/number/number.component.html
 create mode 100644 ui/src/app/schema-form/widget/number/number.component.ts

diff --git a/ui/src/app/schema-form/registry.ts b/ui/src/app/schema-form/registry.ts
index d197dcf2c..47761b3ac 100644
--- a/ui/src/app/schema-form/registry.ts
+++ b/ui/src/app/schema-form/registry.ts
@@ -15,6 +15,7 @@ import { DatalistComponent } from './widget/datalist/datalist.component';
 import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 import { CustomTextAreaComponent } from './widget/textarea/textarea.component';
 import { CustomArrayComponent } from './widget/array/array.component';
+import { CustomIntegerComponent } from './widget/number/number.component';
 
 
 export class CustomWidgetRegistry extends WidgetRegistry {
@@ -44,13 +45,13 @@ export class CustomWidgetRegistry extends WidgetRegistry {
 
         this.register('textarea', CustomTextAreaComponent);
 
+        this.register('integer', CustomIntegerComponent);
+        this.register('number', CustomIntegerComponent);
+
         this.register('datalist', DatalistComponent);
 
         /* NGX-Form */
         this.register('object', ObjectWidget);
-
-        this.register('integer', IntegerWidget);
-        this.register('number', IntegerWidget);
         this.register('range', RangeWidget);
 
         this.register('file', FileWidget);
diff --git a/ui/src/app/schema-form/schema-form.module.ts b/ui/src/app/schema-form/schema-form.module.ts
index d51ae2269..15edd4b6d 100644
--- a/ui/src/app/schema-form/schema-form.module.ts
+++ b/ui/src/app/schema-form/schema-form.module.ts
@@ -14,6 +14,7 @@ import { DatalistComponent } from './widget/datalist/datalist.component';
 import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 import { CustomTextAreaComponent } from './widget/textarea/textarea.component';
 import { CustomArrayComponent } from './widget/array/array.component';
+import { CustomIntegerComponent } from './widget/number/number.component';
 
 export const COMPONENTS = [
     BooleanRadioComponent,
@@ -23,7 +24,8 @@ export const COMPONENTS = [
     DatalistComponent,
     CustomCheckboxComponent,
     CustomTextAreaComponent,
-    CustomArrayComponent
+    CustomArrayComponent,
+    CustomIntegerComponent
 ];
 
 @NgModule({
diff --git a/ui/src/app/schema-form/service/schema.service.ts b/ui/src/app/schema-form/service/schema.service.ts
index 20177e115..86989b6f1 100644
--- a/ui/src/app/schema-form/service/schema.service.ts
+++ b/ui/src/app/schema-form/service/schema.service.ts
@@ -12,4 +12,21 @@ export class SchemaService {
     get(path: string): Observable<any> {
         return this.http.get<any>(`${path}`);
     }
+
+    isRequired(formProperty: any): boolean {
+        let required = false;
+        let requiredFields = formProperty.parent.schema.required || [];
+        let fieldPath = formProperty.path;
+        let controlName = fieldPath.substr(fieldPath.lastIndexOf('/') + 1);
+        required = requiredFields.indexOf(controlName) > -1;
+
+        if (!required) {
+            const conditions = formProperty.parent.schema.anyOf || [];
+            conditions.forEach(el => {
+                requiredFields = el.required || [];
+                required = !required ? requiredFields.indexOf(controlName) > -1 : required;
+            });
+        }
+        return required;
+    }
 }
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index 9df975a27..94242cc8a 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -1,6 +1,9 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
-        <span>{{ schema.title }}</span>
+        <span>
+            {{ schema.title }}
+            <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
+        </span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
@@ -16,6 +19,7 @@
         [matches]="schema.widget.data"
         [required]="true"
         [dropdown]="true"
+        [placeholder]="schema.placeholder"
         role="textbox"
         aria-label="Name ID Format (type for auto-complete)">
     </auto-complete>
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.ts b/ui/src/app/schema-form/widget/datalist/datalist.component.ts
index ca5d8ba58..ab6041500 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.ts
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.ts
@@ -1,10 +1,20 @@
 import { Component, OnChanges } from '@angular/core';
 
 import { ControlWidget } from 'ngx-schema-form';
-import { OneOf } from '../../model/one-of';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
     selector: 'datalist-component',
     templateUrl: `./datalist.component.html`
 })
-export class DatalistComponent extends ControlWidget {}
+export class DatalistComponent extends ControlWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/number/number.component.html b/ui/src/app/schema-form/widget/number/number.component.html
new file mode 100644
index 000000000..3f3bde73e
--- /dev/null
+++ b/ui/src/app/schema-form/widget/number/number.component.html
@@ -0,0 +1,21 @@
+<div class="widget form-group">
+    <label [attr.for]="id" class="d-flex justify-content-between control-label">
+        <span>{{ schema.title }} <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i></span>
+        <span *ngIf="schema.description">
+            <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
+            <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
+                [ngbPopover]="tooltip"
+                i18n-aria-label="@@tooltip--instruction"
+                aria-label="Information icon - press spacebar to read additional information for this form field"></i>
+        </span>
+    </label>
+    <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
+    <input [attr.readonly]="schema.readOnly?true:null"
+        [name]="name"
+        class="text-widget integer-widget form-control"
+        [formControl]="control"
+        [attr.type]="'number'" [attr.min]="schema.minimum" [attr.max]="schema.maximum"
+        [attr.placeholder]="schema.placeholder"
+        [attr.maxLength]="schema.maxLength || null"
+        [attr.minLength]="schema.minLength || null">
+</div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/number/number.component.ts b/ui/src/app/schema-form/widget/number/number.component.ts
new file mode 100644
index 000000000..0f4cdcba9
--- /dev/null
+++ b/ui/src/app/schema-form/widget/number/number.component.ts
@@ -0,0 +1,21 @@
+import {
+    Component,
+} from '@angular/core';
+import { IntegerWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
+
+@Component({
+    selector: 'integer-component',
+    templateUrl: `./number.component.html`
+})
+export class CustomIntegerComponent extends IntegerWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
index 7b4bf8173..4a60d6425 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -1,6 +1,9 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="horizontal control-label" *ngIf="schema.title">
-        {{ schema.title }}
+        <span>
+            {{ schema.title }}
+            <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
+        </span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
@@ -12,8 +15,12 @@
     <span *ngIf="schema.description" class="sr-only">
         {{ schema.description }}
     </span>
-    <select *ngIf="schema.type !== 'array'" [formControl]="control" [attr.name]="name" [attr.disabled]="schema.readOnly" class="form-control">
-        <option disabled selected>{{ schema.title }}</option>
+    <select *ngIf="schema.type !== 'array'"
+        [formControl]="control"
+        [attr.name]="name"
+        [attr.disabled]="schema.readOnly"
+        class="form-control">
+        <option disabled selected>{{ schema.placeholder || schema.title }}</option>
         <option *ngFor="let option of schema.oneOf" [ngValue]="option.enum[0]">{{option.description}}</option>
     </select>
     <select *ngIf="schema.type === 'array'" multiple [formControl]="control" [attr.name]="name" [attr.disabled]="schema.readOnly" class="form-control">
diff --git a/ui/src/app/schema-form/widget/select/select.component.ts b/ui/src/app/schema-form/widget/select/select.component.ts
index 15e90e04f..e673a5e89 100644
--- a/ui/src/app/schema-form/widget/select/select.component.ts
+++ b/ui/src/app/schema-form/widget/select/select.component.ts
@@ -1,9 +1,20 @@
 import { Component } from '@angular/core';
 
-import { ControlWidget } from 'ngx-schema-form';
+import { SelectWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
     selector: 'select-component',
     templateUrl: `./select.component.html`
 })
-export class CustomSelectComponent extends ControlWidget { }
+export class CustomSelectComponent extends SelectWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/text/string.component.html b/ui/src/app/schema-form/widget/text/string.component.html
index 435c2079a..5d1ed9365 100644
--- a/ui/src/app/schema-form/widget/text/string.component.html
+++ b/ui/src/app/schema-form/widget/text/string.component.html
@@ -1,6 +1,6 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
-        <span>{{ schema.title }}</span>
+        <span>{{ schema.title }} <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i></span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
@@ -25,7 +25,7 @@
     <small class="form-text text-danger" *ngIf="errorMessages && errorMessages.length && control.touched">
         {{ errorMessages }}
     </small>
-    <small class="form-text text-muted" *ngIf="!(control.touched && errorMessages.length) && schema.widget.help">
+    <small class="form-text text-muted" *ngIf="!(control.touched && errorMessages && errorMessages.length) && schema.widget.help">
         {{ schema.widget.help }}
     </small>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/schema-form/widget/text/string.component.ts b/ui/src/app/schema-form/widget/text/string.component.ts
index cf46aa6e2..5d49f1d83 100644
--- a/ui/src/app/schema-form/widget/text/string.component.ts
+++ b/ui/src/app/schema-form/widget/text/string.component.ts
@@ -1,9 +1,21 @@
 import { Component } from '@angular/core';
 import { StringWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
     selector: 'custom-string',
     templateUrl: `./string.component.html`,
     styleUrls: ['../widget.component.scss']
 })
-export class CustomStringComponent extends StringWidget {}
+export class CustomStringComponent extends StringWidget {
+
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.html b/ui/src/app/schema-form/widget/textarea/textarea.component.html
index 55260ac43..a4e0a3953 100644
--- a/ui/src/app/schema-form/widget/textarea/textarea.component.html
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.html
@@ -1,6 +1,9 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
-        <span>{{ schema.title }}</span>
+        <span>
+            {{ schema.title }}
+            <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
+        </span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.ts b/ui/src/app/schema-form/widget/textarea/textarea.component.ts
index 6586d7d1f..0f68e524f 100644
--- a/ui/src/app/schema-form/widget/textarea/textarea.component.ts
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.ts
@@ -1,9 +1,20 @@
 import { Component } from '@angular/core';
 
 import { TextAreaWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
   selector: 'textarea-component',
   templateUrl: `./textarea.component.html`
 })
-export class CustomTextAreaComponent extends TextAreaWidget {}
+export class CustomTextAreaComponent extends TextAreaWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 26d51dbcf..6820973fd 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -11,6 +11,7 @@
             type="text"
             role="textbox"
             [attr.aria-activedescendant]="activeDescendant"
+            [placeholder]="placeholder"
             attr.aria-owns="{{ id }}__listbox"
             (focus)="handleInputFocus()"
             (blur)="handleInputBlur()"
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.ts b/ui/src/app/shared/autocomplete/autocomplete.component.ts
index 6044b1757..bbe92dfa7 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.ts
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.ts
@@ -49,6 +49,7 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, OnChanges, Afte
     @Input() limit = 0;
     @Input() processing = false;
     @Input() dropdown = false;
+    @Input() placeholder = '';
 
     @Output() more: EventEmitter<any> = new EventEmitter<any>();
     @Output() onChange: EventEmitter<string> = new EventEmitter<string>();
diff --git a/ui/src/assets/schema/provider/filebacked-http-common.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
index 3bf433b29..b87fa3980 100644
--- a/ui/src/assets/schema/provider/filebacked-http-common.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
@@ -12,22 +12,47 @@
         "satisfyAnyPredicates"
     ],
     "required": ["id", "metadataURL"],
+    "anyOf": [
+        {
+            "properties": {
+                "initializeFromBackupFile": {
+                    "enum": [
+                        true
+                    ]
+                }
+            },
+            "required": [
+                "backingFile"
+            ]
+        },
+        {
+            "properties": {
+                "initializeFromBackupFile": {
+                    "enum": [
+                        false
+                    ]
+                }
+            }
+        }
+    ],
     "properties": {
         "id": {
             "title": "ID",
-            "description": "Unique Identifier",
+            "description": "Identifier for logging, identification for command line reload, etc.",
             "type": "string",
-            "default": ""
+            "default": "",
+            "minLength": 1
         },
         "metadataURL": {
             "title": "Metadata URL",
-            "description": "Metadata URL",
+            "description": "Identifier for logging, identification for command line reload, etc.",
             "type": "string",
-            "default": ""
+            "default": "",
+            "minLength": 1
         },
         "initializeFromBackupFile": {
             "title": "Initialize From Backup File?",
-            "description": "Initialize From Backup File?",
+            "description": "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.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -50,8 +75,9 @@
         },
         "backingFile": {
             "title": "Backing File",
-            "description": "Backing File",
+            "description": "Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.",
             "type": "string",
+            "default": "",
             "visibleIf": {
                 "initializeFromBackupFile": [
                     true
@@ -60,7 +86,7 @@
         },
         "backupFileInitNextRefreshDelay": {
             "title": "Backup File Init Next Refresh Delay",
-            "description": "Backup File Init Next Refresh Delay",
+            "description": "Delay duration after which to schedule next HTTP refresh when initialized from the backing file.",
             "type": "string",
             "visibleIf": {
                 "initializeFromBackupFile": [
@@ -70,7 +96,7 @@
         },
         "requireValidMetadata": {
             "title": "Require Valid Metadata?",
-            "description": "Require Valid Metadata?",
+            "description": "Whether candidate metadata found by the resolver must be valid in order to be returned (where validity is implementation specific, but in SAML cases generally depends on a validUntil attribute.) If this flag is true, then invalid candidate metadata will not be returned.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -93,7 +119,7 @@
         },
         "failFastInitialization": {
             "title": "Fail Fast Initialization?",
-            "description": "Fail Fast Initialization?",
+            "description": "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.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -116,7 +142,7 @@
         },
         "useDefaultPredicateRegistry": {
             "title": "Use Default Predicate Registry?",
-            "description": "Use Default Predicate Registry?",
+            "description": "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.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -139,7 +165,7 @@
         },
         "satisfyAnyPredicates": {
             "title": "Satisy Any Predicates?",
-            "description": "Satisy Any Predicates?",
+            "description": "Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
diff --git a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
index 98ec3eed9..66e4d5b0f 100644
--- a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
@@ -15,7 +15,7 @@
                     "properties": {
                         "maxValidityInterval": {
                             "title": "Max Validity Interval",
-                            "description": "Max Validity Interval",
+                            "description": "Defines the window within which the metadata is valid.",
                             "type": "number",
                             "default": 0
                         }
@@ -30,18 +30,19 @@
                     "properties": {
                         "requireSignedRoot": {
                             "title": "Require Signed Root",
-                            "description": "Require Signed Root",
+                            "description": "If true, this fails to load metadata with no signature on the root XML element.",
                             "type": "boolean",
                             "default": true
                         },
                         "certificateFile": {
                             "title": "Certificate File",
-                            "description": "Certificate File",
+                            "description": "A key used to verify the signature. Conflicts with trustEngineRef and both of the child elements.",
                             "type": "string",
                             "widget": "textarea",
                             "default": ""
                         }
-                    }
+                    },
+                    "required": ["certificateFile"]
                 },
                 "EntityRoleWhiteList": {
                     "title": "Entity Role Whitelist Filter",
@@ -77,13 +78,13 @@
                         },
                         "removeRolelessEntityDescriptors": {
                             "title": "Remove Roleless Entity Descriptors?",
-                            "description": "Remove Roleless Entity Descriptors?",
+                            "description": "Controls whether to keep entity descriptors that contain no roles.",
                             "type": "boolean",
                             "default": true
                         },
                         "removeEmptyEntitiesDescriptors": {
                             "title": "Remove Empty Entities Descriptors?",
-                            "description": "Remove Empty Entities Descriptors?",
+                            "description": "Controls whether to keep entities descriptors that contain no entity descriptors.",
                             "type": "boolean",
                             "default": true
                         }
diff --git a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
index 9fa60f808..382637975 100644
--- a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
@@ -6,8 +6,9 @@
             "properties": {
                 "minRefreshDelay": {
                     "title": "Min Refresh Delay",
-                    "description": "",
+                    "description": "Lower bound on the next refresh from the time calculated based on the metadata's expiration.",
                     "type": "string",
+                    "placeholder": "Duration",
                     "widget": {
                         "id": "datalist",
                         "data": [
@@ -26,8 +27,9 @@
                 },
                 "maxRefreshDelay": {
                     "title": "Max Refresh Delay",
-                    "description": "",
+                    "description": "Upper bound on the next refresh from the time calculated based on the metadata's expiration.",
                     "type": "string",
+                    "placeholder": "Duration",
                     "widget": {
                         "id": "datalist",
                         "data": [
@@ -46,13 +48,16 @@
                 },
                 "refreshDelayFactor": {
                     "title": "Refresh Delay Factor",
-                    "description": "",
+                    "description": "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's expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.",
                     "type": "number",
+                    "placeholder": "Real Number (between 0.0 and 1.0)",
+                    "minimum": 0,
+                    "maximum": 1,
                     "default": null
                 },
                 "resolveViaPredicatesOnly": {
                     "title": "Resolve Via Predicates Only?",
-                    "description": "",
+                    "description": "Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.",
                     "type": "boolean",
                     "widget": {
                         "id": "boolean-radio"
@@ -75,8 +80,9 @@
                 },
                 "expirationWarningThreshold": {
                     "title": "Expiration Warning Threshold",
-                    "description": "",
+                    "description": "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.",
                     "type": "string",
+                    "placeholder": "Duration",
                     "widget": {
                         "id": "datalist",
                         "data": [
diff --git a/ui/src/assets/schema/provider/metadata-provider.schema.json b/ui/src/assets/schema/provider/metadata-provider.schema.json
index f5a840f35..e11a3cc30 100644
--- a/ui/src/assets/schema/provider/metadata-provider.schema.json
+++ b/ui/src/assets/schema/provider/metadata-provider.schema.json
@@ -7,7 +7,7 @@
     "properties": {
         "name": {
             "title": "Metadata Provider Name (Dashboard Display Only)",
-            "description": "Metadata Provider Name (Dashboard Display Only)",
+            "description": "Metadata Provider Name",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -17,7 +17,7 @@
         "@type": {
             "title": "Metadata Provider Type",
             "description": "Metadata Provider Type",
-            "ui:placeholder": "Select a metadata provider type",
+            "placeholder": "Select a metadata provider type",
             "type": "string",
             "widget": {
                 "id": "select"