From 562241616c1f8df08dc7082ceca4abf00e526a08 Mon Sep 17 00:00:00 2001 From: AdamF42 Date: Wed, 6 May 2026 09:27:39 +0200 Subject: [PATCH 1/2] [DURACOM-476] fix to show other workspace configuration --- .../my-dspace-page/my-dspace-configuration.service.spec.ts | 4 +++- src/app/my-dspace-page/my-dspace-configuration.service.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index 3b0429594ec..93a89ff0e1a 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/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, ], })); }); diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts index 751cc39b1d2..78402f3a84c 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.ts @@ -123,12 +123,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; })); } From 5ed265b22221375e1bbdbac5637d35a77978a785 Mon Sep 17 00:00:00 2001 From: AdamF42 Date: Wed, 6 May 2026 15:41:07 +0200 Subject: [PATCH 2/2] [DURACOM-476] test fix --- src/app/submission/submission.service.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts index ca238c8beae..f673dfd0632 100644 --- a/src/app/submission/submission.service.spec.ts +++ b/src/app/submission/submission.service.spec.ts @@ -412,7 +412,7 @@ describe('SubmissionService', () => { const searchService = getMockSearchService(); - const requestServce = getMockRequestService(); + const requestService = getMockRequestService(); beforeEach(waitForAsync(() => { itemService = new ItemDataServiceStub(); @@ -432,7 +432,7 @@ describe('SubmissionService', () => { { 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: ItemDataService, useValue: itemService }, NotificationsService, @@ -980,6 +980,7 @@ describe('SubmissionService', () => { it('should redirect to Item page', fakeAsync(() => { scheduler = getTestScheduler(); + (requestService.setStaleByHrefSubstring as jasmine.Spy).calls.reset(); const itemUuid = 'd62fc60f-e9a5-48e6-973a-90819acf23ae'; const mockBundle = Object.assign(new Bundle(), { _links: { @@ -999,7 +1000,6 @@ describe('SubmissionService', () => { }); let itemSubmissionId = itemUuid + ':FULL'; spyOn(itemService as any, 'findById').and.returnValue(cold('a', { a: createSuccessfulRemoteDataObject(mockItem) })); - spyOn(requestServce as any, 'setStaleByHrefSubstring').and.returnValue(cold('a', { a: true })); scheduler.schedule(() => service.invalidateCacheAndRedirectToItemPage(itemSubmissionId)); scheduler.flush();