| {{ cert.name }} |
{{ cert.type }} |
- Assertion Consumer Service Endpoints
-
-
—
-
+ —
+
| # |
@@ -184,7 +184,7 @@
-
+
| {{ i + 1 }} |
{{ service.locationUrl }} |
{{ service.binding }} |
@@ -199,39 +199,39 @@
8
Relying Party Overrides
-
+
- Sign the Assertion?
- - {{ provider.relyingPartyOverrides.signAssertion ? 'True' : 'False' }}
+ - {{ resolver.relyingPartyOverrides.signAssertion ? 'True' : 'False' }}
- Don't Sign the Response?
- - {{ provider.relyingPartyOverrides.dontSignResponse ? 'True' : 'False' }}
+ - {{ resolver.relyingPartyOverrides.dontSignResponse ? 'True' : 'False' }}
- Turn off Encryption of Response?
- - {{ provider.relyingPartyOverrides.turnOffEncryption ? 'True' : 'False' }}
+ - {{ resolver.relyingPartyOverrides.turnOffEncryption ? 'True' : 'False' }}
- Use SHA1 Signing Algorithm?
- - {{ provider.relyingPartyOverrides.useSha ? 'True' : 'False' }}
+ - {{ resolver.relyingPartyOverrides.useSha ? 'True' : 'False' }}
- NameID Format to Send
-
-
—
-
- Default Authentication Method(s)
-
-
—
-
- -
+
—
+
+ -
{{ method }}
- Ignore any SP-Requested Authentication Method?
- - {{ provider.relyingPartyOverrides.ignoreAuthenticationMethod ? 'True' : 'False' }}
+ - {{ resolver.relyingPartyOverrides.ignoreAuthenticationMethod ? 'True' : 'False' }}
- Omit Not Before Condition?
- - {{ provider.relyingPartyOverrides.omitNotBefore ? 'True' : 'False' }}
+ - {{ resolver.relyingPartyOverrides.omitNotBefore ? 'True' : 'False' }}
- ResponderID
- - {{ provider.relyingPartyOverrides.responderId }}
+ - {{ resolver.relyingPartyOverrides.responderId }}
@@ -239,7 +239,7 @@
9
Attribute Release
-
+
| Attribute Name |
@@ -251,10 +251,10 @@
| {{ attr.label }} |
-
+
|
-
+
|
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 31b16f56e..14eecd7fd 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
@@ -15,7 +15,7 @@ import { FileBackedHttpMetadataResolver } from '../../entity';
import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
@Component({
- template: ``
+ template: ``
})
class TestHostComponent {
resolver = new FileBackedHttpMetadataResolver({
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 1a4591a57..784739ea3 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
@@ -51,8 +51,8 @@ describe('Organization Info Form Component', () => {
instance.resolver = stubs.resolver;
fixture.detectChanges();
instance.ngOnChanges();
- expect(instance.provider.organization).toEqual({});
- expect(instance.provider.contacts).toEqual([]);
+ expect(instance.resolver.organization).toEqual({});
+ expect(instance.resolver.contacts).toEqual([]);
});
});
diff --git a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts
index 2b6d4fbce..6051e4bbb 100644
--- a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts
@@ -14,7 +14,7 @@ import { EntityValidators } from '../../../domain/service/entity-validators.serv
templateUrl: './organization-info-form.component.html'
})
export class OrganizationInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
- @Input() provider: MetadataResolver;
+ @Input() resolver: MetadataResolver;
contactTypes: string[] = [
'support',
@@ -59,12 +59,12 @@ export class OrganizationInfoFormComponent extends ProviderFormFragmentComponent
}
ngOnChanges(): void {
- this.provider.organization = this.provider.organization || {};
- this.provider.contacts = this.provider.contacts || [];
+ this.resolver.organization = this.resolver.organization || {};
+ this.resolver.contacts = this.resolver.contacts || [];
this.form.reset({
- organization: this.provider.organization
+ organization: this.resolver.organization
});
- this.setContacts(this.provider.contacts);
+ this.setContacts(this.resolver.contacts);
}
get contacts(): FormArray {
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 aff842de5..f6a29b027 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
@@ -33,6 +33,10 @@ export class EntityAttributesFilter implements MetadataFilter, MetadataEntity {
return this.entityId;
}
+ isDraft(): boolean {
+ return false;
+ }
+
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 29e97a31a..4199ee81d 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
@@ -56,6 +56,10 @@ export class FileBackedHttpMetadataProvider implements MetadataProvider, Metadat
return this.id;
}
+ isDraft(): boolean {
+ return false;
+ }
+
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 f58d961e6..4f9b53495 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
@@ -53,7 +53,11 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat
}
getId(): string {
- return this.id;
+ return this.id ? this.id : this.entityId;
+ }
+
+ isDraft(): boolean {
+ return this.id ? false : true;
}
get name(): string {
diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts
index 259a2cb99..07b8b0c21 100644
--- a/ui/src/app/metadata/domain/model/metadata-entity.ts
+++ b/ui/src/app/metadata/domain/model/metadata-entity.ts
@@ -4,6 +4,7 @@ export interface MetadataEntity {
kind: string;
getId(): string;
+ isDraft(): boolean;
serialize(): any;
}
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 1efcc4b29..0baba3374 100644
--- a/ui/src/app/metadata/domain/service/provider.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.spec.ts
@@ -4,7 +4,7 @@ import { HttpClientModule, HttpRequest } from '@angular/common/http';
import { MetadataProviderService } from './provider.service';
import { EntityAttributesFilter } from '../entity';
-describe(`Metadata Resolver Service`, () => {
+xdescribe(`Metadata Provider Service`, () => {
beforeEach(() => {
TestBed.configureTestingModule({
diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index 2713dd498..0644e4ab8 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
+import { MetadataFilter } from '../../domain/model';
@Injectable()
export class MetadataProviderService {
diff --git a/ui/src/app/metadata/domain/service/resolver.service.spec.ts b/ui/src/app/metadata/domain/service/resolver.service.spec.ts
index f42c6d705..d4a32cbdc 100644
--- a/ui/src/app/metadata/domain/service/resolver.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/resolver.service.spec.ts
@@ -4,7 +4,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
import { ResolverService } from './resolver.service';
-describe(`EntityDescriptorService`, () => {
+describe(`Resolver Service`, () => {
beforeEach(() => {
TestBed.configureTestingModule({
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index fb26a3a62..2a2267d26 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -171,10 +171,10 @@
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
index 55889cee7..0985f9764 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -137,10 +137,10 @@
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.spec.ts b/ui/src/app/metadata/filter/container/new-filter.component.spec.ts
index dfd998016..e954c1cbf 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.spec.ts
+++ b/ui/src/app/metadata/filter/container/new-filter.component.spec.ts
@@ -25,7 +25,7 @@ describe('New Metadata Filter Page', () => {
],
imports: [
StoreModule.forRoot({
- 'metadata-filter': combineReducers(fromFilter.reducers),
+ 'filter': combineReducers(fromFilter.reducers),
}),
ReactiveFormsModule,
ProviderEditorFormModule,
diff --git a/ui/src/app/metadata/filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts
index a7afa9a4a..dfcc2a95a 100644
--- a/ui/src/app/metadata/filter/filter.module.ts
+++ b/ui/src/app/metadata/filter/filter.module.ts
@@ -52,7 +52,7 @@ export const routes: Routes = [
],
imports: [
RouterModule.forChild(routes),
- StoreModule.forFeature('metadata-filter', reducers),
+ StoreModule.forFeature('filter', reducers),
EffectsModule.forFeature([FilterEffects, SearchIdEffects]),
CommonModule,
ReactiveFormsModule,
diff --git a/ui/src/app/metadata/filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts
index e0252e04a..5ae10da51 100644
--- a/ui/src/app/metadata/filter/reducer/index.ts
+++ b/ui/src/app/metadata/filter/reducer/index.ts
@@ -28,11 +28,16 @@ export const getCollectionFromStateFn = (state: FilterState) => state.collection
export const getFilterState = createFeatureSelector('filter');
export const getFilterFromState = createSelector(getFilterState, getFiltersFromStateFn);
+
export const getSelected = createSelector(getFilterFromState, fromFilter.getSelected);
export const getFilter = createSelector(getFilterFromState, fromFilter.getFilterChanges);
export const getPreview = createSelector(getFilterFromState, fromFilter.getPreview);
export const getSaving = createSelector(getFilterFromState, fromFilter.getSaving);
+/*
+ * Select pieces of Search Collection
+*/
+
export const getSearchFromState = createSelector(getFilterState, getSearchFromStateFn);
export const getEntityCollection = createSelector(getSearchFromState, fromSearch.getEntityIds);
export const getIsLoading = createSelector(getSearchFromState, fromSearch.getLoading);
diff --git a/ui/src/app/metadata/manager/action/search.action.ts b/ui/src/app/metadata/manager/action/search.action.ts
index 09461388e..457a9c371 100644
--- a/ui/src/app/metadata/manager/action/search.action.ts
+++ b/ui/src/app/metadata/manager/action/search.action.ts
@@ -1,6 +1,5 @@
import { Action } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
+import { MetadataEntity } from '../../domain/model';
export const ENTITY_SEARCH = '[Metadata Entity Search] Entity Search';
export const ENTITY_FILTER = '[Metadata Entity Filter] Entity Filter';
@@ -24,7 +23,7 @@ export class FilterAction implements Action {
export class SearchCompleteAction implements Action {
readonly type = ENTITY_SEARCH_COMPLETE;
- constructor(public payload: Array) { }
+ constructor(public payload: Array) { }
}
export type Actions =
diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html
index 02f379165..ed6ad0160 100644
--- a/ui/src/app/metadata/manager/container/manager.component.html
+++ b/ui/src/app/metadata/manager/container/manager.component.html
@@ -47,11 +47,11 @@
-
+ (delete)="deleteResolver(entity)">
diff --git a/ui/src/app/metadata/manager/container/manager.component.spec.ts b/ui/src/app/metadata/manager/container/manager.component.spec.ts
index 8c6bca4ed..1bb6488cb 100644
--- a/ui/src/app/metadata/manager/container/manager.component.spec.ts
+++ b/ui/src/app/metadata/manager/container/manager.component.spec.ts
@@ -26,7 +26,7 @@ describe('Metadata Manager Page', () => {
entityId: 'foo',
serviceProviderName: 'bar'
}),
- provider = new FileBackedHttpMetadataResolver({
+ resolver = new FileBackedHttpMetadataResolver({
entityId: 'foo',
serviceProviderName: 'foo',
id: '1'
@@ -70,7 +70,7 @@ describe('Metadata Manager Page', () => {
expect(fixture).toBeDefined();
});
- xdescribe('getPagedProviders method', () => {});
+ xdescribe('getPagedResolvers method', () => {});
describe('changePage method', () => {
it('should update the page value', () => {
@@ -79,24 +79,24 @@ describe('Metadata Manager Page', () => {
expect(instance.page).toBe(page);
});
- it('should update the paged providers list', () => {
+ it('should update the paged resolvers list', () => {
let page = 2;
- spyOn(instance, 'getPagedProviders');
+ spyOn(instance, 'getPagedResolvers');
instance.changePage(page);
- expect(instance.getPagedProviders).toHaveBeenCalled();
+ expect(instance.getPagedResolvers).toHaveBeenCalled();
});
});
- describe('toggleProvider method', () => {
+ describe('toggleResolver method', () => {
it('should fire a redux action', () => {
- instance.toggleProvider(draft);
+ instance.toggleEntity(draft);
expect(store.dispatch).toHaveBeenCalled();
});
});
describe('openPreviewDialog method', () => {
it('should fire a redux action', () => {
- instance.openPreviewDialog(provider);
+ instance.openPreviewDialog(resolver);
expect(store.dispatch).toHaveBeenCalled();
});
});
@@ -115,24 +115,24 @@ describe('Metadata Manager Page', () => {
describe('edit method', () => {
it('should route to the edit page', () => {
spyOn(router, 'navigate');
- instance.edit(provider);
- expect(router.navigate).toHaveBeenCalledWith(['provider', provider.id, 'edit']);
+ instance.edit(resolver);
+ expect(router.navigate).toHaveBeenCalledWith(['resolver', resolver.id, 'edit']);
});
it('should route to the wizard page', () => {
spyOn(router, 'navigate');
instance.edit(draft);
- expect(router.navigate).toHaveBeenCalledWith(['provider', draft.entityId, 'wizard']);
+ expect(router.navigate).toHaveBeenCalledWith(['resolver', draft.entityId, 'wizard']);
});
});
- describe('deleteProvider method', () => {
+ describe('deleteResolver method', () => {
it('should call the modal service', () => {
spyOn(modal, 'open').and.callFake(() => {
return {
result: Promise.resolve(true)
};
});
- instance.deleteProvider(provider);
+ instance.deleteResolver(resolver);
expect(modal.open).toHaveBeenCalled();
});
it('should log an error to the console on failure', () => {
@@ -141,7 +141,7 @@ describe('Metadata Manager Page', () => {
result: Promise.reject(false)
};
});
- instance.deleteProvider(provider);
+ instance.deleteResolver(resolver);
expect(modal.open).toHaveBeenCalled();
});
});
diff --git a/ui/src/app/metadata/manager/container/manager.component.ts b/ui/src/app/metadata/manager/container/manager.component.ts
index de1cfdf77..73f098a26 100644
--- a/ui/src/app/metadata/manager/container/manager.component.ts
+++ b/ui/src/app/metadata/manager/container/manager.component.ts
@@ -22,13 +22,13 @@ import { RemoveDraftRequest } from '../../resolver/action/draft.action';
})
export class ManagerComponent implements OnInit {
searchQuery$: Observable;
- providers$: Observable;
+ resolvers$: Observable;
loading$: Observable;
total$: Observable;
page = 1;
limit = 8;
- limited$: Observable;
+ limited$: Observable;
entitiesOpen$: Observable<{[key: string]: boolean}>;
@@ -41,16 +41,16 @@ export class ManagerComponent implements OnInit {
private router: Router,
private modalService: NgbModal
) {
- this.providers$ = store.select(fromDashboard.getSearchResults);
+ this.resolvers$ = store.select(fromDashboard.getSearchResults);
this.searchQuery$ = store.select(fromDashboard.getSearchQuery);
this.loading$ = store.select(fromDashboard.getSearchLoading);
this.entitiesOpen$ = store.select(fromDashboard.getOpenProviders);
this.filtering$ = store.select(fromDashboard.getFilterType);
this.filtering$.subscribe(f => this.filtering = f);
- this.total$ = this.providers$.pipe(map(list => list.length));
+ this.total$ = this.resolvers$.pipe(map(list => list.length));
- this.limited$ = this.getPagedProviders(this.page, this.providers$);
+ this.limited$ = this.getPagedResolvers(this.page, this.resolvers$);
// this.providers$.subscribe(p => console.log(p));
}
@@ -60,12 +60,12 @@ export class ManagerComponent implements OnInit {
this.changeFilter('all');
}
- getPagedProviders(page: number, list$: Observable): Observable {
+ getPagedResolvers(page: number, list$: Observable): Observable {
return list$.pipe(
- map((providers: Metadata[]) => {
+ map((providers: MetadataEntity[]) => {
let maxIndex = (page * this.limit) - 1,
minIndex = ((page - 1) * this.limit);
- return providers.filter((provider: Metadata, index: number) => (maxIndex >= index && index >= minIndex) );
+ return providers.filter((resolver: MetadataEntity, index: number) => (maxIndex >= index && index >= minIndex) );
})
);
}
@@ -76,7 +76,7 @@ export class ManagerComponent implements OnInit {
changePage(index: number): void {
this.page = index;
- this.limited$ = this.getPagedProviders(index, this.providers$);
+ this.limited$ = this.getPagedResolvers(index, this.resolvers$);
}
search(query: string = ''): void {
@@ -85,10 +85,10 @@ export class ManagerComponent implements OnInit {
}
edit(entity: MetadataEntity): void {
- this.router.navigate(['resolver', entity.getId(), entity.getId() ? 'edit' : 'wizard']);
+ this.router.navigate(['resolver', entity.getId(), entity.isDraft() ? 'wizard' : 'edit']);
}
- toggleProvider(entity: MetadataEntity): void {
+ toggleEntity(entity: MetadataEntity): void {
this.store.dispatch(new ToggleEntityDisplay(entity.getId()));
}
@@ -96,7 +96,7 @@ export class ManagerComponent implements OnInit {
this.store.dispatch(new PreviewEntity(entity));
}
- deleteProvider(entity: MetadataResolver): void {
+ deleteResolver(entity: MetadataResolver): void {
this.modalService
.open(DeleteDialogComponent)
.result
diff --git a/ui/src/app/metadata/manager/reducer/index.ts b/ui/src/app/metadata/manager/reducer/index.ts
index ce597a06b..d35d2b66e 100644
--- a/ui/src/app/metadata/manager/reducer/index.ts
+++ b/ui/src/app/metadata/manager/reducer/index.ts
@@ -19,7 +19,7 @@ export const reducers = {
export const getFeatureState = createFeatureSelector('manager');
export const getDashboardState = createSelector(getFeatureState, (state: DashboardState) => state.manager);
-export const getOpenProviders = createSelector(getDashboardState, (manager: fromDashboard.State) => manager.providersOpen);
+export const getOpenProviders = createSelector(getDashboardState, (manager: fromDashboard.State) => manager.resolversOpen);
export const getSearchState = createSelector(getFeatureState,
(state: DashboardState) => state.search
diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
index b31f3c4f7..f10a14115 100644
--- a/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
+++ b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
@@ -4,7 +4,7 @@ import { ToggleEntityDisplay } from '../action/manager.action';
describe('Dashboard Reducer', () => {
const initialState: fromDashboard.State = {
- providersOpen: {}
+ resolversOpen: {}
};
describe('undefined action', () => {
diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.ts
index 2cd0e6926..09d427776 100644
--- a/ui/src/app/metadata/manager/reducer/manager.reducer.ts
+++ b/ui/src/app/metadata/manager/reducer/manager.reducer.ts
@@ -1,11 +1,11 @@
import * as manager from '../action/manager.action';
export interface State {
- providersOpen: {[key: string]: boolean};
+ resolversOpen: {[key: string]: boolean};
}
export const initialState: State = {
- providersOpen: {}
+ resolversOpen: {}
};
export function reducer(state = initialState, action: manager.Actions): State {
@@ -13,8 +13,8 @@ export function reducer(state = initialState, action: manager.Actions): State {
case manager.TOGGLE_ENTITY_DISPLAY: {
return Object.assign({}, state, {
providersOpen: {
- ...state.providersOpen,
- ...{[action.payload]: !state.providersOpen[action.payload]}
+ ...state.resolversOpen,
+ ...{[action.payload]: !state.resolversOpen[action.payload]}
}
});
}
@@ -25,4 +25,4 @@ export function reducer(state = initialState, action: manager.Actions): State {
}
}
-export const providersOpen = (state: State) => state.providersOpen;
+export const resolversOpen = (state: State) => state.resolversOpen;
diff --git a/ui/src/app/metadata/manager/reducer/search.reducer.ts b/ui/src/app/metadata/manager/reducer/search.reducer.ts
index e002cd75d..2ab931fc0 100644
--- a/ui/src/app/metadata/manager/reducer/search.reducer.ts
+++ b/ui/src/app/metadata/manager/reducer/search.reducer.ts
@@ -1,9 +1,8 @@
import * as searchActions from '../action/search.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
+import { MetadataEntity } from '../../domain/model';
export interface SearchState {
- entities: (MetadataProvider | MetadataFilter)[];
+ entities: MetadataEntity[];
loading: boolean;
query: string;
kind: string;
@@ -55,4 +54,4 @@ export const getQuery = (state: SearchState) => state.query;
export const getLoading = (state: SearchState) => state.loading;
-export const getFilter = (state: SearchState) => state.kind;
\ No newline at end of file
+export const getFilter = (state: SearchState) => state.kind;
diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
index 86084e2b2..9d94ea088 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
@@ -7,6 +7,8 @@ import { WizardNavComponent } from './wizard-nav.component';
import * as fromEditor from '../reducer';
import { ProviderEditorFormModule } from '../../domain/component';
import { DomainModule } from '../../domain/domain.module';
+import { InputDefaultsDirective } from '../../../shared/directive/input-defaults.directive';
+import { SharedModule } from '../../../shared/shared.module';
@Component({
template:
@@ -49,6 +51,7 @@ describe('Wizard Nav Component', () => {
}),
ReactiveFormsModule,
DomainModule,
+ SharedModule,
ProviderEditorFormModule
],
declarations: [TestHostComponent, WizardNavComponent],
diff --git a/ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts
index 30f6747ec..ff012f877 100644
--- a/ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts
@@ -2,10 +2,8 @@ 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 { NewResolverComponent } from './new-resolver.component';
import * as fromResolver from '../reducer';
import { BlankResolverComponent } from './blank-resolver.component';
-import { UploadResolverComponent } from './upload-resolver.component';
describe('Blank Resolver Page', () => {
let fixture: ComponentFixture;
@@ -17,7 +15,7 @@ describe('Blank Resolver Page', () => {
imports: [
NoopAnimationsModule,
StoreModule.forRoot({
- collections: combineReducers(fromResolver.reducers),
+ resolver: combineReducers(fromResolver.reducers),
}),
ReactiveFormsModule,
],
diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
index 18d819a03..e85cfbe0f 100644
--- a/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
@@ -3,8 +3,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 * as fromCollections from '../reducer';
-import * as fromProvider from '../reducer';
+import * as fromResolver from '../reducer';
import { CopyResolverComponent } from './copy-resolver.component';
import { SharedModule } from '../../../shared/shared.module';
import { NavigatorService } from '../../../core/service/navigator.service';
@@ -23,7 +22,7 @@ class TestHostComponent {
describe('Copy Resolver Page', () => {
let fixture: ComponentFixture;
- let store: Store;
+ let store: Store;
let instance: CopyResolverComponent;
beforeEach(() => {
@@ -31,8 +30,7 @@ describe('Copy Resolver Page', () => {
imports: [
NoopAnimationsModule,
StoreModule.forRoot({
- collections: combineReducers(fromCollections.reducers),
- resolver: combineReducers(fromProvider.reducers)
+ resolver: combineReducers(fromResolver.reducers)
}),
ReactiveFormsModule,
SharedModule
diff --git a/ui/src/app/metadata/resolver/reducer/index.ts b/ui/src/app/metadata/resolver/reducer/index.ts
index 88ff05064..b4ad07444 100644
--- a/ui/src/app/metadata/resolver/reducer/index.ts
+++ b/ui/src/app/metadata/resolver/reducer/index.ts
@@ -19,7 +19,9 @@ export interface ResolverState {
export const reducers = {
copy: fromCopy.reducer,
search: fromSearch.reducer,
- editor: fromEditor.reducer
+ editor: fromEditor.reducer,
+ collection: fromCollection.reducer,
+ draft: fromDraft.reducer
};
export interface State extends fromRoot.State {
@@ -30,7 +32,10 @@ export const getResolverState = createFeatureSelector('resolver')
export const getCollectionStateFn = (state: ResolverState) => state.collection;
export const getDraftStateFn = (state: ResolverState) => state.draft;
-export const getEditorStateFn = (state: ResolverState) => state.editor;
+export const getEditorStateFn = (state: ResolverState) => {
+ console.log('RESOLVER STATE', JSON.stringify(state));
+ return state.editor;
+};
export const getCopyStateFn = (state: ResolverState) => state.copy;
export const getSearchStateFn = (state: ResolverState) => state.search;
diff --git a/ui/src/app/metadata/resolver/resolver.module.ts b/ui/src/app/metadata/resolver/resolver.module.ts
index 7ff010f03..c2a405e2b 100644
--- a/ui/src/app/metadata/resolver/resolver.module.ts
+++ b/ui/src/app/metadata/resolver/resolver.module.ts
@@ -15,7 +15,7 @@ import { CopyResolverComponent } from './container/copy-resolver.component';
import { ResolverComponent } from './container/resolver.component';
import { SharedModule } from '../../shared/shared.module';
import { SearchIdEffects } from './effect/search.effect';
-import * as fromProvider from './reducer';
+import * as fromResolver from './reducer';
import { ConfirmCopyComponent } from './container/confirm-copy.component';
import { CopyIsSetGuard } from './guard/copy-isset.guard';
import { CopyResolverEffects } from './effect/copy.effect';
@@ -23,6 +23,11 @@ import { DomainModule } from '../domain/domain.module';
import { DraftComponent } from './container/draft.component';
import { EditorComponent } from './container/editor.component';
import { WizardComponent } from './container/wizard.component';
+import { WizardNavComponent } from './component/wizard-nav.component';
+import { ResolverCollectionEffects } from './effect/collection.effects';
+import { DraftCollectionEffects } from './effect/draft-collection.effects';
+import { WizardEffects } from './effect/wizard.effect';
+import { EditorEffects } from './effect/editor.effect';
@NgModule({
declarations: [
@@ -34,7 +39,8 @@ import { WizardComponent } from './container/wizard.component';
ResolverComponent,
DraftComponent,
EditorComponent,
- WizardComponent
+ WizardComponent,
+ WizardNavComponent
],
entryComponents: [],
imports: [
@@ -48,7 +54,8 @@ import { WizardComponent } from './container/wizard.component';
ProviderEditorFormModule
],
exports: [
- ProviderEditorFormModule
+ ProviderEditorFormModule,
+ WizardNavComponent
],
providers: []
})
@@ -102,10 +109,14 @@ export const routes: Routes = [
imports: [
ResolverModule,
RouterModule.forChild(routes),
- StoreModule.forFeature('provider', fromProvider.reducers),
+ StoreModule.forFeature('resolver', fromResolver.reducers),
EffectsModule.forFeature([
SearchIdEffects,
- CopyResolverEffects
+ CopyResolverEffects,
+ ResolverCollectionEffects,
+ DraftCollectionEffects,
+ WizardEffects,
+ EditorEffects
])
],
})
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index d6a0436aa..26000b829 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -4,6 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HighlightPipe } from './pipe/highlight.pipe';
import { AutoCompleteComponent } from './autocomplete/autocomplete.component';
import { ValidationClassDirective } from './validation/validation-class.directive';
+import { InputDefaultsDirective } from './directive/input-defaults.directive';
@NgModule({
imports: [
@@ -14,14 +15,16 @@ import { ValidationClassDirective } from './validation/validation-class.directiv
declarations: [
HighlightPipe,
AutoCompleteComponent,
- ValidationClassDirective
+ ValidationClassDirective,
+ InputDefaultsDirective
],
exports: [
HighlightPipe,
AutoCompleteComponent,
CommonModule,
ReactiveFormsModule,
- FormsModule
+ FormsModule,
+ InputDefaultsDirective
]
})
export class SharedModule { }
|