Merge remote-tracking branch 'atmire-github/fix-submission-lost-changes-after-save-7.6' into fix-submission-lost-changes-after-save-8.0.0-next

Author: artlowel

src/app/core/json-patch/json-patch-operations.service.spec.ts

@@ -156,7 +156,7 @@ describe('JsonPatchOperationsService test suite', () => {
     });
 
     it('should send a new SubmissionPatchRequest', () => {
-      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref, patchOpBody);
+      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref + '?embed=item', patchOpBody);
       scheduler.schedule(() => service.jsonPatchByResourceType(resourceEndpoint, resourceScope, testJsonPatchResourceType).subscribe());
       scheduler.flush();
 
@@ -246,7 +246,7 @@ describe('JsonPatchOperationsService test suite', () => {
     });
 
     it('should send a new SubmissionPatchRequest', () => {
-      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref, patchOpBody);
+      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref + '?embed=item', patchOpBody);
       scheduler.schedule(() => service.jsonPatchByResourceID(resourceEndpoint, resourceScope, testJsonPatchResourceType, testJsonPatchResourceId).subscribe());
       scheduler.flush();
 

src/app/core/json-patch/json-patch-operations.service.ts

@@ -37,6 +37,7 @@ import {
 } from './json-patch-operations.actions';
 import { JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
 import { jsonPatchOperationsByResourceType } from './selectors';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -144,7 +145,7 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
    *    instance of PatchRequestDefinition
    */
   protected getRequestInstance(uuid: string, href: string, body?: any): PatchRequestDefinition {
-    return new this.patchRequestConstructor(uuid, href, body);
+    return new this.patchRequestConstructor(uuid, new URLCombiner(href, '?embed=item').toString(), body);
   }
 
   protected getEndpointByIDHref(endpoint, resourceID): string {