Fixed dependancy issues and routing

TIER · Jun 19, 2018 · 971f20a · 971f20a
1 parent e232e39
commit 971f20a
Show file tree

Hide file tree

Showing 34 changed files with 228 additions and 209 deletions.
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
@@ -24,27 +24,27 @@
                 </button>
                 <div ngbDropdownMenu aria-labelledby="addNewDropdown">
                     <a class="nav-link"
-                        routerLink="/metadata/provider/new"
+                        routerLink="/metadata/resolver/new"
                         routerLinkActive="active"
                         aria-label="Add a new metadata provider"
                         role="button">
                         <i class="fa fa-cube fa-fw" aria-hidden="true"></i>
                         &nbsp;
-                        <ng-container i18n="@@action--add-source">Metadata Provider</ng-container>
+                        <ng-container i18n="@@action--add-source">Metadata Source</ng-container>
                     </a>
                     <a class="nav-link"
-                        routerLink="/metadata/resolver/new"
+                        routerLink="/metadata/provider/new"
                         routerLinkActive="active"
                         aria-label="Add a new metadata resolver"
                         role="button">
                         <i class="fa fa-cubes fa-fw" aria-hidden="true"></i>
                         &nbsp;
-                        <ng-container i18n="@@action--add-filter">Metadata Source</ng-container>
+                        <ng-container i18n="@@action--add-filter">Metadata Provider</ng-container>
                     </a>
                 </div>
             </li>
             <li class="nav-item">
-                <a class="nav-link" routerLink="/dashboard" routerLinkActive="active" aria-label="Metadata Dashboard">
+                <a class="nav-link" routerLink="/metadata" routerLinkActive="active" aria-label="Metadata Dashboard">
                     <i class="fa fa-th fa-fw" aria-hidden="true"></i>
                     <ng-container i18n="@@action--dashboard">Dashboard</ng-container>
                 </a>

diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { SharedModule } from './shared/shared.module';
         }),
         EffectsModule.forRoot([]),
         BrowserModule,
-        AppRoutingModule,
         CoreModule.forRoot(),
         StoreRouterConnectingModule,
         NgbDropdownModule.forRoot(),
@@ -41,7 +40,8 @@ import { SharedModule } from './shared/shared.module';
         NotificationModule,
         HttpClientModule,
         ContentionModule,
-        SharedModule
+        SharedModule,
+        AppRoutingModule
     ],
     providers: [
         NavigatorService,

diff --git a/ui/src/app/app.routing.ts b/ui/src/app/app.routing.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
-    { path: '', redirectTo: '/metadata/manager', pathMatch: 'full' },
+    { path: '', redirectTo: 'metadata', pathMatch: 'full' },
     {
         path: 'metadata',
         loadChildren: './metadata/metadata.module#MetadataModule'

diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts
@@ -1,17 +1,14 @@
 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { AdvancedInfoFormComponent } from './advanced-info-form.component';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Advanced Info Form Component', () => {
     let fixture: ComponentFixture<AdvancedInfoFormComponent>;
     let instance: AdvancedInfoFormComponent;
-    let store: Store<fromMetadata.MetadataState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -23,17 +20,12 @@ describe('Advanced Info Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 AdvancedInfoFormComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(AdvancedInfoFormComponent);
         instance = fixture.componentInstance;

diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts
@@ -3,13 +3,10 @@ import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 import { Observable, Subscription, of } from 'rxjs';
 import { takeUntil, switchMap, map, startWith } from 'rxjs/operators';
 
-import { Store } from '@ngrx/store';
-
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataResolver, Contact } from '../../../domain/model';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { EntityValidators } from '../../../domain/service/entity-validators.service';
-import * as fromMetadata from '../../../metadata.reducer';
 
 @Component({
     selector: 'adv-info-form',
@@ -37,8 +34,7 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
     constructor(
         protected fb: FormBuilder,
         protected statusEmitter: ProviderStatusEmitter,
-        protected valueEmitter: ProviderValueEmitter,
-        protected store: Store<fromMetadata.MetadataState>
+        protected valueEmitter: ProviderValueEmitter
     ) {
         super(fb, statusEmitter, valueEmitter);
 

diff --git a/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts
@@ -3,15 +3,13 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AssertionFormComponent } from './assertion-form.component';
 import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Assertion Form Component', () => {
     let fixture: ComponentFixture<AssertionFormComponent>;
     let instance: AssertionFormComponent;
-    let store: Store<fromMetadata.MetadataState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -23,17 +21,12 @@ describe('Assertion Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 AssertionFormComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(AssertionFormComponent);
         instance = fixture.componentInstance;

diff --git a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts
@@ -3,7 +3,6 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AttributeReleaseFormComponent } from './attribute-release-form.component';
 import { ListValuesService } from '../../../domain/service/list-values.service';
@@ -12,7 +11,6 @@ import * as stubs from '../../../../../testing/resolver.stub';
 describe('Attribute Release Form Component', () => {
     let fixture: ComponentFixture<AttributeReleaseFormComponent>;
     let instance: AttributeReleaseFormComponent;
-    let store: Store<fromMetadata.State>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -25,17 +23,12 @@ describe('Attribute Release Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 AttributeReleaseFormComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(AttributeReleaseFormComponent);
         instance = fixture.componentInstance;

diff --git a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts
@@ -4,7 +4,6 @@ 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FileBackedHttpMetadataResolver } from '../../../domain/entity';
@@ -40,7 +39,6 @@ class TestHostComponent {
 describe('Descriptor Info Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromMetadata.MetadataState>;
     let form: DescriptorInfoFormComponent;
     let fb: FormBuilder;
 
@@ -55,9 +53,6 @@ describe('Descriptor Info Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule,
                 SharedModule
             ],
@@ -66,8 +61,6 @@ describe('Descriptor Info Form Component', () => {
                 TestHostComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;

diff --git a/ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts
@@ -3,19 +3,17 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 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/resolver.stub';
-import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
 import { FileBackedHttpMetadataResolver } from '../../entity';
 import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
     template: `<finish-form [resolver]="resolver"></finish-form>`
@@ -36,7 +34,6 @@ class TestHostComponent {
 describe('Finished Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromMetadata.MetadataState>;
     let form: FinishFormComponent;
 
     beforeEach(() => {
@@ -52,9 +49,6 @@ describe('Finished Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
@@ -65,8 +59,6 @@ describe('Finished Form Component', () => {
                 TestHostComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;

diff --git a/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts
@@ -2,17 +2,15 @@ import { Component, ViewChild } from '@angular/core';
 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { KeyInfoFormComponent } from './key-info-form.component';
 
 import * as stubs from '../../../../../testing/resolver.stub';
-import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
 import { FileBackedHttpMetadataResolver } from '../../entity';
 import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
     template: `<key-info-form [resolver]="resolver"></key-info-form>`
@@ -37,7 +35,6 @@ class TestHostComponent {
 describe('Security (Key) Info Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromMetadata.MetadataState>;
     let form: KeyInfoFormComponent;
 
     beforeEach(() => {
@@ -51,9 +48,6 @@ describe('Security (Key) Info Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
@@ -63,8 +57,6 @@ describe('Security (Key) Info Form Component', () => {
                 I18nTextComponent
             ],
         }).compileComponents();
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;

diff --git a/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts
@@ -4,15 +4,14 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { LogoutFormComponent } from './logout-form.component';
 
 import * as stubs from '../../../../../testing/resolver.stub';
-import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
 import { FileBackedHttpMetadataResolver } from '../../entity';
 import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
     template: `<logout-form [resolver]="resolver"></logout-form>`
@@ -34,7 +33,6 @@ class TestHostComponent {
 describe('Logout Endpoints Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromMetadata.MetadataState>;
     let form: LogoutFormComponent;
 
     beforeEach(() => {
@@ -48,9 +46,6 @@ describe('Logout Endpoints Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'metadata': combineReducers(fromMetadata.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
@@ -60,8 +55,6 @@ describe('Logout Endpoints Form Component', () => {
                 I18nTextComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;