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

Task/dspace cris 2024 02 x/DSC-2812

Approved-by: Kim Shepherd

Author: AdamF42

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';