Merge pull request #2049 from ORCID/batch-of-fixes-18-aug

Batch of fixes 18 aug
ORCID · Aug 18, 2023 · 318f32e · 318f32e
2 parents a5d17ae + 5792690
commit 318f32e
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 73 deletions.
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
@@ -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 &&

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
@@ -79,15 +79,17 @@
         <caption class="orc-font-small-print">
           <ng-container *ngIf="activity.startDate">
             {{ activity.startDate }}
-            <ng-container i18n="@@summary.to" i18n="@@shared.to"
+            <ng-container
+              i18n="@@shared.to"
+              *ngIf="activity.endDate || showToPresent"
               >to</ng-container
             >
           </ng-container>
           <ng-container *ngIf="activity.endDate">
             {{ 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
@@ -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/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.html b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
@@ -247,7 +247,8 @@ <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>
       <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
@@ -12,7 +12,7 @@
     color: map-get($foreground, 'text-dark-mid');
   }
 
-  :host {
+  main {
     background-color: map-get($background, 'ui-background-lightest');
   }
 

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
@@ -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,
           }
         }
       )
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
         color: map-get($foreground, 'text-dark-mid');
       }
-      :host {
+      main {
         background-color: map-get($background, 'ui-background-lightest');
       }
@@ Expand Down @@