From 5f33f0f3514dd983396441809343a61fa6eaf5d7 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 14 Nov 2023 17:25:08 +0200 Subject: [PATCH] [WIP] 1. add claims pages, add orcd pages, minor change in upload dois --- package.json | 1 + src/app/app-routing.module.ts | 4 +++ src/app/app.component.ts | 7 ++++- src/app/claims/claims.module.ts | 16 +++++++++++ .../claimsAdmin/claimsAdmin-routing.module.ts | 17 ++++++++++++ .../claimsAdmin/claimsAdmin.component.ts | 22 +++++++++++++++ .../claims/claimsAdmin/claimsAdmin.module.ts | 23 ++++++++++++++++ .../directLinking-routing.module.ts | 21 +++++++++++++++ .../directLinking/directLinking.component.ts | 8 ++++++ .../directLinking/directLinking.module.ts | 20 ++++++++++++++ .../claims/linking/linking-routing.module.ts | 20 ++++++++++++++ .../linking/linkingGeneric.component.ts | 10 +++++++ .../claims/linking/linkingGeneric.module.ts | 21 +++++++++++++++ .../myClaims/myClaims-routing.module.ts | 18 +++++++++++++ src/app/claims/myClaims/myClaims.component.ts | 24 +++++++++++++++++ src/app/claims/myClaims/myClaims.module.ts | 24 +++++++++++++++++ .../myOrcidLinks-routing.module.ts | 21 +++++++++++++++ .../my-orcid-links/myOrcidLinks.component.ts | 16 +++++++++++ .../my-orcid-links/myOrcidLinks.module.ts | 24 +++++++++++++++++ src/app/orcid/orcid.module.ts | 23 ++++++++++++++++ ...commendedResultsForOrcid-routing.module.ts | 24 +++++++++++++++++ ...rchRecommendedResultsForOrcid.component.ts | 16 +++++++++++ ...searchRecommendedResultsForOrcid.module.ts | 27 +++++++++++++++++++ .../upload-dois/upload-dois.component.html | 2 +- 24 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 src/app/claims/claims.module.ts create mode 100644 src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts create mode 100644 src/app/claims/claimsAdmin/claimsAdmin.component.ts create mode 100644 src/app/claims/claimsAdmin/claimsAdmin.module.ts create mode 100644 src/app/claims/directLinking/directLinking-routing.module.ts create mode 100644 src/app/claims/directLinking/directLinking.component.ts create mode 100644 src/app/claims/directLinking/directLinking.module.ts create mode 100644 src/app/claims/linking/linking-routing.module.ts create mode 100644 src/app/claims/linking/linkingGeneric.component.ts create mode 100644 src/app/claims/linking/linkingGeneric.module.ts create mode 100644 src/app/claims/myClaims/myClaims-routing.module.ts create mode 100644 src/app/claims/myClaims/myClaims.component.ts create mode 100644 src/app/claims/myClaims/myClaims.module.ts create mode 100644 src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts create mode 100644 src/app/orcid/my-orcid-links/myOrcidLinks.component.ts create mode 100644 src/app/orcid/my-orcid-links/myOrcidLinks.module.ts create mode 100644 src/app/orcid/orcid.module.ts create mode 100644 src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts create mode 100644 src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts create mode 100644 src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts diff --git a/package.json b/package.json index 60f4624..36867fd 100644 --- a/package.json +++ b/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" diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 826c5d2..7981a1a 100644 --- a/src/app/app-routing.module.ts +++ b/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} ]; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 46e189c..a2d4ddc 100644 --- a/src/app/app.component.ts +++ b/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'})); } diff --git a/src/app/claims/claims.module.ts b/src/app/claims/claims.module.ts new file mode 100644 index 0000000..3c61683 --- /dev/null +++ b/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 { +} diff --git a/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts new file mode 100644 index 0000000..fc70577 --- /dev/null +++ b/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 { } diff --git a/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/src/app/claims/claimsAdmin/claimsAdmin.component.ts new file mode 100644 index 0000000..23f4e19 --- /dev/null +++ b/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: ` + + + `, +}) +export class OpenaireClaimsAdminComponent implements OnInit { + claimsInfoURL: string; + userInfoURL: string; + + constructor() { + } + + public ngOnInit() { + this.claimsInfoURL = properties.claimsInformationLink; + this.userInfoURL = properties.userInfoUrl; + } +} diff --git a/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/src/app/claims/claimsAdmin/claimsAdmin.module.ts new file mode 100644 index 0000000..2e155ce --- /dev/null +++ b/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 { } diff --git a/src/app/claims/directLinking/directLinking-routing.module.ts b/src/app/claims/directLinking/directLinking-routing.module.ts new file mode 100644 index 0000000..7d260fc --- /dev/null +++ b/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 { } diff --git a/src/app/claims/directLinking/directLinking.component.ts b/src/app/claims/directLinking/directLinking.component.ts new file mode 100644 index 0000000..afabe0a --- /dev/null +++ b/src/app/claims/directLinking/directLinking.component.ts @@ -0,0 +1,8 @@ +import {Component, Input} from '@angular/core'; + +@Component({ + selector: 'openaire-directLinking', + template: `` +}) +export class OpenaireDirectLinkingComponent { +} diff --git a/src/app/claims/directLinking/directLinking.module.ts b/src/app/claims/directLinking/directLinking.module.ts new file mode 100644 index 0000000..8c9f752 --- /dev/null +++ b/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 { } diff --git a/src/app/claims/linking/linking-routing.module.ts b/src/app/claims/linking/linking-routing.module.ts new file mode 100644 index 0000000..469c7e2 --- /dev/null +++ b/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 { } diff --git a/src/app/claims/linking/linkingGeneric.component.ts b/src/app/claims/linking/linkingGeneric.component.ts new file mode 100644 index 0000000..edfeb87 --- /dev/null +++ b/src/app/claims/linking/linkingGeneric.component.ts @@ -0,0 +1,10 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'openaire-linking-generic', + template: `` + +}) +export class OpenaireLinkingComponent { + +} diff --git a/src/app/claims/linking/linkingGeneric.module.ts b/src/app/claims/linking/linkingGeneric.module.ts new file mode 100644 index 0000000..c9911f6 --- /dev/null +++ b/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 { } diff --git a/src/app/claims/myClaims/myClaims-routing.module.ts b/src/app/claims/myClaims/myClaims-routing.module.ts new file mode 100644 index 0000000..949ae69 --- /dev/null +++ b/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 { } diff --git a/src/app/claims/myClaims/myClaims.component.ts b/src/app/claims/myClaims/myClaims.component.ts new file mode 100644 index 0000000..da297ff --- /dev/null +++ b/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: ` + + + ` + +}) +export class OpenaireMyClaimsComponent implements OnInit { + claimsInfoURL: string; + userInfoURL: string; + + constructor() { + } + + public ngOnInit() { + this.claimsInfoURL = properties.claimsInformationLink; + this.userInfoURL = properties.userInfoUrl; + } +} diff --git a/src/app/claims/myClaims/myClaims.module.ts b/src/app/claims/myClaims/myClaims.module.ts new file mode 100644 index 0000000..aaf9c50 --- /dev/null +++ b/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 { } diff --git a/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts b/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts new file mode 100644 index 0000000..232b8c5 --- /dev/null +++ b/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 { } diff --git a/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts b/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts new file mode 100644 index 0000000..7197544 --- /dev/null +++ b/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: ` + + ` +}) + +export class OpenaireMyOrcidLinksComponent { + + constructor() {} + + public ngOnInit() {} +} + diff --git a/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts b/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts new file mode 100644 index 0000000..ace58ca --- /dev/null +++ b/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 { } diff --git a/src/app/orcid/orcid.module.ts b/src/app/orcid/orcid.module.ts new file mode 100644 index 0000000..a24a6a8 --- /dev/null +++ b/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 { } diff --git a/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts b/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts new file mode 100644 index 0000000..c48b4ec --- /dev/null +++ b/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 { } diff --git a/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts b/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts new file mode 100644 index 0000000..8e11400 --- /dev/null +++ b/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: ` + + ` +}) + +export class OpenaireSearchRecommendedResultsForOrcidComponent { + + constructor() {} + + public ngOnInit() {} +} + diff --git a/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts b/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts new file mode 100644 index 0000000..0ee0dcc --- /dev/null +++ b/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 { } diff --git a/src/app/upload-dois/upload-dois.component.html b/src/app/upload-dois/upload-dois.component.html index 9c6f00a..9e98f29 100644 --- a/src/app/upload-dois/upload-dois.component.html +++ b/src/app/upload-dois/upload-dois.component.html @@ -78,7 +78,7 @@
- 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}}