From 4d520d71fea57a9c673dd90476c9385bc6b2866f Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 27 Jun 2022 12:00:30 +0300 Subject: [PATCH] [Library | new-theme]: Added scrolling in links and my links | set 403 on errorPage when private data | Show pid re3data lowercase. 1. displayClaims.component.ts & searchMyOrcidResults.component.ts: Added scrolling in my/all claims page and in my orcid links page. 2. errorPage.component.ts: Set statusMessage and statusCode to 403 when page is private. 3. showIdentifiers.component.ts: Do not add uk-text-uppercase for "re3data" pid. 4. myOrcidLinks.component.ts: In "No ORCID links found" added classes "uk-text-meta uk-text-large uk-text-center" instead of alert. 5. searchMyOrcidResults.component.html: Added condition if totalResults > 0 and previewResults > 0 for . --- .../displayClaims/displayClaims.component.ts | 2 ++ error/errorPage.component.ts | 12 ++++++++---- .../landing-utils/showIdentifiers.component.ts | 2 +- orcid/my-orcid-links/myOrcidLinks.component.ts | 2 +- .../searchMyOrcidResults.component.html | 9 ++++----- .../my-orcid-links/searchMyOrcidResults.component.ts | 2 ++ 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/claims/claim-utils/displayClaims/displayClaims.component.ts b/claims/claim-utils/displayClaims/displayClaims.component.ts index acd5a711..f35d3bfe 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.ts +++ b/claims/claim-utils/displayClaims/displayClaims.component.ts @@ -21,6 +21,7 @@ import {FormArray, FormBuilder, FormControl, FormGroup} from '@angular/forms'; import {Option} from '../../../sharedComponents/input/input.component'; import {SearchInputComponent} from '../../../sharedComponents/search-input/search-input.component'; import {OpenaireEntities} from "../../../utils/properties/searchFields"; +import {HelperFunctions} from "../../../utils/HelperFunctions.class"; declare var UIkit; @Component({ @@ -293,6 +294,7 @@ export class DisplayClaimsComponent { goTo(page: number = 1) { this.page = page; this.location.go(location.pathname, this.getParametersString()); + HelperFunctions.scroll(); this.getClaims(); } diff --git a/error/errorPage.component.ts b/error/errorPage.component.ts index 189d691f..92b1ceaf 100644 --- a/error/errorPage.component.ts +++ b/error/errorPage.component.ts @@ -62,18 +62,22 @@ export class ErrorPageComponent { if (!this.page) { this.page = this._location.path(true); } - if(this.response) { - this.response.statusCode = 404; - this.response.statusMessage = '404 - Page not found'; - } if(this.page != "-1") { let title = "OpenAIRE | Error page"; this._meta.updateTag({content:title},"property='og:title'"); this._title.setTitle(title); + if(this.response) { + this.response.statusCode = 404; + this.response.statusMessage = '404 - Page not found'; + } } else{ let title = "OpenAIRE | Private data"; this._meta.updateTag({content:title},"property='og:title'"); this._title.setTitle(title); + if(this.response) { + this.response.statusCode = 403; + this.response.statusMessage = '403 - Private data'; + } } this.page_type = data['page_type']; if(this.page_type) { diff --git a/landingPages/landing-utils/showIdentifiers.component.ts b/landingPages/landing-utils/showIdentifiers.component.ts index 21e55ecb..2e3dcff5 100644 --- a/landingPages/landing-utils/showIdentifiers.component.ts +++ b/landingPages/landing-utils/showIdentifiers.component.ts @@ -23,7 +23,7 @@ import {properties} from "../../../../environments/environment"; [class.uk-margin-bottom]="modal">

- {{key}}: + {{key}}:

diff --git a/orcid/my-orcid-links/searchMyOrcidResults.component.html b/orcid/my-orcid-links/searchMyOrcidResults.component.html index d6c362c3..2eaa8986 100644 --- a/orcid/my-orcid-links/searchMyOrcidResults.component.html +++ b/orcid/my-orcid-links/searchMyOrcidResults.component.html @@ -1,12 +1,11 @@
- - -
    - +
      +
    • @@ -38,7 +37,7 @@ -
      \ No newline at end of file diff --git a/orcid/my-orcid-links/searchMyOrcidResults.component.ts b/orcid/my-orcid-links/searchMyOrcidResults.component.ts index 503df21e..4034e75a 100644 --- a/orcid/my-orcid-links/searchMyOrcidResults.component.ts +++ b/orcid/my-orcid-links/searchMyOrcidResults.component.ts @@ -10,6 +10,7 @@ import {properties} from "../../../../environments/environment"; import {Session} from "../../login/utils/helper.class"; import {OrcidService} from "../orcid.service"; import {OpenaireEntities} from "../../utils/properties/searchFields"; +import {HelperFunctions} from "../../utils/HelperFunctions.class"; @Component({ selector: 'my-orcid-result', @@ -115,6 +116,7 @@ export class searcMyOrcidResultsComponent { public pageChanged($event) { this.pageChange.emit($event); + HelperFunctions.scroll(); } public totalPages(totalResults: number): number {