diff --git a/landingPages/landing-utils/showIdentifiers.component.ts b/landingPages/landing-utils/showIdentifiers.component.ts index b45eb6a6..e8a3cef9 100644 --- a/landingPages/landing-utils/showIdentifiers.component.ts +++ b/landingPages/landing-utils/showIdentifiers.component.ts @@ -5,7 +5,7 @@ import {HelperFunctions} from "../../utils/HelperFunctions.class"; selector: 'showIdentifiers', template: ` - 0" class="uk-text-bold">Related identifiers: + 0" class="uk-text-bold">Identifiers: pageSize"> View less identifiers diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 4e5f48e7..3f295bc0 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -25,7 +25,7 @@ The following information is the result of merging - {{organizationInfo.deletedByInferenceIds.length}} original versions + {{organizationInfo.deletedByInferenceIds.length}} other versions {{organizationInfo.name}} diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index 2084a811..e20170ba 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -567,7 +567,7 @@ export class OrganizationComponent { this.deleteByInferenceOpened = true; this.alertModalDeletedByInference.cancelButton = false; this.alertModalDeletedByInference.okButton = false; - this.alertModalDeletedByInference.alertTitle = "Original versions"; + this.alertModalDeletedByInference.alertTitle = "Other versions"; this.alertModalDeletedByInference.open(); } } diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index caed46d7..100c9e31 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -28,7 +28,7 @@ The following information is the result of merging - {{resultLandingInfo.deletedByInferenceIds.length}} original versions + {{resultLandingInfo.deletedByInferenceIds.length}} other versions @@ -291,40 +291,6 @@ - - - Software - ({{resultLandingInfo.software.length | number}}) - - - pageSize" - class="uk-margin-bottom"> - {{resultLandingInfo.software.length | number}} - software results, page {{softwarePage | number}} - of {{totalPages(resultLandingInfo.software.length) | number}} - - - - - - - - - - {{item.name}} - - - - - - - - - 0"> diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 1216ef6e..51eeb777 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -280,8 +280,6 @@ export class ResultLandingComponent { this.activeTab = "Related Organizations"; } else if (this.resultLandingInfo.bioentities) { this.activeTab = "Bioentities"; - } else if (this.resultLandingInfo.software) { - this.activeTab = "Software"; } else { this.activeTab = "Metrics"; //this.metricsClicked = true; @@ -414,7 +412,7 @@ export class ResultLandingComponent { this.deleteByInferenceOpened = true; this.alertModalDeletedByInference.cancelButton = false; this.alertModalDeletedByInference.okButton = false; - this.alertModalDeletedByInference.alertTitle = "Original versions"; + this.alertModalDeletedByInference.alertTitle = "Other versions"; //this.alertModalDeletedByInference.message = "There was an error in csv downloading. Please try again later."; //this.alertModalDeletedByInference.okButtonText = "OK"; this.alertModalDeletedByInference.open(); diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts index 587dd205..b70cb689 100644 --- a/landingPages/result/resultLanding.service.ts +++ b/landingPages/result/resultLanding.service.ts @@ -190,9 +190,8 @@ export class ResultLandingService { } if(data[3].hasOwnProperty("externalreference")) { - let externalResults: [Map>, { "name": string, "url": string}[]] = this.parseBioentitiesAndSoftware(data[3]); - this.resultLandingInfo.bioentities = externalResults[0]; - this.resultLandingInfo.software = externalResults[1]; + let externalResults: Map> = this.parseBioentitiesAndSoftware(data[3]); + this.resultLandingInfo.bioentities = externalResults; } } @@ -325,9 +324,8 @@ export class ResultLandingService { return organizations; } - parseBioentitiesAndSoftware(children: any) : [Map>, { "name": string, "url": string}[]] { + parseBioentitiesAndSoftware(children: any) : Map> { let bioentities: Map>; - let software: {"name": string, "url": string}[]; let length = Array.isArray(children['externalreference']) ? children['externalreference'].length : 1; @@ -347,18 +345,11 @@ export class ResultLandingService { } bioentities.get(externalreference.sitename).set(externalreference.refidentifier, externalreference.url); - } else if(externalreference['qualifier'].classid == "software") { - - if(software == undefined) { - software = new Array<{"name": string, "url": string}>(); - } - - software.push({"name": externalreference.sitename, "url": externalreference.url}); } } } - return [bioentities, software]; + return bioentities; } getOpenCitations(id: string, properties:EnvProperties) { diff --git a/utils/entities/resultLandingInfo.ts b/utils/entities/resultLandingInfo.ts index 09cc4d48..2c6567ee 100644 --- a/utils/entities/resultLandingInfo.ts +++ b/utils/entities/resultLandingInfo.ts @@ -52,7 +52,6 @@ export class ResultLandingInfo { // PUBLICATION bioentities: Map>; //> - software: { "name": string, "url": string}[]; //> organizations: {"name": string, "shortname":string, "id": string, "websiteUrl": string, "country": string, "trust": number}[]; openCitations: {"url": string, "title": string, "year": string, "doi": string, "authors": string[]}[];
@@ -291,40 +291,6 @@ -