Merged in task/dspace-cris-2025_02_x/DSC-2812 (pull request DSpace#4646)

Task/dspace cris 2025 02 x/DSC-2812

Approved-by: Kim Shepherd

Author: AdamF42

src/app/core/data/dspace-rest-response-parsing.service.spec.ts

@@ -53,6 +53,30 @@ describe('DspaceRestResponseParsingService', () => {
       expect(warnSpy).not.toHaveBeenCalled();
     });
 
+    it('does not replace self link when request URL contains a segment in SKIP_SELF_LINK_OVERRIDE', () => {
+      const request = {
+        uuid: 'request-id',
+        href: 'https://rest.test/server/api/submission/workspaceitems/search/item?uuid=f639b124-1234-1234-1234-abcdef123456',
+        method: RestRequestMethod.GET,
+      } as RestRequest;
+      const response: RawRestResponse = {
+        payload: {
+          _links: {
+            self: {
+              href: 'https://rest.test/server/api/submission/workspaceitems/123',
+            },
+          },
+        },
+        statusCode: 200,
+        statusText: 'OK',
+      };
+
+      const result = service.ensureSelfLinkForTest(request, response);
+
+      expect(result.payload._links.self.href).toBe('https://rest.test/server/api/submission/workspaceitems/123');
+      expect(warnSpy).not.toHaveBeenCalled();
+    });
+
     it('replaces self link when path differs', () => {
       const request = {
         uuid: 'request-id',

src/app/core/data/dspace-rest-response-parsing.service.ts

@@ -65,6 +65,13 @@ const splitUrlInParts = (url: string): string[] => {
   return normalizedUrl.split('/');
 };
 
+/**
+ * Path segments for which the self link override should be skipped.
+ */
+const SKIP_SELF_LINK_OVERRIDE: readonly string[] = [
+  'workspaceitems',
+];
+
 @Injectable({ providedIn: 'root' })
 export class DspaceRestResponseParsingService implements ResponseParsingService {
   protected serializerConstructor: GenericConstructor<Serializer<any>> = DSpaceSerializer;
@@ -169,7 +176,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
       } else {
         const expected = splitUrlInParts(urlWithoutEmbedParams);
         const actual = splitUrlInParts(response.payload._links.self.href);
-        if (expected[0] === actual[0] && (expected.some((e) => !actual.includes(e)) || actual.some((e) => !expected.includes(e)))) {
+        if (expected[0] === actual[0] && !expected.some((e) => SKIP_SELF_LINK_OVERRIDE.includes(e)) && (expected.some((e) => !actual.includes(e)) || actual.some((e) => !expected.includes(e)))) {
           console.warn(`The response for '${urlWithoutEmbedParams}' has the self link '${response.payload._links.self.href}'. These don't match. This could mean there's an issue with the REST endpoint`);
           response.payload._links = Object.assign({}, response.payload._links, {
             self: {

src/app/my-dspace-page/my-dspace-configuration.service.spec.ts

@@ -208,6 +208,7 @@ describe('MyDSpaceConfigurationService', () => {
         b: [
           MyDSpaceConfigurationValueType.SupervisedItems,
           MyDSpaceConfigurationValueType.Workflow,
+          MyDSpaceConfigurationValueType.OtherWorkspace,
         ],
       }));
     });
@@ -223,6 +224,7 @@ describe('MyDSpaceConfigurationService', () => {
         b: [
           MyDSpaceConfigurationValueType.SupervisedItems,
           MyDSpaceConfigurationValueType.Workflow,
+          MyDSpaceConfigurationValueType.OtherWorkspace,
         ],
       }));
     });
@@ -237,9 +239,9 @@ describe('MyDSpaceConfigurationService', () => {
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
           MyDSpaceConfigurationValueType.Workspace,
-          MyDSpaceConfigurationValueType.OtherWorkspace,
           MyDSpaceConfigurationValueType.SupervisedItems,
           MyDSpaceConfigurationValueType.Workflow,
+          MyDSpaceConfigurationValueType.OtherWorkspace,
         ],
       }));
     });

src/app/my-dspace-page/my-dspace-configuration.service.ts

@@ -125,12 +125,12 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
         const availableConf: MyDSpaceConfigurationValueType[] = [];
         if (isSubmitter) {
           availableConf.push(MyDSpaceConfigurationValueType.Workspace);
-          availableConf.push(MyDSpaceConfigurationValueType.OtherWorkspace);
         }
         if (isController || isAdmin) {
           availableConf.push(MyDSpaceConfigurationValueType.SupervisedItems);
           availableConf.push(MyDSpaceConfigurationValueType.Workflow);
         }
+        availableConf.push(MyDSpaceConfigurationValueType.OtherWorkspace);
         return availableConf;
       }));
   }

src/app/submission/submission.service.spec.ts

@@ -415,7 +415,7 @@ describe('SubmissionService test suite', () => {
 
   const searchService = getMockSearchService();
 
-  const requestServce = getMockRequestService();
+  const requestService = getMockRequestService();
 
   beforeEach(waitForAsync(() => {
 
@@ -434,7 +434,7 @@ describe('SubmissionService test suite', () => {
         { provide: SubmissionRestService, useValue: restService },
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestServce },
+        { provide: RequestService, useValue: requestService },
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsService },
         { provide: NativeWindowService, useValue: new NativeWindowRef() },
         ScrollToService,
@@ -1024,6 +1024,7 @@ describe('SubmissionService test suite', () => {
     it('should redirect to Item page', () => {
       scheduler = getTestScheduler();
 
+      (requestService.setStaleByHrefSubstring as jasmine.Spy).calls.reset();
       const itemUuid = 'd62fc60f-e9a5-48e6-973a-90819acf23ae';
       let itemSubmissionId = itemUuid + ':FULL';