From 2cad49f495185abff433464fd2ed5be376078bd7 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Fri, 7 Jul 2023 09:39:00 -0600 Subject: [PATCH 1/2] 8717-qa-edit-button-missing-from-activities --- .../panel-source/panel-source.component.html | 12 +++++++----- .../affiliation-stack.component.ts | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 6 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 index f18cca003b..52c12be0c9 100644 --- a/src/app/cdk/panel/panel-source/panel-source.component.html +++ b/src/app/cdk/panel/panel-source/panel-source.component.html @@ -26,11 +26,13 @@ > - - {{ assertionOriginName || assertionOriginOrcid }} - via - - {{ sourceName }} +
+ + {{ assertionOriginName || assertionOriginOrcid }} + via + + {{ sourceName }} +
diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts index 1530155c0b..5a42a0b84d 100644 --- a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts +++ b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts @@ -13,6 +13,7 @@ import { import { UserRecord } from 'src/app/types/record.local' import { ModalAffiliationsComponent } from '../affiliation-stacks-groups/modals/modal-affiliations/modal-affiliations.component' import { TogglzService } from '../../../core/togglz/togglz.service' +import { log } from 'console' @Component({ selector: 'app-affiliation-stack', @@ -56,8 +57,23 @@ export class AffiliationStackComponent implements OnInit { get displayTheStack(): boolean { return this._displayTheStack } + private _userInfo: UserInfo + + @Input() + public set userInfo(value: UserInfo) { + this._userInfo = value + this._affiliationStack.affiliations = + this._affiliationStack.affiliations.map((affiliation) => { + return { + ...affiliation, + userIsSource: this.userIsSource(affiliation), + } + }) + } + public get userInfo(): UserInfo { + return this._userInfo + } - @Input() userInfo: UserInfo @Input() professionalActivitiesTogglz = false orgDisambiguated: { [key: string]: OrgDisambiguated | null } = {} From af82d1adf2cc92ffea66b005dcdd5570fb327378 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Fri, 7 Jul 2023 09:39:52 -0600 Subject: [PATCH 2/2] remove log --- src/app/core/title-service/title.service.ts | 1 - .../components/affiliation-stack/affiliation-stack.component.ts | 1 - .../components/peer-review-stack/peer-review-stack.component.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/src/app/core/title-service/title.service.ts b/src/app/core/title-service/title.service.ts index 217f4a55c4..fa4da8571c 100644 --- a/src/app/core/title-service/title.service.ts +++ b/src/app/core/title-service/title.service.ts @@ -1,7 +1,6 @@ import { Injectable, OnInit } from '@angular/core' import { Title } from '@angular/platform-browser' import { NavigationEnd, NavigationStart, Router } from '@angular/router' -import { log } from 'console' import { ReplaySubject, combineLatest } from 'rxjs' import { filter, map, withLatestFrom } from 'rxjs/operators' import { diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts index 5a42a0b84d..ecae63c149 100644 --- a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts +++ b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts @@ -13,7 +13,6 @@ import { import { UserRecord } from 'src/app/types/record.local' import { ModalAffiliationsComponent } from '../affiliation-stacks-groups/modals/modal-affiliations/modal-affiliations.component' import { TogglzService } from '../../../core/togglz/togglz.service' -import { log } from 'console' @Component({ selector: 'app-affiliation-stack', diff --git a/src/app/record/components/peer-review-stack/peer-review-stack.component.ts b/src/app/record/components/peer-review-stack/peer-review-stack.component.ts index aae6e4cf0b..6a11500d0a 100644 --- a/src/app/record/components/peer-review-stack/peer-review-stack.component.ts +++ b/src/app/record/components/peer-review-stack/peer-review-stack.component.ts @@ -15,7 +15,6 @@ import { first } from 'rxjs/operators' import { RecordPeerReviewService } from '../../../core/record-peer-review/record-peer-review.service' import { PlatformInfo, PlatformInfoService } from '../../../cdk/platform-info' import { UserRecord } from 'src/app/types/record.local' -import { log } from 'console' @Component({ selector: 'app-peer-review-stack',