MaDgIK
/
eosc-explore
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Konstantina Galouni 2023-09-11 18:19:04 +03:00
parent 057f3f8ce2 db68cb505f
commit 6f40cbb6da
35 changed files with 47 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@ -14,6 +14,18 @@ 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] - 11/09/2023
### Added
* 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

2
package.json
View File

@ -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",

2
src/app/app-routing.module.ts
View File

@ -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++) {

2
src/app/app.component.ts
View File

@ -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;
}

4
src/app/claims/directLinking/directLinking.component.ts
View File

@ -4,9 +4,7 @@ import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-directLinking',
template: `
<directLinking [piwikSiteId]="piwikSiteId"></directLinking>`
<directLinking></directLinking>`
})
export class OpenaireDirectLinkingComponent {
piwikSiteId = properties.piwikSiteId;
}

5
src/app/claims/linking/linkingGeneric.component.ts
View File

@ -3,11 +3,8 @@ import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-linking-generic',
template: `<linking-generic pageTitle="Linking" [piwikSiteId]="piwikSiteId"></linking-generic>`
template: `<linking-generic pageTitle="Linking"></linking-generic>`
})
export class OpenaireLinkingComponent {
piwikSiteId = properties.piwikSiteId;
}

3
src/app/claims/myClaims/myClaims.component.ts
View File

@ -9,7 +9,7 @@ import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-my-claims',
template: `
<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [piwikSiteId]="piwikSiteId">
<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
</my-claims>
`
@ -18,7 +18,6 @@ import {properties} from "../../../environments/environment";
claimsInfoURL:string;
userInfoURL: string;
sub;
piwikSiteId = properties.piwikSiteId;
constructor (private route: ActivatedRoute) {
}

8
src/app/deposit/deposit.component.ts
View File

@ -1,18 +1,12 @@
import {Component} from '@angular/core';
import {properties} from "../../environments/environment";
@Component({
selector: 'openaire-deposit',
template: `
<deposit-first-page [piwikSiteId]="piwikSiteId"></deposit-first-page>
<deposit-first-page></deposit-first-page>
`
})
export class OpenaireDepositComponent {
piwikSiteId = properties.piwikSiteId;
constructor() {
}
public ngOnInit() {}
}

8
src/app/deposit/searchDataprovidersToDeposit.component.ts
View File

@ -1,18 +1,12 @@
import {Component} from '@angular/core';
import {properties} from "../../environments/environment";
@Component({
selector: 'openaire-search-deposit',
template: `
<deposit-search-dataproviders [piwikSiteId]="piwikSiteId"></deposit-search-dataproviders>
<deposit-search-dataproviders></deposit-search-dataproviders>
`
})
export class OpenaireSearchDataprovidersToDepositComponent {
piwikSiteId = properties.piwikSiteId;
constructor() {}
public ngOnInit() {}
}

5
src/app/develop/develop.component.ts
View File

@ -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();
}

14
src/app/landingPages/dataProvider/dataProvider.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-dataprovider',
template: `<dataprovider [piwikSiteId]="piwikSiteId"></dataprovider>`,
template: `<dataprovider></dataprovider>`,
})
export class OpenaireDataProviderComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

14
src/app/landingPages/dataset/dataset.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-dataset',
template: `<result-landing type="dataset" [piwikSiteId]="piwikSiteId"></result-landing>`,
template: `<result-landing type="dataset"></result-landing>`,
})
export class OpenaireDatasetComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

14
src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-htmlProjectReport',
template: `<htmlProjectReport [piwikSiteId]=""></htmlProjectReport>`,
template: `<htmlProjectReport></htmlProjectReport>`,
})
export class OpenaireHtmlProjectReportComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

14
src/app/landingPages/organization/organization.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-organization',
template: `<organization [piwikSiteId]="piwikSiteId"></organization>`,
template: `<organization ></organization>`,
})
export class OpenaireOrganizationComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

14
src/app/landingPages/orp/orp.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-orp',
template: `<result-landing type="orp" [piwikSiteId]="piwikSiteId"></result-landing>`,
template: `<result-landing type="orp"></result-landing>`,
})
export class OpenaireOrpComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

14
src/app/landingPages/project/project.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-project',
template: `<project [piwikSiteId]="piwikSiteId"></project>`,
template: `<project></project>`,
})
export class OpenaireProjectComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

12
src/app/landingPages/publication/publication.component.ts
View File

@ -1,19 +1,9 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-publication',
template: `
<result-landing type="publication" [piwikSiteId]="piwikSiteId"></result-landing>`,
<result-landing type="publication"></result-landing>`,
})
export class OpenairePublicationComponent {
piwikSiteId = properties.piwikSiteId;
constructor() {}
ngOnInit() {
}
}

5
src/app/landingPages/result/result.component.ts
View File

@ -1,11 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-publication',
template: `<result-landing type="result" [piwikSiteId]="piwikSiteId"></result-landing>`,
template: `<result-landing type="result"></result-landing>`,
})
export class OpenaireResultComponent{
piwikSiteId = properties.piwikSiteId;
}

14
src/app/landingPages/service/service.component.ts
View File

@ -1,20 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-dataprovider',
template: `<dataprovider type="service" [piwikSiteId]="piwikSiteId"></dataprovider>`,
template: `<dataprovider type="service"></dataprovider>`,
})
export class OpenaireServiceComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

13
src/app/landingPages/software/software.component.ts
View File

@ -1,19 +1,8 @@
import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-software',
template: `<result-landing type="software" [piwikSiteId]="piwikSiteId"></result-landing>`,
template: `<result-landing type="software"></result-landing>`,
})
export class OpenaireSoftwareComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
}

2
src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -8,7 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
selector: 'openaire-advanced-search-dataprovider',
template: `
<search-dataproviders [simpleView]="false"
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
[hasPrefix]="false" [searchForm]="searchForm">
</search-dataproviders>
`

3
src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -7,8 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-organizations',
template: `
<search-organizations [simpleView]="false"
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
<search-organizations [simpleView]="false" [hasPrefix]="false" [searchForm]="searchForm">
</search-organizations>
`

3
src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

@ -6,8 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-projects',
template: `
<search-projects [simpleView]="false"
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
<search-projects [simpleView]="false" [hasPrefix]="false" [searchForm]="searchForm">
</search-projects>
`

3
src/app/searchPages/advanced/advancedSearchServices.component.ts
View File

@ -8,8 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-service',
template: `
<search-dataproviders [simpleView]="false"
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
<search-dataproviders [simpleView]="false" [hasPrefix]="false"
type="services" entityType="service" [typeName]="openaireEntities.SERVICES"
[searchForm]="searchForm">
</search-dataproviders>

2
src/app/searchPages/advanced/searchResearchResults.component.ts
View File

@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
selector: 'openaire-search-results',
template: `
<search-research-results resultType="result" [simpleView]="false"
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
[hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
`
})

6
src/app/searchPages/find/search.component.ts
View File

@ -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: `
<search-all logoURL="/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [piwikSiteId]="piwikSiteId"
<search-all logoURL="/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE"
[searchForm]="searchForm"></search-all>
`,
})
export class OpenaireSearchComponent{
piwikSiteId = properties.piwikSiteId;
public searchForm: SearchForm = {class: 'search-form', dark: true};
constructor ( ) {}
ngOnInit() {}
}

2
src/app/searchPages/simple/searchDataproviders.component.ts
View File

@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-search-dataproviders',
template: `
<search-dataproviders [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-dataproviders>
<search-dataproviders [hasPrefix]="false" [searchForm]="searchForm"></search-dataproviders>
`
})
export class OpenaireSearchDataprovidersComponent {

2
src/app/searchPages/simple/searchOrganizations.component.ts
View File

@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-search-organizations',
template: `
<search-organizations [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-organizations>
<search-organizations [hasPrefix]="false" [searchForm]="searchForm"></search-organizations>
`
})
export class OpenaireSearchOrganizationsComponent {

2
src/app/searchPages/simple/searchProjects.component.ts
View File

@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-search-projects',
template: `
<search-projects [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-projects>
<search-projects [hasPrefix]="false" [searchForm]="searchForm"></search-projects>
`
})
export class OpenaireSearchProjectsComponent {

2
src/app/searchPages/simple/searchResearchResults.component.ts
View File

@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
selector: 'openaire-search-results',
template: `
<search-research-results resultType="result" [stickyForm]="false"
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
[hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
`
})
export class OpenaireSearchResearchResultsComponent {

2
src/app/searchPages/simple/searchServices.component.ts
View File

@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-search-services',
template: `
<search-dataproviders [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
<search-dataproviders [hasPrefix]="false"
type="services" entityType="service" [typeName]="openaireEntities.SERVICES"
[searchForm]="searchForm">
</search-dataproviders>

2
src/app/utils/aggregators.ts
View File

@ -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);
}
}

2
src/environments/environment.beta.ts
View File

@ -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/",
@ -111,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",

1
src/environments/environment.prod.ts
View File

@ -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/",

1
src/environments/environment.ts
View File

@ -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/",