[WIP] 1. add claims pages, add orcd pages, minor change in upload dois

package.json

@@ -37,6 +37,7 @@
     "ng-recaptcha": "^12.0.2",
     "ng2-ckeditor": "1.3.7",
     "rxjs": "^6.5.1",
+    "ts-md5": "^1.2.0",
     "tslib": "^2.3.0",
     "uikit": "3.16.24",
     "zone.js": "~0.13.0"

src/app/app-routing.module.ts

@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import {Irish} from "./shared/irish";
 import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component";
+import {ClaimsModule} from "./claims/claims.module";
 
 const routes: Routes = [
   {
@@ -31,6 +32,9 @@ const routes: Routes = [
     loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule),
     data: {title: Irish.METADATA_PREFIX + ' Admin | '},
   },
+  {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule)},
+  {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)},
+  {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)},
   {path: 'error', component: ErrorPageComponent},
   {path: '**', pathMatch: 'full', component: ErrorPageComponent}
 ];

src/app/app.component.ts

@@ -79,7 +79,12 @@ export class AppComponent extends StakeholderBaseComponent implements OnInit {
     ];
 
     if(this.user) {
-      this.userMenuItems = [new MenuItem("upload-dois", "Upload DOIs", "", "/upload-dois", false, [], null, {}, null, null, null, null)];
+      this.userMenuItems = [
+        new MenuItem("myorcidlinks", "My Orcid links", "", "/my-orcid-links", false, [], null, {}, null, null, null, null),
+        new MenuItem("myclaims", "My claims", "", "/participate/myclaims", false, [], null, {}, null, null, null, null),
+        new MenuItem("claims", "Link", "", "/participate/claim", false, [], null, {}, null, null, null, null),
+        new MenuItem("upload-dois", "Upload DOIs", "", "/upload-dois", false, [], null, {}, null, null, null, null)
+      ];
       if(this.isAdmin) {
         this.userMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
       }

src/app/claims/claims.module.ts

@@ -0,0 +1,16 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {Route, RouterModule} from "@angular/router";
+
+const routes: Route[] = [
+  {path: 'claim', loadChildren: () => import('./linking/linkingGeneric.module').then(m => m.LibLinkingGenericModule)},
+  {path: 'direct-claim', loadChildren: () => import('./directLinking/directLinking.module').then(m => m.LibDirectLinkingModule)},
+  {path: 'myclaims', loadChildren: () => import('./myClaims/myClaims.module').then(m => m.LibMyClaimsModule)}
+];
+
+@NgModule({
+  imports: [CommonModule, RouterModule.forChild(routes)],
+
+})
+export class ClaimsModule {
+}

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
+import{  ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {properties} from "../../../environments/environment";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, ClaimsCuratorGuard],
+      data: {redirect: properties.errorLink,  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
+  ]
+})
+export class ClaimsAdminRoutingModule { }

src/app/claims/claimsAdmin/claimsAdmin.component.ts

@@ -0,0 +1,22 @@
+import {Component, OnInit} from '@angular/core';
+import {properties} from "../../../environments/environment";
+
+@Component({
+  selector: 'openaire-claims-admin',
+  template: `
+    <claims-admin *ngIf="claimsInfoURL && userInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
+    </claims-admin>
+  `,
+})
+export class OpenaireClaimsAdminComponent implements OnInit {
+  claimsInfoURL: string;
+  userInfoURL: string;
+  
+  constructor() {
+  }
+  
+  public ngOnInit() {
+    this.claimsInfoURL = properties.claimsInformationLink;
+    this.userInfoURL = properties.userInfoUrl;
+  }
+}

src/app/claims/claimsAdmin/claimsAdmin.module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../openaireLibrary/shared/shared.module';
+import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
+import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module';
+import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
+import{  ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    SharedModule,
+    ClaimsAdminRoutingModule,
+    ClaimsAdminModule
+  ],
+    providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled],
+  declarations: [
+    OpenaireClaimsAdminComponent
+  ]
+})
+export class LibClaimsAdminModule { }

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

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireDirectLinkingComponent } from './directLinking.component';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {properties} from "../../../environments/environment";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
+          redirect: properties.errorLink,  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]},
+
+    ])
+  ]
+})
+export class DirectLinkingRoutingModule { }

src/app/claims/directLinking/directLinking.component.ts

@@ -0,0 +1,8 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+    selector: 'openaire-directLinking',
+    template: `<directLinking></directLinking>`
+})
+export class OpenaireDirectLinkingComponent {
+}

src/app/claims/directLinking/directLinking.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../openaireLibrary/shared/shared.module';
+import { OpenaireDirectLinkingComponent } from './directLinking.component';
+import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module';
+import {DirectLinkingRoutingModule} from './directLinking-routing.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    SharedModule, DirectLinkingModule, DirectLinkingRoutingModule
+  ],
+  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  declarations: [
+    OpenaireDirectLinkingComponent
+  ], exports:[OpenaireDirectLinkingComponent]
+})
+export class LibDirectLinkingModule { }

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

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+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 {properties} from "../../../environments/environment";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
+          redirect: properties.errorLink,  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]},
+
+    ])
+  ]
+})
+export class LinkingRoutingModule { }

src/app/claims/linking/linkingGeneric.component.ts

@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+@Component({
+    selector: 'openaire-linking-generic',
+    template: `<linking-generic pageTitle="Linking"></linking-generic>`
+
+})
+export class OpenaireLinkingComponent {
+
+}

src/app/claims/linking/linkingGeneric.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../openaireLibrary/shared/shared.module';
+import {OpenaireLinkingComponent} from './linkingGeneric.component';
+import {LinkingRoutingModule} from './linking-routing.module';
+import{   LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    SharedModule, LinkingRoutingModule, LinkingGenericModule
+  ],
+  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  declarations: [
+    OpenaireLinkingComponent
+   ], exports:[
+   OpenaireLinkingComponent ]
+})
+export class LibLinkingGenericModule { }

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

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import {OpenaireMyClaimsComponent } from './myClaims.component';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {properties} from "../../../environments/environment";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireMyClaimsComponent, canActivate: [LoginGuard],
+      data: {redirect: properties.errorLink,  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
+  ]
+})
+export class MyClaimsRoutingModule { }

src/app/claims/myClaims/myClaims.component.ts

@@ -0,0 +1,24 @@
+import {Component, OnInit} from '@angular/core';
+import {properties} from "../../../environments/environment";
+
+
+@Component({
+  selector: 'openaire-my-claims',
+  template: `
+    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
+    </my-claims>
+  `
+  
+})
+export class OpenaireMyClaimsComponent implements OnInit {
+  claimsInfoURL: string;
+  userInfoURL: string;
+  
+  constructor() {
+  }
+  
+  public ngOnInit() {
+    this.claimsInfoURL = properties.claimsInformationLink;
+    this.userInfoURL = properties.userInfoUrl;
+  }
+}

src/app/claims/myClaims/myClaims.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../openaireLibrary/shared/shared.module';
+import { OpenaireMyClaimsComponent } from './myClaims.component';
+import { MyClaimsRoutingModule } from './myClaims-routing.module';
+import{  MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    SharedModule,
+    MyClaimsRoutingModule,
+    MyClaimsModule
+
+  ],
+  providers:[LoginGuard, PreviousRouteRecorder],
+  declarations: [
+    OpenaireMyClaimsComponent
+  ]
+})
+export class LibMyClaimsModule { }

src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {OpenaireMyOrcidLinksComponent} from "./myOrcidLinks.component";
+import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
+import {properties} from "../../../environments/environment";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireMyOrcidLinksComponent,
+        canActivate: [LoginGuard], data: {
+          redirect: properties.errorLink,  community : 'openaire'
+        },
+        canDeactivate: [PreviousRouteRecorder]
+      }
+
+    ])
+  ]
+})
+export class MyOrcidLinksRoutingModule { }

src/app/orcid/my-orcid-links/myOrcidLinks.component.ts

@@ -0,0 +1,16 @@
+import {Component} from '@angular/core';
+
+@Component({
+  selector: 'openaire-my-orcid-links',
+  template: `
+    <my-orcid-links></my-orcid-links>   
+  `
+})
+
+export class OpenaireMyOrcidLinksComponent {
+
+  constructor() {}
+
+  public ngOnInit() {}
+}
+

src/app/orcid/my-orcid-links/myOrcidLinks.module.ts

@@ -0,0 +1,24 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {OpenaireMyOrcidLinksComponent} from './myOrcidLinks.component';
+import {MyOrcidLinksModule} from "../../openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module";
+import {MyOrcidLinksRoutingModule} from "./myOrcidLinks-routing.module";
+import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    MyOrcidLinksModule,
+    MyOrcidLinksRoutingModule
+  ],
+  declarations: [
+    OpenaireMyOrcidLinksComponent
+  ],
+  exports: [
+    OpenaireMyOrcidLinksComponent
+  ],
+  providers:    [PreviousRouteRecorder, LoginGuard]
+})
+export class LibMyOrcidLinksModule { }

src/app/orcid/orcid.module.ts

@@ -0,0 +1,23 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {FormsModule} from "@angular/forms";
+import {OrcidModule} from "../openaireLibrary/orcid/orcid.module";
+import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
+import {Route, RouterModule} from "@angular/router";
+import {OrcidComponent} from "../openaireLibrary/orcid/orcid.component";
+
+const routes: Route[] = [
+  {
+    path: '', component:  OrcidComponent
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    OrcidModule, RouterModule.forChild(routes)
+  ],
+  providers: [PreviousRouteRecorder, LoginGuard],
+})
+export class LibOrcidModule { }

src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts

@@ -0,0 +1,24 @@
+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 {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
+import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
+import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
+import {properties} from "../../../environments/environment";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      // { path: '', component: OpenaireSearchMyResultsInOrcidComponent, canActivate: [IsRouteEnabled], data: {
+      { path: '', component: OpenaireSearchRecommendedResultsForOrcidComponent,
+        canActivate: [LoginGuard], data: {
+          redirect: properties.errorLink,  community : 'openaire'
+        },
+        canDeactivate: [PreviousRouteRecorder]
+      }
+
+    ])
+  ]
+})
+export class SearchRecommendedResultsForOrcidRoutingModule { }

src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts

@@ -0,0 +1,16 @@
+import {Component} from '@angular/core';
+
+@Component({
+  selector: 'openaire-search-recommended-results-for-orcid',
+  template: `
+    <search-recommended-results-for-orcid></search-recommended-results-for-orcid>
+  `
+})
+
+export class OpenaireSearchRecommendedResultsForOrcidComponent {
+
+  constructor() {}
+
+  public ngOnInit() {}
+}
+

src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts

@@ -0,0 +1,27 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
+import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
+import {SearchRecommendedResultsForOrcidModule} from "../../openaireLibrary/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module";
+import {SearchRecommendedResultsForOrcidRoutingModule} from "./searchRecommendedResultsForOrcid-routing.module";
+import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
+import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    SearchRecommendedResultsForOrcidModule,
+    SearchRecommendedResultsForOrcidRoutingModule
+  ],
+  declarations: [
+    OpenaireSearchRecommendedResultsForOrcidComponent
+  ],
+  exports: [
+    OpenaireSearchRecommendedResultsForOrcidComponent
+  ],
+  // providers:    [PreviousRouteRecorder, IsRouteEnabled]
+  providers:    [PreviousRouteRecorder, LoginGuard]
+})
+export class LibSearchRecommendedResultsForOrcidModule { }

src/app/upload-dois/upload-dois.component.html

@@ -78,7 +78,7 @@
             </div>
             <div search-input [value]="keyword" (valueChange)="updateKeyword($event)"></div>
             <div>
-              Viewing {{(page-1)*size}}-{{resultsToShow.length>(page)*size? (page)*size : resultsToShow.length}} of {{resultsToShow.length}}
+              Viewing {{((page-1)*size + 1)}}-{{resultsToShow.length>(page)*size? (page)*size : resultsToShow.length}} of {{resultsToShow.length}}
             </div>
             <div *ngIf="resultsToShow.length > size">
             <ul [class.uk-invisible]="resultsToShow.length<size"  class="uk-pagination">