Merge branch 'master' into w2p-62849_relationships-in-submission

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

@@ -1,8 +1,9 @@
 import { TaskObject } from './task-object.model';
+import { ResourceType } from '../../shared/resource-type';
 
 /**
  * A model class for a ClaimedTask.
  */
 export class ClaimedTask extends TaskObject {
-
+  static type = new ResourceType('claimedtask');
 }

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

@@ -2,7 +2,9 @@ import { NormalizedTaskObject } from './normalized-task-object.model';
 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 { EPerson } from '../../eperson/models/eperson.model';
+import { Group } from '../../eperson/models/group.model';
+import { WorkflowItem } from '../../submission/models/workflowitem.model';
 
 /**
  * A normalized model class for a ClaimedTask.
@@ -10,7 +12,6 @@ import { ResourceType } from '../../shared/resource-type';
 @mapsTo(ClaimedTask)
 @inheritSerialization(NormalizedTaskObject)
 export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
-
   /**
    * The task identifier
    */
@@ -29,11 +30,25 @@ export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
   @autoserialize
   action: string;
 
+  /**
+   * The eperson object for this task
+   */
+  @autoserialize
+  @relationship(EPerson, false)
+  eperson: string;
+
+  /**
+   * The group object for this task
+   */
+  @autoserialize
+  @relationship(Group, false)
+  group: string;
+
   /**
    * The workflowitem object whom this task is related
    */
   @autoserialize
-  @relationship(ResourceType.Workflowitem, false)
+  @relationship(WorkflowItem, false)
   workflowitem: string;
 
 }

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

@@ -2,7 +2,8 @@ import { NormalizedTaskObject } from './normalized-task-object.model';
 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 { Group } from '../../eperson/models/group.model';
+import { WorkflowItem } from '../../submission/models/workflowitem.model';
 
 /**
  * A normalized model class for a PoolTask.
@@ -10,7 +11,6 @@ import { ResourceType } from '../../shared/resource-type';
 @mapsTo(PoolTask)
 @inheritSerialization(NormalizedTaskObject)
 export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
-
   /**
    * The task identifier
    */
@@ -29,10 +29,17 @@ export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
   @autoserialize
   action: string;
 
+  /**
+   * The group object for this task
+   */
+  @autoserialize
+  @relationship(Group, false)
+  group: string;
+
   /**
    * The workflowitem object whom this task is related
    */
   @autoserialize
-  @relationship(ResourceType.Workflowitem, false)
+  @relationship(WorkflowItem, false)
   workflowitem: string;
 }

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

@@ -1,16 +1,18 @@
 import { autoserialize, inheritSerialization } from 'cerialize';
 import { mapsTo, relationship } from '../../cache/builders/build-decorators';
-import { ResourceType } from '../../shared/resource-type';
 import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-object.model';
 import { TaskObject } from './task-object.model';
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { Group } from '../../eperson/models/group.model';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { WorkflowItem } from '../../submission/models/workflowitem.model';
 
 /**
  * An abstract normalized model class for a TaskObject.
  */
 @mapsTo(TaskObject)
 @inheritSerialization(NormalizedDSpaceObject)
-export abstract class NormalizedTaskObject<T extends DSpaceObject> extends NormalizedDSpaceObject<T> {
+export class NormalizedTaskObject<T extends DSpaceObject> extends NormalizedDSpaceObject<T> {
 
   /**
    * The task identifier
@@ -30,10 +32,24 @@ export abstract class NormalizedTaskObject<T extends DSpaceObject> extends Norma
   @autoserialize
   action: string;
 
+  /**
+   * The eperson object for this task
+   */
+  @autoserialize
+  @relationship(EPerson, false)
+  eperson: string;
+
+  /**
+   * The group object for this task
+   */
+  @autoserialize
+  @relationship(Group, false)
+  group: string;
+
   /**
    * The workflowitem object whom this task is related
    */
   @autoserialize
-  @relationship(ResourceType.Workflowitem, false)
+  @relationship(WorkflowItem, false)
   workflowitem: string;
 }

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

@@ -1,8 +1,9 @@
 import { TaskObject } from './task-object.model';
+import { ResourceType } from '../../shared/resource-type';
 
 /**
  * A model class for a PoolTask.
  */
 export class PoolTask extends TaskObject {
-
+  static type = new ResourceType('pooltask');
 }

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

@@ -3,12 +3,16 @@ import { Observable } from 'rxjs';
 import { CacheableObject } from '../../cache/object-cache.reducer';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { RemoteData } from '../../data/remote-data';
-import { Workflowitem } from '../../submission/models/workflowitem.model';
+import { WorkflowItem } from '../../submission/models/workflowitem.model';
+import { ResourceType } from '../../shared/resource-type';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { Group } from '../../eperson/models/group.model';
 
 /**
  * An abstract model class for a TaskObject.
  */
 export class TaskObject extends DSpaceObject implements CacheableObject {
+  static type = new ResourceType('taskobject');
 
   /**
    * The task identifier
@@ -25,8 +29,18 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    */
   action: string;
 
+  /**
+   * The group of this task
+   */
+  eperson: Observable<RemoteData<EPerson>>;
+
+  /**
+   * The group of this task
+   */
+  group: Observable<RemoteData<Group>>;
+
   /**
    * The workflowitem object whom this task is related
    */
-  workflowitem: Observable<RemoteData<Workflowitem>> | Workflowitem;
+  workflowitem: Observable<RemoteData<WorkflowItem>> | WorkflowItem;
 }