Merge branch 'main' into add-email-domains

ORCID · Aug 9, 2024 · 3e4ff3d · 3e4ff3d
2 parents 48eceff + c13c538
commit 3e4ff3d
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v2.103.0 - 2024-08-05
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.22...v2.103.0)
+
+## v2.102.22 - 2024-08-05
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.21...v2.102.22)
+
 ## v2.102.21 - 2024-07-30
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.20...v2.102.21)

diff --git a/...mponents/notification-your-record-amended/notification-your-record-amended.component.html b/...mponents/notification-your-record-amended/notification-your-record-amended.component.html
@@ -11,6 +11,9 @@
   <ng-container i18n="@@inbox.sectionOf">section of your record:</ng-container>
 </div>
 
+<div *ngIf="isProfessionalActivity(notification)">
+  <strong>{{ getProfessionalActivitiesUpdatedLabel(notification) }}</strong>
+</div>
 <div *ngFor="let i of itemGroupedByType">
   <strong>{{ getAmendedTypeLabel(i.type) }}</strong>
 

diff --git a/...components/notification-your-record-amended/notification-your-record-amended.component.ts b/...components/notification-your-record-amended/notification-your-record-amended.component.ts
@@ -53,14 +53,29 @@ export class NotificationYourRecordAmendedComponent implements OnInit {
     return 'Other update'
   }
 
+  isProfessionalActivity(notification: InboxNotificationAmended) {
+    switch (notification?.amendedSection) {
+      case 'DISTINCTION':
+        return true
+      case 'INVITED_POSITION':
+        return true
+      case 'MEMBERSHIP':
+        return true
+      case 'SERVICE':
+        return true
+      default:
+        return false
+    }
+  }
+
   getNotificationSectionUpdatedLabel(notification: InboxNotificationAmended) {
     switch (notification?.amendedSection) {
       case 'AFFILIATION':
         return $localize`:@@inbox.affiliations:Affiliations`
       case 'BIO':
         return $localize`:@@inbox.bio:Bio`
       case 'DISTINCTION':
-        return $localize`:@@inbox.distinction:Distinction`
+        return $localize`:@@inbox.professionalActivities:Professional activities`
       case 'EDUCATION':
         return $localize`:@@inbox.education:Education`
       case 'EMPLOYMENT':
@@ -70,9 +85,9 @@ export class NotificationYourRecordAmendedComponent implements OnInit {
       case 'FUNDING':
         return $localize`:@@inbox.funding:Funding`
       case 'INVITED_POSITION':
-        return $localize`:@@inbox.invitedPosition:Invited Position`
+        return $localize`:@@inbox.professionalActivities:Professional activities`
       case 'MEMBERSHIP':
-        return $localize`:@@inbox.membership:Membership`
+        return $localize`:@@inbox.professionalActivities:Professional activities`
       case 'PEER_REVIEW':
         return $localize`:@@inbox.peerReview:Peer Review`
       case 'PREFERENCES':
@@ -82,11 +97,28 @@ export class NotificationYourRecordAmendedComponent implements OnInit {
       case 'RESEARCH_RESOURCE':
         return $localize`:@@inbox.researchResource:Research Resource`
       case 'SERVICE':
-        return $localize`:@@inbox.service:Service`
+        return $localize`:@@inbox.professionalActivities:Professional activities`
       case 'WORK':
         return $localize`:@@inbox.work:Work`
       default:
         return $localize`:@@inbox.unknown:unknown`
     }
   }
+
+  getProfessionalActivitiesUpdatedLabel(
+    notification: InboxNotificationAmended
+  ) {
+    switch (notification?.amendedSection) {
+      case 'DISTINCTION':
+        return $localize`:@@inbox.distinction:Distinction`.toUpperCase()
+      case 'INVITED_POSITION':
+        return $localize`:@@inbox.invitedPosition:Invited Position`.toUpperCase()
+      case 'MEMBERSHIP':
+        return $localize`:@@inbox.membership:Membership`.toUpperCase()
+      case 'SERVICE':
+        return $localize`:@@inbox.service:Service`.toUpperCase()
+      default:
+        return ''
+    }
+  }
 }
diff --git a/src/locale/properties/inbox/inbox.en.properties b/src/locale/properties/inbox/inbox.en.properties
@@ -44,3 +44,4 @@ inbox.youCanManage=You can manage the frequency of your ORCID notifications in y
 inbox.youDontHaveUnarchived=You don't have any unarchived notifications right now.
 inbox.youDontHave=You don’t have any notifications yet.
 inbox.archiveWithout=Archive without granting permissions
+inbox.professionalActivities=Professional activities
diff --git a/src/locale/properties/inbox/inbox.lr.properties b/src/locale/properties/inbox/inbox.lr.properties
@@ -48,3 +48,4 @@ inbox.membership=LR
 inbox.service=LR
 inbox.connectingYour=LR
 inbox.archiveWithout=LR
+inbox.professionalActivities=LR
diff --git a/src/locale/properties/inbox/inbox.rl.properties b/src/locale/properties/inbox/inbox.rl.properties
@@ -48,3 +48,4 @@ inbox.membership=RL
 inbox.service=RL
 inbox.connectingYour=RL
 inbox.archiveWithout=RL
+inbox.professionalActivities=RL
diff --git a/src/locale/properties/inbox/inbox.xx.properties b/src/locale/properties/inbox/inbox.xx.properties
@@ -48,3 +48,4 @@ inbox.membership=X
 inbox.service=X
 inbox.connectingYour=X
 inbox.archiveWithout=X
+inbox.professionalActivities=X