Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8717 qa edit button missing from activities #2007

Merged
merged 3 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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