Merge branch 'main' into feature/9071-sign-in-oauth

ORCID · Feb 21, 2024 · fd71942 · fd71942
2 parents 1ac80f7 + 5306d39
commit fd71942
Show file tree

Hide file tree

Showing 20 changed files with 130 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## v2.56.2 - 2024-02-21
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.56.1...v2.56.2)
+
+- [#2163](https://github.com/ORCID/orcid-angular/pull/2163): fix: Add new translations required
+
+### Fix
+
+- Add new translations required
+
+## v2.56.1 - 2024-02-20
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.56.0...v2.56.1)
+
+## v2.56.0 - 2024-02-19
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.55.12...v2.56.0)
+
+## v2.55.12 - 2024-02-19
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.55.11...v2.55.12)
+
 ## v2.55.11 - 2024-02-16
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.55.10...v2.55.11)

diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -5,6 +5,6 @@
   <app-header *ngIf="!headlessMode" currentRoute=""></app-header>
   <div class="router-container">
     <router-outlet> </router-outlet>
-    <app-footer></app-footer>
+    <app-footer *ngIf="!footerlessMode"></app-footer>
   </div>
 </div>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -25,6 +25,7 @@ import { ERROR_REPORT } from './errors'
 export class AppComponent {
   currentlyDisplayingZendesk = true
   headlessMode = false
+  footerlessMode = false
   currentRouteIsHeadlessOnOauthPage = true
   screenDirection
   currentRoute
@@ -126,6 +127,7 @@ export class AppComponent {
       (platformInfo.hasOauthParameters || oauthSessionFound) &&
       this.currentRouteIsHeadlessOnOauthPage
     this.headlessMode = isOauth || platformInfo.summaryScreen
+    this.footerlessMode = platformInfo.summaryScreen
     this.ie = platformInfo.ie
     this.edge = platformInfo.edge
     this.tabletOrHandset = platformInfo.tabletOrHandset

diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts
@@ -54,17 +54,19 @@ export class AffiliationStacksGroupsComponent implements OnInit {
   @Output()
   expandedContentChange: EventEmitter<MainPanelsState> = new EventEmitter()
   professionalActivitiesTogglz = false
-  sortTypes: SortOrderType[] = ['title', 'start', 'end']
+  sortTypes: SortOrderType[] = ['title', 'start', 'end', 'source']
   professionalActivitiesSortTypes: SortOrderType[] = [
     'title',
     'type',
     'start',
     'end',
+    'source',
   ]
   educationAndQualificationSortTypes: SortOrderType[] = [
     'title',
     'start',
     'end',
+    'source',
   ]
   constructor(
     private _record: RecordService,
@@ -77,16 +79,6 @@ export class AffiliationStacksGroupsComponent implements OnInit {
       .getStateOf('PROFESSIONAL_ACTIVITIES')
       .pipe(take(1))
       .subscribe((value) => (this.professionalActivitiesTogglz = value))
-    this._togglz
-      .getStateOf('SOURCE_SORTING')
-      .pipe(take(1))
-      .subscribe((sourceSortingTogglz: boolean) => {
-        if (sourceSortingTogglz) {
-          this.sortTypes.push('source')
-          this.professionalActivitiesSortTypes.push('source')
-          this.educationAndQualificationSortTypes.push('source')
-        }
-      })
     this.$loading = this._recordAffiliationService.$loading
     this._record
       .getRecord({

diff --git a/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.html b/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.html
@@ -16,7 +16,7 @@
     [(expandedContent)]="expandedContent['FUNDING']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
     [sortTypes]="sortTypes"
-    [sortType]="'date'"
+    [sortType]="'end'"
     (sort)="sortEvent($event)"
   >
     <ng-container *ngIf="fundings.length > 0">

diff --git a/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.ts b/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.ts
@@ -41,7 +41,7 @@ export class FundingStacksGroupsComponent implements OnInit {
   ngOrcidFunding = $localize`:@@shared.funding:Funding`
   countryCodes: { key: string; value: string }[]
   loading = true
-  sortTypes: SortOrderType[] = ['title', 'start', 'end']
+  sortTypes: SortOrderType[] = ['title', 'start', 'end', 'source']
 
   constructor(
     private _userSession: UserService,
@@ -52,14 +52,6 @@ export class FundingStacksGroupsComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this._togglz
-      .getStateOf('SOURCE_SORTING')
-      .pipe(take(1))
-      .subscribe((sourceSortingTogglz: boolean) => {
-        if (sourceSortingTogglz) {
-          this.sortTypes.push('source')
-        }
-      })
     this.getRecord()
   }
 

diff --git a/src/app/record/components/record-header/record-header.component.html b/src/app/record/components/record-header/record-header.component.html
@@ -112,7 +112,10 @@
               'orc-font-body-large': platform.columns12
             }"
           >
-            {{ orcidId }}
+            <ng-container *ngIf="!platform.columns12; else elseBlock">{{
+              isPublicRecord
+            }}</ng-container>
+            <ng-template #elseBlock>{{ orcidId }}</ng-template>
           </h2>
           <div
             class="buttons-wrapper"

diff --git a/src/app/record/components/record-info/record-info.component.html b/src/app/record/components/record-info/record-info.component.html
@@ -4,11 +4,7 @@
     [ngClass]="{ 'no-padding': displayBiography || displaySideBar }"
   >
     <ng-container
-      *ngIf="
-        userInfo.IS_LOCKED === 'true' &&
-        userInfo.IS_DEACTIVATED === 'false' &&
-        !userInfo.PRIMARY_RECORD
-      "
+      *ngIf="userInfo.IS_LOCKED === 'true' && !userInfo.PRIMARY_RECORD"
     >
       <p>
         <ng-container i18n="@@topBar.weLockRecords">
@@ -37,7 +33,11 @@
     </ng-container>
 
     <ng-container
-      *ngIf="userInfo.IS_DEACTIVATED === 'true' && !userInfo.PRIMARY_RECORD"
+      *ngIf="
+        userInfo.IS_DEACTIVATED === 'true' &&
+        userInfo.IS_LOCKED === 'false' &&
+        !userInfo.PRIMARY_RECORD
+      "
     >
       <p>
         <ng-container i18n="@@topBar.whenOrcidDeactivated">
@@ -61,11 +61,11 @@
       <p>
         <ng-container i18n="@@topBar.accountDeprecated">
           This account has been deprecated, please see account </ng-container
-        >&nbsp;<a [href]="userInfo.PRIMARY_RECORD">{{
+        >&nbsp;<a class="underline" [href]="userInfo.PRIMARY_RECORD">{{
           'https:' + baseUrl + userInfo.PRIMARY_RECORD
         }}</a
-        >&nbsp;<ng-container i18n="@@topBar.accountDeprecated2"
-          >for the latest information
+        >&nbsp;<ng-container i18n="@@topBar.forTheLastInformation"
+          >for the latest information.
         </ng-container>
       </p>
       <p>

diff --git a/src/app/record/components/work-stack-group/work-stack-group.component.ts b/src/app/record/components/work-stack-group/work-stack-group.component.ts
@@ -134,7 +134,7 @@ export class WorkStackGroupComponent implements OnInit {
   platform: PlatformInfo
   selectedWorks: string[] = []
   selectAll: false
-  sortTypes: SortOrderType[] = ['title', 'start', 'end']
+  sortTypes: SortOrderType[] = ['title', 'date', 'type', 'source']
 
   @ViewChildren('selectAllCheckbox') selectAllCheckbox: MatCheckbox
   @ViewChildren('appWorkStacks') appWorkStacks: QueryList<WorkStackComponent>
@@ -151,14 +151,6 @@ export class WorkStackGroupComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this._togglz
-      .getStateOf('SOURCE_SORTING')
-      .pipe(take(1))
-      .subscribe((sourceSortingTogglz: boolean) => {
-        if (sourceSortingTogglz) {
-          this.sortTypes.push('source')
-        }
-      })
     this.$loading = this._works.$loading
     this._record
       .getRecord({ publicRecordId: this.isPublicRecord })

diff --git a/src/app/register2/components/form-terms/form-terms.component.html b/src/app/register2/components/form-terms/form-terms.component.html
@@ -1,7 +1,7 @@
 <h3 class="orc-font-body" i18n="@@register.termsOfUse">Terms of Use</h3>
 <mat-error
   *ngIf="
-    termsOfUseWasTouched &&
+    this.nextButtonWasClicked &&
     (form.hasError('required', 'termsOfUse') ||
       form.hasError('required', 'dataProcessed'))
   "

diff --git a/src/app/register2/components/form-terms/form-terms.component.ts b/src/app/register2/components/form-terms/form-terms.component.ts
@@ -71,8 +71,4 @@ export class FormTermsComponent extends BaseForm implements OnInit, DoCheck {
       this._errorStateMatcher.isErrorState(this.termsOfUse, null) ||
       this._errorStateMatcher.isErrorState(this.dataProcessed, null)
   }
-
-  get termsOfUseWasTouched() {
-    return this.form.controls.termsOfUse.touched || this.nextButtonWasClicked
-  }
 }
diff --git a/src/index.html b/src/index.html
diff --git a/src/locale/properties/signin/signin.en.properties b/src/locale/properties/signin/signin.en.properties
@@ -66,3 +66,18 @@ ngOrcid.signin.invalidUserType1=Invalid ORCID iD, please
 ngOrcid.signin.invalidUserType2=contact support
 ngOrcid.signin.contactSupport=contact support
 ngOrcid.signin.signInToOrcid=Sign in to ORCID
+ngOrcid.signin.signInInstitution=Sign in through your institution
+ngOrcid.signin.yourOrcidPassword=Your ORCID password
+ngOrcid.signin.enterValidEmailOrOrcidForExample=Please enter a valid email address or ORCID iD, for example: [email protected] or 0000-1234-5678-9101
+ngOrcid.signin.enterValidEmailOrOrcid=Please enter a valid email address or your ORCID iD
+ngOrcid.signin.yourPasswordMoreThan=Your password is more than 256 characters long. You cannot sign in to this ORCID account until you have reset your password
+ngOrcid.signin.resetYourPassword=Reset your password
+ngOrcid.signin.somethingNotQuiteRight=Something's not quite right...
+ngOrcid.signin.checkYourSignIn=Please check that your sign in details are correct and then try signing in again
+ngOrcid.signin.almostDone=Almost done!
+ngOrcid.signin.signInToComplete=Sign in to complete your email verification
+ngOrcid.signin.theEmailAddress=The email address
+ngOrcid.signin.isAssociatedWithDeactivate=is associated with a deactivated ORCID account. You will need to reactivate the account before you can sign in with this email address
+ngOrcid.signin.cannotSignInToOrcid=You cannot sign in to ORCID with this email address until you have claimed the record.
+ngOrcid.signin.claimYourOrcidRecord=Claim your ORCID record
+ngOrcid.signin.orcidAccountHasBeenDeprecated=This ORCID account has been deprecated. The active account is
diff --git a/src/locale/properties/signin/signin.lr.properties b/src/locale/properties/signin/signin.lr.properties
@@ -30,7 +30,7 @@ ngOrcid.signin.2fa.heading=LR
 ngOrcid.signin.2fa.instructions=LR
 ngOrcid.signin.2fa.label=LR
 ngOrcid.signin.2fa.recoveryCode=LR
-ngOrcid.signin.unclaimedExists1=LR
+ngOrcid.signin.unclaimedELRists1=LR
 ngOrcid.signin.invalidUserType1=LR
 ngOrcid.signin.invalidUserType2=LR
 ngOrcid.signin.username=LR
@@ -53,7 +53,7 @@ ngOrcid.signin.2fa.badRecoveryCodeLength=LR
 ngOrcid.signin.2fa.badVerificationCodeLength=LR
 ngOrcid.signin.2fa.instructionsPart1=LR
 ngOrcid.signin.2fa.instructionsPart2=LR
-ngOrcid.signin.unclaimedExists2=LR
+ngOrcid.signin.unclaimedELRists2=LR
 ngOrcid.signin.badCredentials=LR
 ngOrcid.signin.deprecatedWithPrimary=LR
 ngOrcid.signin.verify.reactivationSentError=LR
@@ -67,3 +67,21 @@ ngOrcid.signin.passwordTooLong=LR
 ngOrcid.signin.needToReset=LR
 ngOrcid.signin.toSignIn=LR
 ngOrcid.signin.signInToOrcid=LR
+ngOrcid.signin.signInInstitution=LR
+ngOrcid.signin.yourOrcidPassword=LR
+ngOrcid.signin.enterValidEmailOrOrcidForELRample=LR
+ngOrcid.signin.enterValidEmailOrOrcid=LR
+ngOrcid.signin.yourPasswordMoreThan=LR
+ngOrcid.signin.resetYourPassword=LR
+ngOrcid.signin.somethingNotQuiteRight=LR
+ngOrcid.signin.checkYourSignIn=LR
+ngOrcid.signin.almostDone=LR
+ngOrcid.signin.signInToComplete=LR
+ngOrcid.signin.theEmailAddress=LR
+ngOrcid.signin.isAssociatedWithDeactivate=LR
+ngOrcid.signin.cannotSignInToOrcid=LR
+ngOrcid.signin.claimYourOrcidRecord=LR
+ngOrcid.signin.orcidAccountHasBeenDeprecated=LR
+ngOrcid.signin.unclaimedExists1=LR
+ngOrcid.signin.unclaimedExists2=LR
+ngOrcid.signin.enterValidEmailOrOrcidForExample=LR
diff --git a/src/locale/properties/signin/signin.rl.properties b/src/locale/properties/signin/signin.rl.properties
@@ -30,7 +30,7 @@ ngOrcid.signin.2fa.heading=RL
 ngOrcid.signin.2fa.instructions=RL
 ngOrcid.signin.2fa.label=RL
 ngOrcid.signin.2fa.recoveryCode=RL
-ngOrcid.signin.unclaimedExists1=RL
+ngOrcid.signin.unclaimedERLists1=RL
 ngOrcid.signin.invalidUserType1=RL
 ngOrcid.signin.invalidUserType2=RL
 ngOrcid.signin.username=RL
@@ -53,7 +53,7 @@ ngOrcid.signin.2fa.badRecoveryCodeLength=RL
 ngOrcid.signin.2fa.badVerificationCodeLength=RL
 ngOrcid.signin.2fa.instructionsPart1=RL
 ngOrcid.signin.2fa.instructionsPart2=RL
-ngOrcid.signin.unclaimedExists2=RL
+ngOrcid.signin.unclaimedERLists2=RL
 ngOrcid.signin.badCredentials=RL
 ngOrcid.signin.deprecatedWithPrimary=RL
 ngOrcid.signin.or=RL
@@ -67,3 +67,21 @@ ngOrcid.signin.passwordTooLong=RL
 ngOrcid.signin.needToReset=RL
 ngOrcid.signin.toSignIn=RL
 ngOrcid.signin.signInToOrcid=RL
+ngOrcid.signin.signInInstitution=RL
+ngOrcid.signin.yourOrcidPassword=RL
+ngOrcid.signin.enterValidEmailOrOrcidForERLample=RL
+ngOrcid.signin.enterValidEmailOrOrcid=RL
+ngOrcid.signin.yourPasswordMoreThan=RL
+ngOrcid.signin.resetYourPassword=RL
+ngOrcid.signin.somethingNotQuiteRight=RL
+ngOrcid.signin.checkYourSignIn=RL
+ngOrcid.signin.almostDone=RL
+ngOrcid.signin.signInToComplete=RL
+ngOrcid.signin.theEmailAddress=RL
+ngOrcid.signin.isAssociatedWithDeactivate=RL
+ngOrcid.signin.cannotSignInToOrcid=RL
+ngOrcid.signin.claimYourOrcidRecord=RL
+ngOrcid.signin.orcidAccountHasBeenDeprecated=RL
+ngOrcid.signin.unclaimedExists1=RL
+ngOrcid.signin.unclaimedExists2=RL
+ngOrcid.signin.enterValidEmailOrOrcidForExample=RL
diff --git a/src/locale/properties/signin/signin.xx.properties b/src/locale/properties/signin/signin.xx.properties
@@ -68,3 +68,18 @@ ngOrcid.signin.passwordTooLong=X
 ngOrcid.signin.needToReset=X
 ngOrcid.signin.toSignIn=X
 ngOrcid.signin.signInToOrcid=X
+ngOrcid.signin.signInInstitution=X
+ngOrcid.signin.yourOrcidPassword=X
+ngOrcid.signin.enterValidEmailOrOrcidForExample=X
+ngOrcid.signin.enterValidEmailOrOrcid=X
+ngOrcid.signin.yourPasswordMoreThan=X
+ngOrcid.signin.resetYourPassword=X
+ngOrcid.signin.somethingNotQuiteRight=X
+ngOrcid.signin.checkYourSignIn=X
+ngOrcid.signin.almostDone=X
+ngOrcid.signin.signInToComplete=X
+ngOrcid.signin.theEmailAddress=X
+ngOrcid.signin.isAssociatedWithDeactivate=X
+ngOrcid.signin.cannotSignInToOrcid=X
+ngOrcid.signin.claimYourOrcidRecord=X
+ngOrcid.signin.orcidAccountHasBeenDeprecated=X
diff --git a/src/locale/properties/top-bar/top-bar.en.properties b/src/locale/properties/top-bar/top-bar.en.properties
@@ -112,3 +112,4 @@ topBar.recordOwnerNotHaveAdded=The record owner may not have added information t
 topBar.findOutVisibility=Find out more about visibility settings in ORCID
 topBar.ariaLabelCopyOrcidId=Copy your ORCID iD to the clipboard
 topBar.ariaLabelViewPrintable=View a printable version of your ORCID record (Opens in new tab)
+topBar.forTheLastInformation=for the latest information.
diff --git a/src/locale/properties/top-bar/top-bar.lr.properties b/src/locale/properties/top-bar/top-bar.lr.properties
@@ -126,3 +126,4 @@ topBar.recordOwnerNotHaveAdded=LR
 topBar.findOutVisibility=LR
 topBar.ariaLabelCopyOrcidId=LR
 topBar.ariaLabelViewPrintable=LR
+topBar.forTheLastInformation=LR
diff --git a/src/locale/properties/top-bar/top-bar.rl.properties b/src/locale/properties/top-bar/top-bar.rl.properties
@@ -126,3 +126,4 @@ topBar.recordOwnerNotHaveAdded=RL
 topBar.findOutVisibility=RL
 topBar.ariaLabelCopyOrcidId=RL
 topBar.ariaLabelViewPrintable=RL
+topBar.forTheLastInformation=RL
diff --git a/src/locale/properties/top-bar/top-bar.xx.properties b/src/locale/properties/top-bar/top-bar.xx.properties
@@ -126,3 +126,4 @@ topBar.recordOwnerNotHaveAdded=X
 topBar.findOutVisibility=X
 topBar.ariaLabelCopyOrcidId=X
 topBar.ariaLabelViewPrintable=X
+topBar.forTheLastInformation=X