Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

Conflicts:
	src/app/core/cache/server-sync-buffer.effects.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts

src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html

@@ -14,4 +14,5 @@
       <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">View</a>
     </div>
   </div>
+  <ng-content></ng-content>
 </div>

src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts

@@ -6,6 +6,7 @@ import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
@@ -63,6 +64,7 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
+        { provide: BitstreamDataService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
         { provide: NotificationsService, useValue: {} },

src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html

@@ -1,17 +1,18 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="dso.logo">
-    </ds-grid-thumbnail>
-  </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="card-img-top">
+        <ds-grid-thumbnail [thumbnail]="dso.logo">
+        </ds-grid-thumbnail>
+    </a>
+    <span *ngIf="linkType == linkTypes.None" class="card-img-top">
     <ds-grid-thumbnail [thumbnail]="dso.logo">
     </ds-grid-thumbnail>
   </span>
-  <div class="card-body">
-    <h4 class="card-title">{{dso.name}}</h4>
-    <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">View</a>
+    <div class="card-body">
+        <h4 class="card-title">{{dso.name}}</h4>
+        <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
+        <div *ngIf="linkType != linkTypes.None" class="text-center">
+            <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">View</a>
+        </div>
     </div>
-  </div>
+    <ng-content></ng-content>
 </div>

src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts

@@ -6,6 +6,7 @@ import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
@@ -63,6 +64,7 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
+        { provide: BitstreamDataService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
         { provide: NotificationsService, useValue: {} },

src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html

@@ -1,41 +1,44 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
-           class="card-img-top full-width">
-            <div>
-                <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                </ds-grid-thumbnail>
-            </div>
-        </a>
-        <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                </ds-grid-thumbnail>
-            </div>
-        </span>
-        <div class="card-body">
-            <ds-item-type-badge [object]="dso"></ds-item-type-badge>
-            <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
-                <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
-            </ds-truncatable-part>
-            <p *ngIf="dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
-               class="item-authors card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span *ngIf="dso.hasMetadata('dc.date.issued')" class="item-date">{{firstMetadataValue('dc.date.issued')}}</span>
-                    <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
-                        <span [innerHTML]="author"></span>
-                    </span>
-                </ds-truncatable-part>
-            </p>
-            <p *ngIf="dso.hasMetadata('dc.description.abstract')" class="item-abstract card-text">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
-                </ds-truncatable-part>
-            </p>
-            <div *ngIf="linkType != linkTypes.None" class="text-center">
-                <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
-                   class="lead btn btn-primary viewButton">View</a>
-            </div>
-        </div>
-    </div>
-</ds-truncatable>
+  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
+    <ds-truncatable [id]="dso.id">
+      <ng-content></ng-content>
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
+         class="card-img-top full-width">
+          <div>
+              <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
+              </ds-grid-thumbnail>
+          </div>
+      </a>
+      <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+          <div>
+              <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
+              </ds-grid-thumbnail>
+          </div>
+      </span>
+      <div class="card-body">
+          <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+          <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
+              <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
+          </ds-truncatable-part>
+          <p *ngIf="dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
+             class="item-authors card-text text-muted">
+              <ds-truncatable-part [id]="dso.id" [minLines]="1">
+                  <span *ngIf="dso.hasMetadata('dc.date.issued')" class="item-date">{{firstMetadataValue('dc.date.issued')}}</span>
+                  <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
+                      <span [innerHTML]="author"></span>
+                  </span>
+              </ds-truncatable-part>
+          </p>
+          <p *ngIf="dso.hasMetadata('dc.description.abstract')" class="item-abstract card-text">
+              <ds-truncatable-part [id]="dso.id" [minLines]="3">
+                  <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+              </ds-truncatable-part>
+          </p>
+          <div *ngIf="linkType != linkTypes.None" class="text-center">
+              <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
+                 class="lead btn btn-primary viewButton">View</a>
+          </div>
+      </div>
+    </ds-truncatable>
+    <ng-content></ng-content>
+  </div>
+

src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts

@@ -7,6 +7,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
+@listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
 @Component({
   selector: 'ds-publication-search-result-grid-element',
   styleUrls: ['./publication-search-result-grid-element.component.scss'],