diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 74fec99a5d..0c88a39390 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -351,12 +351,11 @@ "workflow": "All tasks" }, "status": { - "workflow": "Under review", - "rejected": "Rejected", + "workflow": "Workflow", "validation": "Validation", "waiting-for-controller": "Waiting for controller", - "in-progress": "In progress", - "accepted": "Accepted" + "workspace": "Workspace", + "archived": "Archived" }, "view-btn": "View", "general": { diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts index f6b3cbd7e8..48a0a6f4a3 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts @@ -1,8 +1,7 @@ export enum MyDspaceItemStatusType { WORKFLOW = 'mydspace.status.workflow', - REJECTED = 'mydspace.status.rejected', VALIDATION = 'mydspace.status.validation', WAITING_CONTROLLER = 'mydspace.status.waiting-for-controller', - IN_PROGRESS = 'mydspace.status.in-progress', - ACCEPTED = 'mydspace.status.accepted' + WORKSPACE = 'mydspace.status.workspace', + ARCHIVED = 'mydspace.status.archived' } diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts index f3b58665f5..3dd67d7777 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts @@ -74,16 +74,16 @@ describe('MyDSpaceItemStatusComponent', () => { }); it('should init badge content and class', () => { - component.status = MyDspaceItemStatusType.IN_PROGRESS; + component.status = MyDspaceItemStatusType.WORKSPACE; fixture.detectChanges(); - expect(component.badgeContent).toBe(MyDspaceItemStatusType.IN_PROGRESS); + expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKSPACE); expect(component.badgeClass).toBe('text-light badge badge-primary'); }); it('should init badge content and class', () => { - component.status = MyDspaceItemStatusType.ACCEPTED; + component.status = MyDspaceItemStatusType.ARCHIVED; fixture.detectChanges(); - expect(component.badgeContent).toBe(MyDspaceItemStatusType.ACCEPTED); + expect(component.badgeContent).toBe(MyDspaceItemStatusType.ARCHIVED); expect(component.badgeClass).toBe('text-light badge badge-success'); }); diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts index 87bb95ebb5..294045adf9 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts @@ -42,10 +42,10 @@ export class MyDSpaceItemStatusComponent implements OnInit { case MyDspaceItemStatusType.WAITING_CONTROLLER: this.badgeClass += 'badge-info'; break; - case MyDspaceItemStatusType.IN_PROGRESS: + case MyDspaceItemStatusType.WORKSPACE: this.badgeClass += 'badge-primary'; break; - case MyDspaceItemStatusType.ACCEPTED: + case MyDspaceItemStatusType.ARCHIVED: this.badgeClass += 'badge-success'; break; case MyDspaceItemStatusType.WORKFLOW: diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.spec.ts index b757879aac..c99f44cbae 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.spec.ts @@ -73,6 +73,6 @@ describe('ItemMyDSpaceResultDetailElementComponent', () => { }); it('should have properly status', () => { - expect(component.status).toEqual(MyDspaceItemStatusType.ACCEPTED); + expect(component.status).toEqual(MyDspaceItemStatusType.ARCHIVED); }); }); diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.ts index a55d911581..82847ffc09 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.ts @@ -22,6 +22,6 @@ export class ItemMyDSpaceResultDetailElementComponent extends MyDSpaceResultDeta /** * Represent item's status */ - public status = MyDspaceItemStatusType.ACCEPTED; + public status = MyDspaceItemStatusType.ARCHIVED; } diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.spec.ts index 301181e65c..af67bf53ea 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.spec.ts @@ -81,6 +81,6 @@ describe('WorkspaceitemMyDSpaceResultDetailElementComponent', () => { }); it('should have properly status', () => { - expect(component.status).toEqual(MyDspaceItemStatusType.IN_PROGRESS); + expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE); }); }); diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.ts index ca6ed59c12..edc2ce7f07 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.ts @@ -35,7 +35,7 @@ export class WorkspaceitemMyDSpaceResultDetailElementComponent extends MyDSpaceR /** * Represent item's status */ - status = MyDspaceItemStatusType.IN_PROGRESS; + status = MyDspaceItemStatusType.WORKSPACE; constructor(@Inject('objectElementProvider') public listable: ListableObject) { super(listable); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.spec.ts index 1ffb1b5c13..ea4f2d24f3 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.spec.ts @@ -73,6 +73,6 @@ describe('ItemMyDSpaceResultListElementComponent', () => { }); it('should have properly status', () => { - expect(component.status).toEqual(MyDspaceItemStatusType.ACCEPTED); + expect(component.status).toEqual(MyDspaceItemStatusType.ARCHIVED); }); }); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.ts index faeeed8ea2..a8c855e145 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.ts @@ -22,6 +22,6 @@ export class ItemMyDSpaceResultListElementComponent extends MyDSpaceResultListEl /** * Represent item's status */ - public status = MyDspaceItemStatusType.ACCEPTED; + public status = MyDspaceItemStatusType.ARCHIVED; } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.spec.ts index 56ee33ddae..789b69da1b 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.spec.ts @@ -81,6 +81,6 @@ describe('WorkspaceitemMyDSpaceResultListElementComponent', () => { }); it('should have properly status', () => { - expect(component.status).toEqual(MyDspaceItemStatusType.IN_PROGRESS); + expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE); }); }); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.ts index c60b742ae0..7afc0488e9 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.ts @@ -33,7 +33,7 @@ export class WorkspaceitemMyDSpaceResultListElementComponent extends MyDSpaceRes /** * Represent item's status */ - status = MyDspaceItemStatusType.IN_PROGRESS; + status = MyDspaceItemStatusType.WORKSPACE; /** * Initialize all instance variables