Skip to content

Commit

Permalink
Merge pull request #2007 from ORCID/8717-qa-edit-button-missing-from-…
Browse files Browse the repository at this point in the history
…activities

8717 qa edit button missing from activities
  • Loading branch information
leomendoza123 authored Jul 7, 2023
2 parents 65d6718 + ec06611 commit 98f0a78
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 8 deletions.
12 changes: 7 additions & 5 deletions src/app/cdk/panel/panel-source/panel-source.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
>
</ng-container></ng-container
>
<ng-container *ngIf="assertionOriginName || assertionOriginOrcid">
{{ assertionOriginName || assertionOriginOrcid }}
<i i18n="@@shared.onBehalfOf">via</i>
</ng-container>
{{ sourceName }}
<div>
<ng-container *ngIf="assertionOriginName || assertionOriginOrcid">
{{ assertionOriginName || assertionOriginOrcid }}
<i i18n="@@shared.onBehalfOf">via</i>
</ng-container>
{{ sourceName }}
</div>
</div>
<!-- OTHER SOURCES (COLLAPSED PANEL) URL -->
<ng-container *ngIf="!topPanelOfTheStackMode && clickableSource">
Expand Down
1 change: 0 additions & 1 deletion src/app/core/title-service/title.service.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,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 } = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 98f0a78

Please sign in to comment.