Merge branch 'main' into fix/9134-qa-intro-text-too-small-in-oauth-sc…

…reen
ORCID · Mar 13, 2024 · 09e5e00 · 09e5e00
2 parents d714503 + 0e43d6f
commit 09e5e00
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## v2.62.13 - 2024-03-13
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.12...v2.62.13)
+
+- [#2194](https://github.com/ORCID/orcid-angular/pull/2194): Fix/9116 tech check errors on the home page
+
+### Fix
+
+- Return empty observable instead of null
+
+## v2.62.12 - 2024-03-13
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.11...v2.62.12)
+
+- [#2193](https://github.com/ORCID/orcid-angular/pull/2193): fix: Add condition to wait for sign in togglz
+
+### Fix
+
+- Add condition to wait for sign in togglz
+
+## v2.62.11 - 2024-03-13
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.10...v2.62.11)
+
+- [#2192](https://github.com/ORCID/orcid-angular/pull/2192): fix: Remove autofocus if new sign in togglz is enabled
+
+### Fix
+
+- Remove autofocus if new sign in togglz is enabled
+
 ## v2.62.10 - 2024-03-13
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.9...v2.62.10)

diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.html b/src/app/authorize/components/form-authorize/form-authorize.component.html
@@ -152,6 +152,7 @@
 
   <ng-container *ngIf="signInUpdatesV1Togglz">
     <mat-progress-bar
+      class="progress-bar"
       id="loading-bar"
       *ngIf="
         loadingUserInfo || loadingTrustedIndividuals || loadingAuthorizeEndpoint

diff --git a/src/app/authorize/pages/authorize/authorize.component.html b/src/app/authorize/pages/authorize/authorize.component.html
@@ -18,7 +18,7 @@
         >
           <app-form-authorize
             [signInUpdatesV1Togglz]="signInUpdatesV1Togglz"
-            *ngIf="showAuthorizationComponent"
+            *ngIf="showAuthorizationComponent && !loading"
           ></app-form-authorize>
           <app-oauth-error
             *ngIf="!showAuthorizationComponent"

diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts
@@ -14,6 +14,7 @@ export class AuthorizeComponent implements OnInit {
   platform: PlatformInfo
   showAuthorizationComponent: boolean
   signInUpdatesV1Togglz = false
+  loading = true
 
   constructor(
     _user: UserService,
@@ -36,6 +37,9 @@ export class AuthorizeComponent implements OnInit {
     this._togglz
       .getStateOf('SIGN_IN_UPDATES_V1')
       .pipe(take(1))
-      .subscribe((value) => (this.signInUpdatesV1Togglz = value))
+      .subscribe((value) => {
+        this.loading = false
+        this.signInUpdatesV1Togglz = value
+      })
   }
 }
diff --git a/src/app/cdk/info-drop-down/info-drop-down.component.scss b/src/app/cdk/info-drop-down/info-drop-down.component.scss
@@ -12,6 +12,10 @@
 .description-client {
   margin: 0 !important;
 }
+b {
+  word-break: break-all;
+}
+
 mat-icon {
   margin-top: 2px; // Compensates mat icon bottom with space
   margin-left: 4px;

diff --git a/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts b/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts
@@ -171,8 +171,10 @@ export class FormSignInComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngAfterViewInit(): void {
-    this.firstInput.nativeElement.focus()
-    this.cd.detectChanges()
+    if (!this.signInUpdatesV1Togglz) {
+      this.firstInput.nativeElement.focus()
+      this.cd.detectChanges()
+    }
   }
 
   onSubmit() {

diff --git a/src/index.html b/src/index.html
@@ -8,12 +8,6 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <link
-      rel="preload"
-      href="./assets/vectors/profile-not-verified.svg"
-      as="image"
-    />
-
     <link rel="icon" type="image/x-icon" href="./assets/icons/favicon.ico" />
     <link
       href="https://fonts.googleapis.com/icon?family=Material+Icons"