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

64961: server-sync-buffer bugfix, data-service update revert changes + edit-bitstream onSubmit refactoring

Browse Source
This commit is contained in:
Kristof De Langhe
2019-09-20 15:24:24 +02:00
parent 4357c19cad
commit f152cad1fa
4 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,18 +211,13 @@ export abstract class DataService<T extends CacheableObject> {
* Add a new patch to the object cache
* The patch is derived from the differences between the given object and its version in the object cache
* @param {DSpaceObject} object The given object
* @param extraOperations
*/
update(object: T, extraOperations?: Operation[]): Observable<RemoteData<T>> {
update(object: T): Observable<RemoteData<T>> {
const oldVersion$ = this.objectCache.getObjectBySelfLink(object.self);
return oldVersion$.pipe(take(1), mergeMap((oldVersion: T) => {
const operations = this.comparator.diff(oldVersion, object);
let combinedOperations = operations || extraOperations;
if (isNotEmpty(extraOperations)) {
combinedOperations = [...operations, ...extraOperations];
}
if (isNotEmpty(combinedOperations)) {
this.objectCache.addPatch(object.self, combinedOperations);
if (isNotEmpty(operations)) {
this.objectCache.addPatch(object.self, operations);
}
return this.findById(object.uuid);
}
@@ -316,7 +311,7 @@ export abstract class DataService<T extends CacheableObject> {
* @param dso The DSpace Object to be removed
* Return the delete request's ID
*/
deleteAndReturnRequestId(dso: T): string {
private deleteAndReturnRequestId(dso: T): string {
const requestId = this.requestService.generateRequestId();
const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(