Merged in task/reorg (pull request #38)

Moved services to domain folder

Approved-by: Ryan Mathis <rmathis@unicon.net>

ui/src/app/app.module.ts

@@ -11,7 +11,9 @@ import { AppRoutingModule } from './routing.module';
 import { AppComponent } from './app.component';
 
 import { CoreModule } from './core/core.module';
+import { DomainModule } from './domain/domain.module';
 import { MetadataProviderModule } from './metadata-provider/metadata-provider.module';
+
 import { reducers, metaReducers } from './app.reducer';
 import { CustomRouterStateSerializer } from './shared/util';
 
@@ -36,6 +38,7 @@ import { environment } from '../environments/environment';
         AppRoutingModule,
         CoreModule.forRoot(),
         MetadataProviderModule.forRoot(),
+        DomainModule.forRoot(),
         StoreRouterConnectingModule,
         NgbDropdownModule.forRoot(),
         NgbModalModule.forRoot(),

ui/src/app/dashboard/effect/search.effects.ts

@@ -5,7 +5,7 @@ import { Store } from '@ngrx/store';
 import * as providerSearch from '../action/search.action';
 import * as fromProviders from '../../metadata-provider/reducer';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 
 @Injectable()
 export class SearchEffects {

ui/src/app/domain/domain.module.ts

@@ -1,5 +1,10 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 
+import { EntityDescriptorService } from './service/entity-descriptor.service';
+import { ListValuesService } from './service/list-values.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from './service/provider-change-emitter.service';
+import { EntityIdService } from './service/entity-id.service';
+import { EntityDraftService } from './service/entity-draft.service';
 @NgModule({
     declarations: [],
     entryComponents: [],
@@ -11,7 +16,14 @@ export class DomainModule {
     static forRoot(): ModuleWithProviders {
         return {
             ngModule: RootDomainModule,
-            providers: []
+            providers: [
+                EntityDescriptorService,
+                EntityIdService,
+                EntityDraftService,
+                ListValuesService,
+                ProviderStatusEmitter,
+                ProviderValueEmitter
+            ]
         };
     }
 }

ui/src/app/metadata-provider/service/entity-validators.service.spec.ts → ui/src/app/domain/service/entity-validators.service.spec.ts

@@ -6,7 +6,7 @@ import 'rxjs/add/observable/of';
 
 let ids = ['foo', 'bar', 'baz'];
 
-describe(`EntityDescriptorService`, () => {
+describe(`Entity Validators service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({

ui/src/app/metadata-provider/service/provider-change-emitter.service.spec.ts → ui/src/app/domain/service/provider-change-emitter.service.spec.ts

@@ -5,7 +5,7 @@ import { AbstractControl, FormBuilder, ReactiveFormsModule } from '@angular/form
 import 'rxjs/add/observable/of';
 import { ProviderStatusEmitter, ProviderValueEmitter } from './provider-change-emitter.service';
 
-describe(`EntityDescriptorService`, () => {
+describe(`Provider Change emitter service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({

ui/src/app/edit-provider/component/unsaved-dialog.component.ts

@@ -7,7 +7,7 @@ import { Subject } from 'rxjs/Subject';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 import * as fromEditor from '../reducer';
 import { UpdateDraftRequest } from '../../metadata-provider/action/draft.action';
-import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 import { SaveChanges, CancelChanges } from '../action/editor.action';
 
 @Component({

ui/src/app/edit-provider/container/editor.component.ts

@@ -29,7 +29,7 @@ import * as fromProviders from '../../metadata-provider/reducer';
 import { UpdateProviderRequest } from '../../metadata-provider/action/provider.action';
 import * as fromEditor from '../reducer';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { UpdateStatus, UpdateChanges, CancelChanges } from '../action/editor.action';
 import { EDITOR as EditorDef, EditorFlowDefinition } from '../editor-definition.const';
 import { UnsavedDialogComponent } from '../component/unsaved-dialog.component';

ui/src/app/edit-provider/container/wizard.component.ts

@@ -29,7 +29,7 @@ import * as draftActions from '../../metadata-provider/action/draft.action';
 import { AddProviderRequest, RemoveProviderRequest } from '../../metadata-provider/action/provider.action';
 import * as fromEditor from '../reducer';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { UpdateStatus, UpdateChanges, SaveChanges } from '../action/editor.action';
 import { WIZARD as WizardDef, EditorFlowDefinition } from '../editor-definition.const';
 import { CanComponentDeactivate } from '../../core/service/can-deactivate.guard';

ui/src/app/edit-provider/effect/editor.effect.ts

@@ -4,7 +4,7 @@ import { Effect, Actions } from '@ngrx/effects';
 import * as editor from '../action/editor.action';
 import * as provider from '../../metadata-provider/action/provider.action';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 import { Router } from '@angular/router';
 
 @Injectable()

ui/src/app/edit-provider/effect/wizard.effect.ts

@@ -5,7 +5,7 @@ import * as editorActions from '../action/editor.action';
 import * as draft from '../../metadata-provider/action/draft.action';
 import * as provider from '../../metadata-provider/action/provider.action';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDraftService } from '../../metadata-provider/service/entity-draft.service';
+import { EntityDraftService } from '../../domain/service/entity-draft.service';
 
 @Injectable()
 export class WizardEffects {

ui/src/app/metadata-filter/component/filter-form.component.spec.ts

@@ -4,7 +4,7 @@ import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { FilterFormComponent } from './filter-form.component';
 import * as fromFilter from '../reducer';
 import { ProviderEditorFormModule } from '../../metadata-provider/component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbPopoverModule, NgbPopoverConfig, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { NavigatorService } from '../../core/service/navigator.service';
 import { SharedModule } from '../../shared/shared.module';

ui/src/app/metadata-filter/component/filter-form.component.ts

@@ -7,11 +7,11 @@ import 'rxjs/add/operator/takeWhile';
 
 import * as fromFilter from '../reducer';
 import { ProviderFormFragmentComponent } from '../../metadata-provider/component/forms/provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { SearchDialogComponent } from '../component/search-dialog.component';
 import { ViewMoreIds, CancelCreateFilter, QueryEntityIds } from '../action/filter.action';
-import { EntityValidators } from '../../metadata-provider/service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 
 @Component({

ui/src/app/metadata-filter/container/new-filter.component.spec.ts

@@ -4,7 +4,7 @@ import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { NewFilterComponent } from './new-filter.component';
 import * as fromFilter from '../reducer';
 import { ProviderEditorFormModule } from '../../metadata-provider/component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbPopoverModule, NgbPopoverConfig, NgbModalModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { NavigatorService } from '../../core/service/navigator.service';
 import { SharedModule } from '../../shared/shared.module';

ui/src/app/metadata-filter/container/new-filter.component.ts

@@ -8,11 +8,11 @@ import 'rxjs/add/observable/fromPromise';
 
 import * as fromFilter from '../reducer';
 import { ProviderFormFragmentComponent } from '../../metadata-provider/component/forms/provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { SearchDialogComponent } from '../component/search-dialog.component';
 import { ViewMoreIds, CancelCreateFilter, QueryEntityIds, CreateFilter, UpdateFilter, SaveFilter } from '../action/filter.action';
-import { EntityValidators } from '../../metadata-provider/service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 import { PreviewFilterComponent } from '../component/preview-filter.component';
 

ui/src/app/metadata-filter/effect/filter.effect.ts

@@ -15,7 +15,7 @@ import * as filter from '../action/filter.action';
 import * as fromFilter from '../reducer';
 
 import { SearchDialogComponent } from '../component/search-dialog.component';
-import { EntityIdService } from '../../metadata-provider/service/entity-id.service';
+import { EntityIdService } from '../../domain/service/entity-id.service';
 import { MetadataFilterService } from '../service/filter.service';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 

ui/src/app/metadata-provider/component/forms/advanced-info-form.component.spec.ts

@@ -2,7 +2,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { AdvancedInfoFormComponent } from './advanced-info-form.component';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';

ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts

@@ -9,10 +9,10 @@ import 'rxjs/add/operator/takeUntil';
 import 'rxjs/add/operator/startWith';
 
 import * as fromProviders from '../../reducer';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { EntityValidators } from '../../service/entity-validators.service';
+import { EntityValidators } from '../../../domain/service/entity-validators.service';
 import * as patterns from '../../../shared/regex';
 
 @Component({

ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts

@@ -2,7 +2,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AssertionFormComponent } from './assertion-form.component';

ui/src/app/metadata-provider/component/forms/assertion-form.component.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, SsoService } from '../../../domain/model/metadata-provider';
 import * as patterns from '../../../shared/regex';
 

ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts

@@ -2,12 +2,11 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AttributeReleaseFormComponent } from './attribute-release-form.component';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import * as stubs from '../../../../testing/provider.stub';
 
 describe('Attribute Release Form Component', () => {

ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts

@@ -4,9 +4,9 @@ import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/last';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
-import { ListValuesService } from '../../service/list-values.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FormArray } from '@angular/forms/src/model';
 
 @Component({

ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts

@@ -3,11 +3,11 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { Provider } from '../../../domain/entity/Provider';
+import { ListValuesService } from '../../../domain/service/list-values.service';
+import { Provider } from '../../../domain/entity/provider';
 import { DescriptorInfoFormComponent } from './descriptor-info-form.component';
 
 import * as stubs from '../../../../testing/provider.stub';

ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts

@@ -4,9 +4,9 @@ import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
-import { ListValuesService } from '../../service/list-values.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
     selector: 'descriptor-info-form',

ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts

@@ -4,24 +4,24 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute, Router } from '@angular/router';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FinishFormComponent } from './finish-form.component';
 import { RouterStub, RouterLinkStubDirective } from '../../../../testing/router.stub';
 import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 
 import * as stubs from '../../../../testing/provider.stub';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 import { I18nTextComponent } from '../i18n-text.component';
+import { Provider } from '../../../domain/entity/provider';
 
 @Component({
     template: `<finish-form [provider]="provider"></finish-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider
     });
 

ui/src/app/metadata-provider/component/forms/finish-form.component.ts

@@ -2,9 +2,9 @@ import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, C
 import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
-import { ListValuesService } from '../../service/list-values.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
     selector: 'finish-form',

ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts

@@ -3,22 +3,22 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { KeyInfoFormComponent } from './key-info-form.component';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 
 import * as stubs from '../../../../testing/provider.stub';
 import { I18nTextComponent } from '../i18n-text.component';
+import { Provider } from '../../../domain/entity/provider';
 
 @Component({
     template: `<key-info-form [provider]="provider"></key-info-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider,
         securityInfo: {
             ...stubs.secInfo,