[Connect | Trunk]: Add Previous Route Recorder to all routes.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@59262 d315682c-612b-4755-9ff5-7f18f6832af3

src/app/claims/linking/linking-routing.module.ts

@@ -1,11 +1,10 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {RouterModule} from '@angular/router';
-import { OpenaireLinkingComponent } from './linkingGeneric.component';
+import {OpenaireLinkingComponent} from './linkingGeneric.component';
-
-import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard';
+
 //LoginGuard
 @NgModule({
   imports: [

src/app/contact/contact-routing.module.ts

@@ -2,11 +2,12 @@ import { NgModule } from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {ContactComponent} from './contact.component';
 import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
+import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
 
 @NgModule({
     imports: [
         RouterModule.forChild([
-            { path: '', component: ContactComponent, canActivate: [IsRouteEnabled]}
+            { path: '', component: ContactComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}
         ])
     ]
 })

src/app/searchPages/advanced/searchResearchResults.component.ts

@@ -9,7 +9,6 @@ import {PiwikHelper} from "../../utils/piwikHelper";
     template: `
       <search-research-results resultType="result" [simpleView]="false" [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true"></search-research-results>
     `
-
 })
 export class OpenaireSearchResearchResultsComponent {
     connectCommunityId:string;

src/app/searchPages/find/mainSearch-routing.module.ts

@@ -1,17 +1,16 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {RouterModule} from '@angular/router';
 
-import{OpenaireSearchComponent} from './search.component';
+import {OpenaireSearchComponent} from './search.component';
 import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
 import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     // { path: '', component: OpenaireSearchComponent }
+      {path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]}
-      	{ path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
-
     ])
   ]
 })
-export class MainSearchRoutingModule { }
+export class MainSearchRoutingModule {
+}

src/app/searchPages/simple/searchResearchResults.component.ts

@@ -8,7 +8,7 @@ import {PiwikHelper} from "../../utils/piwikHelper";
 @Component({
     selector: 'openaire-search-results',
     template: `
-      <search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/publications"
+      <search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/research-outcomes"
                                [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" 
                                [includeOnlyResultsAndFilter]="false" [showBreadcrumb]="true" [showAdvancedSearchLink]="true"></search-research-results>
     `

src/app/statistics/statistics-routing.module.ts

@@ -1,10 +1,9 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {RouterModule} from '@angular/router';
 
-import{StatisticsComponent} from './statistics.component';
+import {StatisticsComponent} from './statistics.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: [

src/app/subjects/subjects.module.ts

@@ -21,7 +21,6 @@ import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumb
   declarations: [
     SubjectsComponent
   ],
-  providers: [],
   exports: [
     SubjectsComponent
   ]

src/app/verification-manager/verification-manager-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule}      from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
+import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {VerificationComponent} from "../openaireLibrary/verification/verification.component";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: VerificationComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}
+    ])
+  ]
+})
+export class VerificationManagerRoutingModule {
+}

src/app/verification-manager/verification-manager.component.ts

@@ -0,0 +1,9 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'verification-manager',
+  template: `<div>test</div>`
+})
+export class VerificationManagerComponent {
+
+}

src/app/verification-manager/verification-manager.module.ts

@@ -0,0 +1,14 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {VerificationManagerComponent} from "./verification-manager.component";
+import {VerificationModule} from "../openaireLibrary/verification/verification.module";
+import {VerificationGuard} from "../openaireLibrary/login/verification.guard";
+import {VerificationManagerRoutingModule} from "./verification-manager-routing.module";
+
+@NgModule({
+  imports: [CommonModule, VerificationModule, VerificationManagerRoutingModule],
+  declarations: [VerificationManagerComponent],
+  exports: [VerificationManagerComponent],
+  providers: [VerificationGuard]
+})
+export class VerificationManagerModule {}