fixed existing tests and added linkType

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

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

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

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

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

@@ -1 +1 @@
-<ds-publication-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }"></ds-publication-search-result-grid-element>
+<ds-publication-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-publication-search-result-grid-element>

src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts

@@ -8,14 +8,12 @@ import { PublicationGridElementComponent } from './publication-grid-element.comp
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
-import { ITEM } from '../../../../items/switcher/listable-object-component-loader.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../testing/utils';
 import { PaginatedList } from '../../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { JournalGridElementComponent } from '../../../../../entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component';
 
-const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
-mockItemWithMetadata.hitHighlights = {};
-mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+const mockItem = Object.assign(new Item(), {
   bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
@@ -45,33 +43,8 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
   }
 });
 
-const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutMetadata.hitHighlights = {};
-mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-  metadata: {
-    'dc.title': [
-      {
-        language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
-});
-
-describe('PublicationGridElementComponent', getEntityGridElementTestComponent(PublicationGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['authors', 'date', 'abstract']));
-
-/**
- * Create test cases for a grid component of an entity.
- * @param component                     The component's class
- * @param searchResultWithMetadata      An ItemSearchResult containing an item with metadata that should be displayed in the grid element
- * @param searchResultWithoutMetadata   An ItemSearchResult containing an item that's missing the metadata that should be displayed in the grid element
- * @param fieldsToCheck                 A list of fields to check. The tests expect to find html elements with class ".item-${field}", so make sure they exist in the html template of the grid element.
- *                                      For example: If one of the fields to check is labeled "authors", the html template should contain at least one element with class ".item-authors" that's
- *                                      present when the author metadata is available.
- */
-export function getEntityGridElementTestComponent(component, searchResultWithMetadata: ItemSearchResult, searchResultWithoutMetadata: ItemSearchResult, fieldsToCheck: string[]) {
-  return () => {
+describe('PublicationGridElementComponent',
+  () => {
     let comp;
     let fixture;
 
@@ -82,46 +55,31 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [NoopAnimationsModule],
-        declarations: [component, TruncatePipe],
+        declarations: [PublicationGridElementComponent, TruncatePipe],
         providers: [
           { provide: TruncatableService, useValue: truncatableServiceStub },
-          {provide: ITEM, useValue: searchResultWithoutMetadata}
         ],
         schemas: [NO_ERRORS_SCHEMA]
-      }).overrideComponent(component, {
+      }).overrideComponent(PublicationGridElementComponent, {
         set: { changeDetection: ChangeDetectionStrategy.Default }
       }).compileComponents();
     }));
 
     beforeEach(async(() => {
-      fixture = TestBed.createComponent(component);
+      fixture = TestBed.createComponent(PublicationGridElementComponent);
       comp = fixture.componentInstance;
     }));
 
-    fieldsToCheck.forEach((field) => {
-      describe(`when the item has "${field}" metadata`, () => {
-        beforeEach(() => {
-          comp.dso = searchResultWithMetadata.indexableObject;
-          fixture.detectChanges();
-        });
-
-        it(`should show the "${field}" field`, () => {
-          const itemAuthorField = fixture.debugElement.query(By.css(`.item-${field}`));
-          expect(itemAuthorField).not.toBeNull();
-        });
+    describe(`when the publication is rendered`, () => {
+      beforeEach(() => {
+        comp.object = mockItem;
+        fixture.detectChanges();
       });
 
-      describe(`when the item has no "${field}" metadata`, () => {
-        beforeEach(() => {
-          comp.dso = searchResultWithoutMetadata.indexableObject;
-          fixture.detectChanges();
-        });
-
-        it(`should not show the "${field}" field`, () => {
-          const itemAuthorField = fixture.debugElement.query(By.css(`.item-${field}`));
-          expect(itemAuthorField).toBeNull();
-        });
+      it(`should contain a PublicationGridElementComponent`, () => {
+        const publicationGridElement = fixture.debugElement.query(By.css(`ds-publication-search-result-grid-element`));
+        expect(publicationGridElement).not.toBeNull();
       });
     });
-  }
-}
+
+  });

src/app/shared/object-grid/object-grid.component.html

@@ -13,7 +13,7 @@
     <div class="card-columns row" *ngIf="objects?.hasSucceeded">
       <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
         <div class="card-element" *ngFor="let object of column">
-          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context"></ds-listable-object-component-loader>
+          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
         </div>
       </div>
     </div>

src/app/shared/object-grid/object-grid.component.ts

@@ -22,6 +22,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { Context } from '../../core/shared/context.model';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
@@ -39,6 +40,7 @@ export class ObjectGridComponent implements OnInit {
   @Input() sortConfig: SortOptions;
   @Input() hideGear = false;
   @Input() hidePagerWhenSinglePage = true;
+  @Input() linkType: CollectionElementLinkType;
   @Input() context: Context;
   private _objects$: BehaviorSubject<RemoteData<PaginatedList<ListableObject>>>;
 

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

@@ -1,13 +1,17 @@
 <div class="card">
-  <a [routerLink]="['/collections/', dso.id]" class="card-img-top">
+  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', 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 class="text-center">
-      <a [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">View</a>
+    <div *ngIf="linkType != linkTypes.None" class="text-center">
+      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">View</a>
     </div>
   </div>
 </div>

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

@@ -1,14 +1,17 @@
 <div class="card">
-
-  <a [routerLink]="['/communities/', dso.id]" 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 class="text-center">
-      <a [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">View</a>
+    <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>

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

@@ -1,32 +1,39 @@
 <ds-truncatable [id]="dso.id">
     <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <a [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
+        <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]="this.dso.getThumbnail() | async">
                 </ds-grid-thumbnail>
             </div>
         </a>
+        <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+            <div>
+                <ds-grid-thumbnail [thumbnail]="dso.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]="dso.firstMetadataValue('dc.title')"></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="dso-authors card-text text-muted">
+               class="item-authors card-text text-muted">
                 <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span *ngIf="dso.hasMetadata('dc.date.issued')" class="dso-date">{{dso.firstMetadataValue('dc.date.issued')}}</span>
-                    <span *ngFor="let author of dso.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
+                    <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="dso-abstract card-text">
+            <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 class="text-center">
-                <a [routerLink]="['/items/' + dso.id]"
+            <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>

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

@@ -99,7 +99,7 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
     fieldsToCheck.forEach((field) => {
       describe(`when the item has "${field}" metadata`, () => {
         beforeEach(() => {
-          comp.dso = searchResultWithMetadata.indexableObject;
+          comp.object = searchResultWithMetadata;
           fixture.detectChanges();
         });
 
@@ -111,7 +111,7 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
 
       describe(`when the item has no "${field}" metadata`, () => {
         beforeEach(() => {
-          comp.dso = searchResultWithoutMetadata.indexableObject;
+          comp.object = searchResultWithoutMetadata;
           fixture.detectChanges();
         });