From 971f20a51ba4fb44a236a7c64c3a83220b8f3041 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 19 Jun 2018 10:26:24 -0700 Subject: [PATCH] Fixed dependancy issues and routing --- ui/src/app/app.component.html | 10 +-- ui/src/app/app.module.ts | 4 +- ui/src/app/app.routing.ts | 2 +- .../advanced-info-form.component.spec.ts | 8 -- .../forms/advanced-info-form.component.ts | 6 +- .../forms/assertion-form.component.spec.ts | 7 -- .../attribute-release-form.component.spec.ts | 7 -- .../descriptor-info-form.component.spec.ts | 7 -- .../forms/finish-form.component.spec.ts | 10 +-- .../forms/key-info-form.component.spec.ts | 10 +-- .../forms/logout-form.component.spec.ts | 9 +- .../forms/metadata-ui-form.component.spec.ts | 14 +-- .../organization-info-form.component.spec.ts | 7 -- .../relying-party-form.component.spec.ts | 7 -- .../entity/filter/entity-attributes-filter.ts | 4 + .../file-backed-http-metadata-provider.ts | 4 + .../file-backed-http-metadata-resolver.ts | 4 + .../metadata/domain/model/metadata-entity.ts | 1 + ui/src/app/metadata/filter/filter.module.ts | 31 +++++-- .../component/entity-item.component.html | 24 ++--- .../manager/container/manager.component.ts | 2 +- ui/src/app/metadata/manager/manager.module.ts | 29 ++++-- ui/src/app/metadata/metadata.component.ts | 6 +- ui/src/app/metadata/metadata.module.ts | 17 ++-- ui/src/app/metadata/metadata.reducer.ts | 27 ------ ui/src/app/metadata/metadata.routing.ts | 90 +++++++++++++++++++ .../app/metadata/provider/provider.module.ts | 25 ++++++ .../resolver/effect/collection.effects.ts | 4 +- .../metadata/resolver/effect/copy.effect.ts | 2 +- .../effect/draft-collection.effects.ts | 2 +- .../metadata/resolver/effect/editor.effect.ts | 2 +- ui/src/app/metadata/resolver/reducer/index.ts | 5 +- .../app/metadata/resolver/resolver.module.ts | 44 ++------- ui/src/app/shared/shared.module.ts | 6 +- 34 files changed, 228 insertions(+), 209 deletions(-) delete mode 100644 ui/src/app/metadata/metadata.reducer.ts create mode 100644 ui/src/app/metadata/metadata.routing.ts diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 0033b2cee..364388566 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -24,27 +24,27 @@
  - Metadata Provider + Metadata Source   - Metadata Source + Metadata Provider
  • - + Dashboard diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 37dd65f78..85dd2dcf9 100644 --- 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 index d3a6ba525..3de190469 100644 --- 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 index 34dee5c1d..09e549f4f 100644 --- 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,9 +1,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 '../../../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'; @@ -11,7 +9,6 @@ import * as stubs from '../../../../../testing/resolver.stub'; describe('Advanced Info Form Component', () => { let fixture: ComponentFixture; let instance: AdvancedInfoFormComponent; - let store: Store; 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 index 39b143a24..e5a1039a5 100644 --- 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 + 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 index af3f07983..6a3925d2f 100644 --- 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,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 { AssertionFormComponent } from './assertion-form.component'; import * as stubs from '../../../../../testing/resolver.stub'; @@ -11,7 +10,6 @@ import * as stubs from '../../../../../testing/resolver.stub'; describe('Assertion Form Component', () => { let fixture: ComponentFixture; let instance: AssertionFormComponent; - let store: Store; 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 index 43cf58244..67882509e 100644 --- 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; let instance: AttributeReleaseFormComponent; - let store: Store; 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 index a9c8b8d8b..3885aebef 100644 --- 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; let instance: TestHostComponent; - let store: Store; 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 index 7be173c01..6487bcfa8 100644 --- 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,9 +3,7 @@ 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'; @@ -13,9 +11,9 @@ import { RouterStub, RouterLinkStubDirective } from '../../../../../testing/rout 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: `` @@ -36,7 +34,6 @@ class TestHostComponent { describe('Finished Form Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let store: Store; 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 index 3a9e08ffa..a271be071 100644 --- 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: `` @@ -37,7 +35,6 @@ class TestHostComponent { describe('Security (Key) Info Form Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let store: Store; 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 index 6ab388e98..33f32fd51 100644 --- 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: `` @@ -34,7 +33,6 @@ class TestHostComponent { describe('Logout Endpoints Form Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let store: Store; 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; diff --git a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts index 14eecd7fd..6c85a9a09 100644 --- a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts +++ b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts @@ -2,17 +2,15 @@ import { ViewChild, Component, Input } 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 { MetadataUiFormComponent } from './metadata-ui-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: `` @@ -33,7 +31,6 @@ class TestHostComponent { describe('Metadata UI Form Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let store: Store; let form: MetadataUiFormComponent; beforeEach(() => { @@ -47,20 +44,15 @@ describe('Metadata UI Form Component', () => { imports: [ NoopAnimationsModule, ReactiveFormsModule, - StoreModule.forRoot({ - 'metadata': combineReducers(fromMetadata.reducers), - }), NgbPopoverModule ], declarations: [ MetadataUiFormComponent, TestHostComponent, - I18nTextComponent, - InputDefaultsDirective + InputDefaultsDirective, + I18nTextComponent ], }); - 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/organization-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts index 784739ea3..98ce05361 100644 --- a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts +++ b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts @@ -7,12 +7,10 @@ import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/p import { ListValuesService } from '../../../domain/service/list-values.service'; import { OrganizationInfoFormComponent } from './organization-info-form.component'; import * as stubs from '../../../../../testing/resolver.stub'; -import * as fromMetadata from '../../../metadata.reducer'; describe('Organization Info Form Component', () => { let fixture: ComponentFixture; let instance: OrganizationInfoFormComponent; - let store: Store; beforeEach(() => { TestBed.configureTestingModule({ @@ -25,17 +23,12 @@ describe('Organization Info Form Component', () => { imports: [ NoopAnimationsModule, ReactiveFormsModule, - StoreModule.forRoot({ - 'metadata': combineReducers(fromMetadata.reducers), - }), NgbPopoverModule ], declarations: [ OrganizationInfoFormComponent ], }); - store = TestBed.get(Store); - spyOn(store, 'dispatch').and.callThrough(); fixture = TestBed.createComponent(OrganizationInfoFormComponent); instance = fixture.componentInstance; diff --git a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts index 66843943e..62017b66b 100644 --- a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts +++ b/ui/src/app/metadata/domain/component/forms/relying-party-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 { RelyingPartyFormComponent } from './relying-party-form.component'; @@ -40,7 +39,6 @@ class TestHostComponent { describe('Relying Party Form Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let store: Store; let form: RelyingPartyFormComponent; let fb: FormBuilder; @@ -55,9 +53,6 @@ describe('Relying Party Form Component', () => { imports: [ NoopAnimationsModule, ReactiveFormsModule, - StoreModule.forRoot({ - 'metadata': combineReducers(fromMetadata.reducers), - }), NgbPopoverModule, SharedModule ], @@ -66,8 +61,6 @@ describe('Relying Party Form Component', () => { TestHostComponent ], }); - store = TestBed.get(Store); - spyOn(store, 'dispatch').and.callThrough(); fixture = TestBed.createComponent(TestHostComponent); fb = TestBed.get(FormBuilder); diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts index f6a29b027..a6f7beaa0 100644 --- a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts +++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts @@ -37,6 +37,10 @@ export class EntityAttributesFilter implements MetadataFilter, MetadataEntity { return false; } + getCreationDate(): Date { + return new Date(this.createdDate); + } + get id(): string { return this.resourceId; } 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 index 4199ee81d..477fa4278 100644 --- 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 @@ -60,6 +60,10 @@ export class FileBackedHttpMetadataProvider implements MetadataProvider, Metadat return false; } + getCreationDate(): Date { + return new Date(this.createdDate); + } + get name(): string { return this.serviceProviderName; } diff --git a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts index 4f9b53495..1322cb5d3 100644 --- a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts +++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts @@ -60,6 +60,10 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat return this.id ? false : true; } + getCreationDate(): Date { + return new Date(this.createdDate); + } + get name(): string { return this.serviceProviderName; } diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts index 07b8b0c21..a3c7328f4 100644 --- a/ui/src/app/metadata/domain/model/metadata-entity.ts +++ b/ui/src/app/metadata/domain/model/metadata-entity.ts @@ -5,6 +5,7 @@ export interface MetadataEntity { getId(): string; isDraft(): boolean; + getCreationDate(): Date; serialize(): any; } diff --git a/ui/src/app/metadata/filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts index dfcc2a95a..22a7ed992 100644 --- a/ui/src/app/metadata/filter/filter.module.ts +++ b/ui/src/app/metadata/filter/filter.module.ts @@ -18,6 +18,7 @@ import { FilterComponent } from './container/filter.component'; import { SearchIdEffects } from './effect/search.effect'; import { FilterExistsGuard } from './guard/filter-exists.guard'; import { DomainModule } from '../domain/domain.module'; +import { ModuleWithProviders } from '@angular/compiler/src/core'; export const routes: Routes = [ @@ -51,9 +52,6 @@ export const routes: Routes = [ SearchDialogComponent ], imports: [ - RouterModule.forChild(routes), - StoreModule.forFeature('filter', reducers), - EffectsModule.forFeature([FilterEffects, SearchIdEffects]), CommonModule, ReactiveFormsModule, ProviderEditorFormModule, @@ -61,10 +59,27 @@ export const routes: Routes = [ NgbModalModule, SharedModule, DomainModule, - HttpClientModule - ], - providers: [ - FilterExistsGuard + HttpClientModule, + RouterModule ] }) -export class FilterModule { } +export class FilterModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootFilterModule, + providers: [ + FilterExistsGuard + ] + }; + } +} + +@NgModule({ + imports: [ + FilterModule, + RouterModule.forChild(routes), + StoreModule.forFeature('filter', reducers), + EffectsModule.forFeature([FilterEffects, SearchIdEffects]), + ], +}) +export class RootFilterModule { } diff --git a/ui/src/app/metadata/manager/component/entity-item.component.html b/ui/src/app/metadata/manager/component/entity-item.component.html index 4b48336ca..1a6423406 100644 --- a/ui/src/app/metadata/manager/component/entity-item.component.html +++ b/ui/src/app/metadata/manager/component/entity-item.component.html @@ -6,23 +6,23 @@   - - + +
    {{ entity.name }} - - Incomplete Form - {{ entity.entityId }} + Incomplete Form + {{ entity.getId() }}
    -
    {{ entity.name }}
    Created Date:
    -
    {{ entity.createdDate | date:'medium' }}
    -
    —
    +
    {{ entity.getCreationDate() | date:'medium' }}
    +
    —
    {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Entity ID:
    -
    {{ entity.entityId }}
    +
    {{ entity.getId() }}
    {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Status:
    -
    +
    Enabled Disabled
    -
    +
    Incomplete Form
    -