+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index f96379dafd..f5e9dc9b2b 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
import { ViewMode } from '../../../../core/shared/view-mode.model';
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
@listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
@Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
/**
* The component for displaying metadata and relations of an item of the type Journal Issue
*/
-export class JournalIssueComponent extends ItemComponent {
+export class JournalIssueComponent extends VersionedItemComponent {
}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 5d4d8d06ce..8b19c37033 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -3,6 +3,9 @@
{{'journalvolume.page.titleprefix' | translate}}
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index eeb93e7070..cc09be7959 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
import { ViewMode } from '../../../../core/shared/view-mode.model';
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
@listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
@Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
/**
* The component for displaying metadata and relations of an item of the type Journal Volume
*/
-export class JournalVolumeComponent extends ItemComponent {
+export class JournalVolumeComponent extends VersionedItemComponent {
}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index d51c55e5d6..45cbc1f839 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -3,6 +3,9 @@
{{'journal.page.titleprefix' | translate}}
+
@@ -44,7 +47,8 @@
+
@@ -54,12 +57,12 @@
[relationTypes]="[{
label: 'isOrgUnitOfPerson',
filter: 'isOrgUnitOfPerson',
- configuration: 'person'
+ configuration: 'person-relationships'
},
{
label: 'isOrgUnitOfProject',
filter: 'isOrgUnitOfProject',
- configuration: 'project'
+ configuration: 'project-relationships'
}]">
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index ab756db562..cbf8497f35 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
import { ViewMode } from '../../../../core/shared/view-mode.model';
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
@listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
@Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
/**
* The component for displaying metadata and relations of an item of the type Organisation Unit
*/
-export class OrgUnitComponent extends ItemComponent {
+export class OrgUnitComponent extends VersionedItemComponent {
}
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 8cf6117121..ace42f844e 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,9 +1,14 @@
- {{'person.page.titleprefix' | translate}}
+
@@ -19,18 +24,10 @@
[fields]="['person.email']"
[label]="'person.page.email'">
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.scss b/src/app/health-page/health-info/health-info-component/health-info-component.component.scss
new file mode 100644
index 0000000000..a6f0e73413
--- /dev/null
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.scss
@@ -0,0 +1,3 @@
+.collapse-toggle {
+ cursor: pointer;
+}
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
new file mode 100644
index 0000000000..b4532415b8
--- /dev/null
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
@@ -0,0 +1,82 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { HealthInfoComponentComponent } from './health-info-component.component';
+import { HealthInfoComponentOne, HealthInfoComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+
+describe('HealthInfoComponentComponent', () => {
+ let component: HealthInfoComponentComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getPropertyLabel(entry.key) | titlecase }} : {{entry.value}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/health-page/health-page.component.scss b/src/app/health-page/health-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/health-page/health-page.component.spec.ts b/src/app/health-page/health-page.component.spec.ts
new file mode 100644
index 0000000000..f3847ab092
--- /dev/null
+++ b/src/app/health-page/health-page.component.spec.ts
@@ -0,0 +1,72 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { By } from '@angular/platform-browser';
+
+import { of } from 'rxjs';
+import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+
+import { HealthPageComponent } from './health-page.component';
+import { HealthService } from './health.service';
+import { HealthInfoResponseObj, HealthResponseObj } from '../shared/mocks/health-endpoint.mocks';
+import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+
+describe('HealthPageComponent', () => {
+ let component: HealthPageComponent;
+ let fixture: ComponentFixture{{'health-page.heading' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{ getPropertyLabel(item.key) | titlecase }} : {{item.value}}
+{{'health-page.status' | translate}} :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{ bitstream?.firstMetadataValue('dc.description') }}
-
+
+ {{ bitstream?.firstMetadataValue('dc.description') }}
+
diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts
index 74ad0aae07..90a4a54b1e 100644
--- a/src/app/item-page/item-page-routing-paths.ts
+++ b/src/app/item-page/item-page-routing-paths.ts
@@ -50,3 +50,4 @@ export const ITEM_EDIT_PATH = 'edit';
export const ITEM_EDIT_VERSIONHISTORY_PATH = 'versionhistory';
export const ITEM_VERSION_PATH = 'version';
export const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
+export const ORCID_PATH = 'orcid';
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index 59dafd4d99..add2c3d768 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -7,15 +7,19 @@ import { VersionResolver } from './version-page/version.resolver';
import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
import { LinkService } from '../core/cache/builders/link.service';
import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
-import { ITEM_EDIT_PATH, UPLOAD_BITSTREAM_PATH } from './item-page-routing-paths';
+import { ITEM_EDIT_PATH, ORCID_PATH, UPLOAD_BITSTREAM_PATH } from './item-page-routing-paths';
import { ItemPageAdministratorGuard } from './item-page-administrator.guard';
import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
import { ThemedItemPageComponent } from './simple/themed-item-page.component';
import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
import { MenuItemType } from '../shared/menu/menu-item-type.model';
import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
+import {
+ BitstreamRequestACopyPageComponent
+} from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
+import { OrcidPageComponent } from './orcid-page/orcid-page.component';
+import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
@NgModule({
imports: [
@@ -50,6 +54,11 @@ import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
{
path: REQUEST_COPY_MODULE_PATH,
component: BitstreamRequestACopyPageComponent,
+ },
+ {
+ path: ORCID_PATH,
+ component: OrcidPageComponent,
+ canActivate: [AuthenticatedGuard, OrcidPageGuard]
}
],
data: {
@@ -88,6 +97,7 @@ import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
LinkService,
ItemPageAdministratorGuard,
VersionResolver,
+ OrcidPageGuard
]
})
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index 80cb1f61a2..cbb9f3299e 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -6,11 +6,19 @@ import { SharedModule } from '../shared/shared.module';
import { ItemPageComponent } from './simple/item-page.component';
import { ItemPageRoutingModule } from './item-page-routing.module';
import { MetadataUriValuesComponent } from './field-components/metadata-uri-values/metadata-uri-values.component';
-import { ItemPageAuthorFieldComponent } from './simple/field-components/specific-field/author/item-page-author-field.component';
-import { ItemPageDateFieldComponent } from './simple/field-components/specific-field/date/item-page-date-field.component';
-import { ItemPageAbstractFieldComponent } from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
+import {
+ ItemPageAuthorFieldComponent
+} from './simple/field-components/specific-field/author/item-page-author-field.component';
+import {
+ ItemPageDateFieldComponent
+} from './simple/field-components/specific-field/date/item-page-date-field.component';
+import {
+ ItemPageAbstractFieldComponent
+} from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
import { ItemPageUriFieldComponent } from './simple/field-components/specific-field/uri/item-page-uri-field.component';
-import { ItemPageTitleFieldComponent } from './simple/field-components/specific-field/title/item-page-title-field.component';
+import {
+ ItemPageTitleFieldComponent
+} from './simple/field-components/specific-field/title/item-page-title-field.component';
import { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component';
import { CollectionsComponent } from './field-components/collections/collections.component';
import { FullItemPageComponent } from './full/full-item-page.component';
@@ -20,7 +28,9 @@ import { ItemComponent } from './simple/item-types/shared/item.component';
import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
import { StatisticsModule } from '../statistics/statistics.module';
-import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
+import {
+ AbstractIncrementalListComponent
+} from './simple/abstract-incremental-list/abstract-incremental-list.component';
import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
@@ -34,6 +44,11 @@ import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.componen
import { VersionPageComponent } from './version-page/version-page/version-page.component';
import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component';
import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
+import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component';
+import { OrcidPageComponent } from './orcid-page/orcid-page.component';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
+import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
const ENTRY_COMPONENTS = [
@@ -67,6 +82,10 @@ const DECLARATIONS = [
MediaViewerImageComponent,
MiradorViewerComponent,
VersionPageComponent,
+ OrcidPageComponent,
+ OrcidAuthComponent,
+ OrcidSyncSettingsComponent,
+ OrcidQueueComponent
];
@NgModule({
@@ -79,6 +98,7 @@ const DECLARATIONS = [
JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(),
NgxGalleryModule,
+ NgbAccordionModule
],
declarations: [
...DECLARATIONS,
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
new file mode 100644
index 0000000000..e57ce33008
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -0,0 +1,84 @@
+
+
+
+
+
+
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.scss b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
new file mode 100644
index 0000000000..e96e5996fb
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
@@ -0,0 +1,336 @@
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { By } from '@angular/platform-browser';
+
+import { getTestScheduler } from 'jasmine-marbles';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { Item } from '../../../core/shared/item.model';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { OrcidAuthComponent } from './orcid-auth.component';
+import { NativeWindowService } from '../../../core/services/window.service';
+import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+
+describe('OrcidAuthComponent test suite', () => {
+ let comp: OrcidAuthComponent;
+ let fixture: ComponentFixture;
+ let scheduler: TestScheduler;
+ let orcidAuthService: jasmine.SpyObj;
+ let nativeWindowRef;
+ let notificationsService;
+
+ const orcidScopes = [
+ '/authenticate',
+ '/read-limited',
+ '/activities/update',
+ '/person/update'
+ ];
+
+ const partialOrcidScopes = [
+ '/authenticate',
+ '/read-limited',
+ ];
+
+ const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
+ bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ metadata: {
+ 'dc.title': [{
+ value: 'test person'
+ }],
+ 'dspace.entity.type': [{
+ 'value': 'Person'
+ }]
+ }
+ });
+
+ const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
+ bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ metadata: {
+ 'dc.title': [{
+ value: 'test person'
+ }],
+ 'dspace.entity.type': [{
+ 'value': 'Person'
+ }],
+ 'dspace.object.owner': [{
+ 'value': 'test person',
+ 'language': null,
+ 'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
+ 'confidence': 600,
+ 'place': 0
+ }],
+ 'dspace.orcid.authenticated': [{
+ 'value': '2022-06-10T15:15:12.952872',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }],
+ 'dspace.orcid.scope': [{
+ 'value': '/authenticate',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }, {
+ 'value': '/read-limited',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 1
+ }, {
+ 'value': '/activities/update',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 2
+ }, {
+ 'value': '/person/update',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 3
+ }],
+ 'person.identifier.orcid': [{
+ 'value': 'orcid-id',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }]
+ }
+ });
+
+ beforeEach(waitForAsync(() => {
+ orcidAuthService = jasmine.createSpyObj('researcherProfileService', {
+ getOrcidAuthorizationScopes: jasmine.createSpy('getOrcidAuthorizationScopes'),
+ getOrcidAuthorizationScopesByItem: jasmine.createSpy('getOrcidAuthorizationScopesByItem'),
+ getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl'),
+ isLinkedToOrcid: jasmine.createSpy('isLinkedToOrcid'),
+ onlyAdminCanDisconnectProfileFromOrcid: jasmine.createSpy('onlyAdminCanDisconnectProfileFromOrcid'),
+ ownerCanDisconnectProfileFromOrcid: jasmine.createSpy('ownerCanDisconnectProfileFromOrcid'),
+ unlinkOrcidByItem: jasmine.createSpy('unlinkOrcidByItem')
+ });
+
+ void TestBed.configureTestingModule({
+ imports: [
+ NgbAccordionModule,
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useClass: TranslateLoaderMock
+ }
+ }),
+ RouterTestingModule.withRoutes([])
+ ],
+ declarations: [OrcidAuthComponent],
+ providers: [
+ { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
+ { provide: NotificationsService, useClass: NotificationsServiceStub },
+ { provide: OrcidAuthService, useValue: orcidAuthService }
+ ],
+ schemas: [NO_ERRORS_SCHEMA]
+ }).overrideComponent(OrcidAuthComponent, {
+ set: { changeDetection: ChangeDetectionStrategy.Default }
+ }).compileComponents();
+ }));
+
+ beforeEach(waitForAsync(() => {
+ scheduler = getTestScheduler();
+ fixture = TestBed.createComponent(OrcidAuthComponent);
+ comp = fixture.componentInstance;
+ orcidAuthService.getOrcidAuthorizationScopes.and.returnValue(of(orcidScopes));
+ }));
+
+ describe('when orcid profile is not linked', () => {
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemUnlinkedToOrcid;
+ orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([]);
+ orcidAuthService.isLinkedToOrcid.and.returnValue(false);
+ orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+ orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ orcidAuthService.getOrcidAuthorizeUrl.and.returnValue(of('oarcidUrl'));
+ fixture.detectChanges();
+ }));
+
+ it('should create', fakeAsync(() => {
+ const orcidLinked = fixture.debugElement.query(By.css('[data-test="orcidLinked"]'));
+ const orcidNotLinked = fixture.debugElement.query(By.css('[data-test="orcidNotLinked"]'));
+ expect(orcidLinked).toBeFalsy();
+ expect(orcidNotLinked).toBeTruthy();
+ }));
+
+ it('should change location on link', () => {
+ nativeWindowRef = (comp as any)._window;
+ scheduler.schedule(() => comp.linkOrcid());
+ scheduler.flush();
+
+ expect(nativeWindowRef.nativeWindow.location.href).toBe('oarcidUrl');
+ });
+
+ });
+
+ describe('when orcid profile is linked', () => {
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+ }));
+
+ describe('', () => {
+
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ notificationsService = (comp as any).notificationsService;
+ orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+ orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+ orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+ orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ }));
+
+ describe('and unlink is successfully', () => {
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.unlinkOrcidByItem.and.returnValue(createSuccessfulRemoteDataObject$(new ResearcherProfile()));
+ spyOn(comp.unlink, 'emit');
+ fixture.detectChanges();
+ }));
+
+ it('should show success notification', () => {
+ scheduler.schedule(() => comp.unlinkOrcid());
+ scheduler.flush();
+
+ expect(notificationsService.success).toHaveBeenCalled();
+ expect(comp.unlink.emit).toHaveBeenCalled();
+ });
+ });
+
+ describe('and unlink is failed', () => {
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.unlinkOrcidByItem.and.returnValue(createFailedRemoteDataObject$());
+ fixture.detectChanges();
+ }));
+
+ it('should show success notification', () => {
+ scheduler.schedule(() => comp.unlinkOrcid());
+ scheduler.flush();
+
+ expect(notificationsService.error).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('and has orcid authorization scopes', () => {
+
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+ orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+ orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+ orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ fixture.detectChanges();
+ }));
+
+ it('should create', fakeAsync(() => {
+ const orcidLinked = fixture.debugElement.query(By.css('[data-test="orcidLinked"]'));
+ const orcidNotLinked = fixture.debugElement.query(By.css('[data-test="orcidNotLinked"]'));
+ expect(orcidLinked).toBeTruthy();
+ expect(orcidNotLinked).toBeFalsy();
+ }));
+
+ it('should display orcid authorizations', fakeAsync(() => {
+ const orcidAuthorizations = fixture.debugElement.query(By.css('[data-test="hasOrcidAuthorizations"]'));
+ const noMissingOrcidAuthorizations = fixture.debugElement.query(By.css('[data-test="noMissingOrcidAuthorizations"]'));
+ const orcidAuthorizationsList = fixture.debugElement.queryAll(By.css('[data-test="orcidAuthorization"]'));
+
+ expect(orcidAuthorizations).toBeTruthy();
+ expect(noMissingOrcidAuthorizations).toBeTruthy();
+ expect(orcidAuthorizationsList.length).toBe(4);
+ }));
+ });
+
+ describe('and has missing orcid authorization scopes', () => {
+
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...partialOrcidScopes]);
+ orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+ orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+ orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ fixture.detectChanges();
+ }));
+
+ it('should create', fakeAsync(() => {
+ const orcidLinked = fixture.debugElement.query(By.css('[data-test="orcidLinked"]'));
+ const orcidNotLinked = fixture.debugElement.query(By.css('[data-test="orcidNotLinked"]'));
+ expect(orcidLinked).toBeTruthy();
+ expect(orcidNotLinked).toBeFalsy();
+ }));
+
+ it('should display orcid authorizations', fakeAsync(() => {
+ const orcidAuthorizations = fixture.debugElement.query(By.css('[data-test="hasOrcidAuthorizations"]'));
+ const missingOrcidAuthorizations = fixture.debugElement.query(By.css('[data-test="missingOrcidAuthorizations"]'));
+ const orcidAuthorizationsList = fixture.debugElement.queryAll(By.css('[data-test="orcidAuthorization"]'));
+ const missingOrcidAuthorizationsList = fixture.debugElement.queryAll(By.css('[data-test="missingOrcidAuthorization"]'));
+
+ expect(orcidAuthorizations).toBeTruthy();
+ expect(missingOrcidAuthorizations).toBeTruthy();
+ expect(orcidAuthorizationsList.length).toBe(2);
+ expect(missingOrcidAuthorizationsList.length).toBe(2);
+ }));
+ });
+
+ describe('and only admin can unlink scopes', () => {
+
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+ orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+ orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+ fixture.detectChanges();
+ }));
+
+ it('should display warning panel', fakeAsync(() => {
+ const unlinkOnlyAdmin = fixture.debugElement.query(By.css('[data-test="unlinkOnlyAdmin"]'));
+ const unlinkOwner = fixture.debugElement.query(By.css('[data-test="unlinkOwner"]'));
+ expect(unlinkOnlyAdmin).toBeTruthy();
+ expect(unlinkOwner).toBeFalsy();
+ }));
+
+ });
+
+ describe('and owner can unlink scopes', () => {
+
+ beforeEach(waitForAsync(() => {
+ comp.item = mockItemLinkedToOrcid;
+ orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+ orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+ orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+ fixture.detectChanges();
+ }));
+
+ it('should display warning panel', fakeAsync(() => {
+ const unlinkOnlyAdmin = fixture.debugElement.query(By.css('[data-test="unlinkOnlyAdmin"]'));
+ const unlinkOwner = fixture.debugElement.query(By.css('[data-test="unlinkOwner"]'));
+ expect(unlinkOnlyAdmin).toBeFalsy();
+ expect(unlinkOwner).toBeTruthy();
+ }));
+
+ });
+
+ });
+
+
+});
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
new file mode 100644
index 0000000000..ea970e7d31
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -0,0 +1,218 @@
+import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+
+import { TranslateService } from '@ngx-translate/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+
+@Component({
+ selector: 'ds-orcid-auth',
+ templateUrl: './orcid-auth.component.html',
+ styleUrls: ['./orcid-auth.component.scss']
+})
+export class OrcidAuthComponent implements OnInit, OnChanges {
+
+ /**
+ * The item for which showing the orcid settings
+ */
+ @Input() item: Item;
+
+ /**
+ * The list of exposed orcid authorization scopes for the orcid profile
+ */
+ profileAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]);
+
+ /**
+ * The list of all orcid authorization scopes missing in the orcid profile
+ */
+ missingAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]);
+
+ /**
+ * The list of all orcid authorization scopes available
+ */
+ orcidAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]);
+
+ /**
+ * A boolean representing if unlink operation is processing
+ */
+ unlinkProcessing: BehaviorSubject = new BehaviorSubject(false);
+
+ /**
+ * A boolean representing if orcid profile is linked
+ */
+ private isOrcidLinked$: BehaviorSubject = new BehaviorSubject(false);
+
+ /**
+ * A boolean representing if only admin can disconnect orcid profile
+ */
+ private onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false);
+
+ /**
+ * A boolean representing if owner can disconnect orcid profile
+ */
+ private ownerCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false);
+
+ /**
+ * An event emitted when orcid profile is unliked successfully
+ */
+ @Output() unlink: EventEmitter = new EventEmitter();
+
+ constructor(
+ private orcidAuthService: OrcidAuthService,
+ private translateService: TranslateService,
+ private notificationsService: NotificationsService,
+ @Inject(NativeWindowService) private _window: NativeWindowRef,
+ ) {
+ }
+
+ ngOnInit() {
+ this.orcidAuthService.getOrcidAuthorizationScopes().subscribe((scopes: string[]) => {
+ this.orcidAuthorizationScopes.next(scopes);
+ this.initOrcidAuthSettings();
+ });
+ }
+
+ ngOnChanges(changes: SimpleChanges): void {
+ if (!changes.item.isFirstChange() && changes.item.currentValue !== changes.item.previousValue) {
+ this.initOrcidAuthSettings();
+ }
+ }
+
+ /**
+ * Check if the list of exposed orcid authorization scopes for the orcid profile has values
+ */
+ hasOrcidAuthorizations(): Observable {
+ return this.profileAuthorizationScopes.asObservable().pipe(
+ map((scopes: string[]) => scopes.length > 0)
+ );
+ }
+
+ /**
+ * Return the list of exposed orcid authorization scopes for the orcid profile
+ */
+ getOrcidAuthorizations(): Observable {
+ return this.profileAuthorizationScopes.asObservable();
+ }
+
+ /**
+ * Check if the list of exposed orcid authorization scopes for the orcid profile has values
+ */
+ hasMissingOrcidAuthorizations(): Observable {
+ return this.missingAuthorizationScopes.asObservable().pipe(
+ map((scopes: string[]) => scopes.length > 0)
+ );
+ }
+
+ /**
+ * Return the list of exposed orcid authorization scopes for the orcid profile
+ */
+ getMissingOrcidAuthorizations(): Observable {
+ return this.profileAuthorizationScopes.asObservable();
+ }
+
+ /**
+ * Return a boolean representing if orcid profile is linked
+ */
+ isLinkedToOrcid(): Observable {
+ return this.isOrcidLinked$.asObservable();
+ }
+
+ getOrcidNotLinkedMessage(): Observable {
+ const orcid = this.item.firstMetadataValue('person.identifier.orcid');
+ if (orcid) {
+ return this.translateService.get('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid });
+ } else {
+ return this.translateService.get('person.page.orcid.no-orcid-message');
+ }
+ }
+
+ /**
+ * Get label for a given orcid authorization scope
+ *
+ * @param scope
+ */
+ getAuthorizationDescription(scope: string) {
+ return 'person.page.orcid.scope.' + scope.substring(1).replace('/', '-');
+ }
+
+ /**
+ * Return a boolean representing if only admin can disconnect orcid profile
+ */
+ onlyAdminCanDisconnectProfileFromOrcid(): Observable {
+ return this.onlyAdminCanDisconnectProfileFromOrcid$.asObservable();
+ }
+
+ /**
+ * Return a boolean representing if owner can disconnect orcid profile
+ */
+ ownerCanDisconnectProfileFromOrcid(): Observable {
+ return this.ownerCanDisconnectProfileFromOrcid$.asObservable();
+ }
+
+ /**
+ * Link existing person profile with orcid
+ */
+ linkOrcid(): void {
+ this.orcidAuthService.getOrcidAuthorizeUrl(this.item).subscribe((authorizeUrl) => {
+ this._window.nativeWindow.location.href = authorizeUrl;
+ });
+ }
+
+ /**
+ * Unlink existing person profile from orcid
+ */
+ unlinkOrcid(): void {
+ this.unlinkProcessing.next(true);
+ this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
+ getFirstCompletedRemoteData()
+ ).subscribe((remoteData: RemoteData) => {
+ this.unlinkProcessing.next(false);
+ if (remoteData.isSuccess) {
+ this.notificationsService.success(this.translateService.get('person.page.orcid.unlink.success'));
+ this.unlink.emit();
+ } else {
+ this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
+ }
+ });
+ }
+
+ /**
+ * initialize all Orcid authentication settings
+ * @private
+ */
+ private initOrcidAuthSettings(): void {
+
+ this.setOrcidAuthorizationsFromItem();
+
+ this.setMissingOrcidAuthorizations();
+
+ this.orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid().subscribe((result) => {
+ this.onlyAdminCanDisconnectProfileFromOrcid$.next(result);
+ });
+
+ this.orcidAuthService.ownerCanDisconnectProfileFromOrcid().subscribe((result) => {
+ this.ownerCanDisconnectProfileFromOrcid$.next(result);
+ });
+
+ this.isOrcidLinked$.next(this.orcidAuthService.isLinkedToOrcid(this.item));
+ }
+
+ private setMissingOrcidAuthorizations(): void {
+ const profileScopes = this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item);
+ const orcidScopes = this.orcidAuthorizationScopes.value;
+ const missingScopes = orcidScopes.filter((scope) => !profileScopes.includes(scope));
+
+ this.missingAuthorizationScopes.next(missingScopes);
+ }
+
+ private setOrcidAuthorizationsFromItem(): void {
+ this.profileAuthorizationScopes.next(this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item));
+ }
+
+}
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
new file mode 100644
index 0000000000..33c3125d67
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -0,0 +1,19 @@
+
+
diff --git a/src/app/item-page/orcid-page/orcid-page.component.scss b/src/app/item-page/orcid-page/orcid-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/item-page/orcid-page/orcid-page.component.spec.ts b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
new file mode 100644
index 0000000000..1ed237943e
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
@@ -0,0 +1,220 @@
+import { NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { By } from '@angular/platform-browser';
+
+import { of as observableOf } from 'rxjs';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TestScheduler } from 'rxjs/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { OrcidPageComponent } from './orcid-page.component';
+import {
+ createFailedRemoteDataObject$,
+ createSuccessfulRemoteDataObject,
+ createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { Item } from '../../core/shared/item.model';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
+
+describe('OrcidPageComponent test suite', () => {
+ let comp: OrcidPageComponent;
+ let fixture: ComponentFixture;
+ let scheduler: TestScheduler;
+ let authService: jasmine.SpyObj;
+ let routeStub: jasmine.SpyObj;
+ let routeData: any;
+ let itemDataService: jasmine.SpyObj;
+ let orcidAuthService: jasmine.SpyObj;
+
+ const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
+ id: 'test-id',
+ visible: true,
+ type: 'profile',
+ _links: {
+ item: {
+ href: 'https://rest.api/rest/api/profiles/test-id/item'
+ },
+ self: {
+ href: 'https://rest.api/rest/api/profiles/test-id'
+ },
+ }
+ });
+ const mockItem: Item = Object.assign(new Item(), {
+ id: 'test-id',
+ bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'test item'
+ }
+ ]
+ }
+ });
+ const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
+ id: 'test-id',
+ bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ metadata: {
+ 'dc.title': [
+ {
+ value: 'test item'
+ }
+ ],
+ 'dspace.orcid.authenticated': [
+ {
+ value: 'true'
+ }
+ ]
+ }
+ });
+
+ beforeEach(waitForAsync(() => {
+ authService = jasmine.createSpyObj('authService', {
+ isAuthenticated: jasmine.createSpy('isAuthenticated'),
+ navigateByUrl: jasmine.createSpy('navigateByUrl')
+ });
+
+ routeData = {
+ dso: createSuccessfulRemoteDataObject(mockItem),
+ };
+
+ routeStub = new ActivatedRouteStub({}, routeData);
+
+ orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
+ isLinkedToOrcid: jasmine.createSpy('isLinkedToOrcid'),
+ linkOrcidByItem: jasmine.createSpy('linkOrcidByItem'),
+ });
+
+ itemDataService = jasmine.createSpyObj('ItemDataService', {
+ findById: jasmine.createSpy('findById')
+ });
+
+ void TestBed.configureTestingModule({
+ imports: [
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useClass: TranslateLoaderMock
+ }
+ }),
+ RouterTestingModule.withRoutes([])
+ ],
+ declarations: [OrcidPageComponent],
+ providers: [
+ { provide: ActivatedRoute, useValue: routeStub },
+ { provide: OrcidAuthService, useValue: orcidAuthService },
+ { provide: AuthService, useValue: authService },
+ { provide: ItemDataService, useValue: itemDataService },
+ { provide: PLATFORM_ID, useValue: 'browser' },
+ ],
+
+ schemas: [NO_ERRORS_SCHEMA]
+ }).compileComponents();
+ }));
+
+ beforeEach(waitForAsync(() => {
+ scheduler = getTestScheduler();
+ fixture = TestBed.createComponent(OrcidPageComponent);
+ comp = fixture.componentInstance;
+ authService.isAuthenticated.and.returnValue(observableOf(true));
+ }));
+
+ describe('whn has no query param', () => {
+ beforeEach(waitForAsync(() => {
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ const btn = fixture.debugElement.queryAll(By.css('[data-test="back-button"]'));
+ const auth = fixture.debugElement.query(By.css('[data-test="orcid-auth"]'));
+ const settings = fixture.debugElement.query(By.css('[data-test="orcid-sync-setting"]'));
+ expect(comp).toBeTruthy();
+ expect(btn.length).toBe(1);
+ expect(auth).toBeTruthy();
+ expect(settings).toBeTruthy();
+ expect(comp.itemId).toBe('test-id');
+ });
+
+ it('should call isLinkedToOrcid', () => {
+ comp.isLinkedToOrcid();
+
+ expect(orcidAuthService.isLinkedToOrcid).toHaveBeenCalledWith(comp.item.value);
+ });
+
+ it('should update item', fakeAsync(() => {
+ itemDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockItemLinkedToOrcid));
+ scheduler.schedule(() => comp.updateItem());
+ scheduler.flush();
+
+ expect(comp.item.value).toEqual(mockItemLinkedToOrcid);
+ }));
+ });
+
+ describe('when query param contains orcid code', () => {
+ beforeEach(waitForAsync(() => {
+ spyOn(comp, 'updateItem').and.callThrough();
+ routeStub.testParams = {
+ code: 'orcid-code'
+ };
+ }));
+
+ describe('and linking to orcid profile is successfully', () => {
+ beforeEach(waitForAsync(() => {
+ orcidAuthService.linkOrcidByItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+ itemDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockItemLinkedToOrcid));
+ fixture.detectChanges();
+ }));
+
+ it('should call linkOrcidByItem', () => {
+ expect(orcidAuthService.linkOrcidByItem).toHaveBeenCalledWith(mockItem, 'orcid-code');
+ expect(comp.updateItem).toHaveBeenCalled();
+ });
+
+ it('should create', () => {
+ const btn = fixture.debugElement.queryAll(By.css('[data-test="back-button"]'));
+ const auth = fixture.debugElement.query(By.css('[data-test="orcid-auth"]'));
+ const settings = fixture.debugElement.query(By.css('[data-test="orcid-sync-setting"]'));
+ expect(comp).toBeTruthy();
+ expect(btn.length).toBe(1);
+ expect(auth).toBeTruthy();
+ expect(settings).toBeTruthy();
+ expect(comp.itemId).toBe('test-id');
+ });
+
+ });
+
+ describe('and linking to orcid profile is failed', () => {
+ beforeEach(waitForAsync(() => {
+ orcidAuthService.linkOrcidByItem.and.returnValue(createFailedRemoteDataObject$());
+ itemDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockItemLinkedToOrcid));
+ fixture.detectChanges();
+ }));
+
+ it('should call linkOrcidByItem', () => {
+ expect(orcidAuthService.linkOrcidByItem).toHaveBeenCalledWith(mockItem, 'orcid-code');
+ expect(comp.updateItem).not.toHaveBeenCalled();
+ });
+
+ it('should create', () => {
+ const btn = fixture.debugElement.queryAll(By.css('[data-test="back-button"]'));
+ const auth = fixture.debugElement.query(By.css('[data-test="orcid-auth"]'));
+ const settings = fixture.debugElement.query(By.css('[data-test="orcid-sync-setting"]'));
+ const error = fixture.debugElement.query(By.css('[data-test="error-box"]'));
+ expect(comp).toBeTruthy();
+ expect(btn.length).toBe(1);
+ expect(error).toBeTruthy();
+ expect(auth).toBeFalsy();
+ expect(settings).toBeFalsy();
+ });
+
+ });
+ });
+});
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
new file mode 100644
index 0000000000..f3dbb569d9
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -0,0 +1,153 @@
+import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
+import { ActivatedRoute, ParamMap, Router } from '@angular/router';
+import { isPlatformBrowser } from '@angular/common';
+
+import { BehaviorSubject, combineLatest } from 'rxjs';
+import { map, take } from 'rxjs/operators';
+
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { getItemPageRoute } from '../item-page-routing-paths';
+import { AuthService } from '../../core/auth/auth.service';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { isNotEmpty } from '../../shared/empty.util';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+
+/**
+ * A component that represents the orcid settings page
+ */
+@Component({
+ selector: 'ds-orcid-page',
+ templateUrl: './orcid-page.component.html',
+ styleUrls: ['./orcid-page.component.scss']
+})
+export class OrcidPageComponent implements OnInit {
+
+ /**
+ * A boolean representing if the connection operation with orcid profile is in progress
+ */
+ connectionStatus: BehaviorSubject = new BehaviorSubject(false);
+
+ /**
+ * The item for which showing the orcid settings
+ */
+ item: BehaviorSubject- = new BehaviorSubject
- (null);
+
+ /**
+ * The item id for which showing the orcid settings
+ */
+ itemId: string;
+
+ /**
+ * A boolean representing if the connection operation with orcid profile is in progress
+ */
+ processingConnection: BehaviorSubject
= new BehaviorSubject(true);
+
+ constructor(
+ @Inject(PLATFORM_ID) private platformId: any,
+ private authService: AuthService,
+ private itemService: ItemDataService,
+ private orcidAuthService: OrcidAuthService,
+ private route: ActivatedRoute,
+ private router: Router
+ ) {
+ }
+
+ /**
+ * Retrieve the item for which showing the orcid settings
+ */
+ ngOnInit(): void {
+ if (isPlatformBrowser(this.platformId)) {
+ const codeParam$ = this.route.queryParamMap.pipe(
+ take(1),
+ map((paramMap: ParamMap) => paramMap.get('code')),
+ );
+
+ const item$ = this.route.data.pipe(
+ map((data) => data.dso as RemoteData- ),
+ redirectOn4xx(this.router, this.authService),
+ getFirstSucceededRemoteDataPayload()
+ );
+
+ combineLatest([codeParam$, item$]).subscribe(([codeParam, item]) => {
+ this.itemId = item.id;
+ /**
+ * Check if code is present in the query param. If so it means this page is loaded after attempting to
+ * link the person to the ORCID profile, otherwise the person is already linked to ORCID profile
+ */
+ if (isNotEmpty(codeParam)) {
+ this.linkProfileToOrcid(item, codeParam);
+ } else {
+ this.item.next(item);
+ this.processingConnection.next(false);
+ this.connectionStatus.next(true);
+ }
+ });
+ }
+ }
+
+ /**
+ * Check if the current item is linked to an ORCID profile.
+ *
+ * @returns the check result
+ */
+ isLinkedToOrcid(): boolean {
+ return this.orcidAuthService.isLinkedToOrcid(this.item.value);
+ }
+
+ /**
+ * Get the route to an item's page
+ */
+ getItemPage(): string {
+ return getItemPageRoute(this.item.value);
+ }
+
+ /**
+ * Retrieve the updated profile item
+ */
+ updateItem(): void {
+ this.clearRouteParams();
+ this.itemService.findById(this.itemId, false).pipe(
+ getFirstCompletedRemoteData()
+ ).subscribe((itemRD: RemoteData
- ) => {
+ if (itemRD.hasSucceeded) {
+ this.item.next(itemRD.payload);
+ }
+ });
+ }
+
+ /**
+ * Link person item to ORCID profile by using the code received after redirect from ORCID.
+ *
+ * @param person The person item to link to ORCID profile
+ * @param code The auth-code received from ORCID
+ */
+ private linkProfileToOrcid(person: Item, code: string) {
+ this.orcidAuthService.linkOrcidByItem(person, code).pipe(
+ getFirstCompletedRemoteData()
+ ).subscribe((profileRD: RemoteData
) => {
+ this.processingConnection.next(false);
+ if (profileRD.hasSucceeded) {
+ this.connectionStatus.next(true);
+ this.updateItem();
+ } else {
+ this.item.next(person);
+ this.connectionStatus.next(false);
+ this.clearRouteParams();
+ }
+ });
+ }
+
+ /**
+ * Update route removing the code from query params
+ * @private
+ */
+ private clearRouteParams(): void {
+ // update route removing the code from query params
+ const redirectUrl = this.router.url.split('?')[0];
+ this.router.navigate([redirectUrl]);
+ }
+}
diff --git a/src/app/item-page/orcid-page/orcid-page.guard.ts b/src/app/item-page/orcid-page/orcid-page.guard.ts
new file mode 100644
index 0000000000..97c528e9ae
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-page.guard.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+
+@Injectable({
+ providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
+ */
+export class OrcidPageGuard extends DsoPageSingleFeatureGuard- {
+ constructor(protected resolver: ItemPageResolver,
+ protected authorizationService: AuthorizationDataService,
+ protected router: Router,
+ protected authService: AuthService) {
+ super(resolver, authorizationService, router, authService);
+ }
+
+ /**
+ * Check administrator authorization rights
+ */
+ getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable
{
+ return observableOf(FeatureID.CanSynchronizeWithORCID);
+ }
+}
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
new file mode 100644
index 0000000000..9358bcf835
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -0,0 +1,51 @@
+;
+ let debugElement: DebugElement;
+ let orcidQueueService: OrcidQueueService;
+ let orcidAuthService: jasmine.SpyObj;
+
+ const testProfileItemId = 'test-owner-id';
+
+ const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
+ bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ metadata: {
+ 'dc.title': [{
+ value: 'test person'
+ }],
+ 'dspace.entity.type': [{
+ 'value': 'Person'
+ }],
+ 'dspace.object.owner': [{
+ 'value': 'test person',
+ 'language': null,
+ 'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
+ 'confidence': 600,
+ 'place': 0
+ }],
+ 'dspace.orcid.authenticated': [{
+ 'value': '2022-06-10T15:15:12.952872',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }],
+ 'dspace.orcid.scope': [{
+ 'value': '/authenticate',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }, {
+ 'value': '/read-limited',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 1
+ }, {
+ 'value': '/activities/update',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 2
+ }, {
+ 'value': '/person/update',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 3
+ }],
+ 'person.identifier.orcid': [{
+ 'value': 'orcid-id',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }]
+ }
+ });
+
+ function orcidQueueElement(id: number) {
+ return Object.assign(new OrcidQueue(), {
+ 'id': id,
+ 'profileItemId': testProfileItemId,
+ 'entityId': `test-entity-${id}`,
+ 'description': `test description ${id}`,
+ 'recordType': 'Publication',
+ 'operation': 'INSERT',
+ 'type': 'orcidqueue',
+ });
+ }
+
+ const orcidQueueElements = [orcidQueueElement(1), orcidQueueElement(2)];
+
+ const orcidQueueServiceSpy = jasmine.createSpyObj('orcidQueueService', ['searchByProfileItemId', 'clearFindByProfileItemRequests']);
+ orcidQueueServiceSpy.searchByProfileItemId.and.returnValue(createSuccessfulRemoteDataObject$>(createPaginatedList(orcidQueueElements)));
+
+ beforeEach(waitForAsync(() => {
+ orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
+ getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl')
+ });
+
+ void TestBed.configureTestingModule({
+ imports: [
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useClass: TranslateLoaderMock
+ }
+ }),
+ RouterTestingModule.withRoutes([])
+ ],
+ declarations: [OrcidQueueComponent],
+ providers: [
+ { provide: OrcidAuthService, useValue: orcidAuthService },
+ { provide: OrcidQueueService, useValue: orcidQueueServiceSpy },
+ { provide: OrcidHistoryDataService, useValue: {} },
+ { provide: PaginationService, useValue: new PaginationServiceStub() },
+ { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+ ],
+ schemas: [NO_ERRORS_SCHEMA]
+ }).compileComponents();
+
+ orcidQueueService = TestBed.inject(OrcidQueueService);
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(OrcidQueueComponent);
+ component = fixture.componentInstance;
+ component.item = mockItemLinkedToOrcid;
+ debugElement = fixture.debugElement;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should show the ORCID queue elements', () => {
+ const table = debugElement.queryAll(By.css('[data-test="orcidQueueElementRow"]'));
+ expect(table.length).toBe(2);
+ });
+
+});
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
new file mode 100644
index 0000000000..99ba33ee82
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -0,0 +1,302 @@
+import { Component, Input, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
+
+import { TranslateService } from '@ngx-translate/core';
+import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
+import { debounceTime, distinctUntilChanged, switchMap, tap } from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
+import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
+import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { AlertType } from '../../../shared/alert/aletr-type';
+import { Item } from '../../../core/shared/item.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+
+@Component({
+ selector: 'ds-orcid-queue',
+ templateUrl: './orcid-queue.component.html',
+ styleUrls: ['./orcid-queue.component.scss']
+})
+export class OrcidQueueComponent implements OnInit, OnDestroy {
+
+ /**
+ * The item for which showing the orcid settings
+ */
+ @Input() item: Item;
+
+ /**
+ * Pagination config used to display the list
+ */
+ public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+ id: 'oqp',
+ pageSize: 5
+ });
+
+ /**
+ * A boolean representing if results are loading
+ */
+ public processing$ = new BehaviorSubject(false);
+
+ /**
+ * A list of orcid queue records
+ */
+ private list$: BehaviorSubject>> = new BehaviorSubject>>({} as any);
+
+ /**
+ * The AlertType enumeration
+ * @type {AlertType}
+ */
+ AlertTypeEnum = AlertType;
+
+ /**
+ * Array to track all subscriptions and unsubscribe them onDestroy
+ * @type {Array}
+ */
+ private subs: Subscription[] = [];
+
+ constructor(private orcidAuthService: OrcidAuthService,
+ private orcidQueueService: OrcidQueueService,
+ protected translateService: TranslateService,
+ private paginationService: PaginationService,
+ private notificationsService: NotificationsService,
+ private orcidHistoryService: OrcidHistoryDataService,
+ ) {
+ }
+
+ ngOnInit(): void {
+ this.updateList();
+ }
+
+ ngOnChanges(changes: SimpleChanges): void {
+ if (!changes.item.isFirstChange() && changes.item.currentValue !== changes.item.previousValue) {
+ this.updateList();
+ }
+ }
+
+ /**
+ * Retrieve queue list
+ */
+ updateList() {
+ this.subs.push(
+ this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions).pipe(
+ debounceTime(100),
+ distinctUntilChanged(),
+ tap(() => this.processing$.next(true)),
+ switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByProfileItemId(this.item.id, config, false)),
+ getFirstCompletedRemoteData()
+ ).subscribe((result: RemoteData>) => {
+ this.processing$.next(false);
+ this.list$.next(result);
+ this.orcidQueueService.clearFindByProfileItemRequests();
+ })
+ );
+ }
+
+ /**
+ * Return the list of orcid queue records
+ */
+ getList(): Observable>> {
+ return this.list$.asObservable();
+ }
+
+ /**
+ * Return the icon class for the queue object type
+ *
+ * @param orcidQueue The OrcidQueue object
+ */
+ getIconClass(orcidQueue: OrcidQueue): string {
+ if (!orcidQueue.recordType) {
+ return 'fa fa-user';
+ }
+ switch (orcidQueue.recordType.toLowerCase()) {
+ case 'publication':
+ return 'fas fa-book';
+ case 'project':
+ return 'fas fa-wallet';
+ case 'education':
+ return 'fas fa-school';
+ case 'affiliation':
+ return 'fas fa-university';
+ case 'country':
+ return 'fas fa-globe-europe';
+ case 'external_ids':
+ case 'researcher_urls':
+ return 'fas fa-external-link-alt';
+ default:
+ return 'fa fa-user';
+ }
+ }
+
+ /**
+ * Return the icon tooltip message for the queue object type
+ *
+ * @param orcidQueue The OrcidQueue object
+ */
+ getIconTooltip(orcidQueue: OrcidQueue): string {
+ if (!orcidQueue.recordType) {
+ return '';
+ }
+
+ return 'person.page.orcid.sync-queue.tooltip.' + orcidQueue.recordType.toLowerCase();
+ }
+
+ /**
+ * Return the icon tooltip message for the queue object operation
+ *
+ * @param orcidQueue The OrcidQueue object
+ */
+ getOperationTooltip(orcidQueue: OrcidQueue): string {
+ if (!orcidQueue.operation) {
+ return '';
+ }
+
+ return 'person.page.orcid.sync-queue.tooltip.' + orcidQueue.operation.toLowerCase();
+ }
+
+ /**
+ * Return the icon class for the queue object operation
+ *
+ * @param orcidQueue The OrcidQueue object
+ */
+ getOperationClass(orcidQueue: OrcidQueue): string {
+
+ if (!orcidQueue.operation) {
+ return '';
+ }
+
+ switch (orcidQueue.operation.toLowerCase()) {
+ case 'insert':
+ return 'fas fa-plus';
+ case 'update':
+ return 'fas fa-edit';
+ case 'delete':
+ return 'fas fa-trash-alt';
+ default:
+ return '';
+ }
+ }
+
+ /**
+ * Discard a queue entry from the synchronization
+ *
+ * @param orcidQueue The OrcidQueue object to discard
+ */
+ discardEntry(orcidQueue: OrcidQueue) {
+ this.processing$.next(true);
+ this.subs.push(this.orcidQueueService.deleteById(orcidQueue.id).pipe(
+ getFirstCompletedRemoteData()
+ ).subscribe((remoteData) => {
+ this.processing$.next(false);
+ if (remoteData.isSuccess) {
+ this.notificationsService.success(this.translateService.get('person.page.orcid.sync-queue.discard.success'));
+ this.updateList();
+ } else {
+ this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.discard.error'));
+ }
+ }));
+ }
+
+ /**
+ * Send a queue entry to orcid for the synchronization
+ *
+ * @param orcidQueue The OrcidQueue object to synchronize
+ */
+ send(orcidQueue: OrcidQueue) {
+ this.processing$.next(true);
+ this.subs.push(this.orcidHistoryService.sendToORCID(orcidQueue).pipe(
+ getFirstCompletedRemoteData()
+ ).subscribe((remoteData) => {
+ this.processing$.next(false);
+ if (remoteData.isSuccess) {
+ this.handleOrcidHistoryRecordCreation(remoteData.payload);
+ } else if (remoteData.statusCode === 422) {
+ this.handleValidationErrors(remoteData);
+ } else {
+ this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.error'));
+ }
+ }));
+ }
+
+
+ /**
+ * Return the error message for Unauthorized response
+ * @private
+ */
+ private getUnauthorizedErrorContent(): Observable {
+ return this.orcidAuthService.getOrcidAuthorizeUrl(this.item).pipe(
+ switchMap((authorizeUrl) => this.translateService.get(
+ 'person.page.orcid.sync-queue.send.unauthorized-error.content',
+ { orcid: authorizeUrl }
+ ))
+ );
+ }
+
+ /**
+ * Manage notification by response
+ * @private
+ */
+ private handleOrcidHistoryRecordCreation(orcidHistory: OrcidHistory) {
+ switch (orcidHistory.status) {
+ case 200:
+ case 201:
+ case 204:
+ this.notificationsService.success(this.translateService.get('person.page.orcid.sync-queue.send.success'));
+ this.updateList();
+ break;
+ case 400:
+ this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.bad-request-error'), null, { timeOut: 0 });
+ break;
+ case 401:
+ combineLatest([
+ this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.title'),
+ this.getUnauthorizedErrorContent()],
+ ).subscribe(([title, content]) => {
+ this.notificationsService.error(title, content, { timeOut: 0 }, true);
+ });
+ break;
+ case 404:
+ this.notificationsService.warning(this.translateService.get('person.page.orcid.sync-queue.send.not-found-warning'));
+ break;
+ case 409:
+ this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.conflict-error'), null, { timeOut: 0 });
+ break;
+ default:
+ this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.error'), null, { timeOut: 0 });
+ }
+ }
+
+ /**
+ * Manage validation errors
+ * @private
+ */
+ private handleValidationErrors(remoteData: RemoteData) {
+ const translations = [this.translateService.get('person.page.orcid.sync-queue.send.validation-error')];
+ const errorMessage = remoteData.errorMessage;
+ if (errorMessage && errorMessage.indexOf('Error codes:') > 0) {
+ errorMessage.substring(errorMessage.indexOf(':') + 1).trim().split(',')
+ .forEach((error) => translations.push(this.translateService.get('person.page.orcid.sync-queue.send.validation-error.' + error)));
+ }
+ combineLatest(translations).subscribe((messages) => {
+ const title = messages.shift();
+ const content = ';
+ let scheduler: TestScheduler;
+ let researcherProfileService: jasmine.SpyObj;
+ let notificationsService;
+ let formGroup: FormGroup;
+
+ const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
+ id: 'test-id',
+ visible: true,
+ type: 'profile',
+ _links: {
+ item: {
+ href: 'https://rest.api/rest/api/profiles/test-id/item'
+ },
+ self: {
+ href: 'https://rest.api/rest/api/profiles/test-id'
+ },
+ }
+ });
+
+ const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
+ bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+ metadata: {
+ 'dc.title': [{
+ value: 'test person'
+ }],
+ 'dspace.entity.type': [{
+ 'value': 'Person'
+ }],
+ 'dspace.object.owner': [{
+ 'value': 'test person',
+ 'language': null,
+ 'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
+ 'confidence': 600,
+ 'place': 0
+ }],
+ 'dspace.orcid.authenticated': [{
+ 'value': '2022-06-10T15:15:12.952872',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }],
+ 'dspace.orcid.scope': [{
+ 'value': '/authenticate',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }, {
+ 'value': '/read-limited',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 1
+ }, {
+ 'value': '/activities/update',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 2
+ }, {
+ 'value': '/person/update',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 3
+ }],
+ 'dspace.orcid.sync-mode': [{
+ 'value': 'MANUAL',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }],
+ 'dspace.orcid.sync-profile': [{
+ 'value': 'BIOGRAPHICAL',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }, {
+ 'value': 'IDENTIFIERS',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 1
+ }],
+ 'dspace.orcid.sync-publications': [{
+ 'value': 'ALL',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }],
+ 'person.identifier.orcid': [{
+ 'value': 'orcid-id',
+ 'language': null,
+ 'authority': null,
+ 'confidence': -1,
+ 'place': 0
+ }]
+ }
+ });
+
+ beforeEach(waitForAsync(() => {
+ researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+ findByRelatedItem: jasmine.createSpy('findByRelatedItem'),
+ updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations')
+ });
+
+ void TestBed.configureTestingModule({
+ imports: [
+ FormsModule,
+ NgbAccordionModule,
+ ReactiveFormsModule,
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useClass: TranslateLoaderMock
+ }
+ }),
+ RouterTestingModule.withRoutes([])
+ ],
+ declarations: [OrcidSyncSettingsComponent],
+ providers: [
+ { provide: NotificationsService, useClass: NotificationsServiceStub },
+ { provide: ResearcherProfileService, useValue: researcherProfileService }
+ ],
+ schemas: [NO_ERRORS_SCHEMA]
+ }).overrideComponent(OrcidSyncSettingsComponent, {
+ set: { changeDetection: ChangeDetectionStrategy.Default }
+ }).compileComponents();
+ }));
+
+ beforeEach(waitForAsync(() => {
+ scheduler = getTestScheduler();
+ fixture = TestBed.createComponent(OrcidSyncSettingsComponent);
+ comp = fixture.componentInstance;
+ comp.item = mockItemLinkedToOrcid;
+ fixture.detectChanges();
+ }));
+
+ it('should create cards properly', () => {
+ const modes = fixture.debugElement.query(By.css('[data-test="sync-mode"]'));
+ const publication = fixture.debugElement.query(By.css('[data-test="sync-mode-publication"]'));
+ const funding = fixture.debugElement.query(By.css('[data-test="sync-mode-funding"]'));
+ const preferences = fixture.debugElement.query(By.css('[data-test="profile-preferences"]'));
+ expect(modes).toBeTruthy();
+ expect(publication).toBeTruthy();
+ expect(funding).toBeTruthy();
+ expect(preferences).toBeTruthy();
+ });
+
+ it('should init sync modes properly', () => {
+ expect(comp.currentSyncMode).toBe('MANUAL');
+ expect(comp.currentSyncPublications).toBe('ALL');
+ expect(comp.currentSyncFunding).toBe('DISABLED');
+ });
+
+ describe('form submit', () => {
+ beforeEach(() => {
+ scheduler = getTestScheduler();
+ notificationsService = (comp as any).notificationsService;
+ formGroup = new FormGroup({
+ syncMode: new FormControl('MANUAL'),
+ syncFundings: new FormControl('ALL'),
+ syncPublications: new FormControl('ALL'),
+ syncProfile_BIOGRAPHICAL: new FormControl(true),
+ syncProfile_IDENTIFIERS: new FormControl(true),
+ });
+ spyOn(comp.settingsUpdated, 'emit');
+ });
+
+ it('should call updateByOrcidOperations properly', () => {
+ researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+ researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+ const expectedOps: Operation[] = [
+ {
+ path: '/orcid/mode',
+ op: 'replace',
+ value: 'MANUAL'
+ }, {
+ path: '/orcid/publications',
+ op: 'replace',
+ value: 'ALL'
+ }, {
+ path: '/orcid/fundings',
+ op: 'replace',
+ value: 'ALL'
+ }, {
+ path: '/orcid/profile',
+ op: 'replace',
+ value: 'BIOGRAPHICAL,IDENTIFIERS'
+ }
+ ];
+
+ scheduler.schedule(() => comp.onSubmit(formGroup));
+ scheduler.flush();
+
+ expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(mockResearcherProfile, expectedOps);
+ });
+
+ it('should show notification on success', () => {
+ researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+ researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+
+ scheduler.schedule(() => comp.onSubmit(formGroup));
+ scheduler.flush();
+
+ expect(notificationsService.success).toHaveBeenCalled();
+ expect(comp.settingsUpdated.emit).toHaveBeenCalled();
+ });
+
+ it('should show notification on error', () => {
+ researcherProfileService.findByRelatedItem.and.returnValue(createFailedRemoteDataObject$());
+
+ scheduler.schedule(() => comp.onSubmit(formGroup));
+ scheduler.flush();
+
+ expect(notificationsService.error).toHaveBeenCalled();
+ expect(comp.settingsUpdated.emit).not.toHaveBeenCalled();
+ });
+
+ it('should show notification on error', () => {
+ researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+ researcherProfileService.updateByOrcidOperations.and.returnValue(createFailedRemoteDataObject$());
+
+ scheduler.schedule(() => comp.onSubmit(formGroup));
+ scheduler.flush();
+
+ expect(notificationsService.error).toHaveBeenCalled();
+ expect(comp.settingsUpdated.emit).not.toHaveBeenCalled();
+ });
+ });
+
+});
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
new file mode 100644
index 0000000000..6e8b0c8216
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -0,0 +1,196 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+
+import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import { of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+
+@Component({
+ selector: 'ds-orcid-sync-setting',
+ templateUrl: './orcid-sync-settings.component.html',
+ styleUrls: ['./orcid-sync-settings.component.scss']
+})
+export class OrcidSyncSettingsComponent implements OnInit {
+
+ /**
+ * The item for which showing the orcid settings
+ */
+ @Input() item: Item;
+
+ /**
+ * The prefix used for i18n keys
+ */
+ messagePrefix = 'person.page.orcid';
+
+ /**
+ * The current synchronization mode
+ */
+ currentSyncMode: string;
+
+ /**
+ * The current synchronization mode for publications
+ */
+ currentSyncPublications: string;
+
+ /**
+ * The current synchronization mode for funding
+ */
+ currentSyncFunding: string;
+
+ /**
+ * The synchronization options
+ */
+ syncModes: { value: string, label: string }[];
+
+ /**
+ * The synchronization options for publications
+ */
+ syncPublicationOptions: { value: string, label: string }[];
+
+ /**
+ * The synchronization options for funding
+ */
+ syncFundingOptions: { value: string, label: string }[];
+
+ /**
+ * The profile synchronization options
+ */
+ syncProfileOptions: { value: string, label: string, checked: boolean }[];
+
+ /**
+ * An event emitted when settings are updated
+ */
+ @Output() settingsUpdated: EventEmitter = new EventEmitter();
+
+ constructor(private researcherProfileService: ResearcherProfileService,
+ private notificationsService: NotificationsService,
+ private translateService: TranslateService) {
+ }
+
+ /**
+ * Init orcid settings form
+ */
+ ngOnInit() {
+ this.syncModes = [
+ {
+ label: this.messagePrefix + '.synchronization-mode.batch',
+ value: 'BATCH'
+ },
+ {
+ label: this.messagePrefix + '.synchronization-mode.manual',
+ value: 'MANUAL'
+ }
+ ];
+
+ this.syncPublicationOptions = ['DISABLED', 'ALL']
+ .map((value) => {
+ return {
+ label: this.messagePrefix + '.sync-publications.' + value.toLowerCase(),
+ value: value,
+ };
+ });
+
+ this.syncFundingOptions = ['DISABLED', 'ALL']
+ .map((value) => {
+ return {
+ label: this.messagePrefix + '.sync-fundings.' + value.toLowerCase(),
+ value: value,
+ };
+ });
+
+ const syncProfilePreferences = this.item.allMetadataValues('dspace.orcid.sync-profile');
+
+ this.syncProfileOptions = ['BIOGRAPHICAL', 'IDENTIFIERS']
+ .map((value) => {
+ return {
+ label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
+ value: value,
+ checked: syncProfilePreferences.includes(value)
+ };
+ });
+
+ this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
+ this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED');
+ this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED');
+ }
+
+ /**
+ * Generate path operations to save orcid synchronization preferences
+ *
+ * @param form The form group
+ */
+ onSubmit(form: FormGroup): void {
+ const operations: Operation[] = [];
+ this.fillOperationsFor(operations, '/orcid/mode', form.value.syncMode);
+ this.fillOperationsFor(operations, '/orcid/publications', form.value.syncPublications);
+ this.fillOperationsFor(operations, '/orcid/fundings', form.value.syncFundings);
+
+ const syncProfileValue = this.syncProfileOptions
+ .map((syncProfileOption => syncProfileOption.value))
+ .filter((value) => form.value['syncProfile_' + value])
+ .join(',');
+
+ this.fillOperationsFor(operations, '/orcid/profile', syncProfileValue);
+
+ if (operations.length === 0) {
+ return;
+ }
+
+ this.researcherProfileService.findByRelatedItem(this.item).pipe(
+ getFirstCompletedRemoteData(),
+ switchMap((profileRD: RemoteData) => {
+ if (profileRD.hasSucceeded) {
+ return this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations).pipe(
+ getFirstCompletedRemoteData()
+ );
+ } else {
+ return of(profileRD);
+ }
+ }),
+ ).subscribe((remoteData: RemoteData) => {
+ if (remoteData.isSuccess) {
+ this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
+ this.settingsUpdated.emit();
+ } else {
+ this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
+ }
+ });
+ }
+
+ /**
+ * Retrieve setting saved in the item's metadata
+ *
+ * @param metadataField The metadata name that contains setting
+ * @param allowedValues The allowed values
+ * @param defaultValue The default value
+ * @private
+ */
+ private getCurrentPreference(metadataField: string, allowedValues: string[], defaultValue: string): string {
+ const currentPreference = this.item.firstMetadataValue(metadataField);
+ return (currentPreference && allowedValues.includes(currentPreference)) ? currentPreference : defaultValue;
+ }
+
+ /**
+ * Generate a replace patch operation
+ *
+ * @param operations
+ * @param path
+ * @param currentValue
+ */
+ private fillOperationsFor(operations: Operation[], path: string, currentValue: string): void {
+ operations.push({
+ path: path,
+ op: 'replace',
+ value: currentValue
+ });
+ }
+
+}
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index afab4e32eb..6e0db386db 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,15 +1,14 @@
-import { map } from 'rxjs/operators';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
import { ItemDataService } from '../../core/data/item-data.service';
import { RemoteData } from '../../core/data/remote-data';
-
import { Item } from '../../core/shared/item.model';
-
import { fadeInOut } from '../../shared/animations/fade';
-import { getAllSucceededRemoteDataPayload} from '../../core/shared/operators';
+import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
import { ViewMode } from '../../core/shared/view-mode.model';
import { AuthService } from '../../core/auth/auth.service';
import { getItemPageRoute } from '../item-page-routing-paths';
@@ -56,13 +55,16 @@ export class ItemPageComponent implements OnInit {
*/
isAdmin$: Observable;
+ itemUrl: string;
+
constructor(
protected route: ActivatedRoute,
private router: Router,
private items: ItemDataService,
private authService: AuthService,
private authorizationService: AuthorizationDataService
- ) { }
+ ) {
+ }
/**
* Initialize instance variables
@@ -78,5 +80,6 @@ export class ItemPageComponent implements OnInit {
);
this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+
}
}
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 96454914cd..d83202ce12 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -12,6 +12,9 @@
{{'publication.page.titleprefix' | translate}}
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
index 761849f232..a623a34b15 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
@@ -1,6 +1,6 @@
import { HttpClient } from '@angular/common/http';
import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Store } from '@ngrx/store';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
@@ -17,7 +17,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
import { Bitstream } from '../../../../core/shared/bitstream.model';
import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
import { Item } from '../../../../core/shared/item.model';
-import { MetadataMap } from '../../../../core/shared/metadata.models';
+import { MetadataMap } from '../../../../core/shared/metadata.models';
import { UUIDService } from '../../../../core/shared/uuid.service';
import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
@@ -26,22 +26,16 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s
import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
import {
- createRelationshipsObservable,
- iiifEnabled,
- iiifSearchEnabled, mockRouteService
+ createRelationshipsObservable, getIIIFEnabled, getIIIFSearchEnabled, mockRouteService
} from '../shared/item.component.spec';
import { PublicationComponent } from './publication.component';
import { createPaginatedList } from '../../../../shared/testing/utils.test';
import { RouteService } from '../../../../core/services/route.service';
-
-const iiifEnabledMap: MetadataMap = {
- 'dspace.iiif.enabled': [iiifEnabled],
-};
-
-const iiifEnabledWithSearchMap: MetadataMap = {
- 'dspace.iiif.enabled': [iiifEnabled],
- 'iiif.search.enabled': [iiifSearchEnabled],
-};
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
const noMetadata = new MetadataMap();
@@ -64,12 +58,15 @@ describe('PublicationComponent', () => {
}
};
TestBed.configureTestingModule({
- imports: [TranslateModule.forRoot({
- loader: {
- provide: TranslateLoader,
- useClass: TranslateLoaderMock
- }
- })],
+ imports: [
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useClass: TranslateLoaderMock
+ }
+ }),
+ RouterTestingModule,
+ ],
declarations: [PublicationComponent, GenericItemPageFieldComponent, TruncatePipe],
providers: [
{ provide: ItemDataService, useValue: {} },
@@ -85,18 +82,23 @@ describe('PublicationComponent', () => {
{ provide: HttpClient, useValue: {} },
{ provide: DSOChangeAnalyzer, useValue: {} },
{ provide: DefaultChangeAnalyzer, useValue: {} },
+ { provide: VersionHistoryDataService, useValue: {} },
+ { provide: VersionDataService, useValue: {} },
{ provide: BitstreamDataService, useValue: mockBitstreamDataService },
+ { provide: WorkspaceitemDataService, useValue: {} },
+ { provide: SearchService, useValue: {} },
{ provide: RouteService, useValue: mockRouteService }
],
schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(PublicationComponent, {
- set: { changeDetection: ChangeDetectionStrategy.Default }
- }).compileComponents();
+ set: {changeDetection: ChangeDetectionStrategy.Default}
+ });
}));
describe('default view', () => {
beforeEach(waitForAsync(() => {
+ TestBed.compileComponents();
fixture = TestBed.createComponent(PublicationComponent);
comp = fixture.componentInstance;
comp.object = getItem(noMetadata);
@@ -137,6 +139,42 @@ describe('PublicationComponent', () => {
describe('with IIIF viewer', () => {
beforeEach(waitForAsync(() => {
+ const iiifEnabledMap: MetadataMap = {
+ 'dspace.iiif.enabled': [getIIIFEnabled(true)],
+ 'iiif.search.enabled': [getIIIFSearchEnabled(false)],
+ };
+ TestBed.compileComponents();
+ fixture = TestBed.createComponent(PublicationComponent);
+ comp = fixture.componentInstance;
+ comp.object = getItem(iiifEnabledMap);
+ fixture.detectChanges();
+ }));
+
+ it('should contain an iiif viewer component', () => {
+ const fields = fixture.debugElement.queryAll(By.css('ds-mirador-viewer'));
+ expect(fields.length).toBeGreaterThanOrEqual(1);
+ });
+ it('should not retrieve the query term for previous route', fakeAsync((): void => {
+ //tick(10)
+ expect(comp.iiifQuery$).toBeFalsy();
+ }));
+
+ });
+
+ describe('with IIIF viewer and search', () => {
+
+ beforeEach(waitForAsync(() => {
+ const localMockRouteService = {
+ getPreviousUrl(): Observable
+
+
+{{'person.orcid.registry.auth' | translate}}
+
+
+ {{ 'person.page.orcid.remove-orcid-message' | translate}}
+
+
+
+
+
+
+
+
+ {{ 'person.page.orcid.granted-authorizations'| translate }}
+
+
+
+
+ -
+
- + {{getAuthorizationDescription(auth) | translate}} + +
+
+
+
+ {{ 'person.page.orcid.missing-authorizations'| translate }}
+
+
+
+
+ {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+
+
+ {{'person.page.orcid.missing-authorizations-message' | translate}}
+
+
+ -
+
- + {{getAuthorizationDescription(auth) | translate }} + +
+
+
+
+
+
+
+
+
+ 
+
+
+ {{ getOrcidNotLinkedMessage() | async }}
+
+
+
+
+
+
+
+
+
+
+
+ {{'person.page.orcid.link.error.message' | translate}}
+
+
+
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.scss b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
new file mode 100644
index 0000000000..9107ac34ff
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -0,0 +1,151 @@
+import { OrcidQueueComponent } from './orcid-queue.component';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { RouterTestingModule } from '@angular/router/testing';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
+import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { By } from '@angular/platform-browser';
+import { Item } from '../../../core/shared/item.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+
+describe('OrcidQueueComponent test suite', () => {
+ let component: OrcidQueueComponent;
+ let fixture: ComponentFixture
+
+ {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
+
+
+
+
+
+{{ 'person.orcid.registry.queue' | translate }}
+ +
+
+
+
+
+ | {{'person.page.orcid.sync-queue.table.header.type' | translate}} | +{{'person.page.orcid.sync-queue.table.header.description' | translate}} | +{{'person.page.orcid.sync-queue.table.header.action' | translate}} | +
|---|---|---|
| + + | ++ {{ entry.description }} + | +
+
+
+
+
+ |
+
- ' + messages.map((message) => `
- ${message} `).join('') + '
+
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.scss b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
new file mode 100644
index 0000000000..4312d35be9
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -0,0 +1,261 @@
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
+import { By } from '@angular/platform-browser';
+
+import { getTestScheduler } from 'jasmine-marbles';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import { TestScheduler } from 'rxjs/testing';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+
+import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { Item } from '../../../core/shared/item.model';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { OrcidSyncSettingsComponent } from './orcid-sync-settings.component';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+
+describe('OrcidAuthComponent test suite', () => {
+ let comp: OrcidSyncSettingsComponent;
+ let fixture: ComponentFixture{{'person.orcid.sync.setting' | translate}}
+ +
+
+
+
+ +
diff --git a/src/app/page-error/page-error.component.scss b/src/app/page-error/page-error.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/page-error/page-error.component.spec.ts b/src/app/page-error/page-error.component.spec.ts
new file mode 100644
index 0000000000..0f876f3196
--- /dev/null
+++ b/src/app/page-error/page-error.component.spec.ts
@@ -0,0 +1,48 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { PageErrorComponent } from './page-error.component';
+import { ActivatedRoute } from '@angular/router';
+import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
+import { of as observableOf } from 'rxjs';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
+
+describe('PageErrorComponent', () => {
+ let component: PageErrorComponent;
+ let fixture: ComponentFixture{{status}}
+{{"error-page.description." + status | translate}}
++
{{"error-page." + code | translate}}
++ +
{{"500.help" | translate}}
- {{"500.link.home-page" | translate}} + {{"500.link.home-page" | translate}}
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html new file mode 100644 index 0000000000..eec9f437f1 --- /dev/null +++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html @@ -0,0 +1,37 @@ +
+
+
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
new file mode 100644
index 0000000000..2843322818
--- /dev/null
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
@@ -0,0 +1,223 @@
+import { ActivatedRoute, Router } from '@angular/router';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+import { of } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { ProfileClaimItemModalComponent } from './profile-claim-item-modal.component';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { Item } from '../../core/shared/item.model';
+import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { RouterStub } from '../../shared/testing/router.stub';
+
+describe('ProfileClaimItemModalComponent', () => {
+ let component: ProfileClaimItemModalComponent;
+ let fixture: ComponentFixture{{'dso-selector.claim.item.head' | translate}}
+ +
+
+
+
+ {{'dso-selector.claim.item.body' | translate}}
+
+
+
+
+
+
+
+
+
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
new file mode 100644
index 0000000000..aa0d1d187d
--- /dev/null
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
@@ -0,0 +1,183 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { of as observableOf } from 'rxjs';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+
+describe('ProfilePageResearcherFormComponent', () => {
+
+ let component: ProfilePageResearcherFormComponent;
+ let fixture: ComponentFixture
+
+ {{'researcher.profile.associated' | translate}}
+
+ {{'researcher.profile.status' | translate}}
+
+
+
+ {{'researcher.profile.not.associated' | translate}}
+{{FORM_PREFIX + 'info' | translate}}
+
-
+
{{'profile.head' | translate}}
+{{'profile.head' | translate}}
+
+
+ {{'profile.card.researcher' | translate}}
+
+
+
+
+ {{'profile.card.identify' | translate}}
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 46f83c964b..6893ac2437 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -11,16 +11,18 @@ import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
import { EPersonDataService } from '../core/eperson/eperson-data.service';
import { NotificationsService } from '../shared/notifications/notifications.service';
import { authReducer } from '../core/auth/auth.reducer';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
import { createPaginatedList } from '../shared/testing/utils.test';
import { BehaviorSubject, of as observableOf } from 'rxjs';
import { AuthService } from '../core/auth/auth.service';
import { RestResponse } from '../core/cache/response.models';
import { provideMockStore } from '@ngrx/store/testing';
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { getTestScheduler } from 'jasmine-marbles';
+import { cold, getTestScheduler } from 'jasmine-marbles';
import { By } from '@angular/platform-browser';
import { EmptySpecialGroupDataMock$, SpecialGroupDataMock$ } from '../shared/testing/special-group.mock';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
describe('ProfilePageComponent', () => {
let component: ProfilePageComponent;
@@ -29,16 +31,28 @@ describe('ProfilePageComponent', () => {
let initialState: any;
let authService;
+ let authorizationService;
let epersonService;
let notificationsService;
+ let configurationService;
const canChangePassword = new BehaviorSubject(true);
+ const validConfiguration = Object.assign(new ConfigurationProperty(), {
+ name: 'researcher-profile.entity-type',
+ values: [
+ 'Person'
+ ]
+ });
+ const emptyConfiguration = Object.assign(new ConfigurationProperty(), {
+ name: 'researcher-profile.entity-type',
+ values: []
+ });
function init() {
user = Object.assign(new EPerson(), {
id: 'userId',
groups: createSuccessfulRemoteDataObject$(createPaginatedList([])),
- _links: {self: {href: 'test.com/uuid/1234567654321'}}
+ _links: { self: { href: 'test.com/uuid/1234567654321' } }
});
initialState = {
core: {
@@ -53,7 +67,7 @@ describe('ProfilePageComponent', () => {
}
}
};
-
+ authorizationService = jasmine.createSpyObj('authorizationService', { isAuthorized: canChangePassword });
authService = jasmine.createSpyObj('authService', {
getAuthenticatedUserFromStore: observableOf(user),
getSpecialGroupsFromAuthStatus: SpecialGroupDataMock$
@@ -67,6 +81,9 @@ describe('ProfilePageComponent', () => {
error: {},
warning: {}
});
+ configurationService = jasmine.createSpyObj('configurationDataService', {
+ findByPropertyName: jasmine.createSpy('findByPropertyName')
+ });
}
beforeEach(waitForAsync(() => {
@@ -82,7 +99,8 @@ describe('ProfilePageComponent', () => {
{ provide: EPersonDataService, useValue: epersonService },
{ provide: NotificationsService, useValue: notificationsService },
{ provide: AuthService, useValue: authService },
- { provide: AuthorizationDataService, useValue: jasmine.createSpyObj('authorizationService', { isAuthorized: canChangePassword }) },
+ { provide: ConfigurationDataService, useValue: configurationService },
+ { provide: AuthorizationDataService, useValue: authorizationService },
provideMockStore({ initialState }),
],
schemas: [NO_ERRORS_SCHEMA]
@@ -92,151 +110,157 @@ describe('ProfilePageComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(ProfilePageComponent);
component = fixture.componentInstance;
- fixture.detectChanges();
});
- describe('updateProfile', () => {
- describe('when the metadata form returns false and the security form returns true', () => {
- beforeEach(() => {
- component.metadataForm = jasmine.createSpyObj('metadataForm', {
- updateProfile: false
+ describe('', () => {
+
+ beforeEach(() => {
+ configurationService.findByPropertyName.and.returnValue(createSuccessfulRemoteDataObject$(validConfiguration));
+ fixture.detectChanges();
+ });
+
+ describe('updateProfile', () => {
+ describe('when the metadata form returns false and the security form returns true', () => {
+ beforeEach(() => {
+ component.metadataForm = jasmine.createSpyObj('metadataForm', {
+ updateProfile: false
+ });
+ spyOn(component, 'updateSecurity').and.returnValue(true);
+ component.updateProfile();
});
- spyOn(component, 'updateSecurity').and.returnValue(true);
- component.updateProfile();
- });
- it('should not display a warning', () => {
- expect(notificationsService.warning).not.toHaveBeenCalled();
- });
- });
-
- describe('when the metadata form returns true and the security form returns false', () => {
- beforeEach(() => {
- component.metadataForm = jasmine.createSpyObj('metadataForm', {
- updateProfile: true
+ it('should not display a warning', () => {
+ expect(notificationsService.warning).not.toHaveBeenCalled();
});
- component.updateProfile();
});
- it('should not display a warning', () => {
- expect(notificationsService.warning).not.toHaveBeenCalled();
- });
- });
-
- describe('when the metadata form returns true and the security form returns true', () => {
- beforeEach(() => {
- component.metadataForm = jasmine.createSpyObj('metadataForm', {
- updateProfile: true
+ describe('when the metadata form returns true and the security form returns false', () => {
+ beforeEach(() => {
+ component.metadataForm = jasmine.createSpyObj('metadataForm', {
+ updateProfile: true
+ });
+ component.updateProfile();
});
- component.updateProfile();
- });
- it('should not display a warning', () => {
- expect(notificationsService.warning).not.toHaveBeenCalled();
- });
- });
-
- describe('when the metadata form returns false and the security form returns false', () => {
- beforeEach(() => {
- component.metadataForm = jasmine.createSpyObj('metadataForm', {
- updateProfile: false
+ it('should not display a warning', () => {
+ expect(notificationsService.warning).not.toHaveBeenCalled();
});
- component.updateProfile();
});
- it('should display a warning', () => {
- expect(notificationsService.warning).toHaveBeenCalled();
- });
- });
- });
+ describe('when the metadata form returns true and the security form returns true', () => {
+ beforeEach(() => {
+ component.metadataForm = jasmine.createSpyObj('metadataForm', {
+ updateProfile: true
+ });
+ component.updateProfile();
+ });
- describe('updateSecurity', () => {
- describe('when no password value present', () => {
- let result;
-
- beforeEach(() => {
- component.setPasswordValue('');
-
- result = component.updateSecurity();
+ it('should not display a warning', () => {
+ expect(notificationsService.warning).not.toHaveBeenCalled();
+ });
});
- it('should return false', () => {
- expect(result).toEqual(false);
- });
+ describe('when the metadata form returns false and the security form returns false', () => {
+ beforeEach(() => {
+ component.metadataForm = jasmine.createSpyObj('metadataForm', {
+ updateProfile: false
+ });
+ component.updateProfile();
+ });
- it('should not call epersonService.patch', () => {
- expect(epersonService.patch).not.toHaveBeenCalled();
+ it('should display a warning', () => {
+ expect(notificationsService.warning).toHaveBeenCalled();
+ });
});
});
- describe('when password is filled in, but the password is invalid', () => {
- let result;
+ describe('updateSecurity', () => {
+ describe('when no password value present', () => {
+ let result;
- beforeEach(() => {
- component.setPasswordValue('test');
- component.setInvalid(true);
- result = component.updateSecurity();
+ beforeEach(() => {
+ component.setPasswordValue('');
+
+ result = component.updateSecurity();
+ });
+
+ it('should return false', () => {
+ expect(result).toEqual(false);
+ });
+
+ it('should not call epersonService.patch', () => {
+ expect(epersonService.patch).not.toHaveBeenCalled();
+ });
});
- it('should return true', () => {
- expect(result).toEqual(true);
- expect(epersonService.patch).not.toHaveBeenCalled();
+ describe('when password is filled in, but the password is invalid', () => {
+ let result;
+
+ beforeEach(() => {
+ component.setPasswordValue('test');
+ component.setInvalid(true);
+ result = component.updateSecurity();
+ });
+
+ it('should return true', () => {
+ expect(result).toEqual(true);
+ expect(epersonService.patch).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('when password is filled in, and is valid', () => {
+ let result;
+ let operations;
+
+ beforeEach(() => {
+ component.setPasswordValue('testest');
+ component.setInvalid(false);
+
+ operations = [{ op: 'add', path: '/password', value: 'testest' }];
+ result = component.updateSecurity();
+ });
+
+ it('should return true', () => {
+ expect(result).toEqual(true);
+ });
+
+ it('should return call epersonService.patch', () => {
+ expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
+ });
});
});
- describe('when password is filled in, and is valid', () => {
- let result;
- let operations;
+ describe('canChangePassword$', () => {
+ describe('when the user is allowed to change their password', () => {
+ beforeEach(() => {
+ canChangePassword.next(true);
+ });
- beforeEach(() => {
- component.setPasswordValue('testest');
- component.setInvalid(false);
+ it('should contain true', () => {
+ getTestScheduler().expectObservable(component.canChangePassword$).toBe('(a)', { a: true });
+ });
- operations = [{ op: 'add', path: '/password', value: 'testest' }];
- result = component.updateSecurity();
+ it('should show the security section on the page', () => {
+ fixture.detectChanges();
+ expect(fixture.debugElement.query(By.css('.security-section'))).not.toBeNull();
+ });
});
- it('should return true', () => {
- expect(result).toEqual(true);
- });
+ describe('when the user is not allowed to change their password', () => {
+ beforeEach(() => {
+ canChangePassword.next(false);
+ });
- it('should return call epersonService.patch', () => {
- expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
+ it('should contain false', () => {
+ getTestScheduler().expectObservable(component.canChangePassword$).toBe('(a)', { a: false });
+ });
+
+ it('should not show the security section on the page', () => {
+ fixture.detectChanges();
+ expect(fixture.debugElement.query(By.css('.security-section'))).toBeNull();
+ });
});
});
- });
-
- describe('canChangePassword$', () => {
- describe('when the user is allowed to change their password', () => {
- beforeEach(() => {
- canChangePassword.next(true);
- });
-
- it('should contain true', () => {
- getTestScheduler().expectObservable(component.canChangePassword$).toBe('(a)', { a: true });
- });
-
- it('should show the security section on the page', () => {
- fixture.detectChanges();
- expect(fixture.debugElement.query(By.css('.security-section'))).not.toBeNull();
- });
- });
-
- describe('when the user is not allowed to change their password', () => {
- beforeEach(() => {
- canChangePassword.next(false);
- });
-
- it('should contain false', () => {
- getTestScheduler().expectObservable(component.canChangePassword$).toBe('(a)', { a: false });
- });
-
- it('should not show the security section on the page', () => {
- fixture.detectChanges();
- expect(fixture.debugElement.query(By.css('.security-section'))).toBeNull();
- });
- });
- });
describe('check for specialGroups', () => {
it('should contains specialGroups list', () => {
@@ -258,4 +282,56 @@ describe('ProfilePageComponent', () => {
expect(specialGroupsEle).toBeFalsy();
});
});
+ });
+
+ describe('isResearcherProfileEnabled', () => {
+
+ describe('when configuration service return values', () => {
+
+ beforeEach(() => {
+ configurationService.findByPropertyName.and.returnValue(createSuccessfulRemoteDataObject$(validConfiguration));
+ fixture.detectChanges();
+ });
+
+ it('should return true', () => {
+ const result = component.isResearcherProfileEnabled();
+ const expected = cold('a', {
+ a: true
+ });
+ expect(result).toBeObservable(expected);
+ });
+ });
+
+ describe('when configuration service return no values', () => {
+
+ beforeEach(() => {
+ configurationService.findByPropertyName.and.returnValue(createSuccessfulRemoteDataObject$(emptyConfiguration));
+ fixture.detectChanges();
+ });
+
+ it('should return false', () => {
+ const result = component.isResearcherProfileEnabled();
+ const expected = cold('a', {
+ a: false
+ });
+ expect(result).toBeObservable(expected);
+ });
+ });
+
+ describe('when configuration service return an error', () => {
+
+ beforeEach(() => {
+ configurationService.findByPropertyName.and.returnValue(createFailedRemoteDataObject$());
+ fixture.detectChanges();
+ });
+
+ it('should return false', () => {
+ const result = component.isResearcherProfileEnabled();
+ const expected = cold('a', {
+ a: false
+ });
+ expect(result).toBeObservable(expected);
+ });
+ });
+ });
});
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 7623e9e6ea..5629a1ae18 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
import { EPerson } from '../core/eperson/models/eperson.model';
import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -16,6 +16,8 @@ import { AuthService } from '../core/auth/auth.service';
import { Operation } from 'fast-json-patch';
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
@Component({
selector: 'ds-profile-page',
@@ -72,11 +74,14 @@ export class ProfilePageComponent implements OnInit {
private currentUser: EPerson;
canChangePassword$: Observable;
+ isResearcherProfileEnabled$: BehaviorSubject = new BehaviorSubject(false);
+
constructor(private authService: AuthService,
private notificationsService: NotificationsService,
private translate: TranslateService,
private epersonService: EPersonDataService,
- private authorizationService: AuthorizationDataService) {
+ private authorizationService: AuthorizationDataService,
+ private configurationService: ConfigurationDataService) {
}
ngOnInit(): void {
@@ -90,6 +95,12 @@ export class ProfilePageComponent implements OnInit {
this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
+
+ this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+ getFirstCompletedRemoteData()
+ ).subscribe((configRD: RemoteData) => {
+ this.isResearcherProfileEnabled$.next(configRD.hasSucceeded && configRD.payload.values.length > 0);
+ });
}
/**
@@ -165,4 +176,12 @@ export class ProfilePageComponent implements OnInit {
submit() {
this.updateProfile();
}
+
+ /**
+ * Returns true if the researcher profile feature is enabled, false otherwise.
+ */
+ isResearcherProfileEnabled(): Observable {
+ return this.isResearcherProfileEnabled$.asObservable();
+ }
+
}
diff --git a/src/app/profile-page/profile-page.module.ts b/src/app/profile-page/profile-page.module.ts
index dc9595140b..0e2902de33 100644
--- a/src/app/profile-page/profile-page.module.ts
+++ b/src/app/profile-page/profile-page.module.ts
@@ -5,25 +5,37 @@ import { ProfilePageRoutingModule } from './profile-page-routing.module';
import { ProfilePageComponent } from './profile-page.component';
import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
import { ProfilePageSecurityFormComponent } from './profile-page-security-form/profile-page-security-form.component';
+import {
+ ProfilePageResearcherFormComponent
+} from './profile-page-researcher-form/profile-page-researcher-form.component';
import { ThemedProfilePageComponent } from './themed-profile-page.component';
import { FormModule } from '../shared/form/form.module';
+import { UiSwitchModule } from 'ngx-ui-switch';
+import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profile-claim-item-modal.component';
+
@NgModule({
imports: [
ProfilePageRoutingModule,
CommonModule,
SharedModule,
- FormModule
+ FormModule,
+ UiSwitchModule
],
exports: [
+ ProfilePageComponent,
+ ThemedProfilePageComponent,
+ ProfilePageMetadataFormComponent,
ProfilePageSecurityFormComponent,
- ProfilePageMetadataFormComponent
+ ProfilePageResearcherFormComponent
],
declarations: [
ProfilePageComponent,
ThemedProfilePageComponent,
+ ProfileClaimItemModalComponent,
ProfilePageMetadataFormComponent,
- ProfilePageSecurityFormComponent
+ ProfilePageSecurityFormComponent,
+ ProfilePageResearcherFormComponent
]
})
export class ProfilePageModule {
diff --git a/src/app/root.module.ts b/src/app/root.module.ts
index e5a8aad949..8577f0d728 100644
--- a/src/app/root.module.ts
+++ b/src/app/root.module.ts
@@ -40,6 +40,8 @@ import {
import {
PageInternalServerErrorComponent
} from './page-internal-server-error/page-internal-server-error.component';
+import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { PageErrorComponent } from './page-error/page-error.component';
const IMPORTS = [
CommonModule,
@@ -74,7 +76,9 @@ const DECLARATIONS = [
ThemedForbiddenComponent,
IdleModalComponent,
ThemedPageInternalServerErrorComponent,
- PageInternalServerErrorComponent
+ PageInternalServerErrorComponent,
+ ThemedPageErrorComponent,
+ PageErrorComponent
];
const EXPORTS = [
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index b3ca75bf94..552854a0c0 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
index e8b7d689a3..8b13789179 100644
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
+++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
@@ -1,3 +1 @@
-.btn-dark {
- background-color: var(--ds-admin-sidebar-bg);
-}
+
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
new file mode 100644
index 0000000000..305900ae33
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
@@ -0,0 +1,6 @@
+
+
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts
new file mode 100644
index 0000000000..c70ec4b808
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts
@@ -0,0 +1,76 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { of as observableOf } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { By } from '@angular/platform-browser';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { DsoPageOrcidButtonComponent } from './dso-page-orcid-button.component';
+
+describe('DsoPageOrcidButtonComponent', () => {
+ let component: DsoPageOrcidButtonComponent;
+ let fixture: ComponentFixture;
+
+ let authorizationService: AuthorizationDataService;
+ let dso: DSpaceObject;
+
+ beforeEach(waitForAsync(() => {
+ dso = Object.assign(new Item(), {
+ id: 'test-item',
+ _links: {
+ self: { href: 'test-item-selflink' }
+ }
+ });
+ authorizationService = jasmine.createSpyObj('authorizationService', {
+ isAuthorized: observableOf(true)
+ });
+ TestBed.configureTestingModule({
+ declarations: [DsoPageOrcidButtonComponent],
+ imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
+ providers: [
+ { provide: AuthorizationDataService, useValue: authorizationService }
+ ]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DsoPageOrcidButtonComponent);
+ component = fixture.componentInstance;
+ component.dso = dso;
+ component.pageRoute = 'test';
+ fixture.detectChanges();
+ });
+
+ it('should check the authorization of the current user', () => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanSynchronizeWithORCID, dso.self);
+ });
+
+ describe('when the user is authorized', () => {
+ beforeEach(() => {
+ (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
+ component.ngOnInit();
+ fixture.detectChanges();
+ });
+
+ it('should render a link', () => {
+ const link = fixture.debugElement.query(By.css('a'));
+ expect(link).not.toBeNull();
+ });
+ });
+
+ describe('when the user is not authorized', () => {
+ beforeEach(() => {
+ (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+ component.ngOnInit();
+ fixture.detectChanges();
+ });
+
+ it('should not render a link', () => {
+ const link = fixture.debugElement.query(By.css('a'));
+ expect(link).toBeNull();
+ });
+ });
+});
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
new file mode 100644
index 0000000000..c345d8cbdc
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
@@ -0,0 +1,39 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+
+@Component({
+ selector: 'ds-dso-page-orcid-button',
+ templateUrl: './dso-page-orcid-button.component.html',
+ styleUrls: ['./dso-page-orcid-button.component.scss']
+})
+export class DsoPageOrcidButtonComponent implements OnInit {
+ /**
+ * The DSpaceObject to display a button to the edit page for
+ */
+ @Input() dso: DSpaceObject;
+
+ /**
+ * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
+ */
+ @Input() pageRoute: string;
+
+ /**
+ * Whether or not the current user is authorized to edit the DSpaceObject
+ */
+ isAuthorized: BehaviorSubject = new BehaviorSubject(false);
+
+ constructor(protected authorizationService: AuthorizationDataService) { }
+
+ ngOnInit() {
+ this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, this.dso.self).pipe(take(1)).subscribe((isAuthorized: boolean) => {
+ this.isAuthorized.next(isAuthorized);
+ });
+ }
+
+}
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
new file mode 100644
index 0000000000..c4bba286bf
--- /dev/null
+++ b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
@@ -0,0 +1,7 @@
+
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
new file mode 100644
index 0000000000..168517b47a
--- /dev/null
+++ b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
@@ -0,0 +1,186 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+
+import { of as observableOf } from 'rxjs';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+
+import { PersonPageClaimButtonComponent } from './person-page-claim-button.component';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { RouteService } from '../../../core/services/route.service';
+import { routeServiceStub } from '../../testing/route-service.stub';
+import { Item } from '../../../core/shared/item.model';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+describe('PersonPageClaimButtonComponent', () => {
+ let scheduler: TestScheduler;
+ let component: PersonPageClaimButtonComponent;
+ let fixture: ComponentFixture;
+
+ const mockItem: Item = Object.assign(new Item(), {
+ metadata: {
+ 'person.email': [
+ {
+ language: 'en_US',
+ value: 'fake@email.com'
+ }
+ ],
+ 'person.birthDate': [
+ {
+ language: 'en_US',
+ value: '1993'
+ }
+ ],
+ 'person.jobTitle': [
+ {
+ language: 'en_US',
+ value: 'Developer'
+ }
+ ],
+ 'person.familyName': [
+ {
+ language: 'en_US',
+ value: 'Doe'
+ }
+ ],
+ 'person.givenName': [
+ {
+ language: 'en_US',
+ value: 'John'
+ }
+ ]
+ },
+ _links: {
+ self: {
+ href: 'item-href'
+ }
+ }
+ });
+
+ const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
+ id: 'test-id',
+ visible: true,
+ type: 'profile',
+ _links: {
+ item: {
+ href: 'https://rest.api/rest/api/profiles/test-id/item'
+ },
+ self: {
+ href: 'https://rest.api/rest/api/profiles/test-id'
+ },
+ }
+ });
+
+ const notificationsService = new NotificationsServiceStub();
+
+ const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
+ isAuthorized: jasmine.createSpy('isAuthorized')
+ });
+
+ const researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+ createFromExternalSource: jasmine.createSpy('createFromExternalSource'),
+ findRelatedItemId: jasmine.createSpy('findRelatedItemId'),
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [
+ TranslateModule.forRoot({
+ loader: {
+ provide: TranslateLoader,
+ useClass: TranslateLoaderMock
+ }
+ })
+ ],
+ declarations: [PersonPageClaimButtonComponent],
+ providers: [
+ { provide: AuthorizationDataService, useValue: authorizationDataService },
+ { provide: NotificationsService, useValue: notificationsService },
+ { provide: ResearcherProfileService, useValue: researcherProfileService },
+ { provide: RouteService, useValue: routeServiceStub },
+ ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(PersonPageClaimButtonComponent);
+ component = fixture.componentInstance;
+ component.object = mockItem;
+ });
+
+ describe('when item can be claimed', () => {
+ beforeEach(() => {
+ authorizationDataService.isAuthorized.and.returnValue(observableOf(true));
+ researcherProfileService.createFromExternalSource.calls.reset();
+ researcherProfileService.findRelatedItemId.calls.reset();
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should create claim button', () => {
+ const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]'));
+ expect(btn).toBeTruthy();
+ });
+
+ describe('claim', () => {
+ describe('when successfully', () => {
+ beforeEach(() => {
+ scheduler = getTestScheduler();
+ researcherProfileService.createFromExternalSource.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+ researcherProfileService.findRelatedItemId.and.returnValue(observableOf('test-id'));
+ });
+
+ it('should display success notification', () => {
+ scheduler.schedule(() => component.claim());
+ scheduler.flush();
+
+ expect(researcherProfileService.findRelatedItemId).toHaveBeenCalled();
+ expect(notificationsService.success).toHaveBeenCalled();
+ });
+ });
+
+ describe('when not successfully', () => {
+ beforeEach(() => {
+ scheduler = getTestScheduler();
+ researcherProfileService.createFromExternalSource.and.returnValue(createFailedRemoteDataObject$());
+ });
+
+ it('should display success notification', () => {
+ scheduler.schedule(() => component.claim());
+ scheduler.flush();
+
+ expect(researcherProfileService.findRelatedItemId).not.toHaveBeenCalled();
+ expect(notificationsService.error).toHaveBeenCalled();
+ });
+ });
+ });
+
+ });
+
+ describe('when item cannot be claimed', () => {
+ beforeEach(() => {
+ authorizationDataService.isAuthorized.and.returnValue(observableOf(false));
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should create claim button', () => {
+ const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]'));
+ expect(btn).toBeFalsy();
+ });
+
+ });
+});
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
new file mode 100644
index 0000000000..903b9d3679
--- /dev/null
+++ b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
@@ -0,0 +1,84 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { mergeMap, take } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RouteService } from '../../../core/services/route.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { isNotEmpty } from '../../empty.util';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+
+@Component({
+ selector: 'ds-person-page-claim-button',
+ templateUrl: './person-page-claim-button.component.html',
+ styleUrls: ['./person-page-claim-button.component.scss']
+})
+export class PersonPageClaimButtonComponent implements OnInit {
+
+ /**
+ * The target person item to claim
+ */
+ @Input() object: DSpaceObject;
+
+ /**
+ * A boolean representing if item can be claimed or not
+ */
+ claimable$: BehaviorSubject = new BehaviorSubject(false);
+
+ constructor(protected routeService: RouteService,
+ protected authorizationService: AuthorizationDataService,
+ protected notificationsService: NotificationsService,
+ protected translate: TranslateService,
+ protected researcherProfileService: ResearcherProfileService) {
+ }
+
+ ngOnInit(): void {
+ this.authorizationService.isAuthorized(FeatureID.CanClaimItem, this.object._links.self.href, null, false).pipe(
+ take(1)
+ ).subscribe((isAuthorized: boolean) => {
+ this.claimable$.next(isAuthorized);
+ });
+
+ }
+
+ /**
+ * Create a new researcher profile claiming the current item.
+ */
+ claim() {
+ this.researcherProfileService.createFromExternalSource(this.object._links.self.href).pipe(
+ getFirstCompletedRemoteData(),
+ mergeMap((rd: RemoteData) => {
+ if (rd.hasSucceeded) {
+ return this.researcherProfileService.findRelatedItemId(rd.payload);
+ } else {
+ return observableOf(null);
+ }
+ }))
+ .subscribe((id: string) => {
+ if (isNotEmpty(id)) {
+ this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'),
+ this.translate.get('researcherprofile.success.claim.body'));
+ this.claimable$.next(false);
+ } else {
+ this.notificationsService.error(
+ this.translate.get('researcherprofile.error.claim.title'),
+ this.translate.get('researcherprofile.error.claim.body'));
+ }
+ });
+ }
+
+ /**
+ * Returns true if the item is claimable, false otherwise.
+ */
+ isClaimable(): Observable {
+ return this.claimable$;
+ }
+
+}
diff --git a/src/app/shared/handle.service.spec.ts b/src/app/shared/handle.service.spec.ts
new file mode 100644
index 0000000000..b326eb0416
--- /dev/null
+++ b/src/app/shared/handle.service.spec.ts
@@ -0,0 +1,47 @@
+import { HandleService } from './handle.service';
+
+describe('HandleService', () => {
+ let service: HandleService;
+
+ beforeEach(() => {
+ service = new HandleService();
+ });
+
+ describe(`normalizeHandle`, () => {
+ it(`should simply return an already normalized handle`, () => {
+ let input, output;
+
+ input = '123456789/123456';
+ output = service.normalizeHandle(input);
+ expect(output).toEqual(input);
+
+ input = '12.3456.789/123456';
+ output = service.normalizeHandle(input);
+ expect(output).toEqual(input);
+ });
+
+ it(`should normalize a handle url`, () => {
+ let input, output;
+
+ input = 'https://hdl.handle.net/handle/123456789/123456';
+ output = service.normalizeHandle(input);
+ expect(output).toEqual('123456789/123456');
+
+ input = 'https://rest.api/server/handle/123456789/123456';
+ output = service.normalizeHandle(input);
+ expect(output).toEqual('123456789/123456');
+ });
+
+ it(`should return null if the input doesn't contain a handle`, () => {
+ let input, output;
+
+ input = 'https://hdl.handle.net/handle/123456789';
+ output = service.normalizeHandle(input);
+ expect(output).toBeNull();
+
+ input = 'something completely different';
+ output = service.normalizeHandle(input);
+ expect(output).toBeNull();
+ });
+ });
+});
diff --git a/src/app/shared/handle.service.ts b/src/app/shared/handle.service.ts
new file mode 100644
index 0000000000..da0f17f7de
--- /dev/null
+++ b/src/app/shared/handle.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import { isNotEmpty, isEmpty } from './empty.util';
+
+const PREFIX_REGEX = /handle\/([^\/]+\/[^\/]+)$/;
+const NO_PREFIX_REGEX = /^([^\/]+\/[^\/]+)$/;
+
+@Injectable({
+ providedIn: 'root'
+})
+export class HandleService {
+
+
+ /**
+ * Turns a handle string into the default 123456789/12345 format
+ *
+ * @param handle the input handle
+ *
+ * normalizeHandle('123456789/123456') // '123456789/123456'
+ * normalizeHandle('12.3456.789/123456') // '12.3456.789/123456'
+ * normalizeHandle('https://hdl.handle.net/handle/123456789/123456') // '123456789/123456'
+ * normalizeHandle('https://rest.api/server/handle/123456789/123456') // '123456789/123456'
+ * normalizeHandle('https://rest.api/server/handle/123456789') // null
+ */
+ normalizeHandle(handle: string): string {
+ let matches: string[];
+ if (isNotEmpty(handle)) {
+ matches = handle.match(PREFIX_REGEX);
+ }
+
+ if (isEmpty(matches) || matches.length < 2) {
+ matches = handle.match(NO_PREFIX_REGEX);
+ }
+
+ if (isEmpty(matches) || matches.length < 2) {
+ return null;
+ } else {
+ return matches[1];
+ }
+ }
+
+}
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 3b150a46c9..726dc9ca0e 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -27,7 +27,7 @@