diff --git a/error/errorPage.component.ts b/error/errorPage.component.ts
index afddac90..c0526aab 100644
--- a/error/errorPage.component.ts
+++ b/error/errorPage.component.ts
@@ -7,6 +7,7 @@ import {properties} from "../../../environments/environment";
import {RESPONSE} from '../utils/tokens';
import {Response} from 'express';
import {OpenaireEntities} from "../utils/properties/searchFields";
+import {EnvProperties} from "../utils/properties/env-properties";
@Component({
selector: 'error',
@@ -23,7 +24,8 @@ import {OpenaireEntities} from "../utils/properties/searchFields";
Not valid or missing {{page_type_name}} id.
- Search another {{page_type_name}}?
+ Search another {{page_type_name}}?
+ Search another {{page_type_name}} in OpenAIRE?
@@ -48,7 +50,9 @@ export class ErrorPageComponent {
public page_type: string;
public searchPage: string;
public searchPagePrams: {};
+ public searchPagePramsString: string = "";
public page_type_name: string;
+ public properties: EnvProperties = properties;
constructor (private _location: Location, private _meta: Meta,
private _title: Title, private route: ActivatedRoute,
@@ -84,17 +88,21 @@ export class ErrorPageComponent {
if (this.page_type == "publication") {
this.searchPage = properties.searchLinkToResults;
this.searchPagePrams = {type: 'publications'}
+ this.searchPagePramsString = "&type=publications";
this.page_type_name = OpenaireEntities.PUBLICATION.toLowerCase();
} else if (this.page_type == "software") {
this.searchPage = properties.searchLinkToResults;
this.searchPagePrams = {type: 'software'}
+ this.searchPagePramsString = "&type=software";
this.page_type_name = OpenaireEntities.SOFTWARE_SINGULAR.toLowerCase();
} else if (this.page_type == "dataset") {
this.searchPagePrams = {type: 'datasets'}
+ this.searchPagePramsString = "&type=datasets";
this.searchPage = properties.searchLinkToResults;
this.page_type_name = OpenaireEntities.DATASET.toLowerCase();
} else if (this.page_type == "orp") {
this.searchPagePrams = {type: 'orps'}
+ this.searchPagePramsString = "&type=orps";
this.searchPage = properties.searchLinkToResults;
this.page_type_name = OpenaireEntities.OTHER_SINGULAR.toLowerCase();
} else if (this.page_type == "organization") {
@@ -113,6 +121,11 @@ export class ErrorPageComponent {
this.searchPage = properties.searchLinkToResults;
this.page_type_name = OpenaireEntities.RESULT.toLowerCase();
}
+
+
+ if(properties.adminToolsPortalType == 'eosc') {
+ this.searchPage = "https://explore.openaire.eu"+this.searchPage+this.searchPagePramsString;
+ }
}
});
}
diff --git a/landingPages/dataProvider/relatedDatasourcesTab.component.ts b/landingPages/dataProvider/relatedDatasourcesTab.component.ts
index f5e7da2f..c4671349 100644
--- a/landingPages/dataProvider/relatedDatasourcesTab.component.ts
+++ b/landingPages/dataProvider/relatedDatasourcesTab.component.ts
@@ -46,10 +46,14 @@ import {OpenaireEntities} from "../../utils/properties/searchFields";
0" class="uk-text-center">
-
+
+ {{result.count | number}}
+
+
{{result.count | number}}
|
diff --git a/landingPages/landing-utils/fos.component.ts b/landingPages/landing-utils/fos.component.ts
index c1ffc00a..7f004327 100644
--- a/landingPages/landing-utils/fos.component.ts
+++ b/landingPages/landing-utils/fos.component.ts
@@ -14,17 +14,25 @@ import {StringUtils} from "../../utils/string-utils.class";
{{title}}
-
threshold && !viewAll"
+ threshold && !viewAll"
+ (click)="viewAllClick();" class="view-more-less-link uk-text-truncate" uk-tooltip="View all">
+ View all
+
+
threshold && !viewAll"
(click)="viewAllClick();" class="view-more-less-link uk-text-truncate" uk-tooltip="View all & feedback">
View all & feedback
-
Feedback
@@ -27,8 +30,12 @@ import {StringUtils} from "../../utils/string-utils.class";
loading="lazy" alt="sdg_colors" style="width:27px; height:27px">
diff --git a/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts b/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts
index 2f9dc612..54d42f10 100644
--- a/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts
+++ b/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts
@@ -112,14 +112,16 @@ export class OpenAireJsonldConverterService {
doc.license = this.getLicense(result);
doc.keyword = this.getKeyword(result);
doc.isPartOf = [];
- let fosSubjects = this.getKeyword(result,"FOS");
- let sdgSubjects = this.getKeyword(result,"SDG");
- for(let fos of fosSubjects?fosSubjects:[]){
- doc.isPartOf.push(URL.split('/search/')[0]+ searchActionRoute + "?fos=" + encodeURIComponent('"'+fos+'"'));
- }
- for(let sdg of sdgSubjects?sdgSubjects:[] ){
- doc.isPartOf.push(URL.split('/search/')[0]+ searchActionRoute + "?sdg=" + encodeURIComponent('"'+sdg+'"'));
- }
+ if(properties.adminToolsPortalType !== 'eosc') {
+ let fosSubjects = this.getKeyword(result, "FOS");
+ let sdgSubjects = this.getKeyword(result, "SDG");
+ for (let fos of fosSubjects ? fosSubjects : []) {
+ doc.isPartOf.push(URL.split('/search/')[0] + searchActionRoute + "?fos=" + encodeURIComponent('"' + fos + '"'));
+ }
+ for (let sdg of sdgSubjects ? sdgSubjects : []) {
+ doc.isPartOf.push(URL.split('/search/')[0] + searchActionRoute + "?sdg=" + encodeURIComponent('"' + sdg + '"'));
+ }
+ }
return doc;
}
diff --git a/utils/authors/showAuthors.component.ts b/utils/authors/showAuthors.component.ts
index b31ea38e..27aa7e0c 100644
--- a/utils/authors/showAuthors.component.ts
+++ b/utils/authors/showAuthors.component.ts
@@ -60,12 +60,17 @@ import {properties} from "../../../../environments/environment";
{{author.fullName}} in OpenAIRE
diff --git a/utils/tabs/contents/search-tab.component.ts b/utils/tabs/contents/search-tab.component.ts
index daa12d88..198f4cbc 100644
--- a/utils/tabs/contents/search-tab.component.ts
+++ b/utils/tabs/contents/search-tab.component.ts
@@ -7,7 +7,7 @@ import {StringUtils} from "../../string-utils.class";
@Component({
selector: 'search-tab',
template: `
-
@@ -19,10 +19,14 @@ import {StringUtils} from "../../string-utils.class";
{{customTitle}}
@@ -72,4 +76,12 @@ export class SearchTabComponent {
get results() {
return this.currentPage ? this.fetch.results.slice((this.currentPage - 1) * this.searchNumber, this.currentPage * this.searchNumber) : this.fetch.results;
}
+
+ get paramsForExternalUrl() {
+ let parameters: string = "";
+ Object.keys(this.params).forEach(paramKey => {
+ parameters += (parameters ? "&" : "?") + paramKey+"="+this.params[paramKey];
+ })
+ return parameters;
+ }
}