Merge branch 'main' into amontenegro/PD-5754

Author: amontenegro

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.135.10 - 2026-06-17
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.135.9...v2.135.10)
+
+- [#2863](https://github.com/ORCID/orcid-angular/pull/2863): PD-5389, PD-5402
+
 ## v2.135.9 - 2026-06-16
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.135.8...v2.135.9)

projects/orcid-ui/src/lib/components/record-header/record-header.component.scss

@@ -325,6 +325,11 @@
   min-width: 0;
   flex: 1; // Grow to fill space
 
+  // Keep Copy/Print actions close to the ORCID iD on desktop non-compact mode.
+  .desktop:not(.compact) & {
+    flex: 0 0 auto;
+  }
+
   .id-content {
     display: flex;
     align-items: center;

src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html

@@ -53,7 +53,7 @@ <h4 title i18n>What happens when you remove a duplicate ORCID account?</h4>
     </ul>
   </app-alert-message>
   @if (authenticated) {
-  <form [formGroup]="form" (ngSubmit)="onSubmit()">
+  <form [formGroup]="form" (ngSubmit)="onSubmit()" autocomplete="off">
     <h3 i18n class="mb-2 mt-0">You are removing this duplicate account</h3>
     @if (data.deprecatingAccountName) {
     <p class="leading-5.25">{{ data.deprecatingAccountName }}</p>
@@ -82,7 +82,7 @@ <h3 i18n class="mb-2 mt-0">You are removing this duplicate account</h3>
     </button>
   </form>
   } @else {
-  <form [formGroup]="form" (ngSubmit)="submitVerify()">
+  <form [formGroup]="form" (ngSubmit)="submitVerify()" autocomplete="off">
     <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
     <p i18n class="mb-8!">
       You will need to verify your sign in details for the duplicate account
@@ -108,7 +108,7 @@ <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
         formControlName="deprecatingOrcidOrEmail"
         type="text"
         matInput
-        autocomplete="email"
+        autocomplete="off"
         [errorStateMatcher]="errorMatcher"
         id="cy-duplicate-rercod-email"
       />
@@ -132,7 +132,7 @@ <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
         formControlName="password"
         type="password"
         matInput
-        autocomplete="password"
+        autocomplete="new-password"
         [errorStateMatcher]="errorMatcher"
         id="cy-duplicate-rercod-email"
       />

src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts

@@ -1,4 +1,11 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core'
 import {
   FormGroupDirective,
   NgForm,
@@ -37,7 +44,7 @@ export class NeverShowErrorMatcher implements ErrorStateMatcher {
   preserveWhitespaces: true,
   standalone: false,
 })
-export class SettingsActionsDuplicatedComponent implements OnInit {
+export class SettingsActionsDuplicatedComponent implements OnInit, OnDestroy {
   errorMatcher = new NeverShowErrorMatcher()
   userSession: UserSession
   constructor(
@@ -121,7 +128,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
         document.activeElement.blur()
       }
       this.loadingVerify = false
-      this.form.reset()
+      this.resetFormState()
       if (success) {
         this.authenticated = true
       } else {
@@ -169,7 +176,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
 
         if (data.success) {
           this.errors = []
-          this.form.reset()
+          this.resetFormState()
           this.success = true
         }
         if (data.errors?.length || !data.twoFactorToken) {
@@ -179,9 +186,17 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
       },
       error: () => {
         this.cancelAuthentication = true
-        this.form.reset()
+        this.resetFormState()
         this.loading.next(false)
       },
     })
   }
+
+  ngOnDestroy(): void {
+    this.resetFormState()
+  }
+
+  private resetFormState(): void {
+    this.form?.reset()
+  }
 }

src/app/account-settings/components/settings-security-password/settings-security-password.component.html

@@ -1,5 +1,5 @@
 <app-settings-panels-data *ngIf="form">
-  <form [formGroup]="form">
+  <form [formGroup]="form" autocomplete="off">
     @if (success) {
     <app-alert-message type="success" class="mb-8">
       <div content class="mt-0.5" i18n>
@@ -33,6 +33,7 @@
           matInput
           formControlName="oldPassword"
           type="password"
+          autocomplete="new-password"
           [errorStateMatcher]="errorMatcher"
           [ngClass]="{
             error:

src/app/account-settings/components/settings-security-password/settings-security-password.component.ts

@@ -193,6 +193,7 @@ export class SettingsSecurityPasswordComponent implements OnInit, OnDestroy {
     return status
   }
   ngOnDestroy(): void {
+    this.form?.reset()
     this.$destroy.next()
     this.$destroy.complete()
   }

src/locale/messages.lr.xlf

@@ -65,7 +65,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">51,53</context>
+          <context context-type="linenumber">52,54</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
@@ -836,7 +836,7 @@
         <source>for</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">59</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/reset-password/reset-password/reset-password.component.ts</context>
@@ -848,7 +848,7 @@
         <source>to continue removing a duplicate account</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">60</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
@@ -1370,31 +1370,31 @@
         <source>New password</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
       <trans-unit id="shared.passwordCantBeEmpty" datatype="html" resname="shared.passwordCantBeEmpty">
         <source>Password cannot be empty</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">112,114</context>
+          <context context-type="linenumber">113,115</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
       <trans-unit id="register.wrongPasswordPatternV2" datatype="html" resname="register.wrongPasswordPatternV2">
         <source>Password must meet all requirements</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">124,126</context>
+          <context context-type="linenumber">125,127</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
       <trans-unit id="register.passwordCantBeEmail" datatype="html" resname="register.passwordCantBeEmail">
         <source>Password must not be the same as your email address</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">131,133</context>
+          <context context-type="linenumber">132,134</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/components/form-password/form-password.component.html</context>
@@ -1410,15 +1410,15 @@
         <source>Password must be between 8 and 256 characters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">139,141</context>
+          <context context-type="linenumber">140,142</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
       <trans-unit id="register.passwordConfirmationRequired" datatype="html" resname="register.passwordConfirmationRequired">
         <source>Retype your password</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">192,194</context>
+          <context context-type="linenumber">193,195</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/components/form-password/form-password.component.html</context>
@@ -1430,15 +1430,15 @@
         <source>Passwords do not match</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">203,205</context>
+          <context context-type="linenumber">204,206</context>
         </context-group>
         <target>LR</target>
       </trans-unit>
       <trans-unit id="register.yourPasswordHas" datatype="html" resname="register.yourPasswordHas">
         <source>Your password has:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">209</context>
+          <context context-type="linenumber">210</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/components/form-password/form-password.component.html</context>
@@ -1450,7 +1450,7 @@
         <source>8 or more characters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">215</context>
+          <context context-type="linenumber">216</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/components/form-password/form-password.component.html</context>
@@ -1462,7 +1462,7 @@
         <source>At least 1 letter or symbol</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">221,223</context>
+          <context context-type="linenumber">222,224</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/components/form-password/form-password.component.html</context>
@@ -1474,7 +1474,7 @@
         <source>At least 1 number</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">229</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/components/form-password/form-password.component.html</context>
@@ -1486,7 +1486,7 @@
         <source>Save changes</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account-settings/components/settings-security-password/settings-security-password.component.html</context>
-          <context context-type="linenumber">240,242</context>
+          <context context-type="linenumber">241,243</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/cdk/side-bar/modals/modal-country/modal-country.component.html</context>