Merge branch 'develop' of code-repo.d4science.org:MaDgIK/openaire-library into develop
This commit is contained in:
commit
054d7ff51e
|
@ -297,13 +297,13 @@
|
||||||
<my-tab *ngIf="resultLandingInfo.bioentities && bioentitiesNum> 0"
|
<my-tab *ngIf="resultLandingInfo.bioentities && bioentitiesNum> 0"
|
||||||
[tabTitle]="'External Databases'" [tabId]="'bioentities'" [tabNumber]="bioentitiesNum">
|
[tabTitle]="'External Databases'" [tabId]="'bioentities'" [tabNumber]="bioentitiesNum">
|
||||||
</my-tab>
|
</my-tab>
|
||||||
|
<my-tab *ngIf="resultLandingInfo && (resultLandingInfo.measure || hasAltMetrics)"
|
||||||
|
[tabTitle]="'Metrics'" [tabId]="'metrics'">
|
||||||
|
</my-tab>
|
||||||
<my-tab *ngIf="enermapsId && properties.enermapsURL"
|
<my-tab *ngIf="enermapsId && properties.enermapsURL"
|
||||||
[tabTitle]="'Enermaps Tool'" [tabId]="'enermaps'"
|
[tabTitle]="'Enermaps Tool'" [tabId]="'enermaps'"
|
||||||
customClass="portalTab">
|
customClass="portalTab">
|
||||||
</my-tab>
|
</my-tab>
|
||||||
<my-tab *ngIf="resultLandingInfo && (resultLandingInfo.measure || hasAltMetrics)"
|
|
||||||
[tabTitle]="'Metrics'" [tabId]="'metrics'">
|
|
||||||
</my-tab>
|
|
||||||
</my-tabs>
|
</my-tabs>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -328,14 +328,14 @@
|
||||||
<ng-container *ngTemplateOutlet="bioentities_content"></ng-container>
|
<ng-container *ngTemplateOutlet="bioentities_content"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
<ng-container *ngIf="resultLandingInfo && ((resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length)) || hasAltMetrics)">
|
||||||
|
<ng-container *ngTemplateOutlet="metricsContent"></ng-container>
|
||||||
|
</ng-container>
|
||||||
<ng-container *ngIf="enermapsId && properties.enermapsURL">
|
<ng-container *ngIf="enermapsId && properties.enermapsURL">
|
||||||
<div id="enermaps" class="landing-section">
|
<div id="enermaps" class="landing-section">
|
||||||
<ng-container *ngTemplateOutlet="enermapsTool_content"></ng-container>
|
<ng-container *ngTemplateOutlet="enermapsTool_content"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container *ngIf="resultLandingInfo && ((resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length)) || hasAltMetrics)">
|
|
||||||
<ng-container *ngTemplateOutlet="metricsContent"></ng-container>
|
|
||||||
</ng-container>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-text-xsmall uk-hidden@m"><ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container></div>
|
<div class="uk-text-xsmall uk-hidden@m"><ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container></div>
|
||||||
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
|
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
|
||||||
|
|
|
@ -554,10 +554,6 @@ export class ResultLandingComponent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this.communityId && this.communityId == "enermaps" && properties.enermapsURL) {
|
|
||||||
this.enermapsId = ParsingFunctions.getEnermapsConceptId(this.resultLandingInfo.contexts);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.relatedClassFilters = [{"label": "All relations", "value": ""}];
|
this.relatedClassFilters = [{"label": "All relations", "value": ""}];
|
||||||
if (this.resultLandingInfo.relatedClassFilters.size > 1) {
|
if (this.resultLandingInfo.relatedClassFilters.size > 1) {
|
||||||
for (let relClass of this.resultLandingInfo.relatedClassFilters) {
|
for (let relClass of this.resultLandingInfo.relatedClassFilters) {
|
||||||
|
@ -591,6 +587,9 @@ export class ResultLandingComponent {
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
|
|
||||||
if (contexts) {
|
if (contexts) {
|
||||||
|
if (this.communityId && this.communityId == "enermaps" && properties.enermapsURL) {
|
||||||
|
this.enermapsId = ParsingFunctions.getEnermapsConceptId(contexts);
|
||||||
|
}
|
||||||
await this.promise;
|
await this.promise;
|
||||||
if(this.publicCommunities && this.publicCommunities.length > 0) {
|
if(this.publicCommunities && this.publicCommunities.length > 0) {
|
||||||
this.resultLandingInfo.contexts = contexts.filter(context => {
|
this.resultLandingInfo.contexts = contexts.filter(context => {
|
||||||
|
|
|
@ -40,7 +40,7 @@ export class EntitiesSelectionComponent {
|
||||||
|
|
||||||
/** TODO change conditions base on PortalType instead of customFilter */
|
/** TODO change conditions base on PortalType instead of customFilter */
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc'].includes(this.properties.adminToolsPortalType))) {
|
if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'faircore4eosc'].includes(this.properties.adminToolsPortalType))) {
|
||||||
this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
|
this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
|
||||||
if (data) {
|
if (data) {
|
||||||
let showEntity = {};
|
let showEntity = {};
|
||||||
|
|
|
@ -38,6 +38,7 @@ export let common: EnvProperties = {
|
||||||
searchLinkToPublication: "/search/publication?articleId=",
|
searchLinkToPublication: "/search/publication?articleId=",
|
||||||
searchLinkToProject: "/search/project?projectId=",
|
searchLinkToProject: "/search/project?projectId=",
|
||||||
searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
|
searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
|
||||||
|
searchLinkToService: "/search/service?serviceId=",
|
||||||
searchLinkToDataset: "/search/dataset?datasetId=",
|
searchLinkToDataset: "/search/dataset?datasetId=",
|
||||||
searchLinkToSoftwareLanding: "/search/software?softwareId=",
|
searchLinkToSoftwareLanding: "/search/software?softwareId=",
|
||||||
searchLinkToOrp: "/search/other?orpId=",
|
searchLinkToOrp: "/search/other?orpId=",
|
||||||
|
@ -45,6 +46,7 @@ export let common: EnvProperties = {
|
||||||
searchLinkToAll: "/search/find/",
|
searchLinkToAll: "/search/find/",
|
||||||
searchLinkToPublications: "/search/find/publications",
|
searchLinkToPublications: "/search/find/publications",
|
||||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||||
|
searchLinkToServices: "/search/find/services",
|
||||||
searchLinkToProjects: "/search/find/projects",
|
searchLinkToProjects: "/search/find/projects",
|
||||||
searchLinkToDatasets: "/search/find/datasets",
|
searchLinkToDatasets: "/search/find/datasets",
|
||||||
searchLinkToSoftware: "/search/find/software",
|
searchLinkToSoftware: "/search/find/software",
|
||||||
|
@ -60,6 +62,7 @@ export let common: EnvProperties = {
|
||||||
searchLinkToAdvancedSoftware: "/search/advanced/software",
|
searchLinkToAdvancedSoftware: "/search/advanced/software",
|
||||||
searchLinkToAdvancedOrps: "/search/advanced/other",
|
searchLinkToAdvancedOrps: "/search/advanced/other",
|
||||||
searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
|
searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
|
||||||
|
searchLinkToAdvancedServices: "/search/advanced/services",
|
||||||
searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
|
searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
|
||||||
searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
|
searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
|
||||||
errorLink: '/error',
|
errorLink: '/error',
|
||||||
|
|
Loading…
Reference in New Issue