From 9bbd6404e5ff030b9c66becd9bd5f321b1c82830 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 23 Jul 2024 19:24:24 +0000 Subject: [PATCH 01/11] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20format?= =?UTF-8?q?=5Fprettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings-defaults-email-frequency.component.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts index b1bd1e0c6..b44baf6d8 100644 --- a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts +++ b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts @@ -112,15 +112,18 @@ export class SettingsDefaultsEmailFrequencyComponent this.isMobile = platform.columns4 || platform.columns8 }) - this._record + this._record .getRecord() .pipe(takeUntil(this.$destroy)) .subscribe((userRecord) => { - this.primaryEmail = userRecord.emails.emails.find((email) => email.primary).value - this.primaryEmailVerified = userRecord.emails.emails.find((email) => email.primary).verified + this.primaryEmail = userRecord.emails.emails.find( + (email) => email.primary + ).value + this.primaryEmailVerified = userRecord.emails.emails.find( + (email) => email.primary + ).verified }) } - openEmailModal() { return this._dialog From 696c659c95beb079b0c54b04e1ef860b6cb8b177 Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 23 Jul 2024 19:34:31 +0000 Subject: [PATCH 02/11] v2.102.5 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f04c5ede5..ccbad4336 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v2.102.5 - 2024-07-23 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.4...v2.102.5) + +- [#2304](https://github.com/ORCID/orcid-angular/pull/2304): Lmendoza/9313 qa notification email address in account settings doesnt update when theres a change + ## v2.102.4 - 2024-07-23 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.3...v2.102.4) From e48c4384a4a9c8bae0c75d066d45648e55a82efe Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:02:21 +0300 Subject: [PATCH 03/11] notification frequency menu styling changes (#2305) --- ...ttings-defaults-email-frequency.component.html | 2 ++ ...ttings-defaults-email-frequency.component.scss | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html index 87d2e840b..ffe602b3d 100644 --- a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html +++ b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html @@ -51,6 +51,7 @@

@@ -77,6 +78,7 @@

diff --git a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss index 96e8c13f8..aa910dd4b 100644 --- a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss +++ b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss @@ -20,7 +20,7 @@ mat-form-field { } label { - margin-bottom: 8px; + margin-bottom: 2px; } .italic { @@ -51,9 +51,22 @@ mat-checkbox { justify-content: space-between; max-width: 100%; .email-container { + min-width: 0; display: flex; gap: 16px; align-items: center; + div { + min-width: 0; + line-height: 21px; + } + label, + caption { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + text-align: left; + display: block !important; + } label { font-weight: bold; } From 28690b9674b49e93d36cf5c2ff9581a1ee8f6289 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:08:28 +0300 Subject: [PATCH 04/11] primary email no longer highlighted in bold (#2306) Co-authored-by: Angel Montenegro --- src/app/cdk/side-bar/side-bar/side-bar.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/cdk/side-bar/side-bar/side-bar.component.html b/src/app/cdk/side-bar/side-bar/side-bar.component.html index 1da483eed..7a3cabaf2 100644 --- a/src/app/cdk/side-bar/side-bar/side-bar.component.html +++ b/src/app/cdk/side-bar/side-bar/side-bar.component.html @@ -55,7 +55,6 @@

Emails

[visibility]=" isPublicRecord ? '' : email.verified ? email.visibility : 'PRIVATE' " - [bold]="email.primary" [isPublicRecord]="isPublicRecord" >{{ email.value }} From 2ed6e4c3921d019d01e73e5465dbdf2fad707ebb Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 24 Jul 2024 17:12:21 +0000 Subject: [PATCH 05/11] v2.102.6 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccbad4336..782ebab2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.102.6 - 2024-07-24 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.5...v2.102.6) + ## v2.102.5 - 2024-07-23 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.4...v2.102.5) From db09154662490cd50a53e1f1f89e162388a5564b Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:12:44 +0300 Subject: [PATCH 06/11] fix email notification dropdown focus (#2312) --- .../modals/modal-email/modal-email.component.html | 9 ++++++--- .../modals/modal-email/modal-email.component.scss | 6 ------ .../modal-email/modal-email.component.scss-theme.scss | 7 ++++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html index f5be10ed4..72d6c8dab 100644 --- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html +++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html @@ -249,7 +249,10 @@

>your ORCID account settings.

-
+ }" placeholder=" {{ primaryEmail?.value }}" [(value)]="primaryEmail" - class="select-notifications-email orc-font-body-small" + class="orc-font-body-small" > -
+ diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss index 83c31aba7..8a9006538 100644 --- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss +++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss @@ -104,14 +104,8 @@ mat-form-field { } .select-notifications-email { - padding: 0 8px 0 8px; - align-items: center; - display: flex; height: 38px; max-width: 402px; - width: auto; - border: solid 1px; - border-radius: 0 5px 5px 0; } .current-notification-email { font-weight: bold; diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss-theme.scss b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss-theme.scss index 998cf07b3..20ea5a02e 100644 --- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss-theme.scss +++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.scss-theme.scss @@ -29,10 +29,11 @@ background: mat.get-color-from-palette($background, 'ui-background-light'); } + ::ng-deep .mat-option-text { + color: black; + } + .select-notifications-email { - ::ng-deep .mat-select-placeholder { - color: black; - } color: rgba(0, 0, 0, 0.12); } From 1e6fae275f307c34b11087318f2cdc5e44952453 Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 24 Jul 2024 17:22:27 +0000 Subject: [PATCH 07/11] v2.102.7 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 782ebab2e..b9e5e963a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.102.7 - 2024-07-24 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.6...v2.102.7) + ## v2.102.6 - 2024-07-24 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.5...v2.102.6) From 7a2e2f80d1df23e329f160f9bcebb55e24639ad8 Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 24 Jul 2024 17:32:01 +0000 Subject: [PATCH 08/11] v2.102.8 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9e5e963a..94f51cf4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.102.8 - 2024-07-24 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.7...v2.102.8) + ## v2.102.7 - 2024-07-24 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.6...v2.102.7) From 39c167fe7fdf657f5d58c7607a7b9f522f9f57b1 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:25:49 +0300 Subject: [PATCH 09/11] Fix verified email deletion logic (#2307) * fix deleting verified emails logic * fix logic --- .../modals/modal-email/modal-email.component.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts index 6f25d9704..6bc34acee 100644 --- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts +++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts @@ -247,12 +247,17 @@ export class ModalEmailComponent implements OnInit, OnDestroy { } setNextEmailAsPrimary() { - const verifiedEmails = this.emails.filter((email) => email.verified) - const currentIndex = verifiedEmails.findIndex( + let emails = this.emails.filter((email) => email.verified) + // If there are no verified emails left, set any next email as primary + // we're counting the one being deleted + if (emails.length <= 1) { + emails = this.emails + } + const currentIndex = emails.findIndex( (value) => value.putCode === this.primaryEmail.putCode ) - const nextIndex = (currentIndex + 1) % verifiedEmails.length - const nextEmail = verifiedEmails[nextIndex] + const nextIndex = (currentIndex + 1) % emails.length + const nextEmail = emails[nextIndex] this.makePrimary(nextEmail) } @@ -402,7 +407,6 @@ export class ModalEmailComponent implements OnInit, OnDestroy { if (controlKey === this.primaryEmail?.putCode) { this.setNextEmailAsPrimary() } - const i = this.emails.findIndex((value) => value.putCode === controlKey) this.emails.splice(i, 1) this.emailsForm.removeControl(controlKey) From 9b1e0d17c6f1850c21f0f9173b1725f195308b57 Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 24 Jul 2024 18:35:31 +0000 Subject: [PATCH 10/11] v2.102.9 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94f51cf4d..5ee17c237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.102.9 - 2024-07-24 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.8...v2.102.9) + ## v2.102.8 - 2024-07-24 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.7...v2.102.8) From 779a007a0c2139a9c7bb546c69576b4f7fa6b431 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:57:47 +0300 Subject: [PATCH 11/11] improve dropdown activation logic (#2308) --- .../side-bar/modals/modal-email/modal-email.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html index 72d6c8dab..98748483f 100644 --- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html +++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html @@ -256,10 +256,10 @@