diff --git a/ui/src/app/metadata/resolver/component/finish-form.component.html b/ui/src/app/metadata/resolver/component/finish-form.component.html index 8a3388f3f..770d45d23 100644 --- a/ui/src/app/metadata/resolver/component/finish-form.component.html +++ b/ui/src/app/metadata/resolver/component/finish-form.component.html @@ -12,250 +12,6 @@ -
-

- 1 - Name and Entity ID -

-
-
Service Provider Name (Dashboard Display Only)
-
{{ resolver.serviceProviderName }}
-
Service Provider Entity ID
-
{{ resolver.entityId }}
-
Enable this service?
-
{{ resolver.serviceEnabled ? 'Yes' : 'No' }}
-
-
-
- - 2 - Organization Information - -
-
Organization Name
-
{{ resolver.organization.name }}
-
Organization Display Name
-
{{ resolver.organization.displayName }}
-
Organization URL
-
{{ resolver.organization.url }}
-
Contact Information
-
-

—

- - - - - - - - - - - - - - - -
Given NameEmail AddressContact Type
{{ contact.name }}{{ contact.emailAddress }}{{ contact.type }}
-
-
-
-
- - 3 - User Interface / MDUI Information - -
-
Display Name
-
{{ resolver.mdui.displayName }}
-
Information URL
-
{{ resolver.mdui.informationUrl }}
-
Description
-
{{ resolver.mdui.description }}
-
Privacy Statement URL
-
{{ resolver.mdui.privacyStatementUrl }}
-
Logo URL
-
{{ resolver.mdui.logoUrl }}
-
Logo Width
-
{{ resolver.mdui.logoWidth }}
-
Logo Height
-
{{ resolver.mdui.logoHeight }}
-
-
-
- - 4 - SP SSO Descriptor Information - -
-
Protocol Support Enumeration
-
{{ resolver.serviceProviderSsoDescriptor.protocolSupportEnum }}
-
NameID Format
-
-

—

-
    -
  • - {{ format }} -
    • -
-
-
-
-
- - 5 - Logout Endpoints - -

—

- - - - - - - - - - - - - -
Logout EndpointBinding Type
{{ endpoint.url }}{{ endpoint.bindingType }}
-
- -
-
- - 6 - Security Information - -
-
Is there a X509 Certificate?
-
{{ resolver.securityInfo.x509CertificateAvailable ? 'Yes' : 'No' }}
-
Authentication Requests Signed?
-
{{ resolver.securityInfo.authenticationRequestsSigned ? 'Yes' : 'No' }}
-
Want Assertions Signed?
-
{{ resolver.securityInfo.wantAssertionsSigned ? 'Yes' : 'No' }}
-
X509 Certificates
-
-

—

- - - - - - - - - - - - - - - - -
X509 Certificates
Certificate Name (Display Only)TypeCertificate
{{ cert.name }}{{ cert.type }}{{ cert.value | slice:0:9 }}…
-
-
-
-
- - 7 - Assertion Consumer Services - -
-
Assertion Consumer Service Endpoints
-
-

—

- - - - - - - - - - - - - - - -
#Assertion Consumer Service LocationAssertion Consumer Service Binding
{{ i + 1 }}{{ service.locationUrl }}{{ service.binding }}
-
-
-
-
- - 8 - Relying Party Overrides - -
-
Sign the Assertion?
-
{{ resolver.relyingPartyOverrides.signAssertion ? 'True' : 'False' }}
-
Don't Sign the Response?
-
{{ resolver.relyingPartyOverrides.dontSignResponse ? 'True' : 'False' }}
-
Turn off Encryption of Response?
-
{{ resolver.relyingPartyOverrides.turnOffEncryption ? 'True' : 'False' }}
-
Use SHA1 Signing Algorithm?
-
{{ resolver.relyingPartyOverrides.useSha ? 'True' : 'False' }}
-
NameID Format to Send
-
-

—

-
    -
  • - {{ format }} -
    • -
-
-
Default Authentication Method(s)
-
-

—

-
    -
  1. - {{ method }} -
    2. -
-
-
Ignore any SP-Requested Authentication Method?
-
{{ resolver.relyingPartyOverrides.ignoreAuthenticationMethod ? 'True' : 'False' }}
-
Omit Not Before Condition?
-
{{ resolver.relyingPartyOverrides.omitNotBefore ? 'True' : 'False' }}
-
ResponderID
-
{{ resolver.relyingPartyOverrides.responderId }}
-
-
-
- - 9 - Attribute Release - - - - - - - - - - - - - - - - -
Attribute NameTrueFalse
{{ attr.label }} - - - -
-
diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html index 2097a6c61..8e48e3e0a 100644 --- a/ui/src/app/metadata/resolver/container/confirm-copy.component.html +++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.html @@ -10,7 +10,7 @@
+ +
diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.ts b/ui/src/app/metadata/resolver/container/confirm-copy.component.ts index 42bbff14b..b4c0bef20 100644 --- a/ui/src/app/metadata/resolver/container/confirm-copy.component.ts +++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.ts @@ -1,42 +1,72 @@ -import { Component } from '@angular/core'; +import { Component, Inject, OnDestroy } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; -import * as fromProvider from '../reducer'; +import { + State, + getResolverConfiguration, + getCopy, + getSaving +} from '../reducer'; import { MetadataResolver } from '../../domain/model'; import { ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service'; import { UpdateResolverCopy } from '../action/copy.action'; -import { map, take } from 'rxjs/operators'; +import { take, skipWhile } from 'rxjs/operators'; import { AddResolverRequest } from '../action/collection.action'; +import { MetadataConfiguration } from '../../configuration/model/metadata-configuration'; +import { SetDefinition, ClearWizard } from '../../../wizard/action/wizard.action'; +import { METADATA_SOURCE_WIZARD } from '../wizard-definition'; +import { Wizard } from '../../../wizard/model'; +import { LoadSchemaRequest } from '../../configuration/action/configuration.action'; +import { getCurrentWizardSchema } from '../../../wizard/reducer'; @Component({ selector: 'confirm-copy-page', templateUrl: './confirm-copy.component.html', styleUrls: ['./confirm-copy.component.scss'] }) -export class ConfirmCopyComponent { +export class ConfirmCopyComponent implements OnDestroy { copy$: Observable; values$: Observable; saving$: Observable; + summary$: Observable = this.store.select(getResolverConfiguration); resolver: MetadataResolver; constructor( - private store: Store, - private valueEmitter: ProviderValueEmitter + private store: Store, + private valueEmitter: ProviderValueEmitter, + @Inject(METADATA_SOURCE_WIZARD) private sourceWizard: Wizard ) { - this.copy$ = this.store.select(fromProvider.getCopy); - this.saving$ = this.store.select(fromProvider.getSaving); + this.copy$ = this.store.select(getCopy); + this.saving$ = this.store.select(getSaving); this.values$ = this.copy$.pipe(take(1)); this.valueEmitter.changeEmitted$.subscribe(changes => this.store.dispatch(new UpdateResolverCopy(changes))); this.copy$.subscribe(p => this.resolver = p); + + this.store + .select(getCurrentWizardSchema) + .pipe( + skipWhile(s => !s) + ) + .subscribe(s => { + if (s) { + this.store.dispatch(new LoadSchemaRequest(s)); + } + }); + + this.store.dispatch(new SetDefinition(this.sourceWizard)); } onSave(resolver: MetadataResolver): void { this.store.dispatch(new AddResolverRequest(resolver)); } -} /* istanbul ignore next */ + + ngOnDestroy(): void { + this.store.dispatch(new ClearWizard()); + } +} diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html index fb3832558..07ffad3c3 100644 --- a/ui/src/app/metadata/resolver/container/copy-resolver.component.html +++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.html @@ -9,7 +9,11 @@

  • - diff --git a/ui/src/app/metadata/resolver/effect/copy.effect.ts b/ui/src/app/metadata/resolver/effect/copy.effect.ts index cc020a9dd..d7b9bf385 100644 --- a/ui/src/app/metadata/resolver/effect/copy.effect.ts +++ b/ui/src/app/metadata/resolver/effect/copy.effect.ts @@ -16,6 +16,7 @@ import { } from '../action/copy.action'; import { FileBackedHttpMetadataResolver } from '../../domain/entity'; import { removeNulls } from '../../../shared/util'; +import { UpdateChangesRequest } from '../action/entity.action'; @Injectable() @@ -43,9 +44,16 @@ export class CopyResolverEffects { return of(action); })); + @Effect() + changesOnCreation$ = this.actions$.pipe( + ofType(CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS), + map(action => action.payload), + map(entity => new UpdateChangesRequest(entity)) + ); + @Effect({ dispatch: false }) copyOnCreation$ = this.actions$.pipe( - ofType(CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS), + ofType(CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS), switchMap(() => this.router.navigate(['metadata', 'resolver', 'new', 'copy', 'confirm'])) );