Skip to content

Commit 672219b

Browse files
Merge branch 'refs/heads/w2p-115427_fixed-delete-item-page-freezing_contribute-7.6' into w2p-115427_fixed-delete-item-page-freezing_contribute-main
2 parents aea39ef + b8d9c65 commit 672219b

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/app/core/data/base/delete-data.spec.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,11 @@ describe('DeleteDataImpl', () => {
209209
method: RestRequestMethod.DELETE,
210210
href: 'some-href?copyVirtualMetadata=a&copyVirtualMetadata=b&copyVirtualMetadata=c',
211211
}));
212+
213+
const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1];
214+
callback();
215+
expect(service.invalidateByHref).toHaveBeenCalledWith('some-href');
216+
212217
done();
213218
});
214219
});

src/app/core/data/base/delete-data.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,16 @@ export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataS
7575
deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
7676
const requestId = this.requestService.generateRequestId();
7777

78+
let deleteHref: string = href;
7879
if (copyVirtualMetadata) {
7980
copyVirtualMetadata.forEach((id) =>
80-
href += (href.includes('?') ? '&' : '?')
81+
deleteHref += (deleteHref.includes('?') ? '&' : '?')
8182
+ 'copyVirtualMetadata='
8283
+ id,
8384
);
8485
}
8586

86-
const request = new DeleteRequest(requestId, href);
87+
const request = new DeleteRequest(requestId, deleteHref);
8788
if (hasValue(this.responseMsToLive)) {
8889
request.responseMsToLive = this.responseMsToLive;
8990
}

0 commit comments

Comments
 (0)