From 54550063f6dc285d723f7893886fd113ede7cebd Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 17:36:58 -0600 Subject: [PATCH 1/8] batch-fixes-4-dec --- .../core/register2/register2.form-adapter.ts | 2 +- .../form-personal.component.html | 2 +- .../form-personal/form-personal.component.ts | 24 ++++++++++++++++++- .../components/register2.scss-theme.scss | 2 +- .../register2/components/register2.style.scss | 7 ++++++ .../register2.component.scss.theme.scss | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/app/core/register2/register2.form-adapter.ts b/src/app/core/register2/register2.form-adapter.ts index f4d52ad296..2f6c361163 100644 --- a/src/app/core/register2/register2.form-adapter.ts +++ b/src/app/core/register2/register2.form-adapter.ts @@ -125,7 +125,7 @@ export function Register2FormAdapterMixin>(base: T) { return { ...StepA.value.personal, ...StepB.value.password, - ...StepB.value.sendOrcidNews, + ...StepC.value.sendOrcidNews, ...StepD.value.activitiesVisibilityDefault, ...StepD.value.termsOfUse, ...StepD.value.captcha, diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html index 6b3aa05109..17b5519dd3 100644 --- a/src/app/register2/components/form-personal/form-personal.component.html +++ b/src/app/register2/components/form-personal/form-personal.component.html @@ -173,7 +173,7 @@

Sign in to ORCID using this email address { + return this._router.navigate([ApplicationRoutes.signin], { + // keeps all parameters to support Oauth request + // and set show login to true + queryParams: { ...platform.queryParameters, email, show_login: true }, + }) + }) + } + + } diff --git a/src/app/register2/components/register2.scss-theme.scss b/src/app/register2/components/register2.scss-theme.scss index 7f860f7666..635eee1c5e 100644 --- a/src/app/register2/components/register2.scss-theme.scss +++ b/src/app/register2/components/register2.scss-theme.scss @@ -74,7 +74,7 @@ ::ng-deep { .container .mat-horizontal-content-container, .container { - background-color: map-get($background, 'ui-background-lightest'); + // background-color: map-get($background, 'ui-background-lightest'); } } } diff --git a/src/app/register2/components/register2.style.scss b/src/app/register2/components/register2.style.scss index 427a9d30f6..bc41599239 100644 --- a/src/app/register2/components/register2.style.scss +++ b/src/app/register2/components/register2.style.scss @@ -58,6 +58,12 @@ mat-label.orc-font-small-print { } :host ::ng-deep { + + + mat-card { + margin-top: 32px !important; + } + mat-error { margin-top: 8px; font-size: 12px; @@ -161,6 +167,7 @@ mat-label.orc-font-small-print { margin-bottom: 0px; } + mat-vertical-stepper.orcid-stepper-wizard, mat-horizontal-stepper.orcid-stepper-wizard { mat-card { diff --git a/src/app/register2/pages/register/register2.component.scss.theme.scss b/src/app/register2/pages/register/register2.component.scss.theme.scss index 8915a0e475..b2a5d99f73 100644 --- a/src/app/register2/pages/register/register2.component.scss.theme.scss +++ b/src/app/register2/pages/register/register2.component.scss.theme.scss @@ -9,7 +9,7 @@ $background: map-get($theme, background); :host { - background-color: map-get($background, 'ui-background-lightest'); + // background-color: map-get($background, 'ui-background-lightest'); } } @include theme($orcid-app-theme); From 1326149ed990f61d333d0c374a42e3e049866cad Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 17:38:07 -0600 Subject: [PATCH 2/8] batch-fixes-4-dec --- src/app/core/register2/register2.service.ts | 2 + .../work-form/work-form.component.ts | 92 +++++++++---------- .../components/register2.scss-theme.scss | 8 -- .../register2.component.scss.theme.scss | 4 +- .../pages/register/register2.component.ts | 12 +++ 5 files changed, 57 insertions(+), 61 deletions(-) diff --git a/src/app/core/register2/register2.service.ts b/src/app/core/register2/register2.service.ts index a362de9d4c..486af2c5cd 100644 --- a/src/app/core/register2/register2.service.ts +++ b/src/app/core/register2/register2.service.ts @@ -98,6 +98,8 @@ export class Register2Service extends _RegisterServiceMixingBase { StepC, StepD ) + console.log('_______ >>>>>>>> ________') + console.log(registerForm) this.addOauthContext(registerForm, requestInfoForm) return this._platform.get().pipe( first(), diff --git a/src/app/record/components/work-form/work-form/work-form.component.ts b/src/app/record/components/work-form/work-form/work-form.component.ts index 05bb607bfb..d998bec70b 100644 --- a/src/app/record/components/work-form/work-form/work-form.component.ts +++ b/src/app/record/components/work-form/work-form/work-form.component.ts @@ -52,7 +52,7 @@ import { SnackbarService } from 'src/app/cdk/snackbar/snackbar.service' import { WorkIdentifiers } from 'src/app/shared/validators/work-identifiers/work-identifiers.validator' import { workCitationValidator } from 'src/app/shared/validators/citation/work-citation.validator' import { translatedTitleValidator } from 'src/app/shared/validators/translated-title/translated-title.validator' -import { merge, Subject, of } from 'rxjs' +import { EMPTY, merge, of, Subject } from 'rxjs' import { RecordService } from 'src/app/core/record/record.service' @Component({ @@ -267,59 +267,51 @@ export class WorkFormComponent implements OnInit { externalIdentifierType: string ): AsyncValidatorFn { return (control: AbstractControl) => { - if (externalIdentifierType === 'isbn') { - if (!(control.value?.length === 10 || control.value?.length === 13)) { - return of({ validFormat: true }) - } else { - return of({}) - } - } else { - return this._workService - .validateWorkIdTypes(externalIdentifierType, control.value) - .pipe( - map((value) => { - if ( - (formGroup.controls.externalIdentifierUrl?.value?.length > 0 && - formGroup.controls.externalIdentifierUrl.value !== - formGroup.controls.externalIdentifierUrlWasBackendGenerated - .value) || - formGroup.controls.externalIdentifierId.value === - formGroup.controls.externalIdentifierIdStored.value - ) { - // do not overwrite the existing URL - } else if ( - value.generatedUrl && - value.generatedUrl !== - formGroup.controls.externalIdentifierUrl.value - ) { - formGroup.controls.externalIdentifierUrl.setValue( - decodeURI(value.generatedUrl) - ) - formGroup.controls.externalIdentifierUrlWasBackendGenerated.setValue( - decodeURI(value.generatedUrl) - ) - } else if ( - !value.validFormat || - (value.attemptedResolution && !value.resolved) - ) { - if (!this.work?.putCode) { - formGroup.controls.externalIdentifierUrl.setValue('') - } + return this._workService + .validateWorkIdTypes(externalIdentifierType, control.value) + .pipe( + map((value) => { + if ( + (formGroup.controls.externalIdentifierUrl?.value?.length > 0 && + formGroup.controls.externalIdentifierUrl.value !== + formGroup.controls.externalIdentifierUrlWasBackendGenerated + .value) || + formGroup.controls.externalIdentifierId.value === + formGroup.controls.externalIdentifierIdStored.value + ) { + // do not overwrite the existing URL + } else if ( + value.generatedUrl && + value.generatedUrl !== + formGroup.controls.externalIdentifierUrl.value + ) { + formGroup.controls.externalIdentifierUrl.setValue( + decodeURI(value.generatedUrl) + ) + formGroup.controls.externalIdentifierUrlWasBackendGenerated.setValue( + decodeURI(value.generatedUrl) + ) + } else if ( + !value.validFormat || + (value.attemptedResolution && !value.resolved) + ) { + if (!this.work?.putCode) { + formGroup.controls.externalIdentifierUrl.setValue('') } + } - if (value.attemptedResolution && !value.resolved) { - return { - unResolved: true, - } + if (value.attemptedResolution && !value.resolved) { + return { + unResolved: true, } - if (!value.validFormat) { - return { - validFormat: true, - } + } + if (!value.validFormat) { + return { + validFormat: true, } - }) - ) - } + } + }) + ) } } diff --git a/src/app/register2/components/register2.scss-theme.scss b/src/app/register2/components/register2.scss-theme.scss index 635eee1c5e..34385dcebf 100644 --- a/src/app/register2/components/register2.scss-theme.scss +++ b/src/app/register2/components/register2.scss-theme.scss @@ -70,14 +70,6 @@ } } - :host { - ::ng-deep { - .container .mat-horizontal-content-container, - .container { - // background-color: map-get($background, 'ui-background-lightest'); - } - } - } ::ng-deep { .valid-password-input { diff --git a/src/app/register2/pages/register/register2.component.scss.theme.scss b/src/app/register2/pages/register/register2.component.scss.theme.scss index b2a5d99f73..33f5306fc3 100644 --- a/src/app/register2/pages/register/register2.component.scss.theme.scss +++ b/src/app/register2/pages/register/register2.component.scss.theme.scss @@ -8,8 +8,6 @@ $foreground: map-get($theme, foreground); $background: map-get($theme, background); - :host { - // background-color: map-get($background, 'ui-background-lightest'); - } + } @include theme($orcid-app-theme); diff --git a/src/app/register2/pages/register/register2.component.ts b/src/app/register2/pages/register/register2.component.ts index 7409ce242a..81e29fd316 100644 --- a/src/app/register2/pages/register/register2.component.ts +++ b/src/app/register2/pages/register/register2.component.ts @@ -133,6 +133,18 @@ export class Register2Component implements OnInit, AfterViewInit { } register() { + console.log('register') + console.log(this.FormGroupStepA) + console.log("______________________") + console.log(this.FormGroupStepB) + console.log("______________________") + + console.log(this.FormGroupStepC) + console.log("______________________") + + console.log(this.FormGroupStepD) + console.log("______________________") + this.loading = true this.lastStep.interacted = true if ( From e0b3cc5851eef5c6555722f426ae465af118c741 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 17:38:37 -0600 Subject: [PATCH 3/8] Revert "batch-fixes-4-dec" This reverts commit 1326149ed990f61d333d0c374a42e3e049866cad. --- src/app/core/register2/register2.service.ts | 2 - .../work-form/work-form.component.ts | 92 ++++++++++--------- .../components/register2.scss-theme.scss | 8 ++ .../register2.component.scss.theme.scss | 4 +- .../pages/register/register2.component.ts | 12 --- 5 files changed, 61 insertions(+), 57 deletions(-) diff --git a/src/app/core/register2/register2.service.ts b/src/app/core/register2/register2.service.ts index 486af2c5cd..a362de9d4c 100644 --- a/src/app/core/register2/register2.service.ts +++ b/src/app/core/register2/register2.service.ts @@ -98,8 +98,6 @@ export class Register2Service extends _RegisterServiceMixingBase { StepC, StepD ) - console.log('_______ >>>>>>>> ________') - console.log(registerForm) this.addOauthContext(registerForm, requestInfoForm) return this._platform.get().pipe( first(), diff --git a/src/app/record/components/work-form/work-form/work-form.component.ts b/src/app/record/components/work-form/work-form/work-form.component.ts index d998bec70b..05bb607bfb 100644 --- a/src/app/record/components/work-form/work-form/work-form.component.ts +++ b/src/app/record/components/work-form/work-form/work-form.component.ts @@ -52,7 +52,7 @@ import { SnackbarService } from 'src/app/cdk/snackbar/snackbar.service' import { WorkIdentifiers } from 'src/app/shared/validators/work-identifiers/work-identifiers.validator' import { workCitationValidator } from 'src/app/shared/validators/citation/work-citation.validator' import { translatedTitleValidator } from 'src/app/shared/validators/translated-title/translated-title.validator' -import { EMPTY, merge, of, Subject } from 'rxjs' +import { merge, Subject, of } from 'rxjs' import { RecordService } from 'src/app/core/record/record.service' @Component({ @@ -267,51 +267,59 @@ export class WorkFormComponent implements OnInit { externalIdentifierType: string ): AsyncValidatorFn { return (control: AbstractControl) => { - return this._workService - .validateWorkIdTypes(externalIdentifierType, control.value) - .pipe( - map((value) => { - if ( - (formGroup.controls.externalIdentifierUrl?.value?.length > 0 && - formGroup.controls.externalIdentifierUrl.value !== - formGroup.controls.externalIdentifierUrlWasBackendGenerated - .value) || - formGroup.controls.externalIdentifierId.value === - formGroup.controls.externalIdentifierIdStored.value - ) { - // do not overwrite the existing URL - } else if ( - value.generatedUrl && - value.generatedUrl !== - formGroup.controls.externalIdentifierUrl.value - ) { - formGroup.controls.externalIdentifierUrl.setValue( - decodeURI(value.generatedUrl) - ) - formGroup.controls.externalIdentifierUrlWasBackendGenerated.setValue( - decodeURI(value.generatedUrl) - ) - } else if ( - !value.validFormat || - (value.attemptedResolution && !value.resolved) - ) { - if (!this.work?.putCode) { - formGroup.controls.externalIdentifierUrl.setValue('') + if (externalIdentifierType === 'isbn') { + if (!(control.value?.length === 10 || control.value?.length === 13)) { + return of({ validFormat: true }) + } else { + return of({}) + } + } else { + return this._workService + .validateWorkIdTypes(externalIdentifierType, control.value) + .pipe( + map((value) => { + if ( + (formGroup.controls.externalIdentifierUrl?.value?.length > 0 && + formGroup.controls.externalIdentifierUrl.value !== + formGroup.controls.externalIdentifierUrlWasBackendGenerated + .value) || + formGroup.controls.externalIdentifierId.value === + formGroup.controls.externalIdentifierIdStored.value + ) { + // do not overwrite the existing URL + } else if ( + value.generatedUrl && + value.generatedUrl !== + formGroup.controls.externalIdentifierUrl.value + ) { + formGroup.controls.externalIdentifierUrl.setValue( + decodeURI(value.generatedUrl) + ) + formGroup.controls.externalIdentifierUrlWasBackendGenerated.setValue( + decodeURI(value.generatedUrl) + ) + } else if ( + !value.validFormat || + (value.attemptedResolution && !value.resolved) + ) { + if (!this.work?.putCode) { + formGroup.controls.externalIdentifierUrl.setValue('') + } } - } - if (value.attemptedResolution && !value.resolved) { - return { - unResolved: true, + if (value.attemptedResolution && !value.resolved) { + return { + unResolved: true, + } } - } - if (!value.validFormat) { - return { - validFormat: true, + if (!value.validFormat) { + return { + validFormat: true, + } } - } - }) - ) + }) + ) + } } } diff --git a/src/app/register2/components/register2.scss-theme.scss b/src/app/register2/components/register2.scss-theme.scss index 34385dcebf..635eee1c5e 100644 --- a/src/app/register2/components/register2.scss-theme.scss +++ b/src/app/register2/components/register2.scss-theme.scss @@ -70,6 +70,14 @@ } } + :host { + ::ng-deep { + .container .mat-horizontal-content-container, + .container { + // background-color: map-get($background, 'ui-background-lightest'); + } + } + } ::ng-deep { .valid-password-input { diff --git a/src/app/register2/pages/register/register2.component.scss.theme.scss b/src/app/register2/pages/register/register2.component.scss.theme.scss index 33f5306fc3..b2a5d99f73 100644 --- a/src/app/register2/pages/register/register2.component.scss.theme.scss +++ b/src/app/register2/pages/register/register2.component.scss.theme.scss @@ -8,6 +8,8 @@ $foreground: map-get($theme, foreground); $background: map-get($theme, background); - + :host { + // background-color: map-get($background, 'ui-background-lightest'); + } } @include theme($orcid-app-theme); diff --git a/src/app/register2/pages/register/register2.component.ts b/src/app/register2/pages/register/register2.component.ts index 81e29fd316..7409ce242a 100644 --- a/src/app/register2/pages/register/register2.component.ts +++ b/src/app/register2/pages/register/register2.component.ts @@ -133,18 +133,6 @@ export class Register2Component implements OnInit, AfterViewInit { } register() { - console.log('register') - console.log(this.FormGroupStepA) - console.log("______________________") - console.log(this.FormGroupStepB) - console.log("______________________") - - console.log(this.FormGroupStepC) - console.log("______________________") - - console.log(this.FormGroupStepD) - console.log("______________________") - this.loading = true this.lastStep.interacted = true if ( From 08c3b93ed4a886143028ee26568012e7711657b0 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 17:38:58 -0600 Subject: [PATCH 4/8] batch-fixes-4-dec --- src/app/register2/components/register2.scss-theme.scss | 8 -------- .../pages/register/register2.component.scss.theme.scss | 3 --- 2 files changed, 11 deletions(-) diff --git a/src/app/register2/components/register2.scss-theme.scss b/src/app/register2/components/register2.scss-theme.scss index 635eee1c5e..34385dcebf 100644 --- a/src/app/register2/components/register2.scss-theme.scss +++ b/src/app/register2/components/register2.scss-theme.scss @@ -70,14 +70,6 @@ } } - :host { - ::ng-deep { - .container .mat-horizontal-content-container, - .container { - // background-color: map-get($background, 'ui-background-lightest'); - } - } - } ::ng-deep { .valid-password-input { diff --git a/src/app/register2/pages/register/register2.component.scss.theme.scss b/src/app/register2/pages/register/register2.component.scss.theme.scss index b2a5d99f73..a360686d1c 100644 --- a/src/app/register2/pages/register/register2.component.scss.theme.scss +++ b/src/app/register2/pages/register/register2.component.scss.theme.scss @@ -8,8 +8,5 @@ $foreground: map-get($theme, foreground); $background: map-get($theme, background); - :host { - // background-color: map-get($background, 'ui-background-lightest'); - } } @include theme($orcid-app-theme); From 0fba58df3ab6c5b4315e5304ebe5862559a688ab Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 18:08:34 -0600 Subject: [PATCH 5/8] batch-fixes-4-dec --- .../components/backend-error/backend-error.component.html | 2 +- .../components/backend-error/backend-error.component.ts | 2 ++ .../components/form-personal/form-personal.component.html | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/register2/components/backend-error/backend-error.component.html b/src/app/register2/components/backend-error/backend-error.component.html index d08320c6bb..45980f103d 100644 --- a/src/app/register2/components/backend-error/backend-error.component.html +++ b/src/app/register2/components/backend-error/backend-error.component.html @@ -1,4 +1,4 @@ - + This email already exists in our system. Would you like to diff --git a/src/app/register2/components/backend-error/backend-error.component.ts b/src/app/register2/components/backend-error/backend-error.component.ts index 6e36e49331..dabc88c937 100644 --- a/src/app/register2/components/backend-error/backend-error.component.ts +++ b/src/app/register2/components/backend-error/backend-error.component.ts @@ -29,6 +29,8 @@ enum RegisterBackendErrors { export class BackendErrorComponent implements OnInit { recognizedError = RegisterBackendErrors _errorCode: string + @Input() disableInlineAlreadyExistError = false + @Input() set errorCode(errorCode: string) { // This will change the string send by the backend into a code, to handle the error trough a code diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html index 17b5519dd3..53ab23f07b 100644 --- a/src/app/register2/components/form-personal/form-personal.component.html +++ b/src/app/register2/components/form-personal/form-personal.component.html @@ -92,7 +92,7 @@

class="orc-font-small-print" id="email-input-input-label" [ngClass]="{ - error: emailFormTouched && form.hasError('required', 'emails.email') + error: emailFormTouched && emails.controls.email.errors }" id="email-input-label" i18n="@@register.primaryEmail" @@ -124,8 +124,10 @@

@@ -141,6 +143,7 @@

*ngFor="let error of this.emails.getError('backendError', 'email')" > From 3f9881aaee905cc82639756821d5c973eeb9da6f Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 18:08:56 -0600 Subject: [PATCH 6/8] batch-fixes-4-dec --- .../components/backend-error/backend-error.component.html | 4 +++- .../components/form-personal/form-personal.component.html | 5 ++--- .../components/form-personal/form-personal.component.ts | 3 --- src/app/register2/components/register2.scss-theme.scss | 1 - src/app/register2/components/register2.style.scss | 3 --- .../pages/register/register2.component.scss.theme.scss | 1 - 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/app/register2/components/backend-error/backend-error.component.html b/src/app/register2/components/backend-error/backend-error.component.html index 45980f103d..df4401c026 100644 --- a/src/app/register2/components/backend-error/backend-error.component.html +++ b/src/app/register2/components/backend-error/backend-error.component.html @@ -1,4 +1,6 @@ - + This email already exists in our system. Would you like to diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html index 53ab23f07b..6c9b1b6d80 100644 --- a/src/app/register2/components/form-personal/form-personal.component.html +++ b/src/app/register2/components/form-personal/form-personal.component.html @@ -125,9 +125,8 @@

diff --git a/src/app/register2/components/form-personal/form-personal.component.ts b/src/app/register2/components/form-personal/form-personal.component.ts index ad1e93dce1..cbf6800b48 100644 --- a/src/app/register2/components/form-personal/form-personal.component.ts +++ b/src/app/register2/components/form-personal/form-personal.component.ts @@ -269,7 +269,6 @@ export class FormPersonalComponent extends BaseForm implements OnInit { return this.emailConfirmationValid && this.emailValid } - navigateToSignin(email) { this._platform .get() @@ -282,6 +281,4 @@ export class FormPersonalComponent extends BaseForm implements OnInit { }) }) } - - } diff --git a/src/app/register2/components/register2.scss-theme.scss b/src/app/register2/components/register2.scss-theme.scss index 34385dcebf..1cdd3193b5 100644 --- a/src/app/register2/components/register2.scss-theme.scss +++ b/src/app/register2/components/register2.scss-theme.scss @@ -70,7 +70,6 @@ } } - ::ng-deep { .valid-password-input { mat-icon { diff --git a/src/app/register2/components/register2.style.scss b/src/app/register2/components/register2.style.scss index bc41599239..2cea556c31 100644 --- a/src/app/register2/components/register2.style.scss +++ b/src/app/register2/components/register2.style.scss @@ -58,8 +58,6 @@ mat-label.orc-font-small-print { } :host ::ng-deep { - - mat-card { margin-top: 32px !important; } @@ -167,7 +165,6 @@ mat-label.orc-font-small-print { margin-bottom: 0px; } - mat-vertical-stepper.orcid-stepper-wizard, mat-horizontal-stepper.orcid-stepper-wizard { mat-card { diff --git a/src/app/register2/pages/register/register2.component.scss.theme.scss b/src/app/register2/pages/register/register2.component.scss.theme.scss index a360686d1c..acea1f830d 100644 --- a/src/app/register2/pages/register/register2.component.scss.theme.scss +++ b/src/app/register2/pages/register/register2.component.scss.theme.scss @@ -7,6 +7,5 @@ $warn: map-get($theme, accent); $foreground: map-get($theme, foreground); $background: map-get($theme, background); - } @include theme($orcid-app-theme); From a20c69819b2f0c0f24aa990cf59deb32ed1ed158 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 18:13:26 -0600 Subject: [PATCH 7/8] batch-fixes-4-dec --- .../form-notifications/form-notifications.component.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/register2/components/form-notifications/form-notifications.component.scss b/src/app/register2/components/form-notifications/form-notifications.component.scss index 58207ec0a4..c3504845c5 100644 --- a/src/app/register2/components/form-notifications/form-notifications.component.scss +++ b/src/app/register2/components/form-notifications/form-notifications.component.scss @@ -1,3 +1,8 @@ :host { max-width: 100%; + ::ng-deep { + label { + white-space: initial; + } + } } From 4dff06e88436ea73fd70c09f134350be11fd45a6 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Mon, 4 Dec 2023 18:23:09 -0600 Subject: [PATCH 8/8] batch-fixes-4-dec --- src/app/register2/components/BaseForm.ts | 1 - src/app/register2/pages/register/register2.component.html | 3 ++- src/app/register2/pages/register/register2.component.ts | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/register2/components/BaseForm.ts b/src/app/register2/components/BaseForm.ts index 317ced3fb2..67888b5de5 100644 --- a/src/app/register2/components/BaseForm.ts +++ b/src/app/register2/components/BaseForm.ts @@ -13,7 +13,6 @@ export abstract class BaseForm implements ControlValueAccessor, AsyncValidator { public onTouchedFunction constructor() {} writeValue(val: any): void { - console.log('writeValue', val) if (val != null && val !== undefined && val !== '') { this.form.setValue(val, { emitEvent: true }) // Trigger registerOnChange custom function by calling form.updateValueAndValidity diff --git a/src/app/register2/pages/register/register2.component.html b/src/app/register2/pages/register/register2.component.html index db7dcf6ef1..84918f637a 100644 --- a/src/app/register2/pages/register/register2.component.html +++ b/src/app/register2/pages/register/register2.component.html @@ -7,6 +7,7 @@ #stepper labelPosition="bottom" class="orcid-stepper-wizard" + (selectionChange)="selectionChange($event)" > Visibility and terms