Skip to content

Commit ab0885e

Browse files
[DURACOM-453] add shared submission config and labels
1 parent 87cfa6e commit ab0885e

6 files changed

Lines changed: 22 additions & 4 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export enum MyDSpaceConfigurationValueType {
22
Workspace = 'workspace',
33
SupervisedItems = 'supervisedWorkspace',
4+
OtherWorkspace = 'otherworkspace',
45
Workflow = 'workflow'
56
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ describe('MyDSpaceConfigurationService', () => {
192192
expect(list$).toBeObservable(cold('(b|)', {
193193
b: [
194194
MyDSpaceConfigurationValueType.Workspace,
195+
MyDSpaceConfigurationValueType.OtherWorkspace,
195196
],
196197
}));
197198
});
@@ -236,6 +237,7 @@ describe('MyDSpaceConfigurationService', () => {
236237
expect(list$).toBeObservable(cold('(b|)', {
237238
b: [
238239
MyDSpaceConfigurationValueType.Workspace,
240+
MyDSpaceConfigurationValueType.OtherWorkspace,
239241
MyDSpaceConfigurationValueType.SupervisedItems,
240242
MyDSpaceConfigurationValueType.Workflow,
241243
],

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
123123
const availableConf: MyDSpaceConfigurationValueType[] = [];
124124
if (isSubmitter) {
125125
availableConf.push(MyDSpaceConfigurationValueType.Workspace);
126+
availableConf.push(MyDSpaceConfigurationValueType.OtherWorkspace);
126127
}
127128
if (isController || isAdmin) {
128129
availableConf.push(MyDSpaceConfigurationValueType.SupervisedItems);

src/app/shared/menu/providers/edit-item-details.menu.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ describe('EditItemDetailsMenuProvider', () => {
7979

8080
const result = provider.getSectionsForContext(mockDSO);
8181

82-
const expected = cold('(ab|)', {
83-
a: [],
84-
b: expectedSections,
82+
const expected = cold('(a|)', {
83+
a: expectedSections,
8584
});
8685

8786
expect(result).toBeObservable(expected);

src/app/shared/menu/providers/edit-item-details.menu.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
map,
1919
Observable,
2020
} from 'rxjs';
21-
import { startWith } from 'rxjs/operators';
2221

2322
import { getEditItemPageRoute } from '../../../app-routing-paths';
2423
import { MenuItemType } from '../menu-item-type.model';

src/assets/i18n/en.json5

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,12 +1389,24 @@
13891389

13901390
"collection.form.rights": "Copyright text (HTML)",
13911391

1392+
"collection.form.sharedWorkspace": "Shared workspace",
1393+
13921394
"collection.form.tableofcontents": "News (HTML)",
13931395

13941396
"collection.form.title": "Name",
13951397

13961398
"collection.form.entityType": "Entity Type",
13971399

1400+
"collection.form.errors.entityType.required": "Please choose an entity type for this collection",
1401+
1402+
"collection.form.errors.submissionDefinition.required": "Please choose a submission definition for this collection",
1403+
1404+
"collection.form.submissionDefinition": "Submission definition",
1405+
1406+
"collection.form.correctionSubmissionDefinition": "Submission definition for correction request",
1407+
1408+
1409+
13981410
"collection.listelement.badge": "Collection",
13991411

14001412
"collection.logo": "Collection logo",
@@ -3797,6 +3809,8 @@
37973809

37983810
"mydspace.show.workspace": "Your submissions",
37993811

3812+
"mydspace.show.otherworkspace": "Other Workspace Submissions",
3813+
38003814
"mydspace.show.supervisedWorkspace": "Supervised items",
38013815

38023816
"mydspace.status": "My DSpace status:",
@@ -6112,6 +6126,8 @@
61126126

61136127
"workflow.search.results.head": "Workflow tasks",
61146128

6129+
"otherworkspace.search.results.head": "Workspace submissions",
6130+
61156131
"supervision.search.results.head": "Workflow and Workspace tasks",
61166132

61176133
"workflow-item.edit.breadcrumbs": "Edit workflowitem",

0 commit comments

Comments
 (0)