From c142a5fe213c0a7af63e8f0a71f736f604487450 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 13 May 2022 15:46:54 +0300 Subject: [PATCH 1/8] [Library | Trunk]: advancedSearchForm.component.html: Dropdown for advanced search link (all content) replaced with a link to advanced search results (research products). --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index fc2fbb5..5aa832d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit fc2fbb5ba008712b856a60d28e341dc1475fab80 +Subproject commit 5aa832d69859bf80aa0af8d9a1359ea359f7700f From 19dbcf328dbb374ef97cf18f617e9f9e26710979 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 13 May 2022 15:50:16 +0300 Subject: [PATCH 2/8] [openaire-theme | Trunk]: In class .uk-dropdown.options, updated max-height: 216px to be enough for 6 entities (5 old + services). --- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/common-assets b/src/assets/common-assets index 04d799f..e0ff412 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 04d799f089c93ae28c9d2ca8436f283ebc0be3ae +Subproject commit e0ff4127402ee93a1c757c8aee246fe2c20b18af diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 3b518bb..fd632de 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 3b518bbe8d442f0ce798663384ca33084da61009 +Subproject commit fd632de294187bf79f34fbc8aac70c54328158b8 From 12d4473e54f9e019f06fc57b0e5387f371ea77bc Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 13 May 2022 15:57:31 +0300 Subject: [PATCH 3/8] [Library | Trunk]: [NEW] Added service entity. 1. result-preview.component.ts & datasourcesHelper.class.ts & entitiesSelection.component.ts & newSearchPage.component.ts & errorPage.component.ts & searchAll.component.ts: Added case for service entity. 2. searchFields.ts: Added in OpenaireEntities names for Services | In methods "getFieldName()" and "getFieldParam()" case for service entity. 3. searchDataProviders.component.ts: Parametrize component to show/query for datasources or services. 4. quick-selections.component.ts: Delete reset of resultTypes from "initializeFilters()" method. 5. searchDataproviders.service.ts: In method "numOfSearchDataproviders2()" added parameter "typePathParam" to search for datasources or services | In method "parseResults()" set "entityType" according to eosctype field. 6. portal.ts: In method "getmockPortalInfo()" added entity and routes for service. 7. env-properties.ts: Added properties "searchLinkToService", "searchLinkToServices", "searchLinkToAdvancedServices". 8. dataProvider.component.html: Parametrize component to show for datasources or services | [Bug fix] Added [class.uk-invisible]="!dataProviderInfo" in #graph_and_feedback_template. 9. dataProvider.component.ts: Parametrize component to show/query for datasources or services. 10. dataProvider.service.ts: In method "getDataproviderInfo()" added parameter "typePathParam" to search for datasources or services. 11. searchAll.component.html: Added tab for search services. --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5aa832d..d618397 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5aa832d69859bf80aa0af8d9a1359ea359f7700f +Subproject commit d61839718e3bfc3bd09f6419feec4e47a1788223 From bdda9981276e9b6796cfd88e95e28e69a9a6455f Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 13 May 2022 16:07:09 +0300 Subject: [PATCH 4/8] [Aggregator | new-theme]: [NEW] Added service entity in Menu, properties and added landing and search pages. 1. aggregators.ts: Added in PortalAggregators.disabled object, service entity & route. 2. app.component.ts: Added in menuItems "Serive" and use for menuItems entity names from OpenaireEntities. 3. app-routing.module.ts: Added routes for service landing, search and advanced search pages. 4. environments/: Added values for properties searchLinkToService, searchLinkToServices, searchLinkToAdvancedServices, errorLink 5. [NEW] Files added for services landing, search and advanced search pages: landingPages/service/, advancedSearchServices.component.ts, advancedSearchServices.module.ts, advancedSearchServices-routing.module.ts, searchServices.component.ts, searchServices.module.ts, searchServices-routing.module.ts --- src/app/app-routing.module.ts | 12 +++++++ src/app/app.component.ts | 10 +++--- .../landingPages/service/libService.module.ts | 14 ++++++++ .../service/service-routing.module.ts | 18 ++++++++++ .../landingPages/service/service.component.ts | 20 +++++++++++ .../advancedSearchServices-routing.module.ts | 17 +++++++++ .../advancedSearchServices.component.ts | 35 +++++++++++++++++++ .../advanced/advancedSearchServices.module.ts | 25 +++++++++++++ .../simple/searchServices-routing.module.ts | 18 ++++++++++ .../simple/searchServices.component.ts | 34 ++++++++++++++++++ .../simple/searchServices.module.ts | 23 ++++++++++++ src/app/utils/aggregators.ts | 6 ++-- src/environments/environment.beta.ts | 5 +++ src/environments/environment.eosc.ts | 5 +++ src/environments/environment.prod.ts | 5 +++ src/environments/environment.ts | 9 +++-- 16 files changed, 247 insertions(+), 9 deletions(-) create mode 100644 src/app/landingPages/service/libService.module.ts create mode 100644 src/app/landingPages/service/service-routing.module.ts create mode 100644 src/app/landingPages/service/service.component.ts create mode 100644 src/app/searchPages/advanced/advancedSearchServices-routing.module.ts create mode 100644 src/app/searchPages/advanced/advancedSearchServices.component.ts create mode 100644 src/app/searchPages/advanced/advancedSearchServices.module.ts create mode 100644 src/app/searchPages/simple/searchServices-routing.module.ts create mode 100644 src/app/searchPages/simple/searchServices.component.ts create mode 100644 src/app/searchPages/simple/searchServices.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f522e00..d93a365 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -33,6 +33,10 @@ const routes: Routes = [ path: 'search/dataprovider', loadChildren: () => import('./landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule), data: { showHeader: true} }, + { + path: 'search/service', + loadChildren: () => import('./landingPages/service/libService.module').then(m => m.LibServiceModule), data: { showHeader: true} + }, { path: 'search/organization', loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule), data: { showHeader: true} @@ -53,6 +57,10 @@ const routes: Routes = [ path: 'search/find/dataproviders', loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule) }, + { + path: 'search/find/services', + loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule) + }, { path: 'search/find/organizations', loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule) @@ -69,6 +77,10 @@ const routes: Routes = [ path: 'search/advanced/dataproviders', loadChildren: () => import('./searchPages/advanced/advancedSearchDataProviders.module').then(m => m.LibAdvancedSearchDataProvidersModule) }, + { + path: 'search/advanced/services', + loadChildren: () => import('./searchPages/advanced/advancedSearchServices.module').then(m => m.LibAdvancedSearchServicesModule) + }, { path: 'search/advanced/projects', loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 2ec8006..a588111 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -13,6 +13,7 @@ import {Subscriber} from "rxjs"; import {DOCUMENT} from "@angular/common"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {ActivatedRoute, NavigationEnd, Router} from "@angular/router"; +import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"; @Component({ selector: 'app-root', @@ -139,10 +140,11 @@ export class AppComponent { ]; let params = {}; // params[this.agg.queryFieldName] = this.agg.valueId; - this.menuItems[1].items.push(new MenuItem("", "Research outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], params)); - this.menuItems[1].items.push(new MenuItem("", "Projects", "", "/search/find/projects", false, ["project"], ["/search/find/projects"], params)); - this.menuItems[1].items.push(new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], params)); - this.menuItems[1].items.push(new MenuItem("", "Organizations", "", "/search/find/organizations", false, ["organization"], ["/search/find/organizations"], params)); + this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.RESULTS, "", properties.searchLinkToResults, false, [], ["/search/find/research-outcomes"], params)); + this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.PROJECTS, "", properties.searchLinkToProjects, false, ["project"], ["/search/find/projects"], params)); + this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.DATASOURCES, "", properties.searchLinkToDataProviders, false, ["datasource"], ["/search/find/dataproviders"], params)); + this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.SERVICES, "", properties.searchLinkToServices, false, ["datasource"], ["/search/find/services"], params)); + this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.ORGANIZATIONS, "", properties.searchLinkToOrganizations, false, ["organization"], ["/search/find/organizations"], params)); } setStyles(){ diff --git a/src/app/landingPages/service/libService.module.ts b/src/app/landingPages/service/libService.module.ts new file mode 100644 index 0000000..2820134 --- /dev/null +++ b/src/app/landingPages/service/libService.module.ts @@ -0,0 +1,14 @@ +import { NgModule} from '@angular/core'; +import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; +import { OpenaireServiceComponent } from './service.component'; +import {ServiceRoutingModule} from './service-routing.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + +@NgModule({ + imports: [DataProviderModule, ServiceRoutingModule], + declarations:[OpenaireServiceComponent], + providers:[FreeGuard, PreviousRouteRecorder], + exports:[OpenaireServiceComponent] +}) +export class LibServiceModule { } diff --git a/src/app/landingPages/service/service-routing.module.ts b/src/app/landingPages/service/service-routing.module.ts new file mode 100644 index 0000000..f73bdf9 --- /dev/null +++ b/src/app/landingPages/service/service-routing.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { OpenaireServiceComponent } from './service.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireServiceComponent, canActivate: [FreeGuard], data: { + redirect: '/error' + },canDeactivate: [PreviousRouteRecorder] } + ]) +] +}) +export class ServiceRoutingModule { } diff --git a/src/app/landingPages/service/service.component.ts b/src/app/landingPages/service/service.component.ts new file mode 100644 index 0000000..f2c74cf --- /dev/null +++ b/src/app/landingPages/service/service.component.ts @@ -0,0 +1,20 @@ +import {Component} from '@angular/core'; +import {properties} from "../../../environments/environment"; + +@Component({ + selector: 'openaire-dataprovider', + template: ``, + }) +export class OpenaireServiceComponent{ + piwikSiteId = properties.piwikSiteId; + + constructor ( ) { + + } + + ngOnInit() { +} + + + +} diff --git a/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts b/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts new file mode 100644 index 0000000..30e19f3 --- /dev/null +++ b/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts @@ -0,0 +1,17 @@ +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {OpenaireAdvancedSearchServicesComponent} from './advancedSearchServices.component'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireAdvancedSearchServicesComponent, data: { + redirect: '/error' + }, canDeactivate: [PreviousRouteRecorder] } + + ]) + ] +}) +export class AdvancedSearchServicesRoutingModule { } diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts new file mode 100644 index 0000000..73a280e --- /dev/null +++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts @@ -0,0 +1,35 @@ +import {Component} from '@angular/core'; +import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; +import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators"; +import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper"; +import {properties} from "../../../environments/environment"; +import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; +import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; + + +@Component({ + selector: 'openaire-advanced-search-service', + template: ` + + + + ` +}) + +export class OpenaireAdvancedSearchServicesComponent { + customFilter: SearchCustomFilter = null; + properties: EnvProperties; + public openaireEntities = OpenaireEntities; + public searchForm: SearchForm = {class: 'search-form', dark: false}; + constructor ( ) {} + ngOnInit() { + this.properties = properties; + let id = ConnectHelper.getCommunityFromDomain(properties.domain); + let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id); + this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg); + } +} diff --git a/src/app/searchPages/advanced/advancedSearchServices.module.ts b/src/app/searchPages/advanced/advancedSearchServices.module.ts new file mode 100644 index 0000000..0c745d7 --- /dev/null +++ b/src/app/searchPages/advanced/advancedSearchServices.module.ts @@ -0,0 +1,25 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; + +import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module'; +import {OpenaireAdvancedSearchServicesComponent} from './advancedSearchServices.component'; + +import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; + +@NgModule({ + imports: [ + CommonModule, FormsModule, + AdvancedSearchDataProvidersRoutingModule, + SearchDataProvidersModule + + ], + declarations: [ + OpenaireAdvancedSearchServicesComponent + ], + providers:[], + exports: [ + OpenaireAdvancedSearchServicesComponent + ] +}) +export class LibAdvancedSearchServicesModule { } diff --git a/src/app/searchPages/simple/searchServices-routing.module.ts b/src/app/searchPages/simple/searchServices-routing.module.ts new file mode 100644 index 0000000..a06cae2 --- /dev/null +++ b/src/app/searchPages/simple/searchServices-routing.module.ts @@ -0,0 +1,18 @@ +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; + +import {OpenaireSearchServicesComponent} from './searchServices.component'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireSearchServicesComponent,data: { + redirect: '/error' + }, canDeactivate: [PreviousRouteRecorder] } + + ]) + ] +}) +export class SearchServicesRoutingModule { } diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts new file mode 100644 index 0000000..0ee893e --- /dev/null +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -0,0 +1,34 @@ +import {Component} from '@angular/core'; +import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; +import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators"; +import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper"; +import {properties} from "../../../environments/environment"; +import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; +import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; + +@Component({ + selector: 'openaire-search-services', + template: ` + + + + + ` +}) +export class OpenaireSearchServicesComponent { + customFilter: SearchCustomFilter = null; + properties: EnvProperties; + public openaireEntities = OpenaireEntities; + public searchForm: SearchForm = {class: 'search-form', dark: false}; + constructor ( ) {} + ngOnInit() { + this.properties = properties; + let id = ConnectHelper.getCommunityFromDomain(properties.domain); + let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id); + this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg); + } +} diff --git a/src/app/searchPages/simple/searchServices.module.ts b/src/app/searchPages/simple/searchServices.module.ts new file mode 100644 index 0000000..9e6c4ee --- /dev/null +++ b/src/app/searchPages/simple/searchServices.module.ts @@ -0,0 +1,23 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {SearchServicesRoutingModule} from './searchServices-routing.module'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; +import {OpenaireSearchServicesComponent} from "./searchServices.component"; + +@NgModule({ + imports: [ + CommonModule, FormsModule, + SearchDataProvidersModule, SearchServicesRoutingModule + + ], + declarations: [ + OpenaireSearchServicesComponent + ], + providers:[PreviousRouteRecorder], + exports: [ + OpenaireSearchServicesComponent + ] +}) +export class LibSearchServicesModule { } diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index 7391736..be0fa29 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -185,9 +185,9 @@ border-bottom:1px solid #ced4da; ]; static disabled = { - "canada": {pages: [], entities: ["software"]}, - "italy": {pages: [], entities: []}, - "greece": {pages: [], entities: []}, + "canada": {pages: ["/search/find/services"], entities: ["software", "service"]}, + "italy": {pages: ["/search/find/services"], entities: ["service"]}, + "greece": {pages: ["/search/find/services"], entities: ["service"]}, "eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop"] , entities: []} }; diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 643866e..d6ea154 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -77,6 +77,7 @@ export let properties: EnvProperties = { searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToService: "/search/service?serviceId=", searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", @@ -84,6 +85,7 @@ export let properties: EnvProperties = { searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToServices: "/search/find/services", searchLinkToProjects: "/search/find/projects", searchLinkToDatasets: "/search/find/datasets", searchLinkToSoftware: "/search/find/software", @@ -102,9 +104,12 @@ export let properties: EnvProperties = { searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedServices: "/search/advanced/services", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: "/error", + lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", diff --git a/src/environments/environment.eosc.ts b/src/environments/environment.eosc.ts index c0cd606..c8ba771 100644 --- a/src/environments/environment.eosc.ts +++ b/src/environments/environment.eosc.ts @@ -79,6 +79,7 @@ export let properties: EnvProperties = { searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToService: "/search/service?serviceId=", searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", @@ -86,6 +87,7 @@ export let properties: EnvProperties = { searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToServices: "/search/find/services", searchLinkToProjects: "/search/find/projects", searchLinkToDatasets: "/search/find/datasets", searchLinkToSoftware: "/search/find/software", @@ -104,9 +106,12 @@ export let properties: EnvProperties = { searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedServices: "/search/advanced/services", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: "/error", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a62631e..6b8a4c3 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -79,6 +79,7 @@ export let properties: EnvProperties = { searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToService: "/search/service?serviceId=", searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", @@ -86,6 +87,7 @@ export let properties: EnvProperties = { searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToServices: "/search/find/services", searchLinkToProjects: "/search/find/projects", searchLinkToDatasets: "/search/find/datasets", searchLinkToSoftware: "/search/find/software", @@ -104,9 +106,12 @@ export let properties: EnvProperties = { searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedServices: "/search/advanced/services", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: "/error", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3e95d2f..03a028b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,7 +21,7 @@ export let properties: EnvProperties = { useNewStatistisTool: true, claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", - searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + searchResourcesAPIURL: "http://beta.services.openaire.eu/search/v2/api/resources", openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", searchCrossrefAPIURL: "https://api.crossref.org/works", @@ -81,6 +81,7 @@ export let properties: EnvProperties = { searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToService: "/search/service?serviceId=", searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", @@ -88,6 +89,7 @@ export let properties: EnvProperties = { searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToServices: "/search/find/services", searchLinkToProjects: "/search/find/projects", searchLinkToDatasets: "/search/find/datasets", searchLinkToSoftware: "/search/find/software", @@ -106,9 +108,12 @@ export let properties: EnvProperties = { searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedServices: "/search/advanced/services", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - + + errorLink: "/error", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", From 0bd5589342e9d74468b0d1e76def57e998f6925d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 May 2022 16:42:03 +0300 Subject: [PATCH 5/8] [Aggregator | new-theme]: angular.json: Update UIKIT scripts (get them from the "openaire-theme" folder instead of the "common-assets"). --- angular.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index 41e592b..e7899f5 100644 --- a/angular.json +++ b/angular.json @@ -50,9 +50,8 @@ "src/material.scss" ], "scripts": [ - "src/assets/common-assets/common/jquery.js", - "src/assets/common-assets/common/uikit.min.js", - "src/assets/common-assets/common/uikit-icons.min.js", + "src/assets/openaire-theme/js/uikit.min.js", + "src/assets/openaire-theme/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" ] }, From e2ca8d3e4b89e8dac404ac56dbfaf4f234ff37e8 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 May 2022 17:01:36 +0300 Subject: [PATCH 6/8] [Library | new-theme]: [NEW] #6915 - Added new fields in datasources/services. 1. dataProviderInfo.ts: Added fields jurisdiction, thematic, contentpolicy, identifiers. 2. dataProvider.service.ts: Parse new fields. 3. dataProvider.component.html: Added label "Thematic" when true | moved "web page" under the labels | Show identifiers, jurisdiction and contentpolicy. 4. dataProvider.module.ts: Import ResultLandingUtilsModule. 5. parsingFunctions.class.ts: In method "parseIdentifiers()" added parsing for classid "re3data". 6. showIdentifiers.component.ts: Show identifier when key is "re3data" too. 7. string-utils.class.ts: In Identifier class added class and check for "re3data". 8. searchDataproviders.service.ts: In method "parseResults()" parse "pid" and set identifiers. 9. newSearchPage.component.ts: In method "createKeywordQuery()" added check for identifiers for entityTypes "datasource" and "service". --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index d618397..4242a65 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit d61839718e3bfc3bd09f6419feec4e47a1788223 +Subproject commit 4242a65199dcef141c844a5dda5116317d528045 From 1500084e78b05cbb69dfa993311e62992d5221a2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 May 2022 17:14:50 +0300 Subject: [PATCH 7/8] [Aggregator & Library | new-theme]: [Bug fix] Set properly "dashboard" and "adminToolsPortalType" properties and show "Check compatible EOSC services" button in eosc portal too. 1. env-properties.ts: a. In Dashboard type added "aggregator". b. In PortalType added "funder", "ri", "project", "organization", "aggregator", "eosc". 2. environments/: Set "dashboard" property to "aggregator" and only for eosc set "adminToolsPortalType" property to "eosc". 3. entitiesSelection.component.ts: Added check if adminToolsPortalType is "eosc". 4. resultLanding.component.ts: In method "hasRightSidebarInfo()" check if adminToolsPortalType is "eosc" to show "Check compatible EOSC services" button. 5. resultLanding.component.html: Show "Check compatible EOSC services" for adminToolsPortalType "explore" or "eosc". --- src/app/openaireLibrary | 2 +- src/environments/environment.beta.ts | 2 +- src/environments/environment.eosc.ts | 4 ++-- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4242a65..64b0e16 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4242a65199dcef141c844a5dda5116317d528045 +Subproject commit 64b0e163fa1231154019e63a626fddf77a7ce421 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index d6ea154..16e8eb3 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -3,7 +3,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "beta", adminToolsPortalType: "aggregator", - dashboard: "explore", + dashboard: "aggregator", enablePiwikTrack: true, useCache: false, useLongCache: true, diff --git a/src/environments/environment.eosc.ts b/src/environments/environment.eosc.ts index c8ba771..908c2bb 100644 --- a/src/environments/environment.eosc.ts +++ b/src/environments/environment.eosc.ts @@ -2,8 +2,8 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "production", - adminToolsPortalType: "aggregator", - dashboard: "explore", + adminToolsPortalType: "eosc", + dashboard: "aggregator", enablePiwikTrack: true, useCache: false, useLongCache: true, diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 6b8a4c3..01c77f6 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,7 +3,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "production", adminToolsPortalType: "aggregator", - dashboard: "explore", + dashboard: "aggregator", enablePiwikTrack: true, useCache: false, useLongCache: true, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 03a028b..efedffb 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -7,8 +7,8 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "development", - adminToolsPortalType: "aggregator", - dashboard: "explore", + adminToolsPortalType: "eosc", + dashboard: "aggregator", enablePiwikTrack: false, useCache: true, useLongCache: true, From 2b620d4e2678cad646b64db7581a10031d7a245a Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 May 2022 18:42:23 +0300 Subject: [PATCH 8/8] [Library | new-theme]: 1. showSubjects.component.ts: Ignore specialSubjects and do not add links. | 2. resultLanding.component.html & resultLanding.component.ts: Show button "Check compatible EOSC services" not only in development or beta environments. --- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 64b0e16..2fac23f 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 64b0e163fa1231154019e63a626fddf77a7ce421 +Subproject commit 2fac23fd10bcdee868fa51376d0fd2351f1ef8fd diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index fd632de..e7f2543 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fd632de294187bf79f34fbc8aac70c54328158b8 +Subproject commit e7f2543b7a01368a09f9100c001fe7fb76018658