From 730cebd76b2a2d3e4fa38a17d4686e1668495846 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 18 Aug 2023 16:06:28 -0600
Subject: [PATCH 1/6] 
 8822-qa-affiliations-and-professional-activities-are-missing-external-links-in-summary-page

---
 .../summary-simple-panel/summary-simple-panel.component.html    | 2 +-
 .../pages/trusted-summary/trusted-summary.component.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.html b/src/app/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.html
index d0aa37cbfd..23531718ab 100644
--- a/src/app/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.html
+++ b/src/app/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.html
@@ -30,7 +30,7 @@
                 rel="noopener noreferrer"
                 *ngIf="element.url"
                 href="{{ element.url }}"
-                >{{ element.url }}</a
+                >{{ element.stringA }}</a
               >
             </ng-container>
             <ng-container *ngIf="!element.url">
diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.ts b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.ts
index ab65a62650..3547c99321 100644
--- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.ts
+++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.ts
@@ -176,7 +176,7 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy {
           return {
             verified: id.validated,
             url: id.url,
-            stringA: id.id,
+            stringA: id.commonName + ': ' + id.reference,
           }
         }
       )

From 78b36f4a7ce60af0f5d78401ca0518aecc2a106b Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 18 Aug 2023 16:19:10 -0600
Subject: [PATCH 2/6] Multiple fixes

---
 .../component/summary-panel/summary-panel.component.html  | 8 ++++++--
 .../component/summary-panel/summary-panel.component.ts    | 1 +
 .../pages/trusted-summary/trusted-summary.component.html  | 1 +
 .../trusted-summary.component.scss-theme.scss             | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
index e1b04b470b..f66f3ec01c 100644
--- a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
+++ b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
@@ -79,7 +79,11 @@
         <caption class="orc-font-small-print">
           <ng-container *ngIf="activity.startDate">
             {{ activity.startDate }}
-            <ng-container i18n="@@summary.to" i18n="@@shared.to"
+            <ng-container
+              i18n="@@summary.to"
+              i18n="@@shared.to"
+              *ngIf="activity.endDate || showToPresent"
+            >
               >to</ng-container
             >
           </ng-container>
@@ -87,7 +91,7 @@
             {{ activity.endDate }}
           </ng-container>
           <ng-container
-            *ngIf="!activity.endDate && activity.startDate"
+            *ngIf="!activity.endDate && activity.startDate && showToPresent"
             i18n="@@shared.present"
           >
             present
diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.ts b/src/app/trusted-summary/component/summary-panel/summary-panel.component.ts
index 8e61e8aa29..a69ab534fd 100644
--- a/src/app/trusted-summary/component/summary-panel/summary-panel.component.ts
+++ b/src/app/trusted-summary/component/summary-panel/summary-panel.component.ts
@@ -19,6 +19,7 @@ export class SummaryPanelComponent implements OnInit {
   @Input() count: number = 0
   @Input() moreLabel: string = ''
   @Input() moreLabelSingular: string = ''
+  @Input() showToPresent = true
   activitiesToDisplay: ActivitySummary[]
   acitivityCountOverflow: boolean
   unsubscribe = new Subject()
diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
index 0facf8b048..1b612de5ed 100644
--- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
+++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
@@ -248,6 +248,7 @@ <h2 class="orc-font-small-print" i18n="@@summary.funding">FUNDING</h2>
           [count]="trustedSummary.professionalActivitiesCount"
           [moreLabel]="labelMoreProfessionalActivities"
           moreLabelSingular="labelMoreProfessionalActivitie"
+          [showToPresent]="false"
         ></app-summary-panel>
       </ng-container>
       <ng-container *ngIf="externalIdentifiers?.length">
diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss
index 28f89e8018..a92c5cd481 100644
--- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss
+++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss
@@ -12,7 +12,7 @@
     color: map-get($foreground, 'text-dark-mid') 
   }
   
-  :host {
+  main {
     background-color: map-get($background, 'ui-background-lightest');
   }
 

From 4228d088ed104338b66ec7dd51b0daebfeae180d Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 18 Aug 2023 16:21:30 -0600
Subject: [PATCH 3/6] 8784-qa-fix-links-to-more-items-in-summary-page

---
 .../pages/trusted-summary/trusted-summary.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
index 1b612de5ed..92a49add9f 100644
--- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
+++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
@@ -247,7 +247,7 @@ <h2 class="orc-font-small-print" i18n="@@summary.funding">FUNDING</h2>
           [activitySummary]="trustedSummary.professionalActivities"
           [count]="trustedSummary.professionalActivitiesCount"
           [moreLabel]="labelMoreProfessionalActivities"
-          moreLabelSingular="labelMoreProfessionalActivitie"
+          [moreLabelSingular]="labelMoreProfessionalActivitie"
           [showToPresent]="false"
         ></app-summary-panel>
       </ng-container>

From c649be5b78efd1fd9e2d57a557e4f48fd1885e51 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 18 Aug 2023 16:39:04 -0600
Subject: [PATCH 4/6] 
 8819-prod-anchor-link-to-professional-activities-section-goes-to-education-and-qualifications

---
 .../cdk/panel/panels/panels.component.html    |   3 +-
 src/app/cdk/panel/panels/panels.component.ts  |   1 +
 .../affiliation-stacks-groups.component.html  | 132 +++++++++---------
 3 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/app/cdk/panel/panels/panels.component.html b/src/app/cdk/panel/panels/panels.component.html
index d3dc915685..c0ff2dc926 100644
--- a/src/app/cdk/panel/panels/panels.component.html
+++ b/src/app/cdk/panel/panels/panels.component.html
@@ -1,4 +1,5 @@
-<div class="col s4 m8 l12 no-gutters">
+
+<div class="col s4 m8 l12 no-gutters" [id]="anchorUrlId">
   <div
     class="header-container"
     [ngClass]="{
diff --git a/src/app/cdk/panel/panels/panels.component.ts b/src/app/cdk/panel/panels/panels.component.ts
index 77c0e40690..b5650b3f1b 100644
--- a/src/app/cdk/panel/panels/panels.component.ts
+++ b/src/app/cdk/panel/panels/panels.component.ts
@@ -55,6 +55,7 @@ export class PanelsComponent implements OnInit {
   @Input() sortDirection: SortOrderDirection = 'desc'
   @Input() defaultDirection: SortOrderDirection = 'asc'
   @Input() reviewsNumber: number
+  @Input() anchorUrlId: string
 
   @Output() sort: EventEmitter<SortData> = new EventEmitter()
   @Output() addEvent: EventEmitter<ADD_EVENT_ACTION> = new EventEmitter()
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
index ede6bb350f..6949574cae 100644
--- 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
@@ -59,79 +59,77 @@
   </app-panels>
 </section>
 
-<section
-  id="professional-activities"
-  role="region"
-  [attr.aria-label]="regionProfessionalActivities"
+<ng-container
+  *ngIf="
+    !(
+      isPublicRecord &&
+      getAffiliationType('EDUCATION_AND_QUALIFICATION')?.affiliationGroup
+        ?.length === 0
+    )
+  "
 >
-  <ng-container
+  <!-- A PANELS COMPONENT FOR EDUCATION_AND_QUALIFICATION -->
+  <app-panels
+    [loading]="$loading | async"
+    s
     *ngIf="
-      !(
-        isPublicRecord &&
-        getAffiliationType('EDUCATION_AND_QUALIFICATION')?.affiliationGroup
-          ?.length === 0
-      )
+      getAffiliationType(
+        'EDUCATION_AND_QUALIFICATION'
+      ) as profileAffiliationsGroup
     "
+    class="row"
+    [title]="affiliationTypeLabel(profileAffiliationsGroup.type)"
+    [type]="'education'"
+    [userRecord]="userRecord"
+    [currentAmount]="profileAffiliationsGroup.affiliationGroup.length"
+    [(expandedContent)]="expandedContent['EDUCATION_AND_QUALIFICATION']"
+    (expandedContentChange)="expandedContentChange.emit(expandedContent)"
+    [isPublicRecord]="isPublicRecord"
+    [sortType]="'end'"
+    (sort)="sortEvent($event, 'EDUCATION_AND_QUALIFICATION')"
+    id="cy-affiliation-education-and-qualification"
   >
-    <!-- A PANELS COMPONENT FOR EDUCATION_AND_QUALIFICATION -->
-    <app-panels
-      [loading]="$loading | async"
-      s
-      *ngIf="
-        getAffiliationType(
-          'EDUCATION_AND_QUALIFICATION'
-        ) as profileAffiliationsGroup
-      "
-      class="row"
-      [title]="affiliationTypeLabel(profileAffiliationsGroup.type)"
-      [type]="'education'"
-      [userRecord]="userRecord"
-      [currentAmount]="profileAffiliationsGroup.affiliationGroup.length"
-      [(expandedContent)]="expandedContent['EDUCATION_AND_QUALIFICATION']"
-      (expandedContentChange)="expandedContentChange.emit(expandedContent)"
-      [isPublicRecord]="isPublicRecord"
-      [sortType]="'end'"
-      (sort)="sortEvent($event, 'EDUCATION_AND_QUALIFICATION')"
-      id="cy-affiliation-education-and-qualification"
+    <ng-container *ngIf="profileAffiliationsGroup.affiliationGroup.length > 0">
+      <app-affiliation-stack
+        [userRecord]="userRecord"
+        [isPublicRecord]="isPublicRecord"
+        *ngFor="
+          let affiliationGroup of profileAffiliationsGroup.affiliationGroup;
+          trackBy: trackByAffiliationGroup
+        "
+        [affiliationStack]="affiliationGroup"
+        [type]="affiliationGroup.affiliationType | affiliationType"
+        [userInfo]="userInfo"
+      ></app-affiliation-stack>
+    </ng-container>
+    <ng-container
+      *ngIf="profileAffiliationsGroup.affiliationGroup.length === 0"
     >
-      <ng-container
-        *ngIf="profileAffiliationsGroup.affiliationGroup.length > 0"
-      >
-        <app-affiliation-stack
-          [userRecord]="userRecord"
-          [isPublicRecord]="isPublicRecord"
-          *ngFor="
-            let affiliationGroup of profileAffiliationsGroup.affiliationGroup;
-            trackBy: trackByAffiliationGroup
-          "
-          [affiliationStack]="affiliationGroup"
-          [type]="affiliationGroup.affiliationType | affiliationType"
-          [userInfo]="userInfo"
-        ></app-affiliation-stack>
-      </ng-container>
-      <ng-container
-        *ngIf="profileAffiliationsGroup.affiliationGroup.length === 0"
-      >
-        <div class="orc-font-body-small">
-          <p i18n="@@shared.educationQualificationsDescription">
-            Add details about where you have studied and educational or
-            professional qualifications you have been awarded.
-          </p>
-          <a
-            class="underline"
-            rel="noopener noreferrer"
-            target="_blank"
-            href="https://support.orcid.org/hc/en-us/articles/360006973933-Add-an-education-or-qualification-to-your-ORCID-record"
-            i18n="@@shared.educationLearnMore"
-          >
-            Learn more about adding education or qualifications to your ORCID
-            record
-          </a>
-        </div>
-      </ng-container>
-    </app-panels>
-  </ng-container>
+      <div class="orc-font-body-small">
+        <p i18n="@@shared.educationQualificationsDescription">
+          Add details about where you have studied and educational or
+          professional qualifications you have been awarded.
+        </p>
+        <a
+          class="underline"
+          rel="noopener noreferrer"
+          target="_blank"
+          href="https://support.orcid.org/hc/en-us/articles/360006973933-Add-an-education-or-qualification-to-your-ORCID-record"
+          i18n="@@shared.educationLearnMore"
+        >
+          Learn more about adding education or qualifications to your ORCID
+          record
+        </a>
+      </div>
+    </ng-container>
+  </app-panels>
+</ng-container>
 
+<section
+  role="region"
+  [attr.aria-label]="regionProfessionalActivities"
+  id="professional-activities"
+>
   <ng-container
     *ngIf="
       !professionalActivitiesTogglz &&

From 92336b9b8bd6cc4e6d10fa761bc85d91b905c0e0 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 18 Aug 2023 16:45:28 -0600
Subject: [PATCH 5/6] fix translation issue

---
 src/app/cdk/panel/panels/panels.component.html                | 3 +--
 src/app/cdk/panel/panels/panels.component.ts                  | 1 -
 .../component/summary-panel/summary-panel.component.html      | 4 +---
 .../summary-panel/summary-panel.component.scss-theme.scss     | 2 --
 .../trusted-summary/trusted-summary.component.scss-theme.scss | 4 ++--
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/app/cdk/panel/panels/panels.component.html b/src/app/cdk/panel/panels/panels.component.html
index c0ff2dc926..d3dc915685 100644
--- a/src/app/cdk/panel/panels/panels.component.html
+++ b/src/app/cdk/panel/panels/panels.component.html
@@ -1,5 +1,4 @@
-
-<div class="col s4 m8 l12 no-gutters" [id]="anchorUrlId">
+<div class="col s4 m8 l12 no-gutters">
   <div
     class="header-container"
     [ngClass]="{
diff --git a/src/app/cdk/panel/panels/panels.component.ts b/src/app/cdk/panel/panels/panels.component.ts
index b5650b3f1b..77c0e40690 100644
--- a/src/app/cdk/panel/panels/panels.component.ts
+++ b/src/app/cdk/panel/panels/panels.component.ts
@@ -55,7 +55,6 @@ export class PanelsComponent implements OnInit {
   @Input() sortDirection: SortOrderDirection = 'desc'
   @Input() defaultDirection: SortOrderDirection = 'asc'
   @Input() reviewsNumber: number
-  @Input() anchorUrlId: string
 
   @Output() sort: EventEmitter<SortData> = new EventEmitter()
   @Output() addEvent: EventEmitter<ADD_EVENT_ACTION> = new EventEmitter()
diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
index f66f3ec01c..974c55996c 100644
--- a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
+++ b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
@@ -80,11 +80,9 @@
           <ng-container *ngIf="activity.startDate">
             {{ activity.startDate }}
             <ng-container
-              i18n="@@summary.to"
               i18n="@@shared.to"
               *ngIf="activity.endDate || showToPresent"
-            >
-              >to</ng-container
+            >to</ng-container
             >
           </ng-container>
           <ng-container *ngIf="activity.endDate">
diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.scss-theme.scss b/src/app/trusted-summary/component/summary-panel/summary-panel.component.scss-theme.scss
index e7119dd109..e50e10673e 100644
--- a/src/app/trusted-summary/component/summary-panel/summary-panel.component.scss-theme.scss
+++ b/src/app/trusted-summary/component/summary-panel/summary-panel.component.scss-theme.scss
@@ -8,8 +8,6 @@
   $foreground: map-get($theme, foreground);
   $background: map-get($theme, background);
 
-  
-
   .verified {
     color: mat.get-color-from-palette($accent, 400);
   }
diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss
index a92c5cd481..6e5d8b242b 100644
--- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss
+++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.scss-theme.scss
@@ -9,9 +9,9 @@
   $background: map-get($theme, background);
 
   .day-title {
-    color: map-get($foreground, 'text-dark-mid') 
+    color: map-get($foreground, 'text-dark-mid');
   }
-  
+
   main {
     background-color: map-get($background, 'ui-background-lightest');
   }

From d881f0f7e3f881b52eaeaf291206e80f472106d3 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 18 Aug 2023 16:45:56 -0600
Subject: [PATCH 6/6] format

---
 .../component/summary-panel/summary-panel.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
index 974c55996c..3b10ac769a 100644
--- a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
+++ b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html
@@ -82,7 +82,7 @@
             <ng-container
               i18n="@@shared.to"
               *ngIf="activity.endDate || showToPresent"
-            >to</ng-container
+              >to</ng-container
             >
           </ng-container>
           <ng-container *ngIf="activity.endDate">