Skip to content

Commit f7c9058

Browse files
alexandrevryghemalexandrevryghem
committed
Merge branch 'w2p-113560_edit-item-add-relationships-one-by-one_contribute-7.6' into w2p-113560_edit-item-add-relationships-one-by-one_contribute-7_x
# Conflicts: # src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html # src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
2 parents 1b38f2d + f65b964 commit f7c9058

12 files changed

Lines changed: 73 additions & 70 deletions

‎src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
3535
*/
3636
updates$: Observable<FieldUpdates>;
3737

38+
hasChanges$: Observable<boolean>;
39+
40+
isReinstatable$: Observable<boolean>;
41+
3842
/**
3943
* Route to the item's page
4044
*/
@@ -82,6 +86,8 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
8286

8387
this.discardTimeOut = environment.item.edit.undoTimeout;
8488
this.url = this.router.url;
89+
this.hasChanges$ = this.hasChanges();
90+
this.isReinstatable$ = this.isReinstatable();
8591
if (this.url.indexOf('?') > 0) {
8692
this.url = this.url.substr(0, this.url.indexOf('?'));
8793
}

‎src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
class="fas fa-upload"></i>
77
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
88
</button>
9-
<button class="btn btn-warning" *ngIf="isReinstatable() | async"
9+
<button class="btn btn-warning" *ngIf="isReinstatable$ | async"
1010
[attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
1111
(click)="reinstate()"><i
1212
class="fas fa-undo-alt"></i>
1313
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
1414
</button>
15-
<button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
15+
<button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
1616
[attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
1717
(click)="submit()"><i
1818
class="fas fa-save"></i>
1919
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
2020
</button>
21-
<button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
21+
<button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
2222
[attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
23-
[disabled]="!(hasChanges() | async) || submitting"
23+
[disabled]="(hasChanges$ | async) !== true || submitting"
2424
(click)="discard()"><i
2525
class="fas fa-times"></i>
2626
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -52,21 +52,21 @@
5252

5353
<div class="button-row bottom">
5454
<div class="mt-4 float-right space-children-mr ml-gap">
55-
<button class="btn btn-warning" *ngIf="isReinstatable() | async"
55+
<button class="btn btn-warning" *ngIf="isReinstatable$ | async"
5656
[attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
5757
(click)="reinstate()"><i
5858
class="fas fa-undo-alt"></i>
5959
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
6060
</button>
61-
<button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
61+
<button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
6262
[attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
6363
(click)="submit()"><i
6464
class="fas fa-save"></i>
6565
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
6666
</button>
67-
<button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
67+
<button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
6868
[attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
69-
[disabled]="!(hasChanges() | async) || submitting"
69+
[disabled]="(hasChanges$ | async) !== true || submitting"
7070
(click)="discard()"><i
7171
class="fas fa-times"></i>
7272
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>

‎src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ describe('EditItemRelationshipsService', () => {
185185

186186
expect(itemService.invalidateByHref).toHaveBeenCalledWith(currentItem.self);
187187
expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem1.self);
188-
// TODO currently this isn't done yet
189-
// expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem2.self);
190188

191189
expect(notificationsService.success).toHaveBeenCalledTimes(1);
192190
});

‎src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html‎

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<div class="item-relationships">
2-
<ng-container *ngIf="entityType$ | async as entityType">
3-
<div class="button-row top d-flex space-children-mr">
4-
<button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
5-
[disabled]="!(hasChanges() | async)"
6-
(click)="discard()"><i
7-
class="fas fa-times"></i>
8-
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
9-
</button>
10-
<button class="btn btn-warning ml-auto" *ngIf="isReinstatable() | async"
11-
(click)="reinstate()"><i
12-
class="fas fa-undo-alt"></i>
13-
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
14-
</button>
15-
<button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
16-
(click)="submit()"><span *ngIf="isSaving$ | async" class="spinner-border spinner-border-sm" role="status"
17-
aria-hidden="true"></span>
18-
<i *ngIf="!(isSaving$ | async)" class="fas fa-save"></i>
19-
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
20-
</button>
2+
<ng-container *ngIf="entityType$ | async as entityType; else noEntityType">
3+
<div class="button-row top d-flex justify-content-end">
4+
<ng-container *ngTemplateOutlet="buttons"></ng-container>
215
</div>
226
<div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
237
<div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
@@ -26,36 +10,46 @@
2610
[item]="item"
2711
[itemType]="entityType"
2812
[relationshipType]="relationshipType"
29-
[hasChanges]="hasChanges()"
13+
[hasChanges]="hasChanges$"
3014
></ds-edit-relationship-list>
3115
</div>
3216
</div>
33-
<ng-template #loading>
34-
<ds-themed-loading></ds-themed-loading>
35-
</ng-template>
3617
<div class="button-row bottom">
37-
<div class="float-right space-children-mr ml-gap">
38-
<button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
39-
[disabled]="!(hasChanges() | async)"
40-
(click)="discard()"><i
41-
class="fas fa-times"></i>
42-
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
43-
</button>
44-
<button class="btn btn-warning" *ngIf="isReinstatable() | async"
45-
(click)="reinstate()"><i
46-
class="fas fa-undo-alt"></i>
47-
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
48-
</button>
49-
<button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
50-
(click)="submit()"><i
51-
class="fas fa-save"></i>
52-
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
53-
</button>
18+
<div class="float-right ml-gap">
19+
<ng-container *ngTemplateOutlet="buttons"></ng-container>
5420
</div>
5521
</div>
56-
<div *ngIf="!entityType"
57-
class="alert alert-info mt-2" role="alert">
58-
{{ 'item.edit.relationships.no-entity-type' | translate }}
59-
</div>
6022
</ng-container>
6123
</div>
24+
25+
<ng-template #noEntityType>
26+
<ds-alert [type]="AlertType.Info" class="d-block mt-2">
27+
{{ 'item.edit.relationships.no-entity-type' | translate }}
28+
</ds-alert>
29+
</ng-template>
30+
31+
<ng-template #loading>
32+
<ds-themed-loading></ds-themed-loading>
33+
</ng-template>
34+
35+
<ng-template #buttons>
36+
<div class="d-flex space-children-mr justify-content-end">
37+
<button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
38+
[disabled]="(hasChanges$ | async) !== true"
39+
(click)="discard()">
40+
<i aria-hidden="true" class="fas fa-times"></i>
41+
<span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
42+
</button>
43+
<button class="btn btn-warning" *ngIf="isReinstatable() | async" (click)="reinstate()">
44+
<i aria-hidden="true" class="fas fa-undo-alt"></i>
45+
<span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
46+
</button>
47+
<button class="btn btn-primary"
48+
[disabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
49+
(click)="submit()">
50+
<span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
51+
<i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
52+
<span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.save-button' | translate }}</span>
53+
</button>
54+
</div>
55+
</ng-template>

‎src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core
22
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
33
import { ActivatedRoute, Router } from '@angular/router';
44
import { TranslateModule } from '@ngx-translate/core';
5-
import { getTestScheduler } from 'jasmine-marbles';
65
import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
7-
import { TestScheduler } from 'rxjs/testing';
86
import { ObjectCacheService } from '../../../core/cache/object-cache.service';
97
import { RestResponse } from '../../../core/cache/response.models';
108
import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
@@ -30,6 +28,7 @@ import { relationshipTypes } from '../../../shared/testing/relationship-types.mo
3028
import { ThemeService } from '../../../shared/theme-support/theme.service';
3129
import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
3230
import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub';
31+
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
3332

3433
let comp: any;
3534
let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -58,7 +57,6 @@ let itemService: ItemDataServiceStub;
5857
const url = 'http://test-url.com/test-url';
5958
router.url = url;
6059

61-
let scheduler: TestScheduler;
6260
let item;
6361
let author1;
6462
let author2;
@@ -206,9 +204,8 @@ describe('ItemRelationshipsComponent', () => {
206204
}
207205
);
208206

209-
scheduler = getTestScheduler();
210207
TestBed.configureTestingModule({
211-
imports: [SharedModule, TranslateModule.forRoot()],
208+
imports: [NoopAnimationsModule, SharedModule, TranslateModule.forRoot()],
212209
declarations: [ItemRelationshipsComponent],
213210
providers: [
214211
{ provide: ThemeService, useValue: getMockThemeService() },

‎src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
2828
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
2929
import { EditItemRelationshipsService } from './edit-item-relationships.service';
3030
import { compareArraysUsingIds } from '../../simple/item-types/shared/item-relationships-utils';
31+
import { AlertType } from '../../../shared/alert/alert-type';
3132

3233
@Component({
3334
selector: 'ds-item-relationships',
@@ -54,6 +55,8 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
5455
return this.editItemRelationshipsService.isSaving$;
5556
}
5657

58+
readonly AlertType = AlertType;
59+
5760
constructor(
5861
public itemService: ItemDataService,
5962
public objectUpdatesService: ObjectUpdatesService,

‎src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
3232
</ng-template>
3333
</li>
3434
<li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index" role="presentation">
35-
<a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate : { count: (totalExternal$ | async)[idx] } }}</a>
35+
<a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate : { count: (totalExternal$ | async)?.[idx] } }}</a>
3636
<ng-template ngbNavContent>
3737
<ds-themed-dynamic-lookup-relation-external-source-tab
3838
[label]="label"

‎src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/ope
3030
import { followLink } from '../../../../utils/follow-link-config.model';
3131
import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
3232
import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
33+
import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
3334

3435
@Component({
3536
selector: 'ds-dynamic-lookup-relation-modal',
@@ -217,7 +218,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
217218
* Select (a list of) objects and add them to the store
218219
* @param selectableObjects
219220
*/
220-
select(...selectableObjects: SearchResult<Item>[]) {
221+
select(...selectableObjects: SearchResult<DSpaceObject>[]) {
221222
this.zone.runOutsideAngular(
222223
() => {
223224
const obs: Observable<any[]> = observableCombineLatest([...selectableObjects.map((sri: SearchResult<Item>) => {
@@ -260,11 +261,11 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
260261
* Deselect (a list of) objects and remove them from the store
261262
* @param selectableObjects
262263
*/
263-
deselect(...selectableObjects: SearchResult<Item>[]) {
264+
deselect(...selectableObjects: SearchResult<DSpaceObject>[]) {
264265
this.zone.runOutsideAngular(
265266
() => selectableObjects.forEach((object) => {
266267
this.subMap[object.indexableObject.uuid].unsubscribe();
267-
this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType, this.submissionId));
268+
this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject as Item, this.relationshipOptions.relationshipType, this.submissionId));
268269
})
269270
);
270271
}

‎src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
9696
/**
9797
* Send an event to deselect an object from the list
9898
*/
99-
@Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
99+
@Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
100100

101101
/**
102102
* Send an event to select an object from the list
103103
*/
104-
@Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
104+
@Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
105105

106106
/**
107107
* Search results
@@ -178,7 +178,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
178178
this.selection$
179179
.pipe(take(1))
180180
.subscribe((selection: SearchResult<Item>[]) => {
181-
const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
181+
const filteredPage: SearchResult<DSpaceObject>[] = page.filter((pageItem: SearchResult<DSpaceObject>) => selection.findIndex((selected: SearchResult<Item>) => selected.equals(pageItem)) < 0);
182182
this.selectObject.emit(...filteredPage);
183183
});
184184
this.selectableListService.select(this.listId, page);

‎src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
4343

4444
@Input() isEditRelationship: boolean;
4545

46-
@Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
46+
@Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
4747

48-
@Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
48+
@Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
4949

5050
@Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
5151

0 commit comments

Comments
 (0)