Merge pull request #2013 from ORCID/fix/batch-of-fixes-Jul-week2

Fix/batch of fixes jul week2
ORCID · Jul 11, 2023 · b37570f · b37570f
2 parents 3e699e8 + 18ee01c
commit b37570f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/src/app/cdk/panel/panel-source/panel-source.component.html b/src/app/cdk/panel/panel-source/panel-source.component.html
@@ -13,12 +13,24 @@
       >
         <strong i18n="@@shared.source">Source</strong>:
         <ng-container *ngIf="recordOnDisplayIsTheSource !== undefined">
-          <ng-container *ngIf="recordOnDisplayIsTheSource">
+          <ng-container
+            *ngIf="
+              recordOnDisplayIsTheSource ||
+              assertionOriginName ||
+              assertionOriginOrcid
+            "
+          >
             <mat-icon [attr.aria-label]="selftAssertedSource"
               ><img src="./assets/vectors/profile-not-verified.svg" />
             </mat-icon>
           </ng-container>
-          <ng-container *ngIf="!recordOnDisplayIsTheSource">
+          <ng-container
+            *ngIf="
+              !recordOnDisplayIsTheSource &&
+              !assertionOriginName &&
+              !assertionOriginOrcid
+            "
+          >
             <mat-icon
               [attr.aria-label]="validatedSourceAriaLabel"
               class="verified"

diff --git a/src/app/cdk/panel/panel-source/panel-source.component.scss b/src/app/cdk/panel/panel-source/panel-source.component.scss
@@ -9,7 +9,7 @@ app-panel-data {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  padding: 16px 16px;
+  padding: 8px 16px;
 }
 
 .preferred-source {

diff --git a/src/app/record/components/funding-stack/funding-stack.component.ts b/src/app/record/components/funding-stack/funding-stack.component.ts
@@ -49,7 +49,25 @@ export class FundingStackComponent implements OnInit {
   }
 
   @Input() isPublicRecord: string
-  @Input() userInfo: UserInfo
+  _userInfo: UserInfo
+
+  @Input()
+  set userInfo(userInfo: UserInfo) {
+    this._userInfo = userInfo
+    if (this._fundingStack.fundings) {
+      this._fundingStack.fundings = this._fundingStack.fundings.map(
+        (funding) => {
+          return {
+            ...funding,
+            userIsSource: this.userIsSource(funding),
+          }
+        }
+      )
+    }
+  }
+  get userInfo(): UserInfo {
+    return this._userInfo
+  }
 
   orgDisambiguated: { [key: string]: OrgDisambiguated | null } = {}
   stackPanelsDisplay: { [key: string]: { topPanelOfTheStack: boolean } } = {}