From 6cd4dbb4e9827aa0e13e1ef4d0e457adb2cc0fe6 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 13 Jul 2023 13:49:05 +0300 Subject: [PATCH 01/13] Update libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a0b4ccf..870ce71 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a0b4ccff23473b19320fcc76195f629fd1f264f1 +Subproject commit 870ce718972596f5c36ae79271927c7f4279ff58 diff --git a/src/assets/common-assets b/src/assets/common-assets index f15bbfa..2fd5784 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit f15bbfa7265f170e06b256f086f2acedfa3f72e0 +Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 468b2b0..2fffe0f 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 468b2b008f474c88dacc52991a5231693833f1f9 +Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 From 6ab34a0484c4ffde7e00499d2c138454899e6512 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 13 Jul 2023 14:21:15 +0300 Subject: [PATCH 02/13] Change piwik base on the new dynamic piwik. --- src/app/app-routing.module.ts | 2 +- src/app/app.component.ts | 2 +- .../directLinking/directLinking.component.ts | 4 +--- src/app/claims/linking/linkingGeneric.component.ts | 5 +---- src/app/claims/myClaims/myClaims.component.ts | 3 +-- src/app/deposit/deposit.component.ts | 8 +------- .../searchDataprovidersToDeposit.component.ts | 8 +------- src/app/develop/develop.component.ts | 5 +---- .../dataProvider/dataProvider.component.ts | 14 +------------- src/app/landingPages/dataset/dataset.component.ts | 14 +------------- .../htmlProjectReport.component.ts | 14 +------------- .../organization/organization.component.ts | 14 +------------- src/app/landingPages/orp/orp.component.ts | 14 +------------- src/app/landingPages/project/project.component.ts | 14 +------------- .../publication/publication.component.ts | 12 +----------- src/app/landingPages/result/result.component.ts | 5 +---- src/app/landingPages/service/service.component.ts | 14 +------------- .../landingPages/software/software.component.ts | 13 +------------ src/app/openaireLibrary | 2 +- .../advancedSearchDataProviders.component.ts | 2 +- .../advancedSearchOrganizations.component.ts | 3 +-- .../advanced/advancedSearchProjects.component.ts | 3 +-- .../advanced/advancedSearchServices.component.ts | 3 +-- .../advanced/searchResearchResults.component.ts | 2 +- src/app/searchPages/find/search.component.ts | 6 +----- .../simple/searchDataproviders.component.ts | 2 +- .../simple/searchOrganizations.component.ts | 2 +- .../searchPages/simple/searchProjects.component.ts | 2 +- .../simple/searchResearchResults.component.ts | 2 +- .../searchPages/simple/searchServices.component.ts | 2 +- 30 files changed, 30 insertions(+), 166 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7f707ab..6c12df9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -120,7 +120,7 @@ export class AppRoutingModule { } } constructor( private config: ConfigurationService, private router: Router){ - this.subs.push(this.config.communityInformationState.subscribe(data => { + this.subs.push(this.config.portalAsObservable.subscribe(data => { if (data) { if (data['pages']) { for (var i = 0; i < data['pages'].length; i++) { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8d6e161..d794d09 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -51,7 +51,7 @@ export class AppComponent { @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2, private router: Router, private route: ActivatedRoute) { this.agg = PortalAggregators.eoscInfo; this.setStyles(); - this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfo()); + this.configurationService.initStaticPortal(PortalAggregators.getCommunityInfo()); this.showHeader = this.agg.showHeaderAlways; } diff --git a/src/app/claims/directLinking/directLinking.component.ts b/src/app/claims/directLinking/directLinking.component.ts index 7f34732..efab6dd 100644 --- a/src/app/claims/directLinking/directLinking.component.ts +++ b/src/app/claims/directLinking/directLinking.component.ts @@ -4,9 +4,7 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-directLinking', template: ` - ` + ` }) export class OpenaireDirectLinkingComponent { - piwikSiteId = properties.piwikSiteId; - } diff --git a/src/app/claims/linking/linkingGeneric.component.ts b/src/app/claims/linking/linkingGeneric.component.ts index b9a335b..d7c5b1b 100644 --- a/src/app/claims/linking/linkingGeneric.component.ts +++ b/src/app/claims/linking/linkingGeneric.component.ts @@ -3,11 +3,8 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-linking-generic', - template: `` + template: `` }) export class OpenaireLinkingComponent { - piwikSiteId = properties.piwikSiteId; - - } diff --git a/src/app/claims/myClaims/myClaims.component.ts b/src/app/claims/myClaims/myClaims.component.ts index 36117d5..c60df6e 100644 --- a/src/app/claims/myClaims/myClaims.component.ts +++ b/src/app/claims/myClaims/myClaims.component.ts @@ -9,7 +9,7 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-my-claims', template: ` - + ` @@ -18,7 +18,6 @@ import {properties} from "../../../environments/environment"; claimsInfoURL:string; userInfoURL: string; sub; - piwikSiteId = properties.piwikSiteId; constructor (private route: ActivatedRoute) { } diff --git a/src/app/deposit/deposit.component.ts b/src/app/deposit/deposit.component.ts index 094a3b3..e305fd2 100644 --- a/src/app/deposit/deposit.component.ts +++ b/src/app/deposit/deposit.component.ts @@ -1,18 +1,12 @@ import {Component} from '@angular/core'; -import {properties} from "../../environments/environment"; @Component({ selector: 'openaire-deposit', template: ` - + ` }) export class OpenaireDepositComponent { - piwikSiteId = properties.piwikSiteId; - constructor() { - } - - public ngOnInit() {} } diff --git a/src/app/deposit/searchDataprovidersToDeposit.component.ts b/src/app/deposit/searchDataprovidersToDeposit.component.ts index 69b6e5a..f4cffa0 100644 --- a/src/app/deposit/searchDataprovidersToDeposit.component.ts +++ b/src/app/deposit/searchDataprovidersToDeposit.component.ts @@ -1,18 +1,12 @@ import {Component} from '@angular/core'; -import {properties} from "../../environments/environment"; @Component({ selector: 'openaire-search-deposit', template: ` - + ` }) export class OpenaireSearchDataprovidersToDepositComponent { - piwikSiteId = properties.piwikSiteId; - - constructor() {} - - public ngOnInit() {} } diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts index 181d591..e3a892d 100644 --- a/src/app/develop/develop.component.ts +++ b/src/app/develop/develop.component.ts @@ -119,10 +119,7 @@ export class DevelopComponent implements OnInit { this._meta.updateTag({content: description}, "property='og:description'"); this._meta.updateTag({content: title}, "property='og:title'"); this._title.setTitle(title); - if(properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe()); - } - + this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe()); }else { this.navigateToError(); } diff --git a/src/app/landingPages/dataProvider/dataProvider.component.ts b/src/app/landingPages/dataProvider/dataProvider.component.ts index 938df97..361d3e5 100644 --- a/src/app/landingPages/dataProvider/dataProvider.component.ts +++ b/src/app/landingPages/dataProvider/dataProvider.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-dataprovider', - template: ``, + template: ``, }) export class OpenaireDataProviderComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/dataset/dataset.component.ts b/src/app/landingPages/dataset/dataset.component.ts index 9887dc8..6b7f525 100644 --- a/src/app/landingPages/dataset/dataset.component.ts +++ b/src/app/landingPages/dataset/dataset.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-dataset', - template: ``, + template: ``, }) export class OpenaireDatasetComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts index 0d1c94b..5236c9f 100644 --- a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-htmlProjectReport', - template: ``, + template: ``, }) export class OpenaireHtmlProjectReportComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/organization/organization.component.ts b/src/app/landingPages/organization/organization.component.ts index 150642b..bae58be 100644 --- a/src/app/landingPages/organization/organization.component.ts +++ b/src/app/landingPages/organization/organization.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-organization', - template: ``, + template: ``, }) export class OpenaireOrganizationComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/orp/orp.component.ts b/src/app/landingPages/orp/orp.component.ts index 14cd92c..a5d348b 100644 --- a/src/app/landingPages/orp/orp.component.ts +++ b/src/app/landingPages/orp/orp.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-orp', - template: ``, + template: ``, }) export class OpenaireOrpComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/project/project.component.ts b/src/app/landingPages/project/project.component.ts index e0ae715..e1c278b 100644 --- a/src/app/landingPages/project/project.component.ts +++ b/src/app/landingPages/project/project.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-project', - template: ``, + template: ``, }) export class OpenaireProjectComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts index f4a507c..1d6b86d 100644 --- a/src/app/landingPages/publication/publication.component.ts +++ b/src/app/landingPages/publication/publication.component.ts @@ -1,19 +1,9 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-publication', template: ` - `, + `, }) export class OpenairePublicationComponent { - piwikSiteId = properties.piwikSiteId; - - - constructor() {} - - ngOnInit() { - } - - } diff --git a/src/app/landingPages/result/result.component.ts b/src/app/landingPages/result/result.component.ts index 7896946..9fa51e2 100644 --- a/src/app/landingPages/result/result.component.ts +++ b/src/app/landingPages/result/result.component.ts @@ -1,11 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-publication', - template: ``, + template: ``, }) export class OpenaireResultComponent{ - piwikSiteId = properties.piwikSiteId; - } diff --git a/src/app/landingPages/service/service.component.ts b/src/app/landingPages/service/service.component.ts index f2c74cf..02d1802 100644 --- a/src/app/landingPages/service/service.component.ts +++ b/src/app/landingPages/service/service.component.ts @@ -1,20 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-dataprovider', - template: ``, + template: ``, }) export class OpenaireServiceComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/software/software.component.ts b/src/app/landingPages/software/software.component.ts index f768724..408862f 100644 --- a/src/app/landingPages/software/software.component.ts +++ b/src/app/landingPages/software/software.component.ts @@ -1,19 +1,8 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-software', - template: ``, + template: ``, }) export class OpenaireSoftwareComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - } - - ngOnInit() { -} - - - } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 870ce71..2f98910 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 870ce718972596f5c36ae79271927c7f4279ff58 +Subproject commit 2f989107123ae674aba4907b113e4498a8f87786 diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index 0bead0a..273155e 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -8,7 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc selector: 'openaire-advanced-search-dataprovider', template: ` + [hasPrefix]="false" [searchForm]="searchForm"> ` diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts index 1bef7d0..669edfc 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -7,8 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-advanced-search-organizations', template: ` - + ` diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts index b9ba48d..8dcc913 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts @@ -6,8 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-advanced-search-projects', template: ` - + ` diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts index 16a9f7d..e2932bb 100644 --- a/src/app/searchPages/advanced/advancedSearchServices.component.ts +++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts @@ -8,8 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-advanced-search-service', template: ` - diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts index 274ef16..c62e7fd 100644 --- a/src/app/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/searchPages/advanced/searchResearchResults.component.ts @@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc selector: 'openaire-search-results', template: ` + [hasPrefix]="false" [searchForm]="searchForm"> ` }) diff --git a/src/app/searchPages/find/search.component.ts b/src/app/searchPages/find/search.component.ts index 55e4c59..892084c 100644 --- a/src/app/searchPages/find/search.component.ts +++ b/src/app/searchPages/find/search.component.ts @@ -1,17 +1,13 @@ import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @Component({ selector: 'openaire-search-find', template: ` - `, }) export class OpenaireSearchComponent{ - piwikSiteId = properties.piwikSiteId; public searchForm: SearchForm = {class: 'search-form', dark: true}; - constructor ( ) {} - ngOnInit() {} } diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 1afff3c..ecef3b8 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-dataproviders', template: ` - + ` }) export class OpenaireSearchDataprovidersComponent { diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts index b5dab2a..3a81d73 100644 --- a/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/searchPages/simple/searchOrganizations.component.ts @@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-organizations', template: ` - + ` }) export class OpenaireSearchOrganizationsComponent { diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index 2942bf2..b7c9d31 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-projects', template: ` - + ` }) export class OpenaireSearchProjectsComponent { diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts index d581f8f..71238a5 100644 --- a/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/searchPages/simple/searchResearchResults.component.ts @@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc selector: 'openaire-search-results', template: ` + [hasPrefix]="false" [searchForm]="searchForm"> ` }) export class OpenaireSearchResearchResultsComponent { diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts index 22fe433..0e569f5 100644 --- a/src/app/searchPages/simple/searchServices.component.ts +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-services', template: ` - From 46b87099a5992027e4089f9f560100d54cfbd0de Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 20 Jul 2023 17:06:46 +0300 Subject: [PATCH 03/13] [Library | develop]: resultLanding.component.html & resultLanding.component.ts & transferData.component.html & transferData.component.ts: In desktop view, reverted data transfer modal to normal instead of full screen & small fixes for action icon and modal view | aligned "Go to search" back button with the rest of the page contents. --- 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 2f98910..b18cfcf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2f989107123ae674aba4907b113e4498a8f87786 +Subproject commit b18cfcf533541c26d71ec540e941d3c9d85228a3 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2fffe0f..cf3dab8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 +Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780 From 640fe802f596745eaff6e3c68eeb4691a4ea59a1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:53:20 +0300 Subject: [PATCH 04/13] Update libraries --- 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 b18cfcf..a53c4e9 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b18cfcf533541c26d71ec540e941d3c9d85228a3 +Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index cf3dab8..5268f27 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780 +Subproject commit 5268f277246347aad42349a06eecb915a452841b From f0f9bb5dd02308ad5eeb387ed222794470e34ca9 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:29:02 +0300 Subject: [PATCH 05/13] Fix mockCommunityInfo in aggregators.ts --- src/app/utils/aggregators.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index 5160784..68009c8 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -57,7 +57,7 @@ export class PortalAggregators { } public static getCommunityInfo(): any { - return Portal.getMockCommunityInfo(PortalAggregators.eoscInfo.menuId, PortalAggregators.disabled.entities,PortalAggregators.disabled.pages); + return Portal.getMockCommunityInfo(PortalAggregators.eoscInfo.menuId, PortalAggregators.eoscInfo.title, PortalAggregators.disabled.entities,PortalAggregators.disabled.pages); } } From e6a48cd469b99eac3f6a1d4f0bc20806678120e6 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 30 Aug 2023 16:49:52 +0300 Subject: [PATCH 06/13] [EOSC EXPLORE | develop] Added bipFrameAPIURL property. --- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 155ef95..9be2e6c 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2ce71db..2403203 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 93bc491..2b26d4a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -18,6 +18,7 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", 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/", From 887a0c162417b02446f02f68eeb36c44b2b053fb Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 12:48:17 +0300 Subject: [PATCH 07/13] [Library | develop]: transferData.component.ts: Set "overwrite": false & in method "validatePath()", removed regex and check only if path starts with / | transferData.component.html: Updated checks for path validation | resultLanding.component.ts: Added field public belongsInEOSC: boolean = false; and initialize it | resultLanding.component.html: Added message above title "This {{getTypeName() | lowercase}} is not part of the European Open Science Cloud" when in EOSC portal, but result has no EOSC context. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a53c4e9..37208d8 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 37208d82b6fb2ae84ad4e5c056f45289fb27d079 diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..d18e0a7 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5268f27..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From c56f633d443b0a02347eef2b5d812ac910164a3a Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 14:46:25 +0300 Subject: [PATCH 08/13] [Library | develop]: resultLanding.component.html: Added check for message of non eosc results - do not show it in production environment until we get approval. --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 37208d8..bad8550 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 37208d82b6fb2ae84ad4e5c056f45289fb27d079 +Subproject commit bad855089cb0c522dbeb0a009553742f668049c0 From aa7aab1e4ef99a6c095c347597c23a81690f3b33 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 14:47:07 +0300 Subject: [PATCH 09/13] [Eosc Explore | develop]: package.json: Increased version from 3.0.0 to 3.1.0 | CHANGELOG.md: Added changelog for version 3.1.0. --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c38eeee..e15329b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - *Fixed (for any bug fixes)* - *Security (in case of vulnerabilities)* +## [3.1.0] - 05/09/2023 [BETA] +### Added +* Message for non eosc results i.e. This publication is not part of the European Open Science Cloud +* Impact-based indicators - Citations, Popularity, Influence, Impulse +### Changed +* Smaller window for the Data Transfer Service - not full screen +* Disabled overwrite params when submitting a job to EOSC Data transfer API +* NEW user interface & structure of the detailed page & specific user interface for small devices i.e. mobiles +* Updated access right icons +* Include Subjects as a new tab +### Fixed +* Too much recursion error in validating destination path of Data transfer - updated check + ## [3.0.0] - 13/06/2023 ### Changed * Upgraded uikit version to 3.13.10 diff --git a/package.json b/package.json index 74e0151..a5fea4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "3.0.0", + "version": "3.1.0", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", From 6f657c3194907e1824b99c937d45a10c78e620dd Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 4 Sep 2023 14:49:57 +0300 Subject: [PATCH 10/13] [Eosc Explore | develop]: CHANGELOG.md: Updated message of last changelog. --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e15329b..e16baf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - *Fixed (for any bug fixes)* - *Security (in case of vulnerabilities)* -## [3.1.0] - 05/09/2023 [BETA] +## [3.1.0] - 05/09/2023 ### Added -* Message for non eosc results i.e. This publication is not part of the European Open Science Cloud * Impact-based indicators - Citations, Popularity, Influence, Impulse ### Changed * Smaller window for the Data Transfer Service - not full screen From 825e45f52dde9783e120a3354689253faae01f0d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 8 Sep 2023 11:44:09 +0300 Subject: [PATCH 11/13] [EOSC EXPLORE | develop] Updating openaireLibrary | environment.beta.ts: Added property eoscDataTransferLoginUrl --- src/app/openaireLibrary | 2 +- src/environments/environment.beta.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index bad8550..741a70f 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit bad855089cb0c522dbeb0a009553742f668049c0 +Subproject commit 741a70fa1c236c83d96c4135063ef6bc8b0c431e diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 9be2e6c..886615a 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -112,6 +112,7 @@ export let properties: EnvProperties = { reCaptchaSiteKey: null, footerGrantText: "", eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", + eoscDataTransferLoginUrl:"https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", eoscDataTransferDestinations : [ {label: "EGI dCache (dcache-demo.desy.de)", value: {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache", From a7701e895f4e2b7bfa2055ce54d9b08cc34d1458 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 11 Sep 2023 18:10:02 +0300 Subject: [PATCH 12/13] [Eosc Explore | develop]: CHANGELOG.md: Updated date for version 3.1.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e16baf3..79690a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - *Fixed (for any bug fixes)* - *Security (in case of vulnerabilities)* -## [3.1.0] - 05/09/2023 +## [3.1.0] - 11/09/2023 ### Added * Impact-based indicators - Citations, Popularity, Influence, Impulse ### Changed From db68cb505fb56931fe584be05d9853d6aac5f728 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 11 Sep 2023 18:15:20 +0300 Subject: [PATCH 13/13] Updating openaireLibrary before production release --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 741a70f..f679385 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 741a70fa1c236c83d96c4135063ef6bc8b0c431e +Subproject commit f6793857253fa5ca79e9576b25d0f8d0f67d3835