94060: Encoded embedded slash forward to prevent cypress glob issues

Author: LotteHofstede

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

@@ -24,6 +24,7 @@ import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALDataService } from './hal-data-service.interface';
 
+export const EMBED_SEPARATOR = '%2F';
 /**
  * Common functionality for data services.
  * Specific functionality that not all services would need
@@ -201,7 +202,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
     let nestEmbed = embedString;
     linksToFollow.forEach((linkToFollow: FollowLinkConfig<T>) => {
       if (hasValue(linkToFollow) && linkToFollow.shouldEmbed) {
-        nestEmbed = nestEmbed + '/' + String(linkToFollow.name);
+        nestEmbed = nestEmbed + EMBED_SEPARATOR + String(linkToFollow.name);
         // Add the nested embeds size if given in the FollowLinkConfig.FindListOptions
         if (hasValue(linkToFollow.findListOptions) && hasValue(linkToFollow.findListOptions.elementsPerPage)) {
           const nestedEmbedSize = 'embed.size=' + nestEmbed.split('=')[1] + '=' + linkToFollow.findListOptions.elementsPerPage;

src/app/core/data/base/find-all-data.spec.ts

@@ -22,6 +22,7 @@ import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.s
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { Observable, of as observableOf } from 'rxjs';
+import { EMBED_SEPARATOR } from './base-data.service';
 
 /**
  * Tests whether calls to `FindAllData` methods are correctly patched through in a concrete data service that implements it
@@ -276,15 +277,15 @@ describe('FindAllDataImpl', () => {
     });
 
     it('should include nested linksToFollow 3lvl', () => {
-      const expected = `${endpoint}?embed=owningCollection/itemtemplate/relationships`;
+      const expected = `${endpoint}?embed=owningCollection${EMBED_SEPARATOR}itemtemplate${EMBED_SEPARATOR}relationships`;
 
       (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships')))).subscribe((value) => {
         expect(value).toBe(expected);
       });
     });
 
     it('should include nested linksToFollow 2lvl and nested embed\'s size', () => {
-      const expected = `${endpoint}?embed.size=owningCollection/itemtemplate=4&embed=owningCollection/itemtemplate`;
+      const expected = `${endpoint}?embed.size=owningCollection${EMBED_SEPARATOR}itemtemplate=4&embed=owningCollection${EMBED_SEPARATOR}itemtemplate`;
       const config: FindListOptions = Object.assign(new FindListOptions(), {
         elementsPerPage: 4,
       });

src/app/core/data/base/identifiable-data.service.spec.ts

@@ -19,6 +19,7 @@ import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.s
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { IdentifiableDataService } from './identifiable-data.service';
+import { EMBED_SEPARATOR } from './base-data.service';
 
 const endpoint = 'https://rest.api/core';
 
@@ -137,7 +138,7 @@ describe('IdentifiableDataService', () => {
     });
 
     it('should include nested linksToFollow 3lvl', () => {
-      const expected = `${endpointMock}/${resourceIdMock}?embed=owningCollection/itemtemplate/relationships`;
+      const expected = `${endpointMock}/${resourceIdMock}?embed=owningCollection${EMBED_SEPARATOR}itemtemplate${EMBED_SEPARATOR}relationships`;
       const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships'))));
       expect(result).toEqual(expected);
     });

src/app/core/data/dso-redirect.service.spec.ts

@@ -9,6 +9,7 @@ import { GetRequest, IdentifierType } from './request.models';
 import { RequestService } from './request.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { Item } from '../shared/item.model';
+import { EMBED_SEPARATOR } from './base/base-data.service';
 
 describe('DsoRedirectService', () => {
   let scheduler: TestScheduler;
@@ -174,7 +175,7 @@ describe('DsoRedirectService', () => {
       });
 
       it('should include nested linksToFollow 3lvl', () => {
-        const expected = `${requestUUIDURL}&embed=owningCollection/itemtemplate/relationships`;
+        const expected = `${requestUUIDURL}&embed=owningCollection${EMBED_SEPARATOR}itemtemplate${EMBED_SEPARATOR}relationships`;
         const result = (service as any).dataService.getIDHref(
           pidLink,
           dsoUUID,