Merged in DSC-763 (pull request DSpace#332)

[DSC-763] [CST-6699] added other workspace items option
4Science · Dec 30, 2022 · 3ac211b · 3ac211b
2 parents effcf07 + ce7032a
commit 3ac211b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
@@ -8,6 +8,7 @@ export enum Context {
   Search = 'search',
   Workflow = 'workflow',
   Workspace = 'workspace',
+  OtherWorkspace = 'otherworkspace',
   AdminMenu = 'adminMenu',
   EntitySearchModalWithNameVariants = 'EntitySearchModalWithNameVariants',
   EntitySearchModal = 'EntitySearchModal',

diff --git a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts
@@ -1,4 +1,5 @@
 export enum MyDSpaceConfigurationValueType {
   Workspace = 'workspace',
+  OtherWorkspace = 'otherworkspace',
   Workflow = 'workflow'
 }
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
@@ -188,7 +188,8 @@ describe('MyDSpaceConfigurationService', () => {
 
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
-          MyDSpaceConfigurationValueType.Workspace
+          MyDSpaceConfigurationValueType.Workspace,
+          MyDSpaceConfigurationValueType.OtherWorkspace
         ]
       }));
     });
@@ -231,6 +232,7 @@ describe('MyDSpaceConfigurationService', () => {
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
           MyDSpaceConfigurationValueType.Workspace,
+          MyDSpaceConfigurationValueType.OtherWorkspace,
           MyDSpaceConfigurationValueType.Workflow
         ]
       }));

diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts
@@ -20,6 +20,7 @@ import { Context } from '../core/shared/context.model';
 
 export const MyDSpaceConfigurationToContextMap = new Map([
   [MyDSpaceConfigurationValueType.Workspace, Context.Workspace],
+  [MyDSpaceConfigurationValueType.OtherWorkspace, Context.OtherWorkspace],
   [MyDSpaceConfigurationValueType.Workflow, Context.Workflow]
 ]);
 
@@ -107,6 +108,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
         const availableConf: MyDSpaceConfigurationValueType[] = [];
         if (isSubmitter) {
           availableConf.push(MyDSpaceConfigurationValueType.Workspace);
+          availableConf.push(MyDSpaceConfigurationValueType.OtherWorkspace);
         }
         if (isController || isAdmin) {
           availableConf.push(MyDSpaceConfigurationValueType.Workflow);

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -3820,6 +3820,8 @@
 
   "mydspace.show.workspace": "Your Submissions",
 
+  "mydspace.show.otherworkspace": "Other Workspace Submissions",
+
   "mydspace.status.archived": "Archived",
 
   "mydspace.status.validation": "Validation",
@@ -6299,6 +6301,8 @@
 
 
 
+  "otherworkspace.search.results.head": "Workspace submissions",
+
   "workspace.search.results.head": "Your submissions",
 
   "workflowAdmin.search.results.head": "Administer Workflow",