From c123b9c2b5332dd01fdcd7c94b6f25f305f14a85 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Tue, 11 Jul 2023 09:53:40 -0600 Subject: [PATCH 1/3] fix-robots-for-ready-for-index-users --- .../record/pages/my-orcid/my-orcid.component.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/record/pages/my-orcid/my-orcid.component.ts b/src/app/record/pages/my-orcid/my-orcid.component.ts index 358bfd55ad..91c93a2897 100644 --- a/src/app/record/pages/my-orcid/my-orcid.component.ts +++ b/src/app/record/pages/my-orcid/my-orcid.component.ts @@ -122,8 +122,16 @@ export class MyOrcidComponent implements OnInit, OnDestroy { this.userInfo = userRecord?.userInfo this.checkLoadingState(userRecord) this.recordWithIssues = userRecord?.userInfo?.RECORD_WITH_ISSUES - this.readyForIndexing = - userRecord?.userInfo?.READY_FOR_INDEXING === 'true' + + console.log('userRecord?.userInfo? ', userRecord?.userInfo) + if (userRecord?.userInfo) { + console.log(userRecord?.userInfo?.READY_FOR_INDEXING) + this.readyForIndexing = + userRecord?.userInfo?.READY_FOR_INDEXING === 'true' + if (this.publicOrcid && !this.readyForIndexing) { + this._robotsMeta.disallowRobots() + } + } this.userNotFound = userRecord?.userInfo?.USER_NOT_FOUND this.userRecord = userRecord @@ -133,9 +141,6 @@ export class MyOrcidComponent implements OnInit, OnDestroy { this.observeSessionUpdates() } - if (this.publicOrcid && !this.readyForIndexing) { - this._robotsMeta.disallowRobots() - } this._openGraph.addOpenGraphData(userRecord, { force: true }) }), switchMap(() => this._togglz.getTogglz().pipe(first())), From a3fb89512cbcefeefdf2687bf462d203e1b96844 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Tue, 11 Jul 2023 09:54:13 -0600 Subject: [PATCH 2/3] remove logs --- src/app/record/pages/my-orcid/my-orcid.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/record/pages/my-orcid/my-orcid.component.ts b/src/app/record/pages/my-orcid/my-orcid.component.ts index 91c93a2897..6d04687301 100644 --- a/src/app/record/pages/my-orcid/my-orcid.component.ts +++ b/src/app/record/pages/my-orcid/my-orcid.component.ts @@ -123,9 +123,7 @@ export class MyOrcidComponent implements OnInit, OnDestroy { this.checkLoadingState(userRecord) this.recordWithIssues = userRecord?.userInfo?.RECORD_WITH_ISSUES - console.log('userRecord?.userInfo? ', userRecord?.userInfo) if (userRecord?.userInfo) { - console.log(userRecord?.userInfo?.READY_FOR_INDEXING) this.readyForIndexing = userRecord?.userInfo?.READY_FOR_INDEXING === 'true' if (this.publicOrcid && !this.readyForIndexing) { From efdc52c36f6fc856da3708e1f6d904c86250eca6 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Tue, 11 Jul 2023 11:50:47 -0600 Subject: [PATCH 3/3] Format and test --- .../panel-source/panel-source.component.html | 16 +++++++++++++-- .../panel-source/panel-source.component.scss | 2 +- .../funding-stack/funding-stack.component.ts | 20 ++++++++++++++++++- 3 files changed, 34 insertions(+), 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 index 52c12be0c9..63f2b1015c 100644 --- 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 @@ > Source: - + - + { + return { + ...funding, + userIsSource: this.userIsSource(funding), + } + } + ) + } + } + get userInfo(): UserInfo { + return this._userInfo + } orgDisambiguated: { [key: string]: OrgDisambiguated | null } = {} stackPanelsDisplay: { [key: string]: { topPanelOfTheStack: boolean } } = {}