61949: merged master, resolving conflicts

src/app/+search-page/search-service/search-configuration.service.ts

@@ -277,7 +277,7 @@ export class SearchConfigurationService implements OnDestroy {
   }
 
   /**
-   * Make sure to unsubscribe from all existing subscription to prevent memory leaks
+   * Make sure to unsubscribe from all existing subscription to prevent memory leaksNormalizedRelationship
    */
   ngOnDestroy(): void {
     this.subs.forEach((sub) => {

src/app/core/cache/models/items/normalized-item-type.model.ts

@@ -4,11 +4,13 @@ import { ResourceType } from '../../../shared/resource-type';
 import { mapsTo } from '../../builders/build-decorators';
 import { NormalizedObject } from '../normalized-object.model';
 import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
+import { resourceType } from '../../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace ItemType
  */
 @mapsTo(ItemType)
+@resourceType(ResourceType.ItemType)
 @inheritSerialization(NormalizedObject)
 export class NormalizedItemType extends NormalizedObject<ItemType> {
 

src/app/core/cache/models/items/normalized-relationship-type.model.ts

@@ -5,11 +5,13 @@ import { mapsTo, relationship } from '../../builders/build-decorators';
 import { NormalizedDSpaceObject } from '../normalized-dspace-object.model';
 import { NormalizedObject } from '../normalized-object.model';
 import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
+import { resourceType } from '../../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace RelationshipType
  */
 @mapsTo(RelationshipType)
+@resourceType(ResourceType.RelationshipType)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedRelationshipType extends NormalizedObject<RelationshipType> {
 

src/app/core/cache/models/items/normalized-relationship.model.ts

@@ -4,11 +4,13 @@ import { ResourceType } from '../../../shared/resource-type';
 import { mapsTo, relationship } from '../../builders/build-decorators';
 import { NormalizedObject } from '../normalized-object.model';
 import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
+import { resourceType } from '../../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace Relationship
  */
 @mapsTo(Relationship)
+@resourceType(ResourceType.Relationship)
 @inheritSerialization(NormalizedObject)
 export class NormalizedRelationship extends NormalizedObject<Relationship> {
 

src/app/core/cache/response.models.ts

@@ -8,14 +8,12 @@ import { IntegrationModel } from '../integration/models/integration.model';
 import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
 import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
 import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
-import { MetadataSchema } from '../metadata/metadataschema.model';
-import { MetadataField } from '../metadata/metadatafield.model';
 import { PaginatedList } from '../data/paginated-list';
 import { SubmissionObject } from '../submission/models/submission-object.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { NormalizedAuthStatus } from '../auth/models/normalized-auth-status.model';
-import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { MetadataField } from '../metadata/metadata-field.model';
 
 /* tslint:disable:max-classes-per-file */
 export class RestResponse {

src/app/core/data/base-response-parsing.service.ts

@@ -8,6 +8,7 @@ import { GenericConstructor } from '../shared/generic-constructor';
 import { PaginatedList } from './paginated-list';
 import { isRestDataObject, isRestPaginatedList } from '../cache/builders/normalized-object-build.service';
 import { getNormalizedConstructorByType } from '../shared/resource-type.decorator';
+import { ResourceType } from '../shared/resource-type';
 /* tslint:disable:max-classes-per-file */
 
 export abstract class BaseResponseParsingService {

src/app/core/tasks/models/normalized-claimed-task-object.model.ts

@@ -3,11 +3,13 @@ import { mapsTo, relationship } from '../../cache/builders/build-decorators';
 import { autoserialize, inheritSerialization } from 'cerialize';
 import { ClaimedTask } from './claimed-task-object.model';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * A normalized model class for a ClaimedTask.
  */
 @mapsTo(ClaimedTask)
+@resourceType(ResourceType.ClaimedTask)
 @inheritSerialization(NormalizedTaskObject)
 export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
 
@@ -33,7 +35,7 @@ export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
    * The workflowitem object whom this task is related
    */
   @autoserialize
-  @relationship(ResourceType.Workflowitem, false)
+  @relationship(ResourceType.WorkflowItem, false)
   workflowitem: string;
 
 }

src/app/core/tasks/models/normalized-pool-task-object.model.ts

@@ -3,11 +3,13 @@ import { PoolTask } from './pool-task-object.model';
 import { autoserialize, inheritSerialization } from 'cerialize';
 import { mapsTo, relationship } from '../../cache/builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * A normalized model class for a PoolTask.
  */
 @mapsTo(PoolTask)
+@resourceType(ResourceType.PoolTask)
 @inheritSerialization(NormalizedTaskObject)
 export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
 
@@ -33,6 +35,6 @@ export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
    * The workflowitem object whom this task is related
    */
   @autoserialize
-  @relationship(ResourceType.Workflowitem, false)
+  @relationship(ResourceType.WorkflowItem, false)
   workflowitem: string;
 }

src/app/core/tasks/models/normalized-task-object.model.ts

@@ -34,6 +34,6 @@ export abstract class NormalizedTaskObject<T extends DSpaceObject> extends Norma
    * The workflowitem object whom this task is related
    */
   @autoserialize
-  @relationship(ResourceType.Workflowitem, false)
+  @relationship(ResourceType.WorkflowItem, false)
   workflowitem: string;
 }

src/app/core/tasks/models/task-object.model.ts

@@ -4,7 +4,7 @@ import { CacheableObject } from '../../cache/object-cache.reducer';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 import { RemoteData } from '../../data/remote-data';
-import { Workflowitem } from '../../submission/models/workflowitem.model';
+import { WorkflowItem } from '../../submission/models/workflowitem.model';
 
 /**
  * An abstract model class for a TaskObject.
@@ -29,5 +29,5 @@ export class TaskObject extends DSpaceObject implements CacheableObject, Listabl
   /**
    * The workflowitem object whom this task is related
    */
-  workflowitem: Observable<RemoteData<Workflowitem>> | Workflowitem;
+  workflowitem: Observable<RemoteData<WorkflowItem>> | WorkflowItem;
 }

src/app/core/tasks/task-response-parsing.service.ts

@@ -8,7 +8,6 @@ import { BaseResponseParsingService } from '../data/base-response-parsing.servic
 import { GLOBAL_CONFIG } from '../../../config';
 import { GlobalConfig } from '../../../config/global-config.interface';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
 import { ErrorResponse, RestResponse, TaskResponse } from '../cache/response.models';
 
 /**
@@ -17,7 +16,6 @@ import { ErrorResponse, RestResponse, TaskResponse } from '../cache/response.mod
 @Injectable()
 export class TaskResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
 
-  protected objectFactory = NormalizedObjectFactory;
   protected toCache = false;
 
   /**

src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts

@@ -16,7 +16,7 @@ import { Item } from '../../../core/shared/item.model';
 import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
 import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 
 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -61,7 +61,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rdItem = new RemoteData(false, false, true, null, item);
-const workflowitem = Object.assign(new Workflowitem(), { item: observableOf(rdItem) });
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem), id: '1234' });
 

src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts

@@ -9,7 +9,7 @@ import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.se
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { isNotUndefined } from '../../empty.util';
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { MyDSpaceActionsComponent } from '../mydspace-actions';
 import { ResourceType } from '../../../core/shared/resource-type';
@@ -33,7 +33,7 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
   /**
    * The workflowitem object that belonging to the ClaimedTask object
    */
-  public workflowitem$: Observable<Workflowitem>;
+  public workflowitem$: Observable<WorkflowItem>;
 
   /**
    * A boolean representing if an approve operation is pending
@@ -73,15 +73,15 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
   }
 
   /**
-   * Init the ClaimedTask and Workflowitem objects
+   * Init the ClaimedTask and WorkflowItem objects
    *
    * @param {PoolTask} object
    */
   initObjects(object: ClaimedTask) {
     this.object = object;
-    this.workflowitem$ = (this.object.workflowitem as Observable<RemoteData<Workflowitem>>).pipe(
+    this.workflowitem$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
-      filter((rd: RemoteData<Workflowitem>) => ((!rd.isRequestPending) && isNotUndefined(rd.payload))),
+      filter((rd: RemoteData<WorkflowItem>) => ((!rd.isRequestPending) && isNotUndefined(rd.payload))),
-      map((rd: RemoteData<Workflowitem>) => rd.payload));
+      map((rd: RemoteData<WorkflowItem>) => rd.payload));
   }
 
   /**

src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts

@@ -3,7 +3,7 @@ import { ResourceType } from '../../core/shared/resource-type';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
 import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
-import { WorkflowitemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { CacheableObject } from '../../core/cache/object-cache.reducer';
 import { ItemDataService } from '../../core/data/item-data.service';
 
@@ -16,11 +16,11 @@ export class MydspaceActionsServiceFactory<T extends CacheableObject, TService e
       case ResourceType.Item: {
         return ItemDataService as any;
       }
-      case ResourceType.Workspaceitem: {
+      case ResourceType.WorkspaceItem: {
         return WorkspaceitemDataService as any;
       }
-      case ResourceType.Workflowitem: {
+      case ResourceType.WorkflowItem: {
-        return WorkflowitemDataService as any;
+        return WorkflowItemDataService as any;
       }
       case ResourceType.ClaimedTask: {
         return ClaimedTaskDataService as any;

src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts

@@ -16,7 +16,7 @@ import { Item } from '../../../core/shared/item.model';
 import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { PoolTaskActionsComponent } from './pool-task-actions.component';
 import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 
 let component: PoolTaskActionsComponent;
 let fixture: ComponentFixture<PoolTaskActionsComponent>;
@@ -59,7 +59,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rdItem = new RemoteData(false, false, true, null, item);
-const workflowitem = Object.assign(new Workflowitem(), { item: observableOf(rdItem) });
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem), id: '1234' });
 

src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
@@ -39,7 +39,7 @@ export class PoolTaskActionsComponent extends MyDSpaceActionsComponent<PoolTask,
   /**
    * The workflowitem object that belonging to the PoolTask object
    */
-  public workflowitem$: Observable<Workflowitem>;
+  public workflowitem$: Observable<WorkflowItem>;
 
   /**
    * Initialize instance variables
@@ -64,15 +64,15 @@ export class PoolTaskActionsComponent extends MyDSpaceActionsComponent<PoolTask,
   }
 
   /**
-   * Init the PoolTask and Workflowitem objects
+   * Init the PoolTask and WorkflowItem objects
    *
    * @param {PoolTask} object
    */
   initObjects(object: PoolTask) {
     this.object = object;
-    this.workflowitem$ = (this.object.workflowitem as Observable<RemoteData<Workflowitem>>).pipe(
+    this.workflowitem$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
-      filter((rd: RemoteData<Workflowitem>) => ((!rd.isRequestPending) && isNotUndefined(rd.payload))),
+      filter((rd: RemoteData<WorkflowItem>) => ((!rd.isRequestPending) && isNotUndefined(rd.payload))),
-      map((rd: RemoteData<Workflowitem>) => rd.payload));
+      map((rd: RemoteData<WorkflowItem>) => rd.payload));
   }
 
   /**

src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts

@@ -9,16 +9,16 @@ import { MockTranslateLoader } from '../../mocks/mock-translate-loader';
 import { RouterStub } from '../../testing/router-stub';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
-import { WorkflowitemDataService } from '../../../core/submission/workflowitem-data.service';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
 
 let component: WorkflowitemActionsComponent;
 let fixture: ComponentFixture<WorkflowitemActionsComponent>;
 
-let mockObject: Workflowitem;
+let mockObject: WorkflowItem;
 
 const mockDataService = {};
 
@@ -52,7 +52,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rd = new RemoteData(false, false, true, null, item);
-mockObject = Object.assign(new Workflowitem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
+mockObject = Object.assign(new WorkflowItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
 
 describe('WorkflowitemActionsComponent', () => {
   beforeEach(async(() => {
@@ -69,7 +69,7 @@ describe('WorkflowitemActionsComponent', () => {
       providers: [
         { provide: Injector, useValue: {} },
         { provide: Router, useValue: new RouterStub() },
-        { provide: WorkflowitemDataService, useValue: mockDataService },
+        { provide: WorkflowItemDataService, useValue: mockDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA]

src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts

@@ -4,25 +4,25 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
 import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { WorkflowitemDataService } from '../../../core/submission/workflowitem-data.service';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { NotificationsService } from '../../notifications/notifications.service';
 
 /**
- * This component represents mydspace actions related to Workflowitem object.
+ * This component represents mydspace actions related to WorkflowItem object.
  */
 @Component({
   selector: 'ds-workflowitem-actions',
   styleUrls: ['./workflowitem-actions.component.scss'],
   templateUrl: './workflowitem-actions.component.html',
 })
-export class WorkflowitemActionsComponent extends MyDSpaceActionsComponent<Workflowitem, WorkflowitemDataService> {
+export class WorkflowitemActionsComponent extends MyDSpaceActionsComponent<WorkflowItem, WorkflowItemDataService> {
 
   /**
-   * The Workflowitem object
+   * The WorkflowItem object
    */
-  @Input() object: Workflowitem;
+  @Input() object: WorkflowItem;
 
   /**
    * Initialize instance variables
@@ -36,15 +36,15 @@ export class WorkflowitemActionsComponent extends MyDSpaceActionsComponent<Workf
               protected router: Router,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
-    super(ResourceType.Workflowitem, injector, router, notificationsService, translate);
+    super(ResourceType.WorkflowItem, injector, router, notificationsService, translate);
   }
 
   /**
    * Init the target object
    *
-   * @param {Workflowitem} object
+   * @param {WorkflowItem} object
    */
-  initObjects(object: Workflowitem) {
+  initObjects(object: WorkflowItem) {
     this.object = object;
   }
 

src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts

@@ -13,14 +13,14 @@ import { NotificationsServiceStub } from '../../testing/notifications-service-st
 import { RouterStub } from '../../testing/router-stub';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 
 let component: WorkspaceitemActionsComponent;
 let fixture: ComponentFixture<WorkspaceitemActionsComponent>;
 
-let mockObject: Workspaceitem;
+let mockObject: WorkspaceItem;
 let notificationsServiceStub: NotificationsServiceStub;
 
 const mockDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
@@ -57,7 +57,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rd = new RemoteData(false, false, true, null, item);
-mockObject = Object.assign(new Workspaceitem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
+mockObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
 
 describe('WorkspaceitemActionsComponent', () => {
   beforeEach(async(() => {

src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts

@@ -5,26 +5,26 @@ import { BehaviorSubject } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 
-import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { MyDSpaceActionsComponent } from '../mydspace-actions';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { NotificationsService } from '../../notifications/notifications.service';
 
 /**
- * This component represents mydspace actions related to Workspaceitem object.
+ * This component represents mydspace actions related to WorkspaceItem object.
  */
 @Component({
   selector: 'ds-workspaceitem-actions',
   styleUrls: ['./workspaceitem-actions.component.scss'],
   templateUrl: './workspaceitem-actions.component.html',
 })
-export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Workspaceitem, WorkspaceitemDataService> {
+export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<WorkspaceItem, WorkspaceitemDataService> {
 
   /**
    * The workspaceitem object
    */
-  @Input() object: Workspaceitem;
+  @Input() object: WorkspaceItem;
 
   /**
    * A boolean representing if a delete operation is pending
@@ -46,7 +46,7 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
               protected modalService: NgbModal,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
-    super(ResourceType.Workspaceitem, injector, router, notificationsService, translate);
+    super(ResourceType.WorkspaceItem, injector, router, notificationsService, translate);
   }
 
   /**
@@ -70,9 +70,9 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
   /**
    * Init the target object
    *
-   * @param {Workspaceitem} object
+   * @param {WorkspaceItem} object
    */
-  initObjects(object: Workspaceitem) {
+  initObjects(object: WorkspaceItem) {
     this.object = object;
   }
 

src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts

@@ -6,7 +6,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { RemoteData } from '../../../../core/data/remote-data';
 
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { EPersonMock } from '../../../testing/eperson-mock';
 import { MyDSpaceItemStatusComponent } from './my-dspace-item-status.component';
@@ -20,7 +20,7 @@ let fixture: ComponentFixture<MyDSpaceItemStatusComponent>;
 let mockResultObject: PoolTask;
 
 const rdSumbitter = new RemoteData(false, false, true, null, EPersonMock);
-const workflowitem = Object.assign(new Workflowitem(), { submitter: observableOf(rdSumbitter) });
+const workflowitem = Object.assign(new WorkflowItem(), { submitter: observableOf(rdSumbitter) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockResultObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 

src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts

@@ -7,7 +7,7 @@ import { cold } from 'jasmine-marbles';
 
 import { RemoteData } from '../../../../core/data/remote-data';
 import { ItemSubmitterComponent } from './item-submitter.component';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { EPersonMock } from '../../../testing/eperson-mock';
 import { MockTranslateLoader } from '../../../mocks/mock-translate-loader';
@@ -21,7 +21,7 @@ const compIndex = 1;
 let mockResultObject: PoolTask;
 
 const rdSumbitter = new RemoteData(false, false, true, null, EPersonMock);
-const workflowitem = Object.assign(new Workflowitem(), { submitter: observableOf(rdSumbitter) });
+const workflowitem = Object.assign(new WorkflowItem(), { submitter: observableOf(rdSumbitter) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockResultObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 

src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts

@@ -6,7 +6,7 @@ import { filter, find, flatMap, map } from 'rxjs/operators';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotEmpty, isNotUndefined } from '../../../empty.util';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 
 /**
  * This component represents a badge with submitter information.
@@ -32,9 +32,9 @@ export class ItemSubmitterComponent implements OnInit {
    * Initialize submitter object
    */
   ngOnInit() {
-    this.submitter$ = (this.object.workflowitem as Observable<RemoteData<Workflowitem>>).pipe(
+    this.submitter$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
-      filter((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload))),
+      filter((rd: RemoteData<WorkflowItem>) => (rd.hasSucceeded && isNotUndefined(rd.payload))),
-      flatMap((rd: RemoteData<Workflowitem>) => rd.payload.submitter as Observable<RemoteData<EPerson>>),
+      flatMap((rd: RemoteData<WorkflowItem>) => rd.payload.submitter as Observable<RemoteData<EPerson>>),
       find((rd: RemoteData<EPerson>) => rd.hasSucceeded && isNotEmpty(rd.payload)),
       map((rd: RemoteData<EPerson>) => rd.payload));
   }

src/app/shared/object-collection/shared/workflowitem-my-dspace-result.model.ts

@@ -1,11 +1,11 @@
-import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { SearchResult } from '../../../+search-page/search-result.model';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
 import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
 
 /**
- * Represents a search result object of a Workflowitem object
+ * Represents a search result object of a WorkflowItem object
  */
-@searchResultFor(Workflowitem, MyDSpaceConfigurationValueType.Workspace)
+@searchResultFor(WorkflowItem, MyDSpaceConfigurationValueType.Workspace)
-export class WorkflowitemMyDSpaceResult extends SearchResult<Workflowitem> {
+export class WorkflowitemMyDSpaceResult extends SearchResult<WorkflowItem> {
 }

src/app/shared/object-collection/shared/workspaceitem-my-dspace-result.model.ts

@@ -1,11 +1,11 @@
-import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
 import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
 import { SearchResult } from '../../../+search-page/search-result.model';
 
 /**
- * Represents a search result object of a Workspaceitem object
+ * Represents a search result object of a WorkspaceItem object
  */
-@searchResultFor(Workspaceitem, MyDSpaceConfigurationValueType.Workspace)
+@searchResultFor(WorkspaceItem, MyDSpaceConfigurationValueType.Workspace)
-export class WorkspaceitemMyDSpaceResult extends SearchResult<Workspaceitem> {
+export class WorkspaceitemMyDSpaceResult extends SearchResult<WorkspaceItem> {
 }

src/app/shared/object-detail/my-dspace-result-detail-element/claimed-my-dspace-result/claimed-my-dspace-result-detail-element.component.spec.ts

@@ -10,7 +10,7 @@ import { ClaimedTaskMyDSpaceResult } from '../../../object-collection/shared/cla
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 
 let component: ClaimedMyDSpaceResultDetailElementComponent;
 let fixture: ComponentFixture<ClaimedMyDSpaceResultDetailElementComponent>;
@@ -50,7 +50,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rdItem = new RemoteData(false, false, true, null, item);
-const workflowitem = Object.assign(new Workflowitem(), { item: observableOf(rdItem) });
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
 

src/app/shared/object-detail/my-dspace-result-detail-element/claimed-my-dspace-result/claimed-my-dspace-result-detail-element.component.ts

@@ -8,7 +8,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { isNotUndefined } from '../../../empty.util';
 import { ListableObject } from '../../../object-collection/shared/listable-object.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ClaimedTaskMyDSpaceResult } from '../../../object-collection/shared/claimed-task-my-dspace-result.model';
 import { MyDSpaceResultDetailElementComponent } from '../my-dspace-result-detail-element.component';
@@ -41,7 +41,7 @@ export class ClaimedMyDSpaceResultDetailElementComponent extends MyDSpaceResultD
   /**
    * The workflowitem object that belonging to the result object
    */
-  public workflowitem: Workflowitem;
+  public workflowitem: WorkflowItem;
 
   constructor(@Inject('objectElementProvider') public listable: ListableObject) {
     super(listable);
@@ -51,16 +51,16 @@ export class ClaimedMyDSpaceResultDetailElementComponent extends MyDSpaceResultD
    * Initialize all instance variables
    */
   ngOnInit() {
-    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<Workflowitem>>);
+    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>);
   }
 
   /**
    * Retrieve workflowitem from result object
    */
-  initWorkflowItem(wfi$: Observable<RemoteData<Workflowitem>>) {
+  initWorkflowItem(wfi$: Observable<RemoteData<WorkflowItem>>) {
     wfi$.pipe(
-      find((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
+      find((rd: RemoteData<WorkflowItem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
-    ).subscribe((rd: RemoteData<Workflowitem>) => {
+    ).subscribe((rd: RemoteData<WorkflowItem>) => {
       this.workflowitem = rd.payload;
     });
   }

src/app/shared/object-detail/my-dspace-result-detail-element/pool-my-dspace-result/pool-my-dspace-result-detail-element.component.spec.ts

@@ -10,7 +10,7 @@ import { PoolTaskMyDSpaceResult } from '../../../object-collection/shared/pool-t
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 
 let component: PoolMyDSpaceResultDetailElementComponent;
 let fixture: ComponentFixture<PoolMyDSpaceResultDetailElementComponent>;
@@ -50,7 +50,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rdItem = new RemoteData(false, false, true, null, item);
-const workflowitem = Object.assign(new Workflowitem(), { item: observableOf(rdItem) });
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockResultObject.indexableObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 

src/app/shared/object-detail/my-dspace-result-detail-element/pool-my-dspace-result/pool-my-dspace-result-detail-lement.component.ts

@@ -2,18 +2,16 @@ import { Component, Inject } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
-
-import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotUndefined } from '../../../empty.util';
 import { ListableObject } from '../../../object-collection/shared/listable-object.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { PoolTaskMyDSpaceResult } from '../../../object-collection/shared/pool-task-my-dspace-result.model';
 import { MyDSpaceResultDetailElementComponent } from '../my-dspace-result-detail-element.component';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { SetViewMode } from '../../../view-mode';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 
 /**
  * This component renders pool task object for the mydspace result in the detail view.
@@ -41,7 +39,7 @@ export class PoolMyDSpaceResultDetailElementComponent extends MyDSpaceResultDeta
   /**
    * The workflowitem object that belonging to the result object
    */
-  public workflowitem: Workflowitem;
+  public workflowitem: WorkflowItem;
 
   constructor(@Inject('objectElementProvider') public listable: ListableObject) {
     super(listable);
@@ -51,16 +49,16 @@ export class PoolMyDSpaceResultDetailElementComponent extends MyDSpaceResultDeta
    * Initialize all instance variables
    */
   ngOnInit() {
-    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<Workflowitem>>);
+    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>);
   }
 
   /**
    * Retrieve workflowitem from result object
    */
-  initWorkflowItem(wfi$: Observable<RemoteData<Workflowitem>>) {
+  initWorkflowItem(wfi$: Observable<RemoteData<WorkflowItem>>) {
     wfi$.pipe(
-      find((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
+      find((rd: RemoteData<WorkflowItem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
-    ).subscribe((rd: RemoteData<Workflowitem>) => {
+    ).subscribe((rd: RemoteData<WorkflowItem>) => {
       this.workflowitem = rd.payload;
     });
   }

src/app/shared/object-detail/my-dspace-result-detail-element/workflowitem-my-dspace-result/workflowitem-my-dspace-result-detail-element.component.spec.ts

@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowitemMyDSpaceResultDetailElementComponent } from './workflowitem-my-dspace-result-detail-element.component';
 import { WorkflowitemMyDSpaceResult } from '../../../object-collection/shared/workflowitem-my-dspace-result.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 
@@ -49,7 +49,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rd = new RemoteData(false, false, true, null, item);
-mockResultObject.indexableObject = Object.assign(new Workflowitem(), { item: observableOf(rd) });
+mockResultObject.indexableObject = Object.assign(new WorkflowItem(), { item: observableOf(rd) });
 
 describe('WorkflowitemMyDSpaceResultDetailElementComponent', () => {
   beforeEach(async(() => {

src/app/shared/object-detail/my-dspace-result-detail-element/workflowitem-my-dspace-result/workflowitem-my-dspace-result-detail-element.component.ts

@@ -5,7 +5,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ListableObject } from '../../../object-collection/shared/listable-object.model';
 import { WorkflowitemMyDSpaceResult } from '../../../object-collection/shared/workflowitem-my-dspace-result.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { MyDSpaceResultDetailElementComponent } from '../my-dspace-result-detail-element.component';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { Observable } from 'rxjs/internal/Observable';
@@ -24,8 +24,8 @@ import { SetViewMode } from '../../../view-mode';
 })
 
 @renderElementsFor(WorkflowitemMyDSpaceResult, SetViewMode.Detail)
-@renderElementsFor(Workflowitem, SetViewMode.Detail)
+@renderElementsFor(WorkflowItem, SetViewMode.Detail)
-export class WorkflowitemMyDSpaceResultDetailElementComponent extends MyDSpaceResultDetailElementComponent<WorkflowitemMyDSpaceResult, Workflowitem> {
+export class WorkflowitemMyDSpaceResultDetailElementComponent extends MyDSpaceResultDetailElementComponent<WorkflowitemMyDSpaceResult, WorkflowItem> {
 
   /**
    * The item object that belonging to the result object

src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.spec.ts

@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceitemMyDSpaceResultDetailElementComponent } from './workspaceitem-my-dspace-result-detail-element.component';
 import { WorkspaceitemMyDSpaceResult } from '../../../object-collection/shared/workspaceitem-my-dspace-result.model';
-import { Workspaceitem } from '../../../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 
@@ -49,7 +49,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rd = new RemoteData(false, false, true, null, item);
-mockResultObject.indexableObject = Object.assign(new Workspaceitem(), { item: observableOf(rd) });
+mockResultObject.indexableObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd) });
 
 describe('WorkspaceitemMyDSpaceResultDetailElementComponent', () => {
   beforeEach(async(() => {

src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.ts

@@ -4,8 +4,9 @@ import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
-import { Workspaceitem } from '../../../../core/submission/models/workspaceitem.model';
+  WorkspaceItem
+} from '../../../../core/submission/models/workspaceitem.model';
 import { WorkspaceitemMyDSpaceResult } from '../../../object-collection/shared/workspaceitem-my-dspace-result.model';
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -25,8 +26,8 @@ import { SetViewMode } from '../../../view-mode';
 })
 
 @renderElementsFor(WorkspaceitemMyDSpaceResult, SetViewMode.Detail)
-@renderElementsFor(Workspaceitem, SetViewMode.Detail)
+@renderElementsFor(WorkspaceItem, SetViewMode.Detail)
-export class WorkspaceitemMyDSpaceResultDetailElementComponent extends MyDSpaceResultDetailElementComponent<WorkspaceitemMyDSpaceResult, Workspaceitem> {
+export class WorkspaceitemMyDSpaceResultDetailElementComponent extends MyDSpaceResultDetailElementComponent<WorkspaceitemMyDSpaceResult, WorkspaceItem> {
 
   /**
    * The item object that belonging to the result object

src/app/shared/object-list/my-dspace-result-list-element/claimed-my-dspace-result/claimed-my-dspace-result-list-element.component.spec.ts

@@ -10,7 +10,6 @@ import { ClaimedTaskMyDSpaceResult } from '../../../object-collection/shared/cla
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
 
 let component: ClaimedMyDSpaceResultListElementComponent;
 let fixture: ComponentFixture<ClaimedMyDSpaceResultListElementComponent>;
@@ -50,7 +49,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rdItem = new RemoteData(false, false, true, null, item);
-const workflowitem = Object.assign(new Workflowitem(), { item: observableOf(rdItem) });
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
 

src/app/shared/object-list/my-dspace-result-list-element/claimed-my-dspace-result/claimed-my-dspace-result-list-element.component.ts

@@ -9,7 +9,7 @@ import { MyDSpaceResultListElementComponent, } from '../my-dspace-result-list-el
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotUndefined } from '../../../empty.util';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ClaimedTaskMyDSpaceResult } from '../../../object-collection/shared/claimed-task-my-dspace-result.model';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
@@ -42,22 +42,22 @@ export class ClaimedMyDSpaceResultListElementComponent extends MyDSpaceResultLis
   /**
    * The workflowitem object that belonging to the result object
    */
-  public workflowitem: Workflowitem;
+  public workflowitem: WorkflowItem;
 
   /**
    * Initialize all instance variables
    */
   ngOnInit() {
-    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<Workflowitem>>);
+    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>);
   }
 
   /**
    * Retrieve workflowitem from result object
    */
-  initWorkflowItem(wfi$: Observable<RemoteData<Workflowitem>>) {
+  initWorkflowItem(wfi$: Observable<RemoteData<WorkflowItem>>) {
     wfi$.pipe(
-      find((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
+      find((rd: RemoteData<WorkflowItem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
-    ).subscribe((rd: RemoteData<Workflowitem>) => {
+    ).subscribe((rd: RemoteData<WorkflowItem>) => {
       this.workflowitem = rd.payload;
     });
   }

src/app/shared/object-list/my-dspace-result-list-element/pool-my-dspace-result/pool-my-dspace-result-list-element.component.spec.ts

@@ -10,7 +10,7 @@ import { PoolTaskMyDSpaceResult } from '../../../object-collection/shared/pool-t
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 
 let component: PoolMyDSpaceResultListElementComponent;
 let fixture: ComponentFixture<PoolMyDSpaceResultListElementComponent>;
@@ -50,7 +50,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rdItem = new RemoteData(false, false, true, null, item);
-const workflowitem = Object.assign(new Workflowitem(), { item: observableOf(rdItem) });
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
 mockResultObject.indexableObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 

src/app/shared/object-list/my-dspace-result-list-element/pool-my-dspace-result/pool-my-dspace-result-list-element.component.ts

@@ -9,7 +9,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotUndefined } from '../../../empty.util';
 import { ListableObject } from '../../../object-collection/shared/listable-object.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { PoolTaskMyDSpaceResult } from '../../../object-collection/shared/pool-task-my-dspace-result.model';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
@@ -41,7 +41,7 @@ export class PoolMyDSpaceResultListElementComponent extends MyDSpaceResultListEl
   /**
    * The workflowitem object that belonging to the result object
    */
-  public workflowitem: Workflowitem;
+  public workflowitem: WorkflowItem;
 
   constructor(@Inject('objectElementProvider') public listable: ListableObject,
               @Inject('indexElementProvider') public index: number) {
@@ -52,16 +52,16 @@ export class PoolMyDSpaceResultListElementComponent extends MyDSpaceResultListEl
    * Initialize all instance variables
    */
   ngOnInit() {
-    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<Workflowitem>>);
+    this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>);
   }
 
   /**
    * Retrieve workflowitem from result object
    */
-  initWorkflowItem(wfi$: Observable<RemoteData<Workflowitem>>) {
+  initWorkflowItem(wfi$: Observable<RemoteData<WorkflowItem>>) {
     wfi$.pipe(
-      find((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
+      find((rd: RemoteData<WorkflowItem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
-    ).subscribe((rd: RemoteData<Workflowitem>) => {
+    ).subscribe((rd: RemoteData<WorkflowItem>) => {
       this.workflowitem = rd.payload;
     });
   }

src/app/shared/object-list/my-dspace-result-list-element/workflowitem-my-dspace-result/workflowitem-my-dspace-result-list-element.component.spec.ts

@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowitemMyDSpaceResultListElementComponent } from './workflowitem-my-dspace-result-list-element.component';
 import { WorkflowitemMyDSpaceResult } from '../../../object-collection/shared/workflowitem-my-dspace-result.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 
@@ -49,7 +49,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rd = new RemoteData(false, false, true, null, item);
-mockResultObject.indexableObject = Object.assign(new Workflowitem(), { item: observableOf(rd) });
+mockResultObject.indexableObject = Object.assign(new WorkflowItem(), { item: observableOf(rd) });
 
 describe('WorkflowitemMyDSpaceResultListElementComponent', () => {
   beforeEach(async(() => {

src/app/shared/object-list/my-dspace-result-list-element/workflowitem-my-dspace-result/workflowitem-my-dspace-result-list-element.component.ts

@@ -9,7 +9,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotUndefined } from '../../../empty.util';
 import { WorkflowitemMyDSpaceResult } from '../../../object-collection/shared/workflowitem-my-dspace-result.model';
-import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { Item } from '../../../../core/shared/item.model';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { SetViewMode } from '../../../view-mode';
@@ -24,8 +24,8 @@ import { SetViewMode } from '../../../view-mode';
 })
 
 @renderElementsFor(WorkflowitemMyDSpaceResult, SetViewMode.List)
-@renderElementsFor(Workflowitem, SetViewMode.List)
+@renderElementsFor(WorkflowItem, SetViewMode.List)
-export class WorkflowitemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<WorkflowitemMyDSpaceResult, Workflowitem> {
+export class WorkflowitemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<WorkflowitemMyDSpaceResult, WorkflowItem> {
 
   /**
    * The item object that belonging to the result object

src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.spec.ts

@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceitemMyDSpaceResultListElementComponent } from './workspaceitem-my-dspace-result-list-element.component';
 import { WorkspaceitemMyDSpaceResult } from '../../../object-collection/shared/workspaceitem-my-dspace-result.model';
-import { Workspaceitem } from '../../../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 
@@ -49,7 +49,7 @@ const item = Object.assign(new Item(), {
   }
 });
 const rd = new RemoteData(false, false, true, null, item);
-mockResultObject.indexableObject = Object.assign(new Workspaceitem(), { item: observableOf(rd) });
+mockResultObject.indexableObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd) });
 
 describe('WorkspaceitemMyDSpaceResultListElementComponent', () => {
   beforeEach(async(() => {

src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.ts

@@ -6,7 +6,7 @@ import { find } from 'rxjs/operators';
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { MyDSpaceResultListElementComponent, } from '../my-dspace-result-list-element.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Workspaceitem } from '../../../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { WorkspaceitemMyDSpaceResult } from '../../../object-collection/shared/workspaceitem-my-dspace-result.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotUndefined } from '../../../empty.util';
@@ -24,7 +24,7 @@ import { SetViewMode } from '../../../view-mode';
 })
 
 @renderElementsFor(WorkspaceitemMyDSpaceResult, SetViewMode.List)
-export class WorkspaceitemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<WorkspaceitemMyDSpaceResult, Workspaceitem> {
+export class WorkspaceitemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<WorkspaceitemMyDSpaceResult, WorkspaceItem> {
 
   /**
    * The item object that belonging to the result object