fixed bitstream format/metadataschema pages

src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts

@@ -11,7 +11,6 @@ import { Item } from '../../../core/shared/item.model';
 import { By } from '@angular/platform-browser';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
 
 describe('ItemStatusComponent', () => {

src/app/core/auth/models/normalized-auth-status.model.ts

@@ -39,10 +39,4 @@ export class NormalizedAuthStatus extends NormalizedObject<AuthStatus> {
   @relationship(EPerson, false)
   @autoserialize
   eperson: string;
-
-  /**
-   * The resource object of this auth status
-   */
-  @autoserialize
-  type: ResourceType;
 }

src/app/core/config/models/config.model.ts

@@ -8,11 +8,6 @@ export abstract class ConfigObject implements CacheableObject {
    */
   public name: string;
 
-  /**
-   * A string representing the kind of config object
-   */
-  public type: ResourceType;
-
   /**
    * The links to all related resources returned by the rest api.
    */

src/app/core/config/models/normalized-config.model.ts

@@ -15,12 +15,6 @@ export abstract class NormalizedConfigObject<T extends CacheableObject> implemen
   @autoserialize
   public name: string;
 
-  /**
-   * A string representing the kind of config object
-   */
-  @autoserialize
-  public type: ResourceType;
-
   /**
    * The links to all related resources returned by the rest api.
    */

src/app/core/metadata/metadata-field.model.ts

@@ -39,11 +39,6 @@ export class MetadataField implements ListableObject {
    */
   schema: MetadataSchema;
 
-  /**
-   * The resource type of this metadata field
-   */
-  type: ResourceType;
-
   /**
    * Method to print this metadata field as a string
    * @param separator The separator between the schema, element and qualifier in the string

src/app/core/metadata/metadata-schema.model.ts

@@ -26,9 +26,4 @@ export class MetadataSchema implements ListableObject {
    * The namespace of this metadata schema
    */
   namespace: string;
-
-  /**
-   * The resource type of this metadata schema
-   */
-  type: ResourceType;
 }

src/app/core/metadata/normalized-metadata-field.model.ts

@@ -1,6 +1,5 @@
 import { autoserialize, deserialize } from 'cerialize';
 import { mapsTo, relationship } from '../cache/builders/build-decorators';
-import { ResourceType } from '../shared/resource-type';
 import { MetadataField } from './metadata-field.model';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
@@ -48,10 +47,4 @@ export class NormalizedMetadataField extends NormalizedObject<MetadataField> imp
   @deserialize
   @relationship(MetadataSchema)
   schema: string;
-
-  /**
-   * The resource type of this normalized metadata field
-   */
-  @autoserialize
-  type: ResourceType;
 }

src/app/core/metadata/normalized-metadata-schema.model.ts

@@ -33,10 +33,4 @@ export class NormalizedMetadataSchema extends NormalizedObject<MetadataSchema> i
    */
   @autoserialize
   namespace: string;
-
-  /**
-   * The resource type of this metadata schema
-   */
-  @autoserialize
-  type: ResourceType;
 }

src/app/core/registry/registry-bitstreamformats-response.model.ts

@@ -1,9 +1,11 @@
-import { autoserialize, autoserializeAs } from 'cerialize';
+import { autoserialize, deserialize } from 'cerialize';
 import { PageInfo } from '../shared/page-info.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { relationship } from '../cache/builders/build-decorators';
 
 export class RegistryBitstreamformatsResponse {
-  @autoserializeAs(BitstreamFormat)
+  @deserialize
+  @relationship(BitstreamFormat, true)
   bitstreamformats: BitstreamFormat[];
 
   @autoserialize

src/app/core/registry/registry-metadataschemas-response.model.ts

@@ -1,9 +1,11 @@
 import { PageInfo } from '../shared/page-info.model';
-import { autoserialize, autoserializeAs } from 'cerialize';
+import { autoserialize, deserialize } from 'cerialize';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { relationship } from '../cache/builders/build-decorators';
 
 export class RegistryMetadataschemasResponse {
-  @autoserializeAs(MetadataSchema)
+  @deserialize
+  @relationship(MetadataSchema, true)
   metadataschemas: MetadataSchema[];
 
   @autoserialize

src/app/core/shared/bitstream-format.model.ts

@@ -44,11 +44,6 @@ export class BitstreamFormat implements CacheableObject {
    */
   self: string;
 
-  /**
-   * A ResourceType representing the kind of Object of this BitstreamFormat
-   */
-  type: ResourceType;
-
   /**
    * Universally unique identifier for this Bitstream Format
    */

src/app/core/shared/browse-definition.model.ts

@@ -16,9 +16,6 @@ export class BrowseDefinition implements TypedObject {
   @autoserializeAs('order')
   defaultSortOrder: string;
 
-  @autoserialize
-  type: ResourceType;
-
   @autoserializeAs('metadata')
   metadataKeys: string[];
 

src/app/core/shared/item-relationships/item-type.model.ts

@@ -17,11 +17,6 @@ export class ItemType implements CacheableObject {
    */
   self: string;
 
-  /**
-   * The type of Resource this is
-   */
-  type: ResourceType;
-
   /**
    * The universally unique identifier of this ItemType
    */

src/app/core/shared/item-relationships/relationship-type.model.ts

@@ -15,11 +15,6 @@ export class RelationshipType implements CacheableObject {
    */
   self: string;
 
-  /**
-   * The type of Resource this is
-   */
-  type: ResourceType;
-
   /**
    * The label that describes this RelationshipType
    */

src/app/core/shared/item-relationships/relationship.model.ts

@@ -15,11 +15,6 @@ export class Relationship implements CacheableObject {
    */
   self: string;
 
-  /**
-   * The type of Resource this is
-   */
-  type: ResourceType;
-
   /**
    * The universally unique identifier of this Relationship
    */

src/app/core/shared/normalized-browse-entry.model.ts

@@ -10,12 +10,6 @@ import { mapsTo } from '../cache/builders/build-decorators';
  */
 @mapsTo(BrowseEntry)
 export class NormalizedBrowseEntry extends NormalizedObject<BrowseEntry> {
-  /**
-   * The resource type of this browse entry
-   */
-  @autoserialize
-  type: ResourceType;
-
   /**
    * The authority string of this browse entry
    */

src/app/core/shared/resource-policy.model.ts

@@ -28,11 +28,6 @@ export class ResourcePolicy implements CacheableObject {
    */
   self: string;
 
-  /**
-   * A ResourceType representing the kind of Object of this ResourcePolicy
-   */
-  type: ResourceType;
-
   /**
    * The universally unique identifier for this Resource Policy
    */

src/app/core/shared/resource-type.ts

@@ -1,10 +1,4 @@
 export class ResourceType {
   constructor(public value: string) {
   }
-  // SubmissionDefinitions = 'submissiondefinitions',
-  // SubmissionDefinition = 'submissiondefinition',
-  // SubmissionForm = 'submissionform',
-  // SubmissionForms = 'submissionforms',
-  // SubmissionSections = 'submissionsections',
-  // SubmissionSection = 'submissionsection',
 }