Skip to content

Commit

Permalink
115427: Fixed delete item not redirecting when having some virtual me…
Browse files Browse the repository at this point in the history
…tadata that needs to be copied

(cherry picked from commit b8d9c65)
  • Loading branch information
alexandrevryghem authored and github-actions[bot] committed May 29, 2024
1 parent 8b3010b commit 7993020
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions src/app/core/data/base/delete-data.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ describe('DeleteDataImpl', () => {
method: RestRequestMethod.DELETE,
href: 'some-href?copyVirtualMetadata=a&copyVirtualMetadata=b&copyVirtualMetadata=c',
}));

const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1];
callback();
expect(service.invalidateByHref).toHaveBeenCalledWith('some-href');

done();
});
});
Expand Down
5 changes: 3 additions & 2 deletions src/app/core/data/base/delete-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,16 @@ export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataS
deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
const requestId = this.requestService.generateRequestId();

let deleteHref: string = href;
if (copyVirtualMetadata) {
copyVirtualMetadata.forEach((id) =>
href += (href.includes('?') ? '&' : '?')
deleteHref += (deleteHref.includes('?') ? '&' : '?')
+ 'copyVirtualMetadata='
+ id,
);
}

const request = new DeleteRequest(requestId, href);
const request = new DeleteRequest(requestId, deleteHref);
if (hasValue(this.responseMsToLive)) {
request.responseMsToLive = this.responseMsToLive;
}
Expand Down

0 comments on commit 7993020

Please sign in to comment.