From 53f6eb465caea4628e52cbb058d22b31210ebe3e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 3 Aug 2022 18:21:14 +0300 Subject: [PATCH] [Explore | Library | new-theme]: Added more refine filters in Repositories, Journals, Registries pages | Search & Datasource landing: Show not compatible datasources | Result Landing: get relations names by relationsVocabulary (dnet:relation_relClass.json). 1. env-properties.ts & environments/: Removed old properties searchLinkToEntityRegistriesDataProvidersTable and searchLinkToJournalsTable. 2. fetchDataproviders.class.ts & searchDataproviders.service.ts: Removed old unused methods related to subjects/ tables/ csv. 3. searchFields.ts: Added more refine filters in Repositories, Journals, Registries pages (COMPATIBLE_DATAPROVIDER_FIELDS, ENTITY_REGISTRIES_FIELDS, JOURNAL_FIELDS). 4. result-preview.component.ts: Added field @Input() deposit: boolean = false; 5. result-preview.component.html: a. Added link to landing page even for not compatible datasources. b. Added class "uk-label-danger" when compatibility = "not available" only when deposit=true. 6. searchResultsInDeposit.component.html: In added parameter deposit="true". 7. dataProvider.component.html: a. Added class "uk-label-danger" when compatibility = "not available". b. Show custom "Not yet registered" compatibility label when compatibility = "not available". 8. ISVocabularies.service.ts: Added methods for getting relationsVocabulary (dnet:relation_relClass.json). 9. resultLanding.service.ts & parsingFunctions.class.ts: When parsing relations, get relationName from relationsVocabulary. 10. resultLanding.component.ts: Get relationsVocabulary and pass it to "getResultLandingInfo()". 11. orcid-work.component.ts: When calling "getResultLandingInfo()", added null parameter for relationsVocabulary. 12. configuration.service.ts: [Bug fix] Added more checks in method "isPageEnabledByStateAsync()". --- explore/src/app/openaireLibrary | 2 +- explore/src/environments/environment.beta.ts | 2 -- explore/src/environments/environment.prod.ts | 2 -- explore/src/environments/environment.test.ts | 2 -- explore/src/environments/environment.ts | 4 +--- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index f5def43f..d43f576d 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f5def43fbdb00fa58f315383d2cd59d47cd17d32 +Subproject commit d43f576d406421de2136f53c6b8333c94da22cd3 diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index e29a3c2c..bee23746 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -91,9 +91,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications", diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index f254430e..79f3809b 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -96,9 +96,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications", diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index fe4d1e7a..fa056e21 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -95,9 +95,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications", diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index 531947bd..25b0b622 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -51,7 +51,7 @@ export let properties: EnvProperties = { helpdesk: "https://www.openaire.eu/support/helpdesk", helpdeskEmail: "helpdesk@openaire.eu", utilsService: "http://dl170.madgik.di.uoa.gr:8000", - + vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", @@ -97,9 +97,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications",