-//
-//
-//
-// `
-// //(click)="changeOrderby('target')"
-// //od_______908::3a5b2885656a91307156325644e73b92
-//
-// })
-// export class MyClaimsDemoComponent {
-// constructor ( private _router: Router ) {
-// }
-// user:string="argirok@di.uoa.gr";
-// ngOnInit() {
-//
-// }
-// goToPub(id: number){
-// this._router.navigate( ['Publication', { articleId: id}] );
-// }
-// }
diff --git a/src/app/communities/browseCommunity/browse-community.component.ts b/src/app/communities/browseCommunity/browse-community.component.ts
index c50e68c..9854098 100644
--- a/src/app/communities/browseCommunity/browse-community.component.ts
+++ b/src/app/communities/browseCommunity/browse-community.component.ts
@@ -5,6 +5,7 @@ import {Location} from '@angular/common';
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
import {CommunityInfo, prodReadyCommunities} from '../../openaireLibrary/connect/community/communityInfo';
import {LocalStorageService} from "../../openaireLibrary/services/localStorage.service";
+import {Subscriber} from "rxjs";
@Component({
selector: 'browse-community',
@@ -33,18 +34,25 @@ export class BrowseCommunityComponent {
public ngOnInit() {
- this.route.data
+ this.subscriptions.push(this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
- this.localStorageService.get().subscribe(value => {
+ this.subscriptions.push(this.localStorageService.get().subscribe(value => {
this.directLink = value;
- });
- });
+ }));
+ }));
}
- public ngOnDestroy() {
+ subscriptions = [];
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
}
+
isProduction(): boolean {
return this.properties.environment != "development";
}
diff --git a/src/app/communities/browseCommunity/browse-community.module.ts b/src/app/communities/browseCommunity/browse-community.module.ts
index 58edd4f..8380944 100644
--- a/src/app/communities/browseCommunity/browse-community.module.ts
+++ b/src/app/communities/browseCommunity/browse-community.module.ts
@@ -5,8 +5,6 @@ import {RouterModule} from '@angular/router';
import {BrowseCommunityComponent} from './browse-community.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-
import {SearchFormModule} from '../../openaireLibrary/searchPages/searchUtils/searchForm.module';
import {ManageModule} from '../../openaireLibrary/utils/manage/manage.module';
import {AlertModalModule} from "../../openaireLibrary/utils/modal/alertModal.module";
@@ -20,7 +18,6 @@ import {AlertModalModule} from "../../openaireLibrary/utils/modal/alertM
BrowseCommunityComponent
],
providers:[
- FreeGuard
],
exports: [
BrowseCommunityComponent
diff --git a/src/app/communities/communities-routing.module.ts b/src/app/communities/communities-routing.module.ts
index 4c792f3..1428bc5 100644
--- a/src/app/communities/communities-routing.module.ts
+++ b/src/app/communities/communities-routing.module.ts
@@ -3,13 +3,12 @@ import { RouterModule } from '@angular/router';
import{CommunitiesComponent} from './communities.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: CommunitiesComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: CommunitiesComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts
index 6c39a92..f6aa3f3 100644
--- a/src/app/communities/communities.component.ts
+++ b/src/app/communities/communities.component.ts
@@ -14,6 +14,7 @@ import {ErrorMessagesComponent} from '../openaireLibrary/utils/errorMessages.com
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {properties} from "../../environments/environment";
+import {Subscriber} from "rxjs";
@Component({
selector: 'communities',
@@ -21,7 +22,7 @@ import {properties} from "../../environments/environment";
})
export class CommunitiesComponent {
- public piwiksub: any;
+ private subscriptions = [];
public pageTitle = "OpenAIRE"
public researchCommunities = [];
@@ -64,32 +65,29 @@ export class CommunitiesComponent {
}
public ngOnInit() {
- this.route.data
- .subscribe((data: { envSpecific: EnvProperties }) => {
- this.properties = data.envSpecific;
- var url = this.properties.domain + this.properties.baseLink + this._router.url;
- this.seoService.createLinkForCanonicalURL(url, false);
- this._meta.updateTag({content: url}, "property='og:url'");
- if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE Connect", this.properties.piwikSiteId).subscribe();
- }
- this.getCommunities();
- this.createGifs();
- //this.getDivContents();
- this.getPageContents();
- });
+ this.properties = properties;
+ var url = this.properties.domain + this.properties.baseLink + this._router.url;
+ this.seoService.createLinkForCanonicalURL(url, false);
+ this._meta.updateTag({content: url}, "property='og:url'");
+ if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
+ this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Connect", this.properties.piwikSiteId).subscribe());
+ }
+ this.getCommunities();
+ this.createGifs();
+ //this.getDivContents();
+ this.getPageContents();
}
private getPageContents() {
- this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.pageContents = contents;
- })
+ }));
}
private getDivContents() {
- this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.divContents = contents;
- })
+ }));
}
public getCommunities() {
@@ -99,7 +97,7 @@ export class CommunitiesComponent {
this.researchCommunities = [];
- this._communitiesService.getCommunitiesState().subscribe(
+ this.subscriptions.push(this._communitiesService.getCommunitiesState().subscribe(
communitiesResults => {
if(!communitiesResults){
return;
@@ -125,7 +123,7 @@ export class CommunitiesComponent {
this.status = this.handleError("Error getting communities", error);
this.loading = false;
}
- );
+ ));
}
private createGifs() {
@@ -178,23 +176,25 @@ export class CommunitiesComponent {
return StringUtils.quote(param);
}
- public ngOnDestroy() {
- if (this.piwiksub) {
- this.piwiksub.unsubscribe();
- }
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
}
private handleError(message: string, error): number {
var code = "";
- if (!error.status) {
- var error = error.json();
- code = error.code;
- } else {
- code = error.status;
- }
-
+ try {
+ if (!error.status) {
+ var error = error.json();
+ code = error.code;
+ } else {
+ code = error.status;
+ }
+ }catch(e){}
console.error("Communities (component): " + message, error);
-
return this.errorMessages.getErrorCode(code);
}
}
diff --git a/src/app/communities/communities.module.ts b/src/app/communities/communities.module.ts
index 04f7ee7..389db52 100644
--- a/src/app/communities/communities.module.ts
+++ b/src/app/communities/communities.module.ts
@@ -6,7 +6,6 @@ import {ManageModule} from '../openaireLibrary/utils/manage/manage.m
import {CommunitiesComponent} from './communities.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
@@ -30,7 +29,7 @@ import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOServi
CommunitiesComponent
],
providers:[
- FreeGuard, PreviousRouteRecorder,
+ PreviousRouteRecorder,
PiwikService
],
exports: [
diff --git a/src/app/community/community-routing.module.ts b/src/app/community/community-routing.module.ts
index a3f8003..4fda5c6 100644
--- a/src/app/community/community-routing.module.ts
+++ b/src/app/community/community-routing.module.ts
@@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{CommunityComponent} from './community.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: CommunityComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: CommunityComponent,canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts
index 11f8804..1a49d67 100644
--- a/src/app/community/community.component.ts
+++ b/src/app/community/community.component.ts
@@ -301,6 +301,10 @@ export class CommunityComponent {
for (let sub of this.subs) {
sub.unsubscribe();
}
+ this.fetchPublications.clearSubscriptions();
+ this.fetchDatasets.clearSubscriptions();
+ this.fetchOrps.clearSubscriptions();
+ this.fetchSoftware.clearSubscriptions();
}
isEntityEnabled(entity: string) {
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts
index 4cef217..eb1f900 100644
--- a/src/app/community/community.module.ts
+++ b/src/app/community/community.module.ts
@@ -6,7 +6,6 @@ import {CommunityComponent} from './community.component';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SubscribeModule} from '../utils/subscribe/subscribe.module';
import {InviteModule} from '../utils/subscribe/invite/invite.module';
@@ -42,7 +41,7 @@ import {ErrorMessagesModule} from "../openaireLibrary/utils/errorMessages.module
CommunityComponent
],
providers:[
- FreeGuard, PreviousRouteRecorder, PiwikService
+ PreviousRouteRecorder, PiwikService
],
exports: [
CommunityComponent
diff --git a/src/app/communitywrapper/communityWrapper-routing.module.ts b/src/app/communitywrapper/communityWrapper-routing.module.ts
index d886195..04c7788 100644
--- a/src/app/communitywrapper/communityWrapper-routing.module.ts
+++ b/src/app/communitywrapper/communityWrapper-routing.module.ts
@@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{CommunityWrapperComponent} from './communityWrapper.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: CommunityWrapperComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: CommunityWrapperComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/communitywrapper/communityWrapper.component.ts b/src/app/communitywrapper/communityWrapper.component.ts
index c5427e8..7a5de43 100644
--- a/src/app/communitywrapper/communityWrapper.component.ts
+++ b/src/app/communitywrapper/communityWrapper.component.ts
@@ -2,6 +2,8 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {ConnectHelper} from '../openaireLibrary/connect/connectHelper';
+import {properties} from "../../environments/environment";
+import {Subscriber} from "rxjs";
@Component({
selector: 'community-wrapper',
@@ -14,35 +16,33 @@ import {ConnectHelper} from '../openaireLibrary/connect/connectHelper';
export class CommunityWrapperComponent {
communityId:string;
dashboard:boolean = null;
+ properties;
+ private sub;
+ constructor (private route: ActivatedRoute) {
+ this.properties = properties;
+ this.sub = this.route.queryParams.subscribe(
+ communityId => {
+ this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
+ if(!this.communityId) {
+ this.communityId = communityId['communityId'];
+ }
- constructor (
- private route: ActivatedRoute,
- private _router: Router
-
- ) {
- this.route.data
- .subscribe((data: { envSpecific: any }) => {
- this.route.queryParams.subscribe(
- communityId => {
- this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
- if(!this.communityId) {
- this.communityId = communityId['communityId'];
- }
-
- if(this.communityId){
- this.dashboard = true;
- }else{
- this.dashboard = false;
- }
-
- });
- });
+ if(this.communityId){
+ this.dashboard = true;
+ }else{
+ this.dashboard = false;
+ }
+ });
}
public ngOnInit() {
}
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/communitywrapper/communityWrapper.module.ts b/src/app/communitywrapper/communityWrapper.module.ts
index d45beb8..05578ac 100644
--- a/src/app/communitywrapper/communityWrapper.module.ts
+++ b/src/app/communitywrapper/communityWrapper.module.ts
@@ -2,7 +2,6 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import{CommunityModule} from '../community/community.module';
import{CommunitiesModule} from '../communities/communities.module';
@@ -17,7 +16,7 @@ import {CommunityWrapperRoutingModule} from './communityWrapper-routing.module';
CommunityWrapperComponent
],
providers:[
- FreeGuard, PreviousRouteRecorder,
+ PreviousRouteRecorder,
],
exports: [
diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts
index 7d24ea0..69aecdf 100644
--- a/src/app/contact/contact.component.ts
+++ b/src/app/contact/contact.component.ts
@@ -11,6 +11,7 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
+import {Subscriber} from "rxjs";
@Component({
selector: 'contact',
@@ -20,7 +21,6 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
export class ContactComponent implements OnInit {
public url: string = null;
public pageTitle: string = "OpenAIRE - Connect | Contact Us";
- public piwiksub: any;
public showLoading = true;
public errorMessage = '';
public email: Email;
@@ -32,6 +32,14 @@ export class ContactComponent implements OnInit {
public contactForm: FormGroup;
@ViewChild('AlertModal') modal;
@ViewChild('recaptcha') recaptcha;
+ private subscriptions = [];
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
+ }
constructor(private route: ActivatedRoute,
private _router: Router,
@@ -46,12 +54,12 @@ export class ContactComponent implements OnInit {
ngOnInit() {
this._title.setTitle('OpenAIRE-Connect | Contact Us');
- this.route.data.subscribe((data: { envSpecific: EnvProperties }) => {
+ this.subscriptions.push(this.route.data.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
this.email = {body: '', subject: '', recipients: []};
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
+ this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.url = this.properties.domain + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
@@ -63,19 +71,19 @@ export class ContactComponent implements OnInit {
this.getPageContents();
HelperFunctions.scroll();
this.showLoading = false;
- });
+ }));
}
private getPageContents() {
- this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.pageContents = contents;
- })
+ }));
}
private getDivContents() {
- this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.divContents = contents;
- })
+ }));
}
public send(event) {
@@ -102,9 +110,9 @@ export class ContactComponent implements OnInit {
private sendMail(admins: any) {
this.showLoading = true;
- this._emailService.contact(this.properties,
+ this.subscriptions.push(this._emailService.contact(this.properties,
Composer.composeEmailForNewCommunity(this.contactForm.value, admins),
- this.contactForm.value.recaptcha).subscribe(
+ this.contactForm.value.recaptcha).subscribe(
res => {
this.showLoading = false;
if (res) {
@@ -120,7 +128,7 @@ export class ContactComponent implements OnInit {
this.showLoading = false;
this.contactForm.get('recaptcha').setValue('');
}
- );
+ ));
}
public modalOpen() {
diff --git a/src/app/content/content-routing.module.ts b/src/app/content/content-routing.module.ts
index 1b3ede0..e3f5048 100644
--- a/src/app/content/content-routing.module.ts
+++ b/src/app/content/content-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {ContentPageComponent} from './contentPage.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: ContentPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: ContentPageComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/content/contentPage.module.ts b/src/app/content/contentPage.module.ts
index 450523f..bef23ca 100644
--- a/src/app/content/contentPage.module.ts
+++ b/src/app/content/contentPage.module.ts
@@ -1,7 +1,6 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {ContentPageComponent} from './contentPage.component';
@@ -20,7 +19,7 @@ import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumb
declarations: [
ContentPageComponent
],
- providers: [FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+ providers: [ PreviousRouteRecorder, IsRouteEnabled],
exports: [
ContentPageComponent
]
diff --git a/src/app/curators/curators.module.ts b/src/app/curators/curators.module.ts
index 82788a0..543f71f 100644
--- a/src/app/curators/curators.module.ts
+++ b/src/app/curators/curators.module.ts
@@ -10,7 +10,6 @@ import {AffiliationsModule} from "../affiliations/affiliations.module";
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
-import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {PiwikServiceModule} from "../openaireLibrary/utils/piwik/piwikService.module";
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
diff --git a/src/app/deposit/deposit-routing.module.ts b/src/app/deposit/deposit-routing.module.ts
index 69340f3..e517db4 100644
--- a/src/app/deposit/deposit-routing.module.ts
+++ b/src/app/deposit/deposit-routing.module.ts
@@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositComponent } from './deposit.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireDepositComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+ { path: '', component: OpenaireDepositComponent, canActivate: [ IsRouteEnabled], data: {
redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] }
diff --git a/src/app/deposit/deposit.component.ts b/src/app/deposit/deposit.component.ts
index d406cce..bb53207 100644
--- a/src/app/deposit/deposit.component.ts
+++ b/src/app/deposit/deposit.component.ts
@@ -1,5 +1,5 @@
import {Component} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
+import {ActivatedRoute} from '@angular/router';
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
@@ -9,7 +9,7 @@ import {ZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommuni
import {CommunityService} from "../openaireLibrary/connect/community/community.service";
import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service";
import {PiwikHelper} from "../utils/piwikHelper";
-import {Subscription} from "rxjs";
+import {Subscriber, Subscription} from "rxjs";
import {properties} from "../../environments/environment";
@Component({
@@ -77,8 +77,11 @@ export class OpenaireDepositComponent {
public ngOnDestroy() {
for (let sub of this.subs) {
- sub.unsubscribe();
+ if(sub instanceof Subscriber) {
+ sub.unsubscribe();
+ }
}
+ this.fetchZenodoInformation.clearSubscriptions();
}
private handleError(message: string, error) {
diff --git a/src/app/deposit/deposit.module.ts b/src/app/deposit/deposit.module.ts
index e54229a..c4327dd 100644
--- a/src/app/deposit/deposit.module.ts
+++ b/src/app/deposit/deposit.module.ts
@@ -1,9 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
-
-
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
@@ -25,7 +22,7 @@ import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoC
exports: [
OpenaireDepositComponent,
],
- providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled,
+ providers: [PreviousRouteRecorder, IsRouteEnabled,
ZenodoCommunitiesService, SearchZenodoCommunitiesService]
})
export class LibDepositModule { }
diff --git a/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts b/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
index a51787c..115c823 100644
--- a/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
+++ b/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
@@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovidersToDeposit.component';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+ { path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [ IsRouteEnabled], data: {
redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] }
diff --git a/src/app/deposit/searchDataprovidersToDeposit.component.ts b/src/app/deposit/searchDataprovidersToDeposit.component.ts
index ff74304..881880f 100644
--- a/src/app/deposit/searchDataprovidersToDeposit.component.ts
+++ b/src/app/deposit/searchDataprovidersToDeposit.component.ts
@@ -11,7 +11,7 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
import {ZenodoInformationClass} from '../openaireLibrary/deposit/utils/zenodoInformation.class';
import {FetchZenodoInformation} from './utils/fetchZenodoInformation.class';
-import {Subscription} from "rxjs";
+import {Subscriber, Subscription} from "rxjs";
import {properties} from "../../environments/environment";
@Component({
@@ -32,9 +32,9 @@ export class OpenaireSearchDataprovidersToDepositComponent {
subs: Subscription[] = [];
constructor ( private route: ActivatedRoute,
- private _ΖenodoCommunitieService: ZenodoCommunitiesService,
+ private _zenodoCommunitieService: ZenodoCommunitiesService,
private _communityService: CommunityService,private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService ) {
- this.fetchZenodoInformation = new FetchZenodoInformation(this._ΖenodoCommunitieService, this._searchZenodoCommunitiesService);
+ this.fetchZenodoInformation = new FetchZenodoInformation(this._zenodoCommunitieService, this._searchZenodoCommunitiesService);
}
public ngOnInit() {
@@ -78,8 +78,11 @@ export class OpenaireSearchDataprovidersToDepositComponent {
public ngOnDestroy() {
for (let sub of this.subs) {
- sub.unsubscribe();
+ if(sub instanceof Subscriber) {
+ sub.unsubscribe();
+ }
}
+ this.fetchZenodoInformation.clearSubscriptions();
}
private handleError(message: string, error) {
diff --git a/src/app/deposit/searchDataprovidersToDeposit.module.ts b/src/app/deposit/searchDataprovidersToDeposit.module.ts
index c6823a4..e72b6e7 100644
--- a/src/app/deposit/searchDataprovidersToDeposit.module.ts
+++ b/src/app/deposit/searchDataprovidersToDeposit.module.ts
@@ -6,7 +6,6 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi
import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module';
import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
@@ -25,6 +24,6 @@ import {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/z
exports: [
OpenaireSearchDataprovidersToDepositComponent,
],
- providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled]
+ providers: [PreviousRouteRecorder, IsRouteEnabled]
})
export class LibSearchDataprovidersToDepositModule { }
diff --git a/src/app/deposit/utils/fetchZenodoInformation.class.ts b/src/app/deposit/utils/fetchZenodoInformation.class.ts
index ae64928..1b9e34f 100644
--- a/src/app/deposit/utils/fetchZenodoInformation.class.ts
+++ b/src/app/deposit/utils/fetchZenodoInformation.class.ts
@@ -3,15 +3,26 @@ import {ZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoComm
import {SearchZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service';
import {ZenodoInformationClass} from '../../openaireLibrary/deposit/utils/zenodoInformation.class';
+import {Subscriber} from "rxjs";
export class FetchZenodoInformation {
- constructor ( private _ΖenodoCommunitieService: ZenodoCommunitiesService,
+ private subscriptions = [];
+ constructor ( private _zenodoCommunitieService: ZenodoCommunitiesService,
private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService ) { }
- public ngOnDestroy() { }
+ public ngOnDestroy() {
+ this.clearSubscriptions();
+ }
+ clearSubscriptions(){
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
+ }
public getZenodoCommunityNameAndUrlById(masterZenodoCommunityId: string, properties:EnvProperties, zenodoInformation: ZenodoInformationClass){
- this._ΖenodoCommunitieService.getZenodoCommunityById(properties, properties.zenodoCommunities+masterZenodoCommunityId, null).subscribe(
+ this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(properties, properties.zenodoCommunities+masterZenodoCommunityId, null).subscribe(
result => {
console.info("getZenodoCommunityNameAndUrlById", result);
var masterZenodoCommunity = result;
@@ -21,11 +32,11 @@ export class FetchZenodoInformation {
error => {
console.error("Master Zenodo community'"+masterZenodoCommunityId+"' couldn't be loaded");
}
- );
+ ));
}
public searchNumberOfZCommunities(communityId: string, properties: EnvProperties, zenodoInformation: ZenodoInformationClass) {
- this._searchZenodoCommunitiesService.searchZCommunities(properties,communityId).subscribe (
+ this.subscriptions.push(this._searchZenodoCommunitiesService.searchZCommunities(properties,communityId).subscribe (
result => {
console.info("searchNumberOfZCommunities", result);
@@ -39,6 +50,6 @@ export class FetchZenodoInformation {
error => {
console.error("list of zenodo communities couldn't be loaded");
}
- );
+ ));
}
}
diff --git a/src/app/deposit/zenodo/shareInZenodo-routing.module.ts b/src/app/deposit/zenodo/shareInZenodo-routing.module.ts
index 600c52f..bef554a 100644
--- a/src/app/deposit/zenodo/shareInZenodo-routing.module.ts
+++ b/src/app/deposit/zenodo/shareInZenodo-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {ShareInZenodoComponent} from './shareInZenodo.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: ShareInZenodoComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: ShareInZenodoComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/deposit/zenodo/shareInZenodo.component.ts b/src/app/deposit/zenodo/shareInZenodo.component.ts
index 9c8c73d..6982946 100644
--- a/src/app/deposit/zenodo/shareInZenodo.component.ts
+++ b/src/app/deposit/zenodo/shareInZenodo.component.ts
@@ -18,7 +18,7 @@ import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
import {PiwikHelper} from "../../utils/piwikHelper";
import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
import {properties} from "../../../environments/environment";
-import {Subscription} from "rxjs";
+import {Subscriber, Subscription} from "rxjs";
@Component({
selector: 'share-in-zenodo',
@@ -150,7 +150,9 @@ export class ShareInZenodoComponent {
public ngOnDestroy() {
for (let sub of this.subs) {
- sub.unsubscribe();
+ if(sub instanceof Subscriber) {
+ sub.unsubscribe();
+ }
}
}
diff --git a/src/app/deposit/zenodo/shareInZenodo.module.ts b/src/app/deposit/zenodo/shareInZenodo.module.ts
index 6e4fb8e..0eb171e 100644
--- a/src/app/deposit/zenodo/shareInZenodo.module.ts
+++ b/src/app/deposit/zenodo/shareInZenodo.module.ts
@@ -1,7 +1,6 @@
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@@ -26,7 +25,7 @@ import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcr
declarations: [
ShareInZenodoComponent
],
- providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+ providers:[PreviousRouteRecorder, IsRouteEnabled],
exports: [
ShareInZenodoComponent
]
diff --git a/src/app/error/errorPage.component.ts b/src/app/error/errorPage.component.ts
index e96d3dc..52073bc 100644
--- a/src/app/error/errorPage.component.ts
+++ b/src/app/error/errorPage.component.ts
@@ -1,6 +1,5 @@
-import { Component, Input } from '@angular/core';
-import { Location } from '@angular/common';
-
+import { Component } from '@angular/core';
+
@Component({
selector: 'openaire-error',
template: `
diff --git a/src/app/htmlPages/htmlPage.component.ts b/src/app/htmlPages/htmlPage.component.ts
index 0eab46b..c8be71a 100644
--- a/src/app/htmlPages/htmlPage.component.ts
+++ b/src/app/htmlPages/htmlPage.component.ts
@@ -7,6 +7,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
+import {Subscriber} from "rxjs";
@Component({
selector: 'html-page',
@@ -24,7 +25,7 @@ export class HtmlPageComponent {
@Input() url: string = null;
@Input() pageTitle: string;
@Input() description: string;
- piwiksub: any;
+ private subscriptions = [];
communityId;
constructor(private route: ActivatedRoute, private _router: Router,
@@ -35,18 +36,18 @@ export class HtmlPageComponent {
private helper: HelperService) {}
public ngOnInit() {
- this.route.data
+ this.subscriptions.push(this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
+ this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
if (this.properties.environment == "development") {
- this.route.queryParams.subscribe(params => {
+ this.subscriptions.push(this.route.queryParams.subscribe(params => {
this.communityId = (params['communityId']) ? params['communityId'] : ConnectHelper.getCommunityFromDomain(this.properties.domain);
- })
+ }));
}
//TODO set the proper URL
this.url = this.properties.domain + this._router.url;
@@ -55,15 +56,18 @@ export class HtmlPageComponent {
this.updateTitle(this.pageTitle);
this.updateDescription(this.description);
this.getPageContents();
- });
+ }));
}
ngOnDestroy() {
- if(this.piwiksub) {
- this.piwiksub.unsubscribe();
- }
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
}
+
private updateDescription(description: string) {
this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content: description}, "property='og:description'");
@@ -80,8 +84,8 @@ export class HtmlPageComponent {
}
private getPageContents() {
- this.helper.getPageHelpContents(this.properties, this.communityId?this.communityId:"connect", this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.communityId?this.communityId:"connect", this._router.url).subscribe(contents => {
this.pageContents = contents;
- })
+ }));
}
}
diff --git a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts
index 16564b7..127ddb1 100644
--- a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts
+++ b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts
@@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {NationalBulletinPageComponent} from './nationalBulletinsPage.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: NationalBulletinPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: NationalBulletinPageComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts
index a6caa5c..c047137 100644
--- a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts
+++ b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts
@@ -1,7 +1,5 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {NationalBulletinPageComponent} from './nationalBulletinsPage.component';
import {CommonModule} from "@angular/common";
@@ -18,7 +16,7 @@ import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcr
declarations: [
NationalBulletinPageComponent
],
- providers: [FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+ providers: [PreviousRouteRecorder, IsRouteEnabled],
exports: [
NationalBulletinPageComponent
]
diff --git a/src/app/htmlPages/organizations/organizationsPage-routing.module.ts b/src/app/htmlPages/organizations/organizationsPage-routing.module.ts
index 8500909..df440ba 100644
--- a/src/app/htmlPages/organizations/organizationsPage-routing.module.ts
+++ b/src/app/htmlPages/organizations/organizationsPage-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OrganizationsPageComponent} from './organizationsPage.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OrganizationsPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: OrganizationsPageComponent, canActivate: [ IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/htmlPages/organizations/organizationsPage.module.ts b/src/app/htmlPages/organizations/organizationsPage.module.ts
index 23f8c2a..ab19356 100644
--- a/src/app/htmlPages/organizations/organizationsPage.module.ts
+++ b/src/app/htmlPages/organizations/organizationsPage.module.ts
@@ -1,6 +1,5 @@
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import { NgModule } from '@angular/core';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@@ -21,7 +20,7 @@ import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcr
declarations: [
OrganizationsPageComponent
],
- providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+ providers:[PreviousRouteRecorder, IsRouteEnabled],
exports: [
OrganizationsPageComponent
]
diff --git a/src/app/htmlPages/projects/projects-routing.module.ts b/src/app/htmlPages/projects/projects-routing.module.ts
index 0c54b3a..fa1e7f6 100644
--- a/src/app/htmlPages/projects/projects-routing.module.ts
+++ b/src/app/htmlPages/projects/projects-routing.module.ts
@@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {ProjectsPageComponent} from './projectsPage.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: ProjectsPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: ProjectsPageComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/htmlPages/projects/projectsPage.module.ts b/src/app/htmlPages/projects/projectsPage.module.ts
index c97d5c1..66f5bf6 100644
--- a/src/app/htmlPages/projects/projectsPage.module.ts
+++ b/src/app/htmlPages/projects/projectsPage.module.ts
@@ -1,7 +1,5 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {ProjectsPageComponent} from './projectsPage.component';
import {CommonModule} from "@angular/common";
@@ -18,7 +16,7 @@ import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcr
declarations: [
ProjectsPageComponent
],
- providers: [FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+ providers: [ PreviousRouteRecorder, IsRouteEnabled],
exports: [
ProjectsPageComponent
]
diff --git a/src/app/htmlPages/publications/publications-page.module.ts b/src/app/htmlPages/publications/publications-page.module.ts
index e2b5f75..275e45d 100644
--- a/src/app/htmlPages/publications/publications-page.module.ts
+++ b/src/app/htmlPages/publications/publications-page.module.ts
@@ -1,7 +1,6 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PublicationsPageComponent} from './publications-page.component';
import {CommonModule} from "@angular/common";
@@ -17,7 +16,7 @@ import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
declarations: [
PublicationsPageComponent
],
- providers: [FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+ providers: [ PreviousRouteRecorder, IsRouteEnabled],
exports: [
PublicationsPageComponent
]
diff --git a/src/app/htmlPages/publications/publications-routing.module.ts b/src/app/htmlPages/publications/publications-routing.module.ts
index 5f3beaf..59a77d9 100644
--- a/src/app/htmlPages/publications/publications-routing.module.ts
+++ b/src/app/htmlPages/publications/publications-routing.module.ts
@@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {PublicationsPageComponent} from './publications-page.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: PublicationsPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: PublicationsPageComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
index 6379a65..03d625f 100644
--- a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
+++ b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
@@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDataProviderComponent } from './dataProvider.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenaireDataProviderComponent, data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/dataProvider/dataProvider.component.ts b/src/app/landingPages/dataProvider/dataProvider.component.ts
index b3e145a..aacd9f6 100644
--- a/src/app/landingPages/dataProvider/dataProvider.component.ts
+++ b/src/app/landingPages/dataProvider/dataProvider.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-dataprovider',
@@ -11,9 +12,9 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireDataProviderComponent {
piwikSiteId = null;
communityId = null;
-
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -28,6 +29,10 @@ export class OpenaireDataProviderComponent {
ngOnInit() {
}
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/landingPages/dataProvider/libDataProvider.module.ts b/src/app/landingPages/dataProvider/libDataProvider.module.ts
index d6f8f93..3cefefe 100644
--- a/src/app/landingPages/dataProvider/libDataProvider.module.ts
+++ b/src/app/landingPages/dataProvider/libDataProvider.module.ts
@@ -2,13 +2,12 @@ import { NgModule} from '@angular/core';
import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
import { OpenaireDataProviderComponent } from './dataProvider.component';
import {DataProviderRoutingModule} from './dataProvider-routing.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [DataProviderModule, DataProviderRoutingModule],
declarations:[OpenaireDataProviderComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenaireDataProviderComponent]
})
export class LibDataProviderModule { }
diff --git a/src/app/landingPages/dataset/dataset-routing.module.ts b/src/app/landingPages/dataset/dataset-routing.module.ts
index 4d69cc4..10992dc 100644
--- a/src/app/landingPages/dataset/dataset-routing.module.ts
+++ b/src/app/landingPages/dataset/dataset-routing.module.ts
@@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDatasetComponent } from './dataset.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenaireDatasetComponent, data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/dataset/dataset.component.ts b/src/app/landingPages/dataset/dataset.component.ts
index 1432671..cff8625 100644
--- a/src/app/landingPages/dataset/dataset.component.ts
+++ b/src/app/landingPages/dataset/dataset.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-dataset',
@@ -12,9 +13,9 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireDatasetComponent {
piwikSiteId = null;
communityId = null;
-
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -27,6 +28,12 @@ export class OpenaireDatasetComponent {
}
ngOnInit() {
+
+ }
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
}
diff --git a/src/app/landingPages/dataset/libDataset.module.ts b/src/app/landingPages/dataset/libDataset.module.ts
index bca312d..40b16d1 100644
--- a/src/app/landingPages/dataset/libDataset.module.ts
+++ b/src/app/landingPages/dataset/libDataset.module.ts
@@ -1,13 +1,12 @@
import { NgModule} from '@angular/core';
import { OpenaireDatasetComponent } from './dataset.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {DatasetRoutingModule} from './dataset-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [DatasetRoutingModule, ResultLandingModule],
declarations:[OpenaireDatasetComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenaireDatasetComponent]
})
export class LibDatasetModule { }
diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
index f019aa0..663831a 100644
--- a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
+++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],
+ { path: '', component: OpenaireHtmlProjectReportComponent,
data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder]}
diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
index 3c28b0d..86f0ef2 100644
--- a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
+++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
@@ -2,6 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-htmlProjectReport',
template: ``,
@@ -9,8 +10,10 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireHtmlProjectReportComponent{
piwikSiteId = null;
communityId = null;
- constructor (private route: ActivatedRoute ) {
- this.route.data
+ private sub;
+
+ constructor(private route: ActivatedRoute) {
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -22,9 +25,14 @@ export class OpenaireHtmlProjectReportComponent{
});
}
-
ngOnInit() {
-}
+
+ }
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
diff --git a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
index e5d2a1d..557b898 100644
--- a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
+++ b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
@@ -1,6 +1,5 @@
import { NgModule} from '@angular/core';
import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
@@ -8,7 +7,7 @@ import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module
@NgModule({
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
declarations:[OpenaireHtmlProjectReportComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenaireHtmlProjectReportComponent]
})
export class LibHtmlProjectReportModule { }
diff --git a/src/app/landingPages/organization/libOrganization.module.ts b/src/app/landingPages/organization/libOrganization.module.ts
index 4111cc8..86382fe 100644
--- a/src/app/landingPages/organization/libOrganization.module.ts
+++ b/src/app/landingPages/organization/libOrganization.module.ts
@@ -1,6 +1,5 @@
import { NgModule} from '@angular/core';
import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenaireOrganizationComponent } from './organization.component';
import {OrganizationRoutingModule} from './organization-routing.module';
@@ -8,7 +7,7 @@ import {OrganizationRoutingModule} from './organization-routing.module';
@NgModule({
imports: [OrganizationModule, OrganizationRoutingModule],
declarations:[OpenaireOrganizationComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[PreviousRouteRecorder],
exports:[OpenaireOrganizationComponent]
})
export class LibOrganizationModule { }
diff --git a/src/app/landingPages/organization/organization-routing.module.ts b/src/app/landingPages/organization/organization-routing.module.ts
index afc7bf7..d4ea234 100644
--- a/src/app/landingPages/organization/organization-routing.module.ts
+++ b/src/app/landingPages/organization/organization-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireOrganizationComponent } from './organization.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenaireOrganizationComponent, data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/organization/organization.component.ts b/src/app/landingPages/organization/organization.component.ts
index da07a87..fe52e56 100644
--- a/src/app/landingPages/organization/organization.component.ts
+++ b/src/app/landingPages/organization/organization.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-organization',
@@ -11,9 +12,10 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireOrganizationComponent {
piwikSiteId = null;
communityId = null;
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -28,6 +30,9 @@ export class OpenaireOrganizationComponent {
ngOnInit() {
}
-
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/landingPages/orp/libOrp.module.ts b/src/app/landingPages/orp/libOrp.module.ts
index 5629ee8..5769201 100644
--- a/src/app/landingPages/orp/libOrp.module.ts
+++ b/src/app/landingPages/orp/libOrp.module.ts
@@ -1,5 +1,4 @@
import {NgModule} from '@angular/core';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {OpenaireOrpComponent} from './orp.component';
import {OrpRoutingModule} from './orp-routing.module';
@@ -13,7 +12,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
OpenaireOrpComponent
],
providers: [
- FreeGuard, PreviousRouteRecorder
+ PreviousRouteRecorder
],
exports: [
OpenaireOrpComponent
diff --git a/src/app/landingPages/orp/orp-routing.module.ts b/src/app/landingPages/orp/orp-routing.module.ts
index 848ab00..5f463fe 100644
--- a/src/app/landingPages/orp/orp-routing.module.ts
+++ b/src/app/landingPages/orp/orp-routing.module.ts
@@ -2,13 +2,12 @@ import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {OpenaireOrpComponent } from './orp.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([{
- path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: {
+ path: '', component: OpenaireOrpComponent, data: {
redirect: '/error'
},
canDeactivate: [PreviousRouteRecorder]
diff --git a/src/app/landingPages/orp/orp.component.ts b/src/app/landingPages/orp/orp.component.ts
index 514a291..1a5e1f4 100644
--- a/src/app/landingPages/orp/orp.component.ts
+++ b/src/app/landingPages/orp/orp.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-orp',
@@ -13,8 +14,10 @@ import {ConnectHelper} from '../../openaireLibrary/connect/co
export class OpenaireOrpComponent {
piwikSiteId = null;
communityId = null;
- constructor (private route: ActivatedRoute ) {
- this.route.data
+ private sub;
+
+ constructor(private route: ActivatedRoute) {
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -30,4 +33,9 @@ export class OpenaireOrpComponent {
ngOnInit() {
}
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/landingPages/project/libProject.module.ts b/src/app/landingPages/project/libProject.module.ts
index 36d8447..f68204c 100644
--- a/src/app/landingPages/project/libProject.module.ts
+++ b/src/app/landingPages/project/libProject.module.ts
@@ -1,6 +1,5 @@
import { NgModule} from '@angular/core';
import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenaireProjectComponent } from './project.component';
import {ProjectRoutingModule} from './project-routing.module';
@@ -8,7 +7,7 @@ import {ProjectRoutingModule} from './project-routing.module';
@NgModule({
imports: [ProjectModule, ProjectRoutingModule],
declarations:[OpenaireProjectComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenaireProjectComponent]
})
export class LibProjectModule { }
diff --git a/src/app/landingPages/project/project-routing.module.ts b/src/app/landingPages/project/project-routing.module.ts
index dd498a3..10f49bc 100644
--- a/src/app/landingPages/project/project-routing.module.ts
+++ b/src/app/landingPages/project/project-routing.module.ts
@@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireProjectComponent } from './project.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenaireProjectComponent, data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/project/project.component.ts b/src/app/landingPages/project/project.component.ts
index 2cb4933..e8e4fff 100644
--- a/src/app/landingPages/project/project.component.ts
+++ b/src/app/landingPages/project/project.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-project',
@@ -11,9 +12,10 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireProjectComponent {
piwikSiteId = null;
communityId = null;
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -27,6 +29,10 @@ export class OpenaireProjectComponent {
ngOnInit() {
}
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/landingPages/publication/libPublication.module.ts b/src/app/landingPages/publication/libPublication.module.ts
index 7a9b28a..b94b9ad 100644
--- a/src/app/landingPages/publication/libPublication.module.ts
+++ b/src/app/landingPages/publication/libPublication.module.ts
@@ -1,5 +1,4 @@
import { NgModule} from '@angular/core';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenairePublicationComponent } from './publication.component';
import {PublicationRoutingModule} from './publication-routing.module';
@@ -8,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
@NgModule({
imports: [PublicationRoutingModule, ResultLandingModule],
declarations:[OpenairePublicationComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenairePublicationComponent]
})
export class LibPublicationModule { }
diff --git a/src/app/landingPages/publication/publication-routing.module.ts b/src/app/landingPages/publication/publication-routing.module.ts
index a022558..6e7c22b 100644
--- a/src/app/landingPages/publication/publication-routing.module.ts
+++ b/src/app/landingPages/publication/publication-routing.module.ts
@@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenairePublicationComponent } from './publication.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenairePublicationComponent, data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts
index 10ec0ea..965c927 100644
--- a/src/app/landingPages/publication/publication.component.ts
+++ b/src/app/landingPages/publication/publication.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-publication',
@@ -12,9 +13,10 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenairePublicationComponent {
piwikSiteId = null;
communityId = null;
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -29,6 +31,10 @@ export class OpenairePublicationComponent {
ngOnInit() {
}
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/landingPages/result/libResult.module.ts b/src/app/landingPages/result/libResult.module.ts
index fd55523..da2eafe 100644
--- a/src/app/landingPages/result/libResult.module.ts
+++ b/src/app/landingPages/result/libResult.module.ts
@@ -1,5 +1,4 @@
import {NgModule} from '@angular/core';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {OpenaireResultComponent} from './result.component';
import {ResultRoutingModule} from './result-routing.module';
@@ -8,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
@NgModule({
imports: [ResultRoutingModule, ResultLandingModule],
declarations:[OpenaireResultComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenaireResultComponent]
})
export class LibResultModule { }
diff --git a/src/app/landingPages/result/result-routing.module.ts b/src/app/landingPages/result/result-routing.module.ts
index 48737fd..a3a73bd 100644
--- a/src/app/landingPages/result/result-routing.module.ts
+++ b/src/app/landingPages/result/result-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireResultComponent } from './result.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireResultComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenaireResultComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/result/result.component.ts b/src/app/landingPages/result/result.component.ts
index 5eca433..ccf1401 100644
--- a/src/app/landingPages/result/result.component.ts
+++ b/src/app/landingPages/result/result.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from "@angular/router";
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
import {PiwikHelper} from "../../utils/piwikHelper";
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-publication',
@@ -10,9 +11,10 @@ import {PiwikHelper} from "../../utils/piwikHelper";
export class OpenaireResultComponent{
piwikSiteId = null;
communityId = null;
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -27,6 +29,10 @@ export class OpenaireResultComponent{
ngOnInit() {
}
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/landingPages/software/libSoftware.module.ts b/src/app/landingPages/software/libSoftware.module.ts
index a14e789..66864f7 100644
--- a/src/app/landingPages/software/libSoftware.module.ts
+++ b/src/app/landingPages/software/libSoftware.module.ts
@@ -1,5 +1,4 @@
import { NgModule} from '@angular/core';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenaireSoftwareComponent } from './software.component';
import {SoftwareRoutingModule} from './software-routing.module';
@@ -7,7 +6,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
@NgModule({
imports: [SoftwareRoutingModule, ResultLandingModule],
declarations:[OpenaireSoftwareComponent],
- providers:[FreeGuard, PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder],
exports:[OpenaireSoftwareComponent]
})
export class LibSoftwareModule { }
diff --git a/src/app/landingPages/software/software-routing.module.ts b/src/app/landingPages/software/software-routing.module.ts
index addd79e..7924dae 100644
--- a/src/app/landingPages/software/software-routing.module.ts
+++ b/src/app/landingPages/software/software-routing.module.ts
@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireSoftwareComponent } from './software.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard], data: {
+ { path: '', component: OpenaireSoftwareComponent, data: {
redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] }
])
diff --git a/src/app/landingPages/software/software.component.ts b/src/app/landingPages/software/software.component.ts
index 44bd5fc..90a0253 100644
--- a/src/app/landingPages/software/software.component.ts
+++ b/src/app/landingPages/software/software.component.ts
@@ -2,6 +2,7 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../utils/piwikHelper';
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-software',
@@ -12,9 +13,10 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
export class OpenaireSoftwareComponent {
piwikSiteId = null;
communityId = null;
+ private sub;
constructor(private route: ActivatedRoute) {
- this.route.data
+ this.sub = this.route.data
.subscribe((data: { envSpecific: any }) => {
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
@@ -29,6 +31,10 @@ export class OpenaireSoftwareComponent {
ngOnInit() {
}
-
+ ngOnDestroy() {
+ if (this.sub instanceof Subscriber) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/learn-how/faqs/faqs-routing.module.ts b/src/app/learn-how/faqs/faqs-routing.module.ts
index bd476da..04c6f61 100644
--- a/src/app/learn-how/faqs/faqs-routing.module.ts
+++ b/src/app/learn-how/faqs/faqs-routing.module.ts
@@ -1,7 +1,6 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {FaqsComponent} from "./faqs.component";
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@@ -9,7 +8,7 @@ import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: FaqsComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: FaqsComponent, canActivate: [ IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/learn-how/faqs/faqs.component.ts b/src/app/learn-how/faqs/faqs.component.ts
index 879201d..638b796 100644
--- a/src/app/learn-how/faqs/faqs.component.ts
+++ b/src/app/learn-how/faqs/faqs.component.ts
@@ -6,6 +6,7 @@ import {Meta, Title} from "@angular/platform-browser";
import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service";
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
import {HelperService} from "../../openaireLibrary/utils/helper/helper.service";
+import {Subscriber} from "rxjs";
@Component({
selector: 'learn-in-depth',
@@ -200,7 +201,7 @@ export class FaqsComponent {
public pageTitle: string = "OpenAIRE - Connect | FAQs";
public pageDescription: string = "Frequently asked questions about OpenAIRE Connect research gateway";
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'FAQs'}];
- public piwiksub: any;
+ private subscriptions;
public pageContents = null;
public divContents = null;
public url: string = null;
@@ -217,12 +218,12 @@ export class FaqsComponent {
}
public ngOnInit() {
- this.route.data
+ this.subscriptions.push(this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
+ this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.url = this.properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
@@ -232,25 +233,27 @@ export class FaqsComponent {
//this.getDivContents();
this.getPageContents();
- });
+ }));
}
private getPageContents() {
- this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.pageContents = contents;
- })
+ }));
}
private getDivContents() {
- this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.divContents = contents;
- })
+ }));
}
-
- public ngOnDestroy() {
- if (this.piwiksub) {
- this.piwiksub.unsubscribe();
- }
+
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
}
private updateDescription(description: string) {
diff --git a/src/app/learn-how/faqs/faqs.module.ts b/src/app/learn-how/faqs/faqs.module.ts
index 3415694..182b5ba 100644
--- a/src/app/learn-how/faqs/faqs.module.ts
+++ b/src/app/learn-how/faqs/faqs.module.ts
@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {RouterModule} from '@angular/router';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PiwikService} from '../../openaireLibrary/utils/piwik/piwik.service';
@@ -27,7 +26,7 @@ import {HtmlPagesModule} from "../../htmlPages/htmlPages.module";
FaqsComponent
],
providers:[
- FreeGuard, PreviousRouteRecorder, PiwikService, IsRouteEnabled
+ PreviousRouteRecorder, PiwikService, IsRouteEnabled
]
})
export class FaqsModule { }
diff --git a/src/app/learn-how/learn-how-routing.module.ts b/src/app/learn-how/learn-how-routing.module.ts
index ca8e08c..7783b2f 100644
--- a/src/app/learn-how/learn-how-routing.module.ts
+++ b/src/app/learn-how/learn-how-routing.module.ts
@@ -1,7 +1,5 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {LearnHowComponent} from "./learn-how.component";
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
@@ -9,7 +7,7 @@ import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: LearnHowComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: LearnHowComponent, canActivate: [ IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts
index 0a8256e..32caebc 100644
--- a/src/app/learn-how/learn-how.component.ts
+++ b/src/app/learn-how/learn-how.component.ts
@@ -6,6 +6,7 @@ import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
+import {Subscriber} from "rxjs";
@Component({
selector: 'learn-how',
@@ -232,7 +233,6 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
`
})
export class LearnHowComponent implements OnInit {
- public piwiksub: any;
public pageContents = null;
public divContents = null;
@@ -242,7 +242,7 @@ export class LearnHowComponent implements OnInit {
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about'}];
properties: EnvProperties;
-
+ subscriptions = [];
constructor(
private route: ActivatedRoute,
private _router: Router,
@@ -254,12 +254,12 @@ export class LearnHowComponent implements OnInit {
}
public ngOnInit() {
- this.route.data
+ this.subscriptions.push(this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
+ this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.url = this.properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
@@ -269,26 +269,29 @@ export class LearnHowComponent implements OnInit {
//this.getDivContents();
this.getPageContents();
- });
+ }));
}
private getPageContents() {
- this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.pageContents = contents;
- })
+ }));
}
private getDivContents() {
- this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.divContents = contents;
- })
+ }));
}
-
- public ngOnDestroy() {
- if (this.piwiksub) {
- this.piwiksub.unsubscribe();
- }
+
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
}
+
private updateDescription(description: string) {
this._meta.updateTag({content: description}, "name='description'");
diff --git a/src/app/learn-how/learn-how.module.ts b/src/app/learn-how/learn-how.module.ts
index 472a55d..62d5d98 100644
--- a/src/app/learn-how/learn-how.module.ts
+++ b/src/app/learn-how/learn-how.module.ts
@@ -2,7 +2,6 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
@@ -28,7 +27,7 @@ import {HtmlPagesModule} from "../htmlPages/htmlPages.module";
LearnHowComponent
],
providers:[
- FreeGuard, PreviousRouteRecorder, PiwikService, IsRouteEnabled
+ PreviousRouteRecorder, PiwikService, IsRouteEnabled
]
})
export class LearnHowModule { }
diff --git a/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts b/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts
index d1ab12f..2a5fe1e 100644
--- a/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts
+++ b/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts
@@ -1,7 +1,6 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {LearnInDepthComponent} from "./learn-in-depth.component";
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@@ -9,7 +8,7 @@ import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: LearnInDepthComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: LearnInDepthComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/learn-how/learnInDepth/learn-in-depth.component.ts b/src/app/learn-how/learnInDepth/learn-in-depth.component.ts
index d30efa9..53433db 100644
--- a/src/app/learn-how/learnInDepth/learn-in-depth.component.ts
+++ b/src/app/learn-how/learnInDepth/learn-in-depth.component.ts
@@ -6,6 +6,7 @@ import {Meta, Title} from "@angular/platform-browser";
import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service";
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
import {HelperService} from "../../openaireLibrary/utils/helper/helper.service";
+import {Subscriber} from "rxjs";
@Component({
selector: 'learn-in-depth',
@@ -180,7 +181,7 @@ export class LearnInDepthComponent implements OnInit {
{name: 'about', route: '/about'},
{name: 'learn in-depth'}
];
- public piwiksub: any;
+ subscriptions = [];
public pageContents = null;
public divContents = null;
@@ -199,12 +200,12 @@ export class LearnInDepthComponent implements OnInit {
}
public ngOnInit() {
- this.route.data
+ this.subscriptions.push(this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
+ this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.url = this.properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
@@ -214,27 +215,30 @@ export class LearnInDepthComponent implements OnInit {
//this.getDivContents();
this.getPageContents();
- });
+ }));
}
private getPageContents() {
- this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.pageContents = contents;
- })
+ }));
}
private getDivContents() {
- this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
+ this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.divContents = contents;
- })
+ }));
}
-
- public ngOnDestroy() {
- if (this.piwiksub) {
- this.piwiksub.unsubscribe();
- }
+
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
}
-
+
+
private updateDescription(description: string) {
this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content: description}, "property='og:description'");
diff --git a/src/app/learn-how/learnInDepth/learn-in-depth.module.ts b/src/app/learn-how/learnInDepth/learn-in-depth.module.ts
index 5b9b594..315345d 100644
--- a/src/app/learn-how/learnInDepth/learn-in-depth.module.ts
+++ b/src/app/learn-how/learnInDepth/learn-in-depth.module.ts
@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {RouterModule} from '@angular/router';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PiwikService} from '../../openaireLibrary/utils/piwik/piwik.service';
@@ -27,7 +26,7 @@ import {HtmlPagesModule} from "../../htmlPages/htmlPages.module";
LearnInDepthComponent
],
providers:[
- FreeGuard, PreviousRouteRecorder, PiwikService, IsRouteEnabled
+ PreviousRouteRecorder, PiwikService, IsRouteEnabled
]
})
export class LearnInDepthModule { }
diff --git a/src/app/login/libUser.module.ts b/src/app/login/libUser.module.ts
index 8d8bace..25654b6 100644
--- a/src/app/login/libUser.module.ts
+++ b/src/app/login/libUser.module.ts
@@ -7,7 +7,6 @@ import { UserRoutingModule } from './user-routing.module';
import { UserModule} from '../openaireLibrary/login/user.module';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import { SubscribeService } from '../openaireLibrary/utils/subscribe/subscribe.service';
import {EmailService} from "../openaireLibrary/utils/email/email.service";
import {SubscribeModule} from '../utils/subscribe/subscribe.module';
@@ -16,7 +15,7 @@ import {SubscribeModule} from '../utils/subscribe/subscribe.module';
CommonModule, FormsModule,
UserRoutingModule, UserModule, SubscribeModule
],
- providers:[PreviousRouteRecorder, /*SubscribeService,*/ EmailService],
+ providers:[PreviousRouteRecorder, EmailService],
declarations: [
OpenaireUserComponent
diff --git a/src/app/login/user.component.ts b/src/app/login/user.component.ts
index 7416482..dd5926f 100644
--- a/src/app/login/user.component.ts
+++ b/src/app/login/user.component.ts
@@ -1,16 +1,16 @@
-import {Component, ElementRef, ViewChild} from '@angular/core';
-import {Observable} from 'rxjs/Observable';
+import {Component, ViewChild} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {UserComponent} from '../openaireLibrary/login/user.component';
import {SubscribeService} from '../openaireLibrary/utils/subscribe/subscribe.service';
import {EmailService} from "../openaireLibrary/utils/email/email.service";
-import {Email} from "../openaireLibrary/utils/email/email";
import {Session} from '../openaireLibrary/login/utils/helper.class';
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
import {SubscribeComponent} from '../utils/subscribe/subscribe.component';
import {ConnectHelper} from '../openaireLibrary/connect/connectHelper';
+import {properties} from "../../environments/environment";
+import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-user',
@@ -19,84 +19,87 @@ import {ConnectHelper} from '../openaireLibrary/connect/connectHelper';
-
+
For this action you have to login and subscribe to the research community.
- Login and Subscribe here.
+ Login and Subscribe here.Subscribing to community....An error occured while trying to subscribe to community....
-
+
This action requires authentication.
-
- Please sign in to continue.
+
+ Please sign in to continue.