From c00119dcc3ec8b9f93db46d5bfa302158840d081 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 9 Nov 2022 13:41:33 +0200 Subject: [PATCH] Enable Orcid S&L for aggregator --- src/app/app-routing.module.ts | 5 +++- src/app/app.component.ts | 1 + src/app/openaireLibrary | 2 +- .../myOrcidLinks-routing.module.ts | 21 +++++++++++++++ .../my-orcid-links/myOrcidLinks.component.ts | 16 +++++++++++ .../my-orcid-links/myOrcidLinks.module.ts | 24 +++++++++++++++++ src/app/orcid/orcid-routing.module.ts | 21 +++++++++++++++ src/app/orcid/orcid.component.ts | 10 +++++++ src/app/orcid/orcid.module.ts | 24 +++++++++++++++++ ...commendedResultsForOrcid-routing.module.ts | 24 +++++++++++++++++ ...rchRecommendedResultsForOrcid.component.ts | 16 +++++++++++ ...searchRecommendedResultsForOrcid.module.ts | 27 +++++++++++++++++++ src/assets/common-assets | 2 +- src/environments/environment.beta.ts | 4 +++ src/environments/environment.prod.ts | 4 +++ src/environments/environment.ts | 8 ++++-- src/index.html | 1 - 17 files changed, 204 insertions(+), 6 deletions(-) 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-routing.module.ts create mode 100644 src/app/orcid/orcid.component.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/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index cd3e101..6676213 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -103,7 +103,10 @@ const routes: Routes = [ loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100} }, {path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)}, - {path: 'error', component: OpenaireErrorPageComponent} + {path: 'error', component: OpenaireErrorPageComponent}, + // ORCID Pages + {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)}, ]; @NgModule({ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8a1b677..d17b60b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -102,6 +102,7 @@ export class AppComponent { this.userMenuItems = []; if (this.user) { this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], [], {})); + this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {})); // this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); } })); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a2fea9e..806f018 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a2fea9e32331de06ab2192e3e638662531b9f42f +Subproject commit 806f0185b80dd5d260e8e7e6985f3e5377958ba3 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-routing.module.ts b/src/app/orcid/orcid-routing.module.ts new file mode 100644 index 0000000..a2cb005 --- /dev/null +++ b/src/app/orcid/orcid-routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import {OpenaireOrcidComponent} from './orcid.component'; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; +import {properties} from "../../environments/environment"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireOrcidComponent, + canActivate: [LoginGuard], data: { + redirect: properties.errorLink, community : 'openaire' + }, + canDeactivate: [PreviousRouteRecorder] } + + ]) + ] +}) +export class OrcidRoutingModule { } diff --git a/src/app/orcid/orcid.component.ts b/src/app/orcid/orcid.component.ts new file mode 100644 index 0000000..65976b8 --- /dev/null +++ b/src/app/orcid/orcid.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'openaire-orcid', + template: ` + + ` +}) + +export class OpenaireOrcidComponent {} \ No newline at end of file diff --git a/src/app/orcid/orcid.module.ts b/src/app/orcid/orcid.module.ts new file mode 100644 index 0000000..fb56618 --- /dev/null +++ b/src/app/orcid/orcid.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import {OpenaireOrcidComponent} from './orcid.component'; +import {OrcidRoutingModule} from './orcid-routing.module'; +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"; + +@NgModule({ + imports: [ + CommonModule, FormsModule, + OrcidModule, OrcidRoutingModule + ], + declarations: [ + OpenaireOrcidComponent + ], + providers: [PreviousRouteRecorder, LoginGuard], + exports: [ + OpenaireOrcidComponent + ] +}) +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/assets/common-assets b/src/assets/common-assets index 06e1889..2477972 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 06e1889730e456e86f728a31410bf550d16ac7d6 +Subproject commit 24779729b6f6bd4f099ed5645786b6452120d3d6 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 6aa3ef0..8888a2f 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -22,6 +22,10 @@ export let properties: EnvProperties = { searchDataciteAPIURL: "https://api.datacite.org/works", searchOrcidURL: "https://pub.orcid.org/v2.1/", orcidURL: "https://orcid.org/", + orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", + orcidTokenURL : "https://orcid.org/oauth/authorize?", + orcidClientId: "APP-IN0O56SBVVTB7NN4", + myOrcidLinksPage: "/my-orcid-links", doiURL: "https://dx.doi.org/", pmcURL: "http://europepmc.org/articles/", pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index edc5294..e68e44b 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -22,6 +22,10 @@ export let properties: EnvProperties = { searchDataciteAPIURL: "https://api.datacite.org/works", searchOrcidURL: "https://pub.orcid.org/v2.1/", orcidURL: "https://orcid.org/", + orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", + orcidTokenURL : "https://orcid.org/oauth/authorize?", + orcidClientId: "APP-IN0O56SBVVTB7NN4", + myOrcidLinksPage: "/my-orcid-links", doiURL: "https://dx.doi.org/", pmcURL: "http://europepmc.org/articles/", pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index cd0dcf1..62ac80c 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -10,8 +10,8 @@ export let properties: EnvProperties = { adminToolsPortalType: "aggregator", dashboard: "aggregator", enablePiwikTrack: false, - useCache: true, - useLongCache: true, + useCache: false, + useLongCache: false, showAddThis: true, enableEoscDataTransfer: true, framesAPIURL: "https://beta.openaire.eu/stats3/", @@ -28,6 +28,10 @@ export let properties: EnvProperties = { searchDataciteAPIURL: "https://api.datacite.org/works", searchOrcidURL: "https://pub.orcid.org/v2.1/", orcidURL: "https://orcid.org/", + orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", + orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?", + orcidClientId: "APP-A5M3KTX6NCN67L91", + myOrcidLinksPage: "/my-orcid-links", doiURL: "https://dx.doi.org/", pmcURL: "http://europepmc.org/articles/", pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", diff --git a/src/index.html b/src/index.html index 5ea0dad..5236e5b 100644 --- a/src/index.html +++ b/src/index.html @@ -43,7 +43,6 @@ Search OpenAIRE -
Beta instance