Merge branch 'main' into fix/9116-tech-check-errors-on-the-home-page

ORCID · Mar 13, 2024 · 5db7b46 · 5db7b46
2 parents 6052c84 + e502f09
commit 5db7b46
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 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)
+
+- [#2190](https://github.com/ORCID/orcid-angular/pull/2190): style: Add semicolon and italic style to link
+
 ## v2.62.9 - 2024-03-13
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.8...v2.62.9)

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
@@ -226,7 +227,7 @@ <h1 class="orc-font-heading-small" i18n="@@authorize.authorize">
         i18n="@@authorize.organizationAskedFollowingAccess"
       >
         This organization has asked for the following access to your ORCID
-        record
+        record:
       </p>
 
       <ul class="mat-body-1 m-t-base m-b-64">
@@ -260,13 +261,8 @@ <h1 class="orc-font-heading-small" i18n="@@authorize.authorize">
         Authorize access
       </button>
       <div class="row deny-button-wrapper">
-        <a
-          id="deny-button"
-          class="underline"
-          (click)="authorize(false)"
-          i18n="@@authorize.deny"
-        >
-          Deny access
+        <a id="deny-button" class="underline" (click)="authorize(false)">
+          <i i18n="@@authorize.deny">Deny access</i>
         </a>
       </div>
     </mat-card-content>

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/locale/properties/authorize/authorize.ar.properties b/src/locale/properties/authorize/authorize.ar.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=، معلمة نوع الاستجابة مف
 authorize.error=لقد وصلت إلى هذه الصفحة بسبب خطأ في دمج التطبيق. يُرجى إبلاغ المؤسسة التي تطلب معرِّف أوركيد الخاص بك بهذا الخطأ.
 authorize.showDetails=إظهار التفاصيل
 authorize.hideDetails=إخفاء التفاصيل
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.cs.properties b/src/locale/properties/authorize/authorize.cs.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, chybí parametr typu reakce.
 authorize.error=Na tuto stránku jste se dostali z důvodu chyby integrace aplikace. Nahlaste prosím tuto chybu organizaci, která požaduje vaše ORCID iD.
 authorize.showDetails=Skrýt podrobnosti
 authorize.hideDetails=Skrýt podrobnosti
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.de.properties b/src/locale/properties/authorize/authorize.de.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, fehlender Antworttypparameter.
 authorize.error=Sie haben diese Seite aufgrund eines Fehlers bei der Integration der Anwendung erreicht. Bitte melden Sie diesen Fehler der Organisation, die Ihre ORCID-iD angefordert hat.
 authorize.showDetails=Details anzeigen
 authorize.hideDetails=Details ausblenden
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.en.properties b/src/locale/properties/authorize/authorize.en.properties
@@ -31,7 +31,7 @@ authorize.errorMissingResponseType2=, missing response type parameter.
 authorize.error=You have reached this page due to an error with the application's integration. Please report this error to the organization that is requesting your ORCID iD.
 authorize.showDetails=Show details
 authorize.hideDetails=Hide details
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
+authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record:
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.es.properties b/src/locale/properties/authorize/authorize.es.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=. Falta el parámetro "response_type" .
 authorize.error=Ha llegado a esta página debido a un error en la integración de la aplicación. Informe de este error a la organización que solicita su ORCID iD.
 authorize.showDetails=Mostrar detalles
 authorize.hideDetails=Ocultar detalles
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.fr.properties b/src/locale/properties/authorize/authorize.fr.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=type de paramètre de réponse manquante
 authorize.error=Vous avez atteint cette page en raison d'une erreur d'intégration de l'application. Veuillez signaler cette erreur à l'organisation qui demande votre identifiant ORCID.
 authorize.showDetails=Afficher les détails
 authorize.hideDetails=Masquer les détails
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.it.properties b/src/locale/properties/authorize/authorize.it.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, parametro del tipo di risposta mancante.
 authorize.error=Ti trovi su questa pagina per via di un errore con l’integrazione dell’app. Segnala questo errore all’organizzazione che ti richiede l’iD ORCID.
 authorize.showDetails=Nascondi i dettagli
 authorize.hideDetails=Nascondi i dettagli
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.ja.properties b/src/locale/properties/authorize/authorize.ja.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=応答タイプパラメータがありま
 authorize.error=アプリケーションの統合エラーのため、このページにアクセスしています。このエラーについて、ORCID iDをリクエストしている組織に連絡してください。
 authorize.showDetails=詳細の表示
 authorize.hideDetails=詳細の非表示
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.ko.properties b/src/locale/properties/authorize/authorize.ko.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, 누락된 response type 파라미터.
 authorize.error=애플리케이션 통합에 오류가 발생하여 이 페이지가 표시되었습니다. 귀하의 ORCID iD를 요청한 조직에 이 오류를 신고하시기 바랍니다.
 authorize.showDetails=세부정보 표시
 authorize.hideDetails=세부정보 숨기기
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.pl.properties b/src/locale/properties/authorize/authorize.pl.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, brak parametru typu odpowiedzi.
 authorize.error=Przekierowanie na tę stronę nastąpiło z powodu błędu integracji aplikacji. Zgłoś ten błąd organizacji, która prosi o identyfikator ORCID.
 authorize.showDetails=Pokaż szczegóły
 authorize.hideDetails=Ukryj szczegóły
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.pt.properties b/src/locale/properties/authorize/authorize.pt.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, faltando-lhe o parâmetro do tipo de respo
 authorize.error=Chegou a esta página devido a um erro com a integração da aplicação. Reporte este erro à organização que está a solicitar o seu ORCID iD.
 authorize.showDetails=Exibir detalhes
 authorize.hideDetails=Ocultar detalhes
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.tr.properties b/src/locale/properties/authorize/authorize.tr.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=, yanıt türü parametresi eksik.
 authorize.error=Uygulamanın entegrasyonundaki bir hata nedeniyle bu sayfaya ulaştınız. Lütfen bu hatayı ORCID kimliğinizi isteyen kuruluşa bildirin.
 authorize.showDetails=Ayrıntıları göster
 authorize.hideDetails=Ayrıntıları gizle
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.zh_CN.properties b/src/locale/properties/authorize/authorize.zh_CN.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=，响应类型参数缺失。
 authorize.error=由于应用程序集成错误，您已进入此页面。请向请求您 ORCID iD 号的组织报告此错误。
 authorize.showDetails=显示详细信息
 authorize.hideDetails=隐藏详细信息
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)

diff --git a/src/locale/properties/authorize/authorize.zh_TW.properties b/src/locale/properties/authorize/authorize.zh_TW.properties
@@ -31,7 +31,6 @@ authorize.errorMissingResponseType2=，缺少回覆類型參數。
 authorize.error=由於應用程式整合出現錯誤而將您轉到此頁面。請向要求您的 ORCID iD 的組織提報此錯誤。
 authorize.showDetails=隱藏詳細資訊
 authorize.hideDetails=隱藏詳細資訊
-authorize.organizationAskedFollowingAccess=This organization has asked for the following access to your ORCID record
 authorize.readInfomationVisibilityTrustedParties=Read your information with visibility set to Trusted parties
 authorize.addUpdateReseachActivities=Add/update your research activities (works, affiliations, etc.)
 authorize.addUpdateInformation=Add/update information about your (country, keywords, etc.)