From 8188da0c7587ad15b59488cd86395c77d2b0d0cd Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 11 Jul 2019 13:24:24 +0200 Subject: [PATCH 01/70] 63669: Intermediate commit --- .../collection-source.component.html | 7 +++++ .../collection-source.component.ts | 28 +++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index e69de29bb2..5837a9ed72 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -0,0 +1,7 @@ +

Content source

+
+ + +
+

Configure an external source

+ diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 6ec5be884d..7e167805c1 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -1,4 +1,6 @@ import { Component } from '@angular/core'; +import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component'; +import { DynamicFormControlModel, DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core'; /** * Component for managing the content source of the collection @@ -7,6 +9,28 @@ import { Component } from '@angular/core'; selector: 'ds-collection-source', templateUrl: './collection-source.component.html', }) -export class CollectionSourceComponent { - /* TODO: Implement Collection Edit - Content Source */ +export class CollectionSourceComponent extends AbstractTrackableComponent { + externalSource = false; + + /** + * The dynamic form fields used for creating/editing a collection + * @type {(DynamicInputModel | DynamicTextAreaModel)[]} + */ + formModel: DynamicFormControlModel[] = [ + new DynamicInputModel({ + id: 'title', + name: 'dc.title', + required: true, + validators: { + required: null + }, + errorMessages: { + required: 'Please enter a name for this title' + }, + }), + new DynamicTextAreaModel({ + id: 'provider', + name: 'provider', + }) + ]; } From 03887e7c41d8e23e11b2f54734b982a08af13f77 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 11 Jul 2019 17:57:54 +0200 Subject: [PATCH 02/70] 63669: Intermediate commit --- resources/i18n/en.json | 15 +- .../collection-source.component.html | 21 +- .../collection-source.component.ts | 250 ++++++++++++++++-- src/app/core/shared/content-source.model.ts | 19 ++ 4 files changed, 280 insertions(+), 25 deletions(-) create mode 100644 src/app/core/shared/content-source.model.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 76e925f1a2..2aeac293e4 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -42,7 +42,20 @@ }, "source": { "title": "Collection Edit - Content Source", - "head": "Content Source" + "head": "Content Source", + "external": "This collection harvests its content from an external source", + "form": { + "head": "Configure an external source", + "provider": "OAI Provider", + "set": "OAI specific set id", + "format": "Metadata Format", + "harvest": "Content being harvested", + "errors": { + "provider": { + "required": "You must provide a set id of the target collection." + } + } + } }, "curate": { "title": "Collection Edit - Curate", diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index 5837a9ed72..51a652056b 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -1,7 +1,16 @@ -

Content source

-
- - +
+

{{ 'collection.edit.tabs.source.head' | translate }}

+
+ + +
+

{{ 'collection.edit.tabs.source.form.head' | translate }}

-

Configure an external source

- + diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 7e167805c1..cdff87c6ac 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -1,6 +1,23 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component'; -import { DynamicFormControlModel, DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core'; +import { + DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, + DynamicInputModel, DynamicRadioGroupModel, + DynamicSelectModel, + DynamicTextAreaModel +} from '@ng-dynamic-forms/core'; +import { Location } from '@angular/common'; +import { TranslateService } from '@ngx-translate/core'; +import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { FormGroup } from '@angular/forms'; +import { isNotEmpty } from '../../../shared/empty.util'; +import { ContentSource } from '../../../core/shared/content-source.model'; +import { Observable } from 'rxjs/internal/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Collection } from '../../../core/shared/collection.model'; +import { first, map } from 'rxjs/operators'; +import { ActivatedRoute } from '@angular/router'; /** * Component for managing the content source of the collection @@ -9,28 +26,225 @@ import { DynamicFormControlModel, DynamicInputModel, DynamicTextAreaModel } from selector: 'ds-collection-source', templateUrl: './collection-source.component.html', }) -export class CollectionSourceComponent extends AbstractTrackableComponent { - externalSource = false; +export class CollectionSourceComponent extends AbstractTrackableComponent implements OnInit { + /** + * The current collection's remote data + */ + collectionRD$: Observable>; /** - * The dynamic form fields used for creating/editing a collection + * The current collection's content source + */ + contentSource: ContentSource; + + /** + * @type {string} Key prefix used to generate form labels + */ + LABEL_KEY_PREFIX = 'collection.edit.tabs.source.form.'; + + /** + * @type {string} Key prefix used to generate form error messages + */ + ERROR_KEY_PREFIX = 'collection.edit.tabs.source.form.errors.'; + + /** + * The dynamic form fields used for editing the content source of a collection * @type {(DynamicInputModel | DynamicTextAreaModel)[]} */ formModel: DynamicFormControlModel[] = [ - new DynamicInputModel({ - id: 'title', - name: 'dc.title', - required: true, - validators: { - required: null - }, - errorMessages: { - required: 'Please enter a name for this title' - }, + new DynamicFormGroupModel({ + id: 'providerContainer', + group: [ + new DynamicInputModel({ + id: 'provider', + name: 'provider', + required: true, + validators: { + required: null + }, + errorMessages: { + required: 'You must provide a set id of the target collection.' + }, + disabled: true + }) + ] }), - new DynamicTextAreaModel({ - id: 'provider', - name: 'provider', + new DynamicFormGroupModel({ + id: 'setContainer', + group: [ + new DynamicInputModel({ + id: 'set', + name: 'set', + disabled: true + }), + new DynamicSelectModel({ + id: 'format', + name: 'format', + value: 'dc', + options: [ + { + value: 'dc', + label: 'Simple Dublin Core' + }, + { + value: 'qdc', + label: 'Qualified Dublin Core' + }, + { + value: 'dim', + label: 'DSpace Intermediate Metadata' + } + ], + disabled: true + }) + ] + }), + new DynamicFormGroupModel({ + id: 'harvestContainer', + group: [ + new DynamicRadioGroupModel({ + id: 'harvest', + name: 'harvest', + value: 3, + options: [ + { + value: 1, + label: 'Harvest metadata only.' + }, + { + value: 2, + label: 'Harvest metadata and references to bitstreams (requires ORE support).' + }, + { + value: 3, + label: 'Harvest metadata and bitstreams (requires ORE support).' + } + ] + }) + ] }) ]; + + /** + * Layout used for structuring the form inputs + */ + formLayout: DynamicFormLayout = { + provider: { + grid: { + host: 'col-12 d-inline-block' + } + }, + set: { + grid: { + host: 'col col-sm-6 d-inline-block' + } + }, + format: { + grid: { + host: 'col col-sm-6 d-inline-block' + } + }, + harvest: { + grid: { + host: 'col-12' + } + }, + setContainer: { + grid: { + host: 'row' + } + }, + providerContainer: { + grid: { + host: 'row' + } + }, + harvestContainer: { + grid: { + host: 'row' + } + } + }; + + /** + * The form group of this form + */ + formGroup: FormGroup; + + public constructor(public objectUpdatesService: ObjectUpdatesService, + public notificationsService: NotificationsService, + protected location: Location, + protected formService: DynamicFormService, + protected translate: TranslateService, + protected route: ActivatedRoute) { + super(objectUpdatesService, notificationsService, translate); + } + + ngOnInit(): void { + this.formGroup = this.formService.createFormGroup(this.formModel); + this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso)); + + /* Create a new ContentSource object - TODO: Update to be fetched from the collection */ + this.contentSource = new ContentSource(); + + this.updateFieldTranslations(); + this.translate.onLangChange + .subscribe(() => { + this.updateFieldTranslations(); + }); + } + + /** + * Used the update translations of errors and labels on init and on language change + */ + private updateFieldTranslations() { + this.formModel.forEach( + (fieldModel: DynamicFormControlModel) => { + if (fieldModel instanceof DynamicFormGroupModel) { + fieldModel.group.forEach((childModel: DynamicFormControlModel) => { + this.updateFieldTranslation(childModel); + }); + } else { + this.updateFieldTranslation(fieldModel); + } + } + ); + } + + /** + * Update the translations of a DynamicInputModel + * @param fieldModel + */ + private updateFieldTranslation(fieldModel: DynamicFormControlModel) { + fieldModel.label = this.translate.instant(this.LABEL_KEY_PREFIX + fieldModel.id); + if (isNotEmpty(fieldModel.validators)) { + fieldModel.errorMessages = {}; + Object.keys(fieldModel.validators).forEach((key) => { + fieldModel.errorMessages[key] = this.translate.instant(this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key); + }); + } + } + + onChange(event) { + // TODO: Update ContentSource object and add to field update + console.log(event); + } + + onSubmit() { + // TODO: Fetch field update and send to REST API + console.log('submit'); + } + + onCancel() { + this.location.back(); + } + + changeExternalSource() { + this.contentSource.enabled = !this.contentSource.enabled; + if (this.contentSource.enabled) { + this.formGroup.enable(); + } else { + this.formGroup.disable(); + } + } } diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts new file mode 100644 index 0000000000..10f0986b1b --- /dev/null +++ b/src/app/core/shared/content-source.model.ts @@ -0,0 +1,19 @@ +import { v4 as uuid } from 'uuid'; + +export class ContentSource { + uuid: string; + + enabled = false; + + provider: string; + + set: string; + + format: string; + + harvestType: number; + + constructor() { + this.uuid = uuid(); + } +} From 615a47fe5bbada324184b01f5f7e312b9e1c3de8 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 12 Jul 2019 13:34:40 +0200 Subject: [PATCH 03/70] 63669: Content-Source integrated with FieldUpdate --- config/environment.default.js | 5 + resources/i18n/en.json | 14 +++ .../collection-source.component.html | 39 +++++++ .../collection-source.component.ts | 106 ++++++++++++++++-- src/app/core/shared/content-source.model.ts | 22 +++- .../trackable/abstract-trackable.component.ts | 4 +- .../collection-page-config.interface.ts | 7 ++ src/config/global-config.interface.ts | 2 + 8 files changed, 184 insertions(+), 15 deletions(-) create mode 100644 src/config/collection-page-config.interface.ts diff --git a/config/environment.default.js b/config/environment.default.js index 804d80b0f2..ce79909515 100644 --- a/config/environment.default.js +++ b/config/environment.default.js @@ -155,5 +155,10 @@ module.exports = { edit: { undoTimeout: 10000 // 10 seconds } + }, + collection: { + edit: { + undoTimeout: 10000 // 10 seconds + } } }; diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 2aeac293e4..ef688cf661 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -55,6 +55,20 @@ "required": "You must provide a set id of the target collection." } } + }, + "notifications": { + "discarded": { + "title": "Changed discarded", + "content": "Your changes were discarded. To reinstate your changes click the 'Undo' button" + }, + "invalid": { + "title": "Metadata invalid", + "content": "Your changes were not saved. Please make sure all fields are valid before you save." + }, + "saved": { + "title": "Content Source saved", + "content": "Your changes to this collection's content source were saved." + } } }, "curate": { diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index 51a652056b..2017f172c5 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -1,4 +1,22 @@
+
+ + + +

{{ 'collection.edit.tabs.source.head' | translate }}

@@ -11,6 +29,27 @@ [formGroup]="formGroup" [formModel]="formModel" [formLayout]="formLayout" + [displaySubmit]="false" (dfChange)="onChange($event)" (submitForm)="onSubmit()" (cancel)="onCancel()"> +
+
+ + + +
+
diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index cdff87c6ac..a9696a23f0 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component'; import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, @@ -11,13 +11,17 @@ import { TranslateService } from '@ngx-translate/core'; import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { FormGroup } from '@angular/forms'; -import { isNotEmpty } from '../../../shared/empty.util'; +import { hasValue, isNotEmpty } from '../../../shared/empty.util'; import { ContentSource } from '../../../core/shared/content-source.model'; import { Observable } from 'rxjs/internal/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { Collection } from '../../../core/shared/collection.model'; import { first, map } from 'rxjs/operators'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; +import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { cloneDeep } from 'lodash'; +import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config'; /** * Component for managing the content source of the collection @@ -26,17 +30,22 @@ import { ActivatedRoute } from '@angular/router'; selector: 'ds-collection-source', templateUrl: './collection-source.component.html', }) -export class CollectionSourceComponent extends AbstractTrackableComponent implements OnInit { +export class CollectionSourceComponent extends AbstractTrackableComponent implements OnInit, OnDestroy { /** * The current collection's remote data */ collectionRD$: Observable>; /** - * The current collection's content source + * The collection's content source */ contentSource: ContentSource; + /** + * The current update to the content source + */ + update$: Observable; + /** * @type {string} Key prefix used to generate form labels */ @@ -80,7 +89,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem new DynamicSelectModel({ id: 'format', name: 'format', - value: 'dc', options: [ { value: 'dc', @@ -105,7 +113,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem new DynamicRadioGroupModel({ id: 'harvest', name: 'harvest', - value: 3, options: [ { value: 1, @@ -171,16 +178,29 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ formGroup: FormGroup; + /** + * Subscription to update the current form + */ + updateSub: Subscription; + public constructor(public objectUpdatesService: ObjectUpdatesService, public notificationsService: NotificationsService, protected location: Location, protected formService: DynamicFormService, protected translate: TranslateService, - protected route: ActivatedRoute) { + protected route: ActivatedRoute, + protected router: Router, + @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,) { super(objectUpdatesService, notificationsService, translate); } ngOnInit(): void { + this.notificationsPrefix = 'collection.edit.tabs.source.notifications.'; + this.discardTimeOut = this.EnvConfig.collection.edit.undoTimeout; + this.url = this.router.url; + if (this.url.indexOf('?') > 0) { + this.url = this.url.substr(0, this.url.indexOf('?')); + } this.formGroup = this.formService.createFormGroup(this.formModel); this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso)); @@ -192,6 +212,33 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem .subscribe(() => { this.updateFieldTranslations(); }); + + this.initializeOriginalContentSource(); + } + + initializeOriginalContentSource() { + const initialContentSource = cloneDeep(this.contentSource); + this.objectUpdatesService.initialize(this.url, [initialContentSource], new Date()); + this.update$ = this.objectUpdatesService.getFieldUpdates(this.url, [initialContentSource]).pipe( + map((updates: FieldUpdates) => updates[initialContentSource.uuid]) + ); + this.updateSub = this.update$.subscribe((update: FieldUpdate) => { + const field = update.field as ContentSource; + this.formGroup.patchValue({ + providerContainer: { + provider: field.provider + }, + setContainer: { + set: field.set, + format: field.format + }, + harvestContainer: { + harvest: field.harvest + } + }); + this.contentSource = cloneDeep(field); + this.switchEnableForm(); + }); } /** @@ -226,13 +273,14 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem } onChange(event) { - // TODO: Update ContentSource object and add to field update - console.log(event); + this.updateContentSourceField(event.model); + this.saveFieldUpdate(); } onSubmit() { // TODO: Fetch field update and send to REST API - console.log('submit'); + this.initializeOriginalContentSource(); + this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); } onCancel() { @@ -241,10 +289,46 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem changeExternalSource() { this.contentSource.enabled = !this.contentSource.enabled; + this.updateContentSource(); + } + + /** + * Enable or disable the form depending on the Content Source's enabled property + */ + switchEnableForm() { if (this.contentSource.enabled) { this.formGroup.enable(); } else { this.formGroup.disable(); } } + + updateContentSource() { + this.formModel.forEach( + (fieldModel: DynamicFormGroupModel | DynamicInputModel) => { + if (fieldModel instanceof DynamicFormGroupModel) { + fieldModel.group.forEach((childModel: DynamicInputModel) => { + this.updateContentSourceField(childModel); + }); + } else { + this.updateContentSourceField(fieldModel); + } + } + ); + this.saveFieldUpdate(); + } + + updateContentSourceField(fieldModel: DynamicInputModel) { + if (hasValue(fieldModel)) { + this.contentSource[fieldModel.id] = fieldModel.value; + } + } + + saveFieldUpdate() { + this.objectUpdatesService.saveAddFieldUpdate(this.url, cloneDeep(this.contentSource)); + } + + ngOnDestroy(): void { + this.updateSub.unsubscribe(); + } } diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index 10f0986b1b..4c523b80e1 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -1,17 +1,35 @@ import { v4 as uuid } from 'uuid'; export class ContentSource { + /** + * Unique identifier + */ uuid: string; + /** + * Does this collection harvest its content from an external source ? + */ enabled = false; + /** + * OAI Provider + */ provider: string; + /** + * OAI Specific set ID + */ set: string; - format: string; + /** + * Metadata Format + */ + format = 'dc'; - harvestType: number; + /** + * Type of content being harvested + */ + harvest = 3; constructor() { this.uuid = uuid(); diff --git a/src/app/shared/trackable/abstract-trackable.component.ts b/src/app/shared/trackable/abstract-trackable.component.ts index cd1b425f10..bb1f4b31b4 100644 --- a/src/app/shared/trackable/abstract-trackable.component.ts +++ b/src/app/shared/trackable/abstract-trackable.component.ts @@ -63,7 +63,7 @@ export class AbstractTrackableComponent { * Get translated notification title * @param key */ - private getNotificationTitle(key: string) { + protected getNotificationTitle(key: string) { return this.translateService.instant(this.notificationsPrefix + key + '.title'); } @@ -71,7 +71,7 @@ export class AbstractTrackableComponent { * Get translated notification content * @param key */ - private getNotificationContent(key: string) { + protected getNotificationContent(key: string) { return this.translateService.instant(this.notificationsPrefix + key + '.content'); } diff --git a/src/config/collection-page-config.interface.ts b/src/config/collection-page-config.interface.ts new file mode 100644 index 0000000000..b0103fd176 --- /dev/null +++ b/src/config/collection-page-config.interface.ts @@ -0,0 +1,7 @@ +import { Config } from './config.interface'; + +export interface CollectionPageConfig extends Config { + edit: { + undoTimeout: number; + } +} diff --git a/src/config/global-config.interface.ts b/src/config/global-config.interface.ts index d83ec6e4d8..e2409ec18b 100644 --- a/src/config/global-config.interface.ts +++ b/src/config/global-config.interface.ts @@ -8,6 +8,7 @@ import { FormConfig } from './form-config.interfaces'; import {LangConfig} from './lang-config.interface'; import { BrowseByConfig } from './browse-by-config.interface'; import { ItemPageConfig } from './item-page-config.interface'; +import { CollectionPageConfig } from './collection-page-config.interface'; export interface GlobalConfig extends Config { ui: ServerConfig; @@ -25,4 +26,5 @@ export interface GlobalConfig extends Config { languages: LangConfig[]; browseBy: BrowseByConfig; item: ItemPageConfig; + collection: CollectionPageConfig; } From 7774c3c83c2fac48ca0e1cf1f5d64ea61f0a26b2 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 12 Jul 2019 15:11:38 +0200 Subject: [PATCH 04/70] 63669: Content Source valid check + JSDocs --- .../collection-source.component.html | 4 +- .../collection-source.component.ts | 41 ++++++++++++++++++- src/app/core/shared/content-source.model.ts | 4 ++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index 2017f172c5..71f03e2a9f 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -11,7 +11,7 @@ class="fas fa-undo-alt">  {{"item.edit.metadata.reinstate-button" | translate}} - -
-

{{ 'collection.edit.tabs.source.form.head' | translate }}

+

{{ 'collection.edit.tabs.source.form.head' | translate }}

- -
+
- - + +
+
+ + + +
+

{{ 'collection.edit.tabs.source.head' | translate }}

+
+ + +
+

{{ 'collection.edit.tabs.source.form.head' | translate }}

-

{{ 'collection.edit.tabs.source.head' | translate }}

-
- - + +
+
+ + + +
-

{{ 'collection.edit.tabs.source.form.head' | translate }}

-
- -
-
- - - -
-
+ diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 70b268d9b7..932092a4a4 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -1,8 +1,13 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component'; import { - DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, - DynamicInputModel, DynamicOptionControlModel, DynamicRadioGroupModel, + DynamicFormControlModel, + DynamicFormGroupModel, + DynamicFormLayout, + DynamicFormService, + DynamicInputModel, + DynamicOptionControlModel, + DynamicRadioGroupModel, DynamicSelectModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core'; @@ -12,16 +17,18 @@ import { ObjectUpdatesService } from '../../../core/data/object-updates/object-u import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { FormGroup } from '@angular/forms'; import { hasValue, isNotEmpty } from '../../../shared/empty.util'; -import { ContentSource } from '../../../core/shared/content-source.model'; +import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model'; import { Observable } from 'rxjs/internal/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { Collection } from '../../../core/shared/collection.model'; -import { first, map } from 'rxjs/operators'; +import { first, map, switchMap, take } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer'; import { Subscription } from 'rxjs/internal/Subscription'; import { cloneDeep } from 'lodash'; import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config'; +import { CollectionDataService } from '../../../core/data/collection-data.service'; +import { getSucceededRemoteData } from '../../../core/shared/operators'; /** * Component for managing the content source of the collection @@ -64,9 +71,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem /** * The Dynamic Input Model for the OAI Provider */ - providerModel = new DynamicInputModel({ - id: 'provider', - name: 'provider', + oaiSourceModel = new DynamicInputModel({ + id: 'oaiSource', + name: 'oaiSource', required: true, validators: { required: null @@ -79,17 +86,17 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem /** * The Dynamic Input Model for the OAI Set */ - setModel = new DynamicInputModel({ - id: 'set', - name: 'set' + oaiSetIdModel = new DynamicInputModel({ + id: 'oaiSetId', + name: 'oaiSetId' }); /** * The Dynamic Input Model for the Metadata Format used */ - formatModel = new DynamicSelectModel({ - id: 'format', - name: 'format', + metadataConfigIdModel = new DynamicSelectModel({ + id: 'metadataConfigId', + name: 'metadataConfigId', options: [ { value: 'dc' @@ -100,24 +107,25 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem { value: 'dim' } - ] + ], + value: 'dc' }); /** * The Dynamic Input Model for the type of harvesting */ - harvestModel = new DynamicRadioGroupModel({ - id: 'harvest', - name: 'harvest', + harvestTypeModel = new DynamicRadioGroupModel({ + id: 'harvestType', + name: 'harvestType', options: [ { - value: 1 + value: ContentSourceHarvestType.Metadata }, { - value: 2 + value: ContentSourceHarvestType.MetadataAndRef }, { - value: 3 + value: ContentSourceHarvestType.MetadataAndBitstreams } ] }); @@ -125,7 +133,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem /** * All input models in a simple array for easier iterations */ - inputModels = [this.providerModel, this.setModel, this.formatModel, this.harvestModel]; + inputModels = [this.oaiSourceModel, this.oaiSetIdModel, this.metadataConfigIdModel, this.harvestTypeModel]; /** * The dynamic form fields used for editing the content source of a collection @@ -133,22 +141,22 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ formModel: DynamicFormControlModel[] = [ new DynamicFormGroupModel({ - id: 'providerContainer', + id: 'oaiSourceContainer', group: [ - this.providerModel + this.oaiSourceModel ] }), new DynamicFormGroupModel({ - id: 'setContainer', + id: 'oaiSetContainer', group: [ - this.setModel, - this.formatModel + this.oaiSetIdModel, + this.metadataConfigIdModel ] }), new DynamicFormGroupModel({ - id: 'harvestContainer', + id: 'harvestTypeContainer', group: [ - this.harvestModel + this.harvestTypeModel ] }) ]; @@ -157,38 +165,38 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * Layout used for structuring the form inputs */ formLayout: DynamicFormLayout = { - provider: { + oaiSource: { grid: { host: 'col-12 d-inline-block' } }, - set: { + oaiSetId: { grid: { host: 'col col-sm-6 d-inline-block' } }, - format: { + metadataConfigId: { grid: { host: 'col col-sm-6 d-inline-block' } }, - harvest: { + harvestType: { grid: { host: 'col-12', option: 'btn-outline-secondary' } }, - setContainer: { + oaiSetContainer: { grid: { host: 'row' } }, - providerContainer: { + oaiSourceContainer: { grid: { host: 'row' } }, - harvestContainer: { + harvestTypeContainer: { grid: { host: 'row' } @@ -205,6 +213,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ updateSub: Subscription; + harvestTypeNone = ContentSourceHarvestType.None; + public constructor(public objectUpdatesService: ObjectUpdatesService, public notificationsService: NotificationsService, protected location: Location, @@ -212,7 +222,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem protected translate: TranslateService, protected route: ActivatedRoute, protected router: Router, - @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,) { + @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, + protected collectionService: CollectionDataService) { super(objectUpdatesService, notificationsService, translate); } @@ -229,16 +240,21 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem this.formGroup = this.formService.createFormGroup(this.formModel); this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso)); - /* Create a new ContentSource object - TODO: Update to be fetched from the collection */ - this.contentSource = new ContentSource(); + this.collectionRD$.pipe( + getSucceededRemoteData(), + map((col) => col.payload.uuid), + switchMap((uuid) => this.collectionService.getContentSource(uuid)), + take(1) + ).subscribe((contentSource: ContentSource) => { + this.contentSource = contentSource; + this.initializeOriginalContentSource(); + }); this.updateFieldTranslations(); this.translate.onLangChange .subscribe(() => { this.updateFieldTranslations(); }); - - this.initializeOriginalContentSource(); } /** @@ -254,15 +270,15 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem if (update) { const field = update.field as ContentSource; this.formGroup.patchValue({ - providerContainer: { - provider: field.provider + oaiSourceContainer: { + oaiSource: field.oaiSource }, - setContainer: { - set: field.set, - format: field.format + oaiSetContainer: { + oaiSetId: field.oaiSetId, + metadataConfigId: field.metadataConfigId }, - harvestContainer: { - harvest: field.harvest + harvestTypeContainer: { + harvestType: field.harvestType } }); this.contentSource = cloneDeep(field); @@ -307,7 +323,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * @param event */ onChange(event) { - this.updateContentSourceField(event.model); + this.updateContentSourceField(event.model, true); this.saveFieldUpdate(); } @@ -331,24 +347,28 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * Is the current form valid to be submitted ? */ isValid(): boolean { - return !this.contentSource.enabled || this.formGroup.valid; + return (this.contentSource.harvestType === ContentSourceHarvestType.None) || this.formGroup.valid; } /** * Switch the external source on or off and fire a field update */ changeExternalSource() { - this.contentSource.enabled = !this.contentSource.enabled; - this.updateContentSource(); + if (this.contentSource.harvestType === ContentSourceHarvestType.None) { + this.contentSource.harvestType = ContentSourceHarvestType.Metadata; + } else { + this.contentSource.harvestType = ContentSourceHarvestType.None; + } + this.updateContentSource(false); } /** * Loop over all inputs and update the Content Source with their value */ - updateContentSource() { + updateContentSource(updateHarvestType: boolean) { this.inputModels.forEach( (fieldModel: DynamicInputModel) => { - this.updateContentSourceField(fieldModel) + this.updateContentSourceField(fieldModel, updateHarvestType) } ); this.saveFieldUpdate(); @@ -358,8 +378,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * Update the Content Source with the value from a DynamicInputModel * @param fieldModel */ - updateContentSourceField(fieldModel: DynamicInputModel) { - if (hasValue(fieldModel.value)) { + updateContentSourceField(fieldModel: DynamicInputModel, updateHarvestType: boolean) { + if (hasValue(fieldModel.value) && !(fieldModel.id === this.harvestTypeModel.id && !updateHarvestType)) { this.contentSource[fieldModel.id] = fieldModel.value; } } diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts index 03233e616b..c9934d6abe 100644 --- a/src/app/core/cache/response.models.ts +++ b/src/app/core/cache/response.models.ts @@ -14,6 +14,7 @@ import { DSpaceObject } from '../shared/dspace-object.model'; import { NormalizedAuthStatus } from '../auth/models/normalized-auth-status.model'; import { MetadataSchema } from '../metadata/metadata-schema.model'; import { MetadataField } from '../metadata/metadata-field.model'; +import { ContentSource } from '../shared/content-source.model'; /* tslint:disable:max-classes-per-file */ export class RestResponse { @@ -288,4 +289,17 @@ export class FilteredDiscoveryQueryResponse extends RestResponse { super(true, statusCode, statusText); } } + +/** + * A successful response containing exactly one MetadataSchema + */ +export class ContentSourceSuccessResponse extends RestResponse { + constructor( + public contentsource: ContentSource, + public statusCode: number, + public statusText: string, + ) { + super(true, statusCode, statusText); + } +} /* tslint:enable:max-classes-per-file */ diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 1d22b5fefe..fe46bf88aa 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -117,6 +117,7 @@ import { MetadatafieldParsingService } from './data/metadatafield-parsing.servic import { NormalizedSubmissionUploadsModel } from './config/models/normalized-config-submission-uploads.model'; import { NormalizedBrowseEntry } from './shared/normalized-browse-entry.model'; import { BrowseDefinition } from './shared/browse-definition.model'; +import { ContentSourceResponseParsingService } from './data/content-source-response-parsing.service'; const IMPORTS = [ CommonModule, @@ -203,6 +204,7 @@ const PROVIDERS = [ TaskResponseParsingService, ClaimedTaskDataService, PoolTaskDataService, + ContentSourceResponseParsingService, // register AuthInterceptor as HttpInterceptor { provide: HTTP_INTERCEPTORS, diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index 993954a360..1a59498a72 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { filter, map, take } from 'rxjs/operators'; +import { filter, map, take, tap } from 'rxjs/operators'; import { Store } from '@ngrx/store'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; @@ -16,9 +16,12 @@ import { HttpClient } from '@angular/common/http'; import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service'; import { DSOChangeAnalyzer } from './dso-change-analyzer.service'; import { Observable } from 'rxjs/internal/Observable'; -import { FindAllOptions } from './request.models'; +import { ContentSourceRequest, FindAllOptions, RestRequest } from './request.models'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list'; +import { ContentSource } from '../shared/content-source.model'; +import { configureRequest, filterSuccessfulResponses, getRequestFromRequestHref } from '../shared/operators'; +import { ContentSourceSuccessResponse } from '../cache/response.models'; @Injectable() export class CollectionDataService extends ComColDataService { @@ -57,4 +60,21 @@ export class CollectionDataService extends ComColDataService { map((collections: RemoteData>) => collections.payload.totalElements > 0) ); } + + getHarvesterEndpoint(collectionId: string): Observable { + return this.halService.getEndpoint(this.linkPath).pipe( + map((href: string) => `${href}/${collectionId}/harvester`) + ); + } + + getContentSource(collectionId: string): Observable { + return this.getHarvesterEndpoint(collectionId).pipe( + map((href: string) => new ContentSourceRequest(this.requestService.generateRequestId(), href)), + configureRequest(this.requestService), + map((request: RestRequest) => request.href), + getRequestFromRequestHref(this.requestService), + filterSuccessfulResponses(), + map((response: ContentSourceSuccessResponse) => response.contentsource) + ); + } } diff --git a/src/app/core/data/content-source-response-parsing.service.ts b/src/app/core/data/content-source-response-parsing.service.ts new file mode 100644 index 0000000000..34e9360dd7 --- /dev/null +++ b/src/app/core/data/content-source-response-parsing.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { ResponseParsingService } from './parsing.service'; +import { RestRequest } from './request.models'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; +import { ContentSourceSuccessResponse, RestResponse } from '../cache/response.models'; +import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; +import { ContentSource } from '../shared/content-source.model'; + +@Injectable() +export class ContentSourceResponseParsingService implements ResponseParsingService { + + parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { + const payload = data.payload; + + const deserialized = new DSpaceRESTv2Serializer(ContentSource).deserialize(payload); + return new ContentSourceSuccessResponse(deserialized, data.statusCode, data.statusText); + } + +} diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts index 22d5fd3e77..2b96cb378a 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -93,14 +93,16 @@ export class ObjectUpdatesService { const objectUpdates = this.getObjectEntry(url); return objectUpdates.pipe(map((objectEntry) => { const fieldUpdates: FieldUpdates = {}; - Object.keys(objectEntry.fieldStates).forEach((uuid) => { - let fieldUpdate = objectEntry.fieldUpdates[uuid]; - if (isEmpty(fieldUpdate)) { - const identifiable = initialFields.find((object: Identifiable) => object.uuid === uuid); - fieldUpdate = { field: identifiable, changeType: undefined }; - } - fieldUpdates[uuid] = fieldUpdate; - }); + if (hasValue(objectEntry)) { + Object.keys(objectEntry.fieldStates).forEach((uuid) => { + let fieldUpdate = objectEntry.fieldUpdates[uuid]; + if (isEmpty(fieldUpdate)) { + const identifiable = initialFields.find((object: Identifiable) => object.uuid === uuid); + fieldUpdate = {field: identifiable, changeType: undefined}; + } + fieldUpdates[uuid] = fieldUpdate; + }); + } return fieldUpdates; })) } diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index a2b3423960..eab7af5751 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -18,6 +18,7 @@ import { MetadataschemaParsingService } from './metadataschema-parsing.service'; import { MetadatafieldParsingService } from './metadatafield-parsing.service'; import { URLCombiner } from '../url-combiner/url-combiner'; import { TaskResponseParsingService } from '../tasks/task-response-parsing.service'; +import { ContentSourceResponseParsingService } from './content-source-response-parsing.service'; /* tslint:disable:max-classes-per-file */ @@ -358,6 +359,16 @@ export class CreateRequest extends PostRequest { } } +export class ContentSourceRequest extends GetRequest { + constructor(uuid: string, href: string) { + super(uuid, href); + } + + getResponseParser(): GenericConstructor { + return ContentSourceResponseParsingService; + } +} + /** * Request to delete an object based on its identifier */ diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index c6d6c03fab..68db549adb 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -1,41 +1,51 @@ -import { v4 as uuid } from 'uuid'; +import { autoserialize, autoserializeAs } from 'cerialize'; + +export enum ContentSourceHarvestType { + None = 'NONE', + Metadata = 'METADATA_ONLY', + MetadataAndRef = 'METADATA_AND_REF', + MetadataAndBitstreams = 'METADATA_AND_BITSTREAMS' +} /** * A model class that holds information about the Content Source of a Collection */ export class ContentSource { /** - * Unique identifier + * Unique identifier, this is necessary to store the ContentSource in FieldUpdates + * Because the ContentSource coming from the REST API doesn't have a UUID, we're using the selflink */ + @autoserializeAs('self') uuid: string; /** - * Does this collection harvest its content from an external source ? + * OAI Provider / Source */ - enabled = false; - - /** - * OAI Provider - */ - provider: string; + @autoserializeAs('oai_source') + oaiSource: string; /** * OAI Specific set ID */ - set: string; + @autoserializeAs('oai_set_id') + oaiSetId: string; /** - * Metadata Format + * The ID of the metadata format used */ - format = 'dc'; + @autoserializeAs('metadata_config_id') + metadataConfigId = 'dc'; /** * Type of content being harvested + * Defaults to 'NONE', meaning the collection doesn't harvest its content from an external source */ - harvest = 3; + @autoserializeAs('harvest_type') + harvestType = ContentSourceHarvestType.None; - constructor() { - // TODO: Remove this once the Content Source is fetched from the REST API and a custom generated UUID is not necessary anymore - this.uuid = uuid(); - } + /** + * The REST link to itself + */ + @autoserialize + self: string; } From 1b9bc2f7a3fc6f03e18a1ffe15fc8be297f88ba5 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 20 Aug 2019 17:28:28 +0200 Subject: [PATCH 11/70] 64503: Content Source PUT request on form submit --- resources/i18n/en.json | 2 + .../collection-source.component.ts | 13 +++- src/app/core/data/collection-data.service.ts | 67 +++++++++++++++++-- src/app/core/data/request.models.ts | 10 +++ src/app/core/shared/content-source.model.ts | 6 +- 5 files changed, 87 insertions(+), 11 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 41a4bc3f29..0fb6fd4229 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -131,6 +131,8 @@ "collection.page.browse.recent.head": "Recent Submissions", "collection.page.license": "License", "collection.page.news": "News", + "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", + "collection.source.update.notifications.error.title": "Server Error", "community.create.head": "Create a Community", "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}", "community.delete.cancel": "Cancel", diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 932092a4a4..92dba10ce8 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -331,9 +331,16 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * Submit the edited Content Source to the REST API, re-initialize the field update and display a notification */ onSubmit() { - // TODO: Fetch field update and send to REST API - this.initializeOriginalContentSource(); - this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); + this.collectionRD$.pipe( + getSucceededRemoteData(), + map((col) => col.payload.uuid), + switchMap((uuid) => this.collectionService.updateContentSource(uuid, this.contentSource)), + take(1) + ).subscribe((contentSource: ContentSource) => { + this.contentSource = contentSource; + this.initializeOriginalContentSource(); + this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); + }); } /** diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index 1a59498a72..a858469466 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -12,21 +12,33 @@ import { CommunityDataService } from './community-data.service'; import { RequestService } from './request.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service'; import { DSOChangeAnalyzer } from './dso-change-analyzer.service'; import { Observable } from 'rxjs/internal/Observable'; -import { ContentSourceRequest, FindAllOptions, RestRequest } from './request.models'; +import { ContentSourceRequest, FindAllOptions, RestRequest, UpdateContentSourceRequest } from './request.models'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list'; import { ContentSource } from '../shared/content-source.model'; -import { configureRequest, filterSuccessfulResponses, getRequestFromRequestHref } from '../shared/operators'; -import { ContentSourceSuccessResponse } from '../cache/response.models'; +import { + configureRequest, + filterSuccessfulResponses, + getRequestFromRequestHref, + getResponseFromEntry +} from '../shared/operators'; +import { ContentSourceSuccessResponse, RestResponse } from '../cache/response.models'; +import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; +import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; +import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util'; +import { NotificationOptions } from '../../shared/notifications/models/notification-options.model'; +import { TranslateService } from '@ngx-translate/core'; @Injectable() export class CollectionDataService extends ComColDataService { protected linkPath = 'collections'; protected forceBypassCache = false; + protected errorTitle = 'collection.source.update.notifications.error.title'; + protected contentSourceError = 'collection.source.update.notifications.error.content'; constructor( protected requestService: RequestService, @@ -38,7 +50,8 @@ export class CollectionDataService extends ComColDataService { protected halService: HALEndpointService, protected notificationsService: NotificationsService, protected http: HttpClient, - protected comparator: DSOChangeAnalyzer + protected comparator: DSOChangeAnalyzer, + protected translate: TranslateService ) { super(); } @@ -77,4 +90,48 @@ export class CollectionDataService extends ComColDataService { map((response: ContentSourceSuccessResponse) => response.contentsource) ); } + + updateContentSource(collectionId: string, contentSource: ContentSource): Observable { + const requestId = this.requestService.generateRequestId(); + const serializedContentSource = new DSpaceRESTv2Serializer(ContentSource).serialize(contentSource); + const request$ = this.getHarvesterEndpoint(collectionId).pipe( + take(1), + map((href: string) => { + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'application/json'); + options.headers = headers; + return new UpdateContentSourceRequest(requestId, href, JSON.stringify(serializedContentSource), options); + }) + ); + + // Execute the post/put request + request$.pipe( + configureRequest(this.requestService) + ).subscribe(); + + // Return updated ContentSource + return this.requestService.getByUUID(requestId).pipe( + getResponseFromEntry(), + map((response: RestResponse) => { + if (!response.isSuccessful) { + if (hasValue((response as any).errorMessage)) { + if (response.statusCode === 422) { + this.notificationsService.error(this.translate.instant(this.errorTitle), this.translate.instant(this.contentSourceError), new NotificationOptions(-1)); + } else { + this.notificationsService.error(this.translate.instant(this.errorTitle), (response as any).errorMessage, new NotificationOptions(-1)); + } + } + } else { + return response; + } + }), + isNotEmptyOperator(), + map((response: ContentSourceSuccessResponse) => { + if (isNotEmpty(response.contentsource)) { + return response.contentsource; + } + }) + ); + } } diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index eab7af5751..f25b084af7 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -369,6 +369,16 @@ export class ContentSourceRequest extends GetRequest { } } +export class UpdateContentSourceRequest extends PutRequest { + constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) { + super(uuid, href, body, options); + } + + getResponseParser(): GenericConstructor { + return ContentSourceResponseParsingService; + } +} + /** * Request to delete an object based on its identifier */ diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index 68db549adb..76df1f10ce 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -1,4 +1,4 @@ -import { autoserialize, autoserializeAs } from 'cerialize'; +import { autoserialize, autoserializeAs, deserializeAs, deserialize } from 'cerialize'; export enum ContentSourceHarvestType { None = 'NONE', @@ -15,7 +15,7 @@ export class ContentSource { * Unique identifier, this is necessary to store the ContentSource in FieldUpdates * Because the ContentSource coming from the REST API doesn't have a UUID, we're using the selflink */ - @autoserializeAs('self') + @deserializeAs('self') uuid: string; /** @@ -46,6 +46,6 @@ export class ContentSource { /** * The REST link to itself */ - @autoserialize + @deserialize self: string; } From 8103321245b7c0345d75ffa41b351698af5530fb Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 20 Aug 2019 17:54:58 +0200 Subject: [PATCH 12/70] 64503: MetadataConfig in ContentSource + JSDocs --- .../collection-source.component.ts | 7 ++++++- src/app/core/data/collection-data.service.ts | 13 +++++++++++++ ...content-source-response-parsing.service.ts | 12 ++++++++++++ src/app/core/shared/content-source.model.ts | 9 +++++++++ src/app/core/shared/metadata-config.model.ts | 19 +++++++++++++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 src/app/core/shared/metadata-config.model.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 92dba10ce8..78c7badf51 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -213,6 +213,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ updateSub: Subscription; + /** + * The content harvesting type used when harvesting is disabled + */ harvestTypeNone = ContentSourceHarvestType.None; public constructor(public objectUpdatesService: ObjectUpdatesService, @@ -371,6 +374,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem /** * Loop over all inputs and update the Content Source with their value + * @param updateHarvestType When set to false, the harvestType of the contentSource will be ignored in the update */ updateContentSource(updateHarvestType: boolean) { this.inputModels.forEach( @@ -383,7 +387,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem /** * Update the Content Source with the value from a DynamicInputModel - * @param fieldModel + * @param fieldModel The fieldModel to fetch the value from and update the contentSource with + * @param updateHarvestType When set to false, the harvestType of the contentSource will be ignored in the update */ updateContentSourceField(fieldModel: DynamicInputModel, updateHarvestType: boolean) { if (hasValue(fieldModel.value) && !(fieldModel.id === this.harvestTypeModel.id && !updateHarvestType)) { diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index a858469466..fedb666052 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -74,12 +74,20 @@ export class CollectionDataService extends ComColDataService { ); } + /** + * Get the endpoint for the collection's content harvester + * @param collectionId + */ getHarvesterEndpoint(collectionId: string): Observable { return this.halService.getEndpoint(this.linkPath).pipe( map((href: string) => `${href}/${collectionId}/harvester`) ); } + /** + * Get the collection's content harvester + * @param collectionId + */ getContentSource(collectionId: string): Observable { return this.getHarvesterEndpoint(collectionId).pipe( map((href: string) => new ContentSourceRequest(this.requestService.generateRequestId(), href)), @@ -91,6 +99,11 @@ export class CollectionDataService extends ComColDataService { ); } + /** + * Update the settings of the collection's content harvester + * @param collectionId + * @param contentSource + */ updateContentSource(collectionId: string, contentSource: ContentSource): Observable { const requestId = this.requestService.generateRequestId(); const serializedContentSource = new DSpaceRESTv2Serializer(ContentSource).serialize(contentSource); diff --git a/src/app/core/data/content-source-response-parsing.service.ts b/src/app/core/data/content-source-response-parsing.service.ts index 34e9360dd7..649a8f9b96 100644 --- a/src/app/core/data/content-source-response-parsing.service.ts +++ b/src/app/core/data/content-source-response-parsing.service.ts @@ -5,14 +5,26 @@ import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response. import { ContentSourceSuccessResponse, RestResponse } from '../cache/response.models'; import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; import { ContentSource } from '../shared/content-source.model'; +import { MetadataConfig } from '../shared/metadata-config.model'; @Injectable() +/** + * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a ContentSource object + * wrapped in a ContentSourceSuccessResponse + */ export class ContentSourceResponseParsingService implements ResponseParsingService { parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { const payload = data.payload; const deserialized = new DSpaceRESTv2Serializer(ContentSource).deserialize(payload); + + let metadataConfigs = []; + if (payload._embedded && payload._embedded.metadata_configs && payload._embedded.metadata_configs.configs) { + metadataConfigs = new DSpaceRESTv2Serializer(MetadataConfig).serializeArray(payload._embedded.metadata_configs.configs); + } + deserialized.metadataConfigs = metadataConfigs; + return new ContentSourceSuccessResponse(deserialized, data.statusCode, data.statusText); } diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index 76df1f10ce..a2df90027f 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -1,5 +1,9 @@ import { autoserialize, autoserializeAs, deserializeAs, deserialize } from 'cerialize'; +import { MetadataConfig } from './metadata-config.model'; +/** + * The type of content harvesting used + */ export enum ContentSourceHarvestType { None = 'NONE', Metadata = 'METADATA_ONLY', @@ -43,6 +47,11 @@ export class ContentSource { @autoserializeAs('harvest_type') harvestType = ContentSourceHarvestType.None; + /** + * The available metadata configurations + */ + metadataConfigs: MetadataConfig[]; + /** * The REST link to itself */ diff --git a/src/app/core/shared/metadata-config.model.ts b/src/app/core/shared/metadata-config.model.ts new file mode 100644 index 0000000000..861d04586e --- /dev/null +++ b/src/app/core/shared/metadata-config.model.ts @@ -0,0 +1,19 @@ +/** + * A model class that holds information about a certain metadata configuration + */ +export class MetadataConfig { + /** + * A unique indentifier + */ + id: string; + + /** + * The label used for display + */ + label: string; + + /** + * The namespace of the metadata + */ + nameSpace: string; +} From bf8e2078bcaeb5592debcbf9de6c1428429af597 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Aug 2019 10:40:58 +0200 Subject: [PATCH 13/70] 64503: Metadata Format dropdown filled in by metadataConfig from REST response --- .../collection-source.component.ts | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 78c7badf51..5a1f40a1e2 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -16,7 +16,7 @@ import { TranslateService } from '@ngx-translate/core'; import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { FormGroup } from '@angular/forms'; -import { hasValue, isNotEmpty } from '../../../shared/empty.util'; +import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util'; import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model'; import { Observable } from 'rxjs/internal/Observable'; import { RemoteData } from '../../../core/data/remote-data'; @@ -29,6 +29,7 @@ import { cloneDeep } from 'lodash'; import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config'; import { CollectionDataService } from '../../../core/data/collection-data.service'; import { getSucceededRemoteData } from '../../../core/shared/operators'; +import { MetadataConfig } from '../../../core/shared/metadata-config.model'; /** * Component for managing the content source of the collection @@ -96,19 +97,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ metadataConfigIdModel = new DynamicSelectModel({ id: 'metadataConfigId', - name: 'metadataConfigId', - options: [ - { - value: 'dc' - }, - { - value: 'qdc' - }, - { - value: 'dim' - } - ], - value: 'dc' + name: 'metadataConfigId' }); /** @@ -249,8 +238,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem switchMap((uuid) => this.collectionService.getContentSource(uuid)), take(1) ).subscribe((contentSource: ContentSource) => { - this.contentSource = contentSource; - this.initializeOriginalContentSource(); + this.initializeOriginalContentSource(contentSource); }); this.updateFieldTranslations(); @@ -263,7 +251,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem /** * Initialize the Field Update and subscribe on it to fire updates to the form whenever it changes */ - initializeOriginalContentSource() { + initializeOriginalContentSource(contentSource: ContentSource) { + this.contentSource = contentSource; + this.initializeMetadataConfigs(); const initialContentSource = cloneDeep(this.contentSource); this.objectUpdatesService.initialize(this.url, [initialContentSource], new Date()); this.update$ = this.objectUpdatesService.getFieldUpdates(this.url, [initialContentSource]).pipe( @@ -289,6 +279,17 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem }); } + /** + * Fill the metadataConfigIdModel's options using the contentSource's metadataConfigs property + */ + initializeMetadataConfigs() { + this.metadataConfigIdModel.options = this.contentSource.metadataConfigs + .map((metadataConfig: MetadataConfig) => Object.assign({ value: metadataConfig.id, label: metadataConfig.label })); + if (this.metadataConfigIdModel.options.length > 0) { + this.metadataConfigIdModel.value = this.metadataConfigIdModel.options[0].value; + } + } + /** * Used the update translations of errors and labels on init and on language change */ @@ -315,7 +316,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem if (fieldModel instanceof DynamicOptionControlModel) { if (isNotEmpty(fieldModel.options)) { fieldModel.options.forEach((option) => { - option.label = this.translate.instant(this.OPTIONS_KEY_PREFIX + fieldModel.id + '.' + option.value); + if (hasNoValue(option.label)) { + option.label = this.translate.instant(this.OPTIONS_KEY_PREFIX + fieldModel.id + '.' + option.value); + } }); } } @@ -340,8 +343,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem switchMap((uuid) => this.collectionService.updateContentSource(uuid, this.contentSource)), take(1) ).subscribe((contentSource: ContentSource) => { - this.contentSource = contentSource; - this.initializeOriginalContentSource(); + this.initializeOriginalContentSource(contentSource); this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); }); } From a3b6917abac248969f385b0ddf15d9db44ce7133 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Aug 2019 11:24:52 +0200 Subject: [PATCH 14/70] 64503: Remembering previously selected harvest type + small dropdown fix --- .../collection-source.component.ts | 16 ++++++++++++++-- src/app/core/shared/content-source.model.ts | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 5a1f40a1e2..d4d551d61d 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -207,6 +207,13 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ harvestTypeNone = ContentSourceHarvestType.None; + /** + * The previously selected harvesting type + * Used for switching between ContentSourceHarvestType.None and the previously selected value when enabling / disabling harvesting + * Defaults to ContentSourceHarvestType.Metadata + */ + previouslySelectedHarvestType = ContentSourceHarvestType.Metadata; + public constructor(public objectUpdatesService: ObjectUpdatesService, public notificationsService: NotificationsService, protected location: Location, @@ -286,7 +293,11 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem this.metadataConfigIdModel.options = this.contentSource.metadataConfigs .map((metadataConfig: MetadataConfig) => Object.assign({ value: metadataConfig.id, label: metadataConfig.label })); if (this.metadataConfigIdModel.options.length > 0) { - this.metadataConfigIdModel.value = this.metadataConfigIdModel.options[0].value; + this.formGroup.patchValue({ + oaiSetContainer: { + metadataConfigId: this.metadataConfigIdModel.options[0].value + } + }); } } @@ -367,8 +378,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem */ changeExternalSource() { if (this.contentSource.harvestType === ContentSourceHarvestType.None) { - this.contentSource.harvestType = ContentSourceHarvestType.Metadata; + this.contentSource.harvestType = this.previouslySelectedHarvestType; } else { + this.previouslySelectedHarvestType = this.contentSource.harvestType; this.contentSource.harvestType = ContentSourceHarvestType.None; } this.updateContentSource(false); diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index a2df90027f..cd53c2d81e 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -38,7 +38,7 @@ export class ContentSource { * The ID of the metadata format used */ @autoserializeAs('metadata_config_id') - metadataConfigId = 'dc'; + metadataConfigId: string; /** * Type of content being harvested From 9fab40d7e9e2c0afb3702602c8692b6e3ecd9abf Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Aug 2019 14:14:01 +0200 Subject: [PATCH 15/70] 64503: CollectionSourceComponent and CollectionDataService tests --- .../collection-source.component.spec.ts | 51 ++++++-- .../core/data/collection-data.service.spec.ts | 109 ++++++++++++++++++ 2 files changed, 150 insertions(+), 10 deletions(-) create mode 100644 src/app/core/data/collection-data.service.spec.ts diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts index 89d7445b65..8e93cd7bdd 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { of as observableOf } from 'rxjs/internal/observable/of'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { CollectionSourceComponent } from './collection-source.component'; -import { ContentSource } from '../../../core/shared/content-source.model'; +import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model'; import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; import { INotification, Notification } from '../../../shared/notifications/models/notification.model'; import { NotificationType } from '../../../shared/notifications/models/notification-type'; @@ -17,6 +17,9 @@ import { FormControl, FormGroup } from '@angular/forms'; import { RouterStub } from '../../../shared/testing/router-stub'; import { GLOBAL_CONFIG } from '../../../../config'; import { By } from '@angular/platform-browser'; +import { Collection } from '../../../core/shared/collection.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { CollectionDataService } from '../../../core/data/collection-data.service'; const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info'); const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning'); @@ -31,6 +34,8 @@ let notificationsService: NotificationsService; let location: Location; let formService: DynamicFormService; let router: Router; +let collection: Collection; +let collectionService: CollectionDataService; describe('CollectionSourceComponent', () => { let comp: CollectionSourceComponent; @@ -39,7 +44,24 @@ describe('CollectionSourceComponent', () => { beforeEach(async(() => { date = new Date(); contentSource = Object.assign(new ContentSource(), { - uuid: uuid + uuid: uuid, + metadataConfigs: [ + { + id: 'dc', + label: 'Simple Dublin Core', + nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/' + }, + { + id: 'qdc', + label: 'Qualified Dublin Core', + nameSpace: 'http://purl.org/dc/terms/' + }, + { + id: 'dim', + label: 'DSpace Intermediate Metadata', + nameSpace: 'http://www.dspace.org/xmlns/dspace/dim' + } + ] }); fieldUpdate = { field: contentSource, @@ -84,6 +106,13 @@ describe('CollectionSourceComponent', () => { router = Object.assign(new RouterStub(), { url: 'http://test-url.com/test-url' }); + collection = Object.assign(new Collection(), { + uuid: 'fake-collection-id' + }); + collectionService = jasmine.createSpyObj('collectionService', { + getContentSource: observableOf(contentSource), + updateContentSource: observableOf(contentSource) + }); TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), RouterTestingModule], @@ -93,9 +122,10 @@ describe('CollectionSourceComponent', () => { { provide: NotificationsService, useValue: notificationsService }, { provide: Location, useValue: location }, { provide: DynamicFormService, useValue: formService }, - { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } }, + { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: new RemoteData(false, false, true, null, collection) }) } } }, { provide: Router, useValue: router }, { provide: GLOBAL_CONFIG, useValue: { collection: { edit: { undoTimeout: 10 } } } as any }, + { provide: CollectionDataService, useValue: collectionService } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -104,7 +134,6 @@ describe('CollectionSourceComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(CollectionSourceComponent); comp = fixture.componentInstance; - comp.contentSource = contentSource; fixture.detectChanges(); }); @@ -116,7 +145,7 @@ describe('CollectionSourceComponent', () => { }); it('ContentSource should be disabled', () => { - expect(comp.contentSource.enabled).toBe(false); + expect(comp.contentSource.harvestType).toEqual(ContentSourceHarvestType.None); }); it('the input-form should be hidden', () => { @@ -136,7 +165,7 @@ describe('CollectionSourceComponent', () => { }); it('should enable ContentSource', () => { - expect(comp.contentSource.enabled).toBe(true); + expect(comp.contentSource.harvestType).not.toEqual(ContentSourceHarvestType.None); }); it('should send a field update', () => { @@ -151,19 +180,19 @@ describe('CollectionSourceComponent', () => { describe('isValid', () => { it('should return true when ContentSource is disabled but the form invalid', () => { spyOnProperty(comp.formGroup, 'valid').and.returnValue(false); - comp.contentSource.enabled = false; + comp.contentSource.harvestType = ContentSourceHarvestType.None; expect(comp.isValid()).toBe(true); }); it('should return false when ContentSource is enabled but the form is invalid', () => { spyOnProperty(comp.formGroup, 'valid').and.returnValue(false); - comp.contentSource.enabled = true; + comp.contentSource.harvestType = ContentSourceHarvestType.Metadata; expect(comp.isValid()).toBe(false); }); it('should return true when ContentSource is enabled and the form is valid', () => { spyOnProperty(comp.formGroup, 'valid').and.returnValue(true); - comp.contentSource.enabled = true; + comp.contentSource.harvestType = ContentSourceHarvestType.Metadata; expect(comp.isValid()).toBe(true); }); }); @@ -181,6 +210,8 @@ describe('CollectionSourceComponent', () => { expect(notificationsService.success).toHaveBeenCalled(); }); - // TODO: Write test for sending data to REST API on submit + it('should call updateContentSource on the collectionService', () => { + expect(collectionService.updateContentSource).toHaveBeenCalled(); + }); }); }); diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts new file mode 100644 index 0000000000..f0d3f63910 --- /dev/null +++ b/src/app/core/data/collection-data.service.spec.ts @@ -0,0 +1,109 @@ +import { CollectionDataService } from './collection-data.service'; +import { RequestService } from './request.service'; +import { TranslateService } from '@ngx-translate/core'; +import { getMockRequestService } from '../../shared/mocks/mock-request.service'; +import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub'; +import { getMockTranslateService } from '../../shared/mocks/mock-translate.service'; +import { fakeAsync, tick } from '@angular/core/testing'; +import { ContentSourceRequest, RequestError, UpdateContentSourceRequest } from './request.models'; +import { ContentSource } from '../shared/content-source.model'; +import { of as observableOf } from 'rxjs/internal/observable/of'; +import { RequestEntry } from './request.reducer'; +import { ErrorResponse, RestResponse } from '../cache/response.models'; + +const url = 'fake-url'; +const collectionId = 'fake-collection-id'; + +describe('CollectionDataService', () => { + let service: CollectionDataService; + + let requestService: RequestService; + let translate: TranslateService; + let notificationsService: any; + let halService: any; + + describe('when the requests are successful', () => { + beforeEach(() => { + createService(); + }); + + describe('when calling getContentSource', () => { + let contentSource$; + + beforeEach(() => { + contentSource$ = service.getContentSource(collectionId); + }); + + it('should configure a new ContentSourceRequest', fakeAsync(() => { + contentSource$.subscribe(); + tick(); + expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(ContentSourceRequest), undefined); + })); + }); + + describe('when calling updateContentSource', () => { + let returnedContentSource$; + let contentSource; + + beforeEach(() => { + contentSource = new ContentSource(); + returnedContentSource$ = service.updateContentSource(collectionId, contentSource); + }); + + it('should configure a new UpdateContentSourceRequest', fakeAsync(() => { + returnedContentSource$.subscribe(); + tick(); + expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(UpdateContentSourceRequest), undefined); + })); + }); + }); + + describe('when the requests are unsuccessful', () => { + beforeEach(() => { + createService(observableOf(Object.assign(new RequestEntry(), { + response: new ErrorResponse(Object.assign({ + statusCode: 422, + statusText: 'Unprocessable Entity', + message: 'Error message' + })) + }))); + }); + + describe('when calling updateContentSource', () => { + let returnedContentSource$; + let contentSource; + + beforeEach(() => { + contentSource = new ContentSource(); + returnedContentSource$ = service.updateContentSource(collectionId, contentSource); + }); + + it('should configure a new UpdateContentSourceRequest', fakeAsync(() => { + returnedContentSource$.subscribe(); + tick(); + expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(UpdateContentSourceRequest), undefined); + })); + + it('should display an error notification', fakeAsync(() => { + returnedContentSource$.subscribe(); + tick(); + expect(notificationsService.error).toHaveBeenCalled(); + })); + }); + }); + + /** + * Create a CollectionDataService used for testing + * @param requestEntry$ Supply a requestEntry to be returned by the REST API (optional) + */ + function createService(requestEntry$?) { + requestService = getMockRequestService(requestEntry$); + halService = new HALEndpointServiceStub(url); + notificationsService = new NotificationsServiceStub(); + translate = getMockTranslateService(); + + service = new CollectionDataService(requestService, null, null, null, null, null, halService, notificationsService, null, null, translate); + } + +}); From 86555b936db49a03d2b93654acc1abe6818a3c44 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Aug 2019 14:22:54 +0200 Subject: [PATCH 16/70] 64503: Small bugfix on login --- .../collection-source.component.html | 108 +++++++++--------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index 42f58b4692..d02637ed80 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -1,57 +1,55 @@ - -
-
- - - -
-

{{ 'collection.edit.tabs.source.head' | translate }}

-
- - -
-

{{ 'collection.edit.tabs.source.form.head' | translate }}

+
+
+ + +
- -
-
- - - -
+

{{ 'collection.edit.tabs.source.head' | translate }}

+
+ +
- +

{{ 'collection.edit.tabs.source.form.head' | translate }}

+
+ +
+
+ + + +
+
From a3116a3c5ad962e28011d1233e9673e2871a9475 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Aug 2019 14:37:14 +0200 Subject: [PATCH 17/70] 64503: AoT build error fixes --- .../collection-source/collection-source.component.spec.ts | 2 +- .../edit-collection-page/edit-collection-page.component.ts | 2 +- .../edit-community-page/edit-community-page.component.ts | 2 +- .../edit-comcol-page/edit-comcol-page.component.ts | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts index 8e93cd7bdd..a44311a1c7 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts @@ -33,7 +33,7 @@ let objectUpdatesService: ObjectUpdatesService; let notificationsService: NotificationsService; let location: Location; let formService: DynamicFormService; -let router: Router; +let router: any; let collection: Collection; let collectionService: CollectionDataService; diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts index 21671fe112..dc6df135b4 100644 --- a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts +++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts @@ -12,7 +12,7 @@ import { getCollectionPageRoute } from '../collection-page-routing.module'; templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html' }) export class EditCollectionPageComponent extends EditComColPageComponent { - protected type = 'collection'; + public type = 'collection'; public constructor( protected router: Router, diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.ts b/src/app/+community-page/edit-community-page/edit-community-page.component.ts index a8d4d32b7d..09fc3510a3 100644 --- a/src/app/+community-page/edit-community-page/edit-community-page.component.ts +++ b/src/app/+community-page/edit-community-page/edit-community-page.component.ts @@ -12,7 +12,7 @@ import { getCommunityPageRoute } from '../community-page-routing.module'; templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html' }) export class EditCommunityPageComponent extends EditComColPageComponent { - protected type = 'community'; + public type = 'community'; public constructor( protected router: Router, diff --git a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts index 9face94abd..a750e76c87 100644 --- a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts @@ -2,10 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { RemoteData } from '../../../core/data/remote-data'; -import { isNotEmpty, isNotUndefined } from '../../empty.util'; +import { isNotEmpty } from '../../empty.util'; import { first, map } from 'rxjs/operators'; -import { getSucceededRemoteData } from '../../../core/shared/operators'; -import { DataService } from '../../../core/data/data.service'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; /** @@ -19,7 +17,7 @@ export class EditComColPageComponent implements On /** * The type of DSpaceObject (used to create i18n messages) */ - protected type: string; + public type: string; /** * The current page outlet string From ff2083941a3cc4598a73098bd5e02042aa15e13b Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Aug 2019 14:42:35 +0200 Subject: [PATCH 18/70] 64503: Removal of unnecessary messages --- resources/i18n/en.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 0fb6fd4229..88acc61d3c 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -109,9 +109,6 @@ "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)", "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)", "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only", - "collection.edit.tabs.source.form.options.metadataConfigId.dc": "Simple Dublin Core", - "collection.edit.tabs.source.form.options.metadataConfigId.dim": "DSpace Intermediate Metadata", - "collection.edit.tabs.source.form.options.metadataConfigId.qdc": "Qualified Dublin Core", "collection.edit.tabs.source.head": "Content Source", "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded", From 7432297dce35c20f8ea058e59cdba503a30bab80 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 3 Sep 2019 11:19:23 +0200 Subject: [PATCH 19/70] 64503: Fetch harvester endpoint using halService + small unsubscribe fix --- .../collection-source/collection-source.component.ts | 4 +++- src/app/core/data/collection-data.service.ts | 4 ++-- src/app/core/shared/hal-endpoint.service.ts | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index d4d551d61d..3a87f11910 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -421,6 +421,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * Make sure open subscriptions are closed */ ngOnDestroy(): void { - this.updateSub.unsubscribe(); + if (this.updateSub) { + this.updateSub.unsubscribe(); + } } } diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index fedb666052..435bee21b0 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { filter, map, take, tap } from 'rxjs/operators'; +import { filter, map, switchMap, take, tap } from 'rxjs/operators'; import { Store } from '@ngrx/store'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; @@ -80,7 +80,7 @@ export class CollectionDataService extends ComColDataService { */ getHarvesterEndpoint(collectionId: string): Observable { return this.halService.getEndpoint(this.linkPath).pipe( - map((href: string) => `${href}/${collectionId}/harvester`) + switchMap((href: string) => this.halService.getEndpoint('harvester', `${href}/${collectionId}`)) ); } diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts index a93d54db64..117cc074ca 100644 --- a/src/app/core/shared/hal-endpoint.service.ts +++ b/src/app/core/shared/hal-endpoint.service.ts @@ -43,8 +43,8 @@ export class HALEndpointService { ); } - public getEndpoint(linkPath: string): Observable { - return this.getEndpointAt(this.getRootHref(), ...linkPath.split('/')); + public getEndpoint(linkPath: string, startHref?: string): Observable { + return this.getEndpointAt(startHref || this.getRootHref(), ...linkPath.split('/')); } /** From e59b0929eded9fe343b1e31b3cc3b8d81cb0101b Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 3 Sep 2019 16:11:31 +0200 Subject: [PATCH 20/70] 64503: Default metadataConfigID --- .../collection-source/collection-source.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 3a87f11910..a050443353 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -269,19 +269,21 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem this.updateSub = this.update$.subscribe((update: FieldUpdate) => { if (update) { const field = update.field as ContentSource; + const defaultConfigId = this.contentSource.metadataConfigs[0].id; this.formGroup.patchValue({ oaiSourceContainer: { oaiSource: field.oaiSource }, oaiSetContainer: { oaiSetId: field.oaiSetId, - metadataConfigId: field.metadataConfigId + metadataConfigId: field.metadataConfigId || defaultConfigId }, harvestTypeContainer: { harvestType: field.harvestType } }); this.contentSource = cloneDeep(field); + this.contentSource.metadataConfigId = defaultConfigId; } }); } From 404729faa3aea88c7e5eed526d7d8cdbaf1ef58a Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 31 Oct 2019 12:41:03 +0100 Subject: [PATCH 21/70] 64503: Feedback 2019-10-24 ; loading, message fix, notification clearing --- resources/i18n/en.json5 | 3 +- .../collection-source.component.html | 5 +-- .../collection-source.component.ts | 34 ++++++++++++++++--- src/app/core/data/collection-data.service.ts | 14 ++++---- ...content-source-response-parsing.service.ts | 4 +-- 5 files changed, 45 insertions(+), 15 deletions(-) diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index a9078373ae..f83ed568da 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -159,7 +159,7 @@ "collection.edit.tabs.roles.head": "Assign Roles", "collection.edit.tabs.roles.title": "Collection Edit - Roles", "collection.edit.tabs.source.external": "This collection harvests its content from an external source", - "collection.edit.tabs.source.form.errors.provider.required": "You must provide a set id of the target collection.", + "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.", "collection.edit.tabs.source.form.harvestType": "Content being harvested", "collection.edit.tabs.source.form.head": "Configure an external source", "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format", @@ -478,6 +478,7 @@ "loading.browse-by-page": "Loading page...", "loading.collection": "Loading collection...", "loading.collections": "Loading collections...", + "loading.content-source": "Loading content source...", "loading.community": "Loading community...", "loading.default": "Loading...", "loading.item": "Loading item...", diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index d02637ed80..dfcd6e3166 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -18,11 +18,12 @@

{{ 'collection.edit.tabs.source.head' | translate }}

-
+
-

{{ 'collection.edit.tabs.source.form.head' | translate }}

+ +

{{ 'collection.edit.tabs.source.form.head' | translate }}

{ if (update) { const field = update.field as ContentSource; - const defaultConfigId = this.contentSource.metadataConfigs[0].id; + let defaultConfigId; + if (hasValue(this.contentSource) && isNotEmpty(this.contentSource.metadataConfigs)) { + defaultConfigId = this.contentSource.metadataConfigs[0].id; + } this.formGroup.patchValue({ oaiSourceContainer: { oaiSource: field.oaiSource @@ -355,9 +366,14 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem map((col) => col.payload.uuid), switchMap((uuid) => this.collectionService.updateContentSource(uuid, this.contentSource)), take(1) - ).subscribe((contentSource: ContentSource) => { - this.initializeOriginalContentSource(contentSource); - this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); + ).subscribe((result: ContentSource | INotification) => { + if (hasValue((result as any).harvestType)) { + this.clearNotifications(); + this.initializeOriginalContentSource(result as ContentSource); + this.displayedNotifications.push(this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'))); + } else { + this.displayedNotifications.push(result as INotification); + } }); } @@ -419,6 +435,16 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem this.objectUpdatesService.saveAddFieldUpdate(this.url, cloneDeep(this.contentSource)); } + /** + * Clear possible active notifications + */ + clearNotifications() { + this.displayedNotifications.forEach((notification: INotification) => { + this.notificationsService.remove(notification); + }); + this.displayedNotifications = []; + } + /** * Make sure open subscriptions are closed */ diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index 94860e5df7..e53b684539 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -38,6 +38,7 @@ import { ResponseParsingService } from './parsing.service'; import { GenericConstructor } from '../shared/generic-constructor'; import { DSpaceObject } from '../shared/dspace-object.model'; import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model'; +import { INotification } from '../../shared/notifications/models/notification.model'; @Injectable() export class CollectionDataService extends ComColDataService { @@ -140,7 +141,7 @@ export class CollectionDataService extends ComColDataService { * @param collectionId * @param contentSource */ - updateContentSource(collectionId: string, contentSource: ContentSource): Observable { + updateContentSource(collectionId: string, contentSource: ContentSource): Observable { const requestId = this.requestService.generateRequestId(); const serializedContentSource = new DSpaceRESTv2Serializer(ContentSource).serialize(contentSource); const request$ = this.getHarvesterEndpoint(collectionId).pipe( @@ -166,9 +167,9 @@ export class CollectionDataService extends ComColDataService { if (!response.isSuccessful) { if (hasValue((response as any).errorMessage)) { if (response.statusCode === 422) { - this.notificationsService.error(this.translate.instant(this.errorTitle), this.translate.instant(this.contentSourceError), new NotificationOptions(-1)); + return this.notificationsService.error(this.translate.instant(this.errorTitle), this.translate.instant(this.contentSourceError), new NotificationOptions(-1)); } else { - this.notificationsService.error(this.translate.instant(this.errorTitle), (response as any).errorMessage, new NotificationOptions(-1)); + return this.notificationsService.error(this.translate.instant(this.errorTitle), (response as any).errorMessage, new NotificationOptions(-1)); } } } else { @@ -176,10 +177,11 @@ export class CollectionDataService extends ComColDataService { } }), isNotEmptyOperator(), - map((response: ContentSourceSuccessResponse) => { - if (isNotEmpty(response.contentsource)) { - return response.contentsource; + map((response: ContentSourceSuccessResponse | INotification) => { + if (isNotEmpty((response as any).contentsource)) { + return (response as ContentSourceSuccessResponse).contentsource; } + return response as INotification; }) ); } diff --git a/src/app/core/data/content-source-response-parsing.service.ts b/src/app/core/data/content-source-response-parsing.service.ts index 649a8f9b96..4e0490148b 100644 --- a/src/app/core/data/content-source-response-parsing.service.ts +++ b/src/app/core/data/content-source-response-parsing.service.ts @@ -20,8 +20,8 @@ export class ContentSourceResponseParsingService implements ResponseParsingServi const deserialized = new DSpaceRESTv2Serializer(ContentSource).deserialize(payload); let metadataConfigs = []; - if (payload._embedded && payload._embedded.metadata_configs && payload._embedded.metadata_configs.configs) { - metadataConfigs = new DSpaceRESTv2Serializer(MetadataConfig).serializeArray(payload._embedded.metadata_configs.configs); + if (payload._embedded && payload._embedded.harvestermetadata && payload._embedded.harvestermetadata.configs) { + metadataConfigs = new DSpaceRESTv2Serializer(MetadataConfig).serializeArray(payload._embedded.harvestermetadata.configs); } deserialized.metadataConfigs = metadataConfigs; From 2d3d7ae71ee9d1bc1d6be973ab9fa556ddef8a38 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 12 Nov 2019 11:59:44 +0100 Subject: [PATCH 22/70] 64503: Prevent submit when harvest type is NONE and not changed --- .../collection-source.component.html | 4 +-- .../collection-source.component.ts | 35 ++++++++++++------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html index dfcd6e3166..4192922c7e 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -11,7 +11,7 @@ class="fas fa-undo-alt">  {{"item.edit.metadata.reinstate-button" | translate}} - -
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index 3a145c99e0..e7d1a14200 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -4,10 +4,9 @@ import { Observable } from 'rxjs/internal/Observable'; import { FieldUpdate, FieldUpdates } from '../../../../core/data/object-updates/object-updates.reducer'; import { RelationshipService } from '../../../../core/data/relationship.service'; import { Item } from '../../../../core/shared/item.model'; -import { map, switchMap } from 'rxjs/operators'; +import { map, switchMap} from 'rxjs/operators'; import { hasValue } from '../../../../shared/empty.util'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginatedList } from '../../../../core/data/paginated-list'; +import {Relationship} from "../../../../core/shared/item-relationships/relationship.model"; @Component({ selector: 'ds-edit-relationship-list', @@ -61,22 +60,17 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { this.updates$ = this.getUpdatesByLabel(this.relationshipLabel); } - /** - * Transform the item's relationships of a specific type into related items - * @param label The relationship type's label - */ - public getRelatedItemsByLabel(label: string): Observable>> { - return this.relationshipService.getRelatedItemsByLabel(this.item, label); - } - /** * Get FieldUpdates for the relationships of a specific type * @param label The relationship type's label */ public getUpdatesByLabel(label: string): Observable { - return this.getRelatedItemsByLabel(label).pipe( - switchMap((itemsRD) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, itemsRD.payload.page)) - ) + return this.relationshipService.getItemRelationshipsByLabel(this.item, label).pipe( + map(relationsRD => relationsRD.payload.page.map(relationship => + Object.assign(new Relationship(), relationship, {uuid: relationship.id}) + )), + switchMap((initialFields) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, initialFields)), + ); } /** @@ -97,5 +91,4 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { trackUpdate(index, update: FieldUpdate) { return update && update.field ? update.field.uuid : undefined; } - } diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html index 03040ce8e0..245bf04051 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html @@ -1,10 +1,10 @@ -
+
- +
-
+ + + + diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index 54fce0a68e..00c2a33006 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -112,7 +112,7 @@ describe('EditRelationshipComponent', () => { comp.url = url; comp.fieldUpdate = fieldUpdate1; - comp.item = item; + comp.editItem = item; fixture.detectChanges(); }); diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts index 302ebf68a7..7c1780da58 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts @@ -1,10 +1,15 @@ -import { Component, Input, OnChanges } from '@angular/core'; -import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer'; -import { cloneDeep } from 'lodash'; -import { Item } from '../../../../core/shared/item.model'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; +import {Component, Input, OnChanges, OnInit} from '@angular/core'; +import {combineLatest as observableCombineLatest, Observable} from 'rxjs'; +import {filter, map, switchMap, take, tap} from 'rxjs/operators'; +import {FieldChangeType} from '../../../../core/data/object-updates/object-updates.actions'; +import {DeleteRelationship, FieldUpdate} from '../../../../core/data/object-updates/object-updates.reducer'; +import {ObjectUpdatesService} from '../../../../core/data/object-updates/object-updates.service'; +import {Relationship} from '../../../../core/shared/item-relationships/relationship.model'; +import {Item} from '../../../../core/shared/item.model'; +import {getRemoteDataPayload, getSucceededRemoteData} from '../../../../core/shared/operators'; +import {ViewMode} from '../../../../core/shared/view-mode.model'; +import {hasValue, isNotEmpty} from '../../../../shared/empty.util'; +import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap"; @Component({ // tslint:disable-next-line:component-selector @@ -23,38 +28,109 @@ export class EditRelationshipComponent implements OnChanges { */ @Input() url: string; + /** + * The item being edited + */ + @Input() editItem: Item; + + /** + * The relationship being edited + */ + get relationship(): Relationship { + return this.fieldUpdate.field as Relationship; + } + + private leftItem$: Observable; + private rightItem$: Observable; + /** * The related item of this relationship */ - item: Item; + relatedItem$: Observable; /** * The view-mode we're currently on */ viewMode = ViewMode.ListElement; - constructor(private objectUpdatesService: ObjectUpdatesService) { + constructor( + private objectUpdatesService: ObjectUpdatesService, + private modalService: NgbModal, + ) { } /** * Sets the current relationship based on the fieldUpdate input field */ ngOnChanges(): void { - this.item = cloneDeep(this.fieldUpdate.field) as Item; + this.leftItem$ = this.relationship.leftItem.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)) + ); + this.rightItem$ = this.relationship.rightItem.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)) + ); + this.relatedItem$ = observableCombineLatest( + this.leftItem$, + this.rightItem$, + ).pipe( + map((items: Item[]) => + items.find((item) => item.uuid !== this.editItem.uuid) + ) + ); } /** * Sends a new remove update for this field to the object updates service */ remove(): void { - this.objectUpdatesService.saveRemoveFieldUpdate(this.url, this.item); + this.closeVirtualMetadataModal(); + observableCombineLatest( + this.leftItem$, + this.rightItem$, + ).pipe( + map((items: Item[]) => + items.map(item => this.objectUpdatesService + .isSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid)) + ), + switchMap((selection$: Observable[]) => observableCombineLatest(selection$)), + map((selection: boolean[]) => { + return Object.assign({}, + this.fieldUpdate.field, + { + uuid: this.relationship.id, + keepLeftVirtualMetadata: selection[0] == true, + keepRightVirtualMetadata: selection[1] == true, + } + ) as DeleteRelationship + }), + take(1), + ).subscribe((deleteRelationship: DeleteRelationship) => + this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship) + ); + } + + /** + * Reference to NgbModal + */ + public modalRef: NgbModalRef; + + openVirtualMetadataModal(content: any) { + this.modalRef = this.modalService.open(content); + } + + closeVirtualMetadataModal() { + this.modalRef.close(); } /** * Cancels the current update for this field in the object updates service */ undo(): void { - this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.item.uuid); + this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.fieldUpdate.field.uuid); } /** @@ -70,5 +146,4 @@ export class EditRelationshipComponent implements OnChanges { canUndo(): boolean { return this.fieldUpdate.changeType >= 0; } - } diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts index e8f34bc70e..92b138e962 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -1,8 +1,12 @@ import { ChangeDetectorRef, Component, Inject, OnDestroy } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; -import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer'; +import { + DeleteRelationship, + FieldUpdate, + FieldUpdates +} from '../../../core/data/object-updates/object-updates.reducer'; import { Observable } from 'rxjs/internal/Observable'; -import { filter, map, switchMap, take, tap } from 'rxjs/operators'; +import {filter, map, switchMap, take, tap} from 'rxjs/operators'; import { combineLatest as observableCombineLatest, zip as observableZip } from 'rxjs'; import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component'; import { ItemDataService } from '../../../core/data/item-data.service'; @@ -18,7 +22,7 @@ import { ErrorResponse, RestResponse } from '../../../core/cache/response.models import { isNotEmptyOperator } from '../../../shared/empty.util'; import { RemoteData } from '../../../core/data/remote-data'; import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { getSucceededRemoteData } from '../../../core/shared/operators'; +import { getSucceededRemoteData} from '../../../core/shared/operators'; import { RequestService } from '../../../core/data/request.service'; import { Subscription } from 'rxjs/internal/Subscription'; import { getRelationsByRelatedItemIds } from '../../simple/item-types/shared/item-relationships-utils'; @@ -104,22 +108,36 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl * Make sure the lists are refreshed afterwards and notifications are sent for success and errors */ public submit(): void { - // Get all IDs of related items of which their relationship with the current item is about to be removed - const removedItemIds$ = this.relationshipService.getRelatedItems(this.item).pipe( - switchMap((items: Item[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, items) as Observable), - map((fieldUpdates: FieldUpdates) => Object.values(fieldUpdates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)), - map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field.uuid) as string[]), - isNotEmptyOperator() - ); // Get all the relationships that should be removed - const removedRelationships$ = removedItemIds$.pipe( - getRelationsByRelatedItemIds(this.item, this.relationshipService) + const removedRelationshipIDs$ = this.relationshipService.getItemRelationshipsArray(this.item).pipe( + map((relationships: Relationship[]) => relationships.map(relationship => + Object.assign(new Relationship(), relationship, {uuid: relationship.id}) + )), + switchMap((relationships: Relationship[]) => { + return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable + }), + map((fieldUpdates: FieldUpdates) => Object.values(fieldUpdates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)), + map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field) as DeleteRelationship[]), + isNotEmptyOperator(), ); - // Request a delete for every relationship found in the observable created above - removedRelationships$.pipe( + removedRelationshipIDs$.pipe( take(1), - map((removedRelationships: Relationship[]) => removedRelationships.map((rel: Relationship) => rel.id)), - switchMap((removedIds: string[]) => observableZip(...removedIds.map((uuid: string) => this.relationshipService.deleteRelationship(uuid)))) + switchMap((deleteRelationships: DeleteRelationship[]) => + observableZip(...deleteRelationships.map((deleteRelationship) => { + let copyVirtualMetadata : string; + if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) { + copyVirtualMetadata = 'all'; + } else if (deleteRelationship.keepLeftVirtualMetadata) { + copyVirtualMetadata = 'left'; + } else if (deleteRelationship.keepRightVirtualMetadata) { + copyVirtualMetadata = 'right'; + } else { + copyVirtualMetadata = 'none'; + } + return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata); + } + )) + ), ).subscribe((responses: RestResponse[]) => { this.displayNotifications(responses); this.reset(); diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html new file mode 100644 index 0000000000..aafdb00b47 --- /dev/null +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -0,0 +1,42 @@ +
+
{{'virtual-metadata-modal.head' | translate}} + +
+
+
+
+
+
+ +
+
+ +
+
+
+ {{metadata.metadataField}} +
+
+ {{metadata.metadataValue.value}} +
+
+
+
+
+
+
+
+ +
+
+
diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts new file mode 100644 index 0000000000..7b37b238e8 --- /dev/null +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts @@ -0,0 +1,172 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { Item } from '../../../core/shared/item.model'; +import { RouterStub } from '../../../shared/testing/router-stub'; +import { CommonModule } from '@angular/common'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { VirtualMetadataComponent } from './virtual-metadata.component'; +import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { SearchService } from '../../../+search-page/search-service/search.service'; +import { of as observableOf } from 'rxjs'; +import { FormsModule } from '@angular/forms'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { RestResponse } from '../../../core/cache/response.models'; +import { Collection } from '../../../core/shared/collection.model'; + +// describe('ItemMoveComponent', () => { +// let comp: VirtualMetadataComponent; +// let fixture: ComponentFixture; +// +// const mockItem = Object.assign(new Item(), { +// id: 'fake-id', +// handle: 'fake/handle', +// lastModified: '2018' +// }); +// +// const itemPageUrl = `fake-url/${mockItem.id}`; +// const routerStub = Object.assign(new RouterStub(), { +// url: `${itemPageUrl}/edit` +// }); +// +// const mockItemDataService = jasmine.createSpyObj({ +// moveToCollection: observableOf(new RestResponse(true, 200, 'Success')) +// }); +// +// const mockItemDataServiceFail = jasmine.createSpyObj({ +// moveToCollection: observableOf(new RestResponse(false, 500, 'Internal server error')) +// }); +// +// const routeStub = { +// data: observableOf({ +// item: new RemoteData(false, false, true, null, { +// id: 'item1' +// }) +// }) +// }; +// +// const collection1 = Object.assign(new Collection(),{ +// uuid: 'collection-uuid-1', +// name: 'Test collection 1', +// self: 'self-link-1', +// }); +// +// const collection2 = Object.assign(new Collection(),{ +// uuid: 'collection-uuid-2', +// name: 'Test collection 2', +// self: 'self-link-2', +// }); +// +// const mockSearchService = { +// search: () => { +// return observableOf(new RemoteData(false, false, true, null, +// new PaginatedList(null, [ +// { +// indexableObject: collection1, +// hitHighlights: {} +// }, { +// indexableObject: collection2, +// hitHighlights: {} +// } +// ]))); +// } +// }; +// +// const notificationsServiceStub = new NotificationsServiceStub(); +// +// describe('ItemMoveComponent success', () => { +// beforeEach(async(() => { +// TestBed.configureTestingModule({ +// imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], +// declarations: [VirtualMetadataComponent], +// providers: [ +// {provide: ActivatedRoute, useValue: routeStub}, +// {provide: Router, useValue: routerStub}, +// {provide: ItemDataService, useValue: mockItemDataService}, +// {provide: NotificationsService, useValue: notificationsServiceStub}, +// {provide: SearchService, useValue: mockSearchService}, +// ], schemas: [ +// CUSTOM_ELEMENTS_SCHEMA +// ] +// }).compileComponents(); +// })); +// +// beforeEach(() => { +// fixture = TestBed.createComponent(VirtualMetadataComponent); +// comp = fixture.componentInstance; +// fixture.detectChanges(); +// }); +// it('should load suggestions', () => { +// const expected = [ +// collection1, +// collection2 +// ]; +// +// comp.collectionSearchResults.subscribe((value) => { +// expect(value).toEqual(expected); +// } +// ); +// }); +// it('should get current url ', () => { +// expect(comp.getCurrentUrl()).toEqual('fake-url/fake-id/edit'); +// }); +// it('should on click select the correct collection name and id', () => { +// const data = collection1; +// +// comp.onClick(data); +// +// expect(comp.selectedCollectionName).toEqual('Test collection 1'); +// expect(comp.selectedCollection).toEqual(collection1); +// }); +// describe('moveCollection', () => { +// it('should call itemDataService.moveToCollection', () => { +// comp.itemId = 'item-id'; +// comp.selectedCollectionName = 'selected-collection-id'; +// comp.selectedCollection = collection1; +// comp.moveCollection(); +// +// expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1); +// }); +// it('should call notificationsService success message on success', () => { +// comp.moveCollection(); +// +// expect(notificationsServiceStub.success).toHaveBeenCalled(); +// }); +// }); +// }); +// +// describe('ItemMoveComponent fail', () => { +// beforeEach(async(() => { +// TestBed.configureTestingModule({ +// imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], +// declarations: [VirtualMetadataComponent], +// providers: [ +// {provide: ActivatedRoute, useValue: routeStub}, +// {provide: Router, useValue: routerStub}, +// {provide: ItemDataService, useValue: mockItemDataServiceFail}, +// {provide: NotificationsService, useValue: notificationsServiceStub}, +// {provide: SearchService, useValue: mockSearchService}, +// ], schemas: [ +// CUSTOM_ELEMENTS_SCHEMA +// ] +// }).compileComponents(); +// })); +// +// beforeEach(() => { +// fixture = TestBed.createComponent(VirtualMetadataComponent); +// comp = fixture.componentInstance; +// fixture.detectChanges(); +// }); +// +// it('should call notificationsService error message on fail', () => { +// comp.moveCollection(); +// +// expect(notificationsServiceStub.error).toHaveBeenCalled(); +// }); +// }); +// }); diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts new file mode 100644 index 0000000000..c3379750a2 --- /dev/null +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -0,0 +1,66 @@ +import {Component, EventEmitter, Input, OnChanges, Output} from '@angular/core'; +import {ActivatedRoute} from '@angular/router'; +import {Observable} from 'rxjs'; +import {Item} from "../../../core/shared/item.model"; +import {Relationship} from "../../../core/shared/item-relationships/relationship.model"; +import {MetadataValue} from "../../../core/shared/metadata.models"; +import {getRemoteDataPayload, getSucceededRemoteData} from "../../../core/shared/operators"; +import {ObjectUpdatesService} from "../../../core/data/object-updates/object-updates.service"; + +@Component({ + selector: 'ds-virtual-metadata', + templateUrl: './virtual-metadata.component.html' +}) +/** + * Component that handles the moving of an item to a different collection + */ +export class VirtualMetadataComponent implements OnChanges { + + /** + * The current url of this page + */ + @Input() url: string; + + @Input() relationship: Relationship; + + @Output() close = new EventEmitter(); + @Output() save = new EventEmitter(); + + constructor( + protected route: ActivatedRoute, + protected objectUpdatesService: ObjectUpdatesService, + ) { + } + + leftItem$: Observable; + rightItem$: Observable; + + ngOnChanges(): void { + this.leftItem$ = this.relationship.leftItem.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + ); + this.rightItem$ = this.relationship.rightItem.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + ); + } + + getVirtualMetadata(relationship: Relationship, relatedItem: Item): VirtualMetadata[] { + + return this.objectUpdatesService.getVirtualMetadataList(relationship, relatedItem); + } + + setSelectedVirtualMetadataItem(item: Item, selected: boolean) { + this.objectUpdatesService.setSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid, selected); + } + + isSelectedVirtualMetadataItem(item: Item): Observable { + return this.objectUpdatesService.isSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid); + } +} + +export interface VirtualMetadata { + metadataField: string, + metadataValue: MetadataValue, +} diff --git a/src/app/core/data/object-updates/object-updates.actions.ts b/src/app/core/data/object-updates/object-updates.actions.ts index 6cd74b2626..17ad145eb6 100644 --- a/src/app/core/data/object-updates/object-updates.actions.ts +++ b/src/app/core/data/object-updates/object-updates.actions.ts @@ -1,7 +1,7 @@ -import { type } from '../../../shared/ngrx/type'; -import { Action } from '@ngrx/store'; -import { Identifiable } from './object-updates.reducer'; -import { INotification } from '../../../shared/notifications/models/notification.model'; +import {type} from '../../../shared/ngrx/type'; +import {Action} from '@ngrx/store'; +import {Identifiable} from './object-updates.reducer'; +import {INotification} from '../../../shared/notifications/models/notification.model'; /** * The list of ObjectUpdatesAction type definitions @@ -11,6 +11,7 @@ export const ObjectUpdatesActionTypes = { SET_EDITABLE_FIELD: type('dspace/core/cache/object-updates/SET_EDITABLE_FIELD'), SET_VALID_FIELD: type('dspace/core/cache/object-updates/SET_VALID_FIELD'), ADD_FIELD: type('dspace/core/cache/object-updates/ADD_FIELD'), + SELECT_VIRTUAL_METADATA: type('dspace/core/cache/object-updates/SELECT_VIRTUAL_METADATA'), DISCARD: type('dspace/core/cache/object-updates/DISCARD'), REINSTATE: type('dspace/core/cache/object-updates/REINSTATE'), REMOVE: type('dspace/core/cache/object-updates/REMOVE'), @@ -83,6 +84,34 @@ export class AddFieldUpdateAction implements Action { } } +export class SelectVirtualMetadataAction implements Action { + + type = ObjectUpdatesActionTypes.SELECT_VIRTUAL_METADATA; + payload: { + url: string, + source: string, + uuid: string, + select: boolean; + }; + + /** + * Create a new AddFieldUpdateAction + * + * @param url + * the unique url of the page for which a field update is added + * @param field The identifiable field of which a new update is added + * @param changeType The update's change type + */ + constructor( + url: string, + source: string, + uuid: string, + select: boolean, + ) { + this.payload = { url, source, uuid, select: select}; + } +} + /** * An ngrx action to set the editable state of an existing field in the ObjectUpdates state for a certain page url */ @@ -242,4 +271,5 @@ export type ObjectUpdatesAction | DiscardObjectUpdatesAction | ReinstateObjectUpdatesAction | RemoveObjectUpdatesAction - | RemoveFieldUpdateAction; + | RemoveFieldUpdateAction + | SelectVirtualMetadataAction; diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts index f5698b9b78..8d821c9926 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts @@ -79,7 +79,8 @@ describe('objectUpdatesReducer', () => { changeType: FieldChangeType.ADD } }, - lastModified: modDate + lastModified: modDate, + virtualMetadataSources: {}, } }; @@ -213,6 +214,7 @@ describe('objectUpdatesReducer', () => { }, }, fieldUpdates: {}, + virtualMetadataSources: {}, lastModified: modDate } }; diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts index c0f10ff92a..41d1704797 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.ts @@ -7,9 +7,13 @@ import { ObjectUpdatesActionTypes, ReinstateObjectUpdatesAction, RemoveFieldUpdateAction, - RemoveObjectUpdatesAction, SetEditableFieldUpdateAction, SetValidFieldUpdateAction + RemoveObjectUpdatesAction, + SetEditableFieldUpdateAction, + SetValidFieldUpdateAction, + SelectVirtualMetadataAction, } from './object-updates.actions'; import { hasNoValue, hasValue } from '../../../shared/empty.util'; +import {Relationship} from "../../shared/item-relationships/relationship.model"; /** * Path where discarded objects are saved @@ -42,7 +46,7 @@ export interface Identifiable { /** * The state of a single field update */ -export interface FieldUpdate { +export interface FieldUpdate { field: Identifiable, changeType: FieldChangeType } @@ -54,12 +58,26 @@ export interface FieldUpdates { [uuid: string]: FieldUpdate; } +export interface VirtualMetadataSources { + [source: string]: VirtualMetadataSource +} + +export interface VirtualMetadataSource { + [uuid: string]: boolean, +} + +export interface DeleteRelationship extends Relationship { + keepLeftVirtualMetadata: boolean, + keepRightVirtualMetadata: boolean, +} + /** * The updated state of a single page */ export interface ObjectUpdatesEntry { fieldStates: FieldStates; - fieldUpdates: FieldUpdates + fieldUpdates: FieldUpdates; + virtualMetadataSources: VirtualMetadataSources; lastModified: Date; } @@ -96,6 +114,9 @@ export function objectUpdatesReducer(state = initialState, action: ObjectUpdates case ObjectUpdatesActionTypes.ADD_FIELD: { return addFieldUpdate(state, action as AddFieldUpdateAction); } + case ObjectUpdatesActionTypes.SELECT_VIRTUAL_METADATA: { + return selectVirtualMetadata(state, action as SelectVirtualMetadataAction); + } case ObjectUpdatesActionTypes.DISCARD: { return discardObjectUpdates(state, action as DiscardObjectUpdatesAction); } @@ -135,6 +156,7 @@ function initializeFieldsUpdate(state: any, action: InitializeFieldsAction) { state[url], { fieldStates: fieldStates }, { fieldUpdates: {} }, + { virtualMetadataSources: {} }, { lastModified: lastModifiedServer } ); return Object.assign({}, state, { [url]: newPageState }); @@ -169,6 +191,51 @@ function addFieldUpdate(state: any, action: AddFieldUpdateAction) { return Object.assign({}, state, { [url]: newPageState }); } +/** + * Add a new update for a specific field to the store + * @param state The current state + * @param action The action to perform on the current state + */ +function selectVirtualMetadata(state: any, action: SelectVirtualMetadataAction) { + + const url: string = action.payload.url; + const source: string = action.payload.source; + const uuid: string = action.payload.uuid; + const select: boolean = action.payload.select; + + const pageState: ObjectUpdatesEntry = state[url] || {}; + + const virtualMetadataSource = Object.assign( + {}, + pageState.virtualMetadataSources[source], + { + [uuid]: select, + }, + ); + + const virtualMetadataSources = Object.assign( + {}, + pageState.virtualMetadataSources, + { + [source]: virtualMetadataSource, + }, + ); + + const newPageState = Object.assign( + {}, + pageState, + {virtualMetadataSources: virtualMetadataSources}, + ); + + return Object.assign( + {}, + state, + { + [url]: newPageState, + } + ); +} + /** * Discard all updates for a specific action's url in the store * @param state The current state diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts index 08745f9223..0e8b1c8d07 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -1,16 +1,17 @@ -import { Injectable } from '@angular/core'; -import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store'; -import { CoreState } from '../../core.reducers'; -import { coreSelector } from '../../core.selectors'; +import {Injectable} from '@angular/core'; +import {createSelector, MemoizedSelector, select, Store} from '@ngrx/store'; +import {CoreState} from '../../core.reducers'; +import {coreSelector} from '../../core.selectors'; import { FieldState, FieldUpdates, Identifiable, OBJECT_UPDATES_TRASH_PATH, ObjectUpdatesEntry, - ObjectUpdatesState + ObjectUpdatesState, + VirtualMetadataSource } from './object-updates.reducer'; -import { Observable } from 'rxjs'; +import {Observable} from 'rxjs'; import { AddFieldUpdateAction, DiscardObjectUpdatesAction, @@ -18,12 +19,17 @@ import { InitializeFieldsAction, ReinstateObjectUpdatesAction, RemoveFieldUpdateAction, + SelectVirtualMetadataAction, SetEditableFieldUpdateAction, SetValidFieldUpdateAction } from './object-updates.actions'; -import { distinctUntilChanged, filter, map } from 'rxjs/operators'; -import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util'; -import { INotification } from '../../../shared/notifications/models/notification.model'; +import {distinctUntilChanged, filter, map} from 'rxjs/operators'; +import {hasNoValue, hasValue, isEmpty, isNotEmpty} from '../../../shared/empty.util'; +import {INotification} from '../../../shared/notifications/models/notification.model'; +import {Item} from "../../shared/item.model"; +import {Relationship} from "../../shared/item-relationships/relationship.model"; +import {MetadataValue} from "../../shared/metadata.models"; +import {VirtualMetadata} from "../../../+item-page/edit-item-page/virtual-metadata/virtual-metadata.component"; function objectUpdatesStateSelector(): MemoizedSelector { return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']); @@ -37,6 +43,10 @@ function filterByUrlAndUUIDFieldStateSelector(url: string, uuid: string): Memoiz return createSelector(filterByUrlObjectUpdatesStateSelector(url), (state: ObjectUpdatesEntry) => state.fieldStates[uuid]); } +function virtualMetadataSourceSelector(url: string, source: string): MemoizedSelector { + return createSelector(filterByUrlObjectUpdatesStateSelector(url), (state: ObjectUpdatesEntry) => state.virtualMetadataSources[source]); +} + /** * Service that dispatches and reads from the ObjectUpdates' state in the store */ @@ -195,6 +205,41 @@ export class ObjectUpdatesService { this.saveFieldUpdate(url, field, FieldChangeType.UPDATE); } + getVirtualMetadataList(relationship: Relationship, item: Item): VirtualMetadata[] { + return Object.entries(item.metadata) + .map(([key, value]) => + value + .filter((metadata: MetadataValue) => + metadata.authority && metadata.authority.endsWith(relationship.id)) + .map((metadata: MetadataValue) => { + return { + metadataField: key, + metadataValue: metadata, + } + }) + ) + .reduce((previous, current) => previous.concat(current)); + } + + isSelectedVirtualMetadataItem(url: string, relationship: string, item: string): Observable { + + return this.store + .pipe( + select(virtualMetadataSourceSelector(url, relationship)), + map(virtualMetadataSource => virtualMetadataSource && virtualMetadataSource[item]), + ); + } + + /** + * Method to dispatch an AddFieldUpdateAction to the store + * @param url The page's URL for which the changes are saved + * @param field An updated field for the page's object + * @param changeType The last type of change applied to this field + */ + setSelectedVirtualMetadataItem(url: string, relationship: string, item: string, selected: boolean) { + this.store.dispatch(new SelectVirtualMetadataAction(url, relationship, item, selected)); + } + /** * Dispatches a SetEditableFieldUpdateAction to the store to set a field's editable state * @param url The URL of the page on which the field resides diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts index 4091759386..7d51f167d3 100644 --- a/src/app/core/data/relationship.service.spec.ts +++ b/src/app/core/data/relationship.service.spec.ts @@ -109,7 +109,7 @@ describe('RelationshipService', () => { beforeEach(() => { spyOn(service, 'findById').and.returnValue(getRemotedataObservable(relationship1)); spyOn(objectCache, 'remove'); - service.deleteRelationship(relationships[0].uuid).subscribe(); + service.deleteRelationship(relationships[0].uuid, 'none').subscribe(); }); it('should send a DeleteRequest', () => { diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts index c466bd15af..a4a24e8aaa 100644 --- a/src/app/core/data/relationship.service.ts +++ b/src/app/core/data/relationship.service.ts @@ -31,7 +31,7 @@ import { NormalizedObjectBuildService } from '../cache/builders/normalized-objec import { Store } from '@ngrx/store'; import { CoreState } from '../core.reducers'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { HttpClient } from '@angular/common/http'; +import {HttpClient} from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; import { SearchParam } from '../cache/models/search-param.model'; @@ -83,11 +83,13 @@ export class RelationshipService extends DataService { * Send a delete request for a relationship by ID * @param uuid */ - deleteRelationship(uuid: string): Observable { + deleteRelationship(uuid: string, copyVirtualMetadata: string): Observable { return this.getRelationshipEndpoint(uuid).pipe( isNotEmptyOperator(), distinctUntilChanged(), - map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)), + map((endpointURL: string) => + new DeleteRequest(this.requestService.generateRequestId(), endpointURL + "?copyVirtualMetadata=" + copyVirtualMetadata) + ), configureRequest(this.requestService), switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)), getResponseFromEntry(), @@ -269,5 +271,4 @@ export class RelationshipService extends DataService { this.requestService.removeByHrefSubstring(rightItem.payload.self); }); } - } From b1f4a90a582f54cb0bd106e77c9cdf6c6c8c283f Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 26 Nov 2019 17:31:47 +0100 Subject: [PATCH 25/70] taskid 66074 Keep virtual metadata on relationship delete - fix lint issues --- .../edit-item-page/edit-item-page.module.ts | 2 +- .../edit-relationship-list.component.ts | 4 ++-- .../edit-relationship.component.ts | 21 +++++++++---------- .../item-relationships.component.ts | 4 ++-- .../virtual-metadata.component.ts | 16 +++++++------- .../object-updates/object-updates.reducer.ts | 2 +- .../object-updates/object-updates.service.ts | 10 ++++----- src/app/core/data/relationship.service.ts | 2 +- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts index 6d86e7f35c..5eda9aef10 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts +++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts @@ -21,7 +21,7 @@ import { ItemRelationshipsComponent } from './item-relationships/item-relationsh import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component'; import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component'; import { ItemMoveComponent } from './item-move/item-move.component'; -import {VirtualMetadataComponent} from "./virtual-metadata/virtual-metadata.component"; +import {VirtualMetadataComponent} from './virtual-metadata/virtual-metadata.component'; /** * Module that contains all components related to the Edit Item page administrator functionality diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index e7d1a14200..7645b2b4b7 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -6,7 +6,7 @@ import { RelationshipService } from '../../../../core/data/relationship.service' import { Item } from '../../../../core/shared/item.model'; import { map, switchMap} from 'rxjs/operators'; import { hasValue } from '../../../../shared/empty.util'; -import {Relationship} from "../../../../core/shared/item-relationships/relationship.model"; +import {Relationship} from '../../../../core/shared/item-relationships/relationship.model'; @Component({ selector: 'ds-edit-relationship-list', @@ -66,7 +66,7 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { */ public getUpdatesByLabel(label: string): Observable { return this.relationshipService.getItemRelationshipsByLabel(this.item, label).pipe( - map(relationsRD => relationsRD.payload.page.map(relationship => + map((relationsRD) => relationsRD.payload.page.map((relationship) => Object.assign(new Relationship(), relationship, {uuid: relationship.id}) )), switchMap((initialFields) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, initialFields)), diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts index 7c1780da58..220582a5fd 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts @@ -9,7 +9,7 @@ import {Item} from '../../../../core/shared/item.model'; import {getRemoteDataPayload, getSucceededRemoteData} from '../../../../core/shared/operators'; import {ViewMode} from '../../../../core/shared/view-mode.model'; import {hasValue, isNotEmpty} from '../../../../shared/empty.util'; -import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap"; +import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; @Component({ // tslint:disable-next-line:component-selector @@ -53,6 +53,11 @@ export class EditRelationshipComponent implements OnChanges { */ viewMode = ViewMode.ListElement; + /** + * Reference to NgbModal + */ + public modalRef: NgbModalRef; + constructor( private objectUpdatesService: ObjectUpdatesService, private modalService: NgbModal, @@ -93,17 +98,16 @@ export class EditRelationshipComponent implements OnChanges { this.rightItem$, ).pipe( map((items: Item[]) => - items.map(item => this.objectUpdatesService + items.map((item) => this.objectUpdatesService .isSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid)) ), - switchMap((selection$: Observable[]) => observableCombineLatest(selection$)), + switchMap((selection$) => observableCombineLatest(selection$)), map((selection: boolean[]) => { return Object.assign({}, this.fieldUpdate.field, { - uuid: this.relationship.id, - keepLeftVirtualMetadata: selection[0] == true, - keepRightVirtualMetadata: selection[1] == true, + keepLeftVirtualMetadata: selection[0] === true, + keepRightVirtualMetadata: selection[1] === true, } ) as DeleteRelationship }), @@ -113,11 +117,6 @@ export class EditRelationshipComponent implements OnChanges { ); } - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - openVirtualMetadataModal(content: any) { this.modalRef = this.modalService.open(content); } diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts index 92b138e962..fadba3b981 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -110,7 +110,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl public submit(): void { // Get all the relationships that should be removed const removedRelationshipIDs$ = this.relationshipService.getItemRelationshipsArray(this.item).pipe( - map((relationships: Relationship[]) => relationships.map(relationship => + map((relationships: Relationship[]) => relationships.map((relationship) => Object.assign(new Relationship(), relationship, {uuid: relationship.id}) )), switchMap((relationships: Relationship[]) => { @@ -124,7 +124,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl take(1), switchMap((deleteRelationships: DeleteRelationship[]) => observableZip(...deleteRelationships.map((deleteRelationship) => { - let copyVirtualMetadata : string; + let copyVirtualMetadata: string; if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) { copyVirtualMetadata = 'all'; } else if (deleteRelationship.keepLeftVirtualMetadata) { diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts index c3379750a2..170c3aec0c 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -1,11 +1,11 @@ import {Component, EventEmitter, Input, OnChanges, Output} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {Observable} from 'rxjs'; -import {Item} from "../../../core/shared/item.model"; -import {Relationship} from "../../../core/shared/item-relationships/relationship.model"; -import {MetadataValue} from "../../../core/shared/metadata.models"; -import {getRemoteDataPayload, getSucceededRemoteData} from "../../../core/shared/operators"; -import {ObjectUpdatesService} from "../../../core/data/object-updates/object-updates.service"; +import {Item} from '../../../core/shared/item.model'; +import {Relationship} from '../../../core/shared/item-relationships/relationship.model'; +import {MetadataValue} from '../../../core/shared/metadata.models'; +import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators'; +import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; @Component({ selector: 'ds-virtual-metadata', @@ -26,15 +26,15 @@ export class VirtualMetadataComponent implements OnChanges { @Output() close = new EventEmitter(); @Output() save = new EventEmitter(); + leftItem$: Observable; + rightItem$: Observable; + constructor( protected route: ActivatedRoute, protected objectUpdatesService: ObjectUpdatesService, ) { } - leftItem$: Observable; - rightItem$: Observable; - ngOnChanges(): void { this.leftItem$ = this.relationship.leftItem.pipe( getSucceededRemoteData(), diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts index 41d1704797..daf7555692 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.ts @@ -13,7 +13,7 @@ import { SelectVirtualMetadataAction, } from './object-updates.actions'; import { hasNoValue, hasValue } from '../../../shared/empty.util'; -import {Relationship} from "../../shared/item-relationships/relationship.model"; +import {Relationship} from '../../shared/item-relationships/relationship.model'; /** * Path where discarded objects are saved diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts index 0e8b1c8d07..5063a8a005 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -26,10 +26,10 @@ import { import {distinctUntilChanged, filter, map} from 'rxjs/operators'; import {hasNoValue, hasValue, isEmpty, isNotEmpty} from '../../../shared/empty.util'; import {INotification} from '../../../shared/notifications/models/notification.model'; -import {Item} from "../../shared/item.model"; -import {Relationship} from "../../shared/item-relationships/relationship.model"; -import {MetadataValue} from "../../shared/metadata.models"; -import {VirtualMetadata} from "../../../+item-page/edit-item-page/virtual-metadata/virtual-metadata.component"; +import {Item} from '../../shared/item.model'; +import {Relationship} from '../../shared/item-relationships/relationship.model'; +import {MetadataValue} from '../../shared/metadata.models'; +import {VirtualMetadata} from '../../../+item-page/edit-item-page/virtual-metadata/virtual-metadata.component'; function objectUpdatesStateSelector(): MemoizedSelector { return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']); @@ -226,7 +226,7 @@ export class ObjectUpdatesService { return this.store .pipe( select(virtualMetadataSourceSelector(url, relationship)), - map(virtualMetadataSource => virtualMetadataSource && virtualMetadataSource[item]), + map((virtualMetadataSource) => virtualMetadataSource && virtualMetadataSource[item]), ); } diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts index a4a24e8aaa..895cb46ed1 100644 --- a/src/app/core/data/relationship.service.ts +++ b/src/app/core/data/relationship.service.ts @@ -88,7 +88,7 @@ export class RelationshipService extends DataService { isNotEmptyOperator(), distinctUntilChanged(), map((endpointURL: string) => - new DeleteRequest(this.requestService.generateRequestId(), endpointURL + "?copyVirtualMetadata=" + copyVirtualMetadata) + new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata) ), configureRequest(this.requestService), switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)), From 891415daae78bb1c19ebef10c2d4dbd914504c86 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 3 Dec 2019 16:52:41 +0100 Subject: [PATCH 26/70] taskid 66076 Keep virtual metadata on item delete - tests & docs & small fixes --- resources/i18n/en.json5 | 2 +- .../edit-relationship.component.ts | 2 +- .../item-relationships.component.spec.ts | 17 ++++++----- .../item-relationships.component.ts | 7 +++-- .../virtual-metadata.component.html | 2 +- .../virtual-metadata.component.ts | 18 +++++++++-- .../object-updates.reducer.spec.ts | 24 ++++++++++++--- .../object-updates/object-updates.reducer.ts | 12 +++++++- .../object-updates.service.spec.ts | 12 ++++++-- .../object-updates/object-updates.service.ts | 30 +++++-------------- 10 files changed, 81 insertions(+), 45 deletions(-) diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index 0dc5b51c05..0c34aa88b2 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -1686,6 +1686,6 @@ "uploader.queue-length": "Queue length", - "virtual-metadata-modal.head": "Select the items for which you want to save the virtual metadata as real metadata", + "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata", } diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts index 220582a5fd..3e24801992 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts @@ -99,7 +99,7 @@ export class EditRelationshipComponent implements OnChanges { ).pipe( map((items: Item[]) => items.map((item) => this.objectUpdatesService - .isSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid)) + .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid)) ), switchMap((selection$) => observableCombineLatest(selection$)), map((selection: boolean[]) => { diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts index 48bc28a1b9..4ac3f05a40 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts @@ -110,11 +110,14 @@ describe('ItemRelationshipsComponent', () => { relationships[1].rightItem = observableOf(new RemoteData(false, false, true, undefined, item)); fieldUpdate1 = { - field: author1, + field: relationships[0], changeType: undefined }; fieldUpdate2 = { - field: author2, + field: Object.assign( + relationships[1], + {keepLeftVirtualMetadata: true, keepRightVirtualMetadata: false} + ), changeType: FieldChangeType.REMOVE }; @@ -130,12 +133,12 @@ describe('ItemRelationshipsComponent', () => { objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', { getFieldUpdates: observableOf({ - [author1.uuid]: fieldUpdate1, - [author2.uuid]: fieldUpdate2 + [relationships[0].uuid]: fieldUpdate1, + [relationships[1].uuid]: fieldUpdate2 }), getFieldUpdatesExclusive: observableOf({ - [author1.uuid]: fieldUpdate1, - [author2.uuid]: fieldUpdate2 + [relationships[0].uuid]: fieldUpdate1, + [relationships[1].uuid]: fieldUpdate2 }), saveAddFieldUpdate: {}, discardFieldUpdates: {}, @@ -227,7 +230,7 @@ describe('ItemRelationshipsComponent', () => { }); it('it should delete the correct relationship', () => { - expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid); + expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left'); }); }); }); diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts index fadba3b981..1e678884b1 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -116,8 +116,11 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl switchMap((relationships: Relationship[]) => { return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable }), - map((fieldUpdates: FieldUpdates) => Object.values(fieldUpdates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)), - map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field) as DeleteRelationship[]), + map((fieldUpdates: FieldUpdates) => + Object.values(fieldUpdates) + .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE) + .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship) + ), isNotEmptyOperator(), ); removedRelationshipIDs$.pipe( diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html index aafdb00b47..8a0269d6b7 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -1,5 +1,5 @@
-
{{'virtual-metadata-modal.head' | translate}} +
{{'virtual-metadata.delete-relationship.modal-head' | translate}} diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts index 170c3aec0c..6a99080c1f 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -48,15 +48,27 @@ export class VirtualMetadataComponent implements OnChanges { getVirtualMetadata(relationship: Relationship, relatedItem: Item): VirtualMetadata[] { - return this.objectUpdatesService.getVirtualMetadataList(relationship, relatedItem); + return Object.entries(relatedItem.metadata) + .map(([key, value]) => + value + .filter((metadata: MetadataValue) => + metadata.authority && metadata.authority.endsWith(relationship.id)) + .map((metadata: MetadataValue) => { + return { + metadataField: key, + metadataValue: metadata, + } + }) + ) + .reduce((previous, current) => previous.concat(current)); } setSelectedVirtualMetadataItem(item: Item, selected: boolean) { - this.objectUpdatesService.setSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid, selected); + this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid, selected); } isSelectedVirtualMetadataItem(item: Item): Observable { - return this.objectUpdatesService.isSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid); + return this.objectUpdatesService.isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid); } } diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts index 8d821c9926..6ab3dcfec6 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts @@ -5,10 +5,11 @@ import { FieldChangeType, InitializeFieldsAction, ReinstateObjectUpdatesAction, - RemoveFieldUpdateAction, RemoveObjectUpdatesAction, + RemoveFieldUpdateAction, RemoveObjectUpdatesAction, SelectVirtualMetadataAction, SetEditableFieldUpdateAction, SetValidFieldUpdateAction } from './object-updates.actions'; import { OBJECT_UPDATES_TRASH_PATH, objectUpdatesReducer } from './object-updates.reducer'; +import {Relationship} from "../../shared/item-relationships/relationship.model"; class NullAction extends RemoveFieldUpdateAction { type = null; @@ -44,6 +45,7 @@ const identifiable3 = { language: null, value: 'Unchanged value' }; +const relationship: Relationship = Object.assign(new Relationship, {uuid: 'test relationship uuid'}); const modDate = new Date(2010, 2, 11); const uuid = identifiable1.uuid; @@ -80,7 +82,9 @@ describe('objectUpdatesReducer', () => { } }, lastModified: modDate, - virtualMetadataSources: {}, + virtualMetadataSources: { + [relationship.uuid]: {[identifiable1.uuid]: true} + }, } }; @@ -103,7 +107,10 @@ describe('objectUpdatesReducer', () => { isValid: true }, }, - lastModified: modDate + lastModified: modDate, + virtualMetadataSources: { + [relationship.uuid]: {[identifiable1.uuid]: true} + }, }, [url + OBJECT_UPDATES_TRASH_PATH]: { fieldStates: { @@ -134,7 +141,10 @@ describe('objectUpdatesReducer', () => { changeType: FieldChangeType.ADD } }, - lastModified: modDate + lastModified: modDate, + virtualMetadataSources: { + [relationship.uuid]: {[identifiable1.uuid]: true} + }, } }; @@ -196,6 +206,12 @@ describe('objectUpdatesReducer', () => { objectUpdatesReducer(testState, action); }); + it('should perform the SELECT_VIRTUAL_METADATA action without affecting the previous state', () => { + const action = new SelectVirtualMetadataAction(url, relationship.uuid, identifiable1.uuid, true); + // testState has already been frozen above + objectUpdatesReducer(testState, action); + }); + it('should initialize all fields when the INITIALIZE action is dispatched, based on the payload', () => { const action = new InitializeFieldsAction(url, [identifiable1, identifiable3], modDate); diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts index daf7555692..cffd41856d 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.ts @@ -58,14 +58,24 @@ export interface FieldUpdates { [uuid: string]: FieldUpdate; } +/** + * The states of all virtual metadata selections available for a single page, mapped by the relationship uuid + */ export interface VirtualMetadataSources { [source: string]: VirtualMetadataSource } +/** + * The selection of virtual metadata for a relationship, mapped by the uuid of either the item or the relationship type + */ export interface VirtualMetadataSource { [uuid: string]: boolean, } +/** + * A fieldupdate interface which represents a relationship selected to be deleted, + * along with a selection of the virtual metadata to keep + */ export interface DeleteRelationship extends Relationship { keepLeftVirtualMetadata: boolean, keepRightVirtualMetadata: boolean, @@ -192,7 +202,7 @@ function addFieldUpdate(state: any, action: AddFieldUpdateAction) { } /** - * Add a new update for a specific field to the store + * Update the selected virtual metadata in the store * @param state The current state * @param action The action to perform on the current state */ diff --git a/src/app/core/data/object-updates/object-updates.service.spec.ts b/src/app/core/data/object-updates/object-updates.service.spec.ts index e9fc4652b0..697d941123 100644 --- a/src/app/core/data/object-updates/object-updates.service.spec.ts +++ b/src/app/core/data/object-updates/object-updates.service.spec.ts @@ -4,13 +4,14 @@ import { ObjectUpdatesService } from './object-updates.service'; import { DiscardObjectUpdatesAction, FieldChangeType, - InitializeFieldsAction, ReinstateObjectUpdatesAction, RemoveFieldUpdateAction, + InitializeFieldsAction, ReinstateObjectUpdatesAction, RemoveFieldUpdateAction, SelectVirtualMetadataAction, SetEditableFieldUpdateAction } from './object-updates.actions'; import { of as observableOf } from 'rxjs'; import { Notification } from '../../../shared/notifications/models/notification.model'; import { NotificationType } from '../../../shared/notifications/models/notification-type'; import { OBJECT_UPDATES_TRASH_PATH } from './object-updates.reducer'; +import {Relationship} from "../../shared/item-relationships/relationship.model"; describe('ObjectUpdatesService', () => { let service: ObjectUpdatesService; @@ -22,6 +23,7 @@ describe('ObjectUpdatesService', () => { const identifiable2 = { uuid: '26cbb5ce-5786-4e57-a394-b9fcf8eaf241' }; const identifiable3 = { uuid: 'c5d2c2f7-d757-48bf-84cc-8c9229c8407e' }; const identifiables = [identifiable1, identifiable2]; + const relationship: Relationship = Object.assign(new Relationship, {uuid: 'test relationship uuid'}); const fieldUpdates = { [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE }, @@ -38,7 +40,7 @@ describe('ObjectUpdatesService', () => { }; const objectEntry = { - fieldStates, fieldUpdates, lastModified: modDate + fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {} }; store = new Store(undefined, undefined, undefined); spyOn(store, 'dispatch'); @@ -251,4 +253,10 @@ describe('ObjectUpdatesService', () => { }); }); + describe('setSelectedVirtualMetadata', () => { + it('should dispatch a SELECT_VIRTUAL_METADATA action with the correct URL, relationship, identifiable and boolean', () => { + service.setSelectedVirtualMetadata(url, relationship.uuid, identifiable1.uuid, true); + expect(store.dispatch).toHaveBeenCalledWith(new SelectVirtualMetadataAction(url, relationship.uuid, identifiable1.uuid, true)); + }); + }); }); diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts index 5063a8a005..448f7c9f38 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -204,24 +204,7 @@ export class ObjectUpdatesService { saveChangeFieldUpdate(url: string, field: Identifiable) { this.saveFieldUpdate(url, field, FieldChangeType.UPDATE); } - - getVirtualMetadataList(relationship: Relationship, item: Item): VirtualMetadata[] { - return Object.entries(item.metadata) - .map(([key, value]) => - value - .filter((metadata: MetadataValue) => - metadata.authority && metadata.authority.endsWith(relationship.id)) - .map((metadata: MetadataValue) => { - return { - metadataField: key, - metadataValue: metadata, - } - }) - ) - .reduce((previous, current) => previous.concat(current)); - } - - isSelectedVirtualMetadataItem(url: string, relationship: string, item: string): Observable { + isSelectedVirtualMetadata(url: string, relationship: string, item: string): Observable { return this.store .pipe( @@ -231,13 +214,14 @@ export class ObjectUpdatesService { } /** - * Method to dispatch an AddFieldUpdateAction to the store + * Method to dispatch a SelectVirtualMetadataAction to the store * @param url The page's URL for which the changes are saved - * @param field An updated field for the page's object - * @param changeType The last type of change applied to this field + * @param relationship the relationship for which virtual metadata is selected + * @param uuid the selection identifier, can either be the item uuid or the relationship type uuid + * @param selected whether or not to select the virtual metadata to be saved */ - setSelectedVirtualMetadataItem(url: string, relationship: string, item: string, selected: boolean) { - this.store.dispatch(new SelectVirtualMetadataAction(url, relationship, item, selected)); + setSelectedVirtualMetadata(url: string, relationship: string, uuid: string, selected: boolean) { + this.store.dispatch(new SelectVirtualMetadataAction(url, relationship, uuid, selected)); } /** From 0210be1a53faeaef1fb93d886b29db94ebe682be Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 4 Dec 2019 17:54:01 +0100 Subject: [PATCH 27/70] 67611: External-Source-Entry import window --- resources/i18n/en.json5 | 26 +++ .../normalized-external-source-entry.model.ts | 6 + .../shared/external-source-entry.model.ts | 5 + ...try-list-submission-element.component.html | 13 +- ...entry-list-submission-element.component.ts | 28 ++- ...namic-lookup-relation-modal.component.html | 1 + ...namic-lookup-relation-modal.component.scss | 8 + ...elation-external-source-tab.component.html | 1 - ...-relation-external-source-tab.component.ts | 2 + ...l-source-entry-import-modal.component.html | 50 ++++++ ...l-source-entry-import-modal.component.scss | 3 + ...ource-entry-import-modal.component.spec.ts | 0 ...nal-source-entry-import-modal.component.ts | 162 ++++++++++++++++++ src/app/shared/shared.module.ts | 7 +- 14 files changed, 306 insertions(+), 6 deletions(-) create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.scss create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index df0d9b27f0..fe7949d8b1 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -1525,6 +1525,32 @@ "submission.sections.describe.relationship-lookup.close": "Close", + "submission.sections.describe.relationship-lookup.external-source.import-button-title": "Import remote entry", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.title": "Import Remote Entry", + "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page", diff --git a/src/app/core/cache/models/normalized-external-source-entry.model.ts b/src/app/core/cache/models/normalized-external-source-entry.model.ts index 02abbb32d8..d09d1fe7ea 100644 --- a/src/app/core/cache/models/normalized-external-source-entry.model.ts +++ b/src/app/core/cache/models/normalized-external-source-entry.model.ts @@ -25,6 +25,12 @@ export class NormalizedExternalSourceEntry extends NormalizedObject{{object.display}}
- +
+ +
+
+
{{object.display}}
+ +
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts index 673370cc2c..07d691a5cb 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts @@ -3,9 +3,13 @@ import { ExternalSourceEntry } from '../../../../../core/shared/external-source- import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { Context } from '../../../../../core/shared/context.model'; -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { Metadata } from '../../../../../core/shared/metadata.utils'; import { MetadataValue } from '../../../../../core/shared/metadata.models'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { ExternalSourceEntryImportModalComponent } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; +import { DsDynamicLookupRelationExternalSourceTabComponent } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; +import { hasValue } from '../../../../../shared/empty.util'; @listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.SubmissionModal) @Component({ @@ -19,7 +23,29 @@ export class ExternalSourceEntryListSubmissionElementComponent extends AbstractL */ uri: MetadataValue; + /** + * The modal for importing the entry + */ + modalRef: NgbModalRef; + + constructor(@Inject(DsDynamicLookupRelationExternalSourceTabComponent) private externalSourceTab: DsDynamicLookupRelationExternalSourceTabComponent, + private modalService: NgbModal) { + super(); + } + ngOnInit(): void { this.uri = Metadata.first(this.object.metadata, 'dc.identifier.uri'); } + + import(): void { + this.modalRef = this.modalService.open(ExternalSourceEntryImportModalComponent, { + size: 'lg', + container: 'ds-dynamic-lookup-relation-modal' + }); + const modalComp = this.modalRef.componentInstance; + modalComp.externalSourceEntry = this.object; + if (hasValue(this.externalSourceTab) && hasValue(this.externalSourceTab.relationship)) { + modalComp.relationship = this.externalSourceTab.relationship; + } + } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html index 46620aa00b..4c87ac8bdb 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html @@ -26,6 +26,7 @@ = new EventEmitter(); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html new file mode 100644 index 0000000000..d2ad3d403d --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -0,0 +1,50 @@ +
+ + +
+
+

{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.head.' + externalSourceEntry.externalSource | translate) }}

+
+
{{externalSourceEntry.display}}
+ +
+ +

{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.select' | translate) }}

+
+
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.entities' | translate) }}
+ + + +
+ + +
+
+
+
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.authority' | translate) }}
+ +
+ + +
+
+
+
+
+ +
+
+ +
+
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.scss new file mode 100644 index 0000000000..7db9839e38 --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.scss @@ -0,0 +1,3 @@ +.modal-footer { + justify-content: space-between; +} diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts new file mode 100644 index 0000000000..6a65ec9b05 --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -0,0 +1,162 @@ +import { Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model'; +import { MetadataValue } from '../../../../../../../core/shared/metadata.models'; +import { Metadata } from '../../../../../../../core/shared/metadata.utils'; +import { Observable } from 'rxjs/internal/Observable'; +import { RemoteData } from '../../../../../../../core/data/remote-data'; +import { PaginatedList } from '../../../../../../../core/data/paginated-list'; +import { SearchResult } from '../../../../../../search/search-result.model'; +import { Item } from '../../../../../../../core/shared/item.model'; +import { RelationshipOptions } from '../../../../models/relationship-options.model'; +import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service'; +import { PaginatedSearchOptions } from '../../../../../../search/paginated-search-options.model'; +import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type'; +import { Context } from '../../../../../../../core/shared/context.model'; +import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; + +/** + * The possible types of import for the external entry + */ +export enum ImportType { + None = 'None', + LocalEntity = 'LocalEntity', + LocalAuthority = 'LocalAuthority', + NewEntity = 'NewEntity', + NewAuthority = 'NewAuthority' +} + +@Component({ + selector: 'ds-external-source-entry-import-modal', + styleUrls: ['./external-source-entry-import-modal.component.scss'], + templateUrl: './external-source-entry-import-modal.component.html' +}) +export class ExternalSourceEntryImportModalComponent implements OnInit { + /** + * The external source entry + */ + externalSourceEntry: ExternalSourceEntry; + + /** + * The current relationship-options used for filtering results + */ + relationship: RelationshipOptions; + + /** + * The metadata value for the entry's uri + */ + uri: MetadataValue; + + /** + * Local entities with a similar name + */ + localEntitiesRD$: Observable>>>; + + /** + * Search options to use for fetching similar results + */ + searchOptions: PaginatedSearchOptions; + + /** + * The type of link to render in listable elements + */ + linkTypes = CollectionElementLinkType; + + /** + * The context we're currently in (submission) + */ + context = Context.SubmissionModal; + + /** + * List ID for selecting local entities + */ + entityListId = 'external-source-import-entity'; + + /** + * List ID for selecting local authorities + */ + authorityListId = 'external-source-import-authority'; + + /** + * ImportType enum + */ + importType = ImportType; + + /** + * The type of import the user currently has selected + */ + selectedImportType = ImportType.None; + + constructor(public modal: NgbActiveModal, + public lookupRelationService: LookupRelationService, + private selectService: SelectableListService) { + } + + ngOnInit(): void { + this.uri = Metadata.first(this.externalSourceEntry.metadata, 'dc.identifier.uri'); + this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: this.externalSourceEntry.value })); + this.localEntitiesRD$ = this.lookupRelationService.getLocalResults(this.relationship, this.searchOptions); + } + + /** + * Close the window + */ + close() { + this.modal.close(); + } + + /** + * Perform the import of the external entry + */ + import() { + console.log('TODO: Import'); + } + + /** + * Deselected a local entity + * @param event + */ + deselectEntity(event) { + this.selectedImportType = ImportType.None; + } + + /** + * Selected a local entity + * @param event + */ + selectEntity(event) { + this.selectedImportType = ImportType.LocalEntity; + } + + /** + * Selected/deselected the new entity option + */ + selectNewEntity() { + if (this.selectedImportType === ImportType.NewEntity) { + this.selectedImportType = ImportType.None; + } else { + this.selectedImportType = ImportType.NewEntity; + this.deselectAllLists(); + } + } + + /** + * Selected/deselected the new authority option + */ + selectNewAuthority() { + if (this.selectedImportType === ImportType.NewAuthority) { + this.selectedImportType = ImportType.None; + } else { + this.selectedImportType = ImportType.NewAuthority; + this.deselectAllLists(); + } + } + + /** + * Deselect every element from both entity and authority lists + */ + deselectAllLists() { + this.selectService.deselectAll(this.entityListId); + this.selectService.deselectAll(this.authorityListId); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 903083e931..230bb1f073 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -175,6 +175,7 @@ import { SidebarFilterSelectedOptionComponent } from './sidebar/filter/sidebar-f import { MetadataRepresentationListComponent } from '../+item-page/simple/metadata-representation-list/metadata-representation-list.component'; import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component'; import { DsDynamicLookupRelationExternalSourceTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; +import { ExternalSourceEntryImportModalComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -331,7 +332,8 @@ const COMPONENTS = [ ItemSelectComponent, CollectionSelectComponent, MetadataRepresentationLoaderComponent, - SelectableListItemControlComponent + SelectableListItemControlComponent, + ExternalSourceEntryImportModalComponent ]; const ENTRY_COMPONENTS = [ @@ -393,7 +395,8 @@ const ENTRY_COMPONENTS = [ SearchAuthorityFilterComponent, DsDynamicLookupRelationSearchTabComponent, DsDynamicLookupRelationSelectionTabComponent, - DsDynamicLookupRelationExternalSourceTabComponent + DsDynamicLookupRelationExternalSourceTabComponent, + ExternalSourceEntryImportModalComponent ]; const SHARED_ITEM_PAGE_COMPONENTS = [ From 6ada3fae5b5288f5e321ece59bf71fc5ae1ec462 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Dec 2019 10:58:38 +0100 Subject: [PATCH 28/70] 67611: Fixed radio button bug + hide pagintion details --- .../external-source-entry-import-modal.component.html | 5 ++++- .../external-source-entry-import-modal.component.ts | 6 ++++-- .../object-collection/object-collection.component.html | 3 +++ .../shared/object-collection/object-collection.component.ts | 5 +++++ src/app/shared/object-detail/object-detail.component.ts | 2 +- src/app/shared/object-grid/object-grid.component.html | 1 + src/app/shared/object-grid/object-grid.component.ts | 5 +++++ src/app/shared/object-list/object-list.component.html | 1 + src/app/shared/object-list/object-list.component.ts | 5 +++++ src/app/shared/pagination/pagination.component.html | 2 +- .../search/search-results/search-results.component.html | 1 + .../search/search-results/search-results.component.ts | 5 +++++ 12 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html index d2ad3d403d..f055e617e3 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -16,10 +16,13 @@
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.entities' | translate) }}
- diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts index f09ba3953e..58de49ba40 100644 --- a/src/app/shared/object-collection/object-collection.component.ts +++ b/src/app/shared/object-collection/object-collection.component.ts @@ -63,6 +63,11 @@ export class ObjectCollectionComponent implements OnInit { */ @Input() context: Context; + /** + * Option for hiding the pagination detail + */ + @Input() hidePaginationDetail = false; + /** * the page info of the list */ diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts index fb68316251..45efb4a0b7 100644 --- a/src/app/shared/object-detail/object-detail.component.ts +++ b/src/app/shared/object-detail/object-detail.component.ts @@ -89,7 +89,7 @@ export class ObjectDetailComponent { /** * Option for hiding the pagination detail */ - public hidePaginationDetail = true; + @Input() hidePaginationDetail = true; /** * An event fired when the page is changed. diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html index 348536bfed..0afd623d86 100644 --- a/src/app/shared/object-grid/object-grid.component.html +++ b/src/app/shared/object-grid/object-grid.component.html @@ -5,6 +5,7 @@ [sortOptions]="sortConfig" [hideGear]="hideGear" [hidePagerWhenSinglePage]="hidePagerWhenSinglePage" + [hidePaginationDetail]="hidePaginationDetail" (pageChange)="onPageChange($event)" (pageSizeChange)="onPageSizeChange($event)" (sortDirectionChange)="onSortDirectionChange($event)" diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts index 2da4abe13b..c6f8347217 100644 --- a/src/app/shared/object-grid/object-grid.component.ts +++ b/src/app/shared/object-grid/object-grid.component.ts @@ -69,6 +69,11 @@ export class ObjectGridComponent implements OnInit { */ @Input() context: Context; + /** + * Option for hiding the pagination detail + */ + @Input() hidePaginationDetail = false; + /** * Behavior subject to output the current listable objects */ diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html index 887be96785..d0cfb1a9d8 100644 --- a/src/app/shared/object-list/object-list.component.html +++ b/src/app/shared/object-list/object-list.component.html @@ -5,6 +5,7 @@ [sortOptions]="sortConfig" [hideGear]="hideGear" [hidePagerWhenSinglePage]="hidePagerWhenSinglePage" + [hidePaginationDetail]="hidePaginationDetail" (pageChange)="onPageChange($event)" (pageSizeChange)="onPageSizeChange($event)" (sortDirectionChange)="onSortDirectionChange($event)" diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index 1be0f69106..1efd715084 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -74,6 +74,11 @@ export class ObjectListComponent { */ @Input() context: Context; + /** + * Option for hiding the pagination detail + */ + @Input() hidePaginationDetail = false; + /** * The current listable objects */ diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index c16a153026..649fe686ff 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -1,5 +1,5 @@
-
+
{{ 'pagination.showing.label' | translate }} diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html index ab1e96c58f..cbc56d1080 100644 --- a/src/app/shared/search/search-results/search-results.component.html +++ b/src/app/shared/search/search-results/search-results.component.html @@ -8,6 +8,7 @@ [selectable]="selectable" [selectionConfig]="selectionConfig" [context]="context" + [hidePaginationDetail]="hidePaginationDetail" (deselectObject)="deselectObject.emit($event)" (selectObject)="selectObject.emit($event)" > diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts index f245b5f9ae..b094e69a57 100644 --- a/src/app/shared/search/search-results/search-results.component.ts +++ b/src/app/shared/search/search-results/search-results.component.ts @@ -67,6 +67,11 @@ export class SearchResultsComponent { @Input() context: Context; + /** + * Option for hiding the pagination detail + */ + @Input() hidePaginationDetail = false; + @Input() selectionConfig: {repeatable: boolean, listId: string}; @Output() deselectObject: EventEmitter = new EventEmitter(); From 7a904f9bf7ec11ea5daf9586bcc3ca7ff71f63e7 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Dec 2019 14:06:29 +0100 Subject: [PATCH 29/70] 67611: Refactored import button to separate component within object-collection + moved calling of import modal to external-source tab --- ...try-list-submission-element.component.html | 7 -- ...entry-list-submission-element.component.ts | 26 ----- ...elation-external-source-tab.component.html | 5 +- ...-relation-external-source-tab.component.ts | 54 +++++++++- ...l-source-entry-import-modal.component.html | 2 +- ...nal-source-entry-import-modal.component.ts | 99 +++++++++++++++++-- .../object-collection.component.html | 3 + .../object-collection.component.ts | 15 +++ ...mportable-list-item-control.component.html | 7 ++ .../importable-list-item-control.component.ts | 26 +++++ .../object-list/object-list.component.html | 5 + .../object-list/object-list.component.ts | 16 +++ src/app/shared/shared.module.ts | 4 +- 13 files changed, 223 insertions(+), 46 deletions(-) create mode 100644 src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html create mode 100644 src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html index 4df06bc0e6..5f34d8ccd0 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html @@ -1,11 +1,4 @@
- -
-
{{object.display}}
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts index 07d691a5cb..8891a179c3 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts @@ -6,10 +6,6 @@ import { Context } from '../../../../../core/shared/context.model'; import { Component, Inject, OnInit } from '@angular/core'; import { Metadata } from '../../../../../core/shared/metadata.utils'; import { MetadataValue } from '../../../../../core/shared/metadata.models'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { ExternalSourceEntryImportModalComponent } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; -import { DsDynamicLookupRelationExternalSourceTabComponent } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; -import { hasValue } from '../../../../../shared/empty.util'; @listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.SubmissionModal) @Component({ @@ -23,29 +19,7 @@ export class ExternalSourceEntryListSubmissionElementComponent extends AbstractL */ uri: MetadataValue; - /** - * The modal for importing the entry - */ - modalRef: NgbModalRef; - - constructor(@Inject(DsDynamicLookupRelationExternalSourceTabComponent) private externalSourceTab: DsDynamicLookupRelationExternalSourceTabComponent, - private modalService: NgbModal) { - super(); - } - ngOnInit(): void { this.uri = Metadata.first(this.object.metadata, 'dc.identifier.uri'); } - - import(): void { - this.modalRef = this.modalService.open(ExternalSourceEntryImportModalComponent, { - size: 'lg', - container: 'ds-dynamic-lookup-relation-modal' - }); - const modalComp = this.modalRef.componentInstance; - modalComp.externalSourceEntry = this.object; - if (hasValue(this.externalSourceTab) && hasValue(this.externalSourceTab.relationship)) { - modalComp.relationship = this.externalSourceTab.relationship; - } - } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html index a9ae77a9f5..04737c44e4 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html @@ -14,8 +14,9 @@ [config]="initialPagination" [hideGear]="true" [context]="context" - (deselectObject)="deselectObject.emit($event)" - (selectObject)="selectObject.emit($event)"> + [importable]="true" + [importConfig]="importConfig" + (importObject)="import($event)"> diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index d884f5f63d..18dfa4277f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { Router } from '@angular/router'; @@ -15,6 +15,11 @@ import { ListableObject } from '../../../../../object-collection/shared/listable import { fadeIn, fadeInOut } from '../../../../../animations/fade'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { RelationshipOptions } from '../../../models/relationship-options.model'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { hasValue } from '../../../../../empty.util'; +import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; @Component({ selector: 'ds-dynamic-lookup-relation-external-source-tab', @@ -32,7 +37,7 @@ import { RelationshipOptions } from '../../../models/relationship-options.model' ] }) -export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit { +export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit, OnDestroy { @Input() label: string; @Input() listId: string; @Input() relationship: RelationshipOptions; @@ -56,9 +61,28 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit */ entriesRD$: Observable>>; + /** + * Config to use for the import buttons + */ + importConfig = { + buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title' + }; + + /** + * The modal for importing the entry + */ + modalRef: NgbModalRef; + + /** + * Subscription to the modal's importedObject event-emitter + */ + importObjectSub: Subscription; + constructor(private router: Router, public searchConfigService: SearchConfigurationService, - private externalSourceService: ExternalSourceService) { + private externalSourceService: ExternalSourceService, + private modalService: NgbModal, + private selectableListService: SelectableListService) { } ngOnInit(): void { @@ -67,4 +91,28 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions)) ) } + + /** + * Start the import of an entry by opening up an import modal window + * @param entry The entry to import + */ + import(entry) { + this.modalRef = this.modalService.open(ExternalSourceEntryImportModalComponent, { + size: 'lg', + container: 'ds-dynamic-lookup-relation-modal' + }); + const modalComp = this.modalRef.componentInstance; + modalComp.externalSourceEntry = entry; + modalComp.relationship = this.relationship; + this.importObjectSub = modalComp.importedObject.subscribe((object) => { + this.selectableListService.selectSingle(this.listId, object); + this.selectObject.emit(object); + }); + } + + ngOnDestroy(): void { + if (hasValue(this.importObjectSub)) { + this.importObjectSub.unsubscribe(); + } + } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html index f055e617e3..348b7eae18 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -26,7 +26,7 @@ [selectionConfig]="{ repeatable: false, listId: entityListId }" [linkType]="linkTypes.ExternalLink" [context]="context" - (deselectObject)="deselectEntity($event)" + (deselectObject)="deselectEntity()" (selectObject)="selectEntity($event)">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 6f17ddc529..f8b7b07184 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, EventEmitter, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model'; import { MetadataValue } from '../../../../../../../core/shared/metadata.models'; @@ -14,6 +14,8 @@ import { PaginatedSearchOptions } from '../../../../../../search/paginated-searc import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type'; import { Context } from '../../../../../../../core/shared/context.model'; import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; +import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model'; +import { take } from 'rxjs/operators'; /** * The possible types of import for the external entry @@ -87,6 +89,21 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { */ selectedImportType = ImportType.None; + /** + * The selected local entity + */ + selectedEntity: ListableObject; + + /** + * The selected local authority + */ + selectedAuthority: ListableObject; + + /** + * An object has been imported, send it to the parent component + */ + importedObject: EventEmitter = new EventEmitter(); + constructor(public modal: NgbActiveModal, public lookupRelationService: LookupRelationService, private selectService: SelectableListService) { @@ -109,14 +126,64 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { * Perform the import of the external entry */ import() { - console.log('TODO: Import'); + switch (this.selectedImportType) { + case ImportType.LocalEntity : { + this.importLocalEntity(); + break; + } + case ImportType.NewEntity : { + this.importNewEntity(); + break; + } + case ImportType.LocalAuthority : { + this.importLocalAuthority(); + break; + } + case ImportType.NewAuthority : { + this.importNewAuthority(); + break; + } + } + this.selectedImportType = ImportType.None; + this.deselectAllLists(); + this.close(); + } + + /** + * Import the selected local entity + */ + importLocalEntity() { + if (this.selectedEntity !== undefined) { + this.importedObject.emit(this.selectedEntity); + } + } + + /** + * Create and import a new entity from the external entry + */ + importNewEntity() { + this.importedObject.emit(this.externalSourceEntry); + } + + /** + * Import the selected local authority + */ + importLocalAuthority() { + // TODO: Implement ability to import local authorities + } + + /** + * Create and import a new authority from the external entry + */ + importNewAuthority() { + // TODO: Implement ability to import new authorities } /** * Deselected a local entity - * @param event */ - deselectEntity(event) { + deselectEntity() { + this.selectedEntity = undefined; if (this.selectedImportType === ImportType.LocalEntity) { this.selectedImportType = ImportType.None; } @@ -124,9 +191,10 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { /** * Selected a local entity - * @param event + * @param entity */ - selectEntity(event) { + selectEntity(entity) { + this.selectedEntity = entity; this.selectedImportType = ImportType.LocalEntity; } @@ -142,6 +210,25 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { } } + /** + * Deselected a local authority + */ + deselectAuthority() { + this.selectedAuthority = undefined; + if (this.selectedImportType === ImportType.LocalAuthority) { + this.selectedImportType = ImportType.None; + } + } + + /** + * Selected a local authority + * @param authority + */ + selectAuthority(authority) { + this.selectedAuthority = authority; + this.selectedImportType = ImportType.LocalAuthority; + } + /** * Selected/deselected the new authority option */ diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html index 499b8e03c9..e696170a6f 100644 --- a/src/app/shared/object-collection/object-collection.component.html +++ b/src/app/shared/object-collection/object-collection.component.html @@ -15,6 +15,9 @@ (sortFieldChange)="onSortFieldChange($event)" [selectable]="selectable" [selectionConfig]="selectionConfig" + [importable]="importable" + [importConfig]="importConfig" + (importObject)="importObject.emit($event)" *ngIf="(currentMode$ | async) === viewModeEnum.ListElement"> diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts index 58de49ba40..f39bf07123 100644 --- a/src/app/shared/object-collection/object-collection.component.ts +++ b/src/app/shared/object-collection/object-collection.component.ts @@ -53,6 +53,21 @@ export class ObjectCollectionComponent implements OnInit { @Output() deselectObject: EventEmitter = new EventEmitter(); @Output() selectObject: EventEmitter = new EventEmitter(); + /** + * Whether or not to add an import button to the object elements + */ + @Input() importable = false; + + /** + * The config to use for the import button + */ + @Input() importConfig: { buttonLabel: string }; + + /** + * Send an import event to the parent component + */ + @Output() importObject: EventEmitter = new EventEmitter(); + /** * The link type of the rendered list elements */ diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html new file mode 100644 index 0000000000..ca3b086653 --- /dev/null +++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html @@ -0,0 +1,7 @@ +
+ +
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts new file mode 100644 index 0000000000..f381a02d86 --- /dev/null +++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts @@ -0,0 +1,26 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { ListableObject } from '../listable-object.model'; + +@Component({ + selector: 'ds-importable-list-item-control', + templateUrl: './importable-list-item-control.component.html' +}) +/** + * Component adding an import button to a list item + */ +export class ImportableListItemControlComponent { + /** + * The item or metadata to determine the component for + */ + @Input() object: ListableObject; + + /** + * Extra configuration for the import button + */ + @Input() importConfig: { buttonLabel: string }; + + /** + * Output the object to import + */ + @Output() importObject: EventEmitter = new EventEmitter(); +} diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html index d0cfb1a9d8..5f6b1d1ec8 100644 --- a/src/app/shared/object-list/object-list.component.html +++ b/src/app/shared/object-list/object-list.component.html @@ -20,6 +20,11 @@ (deselectObject)="deselectObject.emit($event)" (selectObject)="selectObject.emit($event)"> + + + diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index 1efd715084..5ebaae668c 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -79,6 +79,16 @@ export class ObjectListComponent { */ @Input() hidePaginationDetail = false; + /** + * Whether or not to add an import button to the object + */ + @Input() importable = false; + + /** + * Config used for the import button + */ + @Input() importConfig: { importLabel: string }; + /** * The current listable objects */ @@ -137,6 +147,12 @@ export class ObjectListComponent { @Output() deselectObject: EventEmitter = new EventEmitter(); @Output() selectObject: EventEmitter = new EventEmitter(); + + /** + * Send an import event to the parent component + */ + @Output() importObject: EventEmitter = new EventEmitter(); + /** * An event fired when the sort field is changed. * Event's payload equals to the newly selected sort field. diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 230bb1f073..6afa15d0f7 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -176,6 +176,7 @@ import { MetadataRepresentationListComponent } from '../+item-page/simple/metada import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component'; import { DsDynamicLookupRelationExternalSourceTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; import { ExternalSourceEntryImportModalComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; +import { ImportableListItemControlComponent } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -333,7 +334,8 @@ const COMPONENTS = [ CollectionSelectComponent, MetadataRepresentationLoaderComponent, SelectableListItemControlComponent, - ExternalSourceEntryImportModalComponent + ExternalSourceEntryImportModalComponent, + ImportableListItemControlComponent ]; const ENTRY_COMPONENTS = [ From 038483c8b87fd7a93b021cf2cbc201cac4efcece Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 5 Dec 2019 15:29:32 +0100 Subject: [PATCH 30/70] taskid 66074 Keep virtual metadata on relationship delete - fix tests --- .../edit-relationship-list.component.spec.ts | 1 + .../edit-relationship.component.spec.ts | 81 ++++++++++++------- .../core/data/relationship.service.spec.ts | 4 +- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index 54cb2837a2..bc2fcda3a9 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -98,6 +98,7 @@ describe('EditRelationshipListComponent', () => { relationshipService = jasmine.createSpyObj('relationshipService', { getRelatedItemsByLabel: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [author1, author2]))), + getItemRelationshipsByLabel: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), relationships))), } ); diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index 00c2a33006..5f12ea32e7 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -11,11 +11,15 @@ import { Item } from '../../../../core/shared/item.model'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; +import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; +import {Store} from "@ngrx/store"; +import {CoreState} from "../../../../core/core.reducers"; -let objectUpdatesService: ObjectUpdatesService; +let objectUpdatesService; const url = 'http://test-url.com/test-url'; let item; +let relatedItem; let author1; let author2; let fieldUpdate1; @@ -37,6 +41,17 @@ describe('EditRelationshipComponent', () => { rightwardType: 'isPublicationOfAuthor' }); + item = Object.assign(new Item(), { + self: 'fake-item-url/publication', + id: 'publication', + uuid: 'publication', + relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships))) + }); + + relatedItem = Object.assign(new Item(), { + uuid: 'related item id', + }); + relationships = [ Object.assign(new Relationship(), { self: url + '/2', @@ -44,7 +59,9 @@ describe('EditRelationshipComponent', () => { uuid: '2', leftId: 'author1', rightId: 'publication', - relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) + relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)), + leftItem: observableOf(new RemoteData(false, false, true, undefined, relatedItem)), + rightItem: observableOf(new RemoteData(false, false, true, undefined, item)), }), Object.assign(new Relationship(), { self: url + '/3', @@ -56,13 +73,6 @@ describe('EditRelationshipComponent', () => { }) ]; - item = Object.assign(new Item(), { - self: 'fake-item-url/publication', - id: 'publication', - uuid: 'publication', - relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships))) - }); - author1 = Object.assign(new Item(), { id: 'author1', uuid: 'author1' @@ -73,32 +83,35 @@ describe('EditRelationshipComponent', () => { }); fieldUpdate1 = { - field: author1, + field: relationships[0], changeType: undefined }; fieldUpdate2 = { - field: author2, + field: relationships[1], changeType: FieldChangeType.REMOVE }; - objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', - { - saveChangeFieldUpdate: {}, - saveRemoveFieldUpdate: {}, - setEditableFieldUpdate: {}, - setValidFieldUpdate: {}, - removeSingleFieldUpdate: {}, - isEditable: observableOf(false), // should always return something --> its in ngOnInit - isValid: observableOf(true) // should always return something --> its in ngOnInit - } - ); + const itemSelection = {}; + itemSelection[relatedItem.uuid] = false; + itemSelection[item.uuid] = true; + + const store = new Store(undefined, undefined, undefined); + + objectUpdatesService = new ObjectUpdatesService(store); + + spyOn(objectUpdatesService, 'isSelectedVirtualMetadata').and.callFake((a, b, uuid) => observableOf(itemSelection[uuid])); TestBed.configureTestingModule({ imports: [TranslateModule.forRoot()], declarations: [EditRelationshipComponent], providers: [ - { provide: ObjectUpdatesService, useValue: objectUpdatesService } - ], schemas: [ + { provide: ObjectUpdatesService, useValue: objectUpdatesService }, + { provide: NgbModal, useValue: { + open: () => {/*comment*/ + } + }, + }, + ], schemas: [ NO_ERRORS_SCHEMA ] }).compileComponents(); @@ -113,6 +126,7 @@ describe('EditRelationshipComponent', () => { comp.url = url; comp.fieldUpdate = fieldUpdate1; comp.editItem = item; + comp.relatedItem$ = observableOf(relatedItem); fixture.detectChanges(); }); @@ -157,21 +171,34 @@ describe('EditRelationshipComponent', () => { describe('remove', () => { beforeEach(() => { + spyOn(comp, 'closeVirtualMetadataModal'); + spyOn(objectUpdatesService, 'saveRemoveFieldUpdate'); + comp.ngOnChanges(); comp.remove(); }); - it('should call saveRemoveFieldUpdate with the correct arguments', () => { - expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, item); + it('should close the virtual metadata modal and call saveRemoveFieldUpdate with the correct arguments', () => { + expect(comp.closeVirtualMetadataModal).toHaveBeenCalled(); + expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, Object.assign({}, fieldUpdate1.field, { + keepLeftVirtualMetadata: false, + keepRightVirtualMetadata: true, + })); }); + }); describe('undo', () => { beforeEach(() => { + spyOn(objectUpdatesService, 'removeSingleFieldUpdate'); comp.undo(); + comp.ngOnChanges(); }); it('should call removeSingleFieldUpdate with the correct arguments', () => { - expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, item.uuid); + + fixture.whenStable().then(() => { + expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, fieldUpdate1[0]); + }) }); }); diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts index 7d51f167d3..34c60983c2 100644 --- a/src/app/core/data/relationship.service.spec.ts +++ b/src/app/core/data/relationship.service.spec.ts @@ -109,11 +109,11 @@ describe('RelationshipService', () => { beforeEach(() => { spyOn(service, 'findById').and.returnValue(getRemotedataObservable(relationship1)); spyOn(objectCache, 'remove'); - service.deleteRelationship(relationships[0].uuid, 'none').subscribe(); + service.deleteRelationship(relationships[0].uuid, 'right').subscribe(); }); it('should send a DeleteRequest', () => { - const expected = new DeleteRequest(requestService.generateRequestId(), relationshipsEndpointURL + '/' + relationship1.uuid); + const expected = new DeleteRequest(requestService.generateRequestId(), relationshipsEndpointURL + '/' + relationship1.uuid + '?copyVirtualMetadata=right'); expect(requestService.configure).toHaveBeenCalledWith(expected); }); From fda083137a2854daaf780a523d39a3fb699937c8 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Dec 2019 15:48:54 +0100 Subject: [PATCH 31/70] 67611: Import external entry as new entity pt1 --- resources/i18n/en.json5 | 2 ++ src/app/core/data/item-data.service.ts | 29 +++++++++++++++++++ ...ynamic-form-control-container.component.ts | 14 +++++++-- ...namic-lookup-relation-modal.component.html | 2 ++ ...dynamic-lookup-relation-modal.component.ts | 1 + ...-relation-external-source-tab.component.ts | 6 ++++ ...l-source-entry-import-modal.component.html | 12 ++++++-- ...nal-source-entry-import-modal.component.ts | 27 +++++++++++++++-- 8 files changed, 84 insertions(+), 9 deletions(-) diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index fe7949d8b1..16d5d64bd9 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -1533,6 +1533,8 @@ "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel", + "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to", + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities", "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity", diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index e616cb8020..b5f16227a8 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -37,6 +37,7 @@ import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; import { Collection } from '../shared/collection.model'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list'; +import { ExternalSourceEntry } from '../shared/external-source-entry.model'; @Injectable() export class ItemDataService extends DataService { @@ -247,4 +248,32 @@ export class ItemDataService extends DataService { map((request: RequestEntry) => request.response) ); } + + /** + * Import an external source entry into a collection + * @param externalSourceEntry + * @param collectionId + */ + public importExternalSourceEntry(externalSourceEntry: ExternalSourceEntry, collectionId: string): Observable { + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'text/uri-list'); + options.headers = headers; + + const requestId = this.requestService.generateRequestId(); + const href$ = this.halService.getEndpoint(this.linkPath).pipe(map((href) => `${href}?owningCollection=${collectionId}`)); + + href$.pipe( + find((href: string) => hasValue(href)), + map((href: string) => { + const request = new PostRequest(requestId, href, externalSourceEntry.self, options); + this.requestService.configure(request); + }) + ).subscribe(); + + return this.requestService.getByUUID(requestId).pipe( + find((request: RequestEntry) => request.completed), + map((request: RequestEntry) => request.response) + ); + } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts index b78385dc62..d6e3a97a11 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts @@ -101,6 +101,7 @@ import { ItemSearchResult } from '../../../object-collection/shared/item-search- import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { MetadataValue } from '../../../../core/shared/metadata.models'; import * as uuidv4 from 'uuid/v4'; +import { Collection } from '../../../../core/shared/collection.model'; export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type | null { switch (model.type) { @@ -188,6 +189,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo hasRelationLookup: boolean; modalRef: NgbModalRef; item: Item; + collection: Collection; listId: string; searchConfig: string; selectedValues$: Observable (submissionObject.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()))); + getRemoteDataPayload() + ); + + const item$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()))); + const collection$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.collection as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()))); this.subs.push(item$.subscribe((item) => this.item = item)); + this.subs.push(collection$.subscribe((collection) => this.collection = collection)); this.relationService.getRelatedItemsByLabel(this.item, this.model.relationship.relationshipType).pipe( map((items: RemoteData>) => items.payload.page.map((item) => Object.assign(new ItemSearchResult(), { indexableObject: item }))), @@ -325,6 +332,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo modalComp.label = this.model.label; modalComp.metadataFields = this.model.metadataFields; modalComp.item = this.item; + modalComp.collection = this.collection; } removeSelection(object: SearchResult) { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html index 4c87ac8bdb..1773661486 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html @@ -26,6 +26,8 @@ ; context: Context; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index 18dfa4277f..dfdb1508fc 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -20,6 +20,8 @@ import { ExternalSourceEntryImportModalComponent } from './external-source-entry import { Subscription } from 'rxjs/internal/Subscription'; import { hasValue } from '../../../../../empty.util'; import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; +import { Item } from '../../../../../../core/shared/item.model'; +import { Collection } from '../../../../../../core/shared/collection.model'; @Component({ selector: 'ds-dynamic-lookup-relation-external-source-tab', @@ -40,6 +42,8 @@ import { SelectableListService } from '../../../../../object-list/selectable-lis export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit, OnDestroy { @Input() label: string; @Input() listId: string; + @Input() item: Item; + @Input() collection: Collection; @Input() relationship: RelationshipOptions; @Input() repeatable: boolean; @Input() context: Context; @@ -103,6 +107,8 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit }); const modalComp = this.modalRef.componentInstance; modalComp.externalSourceEntry = entry; + modalComp.item = this.item; + modalComp.collection = this.collection; modalComp.relationship = this.relationship; this.importObjectSub = modalComp.importedObject.subscribe((object) => { this.selectableListService.selectSingle(this.listId, object); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html index 348b7eae18..ffb3aabde8 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -13,7 +13,13 @@

{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.select' | translate) }}

-
+
+
+ + +
+
+
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.entities' | translate) }}
-
+
@@ -37,7 +43,7 @@
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.authority' | translate) }}
-
+
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index f8b7b07184..acd1fa59ea 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -15,7 +15,8 @@ import { CollectionElementLinkType } from '../../../../../../object-collection/c import { Context } from '../../../../../../../core/shared/context.model'; import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model'; -import { take } from 'rxjs/operators'; +import { Collection } from '../../../../../../../core/shared/collection.model'; +import { ItemDataService } from '../../../../../../../core/data/item-data.service'; /** * The possible types of import for the external entry @@ -39,6 +40,21 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { */ externalSourceEntry: ExternalSourceEntry; + /** + * The item in submission + */ + item: Item; + + /** + * The collection the user is submitting in + */ + collection: Collection; + + /** + * The ID of the collection to import entries to + */ + collectionId: string; + /** * The current relationship-options used for filtering results */ @@ -106,13 +122,15 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { constructor(public modal: NgbActiveModal, public lookupRelationService: LookupRelationService, - private selectService: SelectableListService) { + private selectService: SelectableListService, + private itemService: ItemDataService) { } ngOnInit(): void { this.uri = Metadata.first(this.externalSourceEntry.metadata, 'dc.identifier.uri'); this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: 'sarah' })); this.localEntitiesRD$ = this.lookupRelationService.getLocalResults(this.relationship, this.searchOptions); + this.collectionId = this.collection.id; } /** @@ -162,7 +180,10 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { * Create and import a new entity from the external entry */ importNewEntity() { - this.importedObject.emit(this.externalSourceEntry); + console.log(this.collection); + this.itemService.importExternalSourceEntry(this.externalSourceEntry, this.collectionId).subscribe((response) => { + console.log(response); + }); } /** From a434b5706e16c34f916692e1602f7f034a66e218 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 5 Dec 2019 17:08:54 +0100 Subject: [PATCH 32/70] taskid 66074 Keep virtual metadata on relationship delete - fix lint issues --- .../edit-relationship/edit-relationship.component.spec.ts | 6 +++--- .../core/data/object-updates/object-updates.reducer.spec.ts | 4 ++-- .../core/data/object-updates/object-updates.service.spec.ts | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index 5f12ea32e7..24016c3671 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -11,9 +11,9 @@ import { Item } from '../../../../core/shared/item.model'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; -import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; -import {Store} from "@ngrx/store"; -import {CoreState} from "../../../../core/core.reducers"; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {Store} from '@ngrx/store'; +import {CoreState} from '../../../../core/core.reducers'; let objectUpdatesService; const url = 'http://test-url.com/test-url'; diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts index 6ab3dcfec6..faae4732bc 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts @@ -9,7 +9,7 @@ import { SetEditableFieldUpdateAction, SetValidFieldUpdateAction } from './object-updates.actions'; import { OBJECT_UPDATES_TRASH_PATH, objectUpdatesReducer } from './object-updates.reducer'; -import {Relationship} from "../../shared/item-relationships/relationship.model"; +import {Relationship} from '../../shared/item-relationships/relationship.model'; class NullAction extends RemoveFieldUpdateAction { type = null; @@ -45,7 +45,7 @@ const identifiable3 = { language: null, value: 'Unchanged value' }; -const relationship: Relationship = Object.assign(new Relationship, {uuid: 'test relationship uuid'}); +const relationship: Relationship = Object.assign(new Relationship(), {uuid: 'test relationship uuid'}); const modDate = new Date(2010, 2, 11); const uuid = identifiable1.uuid; diff --git a/src/app/core/data/object-updates/object-updates.service.spec.ts b/src/app/core/data/object-updates/object-updates.service.spec.ts index 697d941123..730ee5ad43 100644 --- a/src/app/core/data/object-updates/object-updates.service.spec.ts +++ b/src/app/core/data/object-updates/object-updates.service.spec.ts @@ -11,7 +11,7 @@ import { of as observableOf } from 'rxjs'; import { Notification } from '../../../shared/notifications/models/notification.model'; import { NotificationType } from '../../../shared/notifications/models/notification-type'; import { OBJECT_UPDATES_TRASH_PATH } from './object-updates.reducer'; -import {Relationship} from "../../shared/item-relationships/relationship.model"; +import {Relationship} from '../../shared/item-relationships/relationship.model'; describe('ObjectUpdatesService', () => { let service: ObjectUpdatesService; @@ -23,7 +23,7 @@ describe('ObjectUpdatesService', () => { const identifiable2 = { uuid: '26cbb5ce-5786-4e57-a394-b9fcf8eaf241' }; const identifiable3 = { uuid: 'c5d2c2f7-d757-48bf-84cc-8c9229c8407e' }; const identifiables = [identifiable1, identifiable2]; - const relationship: Relationship = Object.assign(new Relationship, {uuid: 'test relationship uuid'}); + const relationship: Relationship = Object.assign(new Relationship(), {uuid: 'test relationship uuid'}); const fieldUpdates = { [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE }, @@ -44,7 +44,7 @@ describe('ObjectUpdatesService', () => { }; store = new Store(undefined, undefined, undefined); spyOn(store, 'dispatch'); - service = new ObjectUpdatesService(store); + service = (new ObjectUpdatesService(store)); spyOn(service as any, 'getObjectEntry').and.returnValue(observableOf(objectEntry)); spyOn(service as any, 'getFieldState').and.callFake((uuid) => { From f0e38e9e8c7085fc2ec25a000651811bf92984fb Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Dec 2019 17:31:13 +0100 Subject: [PATCH 33/70] 67611: Console error fix, notification on adding local entity and JSDocs --- resources/i18n/en.json5 | 3 ++ ...namic-lookup-relation-modal.component.html | 1 - ...-relation-external-source-tab.component.ts | 50 +++++++++++++++++-- ...nal-source-entry-import-modal.component.ts | 11 +++- 4 files changed, 58 insertions(+), 7 deletions(-) diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index 16d5d64bd9..7fa9c96010 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -1523,8 +1523,11 @@ "submission.general.save-later": "Save for later", + "submission.sections.describe.relationship-lookup.close": "Close", + "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-button-title": "Import remote entry", "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html index 1773661486..06e45ecb92 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html @@ -29,7 +29,6 @@ [item]="item" [collection]="collection" [relationship]="relationshipOptions" - [repeatable]="repeatable" [context]="context" [externalSource]="source" (selectObject)="select($event)" diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index dfdb1508fc..54cd4e2f86 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -22,6 +22,8 @@ import { hasValue } from '../../../../../empty.util'; import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; import { Item } from '../../../../../../core/shared/item.model'; import { Collection } from '../../../../../../core/shared/collection.model'; +import { NotificationsService } from '../../../../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'ds-dynamic-lookup-relation-external-source-tab', @@ -38,18 +40,49 @@ import { Collection } from '../../../../../../core/shared/collection.model'; fadeInOut ] }) - +/** + * Component rendering the tab content of an external source during submission lookup + * Shows a list of entries matching the current search query with the option to import them into the repository + */ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit, OnDestroy { - @Input() label: string; + /** + * The ID of the list of selected entries + */ @Input() listId: string; + + /** + * The item in submission + */ @Input() item: Item; + + /** + * The collection the user is submitting an item into + */ @Input() collection: Collection; + + /** + * The relationship-options for the current lookup + */ @Input() relationship: RelationshipOptions; - @Input() repeatable: boolean; + + /** + * The context to displaying lists for + */ @Input() context: Context; + + /** + * Emit an event when an object has been deselected + */ @Output() deselectObject: EventEmitter = new EventEmitter(); + + /** + * Emit an event when an object has been selected (or imported) + */ @Output() selectObject: EventEmitter = new EventEmitter(); + /** + * The initial pagination options + */ initialPagination = Object.assign(new PaginationComponentOptions(), { id: 'submission-external-source-relation-list', pageSize: 5 @@ -86,9 +119,14 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit public searchConfigService: SearchConfigurationService, private externalSourceService: ExternalSourceService, private modalService: NgbModal, - private selectableListService: SelectableListService) { + private selectableListService: SelectableListService, + private notificationsService: NotificationsService, + private translateService: TranslateService) { } + /** + * Get the entries for the selected external source + */ ngOnInit(): void { this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe( switchMap((searchOptions: PaginatedSearchOptions) => @@ -112,10 +150,14 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit modalComp.relationship = this.relationship; this.importObjectSub = modalComp.importedObject.subscribe((object) => { this.selectableListService.selectSingle(this.listId, object); + this.notificationsService.success(this.translateService.get('submission.sections.describe.relationship-lookup.external-source.added')); this.selectObject.emit(object); }); } + /** + * Unsubscribe from open subscriptions + */ ngOnDestroy(): void { if (hasValue(this.importObjectSub)) { this.importObjectSub.unsubscribe(); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index acd1fa59ea..2107021d40 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -17,6 +17,7 @@ import { SelectableListService } from '../../../../../../object-list/selectable- import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model'; import { Collection } from '../../../../../../../core/shared/collection.model'; import { ItemDataService } from '../../../../../../../core/data/item-data.service'; +import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model'; /** * The possible types of import for the external entry @@ -34,6 +35,12 @@ export enum ImportType { styleUrls: ['./external-source-entry-import-modal.component.scss'], templateUrl: './external-source-entry-import-modal.component.html' }) +/** + * Component to display a modal window for importing an external source entry + * Shows information about the selected entry and a selectable list of local entities and authorities with similar names + * and the ability to add one of those results to the selection instead of the external entry. + * The other option is to import the external entry as a new entity or authority into the repository. + */ export class ExternalSourceEntryImportModalComponent implements OnInit { /** * The external source entry @@ -128,7 +135,8 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { ngOnInit(): void { this.uri = Metadata.first(this.externalSourceEntry.metadata, 'dc.identifier.uri'); - this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: 'sarah' })); + const pagination = Object.assign(new PaginationComponentOptions(), { id: 'external-entry-import', pageSize: 5 }); + this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: this.externalSourceEntry.value, pagination: pagination })); this.localEntitiesRD$ = this.lookupRelationService.getLocalResults(this.relationship, this.searchOptions); this.collectionId = this.collection.id; } @@ -180,7 +188,6 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { * Create and import a new entity from the external entry */ importNewEntity() { - console.log(this.collection); this.itemService.importExternalSourceEntry(this.externalSourceEntry, this.collectionId).subscribe((response) => { console.log(response); }); From 1402dd9129156dddaa86f8421ccddcc8db2f5cc8 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 6 Dec 2019 16:52:30 +0100 Subject: [PATCH 34/70] 67611: Import new external entity and add to selection + message changes/refactoring --- resources/i18n/en.json5 | 34 +++++++++++++++++-- src/app/core/data/item-data.service.ts | 10 ++++-- src/app/core/data/lookup-relation.service.ts | 11 +++++- ...namic-lookup-relation-modal.component.html | 4 +-- ...dynamic-lookup-relation-modal.component.ts | 9 +++++ ...-relation-external-source-tab.component.ts | 33 ++++++++---------- ...l-source-entry-import-modal.component.html | 22 ++++++------ ...nal-source-entry-import-modal.component.ts | 33 ++++++++++++++++-- 8 files changed, 116 insertions(+), 40 deletions(-) diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5 index 76ffe955a7..cee53de8ec 100644 --- a/resources/i18n/en.json5 +++ b/resources/i18n/en.json5 @@ -1546,7 +1546,19 @@ "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection", - "submission.sections.describe.relationship-lookup.external-source.import-button-title": "Import remote entry", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Author": "Import remote author", + + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal", + + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue", + + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Author.title": "Import Remote Author", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Author.added.local-entity": "Successfully added local author to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Author.added.new-entity": "Successfully imported and added external author to the selection", "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", @@ -1570,9 +1582,25 @@ "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import", - "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal", - "submission.sections.describe.relationship-lookup.external-source.import-modal.title": "Import Remote Entry", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection", + + "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index b71b778993..cd7e70dc32 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -254,7 +254,7 @@ export class ItemDataService extends DataService { * @param externalSourceEntry * @param collectionId */ - public importExternalSourceEntry(externalSourceEntry: ExternalSourceEntry, collectionId: string): Observable { + public importExternalSourceEntry(externalSourceEntry: ExternalSourceEntry, collectionId: string): Observable> { const options: HttpOptions = Object.create({}); let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'text/uri-list'); @@ -273,7 +273,13 @@ export class ItemDataService extends DataService { return this.requestService.getByUUID(requestId).pipe( find((request: RequestEntry) => request.completed), - map((request: RequestEntry) => request.response) + getResponseFromEntry(), + map((response: any) => { + if (isNotEmpty(response.resourceSelfLinks)) { + return response.resourceSelfLinks[0]; + } + }), + switchMap((selfLink: string) => this.findByHref(selfLink)) ); } diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts index 5a36474a66..42cf3afdc5 100644 --- a/src/app/core/data/lookup-relation.service.ts +++ b/src/app/core/data/lookup-relation.service.ts @@ -15,6 +15,7 @@ import { getAllSucceededRemoteData, getRemoteDataPayload } from '../shared/opera import { Injectable } from '@angular/core'; import { ExternalSource } from '../shared/external-source.model'; import { ExternalSourceEntry } from '../shared/external-source-entry.model'; +import { RequestService } from './request.service'; /** * A service for retrieving local and external entries information during a relation lookup @@ -35,7 +36,8 @@ export class LookupRelationService { }); constructor(protected externalSourceService: ExternalSourceService, - protected searchService: SearchService) { + protected searchService: SearchService, + protected requestService: RequestService) { } /** @@ -91,4 +93,11 @@ export class LookupRelationService { startWith(0) ); } + + /** + * Remove cached requests from local results + */ + removeLocalResultsCache() { + this.searchService.getEndpoint().subscribe((href) => this.requestService.removeByHrefSubstring(href)); + } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html index 06e45ecb92..328cdc6763 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html @@ -25,14 +25,14 @@ [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate : {count: (totalExternal$ | async)[idx]}"> diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index c49a228c01..4845ffb398 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -179,6 +179,15 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy ) } + /** + * Called when an external object has been imported, resets the total values and adds the object to the selected list + * @param object + */ + imported(object) { + this.setTotals(); + this.select(object); + } + /** * Calculate and set the total entries available for each tab */ diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index 65645e0739..ec036e4469 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -22,8 +22,6 @@ import { hasValue } from '../../../../../empty.util'; import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; import { Item } from '../../../../../../core/shared/item.model'; import { Collection } from '../../../../../../core/shared/collection.model'; -import { NotificationsService } from '../../../../../notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'ds-dynamic-lookup-relation-external-source-tab', @@ -45,6 +43,11 @@ import { TranslateService } from '@ngx-translate/core'; * Shows a list of entries matching the current search query with the option to import them into the repository */ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit, OnDestroy { + /** + * The label to use for all messages (added to the end of relevant i18n keys) + */ + @Input() label: string; + /** * The ID of the list of selected entries */ @@ -71,14 +74,9 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit @Input() context: Context; /** - * Emit an event when an object has been deselected + * Emit an event when an object has been imported (or selected from similar local entries) */ - @Output() deselectObject: EventEmitter = new EventEmitter(); - - /** - * Emit an event when an object has been selected (or imported) - */ - @Output() selectObject: EventEmitter = new EventEmitter(); + @Output() importedObject: EventEmitter = new EventEmitter(); /** * The initial pagination options @@ -101,9 +99,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit /** * Config to use for the import buttons */ - importConfig = { - buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title' - }; + importConfig; /** * The modal for importing the entry @@ -119,9 +115,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit public searchConfigService: SearchConfigurationService, private externalSourceService: ExternalSourceService, private modalService: NgbModal, - private selectableListService: SelectableListService, - private notificationsService: NotificationsService, - private translateService: TranslateService) { + private selectableListService: SelectableListService) { } /** @@ -131,7 +125,10 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe( switchMap((searchOptions: PaginatedSearchOptions) => this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined))) - ) + ); + this.importConfig = { + buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label + }; } /** @@ -148,10 +145,10 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit modalComp.item = this.item; modalComp.collection = this.collection; modalComp.relationship = this.relationship; + modalComp.label = this.label; this.importObjectSub = modalComp.importedObject.subscribe((object) => { this.selectableListService.selectSingle(this.listId, object); - this.notificationsService.success(this.translateService.get('submission.sections.describe.relationship-lookup.external-source.added')); - this.selectObject.emit(object); + this.importedObject.emit(object); }); } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html index ffb3aabde8..b88fea8e41 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -1,26 +1,26 @@
- +
-

{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.head.' + externalSourceEntry.externalSource | translate) }}

+

{{ (labelPrefix + 'head.' + externalSourceEntry.externalSource | translate) }}

{{externalSourceEntry.display}}
-

{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.select' | translate) }}

+

{{ (labelPrefix + 'select' | translate) }}

- - + +
-
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.entities' | translate) }}
+
{{ (labelPrefix + 'entities' | translate) }}
- +
-
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.authority' | translate) }}
+
{{ (labelPrefix + 'authority' | translate) }}
- +
- +
- +
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 2107021d40..8ca8305085 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -18,6 +18,11 @@ import { ListableObject } from '../../../../../../object-collection/shared/lista import { Collection } from '../../../../../../../core/shared/collection.model'; import { ItemDataService } from '../../../../../../../core/data/item-data.service'; import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model'; +import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../../../../core/shared/operators'; +import { take } from 'rxjs/operators'; +import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model'; +import { NotificationsService } from '../../../../../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; /** * The possible types of import for the external entry @@ -42,6 +47,16 @@ export enum ImportType { * The other option is to import the external entry as a new entity or authority into the repository. */ export class ExternalSourceEntryImportModalComponent implements OnInit { + /** + * The prefix for every i18n key within this modal + */ + labelPrefix = 'submission.sections.describe.relationship-lookup.external-source.import-modal.'; + + /** + * The label to use for all messages (added to the end of relevant i18n keys) + */ + label: string; + /** * The external source entry */ @@ -130,7 +145,9 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { constructor(public modal: NgbActiveModal, public lookupRelationService: LookupRelationService, private selectService: SelectableListService, - private itemService: ItemDataService) { + private itemService: ItemDataService, + private notificationsService: NotificationsService, + private translateService: TranslateService) { } ngOnInit(): void { @@ -180,6 +197,7 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { */ importLocalEntity() { if (this.selectedEntity !== undefined) { + this.notificationsService.success(this.translateService.get(this.labelPrefix + this.label + '.added.local-entity')); this.importedObject.emit(this.selectedEntity); } } @@ -188,8 +206,17 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { * Create and import a new entity from the external entry */ importNewEntity() { - this.itemService.importExternalSourceEntry(this.externalSourceEntry, this.collectionId).subscribe((response) => { - console.log(response); + this.itemService.importExternalSourceEntry(this.externalSourceEntry, this.collectionId).pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + take(1) + ).subscribe((item: Item) => { + this.lookupRelationService.removeLocalResultsCache(); + const searchResult = Object.assign(new ItemSearchResult(), { + indexableObject: item + }); + this.notificationsService.success(this.translateService.get(this.labelPrefix + this.label + '.added.new-entity')); + this.importedObject.emit(searchResult); }); } From 9246cce7de62a9287de17be1ca64d449e7a9bd8d Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 6 Dec 2019 17:54:52 +0100 Subject: [PATCH 35/70] 67611: Test cases --- src/app/core/data/item-data.service.spec.ts | 21 ++++++++ .../core/data/lookup-relation.service.spec.ts | 22 ++++++-- ...tion-external-source-tab.component.spec.ts | 54 ++++++++++++++----- 3 files changed, 82 insertions(+), 15 deletions(-) diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts index 44c5f48cfe..ebe4cbfc0a 100644 --- a/src/app/core/data/item-data.service.spec.ts +++ b/src/app/core/data/item-data.service.spec.ts @@ -23,6 +23,7 @@ import { HttpClient } from '@angular/common/http'; import { RequestEntry } from './request.reducer'; import { of as observableOf } from 'rxjs'; import { getMockRequestService } from '../../shared/mocks/mock-request.service'; +import { ExternalSourceEntry } from '../shared/external-source-entry.model'; describe('ItemDataService', () => { let scheduler: TestScheduler; @@ -202,4 +203,24 @@ describe('ItemDataService', () => { }); }); + describe('importExternalSourceEntry', () => { + let result; + + const externalSourceEntry = Object.assign(new ExternalSourceEntry(), { + display: 'John, Doe', + value: 'John, Doe', + self: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' + }); + + beforeEach(() => { + service = initTestService(); + spyOn(requestService, 'configure'); + result = service.importExternalSourceEntry(externalSourceEntry, 'collection-id'); + }); + + it('should configure a POST request', () => { + result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest), undefined)); + }); + }); + }); diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts index 321fd8d218..e12f81f15f 100644 --- a/src/app/core/data/lookup-relation.service.spec.ts +++ b/src/app/core/data/lookup-relation.service.spec.ts @@ -10,11 +10,14 @@ import { SearchResult } from '../../shared/search/search-result.model'; import { Item } from '../shared/item.model'; import { skip, take } from 'rxjs/operators'; import { ExternalSource } from '../shared/external-source.model'; +import { RequestService } from './request.service'; +import { of as observableOf } from 'rxjs'; -describe('LookupRelationService', () => { +fdescribe('LookupRelationService', () => { let service: LookupRelationService; let externalSourceService: ExternalSourceService; let searchService: SearchService; + let requestService: RequestService; const totalExternal = 8; const optionsWithQuery = new PaginatedSearchOptions({ query: 'test-query' }); @@ -35,15 +38,18 @@ describe('LookupRelationService', () => { name: 'orcidV2', hierarchical: false }); + const searchServiceEndpoint = 'http://test-rest.com/server/api/core/search'; function init() { externalSourceService = jasmine.createSpyObj('externalSourceService', { getExternalSourceEntries: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: totalExternal, totalPages: totalExternal, currentPage: 1 }), [{}])) }); searchService = jasmine.createSpyObj('searchService', { - search: createSuccessfulRemoteDataObject$(createPaginatedList(localResults)) + search: createSuccessfulRemoteDataObject$(createPaginatedList(localResults)), + getEndpoint: observableOf(searchServiceEndpoint) }); - service = new LookupRelationService(externalSourceService, searchService); + requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring']); + service = new LookupRelationService(externalSourceService, searchService, requestService); } beforeEach(() => { @@ -113,4 +119,14 @@ describe('LookupRelationService', () => { }); }); }); + + describe('removeLocalResultsCache', () => { + beforeEach(() => { + service.removeLocalResultsCache(); + }); + + it('should call requestService\'s removeByHrefSubstring with the search endpoint', () => { + expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(searchServiceEndpoint); + }); + }); }); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts index 62327e236e..e35b144372 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { VarDirective } from '../../../../../utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model'; import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { of as observableOf } from 'rxjs/internal/observable/of'; @@ -18,12 +18,20 @@ import { ExternalSource } from '../../../../../../core/shared/external-source.mo import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; +import { Item } from '../../../../../../core/shared/item.model'; +import { Collection } from '../../../../../../core/shared/collection.model'; +import { RelationshipOptions } from '../../../models/relationship-options.model'; +import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component'; -describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { +fdescribe('DsDynamicLookupRelationExternalSourceTabComponent', () => { let component: DsDynamicLookupRelationExternalSourceTabComponent; let fixture: ComponentFixture; let pSearchOptions; let externalSourceService; + let selectableListService; + let modalService; const externalSource = { id: 'orcidV2', @@ -68,6 +76,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { } }) ] as ExternalSourceEntry[]; + const item = Object.assign(new Item(), { id: 'submission-item' }); + const collection = Object.assign(new Collection(), { id: 'submission-collection' }); + const relationship = Object.assign(new RelationshipOptions(), { relationshipType: 'isAuthorOfPublication' }); + const label = 'Author'; function init() { pSearchOptions = new PaginatedSearchOptions({ @@ -76,20 +88,22 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { externalSourceService = jasmine.createSpyObj('externalSourceService', { getExternalSourceEntries: createSuccessfulRemoteDataObject$(createPaginatedList(externalEntries)) }); + selectableListService = jasmine.createSpyObj('selectableListService', ['selectSingle']); } beforeEach(async(() => { init(); TestBed.configureTestingModule({ declarations: [DsDynamicLookupRelationExternalSourceTabComponent, VarDirective], - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule.forRoot(), BrowserAnimationsModule], providers: [ { provide: SearchConfigurationService, useValue: { paginatedSearchOptions: observableOf(pSearchOptions) } }, - { provide: ExternalSourceService, useValue: externalSourceService } + { provide: ExternalSourceService, useValue: externalSourceService }, + { provide: SelectableListService, useValue: selectableListService } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -99,13 +113,18 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { fixture = TestBed.createComponent(DsDynamicLookupRelationExternalSourceTabComponent); component = fixture.componentInstance; component.externalSource = externalSource; + component.item = item; + component.collection = collection; + component.relationship = relationship; + component.label = label; + modalService = (component as any).modalService; fixture.detectChanges(); }); describe('when the external entries finished loading successfully', () => { it('should display a ds-viewable-collection component', () => { - const collection = fixture.debugElement.query(By.css('ds-viewable-collection')); - expect(collection).toBeDefined(); + const viewableCollection = fixture.debugElement.query(By.css('ds-viewable-collection')); + expect(viewableCollection).toBeDefined(); }); }); @@ -116,8 +135,8 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { }); it('should not display a ds-viewable-collection component', () => { - const collection = fixture.debugElement.query(By.css('ds-viewable-collection')); - expect(collection).toBeNull(); + const viewableCollection = fixture.debugElement.query(By.css('ds-viewable-collection')); + expect(viewableCollection).toBeNull(); }); it('should display a ds-loading component', () => { @@ -133,8 +152,8 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { }); it('should not display a ds-viewable-collection component', () => { - const collection = fixture.debugElement.query(By.css('ds-viewable-collection')); - expect(collection).toBeNull(); + const viewableCollection = fixture.debugElement.query(By.css('ds-viewable-collection')); + expect(viewableCollection).toBeNull(); }); it('should display a ds-error component', () => { @@ -150,8 +169,8 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { }); it('should not display a ds-viewable-collection component', () => { - const collection = fixture.debugElement.query(By.css('ds-viewable-collection')); - expect(collection).toBeNull(); + const viewableCollection = fixture.debugElement.query(By.css('ds-viewable-collection')); + expect(viewableCollection).toBeNull(); }); it('should display a message the list is empty', () => { @@ -159,4 +178,15 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { expect(empty).not.toBeNull(); }); }); + + describe('import', () => { + beforeEach(() => { + spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ importedObject: new EventEmitter() }) })); + component.import(externalEntries[0]); + }); + + it('should open a new ExternalSourceEntryImportModalComponent', () => { + expect(modalService.open).toHaveBeenCalledWith(ExternalSourceEntryImportModalComponent, jasmine.any(Object)) + }); + }); }); From 6914000e1971502266bd87480bcd0e4be2d98388 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 9 Dec 2019 11:59:55 +0100 Subject: [PATCH 36/70] 67611: Remaining test cases --- .../core/data/lookup-relation.service.spec.ts | 2 +- ...tion-external-source-tab.component.spec.ts | 2 +- ...ource-entry-import-modal.component.spec.ts | 194 ++++++++++++++++++ 3 files changed, 196 insertions(+), 2 deletions(-) diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts index e12f81f15f..c9fc7fc50d 100644 --- a/src/app/core/data/lookup-relation.service.spec.ts +++ b/src/app/core/data/lookup-relation.service.spec.ts @@ -13,7 +13,7 @@ import { ExternalSource } from '../shared/external-source.model'; import { RequestService } from './request.service'; import { of as observableOf } from 'rxjs'; -fdescribe('LookupRelationService', () => { +describe('LookupRelationService', () => { let service: LookupRelationService; let externalSourceService: ExternalSourceService; let searchService: SearchService; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts index e35b144372..00242ad9ce 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts @@ -25,7 +25,7 @@ import { Collection } from '../../../../../../core/shared/collection.model'; import { RelationshipOptions } from '../../../models/relationship-options.model'; import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component'; -fdescribe('DsDynamicLookupRelationExternalSourceTabComponent', () => { +describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { let component: DsDynamicLookupRelationExternalSourceTabComponent; let fixture: ComponentFixture; let pSearchOptions; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts index e69de29bb2..5248f95573 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts @@ -0,0 +1,194 @@ +import { ExternalSourceEntryImportModalComponent, ImportType } from './external-source-entry-import-modal.component'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service'; +import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model'; +import { Item } from '../../../../../../../core/shared/item.model'; +import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model'; +import { createPaginatedList, createSuccessfulRemoteDataObject$ } from '../../../../../../testing/utils'; +import { Collection } from '../../../../../../../core/shared/collection.model'; +import { RelationshipOptions } from '../../../../models/relationship-options.model'; +import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; +import { ItemDataService } from '../../../../../../../core/data/item-data.service'; +import { NotificationsService } from '../../../../../../notifications/notifications.service'; + +describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { + let component: ExternalSourceEntryImportModalComponent; + let fixture: ComponentFixture; + let lookupRelationService: LookupRelationService; + let selectService: SelectableListService; + let itemService: ItemDataService; + let notificationsService: NotificationsService; + let modalStub: NgbActiveModal; + + const uri = 'https://orcid.org/0001-0001-0001-0001'; + const entry = Object.assign(new ExternalSourceEntry(), { + id: '0001-0001-0001-0001', + display: 'John Doe', + value: 'John, Doe', + metadata: { + 'dc.identifier.uri': [ + { + value: uri + } + ] + } + }); + + const label = 'Author'; + const relationship = Object.assign(new RelationshipOptions(), { relationshipType: 'isAuthorOfPublication' }); + const submissionCollection = Object.assign(new Collection(), { uuid: '9398affe-a977-4992-9a1d-6f00908a259f' }); + const submissionItem = Object.assign(new Item(), { uuid: '26224069-5f99-412a-9e9b-7912a7e35cb1' }); + const item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' }); + const item2 = Object.assign(new Item(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' }); + const item3 = Object.assign(new Item(), { uuid: 'c3bcbff5-ec0c-4831-8e4c-94b9c933ccac' }); + const searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 }); + const searchResult2 = Object.assign(new ItemSearchResult(), { indexableObject: item2 }); + const searchResult3 = Object.assign(new ItemSearchResult(), { indexableObject: item3 }); + const importedItem = Object.assign(new Item(), { uuid: '5d0098fc-344a-4067-a57d-457092b72e82' }); + + function init() { + lookupRelationService = jasmine.createSpyObj('lookupRelationService', { + getLocalResults: createSuccessfulRemoteDataObject$(createPaginatedList([searchResult1, searchResult2, searchResult3])), + removeLocalResultsCache: {} + }); + selectService = jasmine.createSpyObj('selectService', ['deselectAll']); + notificationsService = jasmine.createSpyObj('notificationsService', ['success']); + itemService = jasmine.createSpyObj('itemService', { + importExternalSourceEntry: createSuccessfulRemoteDataObject$(importedItem) + }); + modalStub = jasmine.createSpyObj('modal', ['close']); + } + + beforeEach(async(() => { + init(); + TestBed.configureTestingModule({ + declarations: [ExternalSourceEntryImportModalComponent], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule.forRoot()], + providers: [ + { provide: LookupRelationService, useValue: lookupRelationService }, + { provide: SelectableListService, useValue: selectService }, + { provide: NotificationsService, useValue: notificationsService }, + { provide: ItemDataService, useValue: itemService }, + { provide: NgbActiveModal, useValue: modalStub } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ExternalSourceEntryImportModalComponent); + component = fixture.componentInstance; + component.externalSourceEntry = entry; + component.label = label; + component.relationship = relationship; + component.collection = submissionCollection; + component.item = submissionItem; + fixture.detectChanges(); + }); + + describe('close', () => { + beforeEach(() => { + component.close(); + }); + + it('should close the modal', () => { + expect(modalStub.close).toHaveBeenCalled(); + }); + }); + + describe('selectEntity', () => { + const entity = Object.assign(new Item(), { uuid: 'd8698de5-5b05-4ea4-9d02-da73803a50f9' }); + + beforeEach(() => { + component.selectEntity(entity); + }); + + it('should set selected entity', () => { + expect(component.selectedEntity).toBe(entity); + }); + + it('should set the import type to local entity', () => { + expect(component.selectedImportType).toEqual(ImportType.LocalEntity); + }); + }); + + describe('deselectEntity', () => { + const entity = Object.assign(new Item(), { uuid: 'd8698de5-5b05-4ea4-9d02-da73803a50f9' }); + + beforeEach(() => { + component.selectedImportType = ImportType.LocalEntity; + component.selectedEntity = entity; + component.deselectEntity(); + }); + + it('should remove the selected entity', () => { + expect(component.selectedEntity).toBeUndefined(); + }); + + it('should set the import type to none', () => { + expect(component.selectedImportType).toEqual(ImportType.None); + }); + }); + + describe('selectNewEntity', () => { + describe('when current import type is set to new entity', () => { + beforeEach(() => { + component.selectedImportType = ImportType.NewEntity; + component.selectNewEntity(); + }); + + it('should set the import type to none', () => { + expect(component.selectedImportType).toEqual(ImportType.None); + }); + }); + + describe('when current import type is not set to new entity', () => { + beforeEach(() => { + component.selectedImportType = ImportType.None; + component.selectNewEntity(); + }); + + it('should set the import type to new entity', () => { + expect(component.selectedImportType).toEqual(ImportType.NewEntity); + }); + + it('should deselect the entity and authority list', () => { + expect(selectService.deselectAll).toHaveBeenCalledWith(component.entityListId); + expect(selectService.deselectAll).toHaveBeenCalledWith(component.authorityListId); + }); + }); + }); + + describe('selectNewAuthority', () => { + describe('when current import type is set to new authority', () => { + beforeEach(() => { + component.selectedImportType = ImportType.NewAuthority; + component.selectNewAuthority(); + }); + + it('should set the import type to none', () => { + expect(component.selectedImportType).toEqual(ImportType.None); + }); + }); + + describe('when current import type is not set to new authority', () => { + beforeEach(() => { + component.selectedImportType = ImportType.None; + component.selectNewAuthority(); + }); + + it('should set the import type to new authority', () => { + expect(component.selectedImportType).toEqual(ImportType.NewAuthority); + }); + + it('should deselect the entity and authority list', () => { + expect(selectService.deselectAll).toHaveBeenCalledWith(component.entityListId); + expect(selectService.deselectAll).toHaveBeenCalledWith(component.authorityListId); + }); + }); + }); +}); From ea05af74bd05a45ebfc794e2b396c32aa09d2b58 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 19 Dec 2019 17:34:13 +0100 Subject: [PATCH 37/70] 67611: Import external source entry window layout changes --- ...rnal-source-entry-import-modal.component.html | 16 +++++++++------- ...ternal-source-entry-import-modal.component.ts | 5 +++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html index b88fea8e41..a4fc356ef9 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -13,15 +13,17 @@

{{ (labelPrefix + 'select' | translate) }}

-
-
- - -
-
+
{{ (labelPrefix + 'entities' | translate) }}
+
+
+ + +
+
+ {{ (labelPrefix + 'entities.new' | translate) }}
-
+
{{ (labelPrefix + 'authority' | translate) }}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 8ca8305085..7e0fe78717 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -142,6 +142,11 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { */ importedObject: EventEmitter = new EventEmitter(); + /** + * Should it display the ability to import the entry as an authority? + */ + authorityEnabled = false; + constructor(public modal: NgbActiveModal, public lookupRelationService: LookupRelationService, private selectService: SelectableListService, From 375b51d0d4a893fdf75c58d9d23cc2932d7a6e71 Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Thu, 2 Jan 2020 18:45:09 +0100 Subject: [PATCH 38/70] verify whether file uploads are mandatory --- src/app/shared/mocks/mock-submission.ts | 5 +++- .../upload/section-upload.component.spec.ts | 29 ++++++++++++++++++- .../upload/section-upload.component.ts | 12 +++++++- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/app/shared/mocks/mock-submission.ts b/src/app/shared/mocks/mock-submission.ts index 922e6ad02d..805612c758 100644 --- a/src/app/shared/mocks/mock-submission.ts +++ b/src/app/shared/mocks/mock-submission.ts @@ -1325,7 +1325,7 @@ export const mockUploadConfigResponse = { }, self: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' }, - required: false, + required: true, maxSize: 536870912, name: 'upload', type: 'submissionupload', @@ -1336,6 +1336,9 @@ export const mockUploadConfigResponse = { self: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }; +export const mockUploadConfigResponseNotRequired = mockUploadConfigResponse; +mockUploadConfigResponseNotRequired.required = false; + export const mockAccessConditionOptions = [ { name: 'openaccess', diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index fd9f88d939..58ad12ddc9 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -18,6 +18,7 @@ import { mockSubmissionId, mockSubmissionState, mockUploadConfigResponse, + mockUploadConfigResponseNotRequired, mockUploadFiles } from '../../../shared/mocks/mock-submission'; import { BrowserModule } from '@angular/platform-browser'; @@ -215,6 +216,7 @@ describe('SubmissionSectionUploadComponent test suite', () => { expect(comp.collectionName).toBe(mockCollection.name); expect(comp.availableAccessConditionOptions.length).toBe(4); expect(comp.availableAccessConditionOptions).toEqual(mockUploadConfigResponse.accessConditionOptions as any); + expect(comp.required).toBe(true); expect(compAsAny.subs.length).toBe(2); expect(compAsAny.availableGroups.size).toBe(2); expect(compAsAny.availableGroups).toEqual(expectedGroupsMap); @@ -254,6 +256,7 @@ describe('SubmissionSectionUploadComponent test suite', () => { expect(comp.collectionName).toBe(mockCollection.name); expect(comp.availableAccessConditionOptions.length).toBe(4); expect(comp.availableAccessConditionOptions).toEqual(mockUploadConfigResponse.accessConditionOptions as any); + expect(comp.required).toBe(true); expect(compAsAny.subs.length).toBe(2); expect(compAsAny.availableGroups.size).toBe(2); expect(compAsAny.availableGroups).toEqual(expectedGroupsMap); @@ -263,17 +266,41 @@ describe('SubmissionSectionUploadComponent test suite', () => { }); - it('should the properly section status', () => { + it('should properly read the section status', () => { bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { a: [], b: mockUploadFiles })); + expect(comp.required).toBe(true); + expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', { c: false, d: true })); }); + + it('should properly read the section status when required is false', () => { + uploadsConfigService.getConfigByHref.and.returnValue(observableOf( + new ConfigData(new PageInfo(), mockUploadConfigResponseNotRequired as any) + )); + + bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles)); + + comp.onSectionInit(); + + bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { + a: [], + b: mockUploadFiles + })); + + expect(comp.required).toBe(false); + + expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', { + c: true, + d: true + })); + }); }); }); diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index 9dbd1079f4..24bb658d71 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -104,6 +104,12 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { */ protected availableGroups: Map; // Groups for any policy + /** + * Is the upload required + * @type {boolean} + */ + public required: boolean; + /** * Array to track all subscriptions and unsubscribe them onDestroy * @type {Array} @@ -172,6 +178,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { }), flatMap(() => config$), flatMap((config: SubmissionUploadsModel) => { + this.required = config.required; this.availableAccessConditionOptions = isNotEmpty(config.accessConditionOptions) ? config.accessConditionOptions : []; this.collectionPolicyType = this.availableAccessConditionOptions.length > 0 @@ -273,8 +280,11 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { * the section status */ protected getSectionStatus(): Observable { + // if not mandatory, always true + // if mandatory, at least one file is required return this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id).pipe( - map((fileList: any[]) => (isNotUndefined(fileList) && fileList.length > 0))); + map((fileList: any[]) => + (!this.required || (isNotUndefined(fileList) && fileList.length > 0)))); } /** From 9ed2d4321edc2444b105656d8fdc74edd23646fe Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Fri, 3 Jan 2020 09:32:14 +0100 Subject: [PATCH 39/70] verify whether file uploads are mandatory --- src/app/shared/mocks/mock-submission.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/shared/mocks/mock-submission.ts b/src/app/shared/mocks/mock-submission.ts index 805612c758..a97d2fb31a 100644 --- a/src/app/shared/mocks/mock-submission.ts +++ b/src/app/shared/mocks/mock-submission.ts @@ -1336,7 +1336,8 @@ export const mockUploadConfigResponse = { self: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }; -export const mockUploadConfigResponseNotRequired = mockUploadConfigResponse; +// Clone the object and change one property +export const mockUploadConfigResponseNotRequired = JSON.parse(JSON.stringify(mockUploadConfigResponse)); mockUploadConfigResponseNotRequired.required = false; export const mockAccessConditionOptions = [ From fb10c7764b6a9f0e09d67603edd039b2e3ebecab Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Fri, 3 Jan 2020 10:04:31 +0100 Subject: [PATCH 40/70] case sensitive for Linux compatibility --- .../upload/section-upload.component.spec.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index 58ad12ddc9..8d215d12c7 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -267,6 +267,12 @@ describe('SubmissionSectionUploadComponent test suite', () => { }); it('should properly read the section status', () => { + uploadsConfigService.getConfigByHref.and.returnValue(observableOf( + new ConfigData(new PageInfo(), mockUploadConfigResponseNotRequired as any) + )); + + comp.onSectionInit(); + bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { a: [], b: mockUploadFiles @@ -281,10 +287,21 @@ describe('SubmissionSectionUploadComponent test suite', () => { }); it('should properly read the section status when required is false', () => { + submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState)); + + collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection)); + + resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)); + uploadsConfigService.getConfigByHref.and.returnValue(observableOf( new ConfigData(new PageInfo(), mockUploadConfigResponseNotRequired as any) )); + groupService.findById.and.returnValues( + createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)), + createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)) + ); + bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles)); comp.onSectionInit(); From 1a22f147fb03ed611d3112730effc94b93cefb1b Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Fri, 3 Jan 2020 10:44:01 +0100 Subject: [PATCH 41/70] verify whether file uploads are mandatory --- .../sections/upload/section-upload.component.spec.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index 8d215d12c7..bf971b2f6f 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -267,10 +267,21 @@ describe('SubmissionSectionUploadComponent test suite', () => { }); it('should properly read the section status', () => { + submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState)); + + collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection)); + + resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)); + uploadsConfigService.getConfigByHref.and.returnValue(observableOf( new ConfigData(new PageInfo(), mockUploadConfigResponseNotRequired as any) )); + groupService.findById.and.returnValues( + createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)), + createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)) + ); + comp.onSectionInit(); bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { From 015a0c76f82b134c49bea70284df857a32945de2 Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Fri, 3 Jan 2020 11:14:57 +0100 Subject: [PATCH 42/70] verify whether file uploads are mandatory --- .../submission/sections/upload/section-upload.component.spec.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index bf971b2f6f..68f5ec6de4 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -313,8 +313,6 @@ describe('SubmissionSectionUploadComponent test suite', () => { createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)) ); - bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles)); - comp.onSectionInit(); bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { From 1ca4b95bef5cde61c9f67a7638d8a3634ece3e3a Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Fri, 3 Jan 2020 18:20:34 +0100 Subject: [PATCH 43/70] support uri field which is not dc.identifier.uri --- src/app/+item-page/item-page.module.ts | 3 ++ ...item-page-generic-uri-field.component.html | 3 ++ .../item-page-generic-uri-field.component.ts | 37 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.html create mode 100644 src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts index 5c54becdde..1571339bad 100644 --- a/src/app/+item-page/item-page.module.ts +++ b/src/app/+item-page/item-page.module.ts @@ -10,6 +10,7 @@ import { MetadataUriValuesComponent } from './field-components/metadata-uri-valu 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 { ItemPageGenericUriFieldComponent } from './simple/field-components/specific-field/generic-uri/item-page-generic-uri-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 { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component'; @@ -47,6 +48,7 @@ import { AbstractIncrementalListComponent } from './simple/abstract-incremental- ItemPageDateFieldComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, + ItemPageGenericUriFieldComponent, ItemPageTitleFieldComponent, ItemPageFieldComponent, FileSectionComponent, @@ -66,6 +68,7 @@ import { AbstractIncrementalListComponent } from './simple/abstract-incremental- MetadataValuesComponent, MetadataFieldWrapperComponent, GenericItemPageFieldComponent, + ItemPageGenericUriFieldComponent, RelatedEntitiesSearchComponent, RelatedItemsComponent, MetadataRepresentationListComponent, diff --git a/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.html b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.html new file mode 100644 index 0000000000..2b19754127 --- /dev/null +++ b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts new file mode 100644 index 0000000000..e55d596645 --- /dev/null +++ b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts @@ -0,0 +1,37 @@ +import {Component, Input} from "@angular/core"; +import {ItemPageFieldComponent} from "../item-page-field.component"; +import {Item} from "../../../../../core/shared/item.model"; + +@Component({ + selector: 'ds-item-page-generic-uri-field', + templateUrl: './item-page-generic-uri-field.component.html' +}) +/** + * This component can be used to represent any uri on a simple item page. + * It is the most generic way of displaying uris + * It expects 4 parameters: The item, a separator, the metadata keys and an i18n key + */ +export class ItemPageGenericUriFieldComponent extends ItemPageFieldComponent { + + /** + * The item to display metadata for + */ + @Input() item: Item; + + /** + * Separator string between multiple values of the metadata fields defined + * @type {string} + */ + @Input() separator: string; + + /** + * Fields (schema.element.qualifier) used to render their values. + */ + @Input() fields: string[]; + + /** + * Label i18n key for the rendered metadata + */ + @Input() label: string; + +} From a4d9ce2ec9d8141232740facbf9f4422bf01b08c Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Mon, 6 Jan 2020 09:55:47 +0100 Subject: [PATCH 44/70] verify whether file uploads are mandatory --- .../submission/sections/upload/section-upload.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index 68f5ec6de4..3a512c05c0 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -274,7 +274,7 @@ describe('SubmissionSectionUploadComponent test suite', () => { resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)); uploadsConfigService.getConfigByHref.and.returnValue(observableOf( - new ConfigData(new PageInfo(), mockUploadConfigResponseNotRequired as any) + new ConfigData(new PageInfo(), mockUploadConfigResponse as any) )); groupService.findById.and.returnValues( From f7d4d89db2d49b1b5b3caa566bacc06fe6577350 Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Mon, 6 Jan 2020 10:24:19 +0100 Subject: [PATCH 45/70] verify whether file uploads are mandatory --- src/app/shared/mocks/mock-submission.ts | 99 ++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-) diff --git a/src/app/shared/mocks/mock-submission.ts b/src/app/shared/mocks/mock-submission.ts index a97d2fb31a..31e4c7418e 100644 --- a/src/app/shared/mocks/mock-submission.ts +++ b/src/app/shared/mocks/mock-submission.ts @@ -1336,9 +1336,104 @@ export const mockUploadConfigResponse = { self: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }; +export const mockUploadConfigResponseNotRequired = { + accessConditionOptions: [ + { + name: 'openaccess', + groupUUID: '123456-g', + hasStartDate: false, + hasEndDate: false + }, + { + name: 'lease', + groupUUID: '123456-g', + hasStartDate: false, + hasEndDate: true, + maxEndDate: '2019-07-12T14:40:06.308+0000' + }, + { + name: 'embargo', + groupUUID: '123456-g', + hasStartDate: true, + hasEndDate: false, + maxStartDate: '2022-01-12T14:40:06.308+0000' + }, + { + name: 'administrator', + groupUUID: '0f2773dd-1741-475f-80e7-ccdef153d655', + hasStartDate: false, + hasEndDate: false + } + ], + metadata: { + rows: [ + { + fields: [ + { + input: { + type: 'onebox' + }, + label: 'Title', + mandatory: true, + repeatable: false, + mandatoryMessage: 'You must enter a main title for this item.', + hints: 'Enter the name of the file.', + selectableMetadata: [ + { + metadata: 'dc.title', + label: null, + authority: null, + closed: null + } + ], + languageCodes: [] + } + ] + }, + { + fields: [ + { + input: { + type: 'textarea' + }, + label: 'Description', + mandatory: false, + repeatable: true, + hints: 'Enter a description for the file', + selectableMetadata: [ + { + metadata: 'dc.description', + label: null, + authority: null, + closed: null + } + ], + languageCodes: [] + } + ] + } + ], + name: 'bitstream-metadata', + type: 'submissionform', + _links: { + self: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' + }, + self: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' + }, + required: false, + maxSize: 536870912, + name: 'upload', + type: 'submissionupload', + _links: { + metadata: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload/metadata', + self: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' + }, + self: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' +}; + // Clone the object and change one property -export const mockUploadConfigResponseNotRequired = JSON.parse(JSON.stringify(mockUploadConfigResponse)); -mockUploadConfigResponseNotRequired.required = false; +// export const mockUploadConfigResponseNotRequired = JSON.parse(JSON.stringify(mockUploadConfigResponse)); +// mockUploadConfigResponseNotRequired.required = false; export const mockAccessConditionOptions = [ { From d6e19254e679b191cd5e80a2835160659fd94e59 Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Mon, 6 Jan 2020 11:04:09 +0100 Subject: [PATCH 46/70] support uri field which is not dc.identifier.uri --- ...m-page-generic-uri-field.component.spec.ts | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.spec.ts diff --git a/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.spec.ts b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.spec.ts new file mode 100644 index 0000000000..d238319e56 --- /dev/null +++ b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.spec.ts @@ -0,0 +1,44 @@ +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MockTranslateLoader } from '../../../../../shared/testing/mock-translate-loader'; +import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec'; +import { ItemPageGenericUriFieldComponent } from './item-page-generic-uri-field.component'; +import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component'; + +let comp: ItemPageGenericUriFieldComponent; +let fixture: ComponentFixture; + +const mockField = 'dc.relation.haspart'; +const mockValue = 'test value'; +const mockLabel = 'test label'; + +describe('ItemPageGenericUriFieldComponent', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: MockTranslateLoader + } + })], + declarations: [ItemPageGenericUriFieldComponent, MetadataUriValuesComponent], + schemas: [NO_ERRORS_SCHEMA] + }).overrideComponent(ItemPageGenericUriFieldComponent, { + set: {changeDetection: ChangeDetectionStrategy.Default} + }).compileComponents(); + })); + + beforeEach(async(() => { + fixture = TestBed.createComponent(ItemPageGenericUriFieldComponent); + comp = fixture.componentInstance; + comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue); + comp.fields = [mockField]; + comp.label = mockLabel; + fixture.detectChanges(); + })); + + it('should display display the correct metadata value', () => { + expect(fixture.nativeElement.innerHTML).toContain(mockValue); + }); +}); From 347c9ca7852913b66fafddf4e175cc721e8f08cf Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Mon, 6 Jan 2020 11:07:53 +0100 Subject: [PATCH 47/70] support uri field which is not dc.identifier.uri --- .../generic-uri/item-page-generic-uri-field.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts index e55d596645..596667a879 100644 --- a/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts +++ b/src/app/+item-page/simple/field-components/specific-field/generic-uri/item-page-generic-uri-field.component.ts @@ -1,6 +1,6 @@ -import {Component, Input} from "@angular/core"; -import {ItemPageFieldComponent} from "../item-page-field.component"; -import {Item} from "../../../../../core/shared/item.model"; +import { Component, Input } from '@angular/core'; +import {ItemPageFieldComponent} from '../item-page-field.component'; +import {Item} from '../../../../../core/shared/item.model'; @Component({ selector: 'ds-item-page-generic-uri-field', From dee06c69a6e912324debdcb5c8fa4cf30983de33 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 6 Jan 2020 12:57:00 +0100 Subject: [PATCH 48/70] 64503: Collection harvester settings refresh cache after submitting changes --- .../collection-source.component.spec.ts | 9 +++++++-- .../collection-source.component.ts | 13 ++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts index a44311a1c7..11ec9b1f6a 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts @@ -20,6 +20,7 @@ import { By } from '@angular/platform-browser'; import { Collection } from '../../../core/shared/collection.model'; import { RemoteData } from '../../../core/data/remote-data'; import { CollectionDataService } from '../../../core/data/collection-data.service'; +import { RequestService } from '../../../core/data/request.service'; const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info'); const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning'); @@ -36,6 +37,7 @@ let formService: DynamicFormService; let router: any; let collection: Collection; let collectionService: CollectionDataService; +let requestService: RequestService; describe('CollectionSourceComponent', () => { let comp: CollectionSourceComponent; @@ -111,8 +113,10 @@ describe('CollectionSourceComponent', () => { }); collectionService = jasmine.createSpyObj('collectionService', { getContentSource: observableOf(contentSource), - updateContentSource: observableOf(contentSource) + updateContentSource: observableOf(contentSource), + getHarvesterEndpoint: observableOf('harvester-endpoint') }); + requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring']); TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), RouterTestingModule], @@ -125,7 +129,8 @@ describe('CollectionSourceComponent', () => { { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: new RemoteData(false, false, true, null, collection) }) } } }, { provide: Router, useValue: router }, { provide: GLOBAL_CONFIG, useValue: { collection: { edit: { undoTimeout: 10 } } } as any }, - { provide: CollectionDataService, useValue: collectionService } + { provide: CollectionDataService, useValue: collectionService }, + { provide: RequestService, useValue: requestService } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts index 8ae8efdfe5..5fcc740663 100644 --- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -31,6 +31,7 @@ import { CollectionDataService } from '../../../core/data/collection-data.servic import { getSucceededRemoteData } from '../../../core/shared/operators'; import { MetadataConfig } from '../../../core/shared/metadata-config.model'; import { INotification } from '../../../shared/notifications/models/notification.model'; +import { RequestService } from '../../../core/data/request.service'; /** * Component for managing the content source of the collection @@ -236,7 +237,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem protected route: ActivatedRoute, protected router: Router, @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, - protected collectionService: CollectionDataService) { + protected collectionService: CollectionDataService, + protected requestService: RequestService) { super(objectUpdatesService, notificationsService, translate); } @@ -373,6 +375,15 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem * Submit the edited Content Source to the REST API, re-initialize the field update and display a notification */ onSubmit() { + // Remove cached harvester request to allow for latest harvester to be displayed when switching tabs + this.collectionRD$.pipe( + getSucceededRemoteData(), + map((col) => col.payload.uuid), + switchMap((uuid) => this.collectionService.getHarvesterEndpoint(uuid)), + take(1) + ).subscribe((endpoint) => this.requestService.removeByHrefSubstring(endpoint)); + + // Update harvester this.collectionRD$.pipe( getSucceededRemoteData(), map((col) => col.payload.uuid), From b1575b3336398c3af8aff282d05388348e084393 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 6 Jan 2020 16:08:43 +0100 Subject: [PATCH 49/70] 67611: Remove redundant test --- .../dynamic-lookup-relation-selection-tab.component.spec.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts index 203a4df0b0..18e5d3c3ab 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts @@ -73,11 +73,6 @@ describe('DsDynamicLookupRelationSelectionTabComponent', () => { expect(component).toBeTruthy(); }); - it('should call navigate on the router when is called resetRoute', () => { - component.resetRoute(); - expect(router.navigate).toHaveBeenCalled(); - }); - it('should call navigate on the router when is called resetRoute', () => { component.selectionRD$ = createSelection([]); fixture.detectChanges(); From bb87bf5a0e25e59566f1c00afc6cb9f76f859fa4 Mon Sep 17 00:00:00 2001 From: Ben Bosman Date: Tue, 7 Jan 2020 18:26:26 +0100 Subject: [PATCH 50/70] display the entity type in myDSpace --- .../item-list-preview.component.html | 1 + .../item-list-preview.component.spec.ts | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html index bcd5c3c027..e1478b5206 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html @@ -2,6 +2,7 @@ +

diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts index eb531d2f93..6366539157 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts @@ -47,6 +47,23 @@ const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), { ] } }); +const mockItemWithEntityType: Item = Object.assign(new Item(), { + bundles: observableOf({}), + metadata: { + 'dc.title': [ + { + language: 'en_US', + value: 'This is just another title' + } + ], + 'relationship.type': [ + { + language: null, + value: 'Publication' + } + ] + } +}); describe('ItemListPreviewComponent', () => { beforeEach(async(() => { @@ -128,4 +145,16 @@ describe('ItemListPreviewComponent', () => { expect(dateField).not.toBeNull(); }); }); + + describe('When the item has an entity type', () => { + beforeEach(() => { + component.item = mockItemWithEntityType; + fixture.detectChanges(); + }); + + it('should show the entity type span', () => { + const entityField = fixture.debugElement.query(By.css('ds-item-type-badge')); + expect(entityField).not.toBeNull(); + }); + }); }); From 4e679ec6db48e391f90a2424f4b8cbabb6aa2d86 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 9 Jan 2020 13:42:50 +0100 Subject: [PATCH 51/70] PR-530 Keep virtual metadata on relationship delete - community feedback --- .../edit-relationship-list.component.html | 27 +- .../edit-relationship-list.component.spec.ts | 123 +++++--- .../edit-relationship-list.component.ts | 105 ++++--- .../edit-relationship.component.html | 4 +- .../edit-relationship.component.ts | 2 +- .../item-relationships.component.html | 9 +- .../item-relationships.component.ts | 59 ++-- .../virtual-metadata.component.html | 48 ++-- .../virtual-metadata.component.spec.ts | 272 +++++++----------- .../virtual-metadata.component.ts | 96 +++++-- src/app/core/core.module.ts | 2 + src/app/core/data/entity-type.service.ts | 103 +++++++ .../object-updates/object-updates.actions.ts | 13 +- .../object-updates/object-updates.service.ts | 43 +-- src/app/core/data/relationship.service.ts | 108 +++---- src/app/core/shared/hal-endpoint.service.ts | 4 +- 16 files changed, 586 insertions(+), 432 deletions(-) create mode 100644 src/app/core/data/entity-type.service.ts diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html index 8edcb6808e..1a7cc2e2df 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html @@ -1,16 +1,15 @@ - -
-
{{getRelationshipMessageKey(relationshipLabel) | translate}}
- -
-
- +
{{getRelationshipMessageKey() | async | translate}}
+ + + + + + -
+
no relationships
 diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index bc2fcda3a9..9b2bb3c992 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -1,27 +1,26 @@ -import { EditRelationshipListComponent } from './edit-relationship-list.component'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; -import { ResourceType } from '../../../../core/shared/resource-type'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { of as observableOf } from 'rxjs/internal/observable/of'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; -import { PaginatedList } from '../../../../core/data/paginated-list'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; -import { SharedModule } from '../../../../shared/shared.module'; -import { TranslateModule } from '@ngx-translate/core'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { RelationshipService } from '../../../../core/data/relationship.service'; -import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; -import { By } from '@angular/platform-browser'; +import {EditRelationshipListComponent} from './edit-relationship-list.component'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; +import {RelationshipType} from '../../../../core/shared/item-relationships/relationship-type.model'; +import {Relationship} from '../../../../core/shared/item-relationships/relationship.model'; +import {of as observableOf} from 'rxjs/internal/observable/of'; +import {RemoteData} from '../../../../core/data/remote-data'; +import {Item} from '../../../../core/shared/item.model'; +import {PaginatedList} from '../../../../core/data/paginated-list'; +import {PageInfo} from '../../../../core/shared/page-info.model'; +import {FieldChangeType} from '../../../../core/data/object-updates/object-updates.actions'; +import {SharedModule} from '../../../../shared/shared.module'; +import {TranslateModule} from '@ngx-translate/core'; +import {ObjectUpdatesService} from '../../../../core/data/object-updates/object-updates.service'; +import {DebugElement, NO_ERRORS_SCHEMA} from '@angular/core'; +import {By} from '@angular/platform-browser'; +import {ItemType} from '../../../../core/shared/item-relationships/item-type.model'; let comp: EditRelationshipListComponent; let fixture: ComponentFixture; let de: DebugElement; let objectUpdatesService; -let relationshipService; +let entityTypeService; const url = 'http://test-url.com/test-url'; @@ -30,42 +29,65 @@ let author1; let author2; let fieldUpdate1; let fieldUpdate2; -let relationships; +let relationship1; +let relationship2; let relationshipType; +let entityType; +let relatedEntityType; describe('EditRelationshipListComponent', () => { beforeEach(async(() => { + relationshipType = Object.assign(new RelationshipType(), { id: '1', uuid: '1', leftwardType: 'isAuthorOfPublication', - rightwardType: 'isPublicationOfAuthor' + rightwardType: 'isPublicationOfAuthor', + leftType: observableOf(new RemoteData(false, false, true, undefined, entityType)), + rightType: observableOf(new RemoteData(false, false, true, undefined, relatedEntityType)), }); - relationships = [ - Object.assign(new Relationship(), { - self: url + '/2', - id: '2', - uuid: '2', - leftId: 'author1', - rightId: 'publication', - relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) - }), - Object.assign(new Relationship(), { - self: url + '/3', - id: '3', - uuid: '3', - leftId: 'author2', - rightId: 'publication', - relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) - }) - ]; + relationship1 = Object.assign(new Relationship(), { + self: url + '/2', + id: '2', + uuid: '2', + leftId: 'author1', + rightId: 'publication', + leftItem: observableOf(new RemoteData(false, false, true, undefined, item)), + rightItem: observableOf(new RemoteData(false, false, true, undefined, author1)), + relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) + }); + + relationship2 = Object.assign(new Relationship(), { + self: url + '/3', + id: '3', + uuid: '3', + leftId: 'author2', + rightId: 'publication', + leftItem: observableOf(new RemoteData(false, false, true, undefined, item)), + rightItem: observableOf(new RemoteData(false, false, true, undefined, author2)), + relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) + }); item = Object.assign(new Item(), { self: 'fake-item-url/publication', id: 'publication', uuid: 'publication', - relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships))) + relationships: observableOf(new RemoteData( + false, + false, + true, + undefined, + new PaginatedList(new PageInfo(), [relationship1, relationship2]) + )) + }); + + entityType = Object.assign(new ItemType(), { + id: 'entityType', + }); + + relatedEntityType = Object.assign(new ItemType(), { + id: 'relatedEntityType', }); author1 = Object.assign(new Item(), { @@ -88,17 +110,29 @@ describe('EditRelationshipListComponent', () => { objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', { - getFieldUpdatesExclusive: observableOf({ + getFieldUpdates: observableOf({ [author1.uuid]: fieldUpdate1, [author2.uuid]: fieldUpdate2 }) } ); - relationshipService = jasmine.createSpyObj('relationshipService', + entityTypeService = jasmine.createSpyObj('entityTypeService', { - getRelatedItemsByLabel: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [author1, author2]))), - getItemRelationshipsByLabel: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), relationships))), + getEntityTypeByLabel: observableOf(new RemoteData( + false, + false, + true, + null, + entityType, + )), + getEntityTypeRelationships: observableOf(new RemoteData( + false, + false, + true, + null, + new PaginatedList(new PageInfo(), [relationshipType]), + )), } ); @@ -107,7 +141,6 @@ describe('EditRelationshipListComponent', () => { declarations: [EditRelationshipListComponent], providers: [ { provide: ObjectUpdatesService, useValue: objectUpdatesService }, - { provide: RelationshipService, useValue: relationshipService } ], schemas: [ NO_ERRORS_SCHEMA ] @@ -120,7 +153,7 @@ describe('EditRelationshipListComponent', () => { de = fixture.debugElement; comp.item = item; comp.url = url; - comp.relationshipLabel = relationshipType.leftwardType; + comp.relationshipType = relationshipType; fixture.detectChanges(); }); diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index 7645b2b4b7..13214e27cf 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -1,12 +1,15 @@ -import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { Observable } from 'rxjs/internal/Observable'; -import { FieldUpdate, FieldUpdates } from '../../../../core/data/object-updates/object-updates.reducer'; -import { RelationshipService } from '../../../../core/data/relationship.service'; -import { Item } from '../../../../core/shared/item.model'; -import { map, switchMap} from 'rxjs/operators'; -import { hasValue } from '../../../../shared/empty.util'; +import {Component, Input, OnInit} from '@angular/core'; +import {ObjectUpdatesService} from '../../../../core/data/object-updates/object-updates.service'; +import {Observable} from 'rxjs/internal/Observable'; +import {FieldUpdate, FieldUpdates} from '../../../../core/data/object-updates/object-updates.reducer'; +import {Item} from '../../../../core/shared/item.model'; +import {map, switchMap} from 'rxjs/operators'; +import {hasValue} from '../../../../shared/empty.util'; import {Relationship} from '../../../../core/shared/item-relationships/relationship.model'; +import {RelationshipType} from '../../../../core/shared/item-relationships/relationship-type.model'; +import {getRemoteDataPayload, getSucceededRemoteData} from '../../../../core/shared/operators'; +import {combineLatest as observableCombineLatest, combineLatest} from 'rxjs'; +import {ItemType} from '../../../../core/shared/item-relationships/item-type.model'; @Component({ selector: 'ds-edit-relationship-list', @@ -17,12 +20,15 @@ import {Relationship} from '../../../../core/shared/item-relationships/relations * A component creating a list of editable relationships of a certain type * The relationships are rendered as a list of related items */ -export class EditRelationshipListComponent implements OnInit, OnChanges { +export class EditRelationshipListComponent implements OnInit { + /** * The item to display related items for */ @Input() item: Item; + @Input() itemType: ItemType; + /** * The URL to the current page * Used to fetch updates for the current item from the store @@ -32,7 +38,7 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { /** * The label of the relationship-type we're rendering a list for */ - @Input() relationshipLabel: string; + @Input() relationshipType: RelationshipType; /** * The FieldUpdates for the relationships in question @@ -41,48 +47,42 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { constructor( protected objectUpdatesService: ObjectUpdatesService, - protected relationshipService: RelationshipService ) { } - ngOnInit(): void { - this.initUpdates(); - } - - ngOnChanges(changes: SimpleChanges): void { - this.initUpdates(); - } - /** - * Initialize the FieldUpdates using the related items + * Get the i18n message key for this relationship type */ - initUpdates() { - this.updates$ = this.getUpdatesByLabel(this.relationshipLabel); - } + public getRelationshipMessageKey(): Observable { - /** - * Get FieldUpdates for the relationships of a specific type - * @param label The relationship type's label - */ - public getUpdatesByLabel(label: string): Observable { - return this.relationshipService.getItemRelationshipsByLabel(this.item, label).pipe( - map((relationsRD) => relationsRD.payload.page.map((relationship) => - Object.assign(new Relationship(), relationship, {uuid: relationship.id}) - )), - switchMap((initialFields) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, initialFields)), + return this.getLabel().pipe( + map((label) => { + if (hasValue(label) && label.indexOf('Of') > -1) { + return `relationships.${label.substring(0, label.indexOf('Of') + 2)}` + } else { + return label; + } + }), ); } /** - * Get the i18n message key for a relationship - * @param label The relationship type's label + * Get the relevant label for this relationship type */ - public getRelationshipMessageKey(label: string): string { - if (hasValue(label) && label.indexOf('Of') > -1) { - return `relationships.${label.substring(0, label.indexOf('Of') + 2)}` - } else { - return label; - } + private getLabel(): Observable { + + return combineLatest([ + this.relationshipType.leftType, + this.relationshipType.rightType, + ].map((itemTypeRD) => itemTypeRD.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + ))).pipe( + map((itemTypes) => [ + this.relationshipType.leftwardType, + this.relationshipType.rightwardType, + ][itemTypes.findIndex((itemType) => itemType.id === this.itemType.id)]), + ); } /** @@ -91,4 +91,27 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { trackUpdate(index, update: FieldUpdate) { return update && update.field ? update.field.uuid : undefined; } + + ngOnInit(): void { + this.updates$ = this.item.relationships.pipe( + map((relationships) => relationships.payload.page.filter((relationship) => relationship)), + switchMap((itemRelationships) => + observableCombineLatest( + itemRelationships + .map((relationship) => relationship.relationshipType.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + )) + ).pipe( + map((relationshipTypes) => itemRelationships.filter( + (relationship, index) => relationshipTypes[index].id === this.relationshipType.id) + ), + map((relationships) => relationships.map((relationship) => + Object.assign(new Relationship(), relationship, {uuid: relationship.id}) + )), + ) + ), + switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields)), + ); + } } diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html index 245bf04051..7e61e8958f 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html @@ -19,7 +19,9 @@
 {{"item.edit.metadata.save-button" | translate}}
-
- +
+
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts index 1e678884b1..2030b07f50 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -22,10 +22,12 @@ import { ErrorResponse, RestResponse } from '../../../core/cache/response.models import { isNotEmptyOperator } from '../../../shared/empty.util'; import { RemoteData } from '../../../core/data/remote-data'; import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { getSucceededRemoteData} from '../../../core/shared/operators'; +import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators'; import { RequestService } from '../../../core/data/request.service'; import { Subscription } from 'rxjs/internal/Subscription'; -import { getRelationsByRelatedItemIds } from '../../simple/item-types/shared/item-relationships-utils'; +import {RelationshipType} from '../../../core/shared/item-relationships/relationship-type.model'; +import {ItemType} from '../../../core/shared/item-relationships/item-type.model'; +import {EntityTypeService} from '../../../core/data/entity-type.service'; @Component({ selector: 'ds-item-relationships', @@ -40,13 +42,14 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl /** * The labels of all different relations within this item */ - relationLabels$: Observable; + relationshipTypes$: Observable; /** * A subscription that checks when the item is deleted in cache and reloads the item by sending a new request * This is used to update the item in cache after relationships are deleted */ itemUpdateSubscription: Subscription; + entityType$: Observable; constructor( protected itemService: ItemDataService, @@ -59,7 +62,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl protected relationshipService: RelationshipService, protected objectCache: ObjectCacheService, protected requestService: RequestService, - protected cdRef: ChangeDetectorRef + protected entityTypeService: EntityTypeService, ) { super(itemService, objectUpdatesService, router, notificationsService, translateService, EnvConfig, route); } @@ -69,21 +72,13 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl */ ngOnInit(): void { super.ngOnInit(); - this.relationLabels$ = this.relationshipService.getItemRelationshipLabels(this.item); - this.initializeItemUpdate(); - } - - /** - * Update the item (and view) when it's removed in the request cache - */ - public initializeItemUpdate(): void { this.itemUpdateSubscription = this.requestService.hasByHrefObservable(this.item.self).pipe( filter((exists: boolean) => !exists), switchMap(() => this.itemService.findById(this.item.uuid)), getSucceededRemoteData(), ).subscribe((itemRD: RemoteData) => { this.item = itemRD.payload; - this.cdRef.detectChanges(); + this.initializeUpdates(); }); } @@ -91,8 +86,22 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl * Initialize the values and updates of the current item's relationship fields */ public initializeUpdates(): void { - this.updates$ = this.relationshipService.getRelatedItems(this.item).pipe( - switchMap((items: Item[]) => this.objectUpdatesService.getFieldUpdates(this.url, items)) + + this.entityType$ = this.entityTypeService.getEntityTypeByLabel( + this.item.firstMetadataValue('relationship.type') + ).pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + ); + + this.relationshipTypes$ = this.entityType$.pipe( + switchMap((entityType) => + this.entityTypeService.getEntityTypeRelationships(entityType.id).pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + map((relationshipTypes) => relationshipTypes.page), + ) + ), ); } @@ -142,8 +151,9 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl )) ), ).subscribe((responses: RestResponse[]) => { - this.displayNotifications(responses); - this.reset(); + this.itemUpdateSubscription.add(() => { + this.displayNotifications(responses); + }); }); } @@ -165,22 +175,12 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl } } - /** - * Re-initialize fields and subscriptions - */ - reset() { - this.initializeOriginalFields(); - this.initializeUpdates(); - this.initializeItemUpdate(); - } - /** * Sends all initial values of this item to the object updates service */ public initializeOriginalFields() { - this.relationshipService.getRelatedItems(this.item).pipe(take(1)).subscribe((items: Item[]) => { - this.objectUpdatesService.initialize(this.url, items, this.item.lastModified); - }); + const initialFields = []; + this.objectUpdatesService.initialize(this.url, initialFields, this.item.lastModified); } /** @@ -189,5 +189,4 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl ngOnDestroy(): void { this.itemUpdateSubscription.unsubscribe(); } - } diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html index 8a0269d6b7..f5dab71884 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -5,37 +5,33 @@
-
-
-
-
- -
-
- -
-
-
- {{metadata.metadataField}} -
-
- {{metadata.metadataValue.value}} -
-
+ +
+
+ +
+
+ + +
+
+ {{metadata.metadataField}} +
+
+ {{metadata.metadataValue.value}}
-
+
-
diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts index 7b37b238e8..5b72bec46d 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts @@ -1,172 +1,102 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { Item } from '../../../core/shared/item.model'; -import { RouterStub } from '../../../shared/testing/router-stub'; -import { CommonModule } from '@angular/common'; -import { RouterTestingModule } from '@angular/router/testing'; -import { TranslateModule } from '@ngx-translate/core'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { ActivatedRoute, Router } from '@angular/router'; -import { VirtualMetadataComponent } from './virtual-metadata.component'; -import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { SearchService } from '../../../+search-page/search-service/search.service'; -import { of as observableOf } from 'rxjs'; -import { FormsModule } from '@angular/forms'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PaginatedList } from '../../../core/data/paginated-list'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { RestResponse } from '../../../core/cache/response.models'; -import { Collection } from '../../../core/shared/collection.model'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; +import {of as observableOf} from 'rxjs/internal/observable/of'; +import {TranslateModule} from '@ngx-translate/core'; +import {DebugElement, NO_ERRORS_SCHEMA} from '@angular/core'; +import {By} from '@angular/platform-browser'; +import {VirtualMetadataComponent} from './virtual-metadata.component'; +import {Item} from '../../../core/shared/item.model'; +import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; +import {VarDirective} from '../../../shared/utils/var.directive'; -// describe('ItemMoveComponent', () => { -// let comp: VirtualMetadataComponent; -// let fixture: ComponentFixture; -// -// const mockItem = Object.assign(new Item(), { -// id: 'fake-id', -// handle: 'fake/handle', -// lastModified: '2018' -// }); -// -// const itemPageUrl = `fake-url/${mockItem.id}`; -// const routerStub = Object.assign(new RouterStub(), { -// url: `${itemPageUrl}/edit` -// }); -// -// const mockItemDataService = jasmine.createSpyObj({ -// moveToCollection: observableOf(new RestResponse(true, 200, 'Success')) -// }); -// -// const mockItemDataServiceFail = jasmine.createSpyObj({ -// moveToCollection: observableOf(new RestResponse(false, 500, 'Internal server error')) -// }); -// -// const routeStub = { -// data: observableOf({ -// item: new RemoteData(false, false, true, null, { -// id: 'item1' -// }) -// }) -// }; -// -// const collection1 = Object.assign(new Collection(),{ -// uuid: 'collection-uuid-1', -// name: 'Test collection 1', -// self: 'self-link-1', -// }); -// -// const collection2 = Object.assign(new Collection(),{ -// uuid: 'collection-uuid-2', -// name: 'Test collection 2', -// self: 'self-link-2', -// }); -// -// const mockSearchService = { -// search: () => { -// return observableOf(new RemoteData(false, false, true, null, -// new PaginatedList(null, [ -// { -// indexableObject: collection1, -// hitHighlights: {} -// }, { -// indexableObject: collection2, -// hitHighlights: {} -// } -// ]))); -// } -// }; -// -// const notificationsServiceStub = new NotificationsServiceStub(); -// -// describe('ItemMoveComponent success', () => { -// beforeEach(async(() => { -// TestBed.configureTestingModule({ -// imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], -// declarations: [VirtualMetadataComponent], -// providers: [ -// {provide: ActivatedRoute, useValue: routeStub}, -// {provide: Router, useValue: routerStub}, -// {provide: ItemDataService, useValue: mockItemDataService}, -// {provide: NotificationsService, useValue: notificationsServiceStub}, -// {provide: SearchService, useValue: mockSearchService}, -// ], schemas: [ -// CUSTOM_ELEMENTS_SCHEMA -// ] -// }).compileComponents(); -// })); -// -// beforeEach(() => { -// fixture = TestBed.createComponent(VirtualMetadataComponent); -// comp = fixture.componentInstance; -// fixture.detectChanges(); -// }); -// it('should load suggestions', () => { -// const expected = [ -// collection1, -// collection2 -// ]; -// -// comp.collectionSearchResults.subscribe((value) => { -// expect(value).toEqual(expected); -// } -// ); -// }); -// it('should get current url ', () => { -// expect(comp.getCurrentUrl()).toEqual('fake-url/fake-id/edit'); -// }); -// it('should on click select the correct collection name and id', () => { -// const data = collection1; -// -// comp.onClick(data); -// -// expect(comp.selectedCollectionName).toEqual('Test collection 1'); -// expect(comp.selectedCollection).toEqual(collection1); -// }); -// describe('moveCollection', () => { -// it('should call itemDataService.moveToCollection', () => { -// comp.itemId = 'item-id'; -// comp.selectedCollectionName = 'selected-collection-id'; -// comp.selectedCollection = collection1; -// comp.moveCollection(); -// -// expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1); -// }); -// it('should call notificationsService success message on success', () => { -// comp.moveCollection(); -// -// expect(notificationsServiceStub.success).toHaveBeenCalled(); -// }); -// }); -// }); -// -// describe('ItemMoveComponent fail', () => { -// beforeEach(async(() => { -// TestBed.configureTestingModule({ -// imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], -// declarations: [VirtualMetadataComponent], -// providers: [ -// {provide: ActivatedRoute, useValue: routeStub}, -// {provide: Router, useValue: routerStub}, -// {provide: ItemDataService, useValue: mockItemDataServiceFail}, -// {provide: NotificationsService, useValue: notificationsServiceStub}, -// {provide: SearchService, useValue: mockSearchService}, -// ], schemas: [ -// CUSTOM_ELEMENTS_SCHEMA -// ] -// }).compileComponents(); -// })); -// -// beforeEach(() => { -// fixture = TestBed.createComponent(VirtualMetadataComponent); -// comp = fixture.componentInstance; -// fixture.detectChanges(); -// }); -// -// it('should call notificationsService error message on fail', () => { -// comp.moveCollection(); -// -// expect(notificationsServiceStub.error).toHaveBeenCalled(); -// }); -// }); -// }); +fdescribe('VirtualMetadataComponent', () => { + + let comp: VirtualMetadataComponent; + let fixture: ComponentFixture; + let de: DebugElement; + + let objectUpdatesService; + + const url = 'http://test-url.com/test-url'; + + let item; + let relatedItem; + let relationshipId; + + beforeEach(() => { + + relationshipId = 'relationship id'; + + item = Object.assign(new Item(), { + uuid: 'publication', + metadata: [], + }); + + relatedItem = Object.assign(new Item(), { + uuid: 'relatedItem', + metadata: [], + }); + + objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', { + isSelectedVirtualMetadata: observableOf(false), + setSelectedVirtualMetadata: null, + }); + + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [VirtualMetadataComponent, VarDirective], + providers: [ + {provide: ObjectUpdatesService, useValue: objectUpdatesService}, + ], schemas: [ + NO_ERRORS_SCHEMA + ] + }).compileComponents(); + fixture = TestBed.createComponent(VirtualMetadataComponent); + comp = fixture.componentInstance; + de = fixture.debugElement; + + comp.url = url; + comp.leftItem = item; + comp.rightItem = relatedItem; + comp.relationshipId = relationshipId; + + fixture.detectChanges(); + }); + + describe('when clicking the save button', () => { + it('should emit a save event', () => { + + spyOn(comp.save, 'emit'); + fixture.debugElement + .query(By.css('button.save')) + .triggerEventHandler('click', null); + expect(comp.save.emit).toHaveBeenCalled(); + }); + }); + + describe('when clicking the close button', () => { + it('should emit a close event', () => { + + spyOn(comp.close, 'emit'); + fixture.debugElement + .query(By.css('button.close')) + .triggerEventHandler('click', null); + expect(comp.close.emit).toHaveBeenCalled(); + }); + }); + + describe('when selecting an item', () => { + it('should call the updates service setSelectedVirtualMetadata method', () => { + fixture.debugElement + .query(By.css('input.select')) + .triggerEventHandler('click', null); + fixture.whenStable().then(() => + expect(objectUpdatesService.setSelectedVirtualMetadata).toHaveBeenCalledWith( + url, + relationshipId, + item.uuid, + true + ) + ); + }); + }) +}); diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts index 6a99080c1f..cac46724f0 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -1,10 +1,7 @@ -import {Component, EventEmitter, Input, OnChanges, Output} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {Observable} from 'rxjs'; import {Item} from '../../../core/shared/item.model'; -import {Relationship} from '../../../core/shared/item-relationships/relationship.model'; import {MetadataValue} from '../../../core/shared/metadata.models'; -import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators'; import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; @Component({ @@ -12,47 +9,67 @@ import {ObjectUpdatesService} from '../../../core/data/object-updates/object-upd templateUrl: './virtual-metadata.component.html' }) /** - * Component that handles the moving of an item to a different collection + * Component that lists both items of a relationship, along with their virtual metadata of the relationship. + * The component is shown when a relationship is marked to be deleted. + * Each item has a checkbox to indicate whether its virtual metadata should be saved as real metadata. */ -export class VirtualMetadataComponent implements OnChanges { +export class VirtualMetadataComponent implements OnInit { /** * The current url of this page */ @Input() url: string; - @Input() relationship: Relationship; + /** + * The id of the relationship to be deleted. + */ + @Input() relationshipId: string; + /** + * The left item of the relationship to be deleted. + */ + @Input() leftItem: Item; + + /** + * The right item of the relationship to be deleted. + */ + @Input() rightItem: Item; + + /** + * Emits when the close button is pressed. + */ @Output() close = new EventEmitter(); + + /** + * Emits when the save button is pressed. + */ @Output() save = new EventEmitter(); - leftItem$: Observable; - rightItem$: Observable; + /** + * Get an array of the left and the right item of the relationship to be deleted. + */ + get items() { + return [this.leftItem, this.rightItem]; + } + + private virtualMetadata: Map = new Map(); constructor( - protected route: ActivatedRoute, protected objectUpdatesService: ObjectUpdatesService, ) { } - ngOnChanges(): void { - this.leftItem$ = this.relationship.leftItem.pipe( - getSucceededRemoteData(), - getRemoteDataPayload(), - ); - this.rightItem$ = this.relationship.rightItem.pipe( - getSucceededRemoteData(), - getRemoteDataPayload(), - ); - } + /** + * Get the virtual metadata of a given item corresponding to this relationship. + * @param item the item to get the virtual metadata for + */ + getVirtualMetadata(item: Item): VirtualMetadata[] { - getVirtualMetadata(relationship: Relationship, relatedItem: Item): VirtualMetadata[] { - - return Object.entries(relatedItem.metadata) + return Object.entries(item.metadata) .map(([key, value]) => value .filter((metadata: MetadataValue) => - metadata.authority && metadata.authority.endsWith(relationship.id)) + !key.startsWith('relation') && metadata.authority && metadata.authority.endsWith(this.relationshipId)) .map((metadata: MetadataValue) => { return { metadataField: key, @@ -60,18 +77,43 @@ export class VirtualMetadataComponent implements OnChanges { } }) ) - .reduce((previous, current) => previous.concat(current)); + .reduce((previous, current) => previous.concat(current), []); } + /** + * Select/deselect the virtual metadata of an item to be saved as real metadata. + * @param item the item for which (not) to save the virtual metadata as real metadata + * @param selected whether or not to save the virtual metadata as real metadata + */ setSelectedVirtualMetadataItem(item: Item, selected: boolean) { - this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid, selected); + this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.relationshipId, item.uuid, selected); } + /** + * Check whether the virtual metadata of a given item is selected to be saved as real metadata + * @param item the item for which to check whether the virtual metadata is selected to be saved as real metadata + */ isSelectedVirtualMetadataItem(item: Item): Observable { - return this.objectUpdatesService.isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid); + return this.objectUpdatesService.isSelectedVirtualMetadata(this.url, this.relationshipId, item.uuid); + } + + /** + * Prevent unnecessary rerendering so fields don't lose focus + */ + trackItem(index, item: Item) { + return item && item.uuid; + } + + ngOnInit(): void { + this.items.forEach((item) => { + this.virtualMetadata.set(item.uuid, this.getVirtualMetadata(item)); + }); } } +/** + * Represents a virtual metadata entry. + */ export interface VirtualMetadata { metadataField: string, metadataValue: MetadataValue, diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index a03cc6a9cb..8b623e38e4 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -121,6 +121,7 @@ import { NormalizedBrowseEntry } from './shared/normalized-browse-entry.model'; import { BrowseDefinition } from './shared/browse-definition.model'; import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service'; import { ObjectSelectService } from '../shared/object-select/object-select.service'; +import {EntityTypeService} from './data/entity-type.service'; const IMPORTS = [ CommonModule, @@ -211,6 +212,7 @@ const PROVIDERS = [ TaskResponseParsingService, ClaimedTaskDataService, PoolTaskDataService, + EntityTypeService, // register AuthInterceptor as HttpInterceptor { provide: HTTP_INTERCEPTORS, diff --git a/src/app/core/data/entity-type.service.ts b/src/app/core/data/entity-type.service.ts new file mode 100644 index 0000000000..583601d898 --- /dev/null +++ b/src/app/core/data/entity-type.service.ts @@ -0,0 +1,103 @@ +import { DataService } from './data.service'; +import { RequestService } from './request.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service'; +import { Store } from '@ngrx/store'; +import { CoreState } from '../core.reducers'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { HttpClient } from '@angular/common/http'; +import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; +import { Injectable } from '@angular/core'; +import { GetRequest } from './request.models'; +import { Observable } from 'rxjs/internal/Observable'; +import {switchMap, take, tap} from 'rxjs/operators'; +import { RemoteData } from './remote-data'; +import {RelationshipType} from '../shared/item-relationships/relationship-type.model'; +import {PaginatedList} from './paginated-list'; +import {ItemType} from '../shared/item-relationships/item-type.model'; + +/** + * Service handling all ItemType requests + */ +@Injectable() +export class EntityTypeService extends DataService { + + protected linkPath = 'entitytypes'; + protected forceBypassCache = false; + + constructor(protected requestService: RequestService, + protected rdbService: RemoteDataBuildService, + protected dataBuildService: NormalizedObjectBuildService, + protected store: Store, + protected halService: HALEndpointService, + protected objectCache: ObjectCacheService, + protected notificationsService: NotificationsService, + protected http: HttpClient, + protected comparator: DefaultChangeAnalyzer) { + super(); + } + + getBrowseEndpoint(options, linkPath?: string): Observable { + return this.halService.getEndpoint(this.linkPath); + } + + /** + * Get the endpoint for the item type's allowed relationship types + * @param entityTypeId + */ + getRelationshipTypesEndpoint(entityTypeId: string): Observable { + return this.halService.getEndpoint(this.linkPath).pipe( + switchMap((href) => this.halService.getEndpoint('relationshiptypes', `${href}/${entityTypeId}`)) + ); + } + + /** + * Get the allowed relationship types for an entity type + * @param entityTypeId + */ + getEntityTypeRelationships(entityTypeId: string): Observable>> { + + const href$ = this.getRelationshipTypesEndpoint(entityTypeId); + + href$.pipe(take(1)).subscribe((href) => { + const request = new GetRequest(this.requestService.generateRequestId(), href); + this.requestService.configure(request); + }); + + return this.rdbService.buildList(href$); + } + + /** + * Get an entity type by their label + * @param label + */ + getEntityTypeByLabel(label: string): Observable> { + + // TODO: Remove mock data once REST API supports this + /* + href$.pipe(take(1)).subscribe((href) => { + const request = new GetRequest(this.requestService.generateRequestId(), href); + this.requestService.configure(request); + }); + + return this.rdbService.buildSingle(href$); + */ + + // Mock: + const index = [ + 'Publication', + 'Person', + 'Project', + 'OrgUnit', + 'Journal', + 'JournalVolume', + 'JournalIssue', + 'DataPackage', + 'DataFile', + ].indexOf(label); + + return this.findById((index + 1) + ''); + } +} diff --git a/src/app/core/data/object-updates/object-updates.actions.ts b/src/app/core/data/object-updates/object-updates.actions.ts index 17ad145eb6..a3a95369fd 100644 --- a/src/app/core/data/object-updates/object-updates.actions.ts +++ b/src/app/core/data/object-updates/object-updates.actions.ts @@ -84,6 +84,9 @@ export class AddFieldUpdateAction implements Action { } } +/** + * An ngrx action to select/deselect virtual metadata in the ObjectUpdates state for a certain page url + */ export class SelectVirtualMetadataAction implements Action { type = ObjectUpdatesActionTypes.SELECT_VIRTUAL_METADATA; @@ -95,12 +98,16 @@ export class SelectVirtualMetadataAction implements Action { }; /** - * Create a new AddFieldUpdateAction + * Create a new SelectVirtualMetadataAction * * @param url * the unique url of the page for which a field update is added - * @param field The identifiable field of which a new update is added - * @param changeType The update's change type + * @param source + * the id of the relationship which adds the virtual metadata + * @param uuid + * the id of the item which has the virtual metadata + * @param select + * whether to select or deselect the virtual metadata to be saved as real metadata */ constructor( url: string, diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts index 448f7c9f38..5872a500f7 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -23,13 +23,9 @@ import { SetEditableFieldUpdateAction, SetValidFieldUpdateAction } from './object-updates.actions'; -import {distinctUntilChanged, filter, map} from 'rxjs/operators'; +import {distinctUntilChanged, filter, map, switchMap} from 'rxjs/operators'; import {hasNoValue, hasValue, isEmpty, isNotEmpty} from '../../../shared/empty.util'; import {INotification} from '../../../shared/notifications/models/notification.model'; -import {Item} from '../../shared/item.model'; -import {Relationship} from '../../shared/item-relationships/relationship.model'; -import {MetadataValue} from '../../shared/metadata.models'; -import {VirtualMetadata} from '../../../+item-page/edit-item-page/virtual-metadata/virtual-metadata.component'; function objectUpdatesStateSelector(): MemoizedSelector { return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']); @@ -101,18 +97,22 @@ export class ObjectUpdatesService { */ getFieldUpdates(url: string, initialFields: Identifiable[]): Observable { const objectUpdates = this.getObjectEntry(url); - return objectUpdates.pipe(map((objectEntry) => { - const fieldUpdates: FieldUpdates = {}; - Object.keys(objectEntry.fieldStates).forEach((uuid) => { - let fieldUpdate = objectEntry.fieldUpdates[uuid]; - if (isEmpty(fieldUpdate)) { - const identifiable = initialFields.find((object: Identifiable) => object.uuid === uuid); - fieldUpdate = { field: identifiable, changeType: undefined }; - } - fieldUpdates[uuid] = fieldUpdate; - }); - return fieldUpdates; - })) + return objectUpdates.pipe( + switchMap((objectEntry) => { + const fieldUpdates: FieldUpdates = {}; + Object.keys(objectEntry.fieldStates).forEach((uuid) => { + fieldUpdates[uuid] = objectEntry.fieldUpdates[uuid]; + }); + return this.getFieldUpdatesExclusive(url, initialFields).pipe( + map((fieldUpdatesExclusive) => { + Object.keys(fieldUpdatesExclusive).forEach((uuid) => { + fieldUpdates[uuid] = fieldUpdatesExclusive[uuid]; + }); + return fieldUpdates; + }) + ); + }), + ); } /** @@ -204,6 +204,15 @@ export class ObjectUpdatesService { saveChangeFieldUpdate(url: string, field: Identifiable) { this.saveFieldUpdate(url, field, FieldChangeType.UPDATE); } + + /** + * Check whether the virtual metadata of a given item is selected to be saved as real metadata + * @param url The URL of the page on which the field resides + * @param relationship The id of the relationship for which to check whether the virtual metadata is selected to be + * saved as real metadata + * @param item The id of the item for which to check whether the virtual metadata is selected to be + * saved as real metadata + */ isSelectedVirtualMetadata(url: string, relationship: string, item: string): Observable { return this.store diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts index 895cb46ed1..377703f335 100644 --- a/src/app/core/data/relationship.service.ts +++ b/src/app/core/data/relationship.service.ts @@ -1,39 +1,40 @@ -import { Injectable } from '@angular/core'; -import { RequestService } from './request.service'; -import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; -import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/empty.util'; -import { distinctUntilChanged, filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators'; +import {Injectable} from '@angular/core'; +import {RequestService} from './request.service'; +import {HALEndpointService} from '../shared/hal-endpoint.service'; +import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service'; +import {hasValue, hasValueOperator, isNotEmptyOperator} from '../../shared/empty.util'; +import {distinctUntilChanged, filter, flatMap, map, switchMap, take, tap} from 'rxjs/operators'; import { configureRequest, - filterSuccessfulResponses, - getRemoteDataPayload, getResponseFromEntry, + getRemoteDataPayload, + getResponseFromEntry, getSucceededRemoteData } from '../shared/operators'; -import { DeleteRequest, FindAllOptions, RestRequest } from './request.models'; -import { Observable } from 'rxjs/internal/Observable'; -import { RestResponse } from '../cache/response.models'; -import { Item } from '../shared/item.model'; -import { Relationship } from '../shared/item-relationships/relationship.model'; -import { RelationshipType } from '../shared/item-relationships/relationship-type.model'; -import { RemoteData } from './remote-data'; -import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; -import { zip as observableZip } from 'rxjs'; -import { PaginatedList } from './paginated-list'; -import { ItemDataService } from './item-data.service'; +import {DeleteRequest, FindAllOptions, RestRequest} from './request.models'; +import {Observable} from 'rxjs/internal/Observable'; +import {RestResponse} from '../cache/response.models'; +import {Item} from '../shared/item.model'; +import {Relationship} from '../shared/item-relationships/relationship.model'; +import {RelationshipType} from '../shared/item-relationships/relationship-type.model'; +import {RemoteData} from './remote-data'; +import {combineLatest as observableCombineLatest} from 'rxjs/internal/observable/combineLatest'; +import {zip as observableZip} from 'rxjs'; +import {PaginatedList} from './paginated-list'; +import {ItemDataService} from './item-data.service'; import { - compareArraysUsingIds, filterRelationsByTypeLabel, paginatedRelationsToItems, + compareArraysUsingIds, + paginatedRelationsToItems, relationsToItems } from '../../+item-page/simple/item-types/shared/item-relationships-utils'; -import { ObjectCacheService } from '../cache/object-cache.service'; -import { DataService } from './data.service'; -import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service'; -import { Store } from '@ngrx/store'; -import { CoreState } from '../core.reducers'; -import { NotificationsService } from '../../shared/notifications/notifications.service'; +import {ObjectCacheService} from '../cache/object-cache.service'; +import {DataService} from './data.service'; +import {NormalizedObjectBuildService} from '../cache/builders/normalized-object-build.service'; +import {Store} from '@ngrx/store'; +import {CoreState} from '../core.reducers'; +import {NotificationsService} from '../../shared/notifications/notifications.service'; import {HttpClient} from '@angular/common/http'; -import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; -import { SearchParam } from '../cache/models/search-param.model'; +import {DefaultChangeAnalyzer} from './default-change-analyzer.service'; +import {SearchParam} from '../cache/models/search-param.model'; /** * The service handling all relationship requests @@ -93,19 +94,12 @@ export class RelationshipService extends DataService { configureRequest(this.requestService), switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)), getResponseFromEntry(), - tap(() => this.clearRelatedCache(uuid)) - ); - } - - /** - * Get a combined observable containing an array of all relationships in an item, as well as an array of the relationships their types - * This is used for easier access of a relationship's type because they exist as observables - * @param item - */ - getItemResolvedRelsAndTypes(item: Item): Observable<[Relationship[], RelationshipType[]]> { - return observableCombineLatest( - this.getItemRelationshipsArray(item), - this.getItemRelationshipTypesArray(item) + take(1), + switchMap((response) => + this.clearRelatedCache(uuid).pipe( + map(() => response), + ) + ), ); } @@ -252,23 +246,33 @@ export class RelationshipService extends DataService { } else { findAllOptions.searchParams = searchParams; } - return this.searchBy('byLabel', findAllOptions); + return this.searchBy('byLabel', findAllOptions).pipe( + tap((relationshipsRD) => relationshipsRD.payload.page.forEach( + (relationship) => console.log('relationship: ' + relationship.id)) + ), + ); } /** * Clear object and request caches of the items related to a relationship (left and right items) * @param uuid */ - clearRelatedCache(uuid: string) { - this.findById(uuid).pipe( + clearRelatedCache(uuid: string): Observable { + return this.findById(uuid).pipe( getSucceededRemoteData(), - flatMap((rd: RemoteData) => observableCombineLatest(rd.payload.leftItem.pipe(getSucceededRemoteData()), rd.payload.rightItem.pipe(getSucceededRemoteData()))), - take(1) - ).subscribe(([leftItem, rightItem]) => { - this.objectCache.remove(leftItem.payload.self); - this.objectCache.remove(rightItem.payload.self); - this.requestService.removeByHrefSubstring(leftItem.payload.self); - this.requestService.removeByHrefSubstring(rightItem.payload.self); - }); + switchMap((rd: RemoteData) => + observableCombineLatest( + rd.payload.leftItem.pipe(getSucceededRemoteData()), + rd.payload.rightItem.pipe(getSucceededRemoteData()) + ) + ), + take(1), + map(([leftItem, rightItem]) => { + this.objectCache.remove(leftItem.payload.self); + this.objectCache.remove(rightItem.payload.self); + this.requestService.removeByHrefSubstring(leftItem.payload.self); + this.requestService.removeByHrefSubstring(rightItem.payload.self); + }), + ); } } diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts index a93d54db64..117cc074ca 100644 --- a/src/app/core/shared/hal-endpoint.service.ts +++ b/src/app/core/shared/hal-endpoint.service.ts @@ -43,8 +43,8 @@ export class HALEndpointService { ); } - public getEndpoint(linkPath: string): Observable { - return this.getEndpointAt(this.getRootHref(), ...linkPath.split('/')); + public getEndpoint(linkPath: string, startHref?: string): Observable { + return this.getEndpointAt(startHref || this.getRootHref(), ...linkPath.split('/')); } /** From 7b337acc1ca517c04e0a671b45e03dc0f251b0f3 Mon Sep 17 00:00:00 2001 From: Samuel Date: Fri, 10 Jan 2020 11:59:33 +0100 Subject: [PATCH 52/70] PR-530 repair tests --- .../edit-relationship-list.component.spec.ts | 30 ++++++++--------- .../edit-relationship.component.spec.ts | 32 ++++++++----------- .../virtual-metadata.component.html | 2 +- .../virtual-metadata.component.spec.ts | 15 ++++----- 4 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index 9b2bb3c992..cede48e6ee 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -36,7 +36,16 @@ let entityType; let relatedEntityType; describe('EditRelationshipListComponent', () => { - beforeEach(async(() => { + + beforeEach(() => { + + entityType = Object.assign(new ItemType(), { + id: 'entityType', + }); + + relatedEntityType = Object.assign(new ItemType(), { + id: 'relatedEntityType', + }); relationshipType = Object.assign(new RelationshipType(), { id: '1', @@ -82,14 +91,6 @@ describe('EditRelationshipListComponent', () => { )) }); - entityType = Object.assign(new ItemType(), { - id: 'entityType', - }); - - relatedEntityType = Object.assign(new ItemType(), { - id: 'relatedEntityType', - }); - author1 = Object.assign(new Item(), { id: 'author1', uuid: 'author1' @@ -145,24 +146,23 @@ describe('EditRelationshipListComponent', () => { NO_ERRORS_SCHEMA ] }).compileComponents(); - })); - beforeEach(() => { fixture = TestBed.createComponent(EditRelationshipListComponent); comp = fixture.componentInstance; de = fixture.debugElement; + comp.item = item; + comp.itemType = entityType; comp.url = url; comp.relationshipType = relationshipType; + fixture.detectChanges(); }); describe('changeType is REMOVE', () => { - beforeEach(() => { - fieldUpdate1.changeType = FieldChangeType.REMOVE; - fixture.detectChanges(); - }); it('the div should have class alert-danger', () => { + + fieldUpdate1.changeType = FieldChangeType.REMOVE; const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement; expect(element.classList).toContain('alert-danger'); }); diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index d0de197d9f..70cdacd157 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -31,7 +31,9 @@ let de; let el; describe('EditRelationshipComponent', () => { + beforeEach(async(() => { + relationshipType = Object.assign(new RelationshipType(), { id: '1', uuid: '1', @@ -95,8 +97,8 @@ describe('EditRelationshipComponent', () => { objectUpdatesService = { isSelectedVirtualMetadata: () => null, - removeSingleFieldUpdate: () => null, - saveRemoveFieldUpdate: () => null, + removeSingleFieldUpdate: jasmine.createSpy('removeSingleFieldUpdate'), + saveRemoveFieldUpdate: jasmine.createSpy('saveRemoveFieldUpdate'), }; spyOn(objectUpdatesService, 'isSelectedVirtualMetadata').and.callFake((a, b, uuid) => observableOf(itemSelection[uuid])); @@ -118,6 +120,7 @@ describe('EditRelationshipComponent', () => { })); beforeEach(() => { + fixture = TestBed.createComponent(EditRelationshipComponent); comp = fixture.componentInstance; de = fixture.debugElement; @@ -170,37 +173,30 @@ describe('EditRelationshipComponent', () => { }); describe('remove', () => { + beforeEach(() => { spyOn(comp, 'closeVirtualMetadataModal'); - spyOn(objectUpdatesService, 'saveRemoveFieldUpdate'); comp.ngOnChanges(); comp.remove(); }); it('should close the virtual metadata modal and call saveRemoveFieldUpdate with the correct arguments', () => { - fixture.whenStable(() => { - expect(comp.closeVirtualMetadataModal).toHaveBeenCalled(); - expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, Object.assign({}, fieldUpdate1.field, { + expect(comp.closeVirtualMetadataModal).toHaveBeenCalled(); + expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith( + url, + Object.assign({}, fieldUpdate1.field, { keepLeftVirtualMetadata: false, keepRightVirtualMetadata: true, - })); - }); + }), + ); }); }); describe('undo', () => { - beforeEach(() => { - comp.undo(); - comp.ngOnChanges(); - }); it('should call removeSingleFieldUpdate with the correct arguments', () => { - - fixture.whenStable().then(() => { - expect(spyOn(objectUpdatesService, 'removeSingleFieldUpdate')) - .toHaveBeenCalledWith(url, fieldUpdate1[0]); - }) + comp.undo(); + expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, relationships[0].uuid); }); }); - }); diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html index 15bcce2e1f..c103d83c71 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -8,7 +8,7 @@
+ class="item d-flex flex-row">