Changed mydspace item status labels

resources/i18n/en.json

@@ -351,12 +351,11 @@
       "workflow": "All tasks"
     },
     "status": {
-      "workflow": "Under review",
+      "workflow": "Workflow",
-      "rejected": "Rejected",
       "validation": "Validation",
       "waiting-for-controller": "Waiting for controller",
-      "in-progress": "In progress",
+      "workspace": "Workspace",
-      "accepted": "Accepted"
+      "archived": "Archived"
     },
     "view-btn": "View",
     "general": {

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',
+  WORKSPACE = 'mydspace.status.workspace',
-  ACCEPTED = 'mydspace.status.accepted'
+  ARCHIVED = 'mydspace.status.archived'
 }

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

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:

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);
   });
 });

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

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);
   });
 });

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

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);
   });
 });

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

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);
   });
 });

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