Skip to content

Commit a658bf4

Browse files
committed
decrease the number of unnecessary rerenders by checking whether the relationship types have changed
1 parent 4541788 commit a658bf4

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
347347
);
348348
}),
349349
take(1)
350-
)
350+
);
351351
} else {
352352
return EMPTY;
353353
}
354354
}),
355355
toArray(),
356356
).subscribe({
357357
complete: () => {
358-
this.editItemRelationshipsService.submit(this.item, this.url)
358+
this.editItemRelationshipsService.submit(this.item, this.url);
359359
this.submitModal.emit();
360360
}
361361
});

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import { ChangeDetectorRef, Component } from '@angular/core';
2-
import { Item } from '../../../core/shared/item.model';
2+
3+
34
import {
4-
DeleteRelationship,
5-
RelationshipIdentifiable,
6-
} from '../../../core/data/object-updates/object-updates.reducer';
7-
import { map, switchMap, take, concatMap, toArray, tap } from 'rxjs/operators';
5+
map,
6+
distinctUntilChanged
7+
} from 'rxjs/operators';
88
import {
9-
combineLatest as observableCombineLatest,
109
Observable,
11-
BehaviorSubject, EMPTY
10+
BehaviorSubject
1211
} from 'rxjs';
1312
import { followLink } from '../../../shared/utils/follow-link-config.model';
1413
import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
@@ -18,23 +17,17 @@ import { ActivatedRoute, Router } from '@angular/router';
1817
import { NotificationsService } from '../../../shared/notifications/notifications.service';
1918
import { TranslateService } from '@ngx-translate/core';
2019
import { RelationshipDataService } from '../../../core/data/relationship-data.service';
21-
import { RemoteData } from '../../../core/data/remote-data';
2220
import { ObjectCacheService } from '../../../core/cache/object-cache.service';
2321
import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
2422
import { RequestService } from '../../../core/data/request.service';
2523
import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
2624
import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
2725
import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
28-
import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
29-
import { NoContent } from '../../../core/shared/NoContent.model';
30-
import { hasValue } from '../../../shared/empty.util';
31-
import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
32-
import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
33-
import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
3426
import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
3527
import { PaginatedList } from '../../../core/data/paginated-list.model';
3628
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
3729
import { EditItemRelationshipsService } from './edit-item-relationships.service';
30+
import { compareArraysUsingIds } from '../../simple/item-types/shared/item-relationships-utils';
3831

3932
@Component({
4033
selector: 'ds-item-relationships',
@@ -89,7 +82,8 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
8982
if (label !== undefined) {
9083
this.relationshipTypes$ = this.relationshipTypeService.searchByEntityType(label, true, true, ...this.getRelationshipTypeFollowLinks())
9184
.pipe(
92-
map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page)
85+
map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page),
86+
distinctUntilChanged(compareArraysUsingIds())
9387
);
9488

9589
this.entityTypeService.getEntityTypeByLabel(label).pipe(

0 commit comments

Comments
 (0)