From 1b6b86c5162d3f9b08fa5100c55b7f43abcb718c Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 13 Jun 2018 12:48:23 -0700 Subject: [PATCH] SHIBUI-598 Reorganizing code --- ui/src/app/app.component.html | 22 +++--- ui/src/app/dashboard/action/search.action.ts | 2 +- .../component/entity-item.component.spec.ts | 2 +- .../container/dashboard.component.spec.ts | 6 +- .../container/dashboard.component.ts | 2 +- ui/src/app/dashboard/effect/search.effects.ts | 4 +- .../reducer/dashboard.reducer.spec.ts | 2 +- ui/src/app/domain/domain.type.ts | 14 ---- ui/src/app/domain/model/metadata-base.ts | 20 ------ ui/src/app/domain/model/metadata-provider.ts | 36 ---------- .../container/provider.component.spec.ts | 2 +- .../reducer/editor.reducer.spec.ts | 2 +- .../metadata-provider/action/copy.action.ts | 16 ++--- .../metadata-provider/action/search.action.ts | 6 +- .../descriptor-info-form.component.spec.ts | 4 +- .../forms/finish-form.component.spec.ts | 4 +- .../forms/key-info-form.component.spec.ts | 4 +- .../forms/logout-form.component.spec.ts | 6 +- .../forms/metadata-ui-form.component.spec.ts | 4 +- .../provider-form-fragment.component.spec.ts | 2 +- .../relying-party-form.component.spec.ts | 4 +- .../blank-provider.component.spec.ts | 2 +- .../container/blank-provider.component.ts | 4 +- .../container/copy-provider.component.spec.ts | 2 +- .../container/copy-provider.component.ts | 2 +- .../container/new-provider.component.spec.ts | 2 +- .../upload-provider.component.spec.ts | 2 +- .../metadata-provider/effect/copy.effect.ts | 4 +- .../reducer/copy.reducer.spec.ts | 16 ++--- .../reducer/search.reducer.spec.ts | 2 +- .../domain/action/draft-collection.action.ts | 2 +- .../domain/action/entity.action.ts | 0 .../domain/action/filter-collection.action.ts | 0 .../action/provider-collection.action.ts | 42 +++++------ .../domain/component/i18n-text.component.html | 0 .../domain/component/i18n-text.component.ts | 0 .../{ => metadata}/domain/domain.module.ts | 0 ui/src/app/metadata/domain/domain.type.ts | 16 +++++ .../effect/draft-collection.effect.spec.ts | 16 ++--- .../domain/effect/draft-collection.effects.ts | 2 +- .../domain/effect/entity.effect.spec.ts | 0 .../domain/effect/entity.effect.ts | 0 .../effect/filter-collection.effect.spec.ts | 0 .../domain/effect/filter-collection.effect.ts | 0 .../effect/provider-collection.effect.spec.ts | 20 +++--- .../effect/provider-collection.effects.ts | 8 +-- .../domain/guard/filter-exists.guard.ts | 0 .../domain/model/filter.entity.ts} | 11 +-- ui/src/app/metadata/domain/model/index.ts | 19 +++++ .../metadata/domain/model/metadata-base.ts | 6 ++ .../metadata/domain/model/metadata-entity.ts | 7 ++ .../domain/model/metadata-filter.ts | 10 +-- .../domain/model/metadata-provider.ts | 25 +++++++ .../domain/model/metadata-resolver.ts | 26 +++++++ .../domain/model/properties}/certificate.ts | 2 +- .../domain/model/properties}/contact.ts | 2 +- .../domain/model/properties}/filter-target.ts | 0 .../model/properties}/logout-endpoint.ts | 2 +- .../domain/model/properties}/mdui.ts | 0 .../domain/model/properties}/organization.ts | 0 .../properties}/relying-party-overrides.ts | 0 .../domain/model/properties}/security-info.ts | 0 .../model/properties}/sso-descriptor.ts | 0 .../domain/model/properties}/sso-service.ts | 0 .../domain/model/provider.entity.spec.ts} | 7 +- .../domain/model/provider.entity.ts} | 9 +-- .../metadata/domain/model/resolver.entity.ts | 70 +++++++++++++++++++ .../reducer/draft-collection.reducer.spec.ts | 8 +-- .../reducer/draft-collection.reducer.ts | 2 +- .../reducer/filter-collection.reducer.spec.ts | 0 .../reducer/filter-collection.reducer.ts | 0 .../{ => metadata}/domain/reducer/index.ts | 4 +- .../provider-collection.reducer.spec.ts | 12 ++-- .../reducer/provider-collection.reducer.ts | 2 +- .../service/entity-descriptor.service.spec.ts | 0 .../service/entity-descriptor.service.ts | 2 +- .../service/entity-draft.service.spec.ts | 6 +- .../domain/service/entity-draft.service.ts | 2 +- .../domain/service/entity-id.service.spec.ts | 0 .../domain/service/entity-id.service.ts | 0 .../service/entity-validators.service.spec.ts | 0 .../service/entity-validators.service.ts | 0 .../service/list-values.service.spec.ts | 0 .../domain/service/list-values.service.ts | 0 .../service/metadata-resolver.service.spec.ts | 0 .../service/metadata-resolver.service.ts | 0 .../provider-change-emitter.service.spec.ts | 2 +- .../provider-change-emitter.service.ts | 0 .../filter}/action/filter.action.spec.ts | 0 .../filter}/action/filter.action.ts | 0 .../filter}/action/search.action.spec.ts | 0 .../filter}/action/search.action.ts | 0 .../component/search-dialog.component.html | 0 .../component/search-dialog.component.scss | 0 .../component/search-dialog.component.spec.ts | 0 .../component/search-dialog.component.ts | 0 .../container/edit-filter.component.html | 0 .../container/edit-filter.component.spec.ts | 0 .../container/edit-filter.component.ts | 0 .../filter}/container/filter.component.html | 0 .../filter}/container/filter.component.scss | 0 .../container/filter.component.spec.ts | 0 .../filter}/container/filter.component.ts | 0 .../container/new-filter.component.html | 0 .../container/new-filter.component.spec.ts | 0 .../filter}/container/new-filter.component.ts | 0 .../filter}/effect/filter.effect.ts | 0 .../filter}/effect/search.effect.ts | 2 +- .../filter}/filter.module.ts | 0 .../filter}/reducer/filter.reducer.spec.ts | 0 .../filter}/reducer/filter.reducer.ts | 0 .../filter}/reducer/index.ts | 0 .../filter}/reducer/search.reducer.spec.ts | 0 .../filter}/reducer/search.reducer.ts | 0 ui/src/app/metadata/metadata.module.ts | 0 .../app/metadata/provider/provider.module.ts | 0 .../app/metadata/resolver/resolver.module.ts | 0 117 files changed, 319 insertions(+), 225 deletions(-) delete mode 100644 ui/src/app/domain/domain.type.ts delete mode 100644 ui/src/app/domain/model/metadata-base.ts delete mode 100644 ui/src/app/domain/model/metadata-provider.ts rename ui/src/app/{ => metadata}/domain/action/draft-collection.action.ts (98%) rename ui/src/app/{ => metadata}/domain/action/entity.action.ts (100%) rename ui/src/app/{ => metadata}/domain/action/filter-collection.action.ts (100%) rename ui/src/app/{ => metadata}/domain/action/provider-collection.action.ts (74%) rename ui/src/app/{ => metadata}/domain/component/i18n-text.component.html (100%) rename ui/src/app/{ => metadata}/domain/component/i18n-text.component.ts (100%) rename ui/src/app/{ => metadata}/domain/domain.module.ts (100%) create mode 100644 ui/src/app/metadata/domain/domain.type.ts rename ui/src/app/{ => metadata}/domain/effect/draft-collection.effect.spec.ts (73%) rename ui/src/app/{ => metadata}/domain/effect/draft-collection.effects.ts (98%) rename ui/src/app/{ => metadata}/domain/effect/entity.effect.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/effect/entity.effect.ts (100%) rename ui/src/app/{ => metadata}/domain/effect/filter-collection.effect.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/effect/filter-collection.effect.ts (100%) rename ui/src/app/{ => metadata}/domain/effect/provider-collection.effect.spec.ts (64%) rename ui/src/app/{ => metadata}/domain/effect/provider-collection.effects.ts (94%) rename ui/src/app/{ => metadata}/domain/guard/filter-exists.guard.ts (100%) rename ui/src/app/{domain/entity/filter.ts => metadata/domain/model/filter.entity.ts} (79%) create mode 100644 ui/src/app/metadata/domain/model/index.ts create mode 100644 ui/src/app/metadata/domain/model/metadata-base.ts create mode 100644 ui/src/app/metadata/domain/model/metadata-entity.ts rename ui/src/app/{ => metadata}/domain/model/metadata-filter.ts (56%) create mode 100644 ui/src/app/metadata/domain/model/metadata-provider.ts create mode 100644 ui/src/app/metadata/domain/model/metadata-resolver.ts rename ui/src/app/{domain/model => metadata/domain/model/properties}/certificate.ts (97%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/contact.ts (97%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/filter-target.ts (100%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/logout-endpoint.ts (97%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/mdui.ts (100%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/organization.ts (100%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/relying-party-overrides.ts (100%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/security-info.ts (100%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/sso-descriptor.ts (100%) rename ui/src/app/{domain/model => metadata/domain/model/properties}/sso-service.ts (100%) rename ui/src/app/{domain/entity/provider.spec.ts => metadata/domain/model/provider.entity.spec.ts} (92%) rename ui/src/app/{domain/entity/provider.ts => metadata/domain/model/provider.entity.ts} (87%) create mode 100644 ui/src/app/metadata/domain/model/resolver.entity.ts rename ui/src/app/{ => metadata}/domain/reducer/draft-collection.reducer.spec.ts (96%) rename ui/src/app/{ => metadata}/domain/reducer/draft-collection.reducer.ts (96%) rename ui/src/app/{ => metadata}/domain/reducer/filter-collection.reducer.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/reducer/filter-collection.reducer.ts (100%) rename ui/src/app/{ => metadata}/domain/reducer/index.ts (97%) rename ui/src/app/{ => metadata}/domain/reducer/provider-collection.reducer.spec.ts (93%) rename ui/src/app/{ => metadata}/domain/reducer/provider-collection.reducer.ts (96%) rename ui/src/app/{ => metadata}/domain/service/entity-descriptor.service.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/service/entity-descriptor.service.ts (97%) rename ui/src/app/{ => metadata}/domain/service/entity-draft.service.spec.ts (90%) rename ui/src/app/{ => metadata}/domain/service/entity-draft.service.ts (95%) rename ui/src/app/{ => metadata}/domain/service/entity-id.service.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/service/entity-id.service.ts (100%) rename ui/src/app/{ => metadata}/domain/service/entity-validators.service.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/service/entity-validators.service.ts (100%) rename ui/src/app/{ => metadata}/domain/service/list-values.service.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/service/list-values.service.ts (100%) rename ui/src/app/{ => metadata}/domain/service/metadata-resolver.service.spec.ts (100%) rename ui/src/app/{ => metadata}/domain/service/metadata-resolver.service.ts (100%) rename ui/src/app/{ => metadata}/domain/service/provider-change-emitter.service.spec.ts (96%) rename ui/src/app/{ => metadata}/domain/service/provider-change-emitter.service.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/action/filter.action.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/action/filter.action.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/action/search.action.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/action/search.action.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/component/search-dialog.component.html (100%) rename ui/src/app/{metadata-filter => metadata/filter}/component/search-dialog.component.scss (100%) rename ui/src/app/{metadata-filter => metadata/filter}/component/search-dialog.component.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/component/search-dialog.component.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/edit-filter.component.html (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/edit-filter.component.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/edit-filter.component.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/filter.component.html (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/filter.component.scss (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/filter.component.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/filter.component.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/new-filter.component.html (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/new-filter.component.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/container/new-filter.component.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/effect/filter.effect.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/effect/search.effect.ts (96%) rename ui/src/app/{metadata-filter => metadata/filter}/filter.module.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/reducer/filter.reducer.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/reducer/filter.reducer.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/reducer/index.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/reducer/search.reducer.spec.ts (100%) rename ui/src/app/{metadata-filter => metadata/filter}/reducer/search.reducer.ts (100%) create mode 100644 ui/src/app/metadata/metadata.module.ts create mode 100644 ui/src/app/metadata/provider/provider.module.ts create mode 100644 ui/src/app/metadata/resolver/resolver.module.ts diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 7ee5acda8..0033b2cee 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -4,7 +4,7 @@ Shibboleth Logo - Click to be directed to www.shibboleth.net Shibboleth - Metadata Source Management + Source Management
- +   - Filter + Metadata Provider - +   - Metadata Source + Metadata Source
  • - + - Manage Sources + Dashboard
  • diff --git a/ui/src/app/dashboard/action/search.action.ts b/ui/src/app/dashboard/action/search.action.ts index 11df79fc4..09461388e 100644 --- a/ui/src/app/dashboard/action/search.action.ts +++ b/ui/src/app/dashboard/action/search.action.ts @@ -7,7 +7,7 @@ export const ENTITY_FILTER = '[Metadata Entity Filter] Entity Filter'; export const ENTITY_SEARCH_COMPLETE = '[Metadata Entity Search] Entity Search COMPLETE'; /** - * Add Provider to Collection Actions + * Add Resolver to Collection Actions */ export class SearchAction implements Action { readonly type = ENTITY_SEARCH; diff --git a/ui/src/app/dashboard/component/entity-item.component.spec.ts b/ui/src/app/dashboard/component/entity-item.component.spec.ts index 4a1f3e4d9..66c43dd65 100644 --- a/ui/src/app/dashboard/component/entity-item.component.spec.ts +++ b/ui/src/app/dashboard/component/entity-item.component.spec.ts @@ -3,7 +3,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { EntityItemComponent } from './entity-item.component'; import { MetadataProvider } from '../../domain/model/metadata-provider'; -describe('Provider List item', () => { +describe('Resolver List item', () => { let fixture: ComponentFixture; let instance: EntityItemComponent; diff --git a/ui/src/app/dashboard/container/dashboard.component.spec.ts b/ui/src/app/dashboard/container/dashboard.component.spec.ts index 1c6a064bc..faa8342c9 100644 --- a/ui/src/app/dashboard/container/dashboard.component.spec.ts +++ b/ui/src/app/dashboard/container/dashboard.component.spec.ts @@ -13,7 +13,7 @@ import { DeleteDialogComponent } from '../component/delete-dialog.component'; import { RouterStub } from '../../../testing/router.stub'; import { NgbModalStub } from '../../../testing/modal.stub'; import { MetadataProvider } from '../../domain/model/metadata-provider'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; describe('Dashboard Page', () => { @@ -23,11 +23,11 @@ describe('Dashboard Page', () => { let modal: NgbModal; let instance: DashboardComponent; - let draft = new Provider({ + let draft = new Resolver({ entityId: 'foo', serviceProviderName: 'bar' }), - provider = new Provider({ + provider = new Resolver({ ...draft, id: '1' }); diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts index 434ab7206..95d8a7537 100644 --- a/ui/src/app/dashboard/container/dashboard.component.ts +++ b/ui/src/app/dashboard/container/dashboard.component.ts @@ -7,7 +7,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { MetadataEntity, MetadataProvider, DomainTypes } from '../../domain/domain.type'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; import * as searchActions from '../action/search.action'; import * as providerActions from '../../domain/action/provider-collection.action'; import * as draftActions from '../../domain/action/draft-collection.action'; diff --git a/ui/src/app/dashboard/effect/search.effects.ts b/ui/src/app/dashboard/effect/search.effects.ts index 809ef523b..be844554e 100644 --- a/ui/src/app/dashboard/effect/search.effects.ts +++ b/ui/src/app/dashboard/effect/search.effects.ts @@ -9,7 +9,7 @@ import * as fromCollections from '../../domain/reducer'; import * as fromDashboard from '../reducer'; import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; import { Filter } from '../../domain/entity/filter'; import { MetadataEntity, DomainTypes, MetadataFilter } from '../../domain/domain.type'; @@ -45,7 +45,7 @@ export class SearchEffects { (o: any[], p: MetadataProvider[], f: MetadataFilter[]): Array => { return o.concat( f.map(filter => new Filter(filter)), - p.map(provider => new Provider(provider)) + p.map(provider => new Resolver(provider)) ); } ), diff --git a/ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts b/ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts index 93662e652..969671c65 100644 --- a/ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts +++ b/ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts @@ -15,7 +15,7 @@ describe('Dashboard Reducer', () => { }); }); - describe('Toggle Provider Display', () => { + describe('Toggle Resolver Display', () => { it('should toggle the selected providers open state', () => { const id = 'foo'; const action = new ToggleEntityDisplay(id); diff --git a/ui/src/app/domain/domain.type.ts b/ui/src/app/domain/domain.type.ts deleted file mode 100644 index 3b6a9c489..000000000 --- a/ui/src/app/domain/domain.type.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { MetadataFilter } from './model/metadata-filter'; -import { MetadataProvider } from './model/metadata-provider'; - -export * from './model/metadata-provider'; -export * from './model/metadata-filter'; - -export enum DomainTypes { - filter = 'filter', - provider = 'provider' -} - -export type MetadataEntity = - | MetadataFilter - | MetadataProvider; diff --git a/ui/src/app/domain/model/metadata-base.ts b/ui/src/app/domain/model/metadata-base.ts deleted file mode 100644 index 6a523f16a..000000000 --- a/ui/src/app/domain/model/metadata-base.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Organization } from './organization'; -import { MDUI } from './mdui'; -import { Contact } from './contact'; -import { SecurityInfo } from './security-info'; -import { SsoService, LogoutEndpoint } from '../../domain/model/metadata-provider'; -import { IdpSsoDescriptor } from './sso-descriptor'; -import { RelyingPartyOverrides } from './relying-party-overrides'; - -export interface MetadataBase { - id?: string; - createdDate?: string; - modifiedDate?: string; - version: string; - - name: string; - enabled: boolean; - type: string; - - serialize(): any; -} diff --git a/ui/src/app/domain/model/metadata-provider.ts b/ui/src/app/domain/model/metadata-provider.ts deleted file mode 100644 index c01b9ce3a..000000000 --- a/ui/src/app/domain/model/metadata-provider.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Organization } from './organization'; -import { MDUI } from './mdui'; -import { Contact } from './contact'; -import { SecurityInfo } from './security-info'; -import { SsoService } from './sso-service'; -import { LogoutEndpoint } from './logout-endpoint'; -import { IdpSsoDescriptor } from './sso-descriptor'; -import { RelyingPartyOverrides } from './relying-party-overrides'; -import { Certificate } from './certificate'; - -import { MetadataBase } from './metadata-base'; - -export interface MetadataProvider extends MetadataBase { - entityId: string; - serviceProviderName: string; - organization?: Organization; - contacts?: Contact[]; - mdui?: MDUI; - securityInfo?: SecurityInfo; - assertionConsumerServices?: SsoService[]; - serviceProviderSsoDescriptor?: IdpSsoDescriptor; - logoutEndpoints?: LogoutEndpoint[]; - serviceEnabled?: boolean; - relyingPartyOverrides: RelyingPartyOverrides; - attributeRelease: string[]; -} - -export * from './organization'; -export * from './mdui'; -export * from './contact'; -export * from './security-info'; -export * from './sso-service'; -export * from './logout-endpoint'; -export * from './sso-descriptor'; -export * from './relying-party-overrides'; -export * from './certificate'; diff --git a/ui/src/app/edit-provider/container/provider.component.spec.ts b/ui/src/app/edit-provider/container/provider.component.spec.ts index a86a52c43..45464e307 100644 --- a/ui/src/app/edit-provider/container/provider.component.spec.ts +++ b/ui/src/app/edit-provider/container/provider.component.spec.ts @@ -9,7 +9,7 @@ import * as fromCollections from '../../domain/reducer'; import { ActivatedRouteStub } from '../../../testing/activated-route.stub'; import { routes } from '../editor.module'; -describe('Provider Select (Editor) Page', () => { +describe('Resolver Select (Editor) Page', () => { let fixture: ComponentFixture; let store: Store; let instance: ProviderComponent; diff --git a/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts b/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts index 81934837b..d3013c83a 100644 --- a/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts +++ b/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts @@ -23,7 +23,7 @@ describe('Editor Reducer', () => { }); }); - describe('Editor Add Provider', () => { + describe('Editor Add Resolver', () => { it('should update the status when a provider is saved', () => { const action = new collectionActions.AddProviderRequest(changes); const result = reducer(initialState, action); diff --git a/ui/src/app/metadata-provider/action/copy.action.ts b/ui/src/app/metadata-provider/action/copy.action.ts index 1343aa9d1..a0e424374 100644 --- a/ui/src/app/metadata-provider/action/copy.action.ts +++ b/ui/src/app/metadata-provider/action/copy.action.ts @@ -2,17 +2,17 @@ import { Action } from '@ngrx/store'; import { MetadataProvider } from '../../domain/model/metadata-provider'; export enum CopySourceActionTypes { - CREATE_PROVIDER_COPY_REQUEST = '[Copy Provider] Create Provider Copy Request', - CREATE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Create Provider Copy Success', - CREATE_PROVIDER_COPY_ERROR = '[Copy Provider] Create Provider Copy Error', + CREATE_PROVIDER_COPY_REQUEST = '[Copy Resolver] Create Resolver Copy Request', + CREATE_PROVIDER_COPY_SUCCESS = '[Copy Resolver] Create Resolver Copy Success', + CREATE_PROVIDER_COPY_ERROR = '[Copy Resolver] Create Resolver Copy Error', - UPDATE_PROVIDER_COPY = '[Copy Provider] Update Provider Copy Request', + UPDATE_PROVIDER_COPY = '[Copy Resolver] Update Resolver Copy Request', - UPDATE_PROVIDER_COPY_SECTIONS = '[Copy Provider] Update Provider Sections', + UPDATE_PROVIDER_COPY_SECTIONS = '[Copy Resolver] Update Resolver Sections', - SAVE_PROVIDER_COPY_REQUEST = '[Copy Provider] Save Provider Copy Request', - SAVE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Save Provider Copy Request', - SAVE_PROVIDER_COPY_ERROR = '[Copy Provider] Save Provider Copy Request', + SAVE_PROVIDER_COPY_REQUEST = '[Copy Resolver] Save Resolver Copy Request', + SAVE_PROVIDER_COPY_SUCCESS = '[Copy Resolver] Save Resolver Copy Request', + SAVE_PROVIDER_COPY_ERROR = '[Copy Resolver] Save Resolver Copy Request', } export class CreateProviderCopyRequest implements Action { diff --git a/ui/src/app/metadata-provider/action/search.action.ts b/ui/src/app/metadata-provider/action/search.action.ts index e4623c8c9..9265f512e 100644 --- a/ui/src/app/metadata-provider/action/search.action.ts +++ b/ui/src/app/metadata-provider/action/search.action.ts @@ -2,9 +2,9 @@ import { Action } from '@ngrx/store'; import { MetadataProvider } from '../../domain/model/metadata-provider'; export enum SearchActionTypes { - SEARCH_IDS = '[Search Provider Ids] Request', - SEARCH_IDS_SUCCESS = '[Search Provider Ids] Success', - SEARCH_IDS_ERROR = '[Search Provider Ids] Error' + SEARCH_IDS = '[Search Resolver Ids] Request', + SEARCH_IDS_SUCCESS = '[Search Resolver Ids] Success', + SEARCH_IDS_ERROR = '[Search Resolver Ids] Error' } export class SearchIds implements Action { diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts index 5f814a6a2..98baad840 100644 --- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts @@ -7,7 +7,7 @@ import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/ser import * as fromCollections from '../../../domain/reducer'; import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module'; import { ListValuesService } from '../../../domain/service/list-values.service'; -import { Provider } from '../../../domain/entity/provider'; +import { Resolver } from '../../../domain/entity/provider'; import { DescriptorInfoFormComponent } from './descriptor-info-form.component'; import * as stubs from '../../../../testing/provider.stub'; @@ -17,7 +17,7 @@ import { SharedModule } from '../../../shared/shared.module'; template: `` }) class TestHostComponent { - provider = new Provider({ + provider = new Resolver({ ...stubs.provider, serviceProviderSsoDescriptor: { protocolSupportEnum: 'foo', diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts index 2936c0832..ffd903c16 100644 --- a/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts @@ -15,13 +15,13 @@ import { ActivatedRouteStub } from '../../../../testing/activated-route.stub'; import * as stubs from '../../../../testing/provider.stub'; import { InputDefaultsDirective } from '../../directive/input-defaults.directive'; import { I18nTextComponent } from '../../../domain/component/i18n-text.component'; -import { Provider } from '../../../domain/entity/provider'; +import { Resolver } from '../../../domain/entity/provider'; @Component({ template: `` }) class TestHostComponent { - provider = new Provider({ + provider = new Resolver({ ...stubs.provider }); diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts index 3be72cbdd..b05300916 100644 --- a/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts @@ -12,13 +12,13 @@ import { InputDefaultsDirective } from '../../directive/input-defaults.directive import * as stubs from '../../../../testing/provider.stub'; import { I18nTextComponent } from '../../../domain/component/i18n-text.component'; -import { Provider } from '../../../domain/entity/provider'; +import { Resolver } from '../../../domain/entity/provider'; @Component({ template: `` }) class TestHostComponent { - provider = new Provider({ + provider = new Resolver({ ...stubs.provider, securityInfo: { ...stubs.secInfo, diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts index c841cd668..42d627f75 100644 --- a/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts @@ -12,13 +12,13 @@ import { LogoutFormComponent } from './logout-form.component'; import * as stubs from '../../../../testing/provider.stub'; import { InputDefaultsDirective } from '../../directive/input-defaults.directive'; import { I18nTextComponent } from '../../../domain/component/i18n-text.component'; -import { Provider } from '../../../domain/entity/provider'; +import { Resolver } from '../../../domain/entity/provider'; @Component({ template: `` }) class TestHostComponent { - provider = new Provider({ + provider = new Resolver({ ...stubs.provider, logoutEndpoints: [stubs.logoutEndpoint] }); @@ -85,7 +85,7 @@ describe('Logout Endpoints Form Component', () => { describe('ngOnChanges method', () => { it('should add endpoints if provided', () => { - instance.provider = new Provider({ + instance.provider = new Resolver({ ...stubs.provider }); fixture.detectChanges(); diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts index 961311ac4..9057d5ada 100644 --- a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts @@ -7,7 +7,7 @@ import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/ser import * as fromCollections from '../../../domain/reducer'; import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module'; import { ListValuesService } from '../../../domain/service/list-values.service'; -import { Provider } from '../../../domain/entity/provider'; +import { Resolver } from '../../../domain/entity/provider'; import { MetadataUiFormComponent } from './metadata-ui-form.component'; import * as stubs from '../../../../testing/provider.stub'; @@ -18,7 +18,7 @@ import { I18nTextComponent } from '../../../domain/component/i18n-text.component template: `` }) class TestHostComponent { - provider = new Provider({ + provider = new Resolver({ ...stubs.provider }); diff --git a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts index 168004a41..290acaeaa 100644 --- a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts @@ -5,7 +5,7 @@ import { ProviderFormFragmentComponent } from './provider-form-fragment.componen import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -describe('Provider Form Fragment Component', () => { +describe('Resolver Form Fragment Component', () => { let fixture: ComponentFixture; let instance: ProviderFormFragmentComponent; diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts index 170699ec4..828e47314 100644 --- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts @@ -8,7 +8,7 @@ import * as fromCollections from '../../../domain/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'; -import { Provider } from '../../../domain/entity/provider'; +import { Resolver } from '../../../domain/entity/provider'; import * as stubs from '../../../../testing/provider.stub'; import { SharedModule } from '../../../shared/shared.module'; @@ -17,7 +17,7 @@ import { SharedModule } from '../../../shared/shared.module'; template: `` }) class TestHostComponent { - provider = new Provider({ + provider = new Resolver({ ...stubs.provider, relyingPartyOverrides: { nameIdFormats: [], diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.spec.ts b/ui/src/app/metadata-provider/container/blank-provider.component.spec.ts index e6f1e2eec..0faafb48a 100644 --- a/ui/src/app/metadata-provider/container/blank-provider.component.spec.ts +++ b/ui/src/app/metadata-provider/container/blank-provider.component.spec.ts @@ -7,7 +7,7 @@ import * as fromCollections from '../../domain/reducer'; import { BlankProviderComponent } from './blank-provider.component'; import { UploadProviderComponent } from './upload-provider.component'; -describe('Blank Provider Page', () => { +describe('Blank Resolver Page', () => { let fixture: ComponentFixture; let store: Store; let instance: BlankProviderComponent; diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.ts b/ui/src/app/metadata-provider/container/blank-provider.component.ts index 8d4fef304..b104ae129 100644 --- a/ui/src/app/metadata-provider/container/blank-provider.component.ts +++ b/ui/src/app/metadata-provider/container/blank-provider.component.ts @@ -13,7 +13,7 @@ import { AddProviderRequest, UploadProviderRequest } from '../../domain/action/p import * as fromCollections from '../../domain/reducer'; import { EntityValidators } from '../../domain/service/entity-validators.service'; import { MetadataProvider } from '../../domain/domain.type'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; @Component({ selector: 'blank-provider-form', @@ -40,7 +40,7 @@ export class BlankProviderComponent implements OnInit { } next(): void { - const val: MetadataProvider = new Provider({ + const val: MetadataProvider = new Resolver({ entityId: this.providerForm.get('entityId').value, serviceProviderName: this.providerForm.get('serviceProviderName').value }); diff --git a/ui/src/app/metadata-provider/container/copy-provider.component.spec.ts b/ui/src/app/metadata-provider/container/copy-provider.component.spec.ts index 1a1b3b406..7f6a29d88 100644 --- a/ui/src/app/metadata-provider/container/copy-provider.component.spec.ts +++ b/ui/src/app/metadata-provider/container/copy-provider.component.spec.ts @@ -22,7 +22,7 @@ class TestHostComponent { onSave(event: any): void {} } -describe('Copy Provider Page', () => { +describe('Copy Resolver Page', () => { let fixture: ComponentFixture; let store: Store; let instance: CopyProviderComponent; diff --git a/ui/src/app/metadata-provider/container/copy-provider.component.ts b/ui/src/app/metadata-provider/container/copy-provider.component.ts index c7b59b141..8f83feae1 100644 --- a/ui/src/app/metadata-provider/container/copy-provider.component.ts +++ b/ui/src/app/metadata-provider/container/copy-provider.component.ts @@ -16,7 +16,7 @@ import * as fromCollections from '../../domain/reducer'; import { EntityValidators } from '../../domain/service/entity-validators.service'; import { SearchIds } from '../action/search.action'; import * as fromProvider from '../reducer'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; import { CreateProviderCopyRequest, UpdateProviderCopySections} from '../action/copy.action'; diff --git a/ui/src/app/metadata-provider/container/new-provider.component.spec.ts b/ui/src/app/metadata-provider/container/new-provider.component.spec.ts index 4c320fa21..0626788e0 100644 --- a/ui/src/app/metadata-provider/container/new-provider.component.spec.ts +++ b/ui/src/app/metadata-provider/container/new-provider.component.spec.ts @@ -18,7 +18,7 @@ import { RouterStub } from '../../../testing/router.stub'; import { ActivatedRouteStub } from '../../../testing/activated-route.stub'; import { I18nTextComponent } from '../../domain/component/i18n-text.component'; -describe('New Provider Page', () => { +describe('New Resolver Page', () => { let fixture: ComponentFixture; let store: Store; let instance: NewProviderComponent; diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts b/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts index afcba83c2..e81105b52 100644 --- a/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts +++ b/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts @@ -30,7 +30,7 @@ const getFakeFile = (str: string) => { return blob; }; -describe('Upload Provider Page', () => { +describe('Upload Resolver Page', () => { let fixture: ComponentFixture; let instance: TestHostComponent; let form: UploadProviderComponent; diff --git a/ui/src/app/metadata-provider/effect/copy.effect.ts b/ui/src/app/metadata-provider/effect/copy.effect.ts index f3b5473d1..14160a3f0 100644 --- a/ui/src/app/metadata-provider/effect/copy.effect.ts +++ b/ui/src/app/metadata-provider/effect/copy.effect.ts @@ -15,7 +15,7 @@ import { CreateProviderCopySuccess, CreateProviderCopyError } from '../action/copy.action'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; @Injectable() @@ -34,7 +34,7 @@ export class CopyProviderEffects { const provider = providers.find(p => p.entityId === attrs.target); const copied = sections.reduce((c, section) => ({ ...c, ...{[section]: provider[section] } }), {}); const action = provider ? - new CreateProviderCopySuccess(new Provider({ + new CreateProviderCopySuccess(new Resolver({ serviceProviderName, entityId, ...copied diff --git a/ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts b/ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts index 34b69b258..82a4e0e3a 100644 --- a/ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts +++ b/ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts @@ -3,11 +3,11 @@ import * as fromProviderCopy from './copy.reducer'; import * as actions from '../action/copy.action'; import * as fromCollection from '../../domain/action/provider-collection.action'; import { CopySourceActionTypes, CopySourceActionUnion, CreateProviderCopyRequest } from '../action/copy.action'; -import { Provider } from '../../domain/entity/provider'; +import { Resolver } from '../../domain/entity/provider'; const snapshot: fromProviderCopy.CopyState = { ...fromProviderCopy.initialState }; -describe('Provider -> Copy Reducer', () => { +describe('Resolver -> Copy Reducer', () => { describe('undefined action', () => { it('should return the default state', () => { const result = reducer(snapshot, {} as any); @@ -26,7 +26,7 @@ describe('Provider -> Copy Reducer', () => { describe(`${CopySourceActionTypes.CREATE_PROVIDER_COPY_SUCCESS} action`, () => { it('should set properties on the state', () => { - const p = new Provider({}); + const p = new Resolver({}); const obj = { ...snapshot }; const result = reducer(snapshot, new actions.CreateProviderCopySuccess(p)); @@ -36,7 +36,7 @@ describe('Provider -> Copy Reducer', () => { describe(`${CopySourceActionTypes.CREATE_PROVIDER_COPY_ERROR} action`, () => { it('should set properties on the state', () => { - const p = new Provider({}); + const p = new Resolver({}); const obj = { ...snapshot }; const result = reducer(snapshot, new actions.CreateProviderCopyError(new Error())); @@ -46,7 +46,7 @@ describe('Provider -> Copy Reducer', () => { describe(`${CopySourceActionTypes.UPDATE_PROVIDER_COPY} action`, () => { it('should set properties on the state', () => { - const obj = { ...snapshot, provider: new Provider({}) }; + const obj = { ...snapshot, provider: new Resolver({}) }; const result = reducer(snapshot, new actions.UpdateProviderCopy({id: 'foo'})); expect(result.provider.id).toBe('foo'); @@ -55,7 +55,7 @@ describe('Provider -> Copy Reducer', () => { describe(`${ fromCollection.ProviderCollectionActionTypes.ADD_PROVIDER } action`, () => { it('should set properties on the state', () => { - const p = new Provider({}); + const p = new Resolver({}); const obj = { ...snapshot, provider: p }; const result = reducer(snapshot, new fromCollection.AddProviderRequest(p)); @@ -65,7 +65,7 @@ describe('Provider -> Copy Reducer', () => { describe(`${fromCollection.ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS} action`, () => { it('should set properties on the state', () => { - const p = new Provider({}); + const p = new Resolver({}); const obj = { ...snapshot, provider: p }; const result = reducer(snapshot, new fromCollection.AddProviderSuccess(p)); @@ -75,7 +75,7 @@ describe('Provider -> Copy Reducer', () => { describe(`${fromCollection.ProviderCollectionActionTypes.ADD_PROVIDER_FAIL} action`, () => { it('should set properties on the state', () => { - const p = new Provider({}); + const p = new Resolver({}); const obj = { ...snapshot, provider: p }; const result = reducer(snapshot, new fromCollection.AddProviderFail(p)); diff --git a/ui/src/app/metadata-provider/reducer/search.reducer.spec.ts b/ui/src/app/metadata-provider/reducer/search.reducer.spec.ts index a1155b2b5..2eb5d6262 100644 --- a/ui/src/app/metadata-provider/reducer/search.reducer.spec.ts +++ b/ui/src/app/metadata-provider/reducer/search.reducer.spec.ts @@ -8,7 +8,7 @@ const snapshot: fromProviderSearch.SearchState = { searching: false }; -describe('Provider -> Search Reducer', () => { +describe('Resolver -> Search Reducer', () => { describe('undefined action', () => { it('should return the default state', () => { const result = reducer(snapshot, {} as any); diff --git a/ui/src/app/domain/action/draft-collection.action.ts b/ui/src/app/metadata/domain/action/draft-collection.action.ts similarity index 98% rename from ui/src/app/domain/action/draft-collection.action.ts rename to ui/src/app/metadata/domain/action/draft-collection.action.ts index 39a631b2c..a5aef8dd3 100644 --- a/ui/src/app/domain/action/draft-collection.action.ts +++ b/ui/src/app/metadata/domain/action/draft-collection.action.ts @@ -1,6 +1,6 @@ import { Action } from '@ngrx/store'; import { Update } from '@ngrx/entity/entity'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../model/provider'; export enum DraftCollectionActionTypes { FIND = '[Metadata Draft] Find', diff --git a/ui/src/app/domain/action/entity.action.ts b/ui/src/app/metadata/domain/action/entity.action.ts similarity index 100% rename from ui/src/app/domain/action/entity.action.ts rename to ui/src/app/metadata/domain/action/entity.action.ts diff --git a/ui/src/app/domain/action/filter-collection.action.ts b/ui/src/app/metadata/domain/action/filter-collection.action.ts similarity index 100% rename from ui/src/app/domain/action/filter-collection.action.ts rename to ui/src/app/metadata/domain/action/filter-collection.action.ts diff --git a/ui/src/app/domain/action/provider-collection.action.ts b/ui/src/app/metadata/domain/action/provider-collection.action.ts similarity index 74% rename from ui/src/app/domain/action/provider-collection.action.ts rename to ui/src/app/metadata/domain/action/provider-collection.action.ts index 0d890aad4..1f60e26c9 100644 --- a/ui/src/app/domain/action/provider-collection.action.ts +++ b/ui/src/app/metadata/domain/action/provider-collection.action.ts @@ -1,28 +1,28 @@ import { Action } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../model/provider'; import { Update } from '@ngrx/entity'; export enum ProviderCollectionActionTypes { - FIND = '[Metadata Provider] Find', - SELECT = '[Metadata Provider] Select', - SELECT_SUCCESS = '[Metadata Provider] Select Success', - - UPDATE_PROVIDER_REQUEST = '[Metadata Provider] Update Request', - UPDATE_PROVIDER_SUCCESS = '[Metadata Provider] Update Success', - UPDATE_PROVIDER_FAIL = '[Metadata Provider] Update Fail', - - LOAD_PROVIDER_REQUEST = '[Metadata Provider Collection] Provider REQUEST', - LOAD_PROVIDER_SUCCESS = '[Metadata Provider Collection] Provider SUCCESS', - LOAD_PROVIDER_ERROR = '[Metadata Provider Collection] Provider ERROR', - ADD_PROVIDER = '[Metadata Provider Collection] Add Provider', - ADD_PROVIDER_SUCCESS = '[Metadata Provider Collection] Add Provider Success', - ADD_PROVIDER_FAIL = '[Metadata Provider Collection] Add Provider Fail', - REMOVE_PROVIDER = '[Metadata Provider Collection] Remove Provider', - REMOVE_PROVIDER_SUCCESS = '[Metadata Provider Collection] Remove Provider Success', - REMOVE_PROVIDER_FAIL = '[Metadata Provider Collection] Remove Provider Fail', - - UPLOAD_PROVIDER_REQUEST = '[Metadata Provider Collection] Upload Provider Request', - CREATE_PROVIDER_FROM_URL_REQUEST = '[Metadata Provider Collection] Create Provider From URL Request', + FIND = '[Metadata Resolver] Find', + SELECT = '[Metadata Resolver] Select', + SELECT_SUCCESS = '[Metadata Resolver] Select Success', + + UPDATE_PROVIDER_REQUEST = '[Metadata Resolver] Update Request', + UPDATE_PROVIDER_SUCCESS = '[Metadata Resolver] Update Success', + UPDATE_PROVIDER_FAIL = '[Metadata Resolver] Update Fail', + + LOAD_PROVIDER_REQUEST = '[Metadata Resolver Collection] Resolver REQUEST', + LOAD_PROVIDER_SUCCESS = '[Metadata Resolver Collection] Resolver SUCCESS', + LOAD_PROVIDER_ERROR = '[Metadata Resolver Collection] Resolver ERROR', + ADD_PROVIDER = '[Metadata Resolver Collection] Add Resolver', + ADD_PROVIDER_SUCCESS = '[Metadata Resolver Collection] Add Resolver Success', + ADD_PROVIDER_FAIL = '[Metadata Resolver Collection] Add Resolver Fail', + REMOVE_PROVIDER = '[Metadata Resolver Collection] Remove Resolver', + REMOVE_PROVIDER_SUCCESS = '[Metadata Resolver Collection] Remove Resolver Success', + REMOVE_PROVIDER_FAIL = '[Metadata Resolver Collection] Remove Resolver Fail', + + UPLOAD_PROVIDER_REQUEST = '[Metadata Resolver Collection] Upload Resolver Request', + CREATE_PROVIDER_FROM_URL_REQUEST = '[Metadata Resolver Collection] Create Resolver From URL Request', } export class FindProvider implements Action { diff --git a/ui/src/app/domain/component/i18n-text.component.html b/ui/src/app/metadata/domain/component/i18n-text.component.html similarity index 100% rename from ui/src/app/domain/component/i18n-text.component.html rename to ui/src/app/metadata/domain/component/i18n-text.component.html diff --git a/ui/src/app/domain/component/i18n-text.component.ts b/ui/src/app/metadata/domain/component/i18n-text.component.ts similarity index 100% rename from ui/src/app/domain/component/i18n-text.component.ts rename to ui/src/app/metadata/domain/component/i18n-text.component.ts diff --git a/ui/src/app/domain/domain.module.ts b/ui/src/app/metadata/domain/domain.module.ts similarity index 100% rename from ui/src/app/domain/domain.module.ts rename to ui/src/app/metadata/domain/domain.module.ts diff --git a/ui/src/app/metadata/domain/domain.type.ts b/ui/src/app/metadata/domain/domain.type.ts new file mode 100644 index 000000000..71a8194ed --- /dev/null +++ b/ui/src/app/metadata/domain/domain.type.ts @@ -0,0 +1,16 @@ +import { + MetadataProvider, + MetadataResolver, + MetadataFilter +} from './model'; + +export enum MetadataTypes { + FILTER = '[Type] Metadata Filter', + PROVIDER = '[Type] Metadata Provider', + RESOLVER = '[Type] Metadata Resolver' +} + +export type Metadata = + | MetadataProvider + | MetadataResolver + | MetadataFilter; diff --git a/ui/src/app/domain/effect/draft-collection.effect.spec.ts b/ui/src/app/metadata/domain/effect/draft-collection.effect.spec.ts similarity index 73% rename from ui/src/app/domain/effect/draft-collection.effect.spec.ts rename to ui/src/app/metadata/domain/effect/draft-collection.effect.spec.ts index cb12586de..1dc4c8851 100644 --- a/ui/src/app/domain/effect/draft-collection.effect.spec.ts +++ b/ui/src/app/metadata/domain/effect/draft-collection.effect.spec.ts @@ -1,16 +1,14 @@ -import { TestBed, tick, fakeAsync } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; import { Actions } from '@ngrx/effects'; -import { cold, getTestScheduler, hot } from 'jasmine-marbles'; -import { empty, Observable, of } from 'rxjs'; -import { TestActions, getActions } from '../../../testing/effect.util'; +import { TestActions, getActions } from '../../../../testing/effect.util'; import { DraftCollectionEffects, getPayload } from './draft-collection.effects'; import { EntityDraftService } from '../service/entity-draft.service'; -import { MetadataProvider } from '../domain.type'; +import { MetadataProvider } from '../model'; import { Router } from '@angular/router'; -import { RouterStub } from '../../../testing/router.stub'; -import { LoadDraftRequest, AddDraftRequest } from '../action/draft-collection.action'; -import { Provider } from '../entity/provider'; +import { RouterStub } from '../../../../testing/router.stub'; +import { AddDraftRequest } from '../action/draft-collection.action'; +import { Resolver } from '../model'; describe('Draft Collection Effects', () => { let effects: DraftCollectionEffects; @@ -43,7 +41,7 @@ describe('Draft Collection Effects', () => { describe('getPayload', () => { it('should return the action payload', () => { - const payload = new Provider({ id: 'foo' }); + const payload = new Resolver({ id: 'foo' }); const action = new AddDraftRequest(payload); expect(getPayload(action)).toEqual(payload); }); diff --git a/ui/src/app/domain/effect/draft-collection.effects.ts b/ui/src/app/metadata/domain/effect/draft-collection.effects.ts similarity index 98% rename from ui/src/app/domain/effect/draft-collection.effects.ts rename to ui/src/app/metadata/domain/effect/draft-collection.effects.ts index e113cf840..5c0eef714 100644 --- a/ui/src/app/domain/effect/draft-collection.effects.ts +++ b/ui/src/app/metadata/domain/effect/draft-collection.effects.ts @@ -10,7 +10,7 @@ import { switchMap, map, catchError, tap } from 'rxjs/operators'; import { DraftCollectionActionTypes, DraftCollectionActionsUnion } from '../action/draft-collection.action'; import * as actions from '../action/draft-collection.action'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/provider'; import { EntityDraftService } from '../../domain/service/entity-draft.service'; export const getPayload = (action: any) => action.payload; diff --git a/ui/src/app/domain/effect/entity.effect.spec.ts b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts similarity index 100% rename from ui/src/app/domain/effect/entity.effect.spec.ts rename to ui/src/app/metadata/domain/effect/entity.effect.spec.ts diff --git a/ui/src/app/domain/effect/entity.effect.ts b/ui/src/app/metadata/domain/effect/entity.effect.ts similarity index 100% rename from ui/src/app/domain/effect/entity.effect.ts rename to ui/src/app/metadata/domain/effect/entity.effect.ts diff --git a/ui/src/app/domain/effect/filter-collection.effect.spec.ts b/ui/src/app/metadata/domain/effect/filter-collection.effect.spec.ts similarity index 100% rename from ui/src/app/domain/effect/filter-collection.effect.spec.ts rename to ui/src/app/metadata/domain/effect/filter-collection.effect.spec.ts diff --git a/ui/src/app/domain/effect/filter-collection.effect.ts b/ui/src/app/metadata/domain/effect/filter-collection.effect.ts similarity index 100% rename from ui/src/app/domain/effect/filter-collection.effect.ts rename to ui/src/app/metadata/domain/effect/filter-collection.effect.ts diff --git a/ui/src/app/domain/effect/provider-collection.effect.spec.ts b/ui/src/app/metadata/domain/effect/provider-collection.effect.spec.ts similarity index 64% rename from ui/src/app/domain/effect/provider-collection.effect.spec.ts rename to ui/src/app/metadata/domain/effect/provider-collection.effect.spec.ts index e0ab36ae1..ffedc934d 100644 --- a/ui/src/app/domain/effect/provider-collection.effect.spec.ts +++ b/ui/src/app/metadata/domain/effect/provider-collection.effect.spec.ts @@ -1,16 +1,14 @@ -import { TestBed, tick, fakeAsync } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; import { Actions } from '@ngrx/effects'; -import { cold, getTestScheduler, hot } from 'jasmine-marbles'; -import { empty, Observable, of } from 'rxjs'; -import { TestActions, getActions } from '../../../testing/effect.util'; -import { MetadataProvider } from '../domain.type'; +import { TestActions, getActions } from '../../../../testing/effect.util'; +import { MetadataResolver } from '../model'; import { ProviderCollectionEffects } from './provider-collection.effects'; import { EntityDescriptorService } from '../service/entity-descriptor.service'; import { Router } from '@angular/router'; -import { RouterStub } from '../../../testing/router.stub'; +import { RouterStub } from '../../../../testing/router.stub'; -describe('Provider Collection Effects', () => { +describe('Resolver Collection Effects', () => { let effects: ProviderCollectionEffects; let draftService: any; let actions$: TestActions; @@ -24,10 +22,10 @@ describe('Provider Collection Effects', () => { useValue: { query: () => { }, find: (id: string) => { }, - save: (e: MetadataProvider) => { }, - update: (e: MetadataProvider) => { }, - remove: (e: MetadataProvider) => { }, - preview: (e: MetadataProvider) => { }, + save: (e: MetadataResolver) => { }, + update: (e: MetadataResolver) => { }, + remove: (e: MetadataResolver) => { }, + preview: (e: MetadataResolver) => { }, upload: (name: string, xml: string) => { }, createFromUrl: (name: string, url: string) => { } }, diff --git a/ui/src/app/domain/effect/provider-collection.effects.ts b/ui/src/app/metadata/domain/effect/provider-collection.effects.ts similarity index 94% rename from ui/src/app/domain/effect/provider-collection.effects.ts rename to ui/src/app/metadata/domain/effect/provider-collection.effects.ts index b402318f9..933c111ea 100644 --- a/ui/src/app/domain/effect/provider-collection.effects.ts +++ b/ui/src/app/metadata/domain/effect/provider-collection.effects.ts @@ -1,17 +1,15 @@ import { Injectable } from '@angular/core'; import { Effect, Actions, ofType } from '@ngrx/effects'; -import { Action } from '@ngrx/store'; import { Router } from '@angular/router'; -import { Observable, of } from 'rxjs'; +import { of } from 'rxjs'; import { map, catchError, switchMap, tap } from 'rxjs/operators'; import * as providerActions from '../action/provider-collection.action'; import * as draftActions from '../action/draft-collection.action'; -import { ProviderCollectionActionsUnion, ProviderCollectionActionTypes } from '../action/provider-collection.action'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { ProviderCollectionActionTypes } from '../action/provider-collection.action'; import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service'; -import { removeNulls } from '../../shared/util'; +import { removeNulls } from '../../../shared/util'; /* istanbul ignore next */ @Injectable() diff --git a/ui/src/app/domain/guard/filter-exists.guard.ts b/ui/src/app/metadata/domain/guard/filter-exists.guard.ts similarity index 100% rename from ui/src/app/domain/guard/filter-exists.guard.ts rename to ui/src/app/metadata/domain/guard/filter-exists.guard.ts diff --git a/ui/src/app/domain/entity/filter.ts b/ui/src/app/metadata/domain/model/filter.entity.ts similarity index 79% rename from ui/src/app/domain/entity/filter.ts rename to ui/src/app/metadata/domain/model/filter.entity.ts index 58d386855..867ee3b3b 100644 --- a/ui/src/app/domain/entity/filter.ts +++ b/ui/src/app/metadata/domain/model/filter.entity.ts @@ -1,8 +1,9 @@ -import { MetadataFilter, RelyingPartyOverrides } from '../model/metadata-filter'; -import { DomainTypes } from '../domain.type'; -import { FilterTarget } from '../model/filter-target'; +import { MetadataFilter, RelyingPartyOverrides } from '../model'; +import { MetadataTypes } from '../domain.type'; +import { FilterTarget } from '../model'; +import { MetadataEntity } from '../model'; -export class Filter implements MetadataFilter { +export class Filter implements MetadataFilter, MetadataEntity { id = ''; createdDate?: string; modifiedDate?: string; @@ -36,7 +37,7 @@ export class Filter implements MetadataFilter { } get type(): string { - return DomainTypes.filter; + return MetadataTypes.FILTER; } get entityId(): string { diff --git a/ui/src/app/metadata/domain/model/index.ts b/ui/src/app/metadata/domain/model/index.ts new file mode 100644 index 000000000..5b8fa5fc4 --- /dev/null +++ b/ui/src/app/metadata/domain/model/index.ts @@ -0,0 +1,19 @@ +export * from './metadata-base'; +export * from './metadata-entity'; +export * from './metadata-filter'; +export * from './metadata-provider'; +export * from './metadata-resolver'; +export * from './properties/certificate'; +export * from './properties/contact'; +export * from './properties/filter-target'; +export * from './properties/logout-endpoint'; +export * from './properties/mdui'; +export * from './properties/organization'; +export * from './properties/relying-party-overrides'; +export * from './properties/security-info'; +export * from './properties/sso-descriptor'; +export * from './properties/sso-service'; + +export * from './filter.entity'; +export * from './resolver.entity'; +export * from './provider.entity'; diff --git a/ui/src/app/metadata/domain/model/metadata-base.ts b/ui/src/app/metadata/domain/model/metadata-base.ts new file mode 100644 index 000000000..2de4e32bf --- /dev/null +++ b/ui/src/app/metadata/domain/model/metadata-base.ts @@ -0,0 +1,6 @@ +export interface MetadataBase { + id?: string; + createdDate?: string; + modifiedDate?: string; + version?: string; +} diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts new file mode 100644 index 000000000..6f7b9f306 --- /dev/null +++ b/ui/src/app/metadata/domain/model/metadata-entity.ts @@ -0,0 +1,7 @@ +export interface MetadataEntity { + name: string; + enabled: boolean; + type: string; + + serialize(): any; +} diff --git a/ui/src/app/domain/model/metadata-filter.ts b/ui/src/app/metadata/domain/model/metadata-filter.ts similarity index 56% rename from ui/src/app/domain/model/metadata-filter.ts rename to ui/src/app/metadata/domain/model/metadata-filter.ts index 548d6d813..6e9fc3983 100644 --- a/ui/src/app/domain/model/metadata-filter.ts +++ b/ui/src/app/metadata/domain/model/metadata-filter.ts @@ -1,6 +1,8 @@ -import { RelyingPartyOverrides } from './relying-party-overrides'; -import { MetadataBase } from './metadata-base'; -import { FilterTarget } from './filter-target'; +import { + MetadataBase, + FilterTarget, + RelyingPartyOverrides +} from '../model'; export interface MetadataFilter extends MetadataBase { entityId: string; @@ -12,5 +14,3 @@ export interface MetadataFilter extends MetadataBase { serialize(): any; } - -export * from './relying-party-overrides'; diff --git a/ui/src/app/metadata/domain/model/metadata-provider.ts b/ui/src/app/metadata/domain/model/metadata-provider.ts new file mode 100644 index 000000000..22da67257 --- /dev/null +++ b/ui/src/app/metadata/domain/model/metadata-provider.ts @@ -0,0 +1,25 @@ +import { + MetadataBase, + Organization, + Contact, + MDUI, + SecurityInfo, + SsoService, + IdpSsoDescriptor, + LogoutEndpoint, + RelyingPartyOverrides +} from '../model'; + +export interface MetadataProvider extends MetadataBase { + serviceProviderName: string; + organization?: Organization; + contacts?: Contact[]; + mdui?: MDUI; + securityInfo?: SecurityInfo; + assertionConsumerServices?: SsoService[]; + serviceProviderSsoDescriptor?: IdpSsoDescriptor; + logoutEndpoints?: LogoutEndpoint[]; + serviceEnabled?: boolean; + relyingPartyOverrides: RelyingPartyOverrides; + attributeRelease: string[]; +} diff --git a/ui/src/app/metadata/domain/model/metadata-resolver.ts b/ui/src/app/metadata/domain/model/metadata-resolver.ts new file mode 100644 index 000000000..431d9d448 --- /dev/null +++ b/ui/src/app/metadata/domain/model/metadata-resolver.ts @@ -0,0 +1,26 @@ +import { + MetadataBase, + Organization, + Contact, + MDUI, + SecurityInfo, + SsoService, + IdpSsoDescriptor, + LogoutEndpoint, + RelyingPartyOverrides +} from '../model'; + +export interface MetadataResolver extends MetadataBase { + entityId: string; + serviceProviderName: string; + organization?: Organization; + contacts?: Contact[]; + mdui?: MDUI; + securityInfo?: SecurityInfo; + assertionConsumerServices?: SsoService[]; + serviceProviderSsoDescriptor?: IdpSsoDescriptor; + logoutEndpoints?: LogoutEndpoint[]; + serviceEnabled?: boolean; + relyingPartyOverrides: RelyingPartyOverrides; + attributeRelease: string[]; +} diff --git a/ui/src/app/domain/model/certificate.ts b/ui/src/app/metadata/domain/model/properties/certificate.ts similarity index 97% rename from ui/src/app/domain/model/certificate.ts rename to ui/src/app/metadata/domain/model/properties/certificate.ts index e46be4e38..bb8ad9088 100644 --- a/ui/src/app/domain/model/certificate.ts +++ b/ui/src/app/metadata/domain/model/properties/certificate.ts @@ -2,4 +2,4 @@ export interface Certificate { name: string; type: string; value: string; -} \ No newline at end of file +} diff --git a/ui/src/app/domain/model/contact.ts b/ui/src/app/metadata/domain/model/properties/contact.ts similarity index 97% rename from ui/src/app/domain/model/contact.ts rename to ui/src/app/metadata/domain/model/properties/contact.ts index 1485522d5..52d1fe905 100644 --- a/ui/src/app/domain/model/contact.ts +++ b/ui/src/app/metadata/domain/model/properties/contact.ts @@ -2,4 +2,4 @@ export interface Contact { type: string; name: string; emailAddress: string; -} \ No newline at end of file +} diff --git a/ui/src/app/domain/model/filter-target.ts b/ui/src/app/metadata/domain/model/properties/filter-target.ts similarity index 100% rename from ui/src/app/domain/model/filter-target.ts rename to ui/src/app/metadata/domain/model/properties/filter-target.ts diff --git a/ui/src/app/domain/model/logout-endpoint.ts b/ui/src/app/metadata/domain/model/properties/logout-endpoint.ts similarity index 97% rename from ui/src/app/domain/model/logout-endpoint.ts rename to ui/src/app/metadata/domain/model/properties/logout-endpoint.ts index 9f149b4d2..31354277a 100644 --- a/ui/src/app/domain/model/logout-endpoint.ts +++ b/ui/src/app/metadata/domain/model/properties/logout-endpoint.ts @@ -1,4 +1,4 @@ export interface LogoutEndpoint { url: string; bindingType: string; -} \ No newline at end of file +} diff --git a/ui/src/app/domain/model/mdui.ts b/ui/src/app/metadata/domain/model/properties/mdui.ts similarity index 100% rename from ui/src/app/domain/model/mdui.ts rename to ui/src/app/metadata/domain/model/properties/mdui.ts diff --git a/ui/src/app/domain/model/organization.ts b/ui/src/app/metadata/domain/model/properties/organization.ts similarity index 100% rename from ui/src/app/domain/model/organization.ts rename to ui/src/app/metadata/domain/model/properties/organization.ts diff --git a/ui/src/app/domain/model/relying-party-overrides.ts b/ui/src/app/metadata/domain/model/properties/relying-party-overrides.ts similarity index 100% rename from ui/src/app/domain/model/relying-party-overrides.ts rename to ui/src/app/metadata/domain/model/properties/relying-party-overrides.ts diff --git a/ui/src/app/domain/model/security-info.ts b/ui/src/app/metadata/domain/model/properties/security-info.ts similarity index 100% rename from ui/src/app/domain/model/security-info.ts rename to ui/src/app/metadata/domain/model/properties/security-info.ts diff --git a/ui/src/app/domain/model/sso-descriptor.ts b/ui/src/app/metadata/domain/model/properties/sso-descriptor.ts similarity index 100% rename from ui/src/app/domain/model/sso-descriptor.ts rename to ui/src/app/metadata/domain/model/properties/sso-descriptor.ts diff --git a/ui/src/app/domain/model/sso-service.ts b/ui/src/app/metadata/domain/model/properties/sso-service.ts similarity index 100% rename from ui/src/app/domain/model/sso-service.ts rename to ui/src/app/metadata/domain/model/properties/sso-service.ts diff --git a/ui/src/app/domain/entity/provider.spec.ts b/ui/src/app/metadata/domain/model/provider.entity.spec.ts similarity index 92% rename from ui/src/app/domain/entity/provider.spec.ts rename to ui/src/app/metadata/domain/model/provider.entity.spec.ts index c5607e257..0ad9cee8b 100644 --- a/ui/src/app/domain/entity/provider.spec.ts +++ b/ui/src/app/metadata/domain/model/provider.entity.spec.ts @@ -1,7 +1,6 @@ -import { Provider } from './provider'; -import { MetadataProvider } from '../model/metadata-provider'; +import { Resolver } from './resolver.entity'; -describe('Provider construct', () => { +describe('Resolver construct', () => { const config = { id: 'foo', @@ -84,7 +83,7 @@ describe('Provider construct', () => { 'mail' ] }; - const entity = new Provider(config); + const entity = new Resolver(config); it('should populate its own values', () => { Object.keys(config).forEach(key => { diff --git a/ui/src/app/domain/entity/provider.ts b/ui/src/app/metadata/domain/model/provider.entity.ts similarity index 87% rename from ui/src/app/domain/entity/provider.ts rename to ui/src/app/metadata/domain/model/provider.entity.ts index f9bbb3692..ce5bdc30f 100644 --- a/ui/src/app/domain/entity/provider.ts +++ b/ui/src/app/metadata/domain/model/provider.entity.ts @@ -1,5 +1,6 @@ import { MetadataProvider, + MetadataEntity, Organization, Contact, MDUI, @@ -9,10 +10,10 @@ import { SsoService, IdpSsoDescriptor, RelyingPartyOverrides -} from '../model/metadata-provider'; -import { DomainTypes } from '../domain.type'; +} from '../model'; +import { MetadataTypes } from '../domain.type'; -export class Provider implements MetadataProvider { +export class Provider implements MetadataProvider, MetadataEntity { id = ''; createdDate?: string; modifiedDate?: string; @@ -60,7 +61,7 @@ export class Provider implements MetadataProvider { } get type(): string { - return DomainTypes.provider; + return MetadataTypes.PROVIDER; } serialize(): any { diff --git a/ui/src/app/metadata/domain/model/resolver.entity.ts b/ui/src/app/metadata/domain/model/resolver.entity.ts new file mode 100644 index 000000000..0b45a0344 --- /dev/null +++ b/ui/src/app/metadata/domain/model/resolver.entity.ts @@ -0,0 +1,70 @@ +import { + MetadataProvider, + Organization, + Contact, + MDUI, + LogoutEndpoint, + SecurityInfo, + Certificate, + SsoService, + IdpSsoDescriptor, + RelyingPartyOverrides +} from '../model'; +import { MetadataTypes } from '../domain.type'; +import { MetadataEntity } from '../model/metadata-entity'; + +export class Resolver implements MetadataProvider, MetadataEntity { + id = ''; + createdDate?: string; + modifiedDate?: string; + version: string; + + entityId = ''; + serviceProviderName = ''; + organization = {} as Organization; + contacts = [] as Contact[]; + mdui = {} as MDUI; + + securityInfo = { + x509CertificateAvailable: false, + authenticationRequestsSigned: false, + wantAssertionsSigned: false, + x509Certificates: [] as Certificate[] + } as SecurityInfo; + + assertionConsumerServices = [] as SsoService[]; + serviceProviderSsoDescriptor = { + nameIdFormats: [] + } as IdpSsoDescriptor; + + logoutEndpoints = [] as LogoutEndpoint[]; + + serviceEnabled = false; + + relyingPartyOverrides = { + nameIdFormats: [] as string[], + authenticationMethods: [] as string[] + } as RelyingPartyOverrides; + + attributeRelease = [] as string[]; + + constructor(descriptor?: Partial) { + Object.assign(this, descriptor); + } + + get name(): string { + return this.serviceProviderName; + } + + get enabled(): boolean { + return this.serviceEnabled; + } + + get type(): string { + return MetadataTypes.RESOLVER; + } + + serialize(): any { + return this; + } +} diff --git a/ui/src/app/domain/reducer/draft-collection.reducer.spec.ts b/ui/src/app/metadata/domain/reducer/draft-collection.reducer.spec.ts similarity index 96% rename from ui/src/app/domain/reducer/draft-collection.reducer.spec.ts rename to ui/src/app/metadata/domain/reducer/draft-collection.reducer.spec.ts index e9f72bd73..0ec6b9ff0 100644 --- a/ui/src/app/domain/reducer/draft-collection.reducer.spec.ts +++ b/ui/src/app/metadata/domain/reducer/draft-collection.reducer.spec.ts @@ -1,11 +1,11 @@ import { reducer, adapter } from './draft-collection.reducer'; import * as fromDrafts from './draft-collection.reducer'; import * as draftActions from '../action/draft-collection.action'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataResolver } from '../../domain/model'; -let drafts: MetadataProvider[] = [ - { entityId: 'foo', serviceProviderName: 'bar' } as MetadataProvider, - { entityId: 'baz', serviceProviderName: 'fin' } as MetadataProvider +let drafts: MetadataResolver[] = [ + { entityId: 'foo', serviceProviderName: 'bar' } as MetadataResolver, + { entityId: 'baz', serviceProviderName: 'fin' } as MetadataResolver ], snapshot: fromDrafts.DraftCollectionState = { ids: [drafts[0].entityId, drafts[1].entityId], diff --git a/ui/src/app/domain/reducer/draft-collection.reducer.ts b/ui/src/app/metadata/domain/reducer/draft-collection.reducer.ts similarity index 96% rename from ui/src/app/domain/reducer/draft-collection.reducer.ts rename to ui/src/app/metadata/domain/reducer/draft-collection.reducer.ts index 0fea3ea3d..ff1271faa 100644 --- a/ui/src/app/domain/reducer/draft-collection.reducer.ts +++ b/ui/src/app/metadata/domain/reducer/draft-collection.reducer.ts @@ -1,7 +1,7 @@ import { createSelector } from '@ngrx/store'; import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/provider'; import * as providerAction from '../action/provider-collection.action'; import { DraftCollectionActionsUnion, DraftCollectionActionTypes } from '../action/draft-collection.action'; diff --git a/ui/src/app/domain/reducer/filter-collection.reducer.spec.ts b/ui/src/app/metadata/domain/reducer/filter-collection.reducer.spec.ts similarity index 100% rename from ui/src/app/domain/reducer/filter-collection.reducer.spec.ts rename to ui/src/app/metadata/domain/reducer/filter-collection.reducer.spec.ts diff --git a/ui/src/app/domain/reducer/filter-collection.reducer.ts b/ui/src/app/metadata/domain/reducer/filter-collection.reducer.ts similarity index 100% rename from ui/src/app/domain/reducer/filter-collection.reducer.ts rename to ui/src/app/metadata/domain/reducer/filter-collection.reducer.ts diff --git a/ui/src/app/domain/reducer/index.ts b/ui/src/app/metadata/domain/reducer/index.ts similarity index 97% rename from ui/src/app/domain/reducer/index.ts rename to ui/src/app/metadata/domain/reducer/index.ts index a6281c90b..5454f01a0 100644 --- a/ui/src/app/domain/reducer/index.ts +++ b/ui/src/app/metadata/domain/reducer/index.ts @@ -2,7 +2,7 @@ import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/s import * as fromFilter from './filter-collection.reducer'; import * as fromProvider from './provider-collection.reducer'; import * as fromDraft from './draft-collection.reducer'; -import * as fromRoot from '../../app.reducer'; +import * as fromRoot from '../../../app.reducer'; export interface CollectionState { filters: fromFilter.FilterCollectionState; @@ -45,7 +45,7 @@ export const getInCollectionFn = (entities, selectedId) => { export const getEntityIdsFn = list => list.map(entity => entity.entityId); /* - * Select pieces of Provider Collection + * Select pieces of Resolver Collection */ export const getProviderEntities = createSelector(getProviderEntityState, fromProvider.selectProviderEntities); diff --git a/ui/src/app/domain/reducer/provider-collection.reducer.spec.ts b/ui/src/app/metadata/domain/reducer/provider-collection.reducer.spec.ts similarity index 93% rename from ui/src/app/domain/reducer/provider-collection.reducer.spec.ts rename to ui/src/app/metadata/domain/reducer/provider-collection.reducer.spec.ts index baddf7317..ba6ae362b 100644 --- a/ui/src/app/domain/reducer/provider-collection.reducer.spec.ts +++ b/ui/src/app/metadata/domain/reducer/provider-collection.reducer.spec.ts @@ -1,11 +1,11 @@ import { reducer } from './provider-collection.reducer'; import * as fromProvider from './provider-collection.reducer'; import * as providerActions from '../action/provider-collection.action'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataResolver } from '../model'; -let providers: MetadataProvider[] = [ - { id: '1', entityId: 'foo', serviceProviderName: 'bar', createdDate: 'Tue Apr 17 2018 13:33:54 GMT-0700 (MST)' } as MetadataProvider, - { id: '2', entityId: 'baz', serviceProviderName: 'fin', createdDate: 'Tue Apr 17 2018 13:34:07 GMT-0700 (MST)' } as MetadataProvider +let providers: MetadataResolver[] = [ + { id: '1', entityId: 'foo', serviceProviderName: 'bar', createdDate: 'Tue Apr 17 2018 13:33:54 GMT-0700 (MST)' } as MetadataResolver, + { id: '2', entityId: 'baz', serviceProviderName: 'fin', createdDate: 'Tue Apr 17 2018 13:34:07 GMT-0700 (MST)' } as MetadataResolver ], snapshot: fromProvider.ProviderCollectionState = { ids: [providers[0].id, providers[1].id], @@ -16,7 +16,7 @@ let providers: MetadataProvider[] = [ selectedProviderId: null }; -describe('Provider Reducer', () => { +describe('Resolver Reducer', () => { const initialState: fromProvider.ProviderCollectionState = { ids: [], entities: {}, @@ -70,7 +70,7 @@ describe('Provider Reducer', () => { }); }); - describe('Select Provider', () => { + describe('Select Resolver', () => { it('should update the selected draft id', () => { let id = 'foo', expected = { ...snapshot, selectedProviderId: id }; diff --git a/ui/src/app/domain/reducer/provider-collection.reducer.ts b/ui/src/app/metadata/domain/reducer/provider-collection.reducer.ts similarity index 96% rename from ui/src/app/domain/reducer/provider-collection.reducer.ts rename to ui/src/app/metadata/domain/reducer/provider-collection.reducer.ts index 42a18c8c4..13497e6f7 100644 --- a/ui/src/app/domain/reducer/provider-collection.reducer.ts +++ b/ui/src/app/metadata/domain/reducer/provider-collection.reducer.ts @@ -1,7 +1,7 @@ import { createSelector } from '@ngrx/store'; import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/provider'; import * as provider from '../action/provider-collection.action'; import { ProviderCollectionActionsUnion, ProviderCollectionActionTypes } from '../action/provider-collection.action'; diff --git a/ui/src/app/domain/service/entity-descriptor.service.spec.ts b/ui/src/app/metadata/domain/service/entity-descriptor.service.spec.ts similarity index 100% rename from ui/src/app/domain/service/entity-descriptor.service.spec.ts rename to ui/src/app/metadata/domain/service/entity-descriptor.service.spec.ts diff --git a/ui/src/app/domain/service/entity-descriptor.service.ts b/ui/src/app/metadata/domain/service/entity-descriptor.service.ts similarity index 97% rename from ui/src/app/domain/service/entity-descriptor.service.ts rename to ui/src/app/metadata/domain/service/entity-descriptor.service.ts index 9bc8c88eb..9bb798c15 100644 --- a/ui/src/app/domain/service/entity-descriptor.service.ts +++ b/ui/src/app/metadata/domain/service/entity-descriptor.service.ts @@ -4,7 +4,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/provider'; import { MOCK_DESCRIPTORS } from '../../../data/descriptors.mock'; import { Storage } from '../../shared/storage'; import { environment } from '../../../environments/environment'; diff --git a/ui/src/app/domain/service/entity-draft.service.spec.ts b/ui/src/app/metadata/domain/service/entity-draft.service.spec.ts similarity index 90% rename from ui/src/app/domain/service/entity-draft.service.spec.ts rename to ui/src/app/metadata/domain/service/entity-draft.service.spec.ts index c30b8761a..dbe8a1109 100644 --- a/ui/src/app/domain/service/entity-draft.service.spec.ts +++ b/ui/src/app/metadata/domain/service/entity-draft.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientModule, HttpRequest, HttpParams } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { EntityDraftService } from './entity-draft.service'; -import { Provider } from '../entity/provider'; +import { Resolver } from '../entity/provider'; describe(`EntityDraftService`, () => { @@ -20,7 +20,7 @@ describe(`EntityDraftService`, () => { describe('query', () => { it(`should return an observable of the list from the store`, (done: DoneFn) => { - let list = [new Provider()]; + let list = [new Resolver()]; spyOn(service.storage, 'query').and.returnValue(list); service.query().subscribe(l => { expect(l).toEqual(list); @@ -31,7 +31,7 @@ describe(`EntityDraftService`, () => { describe('find', () => { it(`should return an observable of the list from the store`, (done: DoneFn) => { let id = 'foo'; - let e = new Provider({ entityId: id }); + let e = new Resolver({ entityId: id }); let list = [e]; spyOn(service.storage, 'query').and.returnValue(list); service.find(id).subscribe(entity => { diff --git a/ui/src/app/domain/service/entity-draft.service.ts b/ui/src/app/metadata/domain/service/entity-draft.service.ts similarity index 95% rename from ui/src/app/domain/service/entity-draft.service.ts rename to ui/src/app/metadata/domain/service/entity-draft.service.ts index 687d4d441..83a0dcc8f 100644 --- a/ui/src/app/domain/service/entity-draft.service.ts +++ b/ui/src/app/metadata/domain/service/entity-draft.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/provider'; import { MOCK_DESCRIPTORS } from '../../../data/descriptors.mock'; import { Storage } from '../../shared/storage'; diff --git a/ui/src/app/domain/service/entity-id.service.spec.ts b/ui/src/app/metadata/domain/service/entity-id.service.spec.ts similarity index 100% rename from ui/src/app/domain/service/entity-id.service.spec.ts rename to ui/src/app/metadata/domain/service/entity-id.service.spec.ts diff --git a/ui/src/app/domain/service/entity-id.service.ts b/ui/src/app/metadata/domain/service/entity-id.service.ts similarity index 100% rename from ui/src/app/domain/service/entity-id.service.ts rename to ui/src/app/metadata/domain/service/entity-id.service.ts diff --git a/ui/src/app/domain/service/entity-validators.service.spec.ts b/ui/src/app/metadata/domain/service/entity-validators.service.spec.ts similarity index 100% rename from ui/src/app/domain/service/entity-validators.service.spec.ts rename to ui/src/app/metadata/domain/service/entity-validators.service.spec.ts diff --git a/ui/src/app/domain/service/entity-validators.service.ts b/ui/src/app/metadata/domain/service/entity-validators.service.ts similarity index 100% rename from ui/src/app/domain/service/entity-validators.service.ts rename to ui/src/app/metadata/domain/service/entity-validators.service.ts diff --git a/ui/src/app/domain/service/list-values.service.spec.ts b/ui/src/app/metadata/domain/service/list-values.service.spec.ts similarity index 100% rename from ui/src/app/domain/service/list-values.service.spec.ts rename to ui/src/app/metadata/domain/service/list-values.service.spec.ts diff --git a/ui/src/app/domain/service/list-values.service.ts b/ui/src/app/metadata/domain/service/list-values.service.ts similarity index 100% rename from ui/src/app/domain/service/list-values.service.ts rename to ui/src/app/metadata/domain/service/list-values.service.ts diff --git a/ui/src/app/domain/service/metadata-resolver.service.spec.ts b/ui/src/app/metadata/domain/service/metadata-resolver.service.spec.ts similarity index 100% rename from ui/src/app/domain/service/metadata-resolver.service.spec.ts rename to ui/src/app/metadata/domain/service/metadata-resolver.service.spec.ts diff --git a/ui/src/app/domain/service/metadata-resolver.service.ts b/ui/src/app/metadata/domain/service/metadata-resolver.service.ts similarity index 100% rename from ui/src/app/domain/service/metadata-resolver.service.ts rename to ui/src/app/metadata/domain/service/metadata-resolver.service.ts diff --git a/ui/src/app/domain/service/provider-change-emitter.service.spec.ts b/ui/src/app/metadata/domain/service/provider-change-emitter.service.spec.ts similarity index 96% rename from ui/src/app/domain/service/provider-change-emitter.service.spec.ts rename to ui/src/app/metadata/domain/service/provider-change-emitter.service.spec.ts index f77a10b01..97dba2257 100644 --- a/ui/src/app/domain/service/provider-change-emitter.service.spec.ts +++ b/ui/src/app/metadata/domain/service/provider-change-emitter.service.spec.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs'; import { AbstractControl, FormBuilder, ReactiveFormsModule } from '@angular/forms'; import { ProviderStatusEmitter, ProviderValueEmitter } from './provider-change-emitter.service'; -describe(`Provider Change emitter service`, () => { +describe(`Resolver Change emitter service`, () => { beforeEach(() => { TestBed.configureTestingModule({ diff --git a/ui/src/app/domain/service/provider-change-emitter.service.ts b/ui/src/app/metadata/domain/service/provider-change-emitter.service.ts similarity index 100% rename from ui/src/app/domain/service/provider-change-emitter.service.ts rename to ui/src/app/metadata/domain/service/provider-change-emitter.service.ts diff --git a/ui/src/app/metadata-filter/action/filter.action.spec.ts b/ui/src/app/metadata/filter/action/filter.action.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/action/filter.action.spec.ts rename to ui/src/app/metadata/filter/action/filter.action.spec.ts diff --git a/ui/src/app/metadata-filter/action/filter.action.ts b/ui/src/app/metadata/filter/action/filter.action.ts similarity index 100% rename from ui/src/app/metadata-filter/action/filter.action.ts rename to ui/src/app/metadata/filter/action/filter.action.ts diff --git a/ui/src/app/metadata-filter/action/search.action.spec.ts b/ui/src/app/metadata/filter/action/search.action.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/action/search.action.spec.ts rename to ui/src/app/metadata/filter/action/search.action.spec.ts diff --git a/ui/src/app/metadata-filter/action/search.action.ts b/ui/src/app/metadata/filter/action/search.action.ts similarity index 100% rename from ui/src/app/metadata-filter/action/search.action.ts rename to ui/src/app/metadata/filter/action/search.action.ts diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.html b/ui/src/app/metadata/filter/component/search-dialog.component.html similarity index 100% rename from ui/src/app/metadata-filter/component/search-dialog.component.html rename to ui/src/app/metadata/filter/component/search-dialog.component.html diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.scss b/ui/src/app/metadata/filter/component/search-dialog.component.scss similarity index 100% rename from ui/src/app/metadata-filter/component/search-dialog.component.scss rename to ui/src/app/metadata/filter/component/search-dialog.component.scss diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.spec.ts b/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/component/search-dialog.component.spec.ts rename to ui/src/app/metadata/filter/component/search-dialog.component.spec.ts diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.ts b/ui/src/app/metadata/filter/component/search-dialog.component.ts similarity index 100% rename from ui/src/app/metadata-filter/component/search-dialog.component.ts rename to ui/src/app/metadata/filter/component/search-dialog.component.ts diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html similarity index 100% rename from ui/src/app/metadata-filter/container/edit-filter.component.html rename to ui/src/app/metadata/filter/container/edit-filter.component.html diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.spec.ts b/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/container/edit-filter.component.spec.ts rename to ui/src/app/metadata/filter/container/edit-filter.component.spec.ts diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.ts b/ui/src/app/metadata/filter/container/edit-filter.component.ts similarity index 100% rename from ui/src/app/metadata-filter/container/edit-filter.component.ts rename to ui/src/app/metadata/filter/container/edit-filter.component.ts diff --git a/ui/src/app/metadata-filter/container/filter.component.html b/ui/src/app/metadata/filter/container/filter.component.html similarity index 100% rename from ui/src/app/metadata-filter/container/filter.component.html rename to ui/src/app/metadata/filter/container/filter.component.html diff --git a/ui/src/app/metadata-filter/container/filter.component.scss b/ui/src/app/metadata/filter/container/filter.component.scss similarity index 100% rename from ui/src/app/metadata-filter/container/filter.component.scss rename to ui/src/app/metadata/filter/container/filter.component.scss diff --git a/ui/src/app/metadata-filter/container/filter.component.spec.ts b/ui/src/app/metadata/filter/container/filter.component.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/container/filter.component.spec.ts rename to ui/src/app/metadata/filter/container/filter.component.spec.ts diff --git a/ui/src/app/metadata-filter/container/filter.component.ts b/ui/src/app/metadata/filter/container/filter.component.ts similarity index 100% rename from ui/src/app/metadata-filter/container/filter.component.ts rename to ui/src/app/metadata/filter/container/filter.component.ts diff --git a/ui/src/app/metadata-filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html similarity index 100% rename from ui/src/app/metadata-filter/container/new-filter.component.html rename to ui/src/app/metadata/filter/container/new-filter.component.html 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 similarity index 100% rename from ui/src/app/metadata-filter/container/new-filter.component.spec.ts rename to ui/src/app/metadata/filter/container/new-filter.component.spec.ts diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata/filter/container/new-filter.component.ts similarity index 100% rename from ui/src/app/metadata-filter/container/new-filter.component.ts rename to ui/src/app/metadata/filter/container/new-filter.component.ts diff --git a/ui/src/app/metadata-filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts similarity index 100% rename from ui/src/app/metadata-filter/effect/filter.effect.ts rename to ui/src/app/metadata/filter/effect/filter.effect.ts diff --git a/ui/src/app/metadata-filter/effect/search.effect.ts b/ui/src/app/metadata/filter/effect/search.effect.ts similarity index 96% rename from ui/src/app/metadata-filter/effect/search.effect.ts rename to ui/src/app/metadata/filter/effect/search.effect.ts index ba9e74dcb..fffd28530 100644 --- a/ui/src/app/metadata-filter/effect/search.effect.ts +++ b/ui/src/app/metadata/filter/effect/search.effect.ts @@ -15,7 +15,7 @@ import * as collection from '../../domain/action/filter-collection.action'; import { SearchDialogComponent } from '../component/search-dialog.component'; import { EntityIdService } from '../../domain/service/entity-id.service'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/provider'; import { MetadataResolverService } from '../../domain/service/metadata-resolver.service'; import { fromPromise } from 'rxjs/internal-compatibility'; diff --git a/ui/src/app/metadata-filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts similarity index 100% rename from ui/src/app/metadata-filter/filter.module.ts rename to ui/src/app/metadata/filter/filter.module.ts diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts rename to ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.ts similarity index 100% rename from ui/src/app/metadata-filter/reducer/filter.reducer.ts rename to ui/src/app/metadata/filter/reducer/filter.reducer.ts diff --git a/ui/src/app/metadata-filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts similarity index 100% rename from ui/src/app/metadata-filter/reducer/index.ts rename to ui/src/app/metadata/filter/reducer/index.ts diff --git a/ui/src/app/metadata-filter/reducer/search.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/search.reducer.spec.ts similarity index 100% rename from ui/src/app/metadata-filter/reducer/search.reducer.spec.ts rename to ui/src/app/metadata/filter/reducer/search.reducer.spec.ts diff --git a/ui/src/app/metadata-filter/reducer/search.reducer.ts b/ui/src/app/metadata/filter/reducer/search.reducer.ts similarity index 100% rename from ui/src/app/metadata-filter/reducer/search.reducer.ts rename to ui/src/app/metadata/filter/reducer/search.reducer.ts diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/resolver/resolver.module.ts b/ui/src/app/metadata/resolver/resolver.module.ts new file mode 100644 index 000000000..e69de29bb