fixes after merge

src/app/+item-page/simple/item-types/publication/publication.component.html

@@ -28,23 +28,23 @@
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-metadata-representation-list
-      [parentItem]="item"
+      [parentItem]="object"
       [itemType]="'Person'"
       [metadataField]="'dc.contributor.author'"
       [label]="'relationships.isAuthorOf' | translate">
     </ds-metadata-representation-list>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isProjectOfPublication'"
       [label]="'relationships.isProjectOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isOrgUnitOfPublication'"
       [label]="'relationships.isOrgUnitOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isJournalIssueOfPublication'"
       [label]="'relationships.isJournalIssueOf' | translate">
     </ds-related-items>

src/app/+item-page/simple/item-types/publication/publication.component.ts

@@ -1,10 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import {
-  DEFAULT_ITEM_TYPE, ItemViewMode,
-  rendersItemType
-} from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 /**
  * Component that represents a publication Item page

src/app/+item-page/simple/item-types/shared/item.component.ts

@@ -1,6 +1,5 @@
-import { Component, Inject } from '@angular/core';
+import { Component, Inject, Input } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
-import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component';
 
 @Component({
   selector: 'ds-item',
@@ -10,9 +9,5 @@ import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.compo
  * A generic component for displaying metadata and relations of an item
  */
 export class ItemComponent {
-
+  @Input() object: Item;
-  constructor(
-    @Inject(ITEM) public item: Item
-  ) {}
-
 }

src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts

@@ -1,11 +1,10 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
-import { ItemViewMode } from '../../../shared/items/item-type-decorator';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { Item } from '../../../core/shared/item.model';
-import { zip as observableZip, combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip } from 'rxjs';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
 import { filter, map, switchMap } from 'rxjs/operators';

src/app/+item-page/simple/related-items/related-items-component.ts

@@ -1,13 +1,10 @@
 import { Component, HostBinding, Input, OnDestroy, OnInit } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
-import { ItemViewMode } from '../../../shared/items/item-type-decorator';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { FindAllOptions } from '../../../core/data/request.models';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
-import { hasNoValue, hasValueOperator } from '../../../shared/empty.util';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 

src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html

@@ -29,13 +29,13 @@
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isJournalVolumeOfIssue'"
       [label]="'relationships.isSingleVolumeOf' | translate">
     </ds-related-items>
     <ds-related-items
       class="mb-1 mt-1"
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isPublicationOfJournalIssue'"
       [label]="'relationships.isPublicationOfJournalIssue' | translate">
     </ds-related-items>

src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
 @Component({

src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html

@@ -17,12 +17,12 @@
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isJournalOfVolume'"
       [label]="'relationships.isSingleJournalOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isIssueOfJournalVolume'"
       [label]="'relationships.isIssueOf' | translate">
     </ds-related-items>

src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
 @Component({

src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html

@@ -21,7 +21,7 @@
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isVolumeOfJournal'"
       [label]="'relationships.isVolumeOf' | translate">
     </ds-related-items>

src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage)
 @Component({

src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html

@@ -25,17 +25,17 @@
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isPersonOfOrgUnit'"
       [label]="'relationships.isPersonOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isProjectOfOrgUnit'"
       [label]="'relationships.isProjectOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
       [label]="'relationships.isPublicationOf' | translate">
     </ds-related-items>

src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
 @Component({

src/app/entity-groups/research-entities/item-pages/person/person.component.html

@@ -10,7 +10,7 @@
       [fields]="['person.email']"
       [label]="'person.page.email'">
     </ds-generic-item-page-field>
-    <!--<ds-generic-item-page-field [item]="item"-->
+    <!--<ds-generic-item-page-field [item]="object"-->
       <!--[fields]="['person.identifier.orcid']"-->
       <!--[label]="'person.page.orcid'">-->
     <!--</ds-generic-item-page-field>-->
@@ -18,19 +18,19 @@
       [fields]="['person.birthDate']"
       [label]="'person.page.birthdate'">
     </ds-generic-item-page-field>
-    <!--<ds-generic-item-page-field [item]="item"-->
+    <!--<ds-generic-item-page-field [item]="object"-->
       <!--[fields]="['person.identifier.staffid']"-->
       <!--[label]="'person.page.staffid'">-->
     <!--</ds-generic-item-page-field>-->
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isProjectOfPerson'"
       [label]="'relationships.isProjectOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isOrgUnitOfPerson'"
       [label]="'relationships.isOrgUnitOf' | translate">
     </ds-related-items>

src/app/entity-groups/research-entities/item-pages/person/person.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @listableObjectComponent('Person', ViewMode.StandalonePage)
 @Component({

src/app/entity-groups/research-entities/item-pages/project/project.component.html

@@ -6,12 +6,12 @@
     <ds-metadata-field-wrapper>
       <ds-thumbnail [thumbnail]="object.getThumbnail() | async" [defaultImage]="'assets/images/project-placeholder.svg'"></ds-thumbnail>
     </ds-metadata-field-wrapper>
-    <!--<ds-generic-item-page-field [item]="item"-->
+    <!--<ds-generic-item-page-field [item]="object"-->
       <!--[fields]="['project.identifier.status']"-->
       <!--[label]="'project.page.status'">-->
     <!--</ds-generic-item-page-field>-->
     <ds-metadata-representation-list
-      [parentItem]="item"
+      [parentItem]="object"
       [itemType]="'OrgUnit'"
       [metadataField]="'project.contributor.other'"
       [label]="'project.page.contributor' | translate">
@@ -24,24 +24,24 @@
       [fields]="['dc.identifier']"
       [label]="'project.page.id'">
     </ds-generic-item-page-field>
-    <!--<ds-generic-item-page-field [item]="item"-->
+    <!--<ds-generic-item-page-field [item]="object"-->
       <!--[fields]="['project.identifier.expectedcompletion']"-->
       <!--[label]="'project.page.expectedcompletion'">-->
     <!--</ds-generic-item-page-field>-->
   </div>
   <div class="col-xs-12 col-md-6">
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isPersonOfProject'"
       [label]="'relationships.isPersonOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isPublicationOfProject'"
       [label]="'relationships.isPublicationOf' | translate">
     </ds-related-items>
     <ds-related-items
-      [parentItem]="item"
+      [parentItem]="object"
       [relationType]="'isOrgUnitOfProject'"
       [label]="'relationships.isOrgUnitOf' | translate">
     </ds-related-items>

src/app/entity-groups/research-entities/item-pages/project/project.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @listableObjectComponent('Project', ViewMode.StandalonePage)
 @Component({

themes/mantis/app/+item-page/simple/item-types/publication/publication.component.html

@@ -1,4 +1,4 @@
-<div class="top-item-page">
+a<div class="top-item-page">
     <div class="container">
         <div class="row">
 
@@ -63,19 +63,19 @@
         <div class="row">
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isProjectOfPublication'"
               [label]="'relationships.isProjectOf' | translate">
             </ds-related-items>
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isOrgUnitOfPublication'"
               [label]="'relationships.isOrgUnitOf' | translate">
             </ds-related-items>
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isJournalIssueOfPublication'"
               [label]="'relationships.isJournalIssueOf' | translate">
             </ds-related-items>

themes/mantis/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html

@@ -62,13 +62,13 @@
         <div class="row">
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isJournalVolumeOfIssue'"
               [label]="'relationships.isSingleVolumeOf' | translate">
             </ds-related-items>
             <ds-related-items
               class="mb-1 mt-1 col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isPublicationOfJournalIssue'"
               [label]="'relationships.isPublicationOfJournalIssue' | translate">
             </ds-related-items>

themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html

@@ -47,13 +47,13 @@
         <div class="row">
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isJournalOfVolume'"
               [label]="'relationships.isSingleJournalOf' | translate">
             </ds-related-items>
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isIssueOfJournalVolume'"
               [label]="'relationships.isIssueOf' | translate">
             </ds-related-items>

themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html

@@ -50,7 +50,7 @@
         <div class="row">
             <ds-related-items
               class="col-12 col-md-4"
-              [parentItem]="item"
+              [parentItem]="object"
               [relationType]="'isVolumeOfJournal'"
               [label]="'relationships.isVolumeOf' | translate">
             </ds-related-items>