diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 599ed74..a85bfca 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -112,7 +112,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 d17b60b..c2d5091 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -39,7 +39,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"
ratio="1">
-
+
`
})
@@ -64,7 +64,7 @@ export class AppComponent {
this.id = ConnectHelper.getCommunityFromDomain(this.properties.domain);
this.agg = PortalAggregators.getFilterInfoByMenuId(this.id);
this.setStyles();
- this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfoByMenuId(this.id));
+ this.configurationService.initStaticPortal(PortalAggregators.getCommunityInfoByMenuId(this.id));
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 1c74b45..2f24b26 100644
--- a/src/app/claims/myClaims/myClaims.component.ts
+++ b/src/app/claims/myClaims/myClaims.component.ts
@@ -1,24 +1,17 @@
import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
-import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
import {Subscriber} from "rxjs";
import {properties} from "../../../environments/environment";
-
@Component({
selector: 'openaire-my-claims',
- template: `
-
-
-`
-
+ template: ``
})
export class OpenaireMyClaimsComponent {
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/fos/fos.component.ts b/src/app/fos/fos.component.ts
index ba0aa00..0e2aa46 100644
--- a/src/app/fos/fos.component.ts
+++ b/src/app/fos/fos.component.ts
@@ -1,16 +1,10 @@
import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";
@Component({
selector: 'aggregator-fos',
template: `
-
+
`
})
export class AggregatorFosComponent {
- piwikSiteId = properties.piwikSiteId;
-
- constructor() {
-
- }
-}
\ No newline at end of file
+}
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 66b3b9c..2993b82 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -110,7 +110,7 @@ export class HomeComponent {
this.numbersComponent.showProjects = portalProperties.entities.project.isEnabled;
this.numbersComponent.showDataProviders = portalProperties.entities.datasource.isEnabled;
}
- this.subs.push(this.config.communityInformationState.subscribe(data => {
+ this.subs.push(this.config.portalAsObservable.subscribe(data => {
if (data) {
var showEntity = {};
for (var i = 0; i < data['entities'].length; i++) {
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..b524cf0 100644
--- a/src/app/landingPages/dataset/dataset.component.ts
+++ b/src/app/landingPages/dataset/dataset.component.ts
@@ -3,18 +3,7 @@ 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..772048c 100644
--- a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
+++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
@@ -3,18 +3,7 @@ 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..d048802 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..e82ff25 100644
--- a/src/app/landingPages/publication/publication.component.ts
+++ b/src/app/landingPages/publication/publication.component.ts
@@ -1,19 +1,8 @@
import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
@Component({
selector: 'openaire-publication',
template: `
- `,
+ `,
})
-export class OpenairePublicationComponent {
- piwikSiteId = properties.piwikSiteId;
-
-
- constructor() {}
-
- ngOnInit() {
- }
-
-
-}
+export class OpenairePublicationComponent {}
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..8b57fae 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 870ce718972596f5c36ae79271927c7f4279ff58
+Subproject commit 8b57fae58515adae81210f99fdef27905b9f4e8a
diff --git a/src/app/sdg/sdg.component.ts b/src/app/sdg/sdg.component.ts
index a83f31c..dc95f36 100644
--- a/src/app/sdg/sdg.component.ts
+++ b/src/app/sdg/sdg.component.ts
@@ -7,11 +7,10 @@ import {AggregatorInfo, PortalAggregators} from "../utils/aggregators";
@Component({
selector: 'aggregator-sdg',
template: `
-
+
`
})
export class AggregatorSdgComponent {
- piwikSiteId = properties.piwikSiteId;
aggregatorId;
aggregator: AggregatorInfo;
customFilter: SearchCustomFilter = null;
@@ -23,4 +22,4 @@ export class AggregatorSdgComponent {
}
public ngOnInit() {}
-}
\ No newline at end of file
+}
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
index 22d6ce8..740ab06 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@@ -11,7 +11,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 0ac4d02..da7db14 100644
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
selector: 'openaire-advanced-search-organizations',
template: `
+ [hasPrefix]="false" [searchForm]="searchForm">
`
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
index 29420bd..4ba922a 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
selector: 'openaire-advanced-search-projects',
template: `
+ [hasPrefix]="false" [searchForm]="searchForm">
`
diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts
index c7b9921..e8d4552 100644
--- a/src/app/searchPages/advanced/advancedSearchServices.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts
@@ -12,7 +12,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
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 e62d5a2..24ef469 100644
--- a/src/app/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/searchPages/advanced/searchResearchResults.component.ts
@@ -10,7 +10,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 a2b96c1..745dabe 100644
--- a/src/app/searchPages/find/search.component.ts
+++ b/src/app/searchPages/find/search.component.ts
@@ -8,22 +8,19 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-search-find',
template: `
-
`,
})
export class OpenaireSearchComponent{
customFilter:SearchCustomFilter= null;
- piwikSiteId = properties.piwikSiteId;
public searchForm: SearchForm = {class: 'search-form', dark: true};
- constructor ( ) {}
+
+
ngOnInit() {
let id = ConnectHelper.getCommunityFromDomain(properties.domain);
let agg:AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
}
-
-
-
}
diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts
index 1353927..6d29be2 100644
--- a/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/searchPages/simple/searchDataproviders.component.ts
@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
template: `
+ [hasPrefix]="false" [searchForm]="searchForm">
`
diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts
index ef04d3e..6f84537 100644
--- a/src/app/searchPages/simple/searchOrganizations.component.ts
+++ b/src/app/searchPages/simple/searchOrganizations.component.ts
@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
template: `
+ [hasPrefix]="false" [searchForm]="searchForm">
`
diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts
index d29ac06..04eddc5 100644
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
template: `
+ [hasPrefix]="false" [searchForm]="searchForm">
`
diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts
index f56103c..2e23d90 100644
--- a/src/app/searchPages/simple/searchResearchResults.component.ts
+++ b/src/app/searchPages/simple/searchResearchResults.component.ts
@@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
selector: 'openaire-search-results',
template: `
+ [hasPrefix]="false" [searchForm]="searchForm">
`
})
diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts
index ec2f679..dd7c7b1 100644
--- a/src/app/searchPages/simple/searchServices.component.ts
+++ b/src/app/searchPages/simple/searchServices.component.ts
@@ -12,7 +12,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
template: `