remove normalized models part 1

This commit is contained in:
Art Lowel
2020-02-13 09:53:52 +01:00
parent bffae34fcc
commit 07998a8c08
137 changed files with 1323 additions and 1444 deletions

View File

@@ -1,9 +1,11 @@
import { resourceType } from '../../cache/builders/build-decorators';
import { CLAIMED_TASK } from './claimed-task-object.resource-type';
import { TaskObject } from './task-object.model';
/**
* A model class for a ClaimedTask.
*/
@resourceType(ClaimedTask.type)
export class ClaimedTask extends TaskObject {
static type = CLAIMED_TASK;
}

View File

@@ -1,5 +1,5 @@
import { NormalizedTaskObject } from './normalized-task-object.model';
import { mapsTo, relationship } from '../../cache/builders/build-decorators';
import { relationship } from '../../cache/builders/build-decorators';
import { autoserialize, inheritSerialization } from 'cerialize';
import { ClaimedTask } from './claimed-task-object.model';
import { EPerson } from '../../eperson/models/eperson.model';
@@ -9,7 +9,6 @@ import { WorkflowItem } from '../../submission/models/workflowitem.model';
/**
* A normalized model class for a ClaimedTask.
*/
@mapsTo(ClaimedTask)
@inheritSerialization(NormalizedTaskObject)
export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
/**

View File

@@ -1,14 +1,13 @@
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 { relationship } from '../../cache/builders/build-decorators';
import { Group } from '../../eperson/models/group.model';
import { WorkflowItem } from '../../submission/models/workflowitem.model';
/**
* A normalized model class for a PoolTask.
*/
@mapsTo(PoolTask)
@inheritSerialization(NormalizedTaskObject)
export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
/**

View File

@@ -1,5 +1,5 @@
import { autoserialize, inheritSerialization } from 'cerialize';
import { mapsTo, relationship } from '../../cache/builders/build-decorators';
import { relationship } from '../../cache/builders/build-decorators';
import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-object.model';
import { TaskObject } from './task-object.model';
import { DSpaceObject } from '../../shared/dspace-object.model';
@@ -10,7 +10,6 @@ import { WorkflowItem } from '../../submission/models/workflowitem.model';
/**
* An abstract normalized model class for a TaskObject.
*/
@mapsTo(TaskObject)
@inheritSerialization(NormalizedDSpaceObject)
export class NormalizedTaskObject<T extends DSpaceObject> extends NormalizedDSpaceObject<T> {

View File

@@ -1,9 +1,11 @@
import { resourceType } from '../../cache/builders/build-decorators';
import { POOL_TASK } from './pool-task-object.resource-type';
import { TaskObject } from './task-object.model';
/**
* A model class for a PoolTask.
*/
@resourceType(PoolTask.type)
export class PoolTask extends TaskObject {
static type = POOL_TASK;
}

View File

@@ -1,5 +1,5 @@
import { Observable } from 'rxjs';
import { link } from '../../cache/builders/build-decorators';
import { link, resourceType } from '../../cache/builders/build-decorators';
import { CacheableObject } from '../../cache/object-cache.reducer';
import { RemoteData } from '../../data/remote-data';
@@ -15,6 +15,7 @@ import { TASK_OBJECT } from './task-object.resource-type';
/**
* An abstract model class for a TaskObject.
*/
@resourceType(TaskObject.type)
export class TaskObject extends DSpaceObject implements CacheableObject {
static type = TASK_OBJECT;
@@ -34,19 +35,22 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
action: string;
/**
* The group of this task
* The EPerson for this task
* Will be undefined unless the eperson HALLink has been resolved.
*/
@link(EPERSON)
eperson?: Observable<RemoteData<EPerson>>;
/**
* The group of this task
* The Group for this task
* Will be undefined unless the group HALLink has been resolved.
*/
@link(GROUP)
group?: Observable<RemoteData<Group>>;
/**
* The workflowitem object whom this task is related
* The WorkflowItem for this task
* Will be undefined unless the workflowitem HALLink has been resolved.
*/
@link(WorkflowItem.type)
workflowitem?: Observable<RemoteData<WorkflowItem>> | WorkflowItem;