From f3b97a7c29410107ad33e4e4265e72080c03f6ad Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 2 Jul 2018 11:06:34 -0700
Subject: [PATCH 01/15] Adding checkbox component

---
 ui/src/app/schema-form/registry.ts            |  5 ++--
 ui/src/app/schema-form/schema-form.module.ts  |  4 ++-
 .../widget/check/checkbox.component.html      | 28 +++++++++++++++++++
 .../widget/check/checkbox.component.ts        |  9 ++++++
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 ui/src/app/schema-form/widget/check/checkbox.component.html
 create mode 100644 ui/src/app/schema-form/widget/check/checkbox.component.ts

diff --git a/ui/src/app/schema-form/registry.ts b/ui/src/app/schema-form/registry.ts
index 85e7d3a7d..904377313 100644
--- a/ui/src/app/schema-form/registry.ts
+++ b/ui/src/app/schema-form/registry.ts
@@ -15,6 +15,7 @@ import { RangeWidget } from 'ngx-schema-form';
 import { TextAreaWidget } from 'ngx-schema-form';
 import { CustomSelectComponent } from './widget/select/select.component';
 import { DatalistComponent } from './widget/datalist/datalist.component';
+import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 
 
 export class CustomWidgetRegistry extends WidgetRegistry {
@@ -37,6 +38,8 @@ export class CustomWidgetRegistry extends WidgetRegistry {
         this.register('fieldset', FieldsetComponent);
 
         this.register('select', CustomSelectComponent);
+        this.register('boolean', CustomCheckboxComponent);
+        this.register('checkbox', CustomCheckboxComponent);
 
         this.register('datalist', DatalistComponent);
 
@@ -52,8 +55,6 @@ export class CustomWidgetRegistry extends WidgetRegistry {
 
         this.register('file', FileWidget);
         this.register('radio', RadioWidget);
-        this.register('boolean', CheckboxWidget);
-        this.register('checkbox', CheckboxWidget);
 
         this.register('button', ButtonWidget);
 
diff --git a/ui/src/app/schema-form/schema-form.module.ts b/ui/src/app/schema-form/schema-form.module.ts
index 95549b7de..89dc8ffc3 100644
--- a/ui/src/app/schema-form/schema-form.module.ts
+++ b/ui/src/app/schema-form/schema-form.module.ts
@@ -11,13 +11,15 @@ import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
 import { SharedModule } from '../shared/shared.module';
 import { CustomSelectComponent } from './widget/select/select.component';
 import { DatalistComponent } from './widget/datalist/datalist.component';
+import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 
 export const COMPONENTS = [
     BooleanRadioComponent,
     FieldsetComponent,
     CustomStringComponent,
     CustomSelectComponent,
-    DatalistComponent
+    DatalistComponent,
+    CustomCheckboxComponent
 ];
 
 @NgModule({
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
new file mode 100644
index 000000000..7ce7eba62
--- /dev/null
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -0,0 +1,28 @@
+<div class="widget form-group">
+    <label [attr.for]="id" class="horizontal control-label">
+        {{ schema.title }}
+    </label>
+    <div *ngIf="schema.type!='array'" class="checkbox">
+        <label class="horizontal control-label">
+            <input [formControl]="control"
+                [attr.name]="name"
+                [indeterminate]="control.value !== false && control.value !== true ? true :null"
+                type="checkbox"
+                [attr.disabled]="schema.readOnly">
+            <input *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control"> {{schema.description}}
+        </label>
+    </div>
+    <ng-container *ngIf="schema.type==='array'">
+        <div *ngFor="let option of schema.items.oneOf" class="checkbox">
+            <label class="horizontal control-label">
+                <input [attr.name]="name" 
+                    value="{{option.enum[0]}}"
+                    type="checkbox"
+                    [attr.disabled]="schema.readOnly"
+                    (change)="onCheck($event.target)"
+                    [attr.checked]="checked[option.enum[0]] ? true : null">
+                {{option.description}}
+            </label>
+        </div>
+    </ng-container>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.ts b/ui/src/app/schema-form/widget/check/checkbox.component.ts
new file mode 100644
index 000000000..ebb784d71
--- /dev/null
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+import { CheckboxWidget } from 'ngx-schema-form';
+
+@Component({
+    selector: 'checkbox-component',
+    templateUrl: `./checkbox.component.html`
+})
+export class CustomCheckboxComponent extends CheckboxWidget { }

From 26828df2376a8989ac829e94a6c530cd9704f076 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 2 Jul 2018 15:15:23 -0700
Subject: [PATCH 02/15] SHIBUI-579 Added metadata filters

---
 ui/src/app/schema-form/registry.ts            | 12 ++---
 ui/src/app/schema-form/schema-form.module.ts  |  6 ++-
 .../widget/array/array.component.html         | 23 ++++++++
 .../widget/array/array.component.ts           |  9 ++++
 .../widget/check/checkbox.component.html      | 53 +++++++++++++------
 .../widget/select/select.component.html       |  4 +-
 .../widget/textarea/textarea.component.html   | 21 ++++++++
 .../widget/textarea/textarea.component.ts     |  9 ++++
 .../filebacked-http-filters.schema.json       | 15 +++---
 9 files changed, 121 insertions(+), 31 deletions(-)
 create mode 100644 ui/src/app/schema-form/widget/array/array.component.html
 create mode 100644 ui/src/app/schema-form/widget/array/array.component.ts
 create mode 100644 ui/src/app/schema-form/widget/textarea/textarea.component.html
 create mode 100644 ui/src/app/schema-form/widget/textarea/textarea.component.ts

diff --git a/ui/src/app/schema-form/registry.ts b/ui/src/app/schema-form/registry.ts
index 904377313..d197dcf2c 100644
--- a/ui/src/app/schema-form/registry.ts
+++ b/ui/src/app/schema-form/registry.ts
@@ -4,18 +4,17 @@ import { CustomStringComponent } from './widget/text/string.component';
 
 import { WidgetRegistry } from 'ngx-schema-form';
 
-import { ArrayWidget } from 'ngx-schema-form';
 import { ButtonWidget } from 'ngx-schema-form';
-import { CheckboxWidget } from 'ngx-schema-form';
 import { FileWidget } from 'ngx-schema-form';
 import { IntegerWidget } from 'ngx-schema-form';
 import { ObjectWidget } from 'ngx-schema-form';
 import { RadioWidget } from 'ngx-schema-form';
 import { RangeWidget } from 'ngx-schema-form';
-import { TextAreaWidget } from 'ngx-schema-form';
 import { CustomSelectComponent } from './widget/select/select.component';
 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';
 
 
 export class CustomWidgetRegistry extends WidgetRegistry {
@@ -35,24 +34,25 @@ export class CustomWidgetRegistry extends WidgetRegistry {
         this.register('time', CustomStringComponent);
 
         this.register('boolean-radio', BooleanRadioComponent);
+
         this.register('fieldset', FieldsetComponent);
+        this.register('array', CustomArrayComponent);
 
         this.register('select', CustomSelectComponent);
         this.register('boolean', CustomCheckboxComponent);
         this.register('checkbox', CustomCheckboxComponent);
 
+        this.register('textarea', CustomTextAreaComponent);
+
         this.register('datalist', DatalistComponent);
 
         /* NGX-Form */
-        this.register('array', ArrayWidget);
         this.register('object', ObjectWidget);
 
         this.register('integer', IntegerWidget);
         this.register('number', IntegerWidget);
         this.register('range', RangeWidget);
 
-        this.register('textarea', TextAreaWidget);
-
         this.register('file', FileWidget);
         this.register('radio', RadioWidget);
 
diff --git a/ui/src/app/schema-form/schema-form.module.ts b/ui/src/app/schema-form/schema-form.module.ts
index 89dc8ffc3..d51ae2269 100644
--- a/ui/src/app/schema-form/schema-form.module.ts
+++ b/ui/src/app/schema-form/schema-form.module.ts
@@ -12,6 +12,8 @@ import { SharedModule } from '../shared/shared.module';
 import { CustomSelectComponent } from './widget/select/select.component';
 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';
 
 export const COMPONENTS = [
     BooleanRadioComponent,
@@ -19,7 +21,9 @@ export const COMPONENTS = [
     CustomStringComponent,
     CustomSelectComponent,
     DatalistComponent,
-    CustomCheckboxComponent
+    CustomCheckboxComponent,
+    CustomTextAreaComponent,
+    CustomArrayComponent
 ];
 
 @NgModule({
diff --git a/ui/src/app/schema-form/widget/array/array.component.html b/ui/src/app/schema-form/widget/array/array.component.html
new file mode 100644
index 000000000..577c084f9
--- /dev/null
+++ b/ui/src/app/schema-form/widget/array/array.component.html
@@ -0,0 +1,23 @@
+<div class="widget form-group">
+    <div class="d-flex justify-content-start">
+        <label [attr.for]="id" class="m-0 pt-1 control-label">
+            {{ schema.title }}
+        </label>
+        &nbsp;
+        <button (click)="addItem()" class="btn btn-success btn-sm array-add-button">
+            Add &nbsp;
+            <i class="fa fa-plus" aria-hidden="true"></i>
+        </button>
+    </div>
+    <div *ngFor="let itemProperty of formProperty.properties; let i=index; trackBy:trackByIndex" class="mt-2">
+        <div class="row">
+            <sf-form-element class="col-sm-11" [formProperty]="itemProperty"></sf-form-element>
+            <div class="col-sm-1">
+                <button class="btn btn-link pt-1" (click)="removeItem(i)" role="button">
+                    <i class="fa fa-fw fa-trash fa-lg text-danger"></i>
+                </button>
+            </div>
+        </div>
+    </div>
+    <span *ngIf="schema.description" class="sr-only">{{schema.description}}</span>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/array/array.component.ts b/ui/src/app/schema-form/widget/array/array.component.ts
new file mode 100644
index 000000000..52987cda7
--- /dev/null
+++ b/ui/src/app/schema-form/widget/array/array.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+import { ArrayWidget } from 'ngx-schema-form';
+
+@Component({
+    selector: 'array-component',
+    templateUrl: `./array.component.html`
+})
+export class CustomArrayComponent extends ArrayWidget {}
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
index 7ce7eba62..4c2745660 100644
--- a/ui/src/app/schema-form/widget/check/checkbox.component.html
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -1,18 +1,27 @@
 <div class="widget form-group">
-    <label [attr.for]="id" class="horizontal control-label">
-        {{ schema.title }}
-    </label>
-    <div *ngIf="schema.type!='array'" class="checkbox">
-        <label class="horizontal control-label">
-            <input [formControl]="control"
-                [attr.name]="name"
-                [indeterminate]="control.value !== false && control.value !== true ? true :null"
-                type="checkbox"
-                [attr.disabled]="schema.readOnly">
-            <input *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control"> {{schema.description}}
-        </label>
-    </div>
-    <ng-container *ngIf="schema.type==='array'">
+    <ng-container *ngIf="schema.type !== 'array'">
+        <div class="d-flex justify-content-start">
+            <div class="custom-control custom-checkbox custom-control-inline custom-control-reverse">
+                <input [formControl]="control"
+                    class="custom-control-input"
+                    [attr.name]="name"
+                    [indeterminate]="control.value !== false && control.value !== true ? true :null"
+                    type="checkbox"
+                    [attr.disabled]="schema.readOnly"
+                    id="{{ schema.id }}-control">
+                <input id="{{ schema.id }}-control" *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control">
+                <label for="{{ schema.id }}-control" class="custom-control-label">
+                    {{ schema.title }}
+                </label>
+            </div>
+            <div>
+                <ng-template #tooltip>{{ 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>
+            </div>
+        </div>
+    </ng-container>
+    <ng-container *ngIf="schema.type === 'array'">
         <div *ngFor="let option of schema.items.oneOf" class="checkbox">
             <label class="horizontal control-label">
                 <input [attr.name]="name" 
@@ -25,4 +34,18 @@
             </label>
         </div>
     </ng-container>
-</div>
\ No newline at end of file
+</div>
+<!--
+
+<fieldset aria-label="Don't sign the response? Checkbox - select for yes">
+    <div class="custom-control custom-checkbox custom-control-inline custom-control-reverse">
+        <input disableValidation="true" type="checkbox" class="custom-control-input" formControlName="dontSignResponse" id="dontSignResponse"
+            [value]="true" role="checkbox" aria-checked="false">
+        <label class="custom-control-label" i18n="@@label--dont-sign-the-response" for="dontSignResponse">Don't Sign the Response</label>
+    </div>
+    <ng-template #tooltipDontSignResponse i18n="@@tooltip--dont-sign-response">Don't Sign Response popover</ng-template>
+    <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipDontSignResponse" i18n-aria-label="@@tooltip--instruction"
+        aria-label="Information icon - press spacebar to read additional information for this form field"></i>
+</fieldset>
+
+-->
\ No newline at end of file
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 831a7e852..7b4bf8173 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -1,7 +1,7 @@
 <div class="widget form-group">
-    <label [attr.for]="id" class="horizontal control-label">
+    <label [attr.for]="id" class="horizontal control-label" *ngIf="schema.title">
         {{ schema.title }}
-        <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"
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.html b/ui/src/app/schema-form/widget/textarea/textarea.component.html
new file mode 100644
index 000000000..55260ac43
--- /dev/null
+++ b/ui/src/app/schema-form/widget/textarea/textarea.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 }}</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="sr-only">{{schema.description}}</span>
+    <textarea [attr.readonly]="schema.readOnly"
+        [name]="name"
+        class="text-widget textarea-widget form-control"
+        [attr.placeholder]="schema.placeholder"
+        [attr.maxLength]="schema.maxLength || null"
+        [attr.minLength]="schema.minLength || null"
+        [rows]="schema.widget.rows || 5"
+        [formControl]="control"></textarea>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.ts b/ui/src/app/schema-form/widget/textarea/textarea.component.ts
new file mode 100644
index 000000000..6586d7d1f
--- /dev/null
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+import { TextAreaWidget } from 'ngx-schema-form';
+
+@Component({
+  selector: 'textarea-component',
+  templateUrl: `./textarea.component.html`
+})
+export class CustomTextAreaComponent extends TextAreaWidget {}
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 2b3d32846..884b8b89e 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": "",
+                            "description": "Max Validity Interval",
                             "type": "number"
                         }
                     }
@@ -29,14 +29,15 @@
                     "properties": {
                         "requireSignedRoot": {
                             "title": "Require Signed Root",
-                            "description": "",
+                            "description": "Require Signed Root",
                             "type": "boolean",
                             "default": true
                         },
                         "certificateFile": {
                             "title": "Certificate File",
-                            "description": "",
-                            "type": "string"
+                            "description": "Certificate File",
+                            "type": "string",
+                            "widget": "textarea"
                         }
                     }
                 },
@@ -49,7 +50,7 @@
                     "properties": {
                         "retainedRoles": {
                             "title": "Retained Roles",
-                            "description": "",
+                            "description": "Retained Roles",
                             "type": "array",
                             "items": {
                                 "widget": {
@@ -74,13 +75,13 @@
                         },
                         "removeRolelessEntityDescriptors": {
                             "title": "Remove Roleless Entity Descriptors?",
-                            "description": "",
+                            "description": "Remove Roleless Entity Descriptors?",
                             "type": "boolean",
                             "default": true
                         },
                         "removeEmptyEntitiesDescriptors": {
                             "title": "Remove Empty Entities Descriptors?",
-                            "description": "",
+                            "description": "Remove Empty Entities Descriptors?",
                             "type": "boolean",
                             "default": true
                         }

From 15cd44411adb8640fd67a9865a1707ec8bc11e74 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 3 Jul 2018 09:35:58 -0700
Subject: [PATCH 03/15] SHIBUI-579 Implemented metadata filters page in wizard

---
 ui/src/app/metadata/domain/domain.type.ts     |   6 +-
 ui/src/app/metadata/domain/entity/index.ts    |   1 -
 ...file-backed-http-metadata-provider.spec.ts | 104 ------------------
 .../file-backed-http-metadata-provider.ts     |  21 ----
 .../file-backed-http-metadata-provider.ts     |   5 +
 .../metadata/domain/model/providers/index.ts  |   1 +
 .../metadata/provider/action/editor.action.ts |  11 +-
 .../metadata/provider/action/entity.action.ts |   8 +-
 .../container/provider-wizard.component.html  |   8 +-
 .../container/provider-wizard.component.ts    |  56 ++++++----
 .../model/file-backed-http.provider.form.ts   |  34 +++++-
 .../provider/reducer/editor.reducer.ts        |   5 +
 .../provider/reducer/entity.reducer.ts        |   9 +-
 ui/src/app/wizard/action/wizard.action.ts     |  11 +-
 ui/src/app/wizard/model/wizard.ts             |   7 +-
 ui/src/app/wizard/reducer/index.ts            |  10 +-
 16 files changed, 128 insertions(+), 169 deletions(-)
 delete mode 100644 ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts
 delete mode 100644 ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
 create mode 100644 ui/src/app/metadata/domain/model/providers/file-backed-http-metadata-provider.ts
 create mode 100644 ui/src/app/metadata/domain/model/providers/index.ts

diff --git a/ui/src/app/metadata/domain/domain.type.ts b/ui/src/app/metadata/domain/domain.type.ts
index 78def16d7..3cda36b83 100644
--- a/ui/src/app/metadata/domain/domain.type.ts
+++ b/ui/src/app/metadata/domain/domain.type.ts
@@ -6,9 +6,11 @@ import {
 
 import {
     EntityAttributesFilter,
-    FileBackedHttpMetadataResolver,
-    FileBackedHttpMetadataProvider
+    FileBackedHttpMetadataResolver
 } from './entity';
+import {
+    FileBackedHttpMetadataProvider
+} from './model/providers';
 
 export type Filter =
     | EntityAttributesFilter;
diff --git a/ui/src/app/metadata/domain/entity/index.ts b/ui/src/app/metadata/domain/entity/index.ts
index 1adb3735e..648255369 100644
--- a/ui/src/app/metadata/domain/entity/index.ts
+++ b/ui/src/app/metadata/domain/entity/index.ts
@@ -1,3 +1,2 @@
 export * from './filter/entity-attributes-filter';
-export * from './provider/file-backed-http-metadata-provider';
 export * from './resolver/file-backed-http-metadata-resolver';
diff --git a/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts
deleted file mode 100644
index 70b0245a4..000000000
--- a/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { FileBackedHttpMetadataProvider } from './file-backed-http-metadata-provider';
-
-describe('FileBackedHttmMetadataProvider construct', () => {
-
-    const config = {
-        id: 'foo',
-        entityId: 'string',
-        serviceProviderName: 'string',
-        organization: {
-            'name': 'string',
-            'displayName': 'string',
-            'url': 'string'
-        },
-        contacts: [
-            {
-                'name': 'string',
-                'type': 'string',
-                'emailAddress': 'string'
-            }
-        ],
-        mdui: {
-            'displayName': 'string',
-            'informationUrl': 'string',
-            'privacyStatementUrl': 'string',
-            'logoUrl': 'string',
-            'logoHeight': 100,
-            'logoWidth': 100,
-            'description': 'string'
-        },
-        securityInfo: {
-            'x509CertificateAvailable': true,
-            'authenticationRequestsSigned': true,
-            'wantAssertionsSigned': true,
-            'x509Certificates': [
-                {
-                    'name': 'string',
-                    'type': 'string',
-                    'value': 'string'
-                }
-            ]
-        },
-        assertionConsumerServices: [
-            {
-                'binding': 'string',
-                'locationUrl': 'string',
-                'makeDefault': true
-            }
-        ],
-        serviceProviderSsoDescriptor: {
-            'protocolSupportEnum': 'string',
-            'nameIdFormats': [
-                'string'
-            ]
-        },
-
-        logoutEndpoints: [
-            {
-                'url': 'string',
-                'bindingType': 'string'
-            }
-        ],
-        serviceEnabled: true,
-        createdDate: new Date().toDateString(),
-        modifiedDate: new Date().toDateString(),
-        relyingPartyOverrides: {
-            'signAssertion': true,
-            'dontSignResponse': true,
-            'turnOffEncryption': true,
-            'useSha': true,
-            'ignoreAuthenticationMethod': true,
-            'omitNotBefore': true,
-            'responderId': 'string',
-            'nameIdFormats': [
-                'string'
-            ],
-            'authenticationMethods': [
-                'string'
-            ]
-        },
-        attributeRelease: [
-            'eduPersonPrincipalName',
-            'uid',
-            'mail'
-        ]
-    };
-
-    let entity;
-
-    beforeEach(() => {
-        entity = new FileBackedHttpMetadataProvider(config);
-    });
-
-    it('should populate its own values', () => {
-        Object.keys(config).forEach(key => {
-            expect(entity[key]).toEqual(config[key]);
-        });
-    });
-
-    describe('interface methods', () => {
-        it('should return a date object from getCreationDate', () => {
-            expect(entity.getCreationDate()).toEqual(new Date(config.createdDate));
-        });
-    });
-});
diff --git a/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
deleted file mode 100644
index 2f64a98ba..000000000
--- a/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-    MetadataProvider
-} from '../../model';
-
-export class FileBackedHttpMetadataProvider implements MetadataProvider {
-    id: string;
-    name: string;
-    '@type': string;
-
-    createdDate?: string;
-    modifiedDate?: string;
-    version: string;
-
-    constructor(descriptor?: Partial<MetadataProvider>) {
-        Object.assign(this, descriptor);
-    }
-
-    getCreationDate(): Date {
-        return new Date(this.createdDate);
-    }
-}
diff --git a/ui/src/app/metadata/domain/model/providers/file-backed-http-metadata-provider.ts b/ui/src/app/metadata/domain/model/providers/file-backed-http-metadata-provider.ts
new file mode 100644
index 000000000..7d107036b
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/providers/file-backed-http-metadata-provider.ts
@@ -0,0 +1,5 @@
+import { MetadataProvider } from '../metadata-provider';
+
+export interface FileBackedHttpMetadataProvider extends MetadataProvider {
+    metadataFilters: any[];
+}
diff --git a/ui/src/app/metadata/domain/model/providers/index.ts b/ui/src/app/metadata/domain/model/providers/index.ts
new file mode 100644
index 000000000..0cd02d47d
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/providers/index.ts
@@ -0,0 +1 @@
+export * from './file-backed-http-metadata-provider';
\ No newline at end of file
diff --git a/ui/src/app/metadata/provider/action/editor.action.ts b/ui/src/app/metadata/provider/action/editor.action.ts
index ca195716f..85ea00edd 100644
--- a/ui/src/app/metadata/provider/action/editor.action.ts
+++ b/ui/src/app/metadata/provider/action/editor.action.ts
@@ -6,7 +6,9 @@ export enum EditorActionTypes {
     LOAD_SCHEMA_SUCCESS = '[Provider Editor] Load Schema Success',
     LOAD_SCHEMA_FAIL = '[Provider Editor] Load Schema Fail',
 
-    SELECT_PROVIDER_TYPE = '[Provider Editor] Select Provider Type'
+    SELECT_PROVIDER_TYPE = '[Provider Editor] Select Provider Type',
+
+    CLEAR = '[Provider Editor] Clear'
 }
 
 export class UpdateStatus implements Action {
@@ -39,9 +41,14 @@ export class SelectProviderType implements Action {
     constructor(public payload: string) { }
 }
 
+export class ClearEditor implements Action {
+    readonly type = EditorActionTypes.CLEAR;
+}
+
 export type EditorActionUnion =
     | UpdateStatus
     | LoadSchemaRequest
     | LoadSchemaSuccess
     | LoadSchemaFail
-    | SelectProviderType;
+    | SelectProviderType
+    | ClearEditor;
diff --git a/ui/src/app/metadata/provider/action/entity.action.ts b/ui/src/app/metadata/provider/action/entity.action.ts
index bff45b5f4..12c2efa5f 100644
--- a/ui/src/app/metadata/provider/action/entity.action.ts
+++ b/ui/src/app/metadata/provider/action/entity.action.ts
@@ -9,7 +9,8 @@ export enum EntityActionTypes {
     SAVE_PROVIDER_SUCCESS = '[Provider Entity] Save Provider Success',
     SAVE_PROVIDER_FAIL = '[Provider Entity] Save Provider Fail',
 
-    RESET_CHANGES = '[Provider Entity] Reset Provider Changes'
+    CLEAR_PROVIDER = '[Provider Entity] Clear',
+    RESET_CHANGES = '[Provider Entity] Reset Changes'
 }
 
 export class SelectProvider implements Action {
@@ -48,6 +49,10 @@ export class SaveProviderFail implements Action {
     constructor(public payload: Error) { }
 }
 
+export class ClearProvider implements Action {
+    readonly type = EntityActionTypes.CLEAR_PROVIDER;
+}
+
 export class ResetChanges implements Action {
     readonly type = EntityActionTypes.RESET_CHANGES;
 }
@@ -59,4 +64,5 @@ export type EntityActionUnion =
     | SaveProviderSuccess
     | SaveProviderFail
     | CreateProvider
+    | ClearProvider
     | ResetChanges;
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.html b/ui/src/app/metadata/provider/container/provider-wizard.component.html
index 58adb7221..085756e5d 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.html
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.html
@@ -5,14 +5,12 @@
         <div class="col col-xl-6 col-lg-9 col-xs-12">
             <sf-form
                 [schema]="schema$ | async"
-                [model]="formModel"
+                [model]="model$ | async"
                 (onChange)="changeSubject.next($event)"
                 (isValid)="onStatusChange($event)"></sf-form>
         </div>
-        <!--
-        <div class="col col-xl-6 col-lg-9 col-xs-12">
+        <!--<div class="col col-xl-6 col-lg-9 col-xs-12">
             <code class="bg-light border rounded p-4 d-block"><pre>{{ changes$ | async | json }}</pre></code>
-        </div>
-        -->
+        </div>-->
     </div>
 </div>
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index 36861d3cf..3209bd051 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -1,20 +1,18 @@
-
 import { Component, OnDestroy } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Subscription, Observable, Subject } from 'rxjs';
-import { distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { map, withLatestFrom } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
 
-import { SetIndex, SetDisabled, UpdateDefinition, WizardActionTypes, Next, SetDefinition } from '../../../wizard/action/wizard.action';
-import { LoadSchemaRequest, UpdateStatus } from '../action/editor.action';
+import { SetIndex, SetDisabled, SetDefinition, ClearWizard } from '../../../wizard/action/wizard.action';
+import { LoadSchemaRequest, UpdateStatus, ClearEditor } from '../action/editor.action';
 import { startWith } from 'rxjs/operators';
 import { Wizard, WizardStep } from '../../../wizard/model';
 import { MetadataProvider } from '../../domain/model';
 import { MetadataProviderTypes, MetadataProviderWizard } from '../model';
-import { UpdateProvider } from '../action/entity.action';
+import { UpdateProvider, ClearProvider } from '../action/entity.action';
 import { pick } from '../../../shared/util';
 
 @Component({
@@ -24,8 +22,6 @@ import { pick } from '../../../shared/util';
 })
 
 export class ProviderWizardComponent implements OnDestroy {
-    actionsSubscription: Subscription;
-
     changeSubject = new Subject<Partial<any>>();
     private changeEmitted$ = this.changeSubject.asObservable();
 
@@ -33,11 +29,10 @@ export class ProviderWizardComponent implements OnDestroy {
     schema: any;
     definition$: Observable<Wizard<MetadataProvider>>;
     changes$: Observable<MetadataProvider>;
+    model$: Observable<any>;
     currentPage: string;
     valid$: Observable<boolean>;
 
-    formModel: any;
-
     nextStep: WizardStep;
     previousStep: WizardStep;
 
@@ -57,6 +52,26 @@ export class ProviderWizardComponent implements OnDestroy {
         this.store.select(fromWizard.getNext).subscribe(n => this.nextStep = n);
         this.store.select(fromWizard.getPrevious).subscribe(p => this.previousStep = p);
 
+        this.model$ = this.schema$.pipe(
+            withLatestFrom(
+                this.store.select(fromWizard.getModel),
+                this.changes$,
+                this.definition$
+            ),
+            map(([schema, model, changes, definition]) => {
+                return ({
+                    model: {
+                        ...model,
+                        ...changes
+                    },
+                    definition
+                });
+            }),
+            map(({ model, definition }) => {
+                return definition.translate ? definition.translate.formatter(model) : model;
+            })
+        );
+
         this.valid$
             .pipe(startWith(false))
             .subscribe((valid) => {
@@ -65,12 +80,9 @@ export class ProviderWizardComponent implements OnDestroy {
 
         this.schema$.subscribe(s => this.schema = s);
 
-        this.changeEmitted$
-            .pipe(
+        this.changeEmitted$.pipe(
                 withLatestFrom(this.schema$, this.definition$),
-            )
-            .subscribe(
-                ([changes, schema, definition]) => {
+                map(([changes, schema, definition]) => {
                     const type = changes.value['@type'];
                     if (type && type !== definition.type) {
                         const newDefinition = MetadataProviderTypes.find(def => def.type === type);
@@ -86,13 +98,17 @@ export class ProviderWizardComponent implements OnDestroy {
                             changes = { value: pick(Object.keys(schema.properties))(changes.value) };
                         }
                     }
-                    this.store.dispatch(new UpdateProvider(changes.value));
-                }
-            );
+                    return { changes: changes.value, definition };
+                }),
+                map(({ changes, definition }) => definition.translate ? definition.translate.parser(changes) : changes)
+            )
+            .subscribe(changes => this.store.dispatch(new UpdateProvider(changes)));
     }
 
     ngOnDestroy() {
-        this.actionsSubscription.unsubscribe();
+        this.store.dispatch(new ClearProvider());
+        this.store.dispatch(new ClearWizard());
+        this.store.dispatch(new ClearEditor());
         this.changeSubject.complete();
     }
 
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index 4f77f9e35..9b31fa220 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -1,17 +1,39 @@
 import { Wizard } from '../../../wizard/model';
-import { MetadataProvider } from '../../domain/model';
+import { FileBackedHttpMetadataProvider } from '../../domain/model/providers/file-backed-http-metadata-provider';
 
-export const FileBackedHttpMetadataProviderWizard: Wizard<MetadataProvider> = {
+export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadataProvider> = {
     label: 'FileBackedHttpMetadataProvider',
     type: '@FileBackedHttpMetadataProvider',
+    translate: {
+        parser: (changes) => ({
+            ...changes,
+            metadataFilters: [
+                ...Object.keys(changes.metadataFilters || {}).reduce((collection, filterName) => ([
+                    ...collection,
+                    {
+                        ...changes.metadataFilters[filterName],
+                        '@type': filterName
+                    }
+                ]), [])
+            ]
+        }),
+        formatter: (changes) => ({
+            ...changes,
+            metadataFilters: {
+                ...(changes.metadataFilters || []).reduce((collection, filter) => ({
+                    ...collection,
+                    [filter['@type']]: filter
+                }), {})
+            }
+        })
+    },
     steps: [
         {
             id: 'common',
             label: 'Common Attributes',
             index: 2,
             initialValues: [],
-            schema: 'assets/schema/provider/filebacked-http-common.schema.json',
-            parser: (changes: Partial<MetadataProvider>, schema: any) => (<MetadataProvider>{ name: '', '@type': '' })
+            schema: 'assets/schema/provider/filebacked-http-common.schema.json'
         },
         {
             id: 'reloading',
@@ -24,7 +46,9 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<MetadataProvider> = {
             id: 'filters',
             label: 'Metadata Filter Plugins',
             index: 4,
-            initialValues: [],
+            initialValues: [
+                { key: 'metadataFilters', value: [] }
+            ],
             schema: 'assets/schema/provider/filebacked-http-filters.schema.json'
         }
     ]
diff --git a/ui/src/app/metadata/provider/reducer/editor.reducer.ts b/ui/src/app/metadata/provider/reducer/editor.reducer.ts
index 351a17917..609f707f0 100644
--- a/ui/src/app/metadata/provider/reducer/editor.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/editor.reducer.ts
@@ -24,6 +24,11 @@ export function reducer(state = initialState, action: EditorActionUnion): Editor
                 type: action.payload
             };
         }
+        case EditorActionTypes.CLEAR: {
+            return {
+                ...initialState
+            };
+        }
         case EditorActionTypes.UPDATE_STATUS: {
             return {
                 ...state,
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
index 101674749..4207c42a4 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
@@ -15,10 +15,17 @@ export const initialState: EntityState = {
 
 export function reducer(state = initialState, action: EntityActionUnion): EntityState {
     switch (action.type) {
+        case EntityActionTypes.CLEAR_PROVIDER: {
+            return {
+                ...initialState
+            };
+        }
         case EntityActionTypes.RESET_CHANGES: {
             return {
                 ...state,
-                changes: initialState.changes
+                changes: {
+                    ...initialState.changes
+                }
             };
         }
         case EntityActionTypes.SELECT_PROVIDER:
diff --git a/ui/src/app/wizard/action/wizard.action.ts b/ui/src/app/wizard/action/wizard.action.ts
index b144601ae..55bb9b404 100644
--- a/ui/src/app/wizard/action/wizard.action.ts
+++ b/ui/src/app/wizard/action/wizard.action.ts
@@ -8,7 +8,9 @@ export enum WizardActionTypes {
     SET_DISABLED = '[Wizard] Set Disabled',
 
     NEXT = '[Wizard] Next Page',
-    PREVIOUS = '[Wizard] Previous Page'
+    PREVIOUS = '[Wizard] Previous Page',
+
+    CLEAR = '[Wizard] Clear'
 }
 
 export class SetIndex implements Action {
@@ -47,10 +49,15 @@ export class Previous implements Action {
     constructor(public payload: string) { }
 }
 
+export class ClearWizard implements Action {
+    readonly type = WizardActionTypes.CLEAR;
+}
+
 export type WizardActionUnion =
     | SetIndex
     | SetDefinition
     | UpdateDefinition
     | SetDisabled
     | Next
-    | Previous;
+    | Previous
+    | ClearWizard;
diff --git a/ui/src/app/wizard/model/wizard.ts b/ui/src/app/wizard/model/wizard.ts
index bcceb9f00..b95f18cd9 100644
--- a/ui/src/app/wizard/model/wizard.ts
+++ b/ui/src/app/wizard/model/wizard.ts
@@ -1,9 +1,11 @@
-import { MetadataProvider } from '../../metadata/domain/model';
-
 export interface Wizard<T> {
     label: string;
     type: string;
     steps: WizardStep[];
+    translate?: {
+        parser(changes: Partial<T>, schema?: any),
+        formatter(changes: Partial<T>, schema?: any)
+    };
 }
 
 export interface WizardStep {
@@ -12,7 +14,6 @@ export interface WizardStep {
     initialValues?: WizardValue[];
     schema: string;
     index: number;
-    parser?(changes: Partial<MetadataProvider>, schema: any);
 }
 
 export interface WizardValue {
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index 1119d5d14..bde6660fb 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -1,7 +1,7 @@
 import * as fromRoot from '../../app.reducer';
 import * as fromWizard from './wizard.reducer';
 import { createFeatureSelector, createSelector } from '@ngrx/store';
-import { Wizard } from '../model';
+import { Wizard, WizardStep } from '../model';
 
 export interface WizardState {
     wizard: fromWizard.State;
@@ -28,7 +28,6 @@ export const getSchema = (index: string, wizard: Wizard<any>) => {
     return step ? step.schema : null;
 };
 
-
 export const getCurrentWizardSchema = createSelector(getWizardIndex, getWizardDefinition, getSchema);
 
 export const getPreviousFn = (index: string, wizard: Wizard<any>) => {
@@ -54,7 +53,14 @@ export const getLastFn = (index: string, wizard: Wizard<any>) => {
     return index === step.id ? step : null;
 };
 
+export const getModelFn = (currentStep: WizardStep) => {
+    const model = currentStep.initialValues || [];
+    return model.reduce((m, property) => m[property.key] = property.value, {});
+};
+
 export const getPrevious = createSelector(getWizardIndex, getWizardDefinition, getPreviousFn);
 export const getCurrent = createSelector(getWizardIndex, getWizardDefinition, getCurrentFn);
 export const getNext = createSelector(getWizardIndex, getWizardDefinition, getNextFn);
 export const getLast = createSelector(getWizardIndex, getWizardDefinition, getLastFn);
+export const getModel = createSelector(getCurrent, getModelFn);
+

From 44146a8b1a2db529d1b143c17fef8f1ef4b4882c Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 3 Jul 2018 09:51:54 -0700
Subject: [PATCH 04/15] SHIBUI-646 Fixed default route with redirect

---
 ui/src/app/app.routing.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/app/app.routing.ts b/ui/src/app/app.routing.ts
index 3de190469..9903039c9 100644
--- a/ui/src/app/app.routing.ts
+++ b/ui/src/app/app.routing.ts
@@ -3,6 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
     { path: '', redirectTo: 'metadata', pathMatch: 'full' },
+    { path: 'dashboard', redirectTo: 'metadata', pathMatch: 'full' },
     {
         path: 'metadata',
         loadChildren: './metadata/metadata.module#MetadataModule'

From cba08fc77fcd1962e369818528b49b34f6cfc59b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 3 Jul 2018 11:31:12 -0700
Subject: [PATCH 05/15] SHIBUI-580 Re-organized code for provider wizard
 containers

---
 .../container/new-provider.component.scss     |  5 -
 .../provider-wizard-step.component.html       |  5 +
 .../provider-wizard-step.component.ts         | 92 +++++++++++++++++++
 ...=> provider-wizard-summary.component.html} |  0
 .../provider-wizard-summary.component.ts      | 21 +++++
 .../container/provider-wizard.component.html  |  6 +-
 .../container/provider-wizard.component.ts    | 63 ++-----------
 ...component.html => provider.component.html} |  0
 ...ponent.scss => provider.component.spec.ts} |  0
 ...der.component.ts => provider.component.ts} |  8 +-
 .../app/metadata/provider/provider.module.ts  | 10 +-
 .../app/metadata/provider/provider.routing.ts | 21 ++++-
 12 files changed, 153 insertions(+), 78 deletions(-)
 delete mode 100644 ui/src/app/metadata/provider/container/new-provider.component.scss
 create mode 100644 ui/src/app/metadata/provider/container/provider-wizard-step.component.html
 create mode 100644 ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
 rename ui/src/app/metadata/provider/container/{new-provider.component.spec.ts => provider-wizard-summary.component.html} (100%)
 create mode 100644 ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts
 rename ui/src/app/metadata/provider/container/{new-provider.component.html => provider.component.html} (100%)
 rename ui/src/app/metadata/provider/container/{provider-wizard.component.scss => provider.component.spec.ts} (100%)
 rename ui/src/app/metadata/provider/container/{new-provider.component.ts => provider.component.ts} (81%)

diff --git a/ui/src/app/metadata/provider/container/new-provider.component.scss b/ui/src/app/metadata/provider/container/new-provider.component.scss
deleted file mode 100644
index e3d0c671e..000000000
--- a/ui/src/app/metadata/provider/container/new-provider.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// :host {
-//     .provider-nav-option {
-//         width: 160px;
-//     }
-// }
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.html b/ui/src/app/metadata/provider/container/provider-wizard-step.component.html
new file mode 100644
index 000000000..842a4a2c2
--- /dev/null
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.html
@@ -0,0 +1,5 @@
+<sf-form
+    [schema]="schema$ | async"
+    [model]="formModel"
+    (onChange)="changeSubject.next($event)"
+    (isValid)="onStatusChange($event)"></sf-form>
\ No newline at end of file
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
new file mode 100644
index 000000000..b4c553f0a
--- /dev/null
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -0,0 +1,92 @@
+import { Component, OnDestroy } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
+import { withLatestFrom } from 'rxjs/operators';
+import { Store } from '@ngrx/store';
+
+import * as fromProvider from '../reducer';
+import * as fromWizard from '../../../wizard/reducer';
+
+import { SetDisabled, SetDefinition } from '../../../wizard/action/wizard.action';
+import { LoadSchemaRequest, UpdateStatus } from '../action/editor.action';
+import { startWith } from 'rxjs/operators';
+import { Wizard } from '../../../wizard/model';
+import { MetadataProvider } from '../../domain/model';
+import { MetadataProviderTypes, MetadataProviderWizard } from '../model';
+import { UpdateProvider } from '../action/entity.action';
+import { pick } from '../../../shared/util';
+
+@Component({
+    selector: 'provider-wizard-step',
+    templateUrl: './provider-wizard-step.component.html',
+    styleUrls: []
+})
+
+export class ProviderWizardStepComponent implements OnDestroy {
+    changeSubject = new Subject<Partial<any>>();
+    private changeEmitted$ = this.changeSubject.asObservable();
+
+    schema$: Observable<any>;
+    schema: any;
+    definition$: Observable<Wizard<MetadataProvider>>;
+    changes$: Observable<MetadataProvider>;
+    currentPage: string;
+    valid$: Observable<boolean>;
+
+    constructor(
+        private store: Store<fromProvider.ProviderState>
+    ) {
+        this.store
+            .select(fromWizard.getCurrentWizardSchema)
+            .subscribe(s => {
+                this.store.dispatch(new LoadSchemaRequest(s));
+            });
+
+        this.schema$ = this.store.select(fromProvider.getSchema);
+        this.valid$ = this.store.select(fromProvider.getEditorIsValid);
+        this.definition$ = this.store.select(fromWizard.getWizardDefinition);
+        this.changes$ = this.store.select(fromProvider.getEntityChanges);
+
+        this.valid$
+            .pipe(startWith(false))
+            .subscribe((valid) => {
+                this.store.dispatch(new SetDisabled(!valid));
+            });
+
+        this.schema$.subscribe(s => this.schema = s);
+
+        this.changeEmitted$
+            .pipe(
+                withLatestFrom(this.schema$, this.definition$),
+            )
+            .subscribe(
+                ([changes, schema, definition]) => {
+                    const type = changes.value['@type'];
+                    if (type && type !== definition.type) {
+                        const newDefinition = MetadataProviderTypes.find(def => def.type === type);
+                        if (newDefinition) {
+                            this.store.dispatch(new SetDefinition({
+                                ...MetadataProviderWizard,
+                                ...newDefinition,
+                                steps: [
+                                    ...MetadataProviderWizard.steps,
+                                    ...newDefinition.steps
+                                ]
+                            }));
+                            changes = { value: pick(Object.keys(schema.properties))(changes.value) };
+                        }
+                    }
+                    this.store.dispatch(new UpdateProvider(changes.value));
+                }
+            );
+    }
+
+    ngOnDestroy() {
+        this.changeSubject.complete();
+    }
+
+    onStatusChange(value): void {
+        const status = { [this.currentPage]: value ? 'VALID' : 'INVALID' };
+        this.store.dispatch(new UpdateStatus(status));
+    }
+}
+
diff --git a/ui/src/app/metadata/provider/container/new-provider.component.spec.ts b/ui/src/app/metadata/provider/container/provider-wizard-summary.component.html
similarity index 100%
rename from ui/src/app/metadata/provider/container/new-provider.component.spec.ts
rename to ui/src/app/metadata/provider/container/provider-wizard-summary.component.html
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts
new file mode 100644
index 000000000..d16ee2498
--- /dev/null
+++ b/ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+
+import * as fromProvider from '../reducer';
+
+@Component({
+    selector: 'provider-wizard-summary',
+    templateUrl: './provider-wizard-summary.component.html',
+    styleUrls: []
+})
+
+export class ProviderWizardSummaryComponent {
+    constructor(
+        private store: Store<fromProvider.ProviderState>
+    ) {}
+
+    save(): void {
+        console.log('Save!');
+    }
+}
+
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.html b/ui/src/app/metadata/provider/container/provider-wizard.component.html
index 58adb7221..cbeb7c675 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.html
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.html
@@ -3,11 +3,7 @@
     <hr />
     <div class="row">
         <div class="col col-xl-6 col-lg-9 col-xs-12">
-            <sf-form
-                [schema]="schema$ | async"
-                [model]="formModel"
-                (onChange)="changeSubject.next($event)"
-                (isValid)="onStatusChange($event)"></sf-form>
+            <router-outlet></router-outlet>
         </div>
         <!--
         <div class="col col-xl-6 col-lg-9 col-xs-12">
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index 36861d3cf..095d92a23 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -1,34 +1,23 @@
-
 import { Component, OnDestroy } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Subscription, Observable, Subject } from 'rxjs';
-import { distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
 
-import { SetIndex, SetDisabled, UpdateDefinition, WizardActionTypes, Next, SetDefinition } from '../../../wizard/action/wizard.action';
-import { LoadSchemaRequest, UpdateStatus } from '../action/editor.action';
+import { SetIndex, SetDisabled } from '../../../wizard/action/wizard.action';
+import { LoadSchemaRequest } from '../action/editor.action';
 import { startWith } from 'rxjs/operators';
 import { Wizard, WizardStep } from '../../../wizard/model';
 import { MetadataProvider } from '../../domain/model';
-import { MetadataProviderTypes, MetadataProviderWizard } from '../model';
-import { UpdateProvider } from '../action/entity.action';
-import { pick } from '../../../shared/util';
 
 @Component({
-    selector: 'provider-wizard-page',
+    selector: 'provider-wizard',
     templateUrl: './provider-wizard.component.html',
-    styleUrls: ['./provider-wizard.component.scss']
+    styleUrls: []
 })
 
-export class ProviderWizardComponent implements OnDestroy {
-    actionsSubscription: Subscription;
-
-    changeSubject = new Subject<Partial<any>>();
-    private changeEmitted$ = this.changeSubject.asObservable();
-
+export class ProviderWizardComponent {
     schema$: Observable<any>;
     schema: any;
     definition$: Observable<Wizard<MetadataProvider>>;
@@ -49,10 +38,7 @@ export class ProviderWizardComponent implements OnDestroy {
             .subscribe(s => {
                 this.store.dispatch(new LoadSchemaRequest(s));
             });
-
-        this.schema$ = this.store.select(fromProvider.getSchema);
         this.valid$ = this.store.select(fromProvider.getEditorIsValid);
-        this.definition$ = this.store.select(fromWizard.getWizardDefinition);
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
         this.store.select(fromWizard.getNext).subscribe(n => this.nextStep = n);
         this.store.select(fromWizard.getPrevious).subscribe(p => this.previousStep = p);
@@ -62,38 +48,6 @@ export class ProviderWizardComponent implements OnDestroy {
             .subscribe((valid) => {
                 this.store.dispatch(new SetDisabled(!valid));
             });
-
-        this.schema$.subscribe(s => this.schema = s);
-
-        this.changeEmitted$
-            .pipe(
-                withLatestFrom(this.schema$, this.definition$),
-            )
-            .subscribe(
-                ([changes, schema, definition]) => {
-                    const type = changes.value['@type'];
-                    if (type && type !== definition.type) {
-                        const newDefinition = MetadataProviderTypes.find(def => def.type === type);
-                        if (newDefinition) {
-                            this.store.dispatch(new SetDefinition({
-                                ...MetadataProviderWizard,
-                                ...newDefinition,
-                                steps: [
-                                    ...MetadataProviderWizard.steps,
-                                    ...newDefinition.steps
-                                ]
-                            }));
-                            changes = { value: pick(Object.keys(schema.properties))(changes.value) };
-                        }
-                    }
-                    this.store.dispatch(new UpdateProvider(changes.value));
-                }
-            );
-    }
-
-    ngOnDestroy() {
-        this.actionsSubscription.unsubscribe();
-        this.changeSubject.complete();
     }
 
     next(): void {
@@ -109,10 +63,5 @@ export class ProviderWizardComponent implements OnDestroy {
     save(): void {
         console.log('Save!');
     }
-
-    onStatusChange(value): void {
-        const status = { [this.currentPage]: value ? 'VALID' : 'INVALID' };
-        this.store.dispatch(new UpdateStatus(status));
-    }
 }
 
diff --git a/ui/src/app/metadata/provider/container/new-provider.component.html b/ui/src/app/metadata/provider/container/provider.component.html
similarity index 100%
rename from ui/src/app/metadata/provider/container/new-provider.component.html
rename to ui/src/app/metadata/provider/container/provider.component.html
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.scss b/ui/src/app/metadata/provider/container/provider.component.spec.ts
similarity index 100%
rename from ui/src/app/metadata/provider/container/provider-wizard.component.scss
rename to ui/src/app/metadata/provider/container/provider.component.spec.ts
diff --git a/ui/src/app/metadata/provider/container/new-provider.component.ts b/ui/src/app/metadata/provider/container/provider.component.ts
similarity index 81%
rename from ui/src/app/metadata/provider/container/new-provider.component.ts
rename to ui/src/app/metadata/provider/container/provider.component.ts
index d7581c566..c2955ca7a 100644
--- a/ui/src/app/metadata/provider/container/new-provider.component.ts
+++ b/ui/src/app/metadata/provider/container/provider.component.ts
@@ -11,11 +11,11 @@ import { SetDefinition, SetIndex } from '../../../wizard/action/wizard.action';
 import { MetadataProviderWizard } from '../model';
 
 @Component({
-    selector: 'new-provider-page',
-    templateUrl: './new-provider.component.html',
-    styleUrls: ['./new-provider.component.scss']
+    selector: 'provider-page',
+    templateUrl: './provider.component.html',
+    styleUrls: []
 })
-export class NewProviderComponent {
+export class ProviderComponent {
     types = MetadataProviderTypes;
 
     constructor(
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index 5379d9c94..25faea83a 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -5,7 +5,9 @@ import { RouterModule } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
 
 import { ProviderWizardComponent } from './container/provider-wizard.component';
-import { NewProviderComponent } from './container/new-provider.component';
+import { ProviderWizardStepComponent } from './container/provider-wizard-step.component';
+import { ProviderWizardSummaryComponent } from './container/provider-wizard-summary.component';
+import { ProviderComponent } from './container/provider.component';
 import { WizardModule } from '../../wizard/wizard.module';
 import * as fromProvider from './reducer';
 import { EffectsModule } from '@ngrx/effects';
@@ -19,8 +21,10 @@ import { CustomWidgetRegistry } from '../../schema-form/registry';
 
 @NgModule({
     declarations: [
-        NewProviderComponent,
-        ProviderWizardComponent
+        ProviderComponent,
+        ProviderWizardComponent,
+        ProviderWizardStepComponent,
+        ProviderWizardSummaryComponent
     ],
     entryComponents: [],
     imports: [
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index ad783dc6a..15a20ae14 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -1,12 +1,14 @@
 import { Routes } from '@angular/router';
 
-import { NewProviderComponent } from './container/new-provider.component';
+import { ProviderComponent } from './container/provider.component';
 import { ProviderWizardComponent } from './container/provider-wizard.component';
+import { ProviderWizardSummaryComponent } from './container/provider-wizard-summary.component';
+import { ProviderWizardStepComponent } from './container/provider-wizard-step.component';
 
 export const ProviderRoutes: Routes = [
     {
         path: 'provider',
-        component: NewProviderComponent,
+        component: ProviderComponent,
         children: [
             {
                 path: 'wizard',
@@ -14,9 +16,20 @@ export const ProviderRoutes: Routes = [
                 pathMatch: 'prefix'
             },
             {
-                path: 'wizard/new',
+                path: 'wizard',
                 component: ProviderWizardComponent,
-                canActivate: []
+                canActivate: [],
+                children: [
+                    {
+                        path: 'new',
+                        component: ProviderWizardStepComponent
+                    },
+                    {
+                        path: 'summary',
+                        component: ProviderWizardSummaryComponent,
+                        canActivate: []
+                    }
+                ]
             }
         ]
     }

From 38466de34761ddb57483e03e02e23465bcaec537 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 3 Jul 2018 13:22:17 -0700
Subject: [PATCH 06/15] [NOJIRA]

Added a logger to TestConfiguration.
Updated incommon-short to be valid until 2099.
---
 .../shibboleth/admin/ui/configuration/TestConfiguration.groovy | 3 +++
 backend/src/test/resources/metadata/incommon-short.xml         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
index 7296a2063..73cf58307 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
@@ -12,6 +12,8 @@ import org.apache.lucene.index.IndexWriter
 import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver
 import org.opensaml.saml.metadata.resolver.MetadataResolver
 import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.core.io.ClassPathResource
@@ -21,6 +23,7 @@ class TestConfiguration {
     final OpenSamlObjects openSamlObjects
     final IndexWriter indexWriter
     final MetadataResolverRepository metadataResolverRepository
+    final Logger logger = LoggerFactory.getLogger(TestConfiguration.class);
 
     TestConfiguration(final OpenSamlObjects openSamlObjects, final IndexWriter indexWriter, final MetadataResolverRepository metadataResolverRepository) {
         this.openSamlObjects =openSamlObjects
diff --git a/backend/src/test/resources/metadata/incommon-short.xml b/backend/src/test/resources/metadata/incommon-short.xml
index c807cf343..e8c214173 100644
--- a/backend/src/test/resources/metadata/incommon-short.xml
+++ b/backend/src/test/resources/metadata/incommon-short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:icmd="http://id.incommon.org/metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:remd="http://refeds.org/metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="INC20180618T184502" Name="urn:mace:incommon" validUntil="2018-07-02T18:45:02Z">
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:icmd="http://id.incommon.org/metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:remd="http://refeds.org/metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="INC20180618T184502" Name="urn:mace:incommon" validUntil="2099-07-02T18:45:02Z">
     <EntityDescriptor entityID="https://carmenwiki.osu.edu/shibboleth">
         <Extensions>
             <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>

From 2f1e1d71508ab6acfa55aeb8fead747a2855c642 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 5 Jul 2018 07:58:12 -0700
Subject: [PATCH 07/15] SHIBUI-580 Implemented summary page

---
 .../provider-wizard-summary.component.html    | 13 +++
 .../provider-wizard-summary.component.ts      | 83 +++++++++++++++++++
 .../component/summary-property.component.html | 18 ++++
 .../component/summary-property.component.ts   | 13 +++
 .../provider-wizard-step.component.ts         | 40 +++------
 .../provider-wizard-summary.component.html    |  0
 .../provider-wizard-summary.component.ts      | 21 -----
 .../container/provider-wizard.component.html  | 13 ++-
 .../container/provider-wizard.component.ts    | 28 +++++--
 .../provider/container/provider.component.ts  |  8 --
 .../metadata/provider/effect/editor.effect.ts | 16 +++-
 .../model/file-backed-http.provider.form.ts   | 49 ++++++-----
 .../app/metadata/provider/model/property.ts   |  6 ++
 .../app/metadata/provider/provider.module.ts  |  9 +-
 .../app/metadata/provider/provider.routing.ts |  6 --
 .../widget/check/checkbox.component.html      | 14 ----
 ui/src/app/wizard/action/wizard.action.ts     | 11 ++-
 .../wizard/component/wizard.component.html    | 26 ++----
 .../app/wizard/component/wizard.component.ts  |  1 +
 ui/src/app/wizard/reducer/index.ts            |  2 +-
 ui/src/app/wizard/reducer/wizard.reducer.ts   | 14 +++-
 .../metadata-provider-summary.schema.json     | 11 +++
 22 files changed, 265 insertions(+), 137 deletions(-)
 create mode 100644 ui/src/app/metadata/provider/component/provider-wizard-summary.component.html
 create mode 100644 ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts
 create mode 100644 ui/src/app/metadata/provider/component/summary-property.component.html
 create mode 100644 ui/src/app/metadata/provider/component/summary-property.component.ts
 delete mode 100644 ui/src/app/metadata/provider/container/provider-wizard-summary.component.html
 delete mode 100644 ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts
 create mode 100644 ui/src/app/metadata/provider/model/property.ts
 create mode 100644 ui/src/assets/schema/provider/metadata-provider-summary.schema.json

diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html
new file mode 100644
index 000000000..a60ef4c1e
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html
@@ -0,0 +1,13 @@
+<div class="row">
+    <div class="col-xl-6 col-xs-12" *ngFor="let sections of columns">
+        <section class="px-3" *ngFor="let section of sections; let i = index;">
+            <button (click)="gotoPage(section.id)" class="tag tag-success tag-sm my-4 text-left" [attr.aria-label]="section.label" role="button">
+                <span class="index">{{ section.index }}</span>
+                <ng-container>{{ section.label }}</ng-container>
+            </button>
+            <ng-container *ngFor="let prop of section.properties">
+                <summary-property [property]="prop"></summary-property>
+            </ng-container>
+        </section>
+    </div>
+</div>
diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts
new file mode 100644
index 000000000..ad4d6fc68
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts
@@ -0,0 +1,83 @@
+import { Component, Input, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core';
+import { Store } from '@ngrx/store';
+
+import * as fromProvider from '../reducer';
+import { Wizard, WizardStep } from '../../../wizard/model';
+import { MetadataProvider } from '../../domain/model';
+import { Property } from '../model/property';
+
+interface Section {
+    id: string;
+    index: number;
+    label: string;
+    properties: Property[];
+}
+
+function getStepProperties(schema: any, model: any): Property[] {
+    if (!schema || !schema.properties) { return []; }
+    return Object.keys(schema.properties).map(property => ({
+        name: schema.properties[property].title,
+        value: (model && model.hasOwnProperty(property)) ? model[property] : null,
+        type: schema.properties[property].type,
+        properties: schema.properties ? getStepProperties(
+            schema.properties[property],
+            (model && model.hasOwnProperty(property)) ? model[property] : null
+        ) : []
+    }));
+}
+
+@Component({
+    selector: 'provider-wizard-summary',
+    templateUrl: './provider-wizard-summary.component.html',
+    styleUrls: []
+})
+
+export class ProviderWizardSummaryComponent implements OnChanges {
+    @Input() summary: { definition: Wizard<MetadataProvider>, schema: { [id: string]: any }, model: any };
+
+    @Output() onPageSelect: EventEmitter<string> = new EventEmitter();
+
+    sections: Section[];
+    columns: Array<Section>[];
+
+    constructor(
+        private store: Store<fromProvider.ProviderState>
+    ) {}
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes.summary && this.summary) {
+            const schemas = this.summary.schema;
+            const model = this.summary.model;
+            const def = this.summary.definition;
+            const steps = def.steps;
+
+            this.sections = steps
+                .filter(step => step.id !== 'summary')
+                .map(
+                    (step: WizardStep) => ({
+                        id: step.id,
+                        index: step.index,
+                        label: step.label,
+                        properties: getStepProperties(schemas[step.id], def.translate ? def.translate.formatter(model) : model)
+                    })
+                );
+
+            this.columns = this.sections.reduce((resultArray, item, index) => {
+                const chunkIndex = Math.floor(index / Math.round(this.sections.length / 2));
+
+                if (!resultArray[chunkIndex]) {
+                    resultArray[chunkIndex] = [];
+                }
+
+                resultArray[chunkIndex].push(item);
+
+                return resultArray;
+            }, []);
+        }
+    }
+
+    gotoPage(page: string = ''): void {
+        this.onPageSelect.emit(page);
+    }
+}
+
diff --git a/ui/src/app/metadata/provider/component/summary-property.component.html b/ui/src/app/metadata/provider/component/summary-property.component.html
new file mode 100644
index 000000000..8f4781e47
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/summary-property.component.html
@@ -0,0 +1,18 @@
+<div role="listitem" class="mb-3" *ngIf="property">
+    <ng-container [ngSwitch]="property.type">
+        <ng-container *ngSwitchDefault>
+            <ng-container *ngIf="property.name">
+                <strong class="text-primary d-block" role="term">{{ property.name }}</strong>
+                <span class="d-block" role="definition">{{ property.value || '-' }}</span>
+            </ng-container>
+        </ng-container>
+        <ng-container *ngSwitchCase="'object'">
+            <ng-container *ngIf="property.name">
+                <span class="text-primary d-block" role="term">{{ property.name }}</span>
+            </ng-container>
+            <ng-container *ngIf="property.properties">
+                <summary-property *ngFor="let prop of property.properties" [property]="prop"></summary-property>
+            </ng-container>
+        </ng-container>
+    </ng-container>
+</div>
diff --git a/ui/src/app/metadata/provider/component/summary-property.component.ts b/ui/src/app/metadata/provider/component/summary-property.component.ts
new file mode 100644
index 000000000..6dbd0c716
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/summary-property.component.ts
@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+import { Property } from '../model/property';
+
+@Component({
+    selector: 'summary-property',
+    templateUrl: './summary-property.component.html',
+    styleUrls: []
+})
+
+export class SummaryPropertyComponent {
+    @Input() property: Property;
+}
+
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
index 81f57c1eb..962445d30 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -6,9 +6,8 @@ import { Store } from '@ngrx/store';
 import * as fromProvider from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
 
-import { SetDisabled, SetDefinition } from '../../../wizard/action/wizard.action';
-import { LoadSchemaRequest, UpdateStatus } from '../action/editor.action';
-import { startWith } from 'rxjs/operators';
+import { SetDefinition } from '../../../wizard/action/wizard.action';
+import { UpdateStatus } from '../action/editor.action';
 import { Wizard } from '../../../wizard/model';
 import { MetadataProvider } from '../../domain/model';
 import { MetadataProviderTypes, MetadataProviderWizard } from '../model';
@@ -36,45 +35,26 @@ export class ProviderWizardStepComponent implements OnDestroy {
     constructor(
         private store: Store<fromProvider.ProviderState>
     ) {
-        this.store
-            .select(fromWizard.getCurrentWizardSchema)
-            .subscribe(s => {
-                this.store.dispatch(new LoadSchemaRequest(s));
-            });
-
         this.schema$ = this.store.select(fromProvider.getSchema);
-        this.valid$ = this.store.select(fromProvider.getEditorIsValid);
         this.definition$ = this.store.select(fromWizard.getWizardDefinition);
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
 
-        this.valid$
-            .pipe(startWith(false))
-            .subscribe((valid) => {
-                this.store.dispatch(new SetDisabled(!valid));
-            });
-
         this.model$ = this.schema$.pipe(
             withLatestFrom(
                 this.store.select(fromWizard.getModel),
                 this.changes$,
                 this.definition$
             ),
-            map(([schema, model, changes, definition]) => {
-                return ({
-                    model: {
-                        ...model,
-                        ...changes
-                    },
-                    definition
-                });
-            }),
-            map(({ model, definition }) => {
-                return definition.translate ? definition.translate.formatter(model) : model;
-            })
+            map(([schema, model, changes, definition]) => ({
+                model: {
+                    ...model,
+                    ...changes
+                },
+                definition
+            })),
+            map(({ model, definition }) => definition.translate ? definition.translate.formatter(model) : model)
         );
 
-        this.schema$.subscribe(s => this.schema = s);
-
         this.changeEmitted$.pipe(
             withLatestFrom(this.schema$, this.definition$),
             map(([changes, schema, definition]) => {
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-summary.component.html b/ui/src/app/metadata/provider/container/provider-wizard-summary.component.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts
deleted file mode 100644
index d16ee2498..000000000
--- a/ui/src/app/metadata/provider/container/provider-wizard-summary.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component } from '@angular/core';
-import { Store } from '@ngrx/store';
-
-import * as fromProvider from '../reducer';
-
-@Component({
-    selector: 'provider-wizard-summary',
-    templateUrl: './provider-wizard-summary.component.html',
-    styleUrls: []
-})
-
-export class ProviderWizardSummaryComponent {
-    constructor(
-        private store: Store<fromProvider.ProviderState>
-    ) {}
-
-    save(): void {
-        console.log('Save!');
-    }
-}
-
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.html b/ui/src/app/metadata/provider/container/provider-wizard.component.html
index 2193c7e1d..196081a1f 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.html
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.html
@@ -1,12 +1,17 @@
 <div class="container-fluid p-3" role="main">
-    <wizard (onNext)="next()" (onPrevious)="previous()" (onSave)="save()"></wizard>
+    <wizard
+        (onNext)="next()"
+        (onPrevious)="previous()"
+        (onSave)="save()"></wizard>
     <hr />
     <div class="row">
         <div class="col col-xl-6 col-lg-9 col-xs-12">
             <router-outlet></router-outlet>
         </div>
-        <!--<div class="col col-xl-6 col-lg-9 col-xs-12">
-            <code class="bg-light border rounded p-4 d-block"><pre>{{ changes$ | async | json }}</pre></code>
-        </div>-->
     </div>
+    <provider-wizard-summary
+        [summary]="summary$ | async"
+        (onPageSelect)="gotoPage($event)"
+        *ngIf="currentPage === 'summary'">
+    </provider-wizard-summary>
 </div>
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index 248efe68b..a9383bd64 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, combineLatest } from 'rxjs';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
@@ -10,6 +10,8 @@ import { startWith } from 'rxjs/operators';
 import { Wizard, WizardStep } from '../../../wizard/model';
 import { MetadataProvider } from '../../domain/model';
 import { ClearProvider } from '../action/entity.action';
+import { Router, ActivatedRoute } from '@angular/router';
+import { map } from 'rxjs/operators';
 
 
 @Component({
@@ -19,9 +21,6 @@ import { ClearProvider } from '../action/entity.action';
 })
 
 export class ProviderWizardComponent implements OnDestroy {
-
-    schema$: Observable<any>;
-    schema: any;
     definition$: Observable<Wizard<MetadataProvider>>;
     changes$: Observable<MetadataProvider>;
     model$: Observable<any>;
@@ -31,8 +30,12 @@ export class ProviderWizardComponent implements OnDestroy {
     nextStep: WizardStep;
     previousStep: WizardStep;
 
+    summary$: Observable<{ definition: Wizard<MetadataProvider>, schema: { [id: string]: any }, model: any }>;
+
     constructor(
-        private store: Store<fromProvider.ProviderState>
+        private store: Store<fromProvider.ProviderState>,
+        private router: Router,
+        private route: ActivatedRoute
     ) {
         this.store
             .select(fromWizard.getCurrentWizardSchema)
@@ -41,8 +44,10 @@ export class ProviderWizardComponent implements OnDestroy {
             });
         this.valid$ = this.store.select(fromProvider.getEditorIsValid);
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
+
         this.store.select(fromWizard.getNext).subscribe(n => this.nextStep = n);
         this.store.select(fromWizard.getPrevious).subscribe(p => this.previousStep = p);
+        this.store.select(fromWizard.getWizardIndex).subscribe(i => this.currentPage = i);
 
         this.valid$
             .pipe(startWith(false))
@@ -50,8 +55,13 @@ export class ProviderWizardComponent implements OnDestroy {
                 this.store.dispatch(new SetDisabled(!valid));
             });
 
-        this.schema$.subscribe(s => this.schema = s);
-
+        this.summary$ = combineLatest(
+            this.store.select(fromWizard.getWizardDefinition),
+            this.store.select(fromWizard.getSchemaCollection),
+            this.store.select(fromProvider.getEntityChanges)
+        ).pipe(
+            map(([ definition, schema, model ]) => ({ definition, schema, model }))
+        );
     }
 
     ngOnDestroy() {
@@ -73,5 +83,9 @@ export class ProviderWizardComponent implements OnDestroy {
     save(): void {
         console.log('Save!');
     }
+
+    gotoPage(page: string): void {
+        this.store.dispatch(new SetIndex(page));
+    }
 }
 
diff --git a/ui/src/app/metadata/provider/container/provider.component.ts b/ui/src/app/metadata/provider/container/provider.component.ts
index c2955ca7a..afaf48a27 100644
--- a/ui/src/app/metadata/provider/container/provider.component.ts
+++ b/ui/src/app/metadata/provider/container/provider.component.ts
@@ -1,10 +1,5 @@
 import { Component } from '@angular/core';
-import { FormGroup, Validators, FormBuilder } from '@angular/forms';
 import { Store } from '@ngrx/store';
-import { ActivatedRoute } from '@angular/router';
-
-
-import { MetadataProviderTypes } from '../model';
 import * as fromProvider from '../reducer';
 import { SetDefinition, SetIndex } from '../../../wizard/action/wizard.action';
 
@@ -16,10 +11,7 @@ import { MetadataProviderWizard } from '../model';
     styleUrls: []
 })
 export class ProviderComponent {
-    types = MetadataProviderTypes;
-
     constructor(
-        private fb: FormBuilder,
         private store: Store<fromProvider.ProviderState>
     ) {
         this.store.dispatch(new SetDefinition(MetadataProviderWizard));
diff --git a/ui/src/app/metadata/provider/effect/editor.effect.ts b/ui/src/app/metadata/provider/effect/editor.effect.ts
index 7fc04f3bc..bbf1bcc48 100644
--- a/ui/src/app/metadata/provider/effect/editor.effect.ts
+++ b/ui/src/app/metadata/provider/effect/editor.effect.ts
@@ -8,11 +8,14 @@ import {
     LoadSchemaFail,
     EditorActionTypes
 } from '../action/editor.action';
-import { map, switchMap, catchError } from 'rxjs/operators';
+import { map, switchMap, catchError, withLatestFrom } from 'rxjs/operators';
 import { of } from 'rxjs';
-import { SetDefinition, WizardActionTypes } from '../../../wizard/action/wizard.action';
+import { SetDefinition, WizardActionTypes, AddSchema } from '../../../wizard/action/wizard.action';
 import { ResetChanges } from '../action/entity.action';
 
+import * as fromWizard from '../../../wizard/reducer';
+import { Store } from '@ngrx/store';
+
 @Injectable()
 export class EditorEffects {
 
@@ -30,6 +33,14 @@ export class EditorEffects {
         )
     );
 
+    @Effect()
+    $loadSchemaSuccess = this.actions$.pipe(
+        ofType<LoadSchemaSuccess>(EditorActionTypes.LOAD_SCHEMA_SUCCESS),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromWizard.getWizardIndex)),
+        map(([schema, id]) => new AddSchema({ id, schema }))
+    );
+
     @Effect()
     $resetChanges = this.actions$.pipe(
         ofType<SetDefinition>(WizardActionTypes.SET_DEFINITION),
@@ -38,6 +49,7 @@ export class EditorEffects {
 
     constructor(
         private schemaService: SchemaService,
+        private store: Store<fromWizard.WizardState>,
         private actions$: Actions
     ) { }
 }  /* istanbul ignore next */
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index 9b31fa220..d4bfd143d 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -5,27 +5,27 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
     label: 'FileBackedHttpMetadataProvider',
     type: '@FileBackedHttpMetadataProvider',
     translate: {
-        parser: (changes) => ({
-            ...changes,
-            metadataFilters: [
-                ...Object.keys(changes.metadataFilters || {}).reduce((collection, filterName) => ([
-                    ...collection,
-                    {
-                        ...changes.metadataFilters[filterName],
-                        '@type': filterName
-                    }
-                ]), [])
-            ]
-        }),
-        formatter: (changes) => ({
-            ...changes,
-            metadataFilters: {
-                ...(changes.metadataFilters || []).reduce((collection, filter) => ({
-                    ...collection,
-                    [filter['@type']]: filter
-                }), {})
-            }
-        })
+        parser: (changes) => changes.metadataFilters ? ({
+                ...changes,
+                metadataFilters: [
+                    ...Object.keys(changes.metadataFilters).reduce((collection, filterName) => ([
+                        ...collection,
+                        {
+                            ...changes.metadataFilters[filterName],
+                            '@type': filterName
+                        }
+                    ]), [])
+                ]
+            }) : changes,
+        formatter: (changes) => changes.metadataFilters ? ({
+                ...changes,
+                metadataFilters: {
+                    ...(changes.metadataFilters || []).reduce((collection, filter) => ({
+                        ...collection,
+                        [filter['@type']]: filter
+                    }), {})
+                }
+            }) : changes
     },
     steps: [
         {
@@ -50,6 +50,13 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
                 { key: 'metadataFilters', value: [] }
             ],
             schema: 'assets/schema/provider/filebacked-http-filters.schema.json'
+        },
+        {
+            id: 'summary',
+            label: 'FINISH SUMMARY AND VALIDATION',
+            index: null,
+            initialValues: [],
+            schema: 'assets/schema/provider/metadata-provider-summary.schema.json'
         }
     ]
 };
diff --git a/ui/src/app/metadata/provider/model/property.ts b/ui/src/app/metadata/provider/model/property.ts
new file mode 100644
index 000000000..031dce75c
--- /dev/null
+++ b/ui/src/app/metadata/provider/model/property.ts
@@ -0,0 +1,6 @@
+export interface Property {
+    type: string;
+    name: string;
+    value: string[];
+    properties: Property[];
+}
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index 25faea83a..098c8baf1 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -6,17 +6,17 @@ import { StoreModule } from '@ngrx/store';
 
 import { ProviderWizardComponent } from './container/provider-wizard.component';
 import { ProviderWizardStepComponent } from './container/provider-wizard-step.component';
-import { ProviderWizardSummaryComponent } from './container/provider-wizard-summary.component';
+import { ProviderWizardSummaryComponent } from './component/provider-wizard-summary.component';
 import { ProviderComponent } from './container/provider.component';
 import { WizardModule } from '../../wizard/wizard.module';
 import * as fromProvider from './reducer';
 import { EffectsModule } from '@ngrx/effects';
 import { EditorEffects } from './effect/editor.effect';
-// import { SchemaFormModule } from '../../schema-form/form.module';
 
-import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
+import { WidgetRegistry} from 'ngx-schema-form';
 import { FormModule } from '../../schema-form/schema-form.module';
 import { CustomWidgetRegistry } from '../../schema-form/registry';
+import { SummaryPropertyComponent } from './component/summary-property.component';
 
 
 @NgModule({
@@ -24,7 +24,8 @@ import { CustomWidgetRegistry } from '../../schema-form/registry';
         ProviderComponent,
         ProviderWizardComponent,
         ProviderWizardStepComponent,
-        ProviderWizardSummaryComponent
+        ProviderWizardSummaryComponent,
+        SummaryPropertyComponent
     ],
     entryComponents: [],
     imports: [
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index 15a20ae14..98cdddd85 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -2,7 +2,6 @@ import { Routes } from '@angular/router';
 
 import { ProviderComponent } from './container/provider.component';
 import { ProviderWizardComponent } from './container/provider-wizard.component';
-import { ProviderWizardSummaryComponent } from './container/provider-wizard-summary.component';
 import { ProviderWizardStepComponent } from './container/provider-wizard-step.component';
 
 export const ProviderRoutes: Routes = [
@@ -23,11 +22,6 @@ export const ProviderRoutes: Routes = [
                     {
                         path: 'new',
                         component: ProviderWizardStepComponent
-                    },
-                    {
-                        path: 'summary',
-                        component: ProviderWizardSummaryComponent,
-                        canActivate: []
                     }
                 ]
             }
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
index 4c2745660..f8f94af1a 100644
--- a/ui/src/app/schema-form/widget/check/checkbox.component.html
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -35,17 +35,3 @@
         </div>
     </ng-container>
 </div>
-<!--
-
-<fieldset aria-label="Don't sign the response? Checkbox - select for yes">
-    <div class="custom-control custom-checkbox custom-control-inline custom-control-reverse">
-        <input disableValidation="true" type="checkbox" class="custom-control-input" formControlName="dontSignResponse" id="dontSignResponse"
-            [value]="true" role="checkbox" aria-checked="false">
-        <label class="custom-control-label" i18n="@@label--dont-sign-the-response" for="dontSignResponse">Don't Sign the Response</label>
-    </div>
-    <ng-template #tooltipDontSignResponse i18n="@@tooltip--dont-sign-response">Don't Sign Response popover</ng-template>
-    <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipDontSignResponse" i18n-aria-label="@@tooltip--instruction"
-        aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-</fieldset>
-
--->
\ No newline at end of file
diff --git a/ui/src/app/wizard/action/wizard.action.ts b/ui/src/app/wizard/action/wizard.action.ts
index 55bb9b404..ecb507cb4 100644
--- a/ui/src/app/wizard/action/wizard.action.ts
+++ b/ui/src/app/wizard/action/wizard.action.ts
@@ -7,6 +7,8 @@ export enum WizardActionTypes {
     UPDATE_DEFINITION = '[Wizard] Update Definition',
     SET_DISABLED = '[Wizard] Set Disabled',
 
+    ADD_SCHEMA = '[Wizard] Add Schema',
+
     NEXT = '[Wizard] Next Page',
     PREVIOUS = '[Wizard] Previous Page',
 
@@ -49,6 +51,12 @@ export class Previous implements Action {
     constructor(public payload: string) { }
 }
 
+export class AddSchema implements Action {
+    readonly type = WizardActionTypes.ADD_SCHEMA;
+
+    constructor(public payload: { id: string, schema: any }) { }
+}
+
 export class ClearWizard implements Action {
     readonly type = WizardActionTypes.CLEAR;
 }
@@ -60,4 +68,5 @@ export type WizardActionUnion =
     | SetDisabled
     | Next
     | Previous
-    | ClearWizard;
+    | ClearWizard
+    | AddSchema;
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index e5921c6ac..a4ae2b75c 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -8,21 +8,26 @@
                     <ng-container i18n="@@action--back">Back</ng-container>
                 </span>
                 <span class="label pull-right">
-                    {{ (previous$ | async).index }}. {{ (previous$ | async).label }}
+                    <ng-container *ngIf="(previous$ | async).index">{{ (previous$ | async).index }}. </ng-container>
+                    {{ (previous$ | async).label }}
                 </span>
             </button>
         </li>
         <li class="nav-item">
             <h3 class="tag tag-primary">
-                <span class="index">{{ (current$ | async).index }}</span>
-                {{ (current$ | async).index }}. {{ (current$ | async).label }}
+                <span class="index">{{ (current$ | async).index }} </span>
+                <ng-container *ngIf="(current$ | async).index">
+                    {{ (current$ | async).index }}. 
+                </ng-container>
+                {{ (current$ | async).label }}
             </h3>
         </li>
         <li class="nav-item" *ngIf="(next$ | async)">
             <button class="nav-link next btn clearfix" (click)="onNext.emit(nextPage.index)" [disabled]="disabled$ | async" [attr.aria-label]="nextPage.path"
                 role="button">
                 <span class="label pull-left">
-                    {{ (next$ | async).index }}. {{ (next$ | async).label }}
+                    <ng-container *ngIf="(next$ | async).index">{{ (next$ | async).index }}. </ng-container>
+                    {{ (next$ | async).label }}
                 </span>
                 <span class="direction pull-right">
                     <i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>
@@ -31,18 +36,6 @@ <h3 class="tag tag-primary">
             </button>
         </li>
         <li class="nav-item" *ngIf="(last$ | async)">
-            <button class="nav-link next btn clearfix" (click)="onNext.emit(null)" [disabled]="disabled$ | async" role="button">
-                <span class="label pull-left">
-                    Finish And Validate
-                </span>
-                <span class="direction pull-right">
-                    <i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>
-                    <ng-container i18n="@@action--next">Next</ng-container>
-                </span>
-            </button>
-        </li>
-        <!--
-        <li class="nav-item" *ngIf="(save$ | async) && !(next$ | async)">
             <button class="nav-link save btn" aria-label="Save" role="button">
                 <span class="label pull-left" i18n="@@action--save">Save</span>
                 <span class="direction pull-right">
@@ -51,6 +44,5 @@ <h3 class="tag tag-primary">
                 </span>
             </button>
         </li>
-        -->
     </ul>
 </nav>
diff --git a/ui/src/app/wizard/component/wizard.component.ts b/ui/src/app/wizard/component/wizard.component.ts
index 5ab006519..da9cdafb0 100644
--- a/ui/src/app/wizard/component/wizard.component.ts
+++ b/ui/src/app/wizard/component/wizard.component.ts
@@ -13,6 +13,7 @@ import { Observable } from 'rxjs';
 export class WizardComponent implements OnChanges {
     @Output() onNext = new EventEmitter();
     @Output() onPrevious = new EventEmitter();
+    @Output() onLast = new EventEmitter();
     @Output() onSave = new EventEmitter();
 
     currentPage: any = {};
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index bde6660fb..bbf53caf4 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -22,6 +22,7 @@ export const getState = createSelector(getWizardState, getWizardStateFn);
 export const getWizardIndex = createSelector(getState, fromWizard.getIndex);
 export const getWizardIsDisabled = createSelector(getState, fromWizard.getDisabled);
 export const getWizardDefinition = createSelector(getState, fromWizard.getDefinition);
+export const getSchemaCollection = createSelector(getState, fromWizard.getCollection);
 
 export const getSchema = (index: string, wizard: Wizard<any>) => {
     const step = wizard.steps.find(s => s.id === index);
@@ -63,4 +64,3 @@ export const getCurrent = createSelector(getWizardIndex, getWizardDefinition, ge
 export const getNext = createSelector(getWizardIndex, getWizardDefinition, getNextFn);
 export const getLast = createSelector(getWizardIndex, getWizardDefinition, getLastFn);
 export const getModel = createSelector(getCurrent, getModelFn);
-
diff --git a/ui/src/app/wizard/reducer/wizard.reducer.ts b/ui/src/app/wizard/reducer/wizard.reducer.ts
index de40f86a3..9ecae96ce 100644
--- a/ui/src/app/wizard/reducer/wizard.reducer.ts
+++ b/ui/src/app/wizard/reducer/wizard.reducer.ts
@@ -5,16 +5,27 @@ export interface State {
     index: string;
     disabled: boolean;
     definition: Wizard<any>;
+    schemaCollection: { [id: string]: any };
 }
 
 export const initialState: State = {
     index: null,
     disabled: false,
-    definition: null
+    definition: null,
+    schemaCollection: {}
 };
 
 export function reducer(state = initialState, action: WizardActionUnion): State {
     switch (action.type) {
+        case WizardActionTypes.ADD_SCHEMA: {
+            return {
+                ...state,
+                schemaCollection: {
+                    ...state.schemaCollection,
+                    [action.payload.id]: action.payload.schema
+                }
+            };
+        }
         case WizardActionTypes.SET_DISABLED: {
             return {
                 ...state,
@@ -56,3 +67,4 @@ export function reducer(state = initialState, action: WizardActionUnion): State
 export const getIndex = (state: State) => state.index;
 export const getDisabled = (state: State) => state.disabled;
 export const getDefinition = (state: State) => state.definition;
+export const getCollection = (state: State) => state.schemaCollection;
diff --git a/ui/src/assets/schema/provider/metadata-provider-summary.schema.json b/ui/src/assets/schema/provider/metadata-provider-summary.schema.json
new file mode 100644
index 000000000..b3cc3b73c
--- /dev/null
+++ b/ui/src/assets/schema/provider/metadata-provider-summary.schema.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "enabled": {
+            "title": "Enable Metadata Provider",
+            "description": "Enable Metadata Provider",
+            "type": "boolean",
+            "default": true
+        }
+    }
+}
\ No newline at end of file

From 382294aecf769613f924524e2a4609204433b0ee Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Thu, 5 Jul 2018 10:59:04 -0700
Subject: [PATCH 08/15] [SHIBUI-580]

Added a name conflict check.
---
 .../admin/ui/controller/MetadataResolversController.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
index ae75b3f6d..c0ee64068 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
@@ -56,6 +56,10 @@ public ResponseEntity<?> getOne(@PathVariable String resourceId) {
     @PostMapping("/MetadataResolvers")
     @Transactional
     public ResponseEntity<?> create(@RequestBody MetadataResolver newResolver) {
+        if (resolverRepository.findByName(newResolver.getName()) != null) {
+            return ResponseEntity.status(HttpStatus.CONFLICT).build();
+        }
+
         //TODO: we are disregarding attached filters if any sent from UI.
         //Only deal with filters via filters endpoints?
         newResolver.clearAllFilters();

From 07c7e9ffe4992a914b8d235448e8f819a59e6053 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Thu, 5 Jul 2018 11:50:25 -0700
Subject: [PATCH 09/15] [SHIBUI-580]

Added a simple POJO for transmitting errors from custom exception handlers.
Added a custom exception handler for when bad things happen when parsing JSON Resolvers.
Fixed a couple typos.
---
 .../admin/ui/controller/ErrorResponse.java     | 18 ++++++++++++++++++
 .../MetadataResolversController.java           | 11 +++++++++--
 .../MetadataResolverValidationService.java     |  4 ++--
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ErrorResponse.java

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ErrorResponse.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ErrorResponse.java
new file mode 100644
index 000000000..fa91aa3e6
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ErrorResponse.java
@@ -0,0 +1,18 @@
+package edu.internet2.tier.shibboleth.admin.ui.controller;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author Bill Smith (wsmith@unicon.net)
+ */
+@AllArgsConstructor
+@Getter
+@Setter
+@ToString
+public class ErrorResponse {
+    private String errorCode;
+    private String errorMessage;
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
index c0ee64068..5b24f5788 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
@@ -1,15 +1,16 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller;
 
+import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidationService;
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidator;
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import java.io.IOException;
 import java.net.URI;
 
 import static edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidator.ValidationResult;
@@ -34,6 +36,11 @@ public class MetadataResolversController {
     @Autowired
     MetadataResolverValidationService metadataResolverValidationService;
 
+    @ExceptionHandler({InvalidTypeIdException.class, IOException.class, HttpMessageNotReadableException.class})
+    public ResponseEntity<?> unableToParseJson(Exception ex) {
+        return ResponseEntity.badRequest().body(new ErrorResponse(HttpStatus.BAD_REQUEST.toString(), ex.getMessage()));
+    }
+
     @GetMapping("/MetadataResolvers")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getAll() {
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java
index 26039b81b..4151faeb6 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java
@@ -8,7 +8,7 @@
 
 /**
  * A facade that aggregates {@link MetadataResolverValidator}s available to call just one of them supporting the type of a given resolver.
- * If no {@link MetadataResolverValidator}s are configured, conciders provided MetadataResolver as valid.
+ * If no {@link MetadataResolverValidator}s are configured, considers provided MetadataResolver as valid.
  * <p>
  * Uses chain-of-responsibility design pattern
  *
@@ -22,7 +22,7 @@ public MetadataResolverValidationService(List<MetadataResolverValidator<T>> vali
         this.validators = validators != null ? validators : new ArrayList<>();
     }
 
-    @SuppressWarnings("Uncheked")
+    @SuppressWarnings("Unchecked")
     public ValidationResult validateIfNecessary(T metadataResolver) {
         Optional<MetadataResolverValidator<T>> validator =
                 this.validators

From f357ea488f28b5fa00bab7b041059cc73699829b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 5 Jul 2018 11:54:45 -0700
Subject: [PATCH 10/15] SHIBUI-580 Fixed issues with saving provider

---
 ui/src/app/metadata/domain/domain.module.ts   |   4 +-
 .../domain/model/metadata-provider.ts         |  10 +-
 .../metadata/domain/service/filter.service.ts |  32 +++++
 .../domain/service/provider.service.ts        |  22 ++--
 .../filter/effect/collection.effect.ts        |  13 +-
 .../provider/action/collection.action.ts      | 112 ++++++++++++++++++
 .../metadata/provider/action/entity.action.ts |  33 ------
 .../container/provider-wizard.component.ts    |  17 ++-
 .../provider/effect/collection.effect.ts      |  55 +++++++++
 .../model/file-backed-http.provider.form.ts   |  19 ++-
 .../app/metadata/provider/provider.module.ts  |   3 +-
 .../provider/reducer/collection.reducer.ts    |  52 ++++++++
 .../provider/reducer/entity.reducer.ts        |  20 +---
 ui/src/app/metadata/provider/reducer/index.ts |  23 +++-
 .../wizard/component/wizard.component.html    |   2 +-
 .../filebacked-http-common.schema.json        |   7 +-
 .../filebacked-http-filters.schema.json       |  12 +-
 .../filebacked-http-reloading.schema.json     |  12 +-
 .../provider/metadata-provider.schema.json    |   2 +-
 19 files changed, 354 insertions(+), 96 deletions(-)
 create mode 100644 ui/src/app/metadata/domain/service/filter.service.ts
 create mode 100644 ui/src/app/metadata/provider/action/collection.action.ts
 create mode 100644 ui/src/app/metadata/provider/effect/collection.effect.ts
 create mode 100644 ui/src/app/metadata/provider/reducer/collection.reducer.ts

diff --git a/ui/src/app/metadata/domain/domain.module.ts b/ui/src/app/metadata/domain/domain.module.ts
index 3349342d9..c51bbb260 100644
--- a/ui/src/app/metadata/domain/domain.module.ts
+++ b/ui/src/app/metadata/domain/domain.module.ts
@@ -12,6 +12,7 @@ import { EntityDraftService } from './service/draft.service';
 import { MetadataProviderService } from './service/provider.service';
 import { EntityEffects } from './effect/entity.effect';
 import { PreviewDialogComponent } from './component/preview-dialog.component';
+import { MetadataFilterService } from './service/filter.service';
 
 export const COMPONENTS = [
     PreviewDialogComponent
@@ -42,7 +43,8 @@ export class DomainModule {
                 ListValuesService,
                 ProviderStatusEmitter,
                 ProviderValueEmitter,
-                MetadataProviderService
+                MetadataProviderService,
+                MetadataFilterService
             ]
         };
     }
diff --git a/ui/src/app/metadata/domain/model/metadata-provider.ts b/ui/src/app/metadata/domain/model/metadata-provider.ts
index 3239bd4b0..4dc283368 100644
--- a/ui/src/app/metadata/domain/model/metadata-provider.ts
+++ b/ui/src/app/metadata/domain/model/metadata-provider.ts
@@ -1,16 +1,10 @@
 import {
     MetadataBase,
-    Organization,
-    Contact,
-    MDUI,
-    SecurityInfo,
-    SsoService,
-    IdpSsoDescriptor,
-    LogoutEndpoint,
-    RelyingPartyOverrides
 } from '../model';
 
 export interface MetadataProvider extends MetadataBase {
     name: string;
     '@type': string;
+    enabled: boolean;
+    resourceId: string;
 }
diff --git a/ui/src/app/metadata/domain/service/filter.service.ts b/ui/src/app/metadata/domain/service/filter.service.ts
new file mode 100644
index 000000000..b96907eca
--- /dev/null
+++ b/ui/src/app/metadata/domain/service/filter.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+import { MetadataFilter } from '../../domain/model';
+
+@Injectable()
+export class MetadataFilterService {
+
+    readonly endpoint = '/MetadataResolvers';
+    readonly base = '/api';
+
+    constructor(
+        private http: HttpClient
+    ) { }
+    query(): Observable<MetadataFilter[]> {
+        return this.http.get<MetadataFilter[]>(`${this.base}${this.endpoint}`, {});
+    }
+
+    find(id: string): Observable<MetadataFilter> {
+        // console.log(id);
+        return this.http.get<MetadataFilter>(`${this.base}${this.endpoint}/${id}`);
+    }
+
+    update(filter: MetadataFilter): Observable<MetadataFilter> {
+        return this.http.put<MetadataFilter>(`${this.base}${this.endpoint}/${filter.id}`, filter);
+    }
+
+    save(filter: MetadataFilter): Observable<MetadataFilter> {
+        return this.http.post<MetadataFilter>(`${this.base}${this.endpoint}`, filter);
+    }
+}
diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index 0644e4ab8..29cc32f36 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -2,31 +2,33 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 
-import { MetadataFilter } from '../../domain/model';
+import { MetadataProvider } from '../../domain/model';
+import { FileBackedHttpMetadataProvider } from '../model/providers';
 
 @Injectable()
 export class MetadataProviderService {
 
-    readonly endpoint = '/MetadataResolver/incommon/Filters';
+    readonly endpoint = '/MetadataResolvers';
     readonly base = '/api';
 
     constructor(
         private http: HttpClient
     ) {}
-    query(): Observable<MetadataFilter[]> {
-        return this.http.get<MetadataFilter[]>(`${this.base}${this.endpoint}`, {});
+    query(): Observable<MetadataProvider[]> {
+        return this.http.get<MetadataProvider[]>(`${this.base}${this.endpoint}`, {});
     }
 
-    find(id: string): Observable<MetadataFilter> {
+    find(id: string): Observable<MetadataProvider> {
         // console.log(id);
-        return this.http.get<MetadataFilter>(`${this.base}${this.endpoint}/${id}`);
+        return this.http.get<MetadataProvider>(`${this.base}${this.endpoint}/${id}`);
     }
 
-    update(filter: MetadataFilter): Observable<MetadataFilter> {
-        return this.http.put<MetadataFilter>(`${this.base}${this.endpoint}/${filter.id}`, filter);
+    update(provider: MetadataProvider): Observable<MetadataProvider> {
+        return this.http.put<MetadataProvider>(`${this.base}${this.endpoint}/${provider.id}`, provider);
     }
 
-    save(filter: MetadataFilter): Observable<MetadataFilter> {
-        return this.http.post<MetadataFilter>(`${this.base}${this.endpoint}`, filter);
+    save(provider: MetadataProvider): Observable<MetadataProvider> {
+        const { metadataFilters, id, ...pruned } = provider as FileBackedHttpMetadataProvider;
+        return this.http.post<MetadataProvider>(`${this.base}${this.endpoint}`, pruned);
     }
 }
diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
index da2a08a84..5422f2d99 100644
--- a/ui/src/app/metadata/filter/effect/collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -9,11 +9,10 @@ import { switchMap, map, catchError, tap } from 'rxjs/operators';
 import * as actions from '../action/collection.action';
 import { FilterCollectionActionTypes } from '../action/collection.action';
 import * as fromFilter from '../reducer';
-
-import { MetadataProviderService } from '../../domain/service/provider.service';
 import { MetadataFilter } from '../../domain/model';
 import { removeNulls } from '../../../shared/util';
 import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+import { MetadataFilterService } from '../../domain/service/filter.service';
 
 /* istanbul ignore next */
 @Injectable()
@@ -23,7 +22,7 @@ export class FilterCollectionEffects {
     loadFilters$ = this.actions$.pipe(
         ofType<actions.LoadFilterRequest>(FilterCollectionActionTypes.LOAD_FILTER_REQUEST),
         switchMap(() =>
-            this.resolverService
+            this.filterService
                 .query()
                 .pipe(
                     map(filters => new actions.LoadFilterSuccess(filters)),
@@ -36,7 +35,7 @@ export class FilterCollectionEffects {
         ofType<actions.SelectFilter>(FilterCollectionActionTypes.SELECT_FILTER),
         map(action => action.payload),
         switchMap(id => {
-            return this.resolverService
+            return this.filterService
                 .find(id)
                 .pipe(
                     map(p => new actions.SelectFilterSuccess(p)),
@@ -57,7 +56,7 @@ export class FilterCollectionEffects {
             };
         }),
         switchMap(unsaved =>
-            this.resolverService
+            this.filterService
                 .save(unsaved as MetadataFilter)
                 .pipe(
                     map(saved => new actions.AddFilterSuccess(saved)),
@@ -86,7 +85,7 @@ export class FilterCollectionEffects {
         switchMap(filter => {
             delete filter.modifiedDate;
             delete filter.createdDate;
-            return this.resolverService
+            return this.filterService
                 .update(filter)
                 .pipe(
                     map(p => new actions.UpdateFilterSuccess({
@@ -113,7 +112,7 @@ export class FilterCollectionEffects {
     constructor(
         private actions$: Actions,
         private router: Router,
-        private resolverService: MetadataProviderService,
+        private filterService: MetadataFilterService,
         private store: Store<fromFilter.State>
     ) { }
 }
diff --git a/ui/src/app/metadata/provider/action/collection.action.ts b/ui/src/app/metadata/provider/action/collection.action.ts
new file mode 100644
index 000000000..934fafa46
--- /dev/null
+++ b/ui/src/app/metadata/provider/action/collection.action.ts
@@ -0,0 +1,112 @@
+import { Action } from '@ngrx/store';
+import { MetadataProvider } from '../../domain/model/metadata-provider';
+import { Update } from '@ngrx/entity';
+
+export enum ProviderCollectionActionTypes {
+    FIND = '[Metadata Provider] Find',
+    SELECT_PROVIDER = '[Metadata Provider] Select Request',
+    SELECT_PROVIDER_SUCCESS = '[Metadata Provider] Select Success',
+    SELECT_PROVIDER_FAIL = '[Metadata Provider] Select Fail',
+
+    UPDATE_PROVIDER_REQUEST = '[Metadata Provider] Update Request',
+    UPDATE_PROVIDER_SUCCESS = '[Metadata Provider] Update Success',
+    UPDATE_PROVIDER_FAIL = '[Metadata Provider] Update Fail',
+
+    LOAD_PROVIDER_REQUEST = '[Metadata Provider Collection] Provider REQUEST',
+    LOAD_PROVIDER_SUCCESS = '[Metadata Provider Collection] Provider SUCCESS',
+    LOAD_PROVIDER_ERROR = '[Metadata Provider Collection] Provider ERROR',
+
+    ADD_PROVIDER_REQUEST = '[Metadata Provider Collection] Add Provider',
+    ADD_PROVIDER_SUCCESS = '[Metadata Provider Collection] Add Provider Success',
+    ADD_PROVIDER_FAIL = '[Metadata Provider Collection] Add Provider Fail',
+
+    REMOVE_PROVIDER_REQUEST = '[Metadata Provider Collection] Remove Provider Request',
+    REMOVE_PROVIDER_SUCCESS = '[Metadata Provider Collection] Remove Provider Success',
+    REMOVE_PROVIDER_FAIL = '[Metadata Provider Collection] Remove Provider Fail'
+}
+
+export class LoadProviderRequest implements Action {
+    readonly type = ProviderCollectionActionTypes.LOAD_PROVIDER_REQUEST;
+
+    constructor() { }
+}
+
+export class LoadProviderSuccess implements Action {
+    readonly type = ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS;
+
+    constructor(public payload: MetadataProvider[]) { }
+}
+
+export class LoadProviderError implements Action {
+    readonly type = ProviderCollectionActionTypes.LOAD_PROVIDER_ERROR;
+
+    constructor(public payload: any) { }
+}
+
+export class UpdateProviderRequest implements Action {
+    readonly type = ProviderCollectionActionTypes.UPDATE_PROVIDER_REQUEST;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export class UpdateProviderSuccess implements Action {
+    readonly type = ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS;
+
+    constructor(public payload: Update<MetadataProvider>) { }
+}
+
+export class UpdateProviderFail implements Action {
+    readonly type = ProviderCollectionActionTypes.UPDATE_PROVIDER_FAIL;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export class AddProviderRequest implements Action {
+    readonly type = ProviderCollectionActionTypes.ADD_PROVIDER_REQUEST;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export class AddProviderSuccess implements Action {
+    readonly type = ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export class AddProviderFail implements Action {
+    readonly type = ProviderCollectionActionTypes.ADD_PROVIDER_FAIL;
+
+    constructor(public payload: any) { }
+}
+
+export class RemoveProviderRequest implements Action {
+    readonly type = ProviderCollectionActionTypes.REMOVE_PROVIDER_REQUEST;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export class RemoveProviderSuccess implements Action {
+    readonly type = ProviderCollectionActionTypes.REMOVE_PROVIDER_SUCCESS;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export class RemoveProviderFail implements Action {
+    readonly type = ProviderCollectionActionTypes.REMOVE_PROVIDER_FAIL;
+
+    constructor(public payload: MetadataProvider) { }
+}
+
+export type ProviderCollectionActionsUnion =
+    | LoadProviderRequest
+    | LoadProviderSuccess
+    | LoadProviderError
+    | AddProviderRequest
+    | AddProviderSuccess
+    | AddProviderFail
+    | RemoveProviderRequest
+    | RemoveProviderSuccess
+    | RemoveProviderFail
+    | UpdateProviderRequest
+    | UpdateProviderSuccess
+    | UpdateProviderFail;
diff --git a/ui/src/app/metadata/provider/action/entity.action.ts b/ui/src/app/metadata/provider/action/entity.action.ts
index 12c2efa5f..84f7dbd4a 100644
--- a/ui/src/app/metadata/provider/action/entity.action.ts
+++ b/ui/src/app/metadata/provider/action/entity.action.ts
@@ -3,12 +3,7 @@ import { MetadataProvider } from '../../domain/model';
 
 export enum EntityActionTypes {
     SELECT_PROVIDER = '[Provider Entity] Select Provider',
-    CREATE_PROVIDER = '[Provider Entity] Create Provider',
     UPDATE_PROVIDER = '[Provider Entity] Update Provider',
-    SAVE_PROVIDER_REQUEST = '[Provider Entity] Save Provider Request',
-    SAVE_PROVIDER_SUCCESS = '[Provider Entity] Save Provider Success',
-    SAVE_PROVIDER_FAIL = '[Provider Entity] Save Provider Fail',
-
     CLEAR_PROVIDER = '[Provider Entity] Clear',
     RESET_CHANGES = '[Provider Entity] Reset Changes'
 }
@@ -19,36 +14,12 @@ export class SelectProvider implements Action {
     constructor(public payload: MetadataProvider) { }
 }
 
-export class CreateProvider implements Action {
-    readonly type = EntityActionTypes.CREATE_PROVIDER;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
 export class UpdateProvider implements Action {
     readonly type = EntityActionTypes.UPDATE_PROVIDER;
 
     constructor(public payload: Partial<MetadataProvider>) { }
 }
 
-export class SaveProviderRequest implements Action {
-    readonly type = EntityActionTypes.SAVE_PROVIDER_REQUEST;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class SaveProviderSuccess implements Action {
-    readonly type = EntityActionTypes.SAVE_PROVIDER_SUCCESS;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class SaveProviderFail implements Action {
-    readonly type = EntityActionTypes.SAVE_PROVIDER_FAIL;
-
-    constructor(public payload: Error) { }
-}
-
 export class ClearProvider implements Action {
     readonly type = EntityActionTypes.CLEAR_PROVIDER;
 }
@@ -60,9 +31,5 @@ export class ResetChanges implements Action {
 export type EntityActionUnion =
     | SelectProvider
     | UpdateProvider
-    | SaveProviderRequest
-    | SaveProviderSuccess
-    | SaveProviderFail
-    | CreateProvider
     | ClearProvider
     | ResetChanges;
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index a9383bd64..ad042590b 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -12,6 +12,7 @@ import { MetadataProvider } from '../../domain/model';
 import { ClearProvider } from '../action/entity.action';
 import { Router, ActivatedRoute } from '@angular/router';
 import { map } from 'rxjs/operators';
+import { AddProviderRequest } from '../action/collection.action';
 
 
 @Component({
@@ -32,6 +33,16 @@ export class ProviderWizardComponent implements OnDestroy {
 
     summary$: Observable<{ definition: Wizard<MetadataProvider>, schema: { [id: string]: any }, model: any }>;
 
+    provider: MetadataProvider;
+
+    namesList: string[] = [];
+
+    validators = {
+        '/name': (value, property, form) => {
+            return this.namesList.indexOf(value) > -1 ? { 'name': { 'expectedValue': 'unique' } } : null;
+        }
+    };
+
     constructor(
         private store: Store<fromProvider.ProviderState>,
         private router: Router,
@@ -62,6 +73,10 @@ export class ProviderWizardComponent implements OnDestroy {
         ).pipe(
             map(([ definition, schema, model ]) => ({ definition, schema, model }))
         );
+
+        this.changes$.subscribe(c => this.provider = c);
+
+        this.store.select(fromProvider.getProviderNames).subscribe(list => this.namesList = list);
     }
 
     ngOnDestroy() {
@@ -81,7 +96,7 @@ export class ProviderWizardComponent implements OnDestroy {
     }
 
     save(): void {
-        console.log('Save!');
+        this.store.dispatch(new AddProviderRequest(this.provider));
     }
 
     gotoPage(page: string): void {
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
new file mode 100644
index 000000000..19e521f3c
--- /dev/null
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -0,0 +1,55 @@
+import { Injectable } from '@angular/core';
+import { Effect, Actions, ofType } from '@ngrx/effects';
+import { Router } from '@angular/router';
+
+import { of } from 'rxjs';
+import { map, catchError, switchMap, tap } from 'rxjs/operators';
+import {
+    ProviderCollectionActionsUnion,
+    ProviderCollectionActionTypes,
+    AddProviderRequest,
+    AddProviderSuccess,
+    AddProviderFail
+} from '../action/collection.action';
+import { MetadataProviderService } from '../../domain/service/provider.service';
+
+/* istanbul ignore next */
+@Injectable()
+export class CollectionEffects {
+
+    @Effect()
+    createProvider$ = this.actions$.pipe(
+        ofType<AddProviderRequest>(ProviderCollectionActionTypes.ADD_PROVIDER_REQUEST),
+        map(action => action.payload),
+        switchMap(provider =>
+            this.providerService
+                .save(provider)
+                .pipe(
+                    map(p => new AddProviderSuccess(p)),
+                    catchError((e) => of(new AddProviderFail(e)))
+                )
+        )
+    );
+
+    @Effect({ dispatch: false })
+    createProviderSuccessRedirect$ = this.actions$.pipe(
+        ofType<AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
+        map(action => action.payload),
+        tap(provider => this.router.navigate(['metadata']))
+    );
+
+    /*
+    @Effect()
+    addResolverSuccessReload$ = this.actions$.pipe(
+        ofType<CreateProviderSuccess>(EntityActionTypes.CREATE_PROVIDER_SUCCESS),
+        map(action => action.payload),
+        map(provider => new LoadProviderRequest())
+    );
+    */
+
+    constructor(
+        private actions$: Actions,
+        private router: Router,
+        private providerService: MetadataProviderService
+    ) { }
+} /* istanbul ignore next */
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index d4bfd143d..5208783c2 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -3,10 +3,27 @@ import { FileBackedHttpMetadataProvider } from '../../domain/model/providers/fil
 
 export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadataProvider> = {
     label: 'FileBackedHttpMetadataProvider',
-    type: '@FileBackedHttpMetadataProvider',
+    type: 'FileBackedHttpMetadataResolver',
     translate: {
         parser: (changes) => changes.metadataFilters ? ({
                 ...changes,
+                httpMetadataResolverAttributes: {
+                    httpClientRef: null,
+                    connectionRequestTimeout: null,
+                    connectionTimeout: null,
+                    socketTimeout: null,
+                    disregardTLSCertificate: false,
+                    tlsTrustEngineRef: null,
+                    httpClientSecurityParametersRef: null,
+                    proxyHost: null,
+                    proxyPort: null,
+                    proxyUser: null,
+                    proxyPassword: null,
+                    httpCaching: null,
+                    httpCacheDirectory: null,
+                    httpMaxCacheEntries: null,
+                    httpMaxCacheEntrySize: null
+                },
                 metadataFilters: [
                     ...Object.keys(changes.metadataFilters).reduce((collection, filterName) => ([
                         ...collection,
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index 098c8baf1..7d60e47bb 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -17,6 +17,7 @@ import { WidgetRegistry} from 'ngx-schema-form';
 import { FormModule } from '../../schema-form/schema-form.module';
 import { CustomWidgetRegistry } from '../../schema-form/registry';
 import { SummaryPropertyComponent } from './component/summary-property.component';
+import { CollectionEffects } from './effect/collection.effect';
 
 
 @NgModule({
@@ -52,7 +53,7 @@ export class ProviderModule {
     imports: [
         ProviderModule,
         StoreModule.forFeature('provider', fromProvider.reducers),
-        EffectsModule.forFeature([EditorEffects])
+        EffectsModule.forFeature([EditorEffects, CollectionEffects])
     ]
 })
 export class RootProviderModule { }
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
new file mode 100644
index 000000000..9a625fa79
--- /dev/null
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
@@ -0,0 +1,52 @@
+import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
+import { ProviderCollectionActionTypes, ProviderCollectionActionsUnion } from '../action/collection.action';
+import { MetadataProvider } from '../../domain/model';
+
+export interface CollectionState extends EntityState<MetadataProvider> {
+    selectedProviderId: string | null;
+    loaded: boolean;
+}
+
+export function sortByDate(a: MetadataProvider, b: MetadataProvider): number {
+    return a.createdDate.localeCompare(b.createdDate);
+}
+
+export const adapter: EntityAdapter<MetadataProvider> = createEntityAdapter<MetadataProvider>({
+    sortComparer: sortByDate,
+    selectId: (model: MetadataProvider) => model.resourceId
+});
+
+export const initialState: CollectionState = adapter.getInitialState({
+    selectedProviderId: null,
+    loaded: false
+});
+
+export function reducer(state = initialState, action: ProviderCollectionActionsUnion): CollectionState {
+    switch (action.type) {
+        case ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS: {
+            let s = adapter.addAll(action.payload, {
+                ...state,
+                selectedProviderId: state.selectedProviderId,
+                loaded: true
+            });
+            return s;
+        }
+
+        case ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS: {
+            return adapter.updateOne(action.payload, state);
+        }
+
+        default: {
+            return state;
+        }
+    }
+}
+
+export const getSelectedProviderId = (state: CollectionState) => state.selectedProviderId;
+export const getIsLoaded = (state: CollectionState) => state.loaded;
+export const {
+    selectIds: selectProviderIds,
+    selectEntities: selectProviderEntities,
+    selectAll: selectAllProviders,
+    selectTotal: selectProviderTotal
+} = adapter.getSelectors();
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
index 4207c42a4..5aa7eceb1 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
@@ -28,8 +28,7 @@ export function reducer(state = initialState, action: EntityActionUnion): Entity
                 }
             };
         }
-        case EntityActionTypes.SELECT_PROVIDER:
-        case EntityActionTypes.CREATE_PROVIDER: {
+        case EntityActionTypes.SELECT_PROVIDER: {
             return {
                 ...state,
                 base: {
@@ -46,23 +45,6 @@ export function reducer(state = initialState, action: EntityActionUnion): Entity
                 }
             };
         }
-        case EntityActionTypes.SAVE_PROVIDER_REQUEST: {
-            return {
-                ...state,
-                saving: true
-            };
-        }
-        case EntityActionTypes.SAVE_PROVIDER_SUCCESS: {
-            return {
-                ...initialState,
-            };
-        }
-        case EntityActionTypes.SAVE_PROVIDER_FAIL: {
-            return {
-                ...state,
-                saving: false
-            };
-        }
         default: {
             return state;
         }
diff --git a/ui/src/app/metadata/provider/reducer/index.ts b/ui/src/app/metadata/provider/reducer/index.ts
index c736201eb..ee98fec25 100644
--- a/ui/src/app/metadata/provider/reducer/index.ts
+++ b/ui/src/app/metadata/provider/reducer/index.ts
@@ -2,15 +2,20 @@ import { createSelector, createFeatureSelector } from '@ngrx/store';
 import * as fromRoot from '../../../app.reducer';
 import * as fromEditor from './editor.reducer';
 import * as fromEntity from './entity.reducer';
+import * as fromCollection from './collection.reducer';
+import * as utils from '../../domain/domain.util';
+import { MetadataProvider } from '../../domain/model';
 
 export interface ProviderState {
     editor: fromEditor.EditorState;
     entity: fromEntity.EntityState;
+    collection: fromCollection.CollectionState;
 }
 
 export const reducers = {
     editor: fromEditor.reducer,
-    entity: fromEntity.reducer
+    entity: fromEntity.reducer,
+    collection: fromCollection.reducer
 };
 
 export interface State extends fromRoot.State {
@@ -21,9 +26,11 @@ export const getProviderState = createFeatureSelector<ProviderState>('provider')
 
 export const getEditorStateFn = (state: ProviderState) => state.editor;
 export const getEntityStateFn = (state: ProviderState) => state.entity;
+export const getCollectionStateFn = (state: ProviderState) => state.collection;
 
 export const getEditorState = createSelector(getProviderState, getEditorStateFn);
 export const getEntityState = createSelector(getProviderState, getEntityStateFn);
+export const getCollectionState = createSelector(getProviderState, getCollectionStateFn);
 
 /*
 Editor State
@@ -43,4 +50,16 @@ Entity State
 export const getEntityIsSaved = createSelector(getEntityState, fromEntity.isEntitySaved);
 export const getEntityChanges = createSelector(getEntityState, fromEntity.getEntityChanges);
 export const getEntityIsSaving = createSelector(getEntityState, fromEntity.isEditorSaving);
-export const getUpdatedEntity = createSelector(getEntityState, fromEntity.getUpdatedEntity);
\ No newline at end of file
+export const getUpdatedEntity = createSelector(getEntityState, fromEntity.getUpdatedEntity);
+
+/*
+ *   Select pieces of Provider Collection
+*/
+export const getAllProviders = createSelector(getCollectionState, fromCollection.selectAllProviders);
+export const getProviderEntities = createSelector(getCollectionState, fromCollection.selectProviderEntities);
+export const getSelectedProviderId = createSelector(getCollectionState, fromCollection.getSelectedProviderId);
+export const getSelectedProvider = createSelector(getProviderEntities, getSelectedProviderId, utils.getInCollectionFn);
+export const getProviderIds = createSelector(getCollectionState, fromCollection.selectProviderIds);
+export const getProviderCollectionIsLoaded = createSelector(getCollectionState, fromCollection.getIsLoaded);
+
+export const getProviderNames = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.name));
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index a4ae2b75c..3d62f7d7a 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -36,7 +36,7 @@ <h3 class="tag tag-primary">
             </button>
         </li>
         <li class="nav-item" *ngIf="(last$ | async)">
-            <button class="nav-link save btn" aria-label="Save" role="button">
+            <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave.emit()">
                 <span class="label pull-left" i18n="@@action--save">Save</span>
                 <span class="direction pull-right">
                     <i class="fa fa-fw fa-save next d-block fa-2x"></i>
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 806c7c053..3bf433b29 100644
--- a/ui/src/assets/schema/provider/filebacked-http-common.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
@@ -11,16 +11,19 @@
         "useDefaultPredicateRegistry",
         "satisfyAnyPredicates"
     ],
+    "required": ["id", "metadataURL"],
     "properties": {
         "id": {
             "title": "ID",
             "description": "Unique Identifier",
-            "type": "string"
+            "type": "string",
+            "default": ""
         },
         "metadataURL": {
             "title": "Metadata URL",
             "description": "Metadata URL",
-            "type": "string"
+            "type": "string",
+            "default": ""
         },
         "initializeFromBackupFile": {
             "title": "Initialize From Backup File?",
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 884b8b89e..98ec3eed9 100644
--- a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
@@ -6,7 +6,7 @@
             "description": "",
             "type": "object",
             "properties": {
-                "@RequiredValidUntilFilter": {
+                "RequiredValidUntil": {
                     "title": "Required Valid Until Filter",
                     "type": "object",
                     "widget": {
@@ -16,11 +16,12 @@
                         "maxValidityInterval": {
                             "title": "Max Validity Interval",
                             "description": "Max Validity Interval",
-                            "type": "number"
+                            "type": "number",
+                            "default": 0
                         }
                     }
                 },
-                "@SignatureValidationFilter": {
+                "SignatureValidation": {
                     "title": "Signature Validation Filter",
                     "type": "object",
                     "widget": {
@@ -37,11 +38,12 @@
                             "title": "Certificate File",
                             "description": "Certificate File",
                             "type": "string",
-                            "widget": "textarea"
+                            "widget": "textarea",
+                            "default": ""
                         }
                     }
                 },
-                "@EntityRoleWhiteListFilter": {
+                "EntityRoleWhiteList": {
                     "title": "Entity Role Whitelist Filter",
                     "type": "object",
                     "widget": {
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 9595d904c..9fa60f808 100644
--- a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
@@ -21,7 +21,8 @@
                             "PT12H",
                             "PT24H"
                         ]
-                    }
+                    },
+                    "default": ""
                 },
                 "maxRefreshDelay": {
                     "title": "Max Refresh Delay",
@@ -40,12 +41,14 @@
                             "PT12H",
                             "PT24H"
                         ]
-                    }
+                    },
+                    "default": ""
                 },
                 "refreshDelayFactor": {
                     "title": "Refresh Delay Factor",
                     "description": "",
-                    "type": "number"
+                    "type": "number",
+                    "default": null
                 },
                 "resolveViaPredicatesOnly": {
                     "title": "Resolve Via Predicates Only?",
@@ -87,7 +90,8 @@
                             "PT12H",
                             "PT24H"
                         ]
-                    }
+                    },
+                    "default": ""
                 }
             }
         }
diff --git a/ui/src/assets/schema/provider/metadata-provider.schema.json b/ui/src/assets/schema/provider/metadata-provider.schema.json
index 241a57e85..af33d3e45 100644
--- a/ui/src/assets/schema/provider/metadata-provider.schema.json
+++ b/ui/src/assets/schema/provider/metadata-provider.schema.json
@@ -21,7 +21,7 @@
             "oneOf": [
                 {
                     "enum": [
-                        "@FileBackedHttpMetadataProvider"
+                        "FileBackedHttpMetadataResolver"
                     ],
                     "description": "FileBackedHttpMetadataProvider"
                 }

From 3caf47846a6d9fe1b48554b1f583bc8db685d915 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 5 Jul 2018 14:10:24 -0700
Subject: [PATCH 11/15] SHIBUI-580 Implemented unique name requirement

---
 ui/src/app/metadata/metadata.component.ts     |  2 +
 .../provider-wizard-step.component.html       |  5 +-
 .../provider-wizard-step.component.ts         | 59 +++++++++++++++----
 .../container/provider-wizard.component.ts    | 10 ----
 .../provider/effect/collection.effect.ts      | 22 +++++--
 .../app/metadata/provider/provider.module.ts  |  2 +
 .../widget/text/string.component.html         |  7 +++
 .../widget/text/string.component.ts           | 13 +---
 ui/src/app/shared/shared.module.ts            |  1 +
 .../provider/metadata-provider.schema.json    |  8 ++-
 10 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/ui/src/app/metadata/metadata.component.ts b/ui/src/app/metadata/metadata.component.ts
index 52ca814e2..62170d286 100644
--- a/ui/src/app/metadata/metadata.component.ts
+++ b/ui/src/app/metadata/metadata.component.ts
@@ -5,6 +5,7 @@ import { LoadResolverRequest } from './resolver/action/collection.action';
 import { LoadFilterRequest } from './filter/action/collection.action';
 import { LoadDraftRequest } from './resolver/action/draft.action';
 import * as fromRoot from '../app.reducer';
+import { LoadProviderRequest } from './provider/action/collection.action';
 
 @Component({
     selector: 'metadata-page',
@@ -20,5 +21,6 @@ export class MetadataPageComponent {
         this.store.dispatch(new LoadResolverRequest());
         this.store.dispatch(new LoadFilterRequest());
         this.store.dispatch(new LoadDraftRequest());
+        this.store.dispatch(new LoadProviderRequest());
     }
 }
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.html b/ui/src/app/metadata/provider/container/provider-wizard-step.component.html
index b04035bf7..831e71fbb 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.html
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.html
@@ -1,5 +1,6 @@
 <sf-form
     [schema]="schema$ | async"
     [model]="model$ | async"
-    (onChange)="changeSubject.next($event)"
-    (isValid)="onStatusChange($event)"></sf-form>
\ No newline at end of file
+    [validators]="validators"
+    (onChange)="valueChangeSubject.next($event)"
+    (onErrorChange)="statusChangeSubject.next($event)"></sf-form>
\ No newline at end of file
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
index 962445d30..ed583d251 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
-import { withLatestFrom, map } from 'rxjs/operators';
+import { withLatestFrom, map, distinctUntilChanged } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
@@ -21,8 +21,11 @@ import { pick } from '../../../shared/util';
 })
 
 export class ProviderWizardStepComponent implements OnDestroy {
-    changeSubject = new Subject<Partial<any>>();
-    private changeEmitted$ = this.changeSubject.asObservable();
+    valueChangeSubject = new Subject<Partial<any>>();
+    private valueChangeEmitted$ = this.valueChangeSubject.asObservable();
+
+    statusChangeSubject = new Subject<Partial<any>>();
+    private statusChangeEmitted$ = this.statusChangeSubject.asObservable();
 
     schema$: Observable<any>;
     schema: any;
@@ -32,6 +35,35 @@ export class ProviderWizardStepComponent implements OnDestroy {
     valid$: Observable<boolean>;
     model$: Observable<any>;
 
+    namesList: string[] = [];
+
+    validators = {
+        '/': (value, property, form_current) => {
+            let errors;
+            // iterate all customer
+            Object.keys(value).forEach((key) => {
+                const item = value[key];
+                const validatorKey = `/${key}`;
+                const validator = this.validators.hasOwnProperty(validatorKey) ? this.validators[validatorKey] : null;
+                const error = validator ? validator(item, { path: `/${key}` }, form_current) : null;
+                if (error) {
+                    errors = errors || [];
+                    errors.push(error);
+                }
+            });
+            return errors;
+        },
+        '/name': (value, property, form) => {
+            const err = this.namesList.indexOf(value) > -1 ? {
+                code: 'INVALID_NAME',
+                path: `#${property.path}`,
+                message: 'Name must be unique.',
+                params: [value]
+            } : null;
+            return err;
+        }
+    };
+
     constructor(
         private store: Store<fromProvider.ProviderState>
     ) {
@@ -39,6 +71,8 @@ export class ProviderWizardStepComponent implements OnDestroy {
         this.definition$ = this.store.select(fromWizard.getWizardDefinition);
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
 
+        this.store.select(fromProvider.getProviderNames).subscribe(list => this.namesList = list);
+
         this.model$ = this.schema$.pipe(
             withLatestFrom(
                 this.store.select(fromWizard.getModel),
@@ -55,7 +89,7 @@ export class ProviderWizardStepComponent implements OnDestroy {
             map(({ model, definition }) => definition.translate ? definition.translate.formatter(model) : model)
         );
 
-        this.changeEmitted$.pipe(
+        this.valueChangeEmitted$.pipe(
             withLatestFrom(this.schema$, this.definition$),
             map(([changes, schema, definition]) => {
                 const type = changes.value['@type'];
@@ -78,15 +112,20 @@ export class ProviderWizardStepComponent implements OnDestroy {
             map(({ changes, definition }) => definition.translate ? definition.translate.parser(changes) : changes)
         )
         .subscribe(changes => this.store.dispatch(new UpdateProvider(changes)));
-    }
 
-    ngOnDestroy() {
-        this.changeSubject.complete();
+        this.statusChangeEmitted$.pipe(
+            distinctUntilChanged()
+        ).subscribe(errors => {
+            console.log(!(errors.value));
+            const status = { [this.currentPage]: !(errors.value) ? 'VALID' : 'INVALID' };
+            this.store.dispatch(new UpdateStatus(status));
+        });
+
+        this.store.select(fromWizard.getWizardIndex).subscribe(i => this.currentPage = i);
     }
 
-    onStatusChange(value): void {
-        const status = { [this.currentPage]: value ? 'VALID' : 'INVALID' };
-        this.store.dispatch(new UpdateStatus(status));
+    ngOnDestroy() {
+        this.valueChangeSubject.complete();
     }
 }
 
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index ad042590b..793f491da 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -35,14 +35,6 @@ export class ProviderWizardComponent implements OnDestroy {
 
     provider: MetadataProvider;
 
-    namesList: string[] = [];
-
-    validators = {
-        '/name': (value, property, form) => {
-            return this.namesList.indexOf(value) > -1 ? { 'name': { 'expectedValue': 'unique' } } : null;
-        }
-    };
-
     constructor(
         private store: Store<fromProvider.ProviderState>,
         private router: Router,
@@ -75,8 +67,6 @@ export class ProviderWizardComponent implements OnDestroy {
         );
 
         this.changes$.subscribe(c => this.provider = c);
-
-        this.store.select(fromProvider.getProviderNames).subscribe(list => this.namesList = list);
     }
 
     ngOnDestroy() {
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index 19e521f3c..5a471dfdd 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -9,7 +9,10 @@ import {
     ProviderCollectionActionTypes,
     AddProviderRequest,
     AddProviderSuccess,
-    AddProviderFail
+    AddProviderFail,
+    LoadProviderRequest,
+    LoadProviderSuccess,
+    LoadProviderError
 } from '../action/collection.action';
 import { MetadataProviderService } from '../../domain/service/provider.service';
 
@@ -17,6 +20,19 @@ import { MetadataProviderService } from '../../domain/service/provider.service';
 @Injectable()
 export class CollectionEffects {
 
+    @Effect()
+    loadFilters$ = this.actions$.pipe(
+        ofType<LoadProviderRequest>(ProviderCollectionActionTypes.LOAD_PROVIDER_REQUEST),
+        switchMap(() =>
+            this.providerService
+                .query()
+                .pipe(
+                    map(providers => new LoadProviderSuccess(providers)),
+                    catchError(error => of(new LoadProviderError(error)))
+                )
+        )
+    );
+
     @Effect()
     createProvider$ = this.actions$.pipe(
         ofType<AddProviderRequest>(ProviderCollectionActionTypes.ADD_PROVIDER_REQUEST),
@@ -38,14 +54,12 @@ export class CollectionEffects {
         tap(provider => this.router.navigate(['metadata']))
     );
 
-    /*
     @Effect()
     addResolverSuccessReload$ = this.actions$.pipe(
-        ofType<CreateProviderSuccess>(EntityActionTypes.CREATE_PROVIDER_SUCCESS),
+        ofType<AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
         map(action => action.payload),
         map(provider => new LoadProviderRequest())
     );
-    */
 
     constructor(
         private actions$: Actions,
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index 7d60e47bb..104bae13d 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -18,6 +18,7 @@ import { FormModule } from '../../schema-form/schema-form.module';
 import { CustomWidgetRegistry } from '../../schema-form/registry';
 import { SummaryPropertyComponent } from './component/summary-property.component';
 import { CollectionEffects } from './effect/collection.effect';
+import { SharedModule } from '../../shared/shared.module';
 
 
 @NgModule({
@@ -34,6 +35,7 @@ import { CollectionEffects } from './effect/collection.effect';
         CommonModule,
         WizardModule,
         RouterModule,
+        SharedModule,
         FormModule
     ],
     exports: []
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 b581f242e..435c2079a 100644
--- a/ui/src/app/schema-form/widget/text/string.component.html
+++ b/ui/src/app/schema-form/widget/text/string.component.html
@@ -11,6 +11,7 @@
     </label>
     <span *ngIf="schema.description" class="sr-only">{{ schema.description }}</span>
     <input [name]="name"
+        validate="true"
         [attr.readonly]="schema.readOnly?true:null"
         class="text-widget.id textline-widget form-control"
         [attr.type]="this.getInputType()"
@@ -21,4 +22,10 @@
         [attr.minLength]="schema.minLength || null"
         [attr.disabled]="(schema.widget.id=='color' && schema.readOnly)?true:null">
     <input *ngIf="(schema.widget.id === 'color' && schema.readOnly)" [attr.name]="name" type="hidden" [formControl]="control">
+    <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">
+        {{ schema.widget.help }}
+    </small>
 </div>
\ No newline at end of file
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 26c1f5c44..cf46aa6e2 100644
--- a/ui/src/app/schema-form/widget/text/string.component.ts
+++ b/ui/src/app/schema-form/widget/text/string.component.ts
@@ -1,18 +1,9 @@
 import { Component } from '@angular/core';
-import { ControlWidget } from 'ngx-schema-form';
+import { StringWidget } from 'ngx-schema-form';
 
 @Component({
     selector: 'custom-string',
     templateUrl: `./string.component.html`,
     styleUrls: ['../widget.component.scss']
 })
-export class CustomStringComponent extends ControlWidget {
-
-    getInputType() {
-        if (!this.schema.widget.id || this.schema.widget.id === 'string') {
-            return 'text';
-        } else {
-            return this.schema.widget.id;
-        }
-    }
-}
+export class CustomStringComponent extends StringWidget {}
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index 4af6af8ce..f166ad254 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -35,6 +35,7 @@ import { PrettyXml } from './pipe/pretty-xml.pipe';
         InputDefaultsDirective,
         I18nTextComponent,
         ValidFormIconComponent,
+        ValidationClassDirective,
         InfoLabelDirective
     ]
 })
diff --git a/ui/src/assets/schema/provider/metadata-provider.schema.json b/ui/src/assets/schema/provider/metadata-provider.schema.json
index af33d3e45..f5a840f35 100644
--- a/ui/src/assets/schema/provider/metadata-provider.schema.json
+++ b/ui/src/assets/schema/provider/metadata-provider.schema.json
@@ -1,5 +1,5 @@
 {
-    "title": "@MetadataResolver",
+    "title": "MetadataResolver",
     "type": "object",
     "widget": {
         "id": "fieldset"
@@ -8,7 +8,11 @@
         "name": {
             "title": "Metadata Provider Name (Dashboard Display Only)",
             "description": "Metadata Provider Name (Dashboard Display Only)",
-            "type": "string"
+            "type": "string",
+            "widget": {
+                "id": "string",
+                "help": "Must be unique."
+            }
         },
         "@type": {
             "title": "Metadata Provider Type",

From af2a2fc5613a91cd8a149d23bc8692c3aaf1fc12 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 5 Jul 2018 15:37:44 -0700
Subject: [PATCH 12/15] SHIBUI-580 Fixed tests

---
 .../domain/service/provider.service.spec.ts   | 10 ++--
 .../domain/service/provider.service.ts        |  2 +-
 .../app/metadata/metadata.component.spec.ts   |  6 +-
 .../provider/action/collection.action.ts      |  5 --
 .../provider-wizard-step.component.ts         |  4 +-
 .../container/provider.component.spec.ts      | 57 +++++++++++++++++++
 ui/src/app/wizard/reducer/index.ts            |  3 +-
 7 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/ui/src/app/metadata/domain/service/provider.service.spec.ts b/ui/src/app/metadata/domain/service/provider.service.spec.ts
index 814c413ac..356bf5964 100644
--- a/ui/src/app/metadata/domain/service/provider.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, async, inject } from '@angular/core/testing';
 import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
 import { HttpClientModule, HttpRequest } from '@angular/common/http';
 import { MetadataProviderService } from './provider.service';
-import { EntityAttributesFilter } from '../entity';
+import { MetadataProvider } from '../model';
 
 describe(`Metadata Provider Service`, () => {
 
@@ -47,8 +47,8 @@ describe(`Metadata Provider Service`, () => {
         it(`should send an expected PUT request`, async(inject([MetadataProviderService, HttpTestingController],
             (service: MetadataProviderService, backend: HttpTestingController) => {
                 const id = 'foo';
-                const filter = new EntityAttributesFilter({id});
-                service.update(filter).subscribe();
+                const provider = <MetadataProvider>{ resourceId: id };
+                service.update(provider).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
                     return req.url === `${service.base}${service.endpoint}/${id}`
@@ -61,8 +61,8 @@ describe(`Metadata Provider Service`, () => {
         it(`should send an expected POST request`, async(inject([MetadataProviderService, HttpTestingController],
             (service: MetadataProviderService, backend: HttpTestingController) => {
                 const id = 'foo';
-                const filter = new EntityAttributesFilter({ id });
-                service.save(filter).subscribe();
+                const provider = <MetadataProvider>{ resourceId: id };
+                service.save(provider).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
                     return req.url === `${service.base}${service.endpoint}`
diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index 29cc32f36..d82ee3d4b 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -24,7 +24,7 @@ export class MetadataProviderService {
     }
 
     update(provider: MetadataProvider): Observable<MetadataProvider> {
-        return this.http.put<MetadataProvider>(`${this.base}${this.endpoint}/${provider.id}`, provider);
+        return this.http.put<MetadataProvider>(`${this.base}${this.endpoint}/${provider.resourceId}`, provider);
     }
 
     save(provider: MetadataProvider): Observable<MetadataProvider> {
diff --git a/ui/src/app/metadata/metadata.component.spec.ts b/ui/src/app/metadata/metadata.component.spec.ts
index fb9d5f329..dffc99361 100644
--- a/ui/src/app/metadata/metadata.component.spec.ts
+++ b/ui/src/app/metadata/metadata.component.spec.ts
@@ -17,7 +17,7 @@ class TestHostComponent {
     public componentUnderTest: MetadataPageComponent;
 }
 
-describe('AppComponent', () => {
+describe('Metadata Root Component', () => {
 
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
@@ -48,8 +48,8 @@ describe('AppComponent', () => {
         fixture.detectChanges();
     }));
 
-    it('should create the app', async(() => {
+    it('should load metadata objects', async(() => {
         expect(app).toBeTruthy();
-        expect(store.dispatch).toHaveBeenCalledTimes(3);
+        expect(store.dispatch).toHaveBeenCalledTimes(4);
     }));
 });
diff --git a/ui/src/app/metadata/provider/action/collection.action.ts b/ui/src/app/metadata/provider/action/collection.action.ts
index 934fafa46..99e71c758 100644
--- a/ui/src/app/metadata/provider/action/collection.action.ts
+++ b/ui/src/app/metadata/provider/action/collection.action.ts
@@ -3,11 +3,6 @@ import { MetadataProvider } from '../../domain/model/metadata-provider';
 import { Update } from '@ngrx/entity';
 
 export enum ProviderCollectionActionTypes {
-    FIND = '[Metadata Provider] Find',
-    SELECT_PROVIDER = '[Metadata Provider] Select Request',
-    SELECT_PROVIDER_SUCCESS = '[Metadata Provider] Select Success',
-    SELECT_PROVIDER_FAIL = '[Metadata Provider] Select Fail',
-
     UPDATE_PROVIDER_REQUEST = '[Metadata Provider] Update Request',
     UPDATE_PROVIDER_SUCCESS = '[Metadata Provider] Update Success',
     UPDATE_PROVIDER_FAIL = '[Metadata Provider] Update Fail',
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
index ed583d251..248542173 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -65,7 +65,7 @@ export class ProviderWizardStepComponent implements OnDestroy {
     };
 
     constructor(
-        private store: Store<fromProvider.ProviderState>
+        private store: Store<fromProvider.ProviderState>,
     ) {
         this.schema$ = this.store.select(fromProvider.getSchema);
         this.definition$ = this.store.select(fromWizard.getWizardDefinition);
@@ -86,7 +86,7 @@ export class ProviderWizardStepComponent implements OnDestroy {
                 },
                 definition
             })),
-            map(({ model, definition }) => definition.translate ? definition.translate.formatter(model) : model)
+            map(({ model, definition }) => definition && definition.translate ? definition.translate.formatter(model) : model)
         );
 
         this.valueChangeEmitted$.pipe(
diff --git a/ui/src/app/metadata/provider/container/provider.component.spec.ts b/ui/src/app/metadata/provider/container/provider.component.spec.ts
index e69de29bb..3f1363cdf 100644
--- a/ui/src/app/metadata/provider/container/provider.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider.component.spec.ts
@@ -0,0 +1,57 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { ProviderComponent } from './provider.component';
+import * as fromRoot from '../reducer';
+import * as fromWizard from '../../../wizard/reducer';
+
+@Component({
+    template: `
+        <provider-page></provider-page>
+    `
+})
+class TestHostComponent {
+    @ViewChild(ProviderComponent)
+    public componentUnderTest: ProviderComponent;
+}
+
+describe('Provider Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: ProviderComponent;
+    let store: Store<fromRoot.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                StoreModule.forRoot({
+                    provider: combineReducers(fromRoot.reducers),
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                ProviderComponent,
+                TestHostComponent
+            ],
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(app).toBeTruthy();
+    }));
+});
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index bbf53caf4..77fbefbef 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -25,6 +25,7 @@ export const getWizardDefinition = createSelector(getState, fromWizard.getDefini
 export const getSchemaCollection = createSelector(getState, fromWizard.getCollection);
 
 export const getSchema = (index: string, wizard: Wizard<any>) => {
+    if (!wizard) { return null; }
     const step = wizard.steps.find(s => s.id === index);
     return step ? step.schema : null;
 };
@@ -55,7 +56,7 @@ export const getLastFn = (index: string, wizard: Wizard<any>) => {
 };
 
 export const getModelFn = (currentStep: WizardStep) => {
-    const model = currentStep.initialValues || [];
+    const model = (currentStep && currentStep.initialValues) || [];
     return model.reduce((m, property) => m[property.key] = property.value, {});
 };
 

From 23e63438d0b1731451585e94e71f8e37f602b55f Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 6 Jul 2018 08:17:25 -0700
Subject: [PATCH 13/15] SHIBUI-580 Implemented tests

---
 .../domain/service/filter.service.spec.ts     |  74 ++++++++++++
 .../provider-wizard-step.component.spec.ts    |  62 ++++++++++
 .../provider-wizard.component.spec.ts         |  63 ++++++++++
 .../file-backed-http.provider.form.spec.ts    | 110 ++++++++++++++++++
 .../model/file-backed-http.provider.form.ts   |  21 +---
 .../reducer/collection.reducer.spec.ts        |  50 ++++++++
 .../provider/reducer/editor.reducer.spec.ts   |   0
 7 files changed, 361 insertions(+), 19 deletions(-)
 create mode 100644 ui/src/app/metadata/domain/service/filter.service.spec.ts
 create mode 100644 ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts
 create mode 100644 ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts
 create mode 100644 ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts
 create mode 100644 ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
 create mode 100644 ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts

diff --git a/ui/src/app/metadata/domain/service/filter.service.spec.ts b/ui/src/app/metadata/domain/service/filter.service.spec.ts
new file mode 100644
index 000000000..1410f6723
--- /dev/null
+++ b/ui/src/app/metadata/domain/service/filter.service.spec.ts
@@ -0,0 +1,74 @@
+import { TestBed, async, inject } from '@angular/core/testing';
+import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
+import { HttpClientModule, HttpRequest } from '@angular/common/http';
+import { MetadataFilterService } from './filter.service';
+import { EntityAttributesFilter } from '../entity';
+
+describe(`Metadata Filter Service`, () => {
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                HttpClientModule,
+                HttpClientTestingModule
+            ],
+            providers: [
+                MetadataFilterService
+            ]
+        });
+    });
+
+    describe('query method', () => {
+        it(`should send an expected GET[] request`, async(inject([MetadataFilterService, HttpTestingController],
+            (service: MetadataFilterService, backend: HttpTestingController) => {
+                service.query().subscribe();
+
+                backend.expectOne((req: HttpRequest<any>) => {
+                    return req.url === `${service.base}${service.endpoint}`
+                        && req.method === 'GET';
+                }, `GET MetadataResolvers collection`);
+            }
+        )));
+    });
+    describe('find method', () => {
+        it(`should send an expected GET request`, async(inject([MetadataFilterService, HttpTestingController],
+            (service: MetadataFilterService, backend: HttpTestingController) => {
+                const id = 'foo';
+                service.find(id).subscribe();
+
+                backend.expectOne((req: HttpRequest<any>) => {
+                    return req.url === `${service.base}${service.endpoint}/${id}`
+                        && req.method === 'GET';
+                }, `GET MetadataResolvers collection`);
+            }
+        )));
+    });
+    describe('update method', () => {
+        it(`should send an expected PUT request`, async(inject([MetadataFilterService, HttpTestingController],
+            (service: MetadataFilterService, backend: HttpTestingController) => {
+                const id = 'foo';
+                const filter = new EntityAttributesFilter({ id });
+                service.update(filter).subscribe();
+
+                backend.expectOne((req: HttpRequest<any>) => {
+                    return req.url === `${service.base}${service.endpoint}/${id}`
+                        && req.method === 'PUT';
+                }, `PUT (update) MetadataResolvers collection`);
+            }
+        )));
+    });
+    describe('save method', () => {
+        it(`should send an expected POST request`, async(inject([MetadataFilterService, HttpTestingController],
+            (service: MetadataFilterService, backend: HttpTestingController) => {
+                const id = 'foo';
+                const filter = new EntityAttributesFilter({ id });
+                service.save(filter).subscribe();
+
+                backend.expectOne((req: HttpRequest<any>) => {
+                    return req.url === `${service.base}${service.endpoint}`
+                        && req.method === 'POST';
+                }, `POST MetadataResolvers collection`);
+            }
+        )));
+    });
+});
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts
new file mode 100644
index 000000000..6e93c612b
--- /dev/null
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts
@@ -0,0 +1,62 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { ProviderWizardStepComponent } from './provider-wizard-step.component';
+import * as fromRoot from '../reducer';
+import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
+import * as fromWizard from '../../../wizard/reducer';
+
+@Component({
+    template: `
+        <provider-wizard-step></provider-wizard-step>
+    `
+})
+class TestHostComponent {
+    @ViewChild(ProviderWizardStepComponent)
+    public componentUnderTest: ProviderWizardStepComponent;
+}
+
+describe('Provider Wizard Step Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: ProviderWizardStepComponent;
+    let store: Store<fromRoot.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                SchemaFormModule.forRoot(),
+                StoreModule.forRoot({
+                    provider: combineReducers(fromRoot.reducers),
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                ProviderWizardStepComponent,
+                TestHostComponent
+            ],
+            providers: [
+                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }
+            ]
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(app).toBeTruthy();
+    }));
+});
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts
new file mode 100644
index 000000000..043663260
--- /dev/null
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts
@@ -0,0 +1,63 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { ProviderWizardComponent } from './provider-wizard.component';
+import * as fromRoot from '../reducer';
+import { WizardModule } from '../../../wizard/wizard.module';
+import { ProviderWizardSummaryComponent } from '../component/provider-wizard-summary.component';
+import { SummaryPropertyComponent } from '../component/summary-property.component';
+import * as fromWizard from '../../../wizard/reducer';
+
+@Component({
+    template: `
+        <provider-wizard></provider-wizard>
+    `
+})
+class TestHostComponent {
+    @ViewChild(ProviderWizardComponent)
+    public componentUnderTest: ProviderWizardComponent;
+}
+
+describe('Provider Wizard Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: ProviderWizardComponent;
+    let store: Store<fromRoot.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                WizardModule,
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                StoreModule.forRoot({
+                    provider: combineReducers(fromRoot.reducers),
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                ProviderWizardComponent,
+                SummaryPropertyComponent,
+                ProviderWizardSummaryComponent,
+                TestHostComponent
+            ]
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(app).toBeTruthy();
+    }));
+});
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts
new file mode 100644
index 000000000..4bba62c7d
--- /dev/null
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts
@@ -0,0 +1,110 @@
+import { FileBackedHttpMetadataProviderWizard } from './file-backed-http.provider.form';
+import { FileBackedHttpMetadataProvider } from '../../domain/model/providers';
+
+describe('FileBackedHttpMetadataProviderWizard', () => {
+
+    const parser = FileBackedHttpMetadataProviderWizard.translate.parser;
+    const formatter = FileBackedHttpMetadataProviderWizard.translate.formatter;
+
+    const requiredValidUntilFilter = {
+        maxValidityInterval: 1,
+        '@type': 'RequiredValidUntil'
+    };
+
+    const signatureValidationFilter = {
+        requireSignedRoot: true,
+        certificateFile: 'foo',
+        '@type': 'SignatureValidation'
+    };
+
+    const entityRoleWhiteListFilter = {
+        retainedRoles: ['foo', 'bar'],
+        removeRolelessEntityDescriptors: true,
+        removeEmptyEntitiesDescriptors: true,
+        '@type': 'EntityRoleWhiteList'
+    };
+
+    describe('parser', () => {
+        it('should transform the filters object to an array', () => {
+            let model = <any>{
+                name: 'foo',
+                '@type': 'FileBackedHttpMetadataProvider',
+                enabled: true,
+                resourceId: 'foo',
+                metadataFilters: {
+                    RequiredValidUntil: requiredValidUntilFilter,
+                    SignatureValidation: signatureValidationFilter,
+                    EntityRoleWhiteList: entityRoleWhiteListFilter
+                }
+            };
+            expect(
+                parser(model)
+            ).toEqual(
+                {
+                    ...model,
+                    metadataFilters: [
+                        requiredValidUntilFilter,
+                        signatureValidationFilter,
+                        entityRoleWhiteListFilter
+                    ]
+                }
+            );
+        });
+
+        it('should return the object if metadataFilters is not provided', () => {
+            let model = <any>{
+                name: 'foo',
+                '@type': 'FileBackedHttpMetadataProvider',
+                enabled: true,
+                resourceId: 'foo'
+            };
+            expect(
+                parser(model)
+            ).toEqual(
+                model
+            );
+        });
+    });
+
+    describe('formatter', () => {
+        it('should transform the filters object to an array', () => {
+            let model = <any>{
+                name: 'foo',
+                '@type': 'FileBackedHttpMetadataProvider',
+                enabled: true,
+                resourceId: 'foo',
+                metadataFilters: [
+                    requiredValidUntilFilter,
+                    signatureValidationFilter,
+                    entityRoleWhiteListFilter
+                ]
+            };
+            expect(
+                formatter(model)
+            ).toEqual(
+                {
+                    ...model,
+                    metadataFilters: {
+                        RequiredValidUntil: requiredValidUntilFilter,
+                        SignatureValidation: signatureValidationFilter,
+                        EntityRoleWhiteList: entityRoleWhiteListFilter
+                    }
+                }
+            );
+        });
+
+        it('should return the object if metadataFilters is not provided', () => {
+            let model = <any>{
+                name: 'foo',
+                '@type': 'FileBackedHttpMetadataProvider',
+                enabled: true,
+                resourceId: 'foo'
+            };
+            expect(
+                formatter(model)
+            ).toEqual(
+                model
+            );
+        });
+    });
+});
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index 5208783c2..41723be8f 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -5,25 +5,8 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
     label: 'FileBackedHttpMetadataProvider',
     type: 'FileBackedHttpMetadataResolver',
     translate: {
-        parser: (changes) => changes.metadataFilters ? ({
+        parser: (changes: any): FileBackedHttpMetadataProvider => changes.metadataFilters ? ({
                 ...changes,
-                httpMetadataResolverAttributes: {
-                    httpClientRef: null,
-                    connectionRequestTimeout: null,
-                    connectionTimeout: null,
-                    socketTimeout: null,
-                    disregardTLSCertificate: false,
-                    tlsTrustEngineRef: null,
-                    httpClientSecurityParametersRef: null,
-                    proxyHost: null,
-                    proxyPort: null,
-                    proxyUser: null,
-                    proxyPassword: null,
-                    httpCaching: null,
-                    httpCacheDirectory: null,
-                    httpMaxCacheEntries: null,
-                    httpMaxCacheEntrySize: null
-                },
                 metadataFilters: [
                     ...Object.keys(changes.metadataFilters).reduce((collection, filterName) => ([
                         ...collection,
@@ -34,7 +17,7 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
                     ]), [])
                 ]
             }) : changes,
-        formatter: (changes) => changes.metadataFilters ? ({
+        formatter: (changes: FileBackedHttpMetadataProvider): any => changes.metadataFilters ? ({
                 ...changes,
                 metadataFilters: {
                     ...(changes.metadataFilters || []).reduce((collection, filter) => ({
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
new file mode 100644
index 000000000..1631c189f
--- /dev/null
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
@@ -0,0 +1,50 @@
+import { reducer } from './collection.reducer';
+import * as fromProvider from './collection.reducer';
+import {
+    ProviderCollectionActionTypes,
+    LoadProviderSuccess,
+    UpdateProviderSuccess
+} from '../action/collection.action';
+
+const snapshot: fromProvider.CollectionState = {
+    ids: [],
+    entities: {},
+    selectedProviderId: null,
+    loaded: false
+};
+
+describe('Provider Reducer', () => {
+    describe('undefined action', () => {
+        it('should return the default state', () => {
+            const result = reducer(snapshot, {} as any);
+
+            expect(result).toEqual(snapshot);
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS}`, () => {
+        it('should add the loaded providers to the collection', () => {
+            spyOn(fromProvider.adapter, 'addAll').and.callThrough();
+            const providers = [
+                { resourceId: 'foo', name: 'foo', '@type': 'foo', enabled: true, createdDate: new Date().toLocaleDateString() },
+                { resourceId: 'bar', name: 'bar', '@type': 'bar', enabled: false, createdDate: new Date().toLocaleDateString() }
+            ];
+            const action = new LoadProviderSuccess(providers);
+            const result = reducer(snapshot, action);
+            expect(fromProvider.adapter.addAll).toHaveBeenCalled();
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS}`, () => {
+        it('should add the loaded providers to the collection', () => {
+            spyOn(fromProvider.adapter, 'updateOne').and.callThrough();
+            const update = {
+                id: 'foo',
+                changes: { resourceId: 'foo', name: 'bar', createdDate: new Date().toLocaleDateString() },
+            };
+            const action = new UpdateProviderSuccess(update);
+            const result = reducer(snapshot, action);
+            expect(fromProvider.adapter.updateOne).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts
new file mode 100644
index 000000000..e69de29bb

From 8759c887f0829881b7a0efc3c442e3e44a9c4d85 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 6 Jul 2018 11:04:05 -0700
Subject: [PATCH 14/15] SHIBUI-580 Added tests

---
 .../provider-wizard-summary.component.spec.ts | 94 +++++++++++++++++++
 .../provider-wizard-summary.component.ts      |  2 +-
 .../summary-property.component.spec.ts        | 75 +++++++++++++++
 .../provider-wizard-step.component.spec.ts    | 36 +++++++
 .../provider-wizard-step.component.ts         | 59 ++++++------
 .../container/provider-wizard.component.ts    |  4 +-
 .../metadata/provider/model/provider.form.ts  |  6 +-
 .../reducer/collection.reducer.spec.ts        |  2 +-
 .../provider/reducer/editor.reducer.spec.ts   | 18 ++++
 .../provider/reducer/entity.reducer.spec.ts   | 18 ++++
 ui/src/app/wizard/guard/step-exists.guard.ts  | 29 ------
 ui/src/app/wizard/model/wizard.ts             |  2 +-
 ui/src/app/wizard/reducer/index.spec.ts       | 91 ++++++++++++++++++
 ui/src/app/wizard/reducer/index.ts            |  4 +-
 .../app/wizard/reducer/wizard.reducer.spec.ts | 74 +++++++++++++++
 ui/src/app/wizard/wizard.module.ts            |  5 +-
 ui/src/testing/form-schema.stub.ts            | 48 ++++++++++
 17 files changed, 497 insertions(+), 70 deletions(-)
 create mode 100644 ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts
 create mode 100644 ui/src/app/metadata/provider/component/summary-property.component.spec.ts
 create mode 100644 ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
 delete mode 100644 ui/src/app/wizard/guard/step-exists.guard.ts
 create mode 100644 ui/src/app/wizard/reducer/index.spec.ts
 create mode 100644 ui/src/app/wizard/reducer/wizard.reducer.spec.ts
 create mode 100644 ui/src/testing/form-schema.stub.ts

diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts
new file mode 100644
index 000000000..d951464ad
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts
@@ -0,0 +1,94 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { ProviderWizardSummaryComponent } from './provider-wizard-summary.component';
+import * as fromRoot from '../reducer';
+import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
+import * as fromWizard from '../../../wizard/reducer';
+import { Wizard } from '../../../wizard/model';
+import { MetadataProvider } from '../../domain/model';
+import { SummaryPropertyComponent } from './summary-property.component';
+import { SCHEMA } from '../../../../testing/form-schema.stub';
+import { MetadataProviderWizard } from '../model';
+
+@Component({
+    template: `
+        <provider-wizard-summary [summary]="summary"></provider-wizard-summary>
+    `
+})
+class TestHostComponent {
+    @ViewChild(ProviderWizardSummaryComponent)
+    public componentUnderTest: ProviderWizardSummaryComponent;
+
+    private _summary;
+
+    get summary(): { definition: Wizard<MetadataProvider>, schema: { [id: string]: any }, model: any } {
+        return this._summary;
+    }
+
+    set summary(summary: { definition: Wizard<MetadataProvider>, schema: { [id: string]: any }, model: any }) {
+        this._summary = summary;
+    }
+}
+
+describe('Provider Wizard Summary Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: ProviderWizardSummaryComponent;
+    let store: Store<fromRoot.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                SchemaFormModule.forRoot(),
+                StoreModule.forRoot({
+                    provider: combineReducers(fromRoot.reducers),
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                ProviderWizardSummaryComponent,
+                SummaryPropertyComponent,
+                TestHostComponent
+            ],
+            providers: [
+                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }
+            ]
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(app).toBeTruthy();
+    }));
+
+    describe('ngOnChanges', () => {
+        it('should set columns and sections if summary is provided', () => {
+            instance.summary = {
+                model: {
+                    name: 'foo',
+                    '@type': 'MetadataProvider'
+                },
+                schema: SCHEMA,
+                definition: MetadataProviderWizard
+            };
+            fixture.detectChanges();
+            expect(app.sections).toBeDefined();
+            expect(app.columns).toBeDefined();
+        });
+    });
+});
diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts
index ad4d6fc68..822e51337 100644
--- a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts
+++ b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts
@@ -58,7 +58,7 @@ export class ProviderWizardSummaryComponent implements OnChanges {
                         id: step.id,
                         index: step.index,
                         label: step.label,
-                        properties: getStepProperties(schemas[step.id], def.translate ? def.translate.formatter(model) : model)
+                        properties: getStepProperties(schemas[step.id], def.translate.formatter(model))
                     })
                 );
 
diff --git a/ui/src/app/metadata/provider/component/summary-property.component.spec.ts b/ui/src/app/metadata/provider/component/summary-property.component.spec.ts
new file mode 100644
index 000000000..8a0fe498b
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/summary-property.component.spec.ts
@@ -0,0 +1,75 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { SummaryPropertyComponent } from './summary-property.component';
+import * as fromRoot from '../reducer';
+import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
+import * as fromWizard from '../../../wizard/reducer';
+import { Wizard } from '../../../wizard/model';
+import { MetadataProvider } from '../../domain/model';
+import { Property } from '../model/property';
+
+@Component({
+    template: `
+        <summary-property [property]="property"></summary-property>
+    `
+})
+class TestHostComponent {
+    @ViewChild(SummaryPropertyComponent)
+    public componentUnderTest: SummaryPropertyComponent;
+
+    private _property;
+
+    get property(): Property {
+        return this._property;
+    }
+
+    set property(prop: Property) {
+        this._property = prop;
+    }
+}
+
+describe('Summary Property Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: SummaryPropertyComponent;
+    let store: Store<fromRoot.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                SchemaFormModule.forRoot(),
+                StoreModule.forRoot({
+                    provider: combineReducers(fromRoot.reducers),
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                SummaryPropertyComponent,
+                TestHostComponent
+            ],
+            providers: [
+                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }
+            ]
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(app).toBeTruthy();
+    }));
+});
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts
index 6e93c612b..eac91d512 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts
@@ -9,6 +9,8 @@ import { ProviderWizardStepComponent } from './provider-wizard-step.component';
 import * as fromRoot from '../reducer';
 import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
 import * as fromWizard from '../../../wizard/reducer';
+import { SCHEMA } from '../../../../testing/form-schema.stub';
+import { MetadataProviderWizard } from '../model';
 
 @Component({
     template: `
@@ -59,4 +61,38 @@ describe('Provider Wizard Step Component', () => {
     it('should instantiate the component', async(() => {
         expect(app).toBeTruthy();
     }));
+
+    describe('resetSelectedType method', () => {
+        it('should dispatch a SetDefinition action if the type has changed', () => {
+            app.resetSelectedType({ value: { name: 'foo', '@type': 'FileBackedHttpMetadataResolver' } }, SCHEMA, MetadataProviderWizard);
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+
+        it('should NOT dispatch a SetDefinition action if the type hasn\'t changed', () => {
+            app.resetSelectedType({ value: { name: 'foo', '@type': 'MetadataProvider' } }, SCHEMA, MetadataProviderWizard);
+            expect(store.dispatch).not.toHaveBeenCalled();
+        });
+
+        it('should NOT dispatch a SetDefinition action if the type isn\'t found', () => {
+            app.resetSelectedType({ value: { name: 'foo', '@type': 'FooProvider' } }, SCHEMA, MetadataProviderWizard);
+            expect(store.dispatch).not.toHaveBeenCalled();
+        });
+
+        it('should return changes and definition if no type supplied', () => {
+            app.resetSelectedType({ value: { name: 'foo' } }, SCHEMA, MetadataProviderWizard);
+            expect(store.dispatch).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('updateStatus method', () => {
+        it('should dispatch an UpdateStatus action', () => {
+            app.updateStatus({value: { name: 'notfound'} });
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+
+        it('should NOT dispatch a SetDefinition action if the type hasn\'t changed', () => {
+            app.updateStatus({ value: null });
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+    });
 });
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
index 248542173..7d09b8ec1 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
-import { withLatestFrom, map, distinctUntilChanged } from 'rxjs/operators';
+import { withLatestFrom, map, distinctUntilChanged, skipWhile } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
@@ -86,44 +86,47 @@ export class ProviderWizardStepComponent implements OnDestroy {
                 },
                 definition
             })),
-            map(({ model, definition }) => definition && definition.translate ? definition.translate.formatter(model) : model)
+            skipWhile(({ model, definition }) => !definition || !model),
+            map(({ model, definition }) => definition.translate.formatter(model))
         );
 
         this.valueChangeEmitted$.pipe(
             withLatestFrom(this.schema$, this.definition$),
-            map(([changes, schema, definition]) => {
-                const type = changes.value['@type'];
-                if (type && type !== definition.type) {
-                    const newDefinition = MetadataProviderTypes.find(def => def.type === type);
-                    if (newDefinition) {
-                        this.store.dispatch(new SetDefinition({
-                            ...MetadataProviderWizard,
-                            ...newDefinition,
-                            steps: [
-                                ...MetadataProviderWizard.steps,
-                                ...newDefinition.steps
-                            ]
-                        }));
-                        changes = { value: pick(Object.keys(schema.properties))(changes.value) };
-                    }
-                }
-                return { changes: changes.value, definition };
-            }),
-            map(({ changes, definition }) => definition.translate ? definition.translate.parser(changes) : changes)
+            map(([changes, schema, definition]) => this.resetSelectedType(changes, schema, definition)),
+            skipWhile(({ changes, definition }) => !definition || !changes),
+            map(({ changes, definition }) => definition.translate.parser(changes))
         )
         .subscribe(changes => this.store.dispatch(new UpdateProvider(changes)));
 
-        this.statusChangeEmitted$.pipe(
-            distinctUntilChanged()
-        ).subscribe(errors => {
-            console.log(!(errors.value));
-            const status = { [this.currentPage]: !(errors.value) ? 'VALID' : 'INVALID' };
-            this.store.dispatch(new UpdateStatus(status));
-        });
+        this.statusChangeEmitted$.pipe(distinctUntilChanged()).subscribe(errors => this.updateStatus(errors));
 
         this.store.select(fromWizard.getWizardIndex).subscribe(i => this.currentPage = i);
     }
 
+    resetSelectedType(changes: any, schema: any, definition: any): { changes: any, definition: any } {
+        const type = changes.value['@type'];
+        if (type && type !== definition.type) {
+            const newDefinition = MetadataProviderTypes.find(def => def.type === type);
+            if (newDefinition) {
+                this.store.dispatch(new SetDefinition({
+                    ...MetadataProviderWizard,
+                    ...newDefinition,
+                    steps: [
+                        ...MetadataProviderWizard.steps,
+                        ...newDefinition.steps
+                    ]
+                }));
+                changes = { value: pick(Object.keys(schema.properties))(changes.value) };
+            }
+        }
+        return { changes: changes.value, definition };
+    }
+
+    updateStatus(errors: any): void {
+        const status = { [this.currentPage]: !(errors.value) ? 'VALID' : 'INVALID' };
+        this.store.dispatch(new UpdateStatus(status));
+    }
+
     ngOnDestroy() {
         this.valueChangeSubject.complete();
     }
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index 793f491da..ee18b72b0 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -76,9 +76,7 @@ export class ProviderWizardComponent implements OnDestroy {
     }
 
     next(): void {
-        if (this.nextStep) {
-            this.store.dispatch(new SetIndex(this.nextStep.id));
-        }
+        this.store.dispatch(new SetIndex(this.nextStep.id));
     }
 
     previous(): void {
diff --git a/ui/src/app/metadata/provider/model/provider.form.ts b/ui/src/app/metadata/provider/model/provider.form.ts
index 133de467f..698d20134 100644
--- a/ui/src/app/metadata/provider/model/provider.form.ts
+++ b/ui/src/app/metadata/provider/model/provider.form.ts
@@ -4,7 +4,11 @@ import { Metadata } from '../../domain/domain.type';
 
 export const MetadataProviderWizard: Wizard<MetadataProvider> = {
     label: 'MetadataProvider',
-    type: '@MetadataProvider',
+    type: 'MetadataProvider',
+    translate: {
+        parser: changes => changes,
+        formatter: model => model
+    },
     steps: [
         {
             id: 'new',
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
index 1631c189f..4204ebe65 100644
--- a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
@@ -13,7 +13,7 @@ const snapshot: fromProvider.CollectionState = {
     loaded: false
 };
 
-describe('Provider Reducer', () => {
+describe('Provider Collection Reducer', () => {
     describe('undefined action', () => {
         it('should return the default state', () => {
             const result = reducer(snapshot, {} as any);
diff --git a/ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts
index e69de29bb..d1b58da34 100644
--- a/ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts
+++ b/ui/src/app/metadata/provider/reducer/editor.reducer.spec.ts
@@ -0,0 +1,18 @@
+import { reducer, initialState as snapshot } from './editor.reducer';
+import { EditorActionTypes, ClearEditor } from '../action/editor.action';
+
+describe('Provider Editor Reducer', () => {
+    describe('undefined action', () => {
+        it('should return the default state', () => {
+            const result = reducer(snapshot, {} as any);
+
+            expect(result).toEqual(snapshot);
+        });
+    });
+
+    describe(`${EditorActionTypes.CLEAR}`, () => {
+        it('should reset to initial state', () => {
+            expect(reducer(snapshot, new ClearEditor())).toEqual(snapshot);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
new file mode 100644
index 000000000..3079a99cd
--- /dev/null
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
@@ -0,0 +1,18 @@
+import { reducer, initialState as snapshot } from './entity.reducer';
+import { EntityActionTypes, ClearProvider } from '../action/entity.action';
+
+describe('Provider Editor Reducer', () => {
+    describe('undefined action', () => {
+        it('should return the default state', () => {
+            const result = reducer(snapshot, {} as any);
+
+            expect(result).toEqual(snapshot);
+        });
+    });
+
+    describe(`${EntityActionTypes.CLEAR_PROVIDER}`, () => {
+        it('should reset to initial state', () => {
+            expect(reducer(snapshot, new ClearProvider())).toEqual(snapshot);
+        });
+    });
+});
diff --git a/ui/src/app/wizard/guard/step-exists.guard.ts b/ui/src/app/wizard/guard/step-exists.guard.ts
deleted file mode 100644
index cd382ee14..000000000
--- a/ui/src/app/wizard/guard/step-exists.guard.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-    CanActivate,
-    Router,
-    ActivatedRouteSnapshot,
-    RouterStateSnapshot
-} from '@angular/router';
-import { Store } from '@ngrx/store';
-import { Observable, of } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
-
-import * as fromWizard from '../reducer';
-
-@Injectable()
-export class StepExistsGuard implements CanActivate {
-    constructor(
-        private store: Store<fromWizard.State>,
-        private router: Router
-    ) { }
-
-    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-        this.store.select(fromWizard.getWizardDefinition).pipe(
-            map(current => !!current)
-        ).subscribe(defined => console.log(defined));
-        return of(true);
-    }
-}
-
-// !isDefined ? this.router.navigate(['metadata/provider/wizard/new']) : isDefined
diff --git a/ui/src/app/wizard/model/wizard.ts b/ui/src/app/wizard/model/wizard.ts
index b95f18cd9..8b5fe344e 100644
--- a/ui/src/app/wizard/model/wizard.ts
+++ b/ui/src/app/wizard/model/wizard.ts
@@ -2,7 +2,7 @@ export interface Wizard<T> {
     label: string;
     type: string;
     steps: WizardStep[];
-    translate?: {
+    translate: {
         parser(changes: Partial<T>, schema?: any),
         formatter(changes: Partial<T>, schema?: any)
     };
diff --git a/ui/src/app/wizard/reducer/index.spec.ts b/ui/src/app/wizard/reducer/index.spec.ts
new file mode 100644
index 000000000..78ff09441
--- /dev/null
+++ b/ui/src/app/wizard/reducer/index.spec.ts
@@ -0,0 +1,91 @@
+import * as selectors from './';
+import { FileBackedHttpMetadataProviderWizard } from '../../metadata/provider/model';
+
+describe('wizard index selectors', () => {
+    describe('getSchema method', () => {
+        it('should return the schema by index name', () => {
+            expect(
+                selectors.getSchema('common', FileBackedHttpMetadataProviderWizard)
+            ).toBe(FileBackedHttpMetadataProviderWizard.steps[0].schema);
+        });
+        it('should return nothing if no schema is found', () => {
+            expect(
+                selectors.getSchema('common', null)
+            ).toBeFalsy();
+        });
+    });
+    describe('getPreviousFn method', () => {
+        it('should return the previous step', () => {
+            expect(
+                selectors.getPreviousFn('reloading', FileBackedHttpMetadataProviderWizard)
+            ).toBe(FileBackedHttpMetadataProviderWizard.steps[0]);
+        });
+        it('should return null if the index is the first step', () => {
+            expect(
+                selectors.getPreviousFn('common', FileBackedHttpMetadataProviderWizard)
+            ).toBeFalsy();
+        });
+        it('should return nothing if no schema is found', () => {
+            expect(
+                selectors.getPreviousFn('common', null)
+            ).toBeFalsy();
+        });
+    });
+
+    describe('getNextFn method', () => {
+        it('should return the previous step', () => {
+            expect(
+                selectors.getNextFn('common', FileBackedHttpMetadataProviderWizard)
+            ).toBe(FileBackedHttpMetadataProviderWizard.steps[1]);
+        });
+        it('should return null if the index is the last step', () => {
+            expect(
+                selectors.getNextFn('summary', FileBackedHttpMetadataProviderWizard)
+            ).toBeFalsy();
+        });
+        it('should return nothing if no schema is found', () => {
+            expect(
+                selectors.getNextFn('common', null)
+            ).toBeFalsy();
+        });
+    });
+
+    describe('getCurrentFn method', () => {
+        it('should return the current step', () => {
+            expect(
+                selectors.getCurrentFn('common', FileBackedHttpMetadataProviderWizard)
+            ).toBe(FileBackedHttpMetadataProviderWizard.steps[0]);
+        });
+        it('should return nothing if no schema is found', () => {
+            expect(
+                selectors.getCurrentFn('common', null)
+            ).toBeFalsy();
+        });
+    });
+
+    describe('getLastFn method', () => {
+        it('should return the last step', () => {
+            expect(
+                selectors.getLastFn('summary', FileBackedHttpMetadataProviderWizard)
+            ).toBe(FileBackedHttpMetadataProviderWizard.steps.find(step => step.id === 'summary'));
+        });
+        it('should return nothing if no definition is provided', () => {
+            expect(
+                selectors.getLastFn('common', null)
+            ).toBeFalsy();
+        });
+        it('should return nothing if no schema is found', () => {
+            expect(
+                selectors.getLastFn('common', FileBackedHttpMetadataProviderWizard)
+            ).toBeFalsy();
+        });
+    });
+
+    describe('getModelFn method', () => {
+        it('should return the model', () => {
+            const step = FileBackedHttpMetadataProviderWizard.steps.find(s => s.id === 'filters');
+            console.log(step);
+            expect(selectors.getModelFn(step)).toEqual({ metadataFilters: [] });
+        });
+    });
+});
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index 77fbefbef..7e3db4c01 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -56,8 +56,8 @@ export const getLastFn = (index: string, wizard: Wizard<any>) => {
 };
 
 export const getModelFn = (currentStep: WizardStep) => {
-    const model = (currentStep && currentStep.initialValues) || [];
-    return model.reduce((m, property) => m[property.key] = property.value, {});
+    const model = (currentStep && currentStep.initialValues) ? currentStep.initialValues : [];
+    return model.reduce((m, property) => ({...m, [property.key]: property.value }), {});
 };
 
 export const getPrevious = createSelector(getWizardIndex, getWizardDefinition, getPreviousFn);
diff --git a/ui/src/app/wizard/reducer/wizard.reducer.spec.ts b/ui/src/app/wizard/reducer/wizard.reducer.spec.ts
new file mode 100644
index 000000000..c922c226d
--- /dev/null
+++ b/ui/src/app/wizard/reducer/wizard.reducer.spec.ts
@@ -0,0 +1,74 @@
+import { reducer, initialState as snapshot } from './wizard.reducer';
+import * as selectors from './wizard.reducer';
+import { WizardActionTypes, ClearWizard, AddSchema, SetDisabled, SetDefinition, SetIndex, UpdateDefinition } from '../action/wizard.action';
+import { SCHEMA } from '../../../testing/form-schema.stub';
+import { MetadataProviderWizard, FileBackedHttpMetadataProviderWizard } from '../../metadata/provider/model';
+
+
+
+describe('Wizard Reducer', () => {
+    describe('undefined action', () => {
+        it('should return the default state', () => {
+            const result = reducer(snapshot, {} as any);
+
+            expect(result).toEqual(snapshot);
+        });
+    });
+
+    describe(`${WizardActionTypes.CLEAR}`, () => {
+        it('should reset to initial state', () => {
+            expect(reducer(snapshot, new ClearWizard())).toEqual(snapshot);
+        });
+    });
+
+    describe(`${WizardActionTypes.ADD_SCHEMA}`, () => {
+        it('should add the payload to the schema collection', () => {
+            expect(reducer(snapshot, new AddSchema({id: 'foo', schema: SCHEMA })).schemaCollection).toEqual({ 'foo': SCHEMA });
+        });
+    });
+
+    describe(`${WizardActionTypes.SET_DISABLED}`, () => {
+        it('should set the disabled property on the wizard', () => {
+            expect(reducer(snapshot, new SetDisabled(true)).disabled).toBe(true);
+            expect(reducer(snapshot, new SetDisabled(false)).disabled).toBe(false);
+        });
+    });
+
+    describe(`${WizardActionTypes.SET_DEFINITION}`, () => {
+        it('should set the definition property on the wizard', () => {
+            expect(reducer(snapshot, new SetDefinition(MetadataProviderWizard)).definition).toBe(MetadataProviderWizard);
+        });
+    });
+
+    describe(`${WizardActionTypes.SET_INDEX}`, () => {
+        it('should set the definition property on the wizard', () => {
+            expect(reducer(snapshot, new SetIndex(MetadataProviderWizard.steps[0].id)).index).toBe('new');
+        });
+    });
+
+    describe(`${WizardActionTypes.SET_INDEX}`, () => {
+        let state = reducer(snapshot, new SetDefinition(MetadataProviderWizard));
+        it('should set the definition property on the wizard', () => {
+            expect(reducer(state, new UpdateDefinition(FileBackedHttpMetadataProviderWizard))).toEqual({
+                ...state,
+                definition: {
+                    ...MetadataProviderWizard,
+                    ...FileBackedHttpMetadataProviderWizard,
+                    steps: [
+                        ...MetadataProviderWizard.steps,
+                        ...FileBackedHttpMetadataProviderWizard.steps
+                    ]
+                }
+            });
+        });
+    });
+
+    describe('selector functions', () => {
+        it('should return pieces of state', () => {
+            expect(selectors.getCollection(snapshot)).toEqual(snapshot.schemaCollection);
+            expect(selectors.getDefinition(snapshot)).toEqual(snapshot.definition);
+            expect(selectors.getDisabled(snapshot)).toEqual(snapshot.disabled);
+            expect(selectors.getIndex(snapshot)).toEqual(snapshot.index);
+        });
+    });
+});
diff --git a/ui/src/app/wizard/wizard.module.ts b/ui/src/app/wizard/wizard.module.ts
index 6664ec16a..8612649b6 100644
--- a/ui/src/app/wizard/wizard.module.ts
+++ b/ui/src/app/wizard/wizard.module.ts
@@ -5,7 +5,6 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { WizardComponent } from './component/wizard.component';
 import { reducers } from './reducer';
-import { StepExistsGuard } from './guard/step-exists.guard';
 
 @NgModule({
     declarations: [
@@ -23,9 +22,7 @@ export class WizardModule {
     static forRoot(): ModuleWithProviders {
         return {
             ngModule: RootWizardModule,
-            providers: [
-                StepExistsGuard
-            ]
+            providers: []
         };
     }
 }
diff --git a/ui/src/testing/form-schema.stub.ts b/ui/src/testing/form-schema.stub.ts
new file mode 100644
index 000000000..c91f63bf1
--- /dev/null
+++ b/ui/src/testing/form-schema.stub.ts
@@ -0,0 +1,48 @@
+export const SCHEMA = {
+    'title': 'MetadataResolver',
+    'type': 'object',
+    'widget': {
+        'id': 'fieldset'
+    },
+    'properties': {
+        'name': {
+            'title': 'Metadata Provider Name (Dashboard Display Only)',
+            'description': 'Metadata Provider Name (Dashboard Display Only)',
+            'type': 'string',
+            'widget': {
+                'id': 'string',
+                'help': 'Must be unique.'
+            }
+        },
+        '@type': {
+            'title': 'Metadata Provider Type',
+            'description': 'Metadata Provider Type',
+            'ui:placeholder': 'Select a metadata provider type',
+            'type': 'string',
+            'widget': {
+                'id': 'select'
+            },
+            'oneOf': [
+                {
+                    'enum': [
+                        'FileBackedHttpMetadataResolver'
+                    ],
+                    'description': 'FileBackedHttpMetadataProvider'
+                }
+            ]
+        }
+    },
+    'required': [
+        'name',
+        '@type'
+    ],
+    'fieldsets': [
+        {
+            'type': 'section',
+            'fields': [
+                'name',
+                '@type'
+            ]
+        }
+    ]
+};

From c7daa6ad5760df72c98470f8be9c59c3e0f58942 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 6 Jul 2018 12:00:28 -0700
Subject: [PATCH 15/15] SHIBUI-640 Updated README

---
 ui/README.md | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/ui/README.md b/ui/README.md
index e3fd36108..a24915b12 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -1,6 +1,40 @@
-# Ui
+# Angular
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.3.1.
+Angular is a complete framework for UI development, meaning that in addition to rendering a web application in a browser, it also provides additional tools for other important UI considerations such as Internationalization (i18n), Accessibility (a11y), HTML 5 push state routing, an http library for connecting with our REST endpoints, a tool for scaffolding new services, components, pages, etc, and extensive end-to-end and unit testing toolset. In comparison to other frameworks, we rely on fewer 3rd party libraries or frameworks to handle these other concerns. The Angular community provides an extensive documentation website with full API documentation, as well as examples/tutorials. This includes a style-guide with rules for formatting code, which we follow on the SHIB-UI project.Angular is actively maintained by Google and has a large community and ecosystem.
+
+## License
+
+Angular is [licensed](https://angular.io/license) under the MIT license.
+
+## Performance
+
+Angular was designed for mobile from the ground up. Aside from limited processing power, mobile devices have other features and limitations that separate them from traditional computers. Touch interfaces, limited screen real estate, and mobile hardware have all been considered when developing the Angular framework. This has resulted in performance gains in Angular across the board, and makes it competitive with the many other UI frameworks available.
+
+## Typescript
+
+Angular uses [TypeScript](https://www.typescriptlang.org/), a superset of JavaScript that implements many new ESNext features as well as making JavaScript strongly typed. This makes errors and exceptions  more likely to happen during compilation, resulting in fewer defects.
+
+By focusing on making the framework easier for computers to process, Angular and TypeScript allow for a much richer development process. Tooling for TypeScript and Angular allows for immediate Angular-specific help and feedback with nearly every IDE and editor. Strong typing enables developers to use more productive development tools and practices like static checking when developing JavaScript applications.
+
+However, developers can still write vanilla JavaScript for Angular that runs without transpilation.
+
+## NGRX
+
+The popular Redux state management system is implemented in SHIB-UI via the framework [NgRx](http://ngrx.github.io/). This provides reliable uni-directional data-flow in the UI which organizes the UI state in a clear and predictable way. One of NgRx's most important features is its simple testability since it is based primarily on pure functions.
+
+# JSON-Schema
+
+For Providers and Filters, the forms in SHIB-UI are built based on the standard [JSON-Schema](http://json-schema.org/). This makes the generation of forms in the editors and wizards of the application dynamic, so that if new properties are added to the specification for a Metadata Provider type, it can be added to the JSON-schema of the application without ever having to re-deploy the javascript code. Rendering of the forms is handled using [ngx-schema-form](https://github.com/makinacorpus/ngx-schema-form), a component library for connecting to a JSON-Schema to render Angular form components, and provides extensibility through support of custom components and validation rules.
+
+# Bootstrap
+
+[Bootstrap](http://getbootstrap.com/) 4 is used for the css framework in SHIB-UI, and provides our base theme, a responsive grid system, consistent styling across all major browsers, and pre-styled components which are connected to Angular using ng-bootstrap, a 3rd party framework.
+
+# Development
+
+## Scaffolding
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.1.
 
 ## Development server