hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 13:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix loop for name variants as well

Browse Source
This commit is contained in:
Art Lowel
2019-12-03 15:09:29 +01:00
parent 71a3a22a7c
commit 5234a7b015
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/core/data/data.service.ts
View File

@@ -236,6 +236,7 @@ export abstract class DataService<T extends CacheableObject> {
console.log(oldVersion); console.log(oldVersion);
const operations = this.comparator.diff(oldVersion, object); const operations = this.comparator.diff(oldVersion, object);
if (isNotEmpty(operations)) { if (isNotEmpty(operations)) {
console.log('operations', operations);
this.objectCache.addPatch(object.self, operations); this.objectCache.addPatch(object.self, operations);
} }
return this.findByHref(object.self); return this.findByHref(object.self);

20
src/app/core/data/relationship.service.ts
View File

@@ -333,7 +333,7 @@ export class RelationshipService extends DataService<Relationship> {
} }
public updateNameVariant(item1: Item, item2: Item, relationshipLabel: string, nameVariant: string): Observable<RemoteData<Relationship>> { public updateNameVariant(item1: Item, item2: Item, relationshipLabel: string, nameVariant: string): Observable<RemoteData<Relationship>> {
return this.getRelationshipByItemsAndLabel(item1, item2, relationshipLabel) const update$ = this.getRelationshipByItemsAndLabel(item1, item2, relationshipLabel)
.pipe( .pipe(
switchMap((relation: Relationship) => switchMap((relation: Relationship) =>
relation.relationshipType.pipe( relation.relationshipType.pipe(
@@ -354,13 +354,17 @@ export class RelationshipService extends DataService<Relationship> {
} }
return this.update(updatedRelationship); return this.update(updatedRelationship);
}), }),
tap((relationshipRD: RemoteData<Relationship>) => { );
if (relationshipRD.hasSucceeded) {
this.removeRelationshipItemsFromCache(item1); update$.pipe(
this.removeRelationshipItemsFromCache(item2); filter((relationshipRD: RemoteData<Relationship>) => relationshipRD.state === RemoteDataState.ResponsePending),
} take(1),
}), ).subscribe(() => {
) this.removeRelationshipItemsFromCache(item1);
this.removeRelationshipItemsFromCache(item2);
});
return update$
} }
public updatePlace(reoRel: ReorderableRelationship): Observable<RemoteData<Relationship>> { public updatePlace(reoRel: ReorderableRelationship): Observable<RemoteData<Relationship>> {

3
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
View File

@@ -3,6 +3,7 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
import { debounceTime, map, mergeMap, take, tap } from 'rxjs/operators'; import { debounceTime, map, mergeMap, take, tap } from 'rxjs/operators';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { RelationshipService } from '../../../../../core/data/relationship.service'; import { RelationshipService } from '../../../../../core/data/relationship.service';
import { getSucceededRemoteData } from '../../../../../core/shared/operators';
import { AddRelationshipAction, RelationshipAction, RelationshipActionTypes, RemoveRelationshipAction, UpdateRelationshipAction } from './relationship.actions'; import { AddRelationshipAction, RelationshipAction, RelationshipActionTypes, RemoveRelationshipAction, UpdateRelationshipAction } from './relationship.actions';
import { Item } from '../../../../../core/shared/item.model'; import { Item } from '../../../../../core/shared/item.model';
import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util'; import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util';
@@ -83,7 +84,7 @@ export class RelationshipEffects {
this.nameVariantUpdates[identifier] = nameVariant; this.nameVariantUpdates[identifier] = nameVariant;
} else { } else {
this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant) this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant)
.pipe() .pipe(getSucceededRemoteData())
.subscribe(); .subscribe();
} }
} }