Merge branch 'main' into fix-domain-aria-labels

ORCID · Sep 13, 2024 · 2b312a6 · 2b312a6
2 parents e5a0096 + 88ea755
commit 2b312a6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.104.17 - 2024-09-11
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.16...v2.104.17)
+
+- [#2349](https://github.com/ORCID/orcid-angular/pull/2349): 9395-qa-all-activity-items-have-space-for-a-type-icon
+
 ## v2.104.16 - 2024-09-09
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.15...v2.104.16)

diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.html b/src/app/record/components/affiliation-stack/affiliation-stack.component.html
@@ -30,21 +30,23 @@
     [panelTitle]="affiliation.affiliationName.value"
   >
     <div class="affiliation-title" header>
-      <mat-icon
-        class="material-icons-outlined"
-        *ngIf="type === 'invited-position'"
-        >join_inner</mat-icon
-      >
-      <mat-icon class="material-icons-outlined" *ngIf="type === 'distinction'"
-        >stars</mat-icon
-      >
-      <mat-icon class="material-icons-outlined" *ngIf="type === 'membership'"
-        >card_membership</mat-icon
-      >
-      <mat-icon class="material-icons-outlined" *ngIf="type === 'service'"
-        >badge</mat-icon
-      >
-      <div class="vl"></div>
+      <ng-container *ngIf="professionalActivities">
+        <mat-icon
+          class="material-icons-outlined"
+          *ngIf="type === 'invited-position'"
+          >join_inner</mat-icon
+        >
+        <mat-icon class="material-icons-outlined" *ngIf="type === 'distinction'"
+          >stars</mat-icon
+        >
+        <mat-icon class="material-icons-outlined" *ngIf="type === 'membership'"
+          >card_membership</mat-icon
+        >
+        <mat-icon class="material-icons-outlined" *ngIf="type === 'service'"
+          >badge</mat-icon
+        >
+        <div class="vl"></div>
+      </ng-container>
       <h4
         class="orc-font-body"
         [ngClass]="{

diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts
@@ -32,6 +32,7 @@ export class AffiliationStackComponent implements OnInit, OnDestroy {
   @Input() isPublicRecord: string = null
   @Input() type: AffiliationType
   hasExternalIdentifiers: boolean
+  @Input() professionalActivities: boolean
   @Input()
   set affiliationStack(value: AffiliationGroup) {
     this.hasExternalIdentifiers = !!value.externalIdentifiers.length

diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html
@@ -176,6 +176,7 @@
           [affiliationStack]="affiliationGroup"
           [type]="affiliationGroup.affiliationType | affiliationType"
           [userInfo]="userInfo"
+          [professionalActivities]="true"
         ></app-affiliation-stack>
       </ng-container>
       <ng-container