Enable Orcid S&L for aggregator
This commit is contained in:
parent
9f67013ad0
commit
c00119dcc3
|
@ -103,7 +103,10 @@ const routes: Routes = [
|
||||||
loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}
|
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: '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({
|
@NgModule({
|
||||||
|
|
|
@ -102,6 +102,7 @@ export class AppComponent {
|
||||||
this.userMenuItems = [];
|
this.userMenuItems = [];
|
||||||
if (this.user) {
|
if (this.user) {
|
||||||
this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], [], {}));
|
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, [], [], {}));
|
// this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a2fea9e32331de06ab2192e3e638662531b9f42f
|
Subproject commit 806f0185b80dd5d260e8e7e6985f3e5377958ba3
|
|
@ -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 { }
|
|
@ -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() {}
|
||||||
|
}
|
||||||
|
|
|
@ -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 { }
|
|
@ -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 { }
|
|
@ -0,0 +1,10 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'openaire-orcid',
|
||||||
|
template: `
|
||||||
|
<orcid></orcid>
|
||||||
|
`
|
||||||
|
})
|
||||||
|
|
||||||
|
export class OpenaireOrcidComponent {}
|
|
@ -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 { }
|
|
@ -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 { }
|
|
@ -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() {}
|
||||||
|
}
|
||||||
|
|
|
@ -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 { }
|
|
@ -1 +1 @@
|
||||||
Subproject commit 06e1889730e456e86f728a31410bf550d16ac7d6
|
Subproject commit 24779729b6f6bd4f099ed5645786b6452120d3d6
|
|
@ -22,6 +22,10 @@ export let properties: EnvProperties = {
|
||||||
searchDataciteAPIURL: "https://api.datacite.org/works",
|
searchDataciteAPIURL: "https://api.datacite.org/works",
|
||||||
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
||||||
orcidURL: "https://orcid.org/",
|
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/",
|
doiURL: "https://dx.doi.org/",
|
||||||
pmcURL: "http://europepmc.org/articles/",
|
pmcURL: "http://europepmc.org/articles/",
|
||||||
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
||||||
|
|
|
@ -22,6 +22,10 @@ export let properties: EnvProperties = {
|
||||||
searchDataciteAPIURL: "https://api.datacite.org/works",
|
searchDataciteAPIURL: "https://api.datacite.org/works",
|
||||||
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
||||||
orcidURL: "https://orcid.org/",
|
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/",
|
doiURL: "https://dx.doi.org/",
|
||||||
pmcURL: "http://europepmc.org/articles/",
|
pmcURL: "http://europepmc.org/articles/",
|
||||||
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
||||||
|
|
|
@ -10,8 +10,8 @@ export let properties: EnvProperties = {
|
||||||
adminToolsPortalType: "aggregator",
|
adminToolsPortalType: "aggregator",
|
||||||
dashboard: "aggregator",
|
dashboard: "aggregator",
|
||||||
enablePiwikTrack: false,
|
enablePiwikTrack: false,
|
||||||
useCache: true,
|
useCache: false,
|
||||||
useLongCache: true,
|
useLongCache: false,
|
||||||
showAddThis: true,
|
showAddThis: true,
|
||||||
enableEoscDataTransfer: true,
|
enableEoscDataTransfer: true,
|
||||||
framesAPIURL: "https://beta.openaire.eu/stats3/",
|
framesAPIURL: "https://beta.openaire.eu/stats3/",
|
||||||
|
@ -28,6 +28,10 @@ export let properties: EnvProperties = {
|
||||||
searchDataciteAPIURL: "https://api.datacite.org/works",
|
searchDataciteAPIURL: "https://api.datacite.org/works",
|
||||||
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
||||||
orcidURL: "https://orcid.org/",
|
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/",
|
doiURL: "https://dx.doi.org/",
|
||||||
pmcURL: "http://europepmc.org/articles/",
|
pmcURL: "http://europepmc.org/articles/",
|
||||||
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
<title>Search OpenAIRE</title>
|
<title>Search OpenAIRE</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="uk-badge" style="border: 0px; border-radius: 0px; background-color: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div>
|
|
||||||
<div class="uk-offcanvas-content uk-height-viewport">
|
<div class="uk-offcanvas-content uk-height-viewport">
|
||||||
<app-root></app-root>
|
<app-root></app-root>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue