From d5484e5c89afd86629eb43a05cf1a6fdd7d13c40 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Fri, 6 Mar 2020 13:54:46 +0100
Subject: [PATCH 01/13] created admin search page

---
 resources/i18n/en.json5                       |  28 ++++
 resources/i18n/nl.json5                       |   2 +-
 src/app/+admin/admin-routing.module.ts        |   4 +-
 .../admin-search-page.component.html          |   1 +
 .../admin-search-page.component.scss          |   0
 .../admin-search-page.component.spec.ts       |  27 ++++
 .../admin-search-page.component.ts            |  18 +++
 src/app/+admin/admin.module.ts                |   4 +
 .../edit-item-page.routing.module.ts          |  12 +-
 src/app/+search-page/search.component.html    |  83 ++++++------
 src/app/+search-page/search.component.ts      |   7 +
 src/app/core/services/route.reducer.ts        |   4 +-
 src/app/core/services/route.service.ts        |   6 +-
 src/app/core/shared/context.model.ts          |   1 +
 .../abstract-listable-element.component.ts    |  17 +++
 ...-search-result-list-element.component.html |   8 ++
 ...-search-result-list-element.component.scss |   0
 ...arch-result-list-element.component.spec.ts |  60 +++++++++
 ...in-search-result-list-element.component.ts |  27 ++++
 ...-search-result-list-element.component.html |   8 ++
 ...-search-result-list-element.component.scss |   0
 ...arch-result-list-element.component.spec.ts |  60 +++++++++
 ...in-search-result-list-element.component.ts |  27 ++++
 ...-search-result-list-element.component.html |  39 ++++++
 ...-search-result-list-element.component.scss |   0
 ...arch-result-list-element.component.spec.ts | 120 ++++++++++++++++++
 ...in-search-result-list-element.component.ts |  77 +++++++++++
 src/app/shared/shared.module.ts               |  13 +-
 28 files changed, 600 insertions(+), 53 deletions(-)
 create mode 100644 src/app/+admin/admin-search-page/admin-search-page.component.html
 create mode 100644 src/app/+admin/admin-search-page/admin-search-page.component.scss
 create mode 100644 src/app/+admin/admin-search-page/admin-search-page.component.spec.ts
 create mode 100644 src/app/+admin/admin-search-page/admin-search-page.component.ts
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
 create mode 100644 src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index cfa202fe4a..497dc8db54 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -170,6 +170,32 @@
 
 
 
+  "admin.search.collection.edit": "Edit",
+
+  "admin.search.community.edit": "Edit",
+
+  "admin.search.item.delete": "Delete",
+
+  "admin.search.item.edit": "Edit",
+
+  "admin.search.item.make-private": "Make Private",
+
+  "admin.search.item.make-public": "Make Public",
+
+  "admin.search.item.move": "Move",
+
+  "admin.search.item.private": "Private",
+
+  "admin.search.item.reinstate": "Reinstate",
+
+  "admin.search.item.withdraw": "Withdraw",
+
+  "admin.search.item.withdrawn": "Withdrawn",
+
+  "admin.search.title": "Admin Search",
+
+
+
   "auth.errors.invalid-user": "Invalid email address or password.",
 
   "auth.messages.expired": "Your session has expired. Please log in again.",
@@ -1984,6 +2010,8 @@
   "title": "DSpace",
 
 
+  "undiscoverable.search.results.head": "Admin Search",
+
 
   "uploader.browse": "browse",
 
diff --git a/resources/i18n/nl.json5 b/resources/i18n/nl.json5
index 344a36e2e8..871efcbd04 100644
--- a/resources/i18n/nl.json5
+++ b/resources/i18n/nl.json5
@@ -1248,7 +1248,7 @@
 
 
   // "journalissue.listelement.badge": "Journal Issue",
-  "journalissue.listelement.badge": "Tijdschrift aflevering",
+  "journalissue.listelement.badge": "Tijdschriftaflevering",
 
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Beschrijving",
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index 2003ecf124..d750d22058 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -2,6 +2,7 @@ import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAdminModulePath } from '../app-routing.module';
+import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
 
 const REGISTRIES_MODULE_PATH = 'registries';
 
@@ -15,7 +16,8 @@ export function getRegistriesModulePath() {
       {
         path: REGISTRIES_MODULE_PATH,
         loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule'
-      }
+      },
+      { path: 'search', component: AdminSearchPageComponent, data: { title: 'admin.search.title' } },
     ])
   ]
 })
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.html b/src/app/+admin/admin-search-page/admin-search-page.component.html
new file mode 100644
index 0000000000..15fa71e4d5
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-page.component.html
@@ -0,0 +1 @@
+<ds-configuration-search-page configuration="undiscoverable" [context]="context"></ds-configuration-search-page>
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.scss b/src/app/+admin/admin-search-page/admin-search-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-page.component.spec.ts
new file mode 100644
index 0000000000..05546d180b
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-page.component.spec.ts
@@ -0,0 +1,27 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminSearchPageComponent } from './admin-search-page.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+
+describe('AdminSearchPageComponent', () => {
+  let component: AdminSearchPageComponent;
+  let fixture: ComponentFixture<AdminSearchPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AdminSearchPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdminSearchPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.ts b/src/app/+admin/admin-search-page/admin-search-page.component.ts
new file mode 100644
index 0000000000..cbbc65a489
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-page.component.ts
@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+import { Context } from '../../core/shared/context.model';
+
+@Component({
+  selector: 'ds-admin-search-page',
+  templateUrl: './admin-search-page.component.html',
+  styleUrls: ['./admin-search-page.component.scss']
+})
+
+/**
+ * Component that represents a search page for administrators
+ */
+export class AdminSearchPageComponent {
+  /**
+   * The context of this page
+   */
+  context: Context = Context.AdminSearch;
+}
diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts
index 1495d0fd8c..b3617cdf4d 100644
--- a/src/app/+admin/admin.module.ts
+++ b/src/app/+admin/admin.module.ts
@@ -2,13 +2,17 @@ import { NgModule } from '@angular/core';
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
 import { AdminRoutingModule } from './admin-routing.module';
 import { SharedModule } from '../shared/shared.module';
+import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+import { SearchPageModule } from '../+search-page/search-page.module';
 
 @NgModule({
   imports: [
     AdminRegistriesModule,
     AdminRoutingModule,
     SharedModule,
+    SearchPageModule
   ],
+  declarations: [AdminSearchPageComponent],
 })
 export class AdminModule {
 
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
index da667847f7..84cdeec3d0 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -15,12 +15,12 @@ import { ItemMoveComponent } from './item-move/item-move.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
-const ITEM_EDIT_WITHDRAW_PATH = 'withdraw';
-const ITEM_EDIT_REINSTATE_PATH = 'reinstate';
-const ITEM_EDIT_PRIVATE_PATH = 'private';
-const ITEM_EDIT_PUBLIC_PATH = 'public';
-const ITEM_EDIT_DELETE_PATH = 'delete';
-const ITEM_EDIT_MOVE_PATH = 'move';
+export const ITEM_EDIT_WITHDRAW_PATH = 'withdraw';
+export const ITEM_EDIT_REINSTATE_PATH = 'reinstate';
+export const ITEM_EDIT_PRIVATE_PATH = 'private';
+export const ITEM_EDIT_PUBLIC_PATH = 'public';
+export const ITEM_EDIT_DELETE_PATH = 'delete';
+export const ITEM_EDIT_MOVE_PATH = 'move';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
diff --git a/src/app/+search-page/search.component.html b/src/app/+search-page/search.component.html
index 36879f33d4..ee96f703f2 100644
--- a/src/app/+search-page/search.component.html
+++ b/src/app/+search-page/search.component.html
@@ -1,54 +1,55 @@
 <div class="container" *ngIf="(isXsOrSm$ | async)">
-  <div class="row">
-    <div class="col-12">
-      <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+    <div class="row">
+        <div class="col-12">
+            <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+        </div>
     </div>
-  </div>
 </div>
 <ds-page-with-sidebar [id]="'search-page'" [sidebarContent]="sidebarContent">
-  <div class="row">
-    <div class="col-12" *ngIf="!(isXsOrSm$ | async)">
-      <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+    <div class="row">
+        <div class="col-12" *ngIf="!(isXsOrSm$ | async)">
+            <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+        </div>
+        <div id="search-content" class="col-12">
+            <div class="d-block d-md-none search-controls clearfix">
+                <ds-view-mode-switch [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
+                <button (click)="openSidebar()" aria-controls="#search-body"
+                        class="btn btn-outline-primary float-right open-sidebar"><i
+                        class="fas fa-sliders"></i> {{"search.sidebar.open"
+                        | translate}}
+                </button>
+            </div>
+            <ds-search-results [searchResults]="resultsRD$ | async"
+                               [searchConfig]="searchOptions$ | async"
+                               [configuration]="configuration$ | async"
+                               [disableHeader]="!searchEnabled"
+                               [context]="context"></ds-search-results>
+        </div>
     </div>
-    <div id="search-content" class="col-12">
-      <div class="d-block d-md-none search-controls clearfix">
-        <ds-view-mode-switch [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
-        <button (click)="openSidebar()" aria-controls="#search-body"
-                class="btn btn-outline-primary float-right open-sidebar"><i
-          class="fas fa-sliders"></i> {{"search.sidebar.open"
-            | translate}}
-        </button>
-      </div>
-      <ds-search-results [searchResults]="resultsRD$ | async"
-                         [searchConfig]="searchOptions$ | async"
-                         [configuration]="configuration$ | async"
-                         [disableHeader]="!searchEnabled"></ds-search-results>
-    </div>
-  </div>
 </ds-page-with-sidebar>
 
 <ng-template #sidebarContent>
-  <ds-search-sidebar id="search-sidebar" *ngIf="!(isXsOrSm$ | async)"
-                     [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
-                     [inPlaceSearch]="inPlaceSearch"></ds-search-sidebar>
-  <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
-                     [resultCount]="(resultsRD$ | async)?.payload.totalElements"
-                     (toggleSidebar)="closeSidebar()"
-  >
-  </ds-search-sidebar>
+    <ds-search-sidebar id="search-sidebar" *ngIf="!(isXsOrSm$ | async)"
+                       [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+                       [inPlaceSearch]="inPlaceSearch"></ds-search-sidebar>
+    <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
+                       [resultCount]="(resultsRD$ | async)?.payload.totalElements"
+                       (toggleSidebar)="closeSidebar()"
+    >
+    </ds-search-sidebar>
 </ng-template>
 
 <ng-template #searchForm>
-  <ds-search-form *ngIf="searchEnabled" id="search-form"
-                  [query]="(searchOptions$ | async)?.query"
-                  [scope]="(searchOptions$ | async)?.scope"
-                  [currentUrl]="searchLink"
-                  [scopes]="(scopeListRD$ | async)"
-                  [inPlaceSearch]="inPlaceSearch">
-  </ds-search-form>
-  <div class="row mb-3 mb-md-1">
-    <div class="labels col-sm-9 offset-sm-3">
-      <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
+    <ds-search-form *ngIf="searchEnabled" id="search-form"
+                    [query]="(searchOptions$ | async)?.query"
+                    [scope]="(searchOptions$ | async)?.scope"
+                    [currentUrl]="searchLink"
+                    [scopes]="(scopeListRD$ | async)"
+                    [inPlaceSearch]="inPlaceSearch">
+    </ds-search-form>
+    <div class="row mb-3 mb-md-1">
+        <div class="labels col-sm-9 offset-sm-3">
+            <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
+        </div>
     </div>
-  </div>
 </ng-template>
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index b27ebf625f..bbbfdba513 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -17,6 +17,7 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu
 import { SearchService } from '../core/shared/search/search.service';
 import { currentPath } from '../shared/utils/route.utils';
 import { Router } from '@angular/router';
+import { Context } from '../core/shared/context.model';
 
 @Component({
   selector: 'ds-search',
@@ -84,6 +85,12 @@ export class SearchComponent implements OnInit {
   @Input()
   configuration$: Observable<string>;
 
+  /**
+   * The current context
+   */
+  @Input()
+  context: Context;
+
   /**
    * Link to the search page
    */
diff --git a/src/app/core/services/route.reducer.ts b/src/app/core/services/route.reducer.ts
index 2d5356a5db..5a56fd3d9b 100644
--- a/src/app/core/services/route.reducer.ts
+++ b/src/app/core/services/route.reducer.ts
@@ -9,6 +9,7 @@ import {
   SetQueryParameterAction,
   SetQueryParametersAction
 } from './route.actions';
+import { isNotEmpty } from '../../shared/empty.util';
 
 /**
  * Interface to represent the parameter state of a current route in the store
@@ -81,7 +82,8 @@ function addParameter(state: RouteState, action: AddParameterAction | AddQueryPa
  * @param paramType The type of parameter to set: route or query parameter
  */
 function setParameters(state: RouteState, action: SetParametersAction | SetQueryParametersAction, paramType: string): RouteState {
-  return Object.assign({}, state, { [paramType]: { [action.payload.key]: action.payload.value } });
+  const param = isNotEmpty(action.payload) ? { [paramType]: { [action.payload.key]: action.payload.value } } : {};
+  return Object.assign({}, state, param);
 }
 
 /**
diff --git a/src/app/core/services/route.service.ts b/src/app/core/services/route.service.ts
index 661f4acf94..441d058c4c 100644
--- a/src/app/core/services/route.service.ts
+++ b/src/app/core/services/route.service.ts
@@ -6,7 +6,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { isEqual } from 'lodash';
 
-import { AddParameterAction, SetParameterAction, SetParametersAction, SetQueryParametersAction } from './route.actions';
+import { AddParameterAction, SetParameterAction, SetParametersAction, SetQueryParameterAction, SetQueryParametersAction } from './route.actions';
 import { CoreState } from '../core.reducers';
 import { coreSelector } from '../core.selectors';
 import { hasValue } from '../../shared/empty.util';
@@ -194,6 +194,10 @@ export class RouteService {
     this.store.dispatch(new SetParameterAction(key, value));
   }
 
+  public setQueryParameter(key, value) {
+    this.store.dispatch(new SetQueryParameterAction(key, value));
+  }
+
   /**
    * Sets the current route parameters and query parameters in the store
    */
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index 7bfd613b65..6bb3d77140 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -10,4 +10,5 @@ export enum Context {
   Workspace = 'workspace',
   AdminMenu = 'adminMenu',
   SubmissionModal = 'submissionModal',
+  AdminSearch = 'adminSearch',
 }
diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
index d27fb331de..3602f45ede 100644
--- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
+++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
@@ -1,6 +1,8 @@
 import { Component, Input } from '@angular/core';
 import { ListableObject } from '../listable-object.model';
 import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 @Component({
   selector: 'ds-abstract-object-element',
@@ -22,8 +24,23 @@ export class AbstractListableElementComponent<T extends ListableObject> {
    */
   @Input() listID: string;
 
+  /**
+   * The index of this element
+   */
+  @Input() index: number;
+
   /**
    * The available link types
    */
   linkTypes = CollectionElementLinkType;
+
+  /**
+   * The available view modes
+   */
+  viewModes = ViewMode;
+
+  /**
+   * The available contexts
+   */
+  contexts = Context;
 }
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
new file mode 100644
index 0000000000..8cf98b6680
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
@@ -0,0 +1,8 @@
+<ds-listable-object-component-loader [object]="object"
+                                     [viewMode]="viewModes.ListElement"
+                                     [index]="index"
+                                     [linkType]="linkType"
+                                     [listID]="listID"></ds-listable-object-component-loader>
+<a class="btn btn-primary mt-1 mb-3" [routerLink]="[getEditPath()]">
+    <i class="fa fa-edit"></i> {{"admin.search.collection.edit" | translate}}
+</a>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
new file mode 100644
index 0000000000..9e932db81c
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
@@ -0,0 +1,60 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+
+describe('CollectionAdminSearchResultListElementComponent', () => {
+  let component: CollectionAdminSearchResultListElementComponent;
+  let fixture: ComponentFixture<CollectionAdminSearchResultListElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new CollectionSearchResult();
+    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject.uuid = id;
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [CollectionAdminSearchResultListElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionAdminSearchResultListElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render an edit button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(getCollectionEditPath(id));
+  })
+});
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
new file mode 100644
index 0000000000..6077db58b3
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-collection-admin-search-result-list-element',
+  styleUrls: ['./collection-admin-search-result-list-element.component.scss'],
+  templateUrl: './collection-admin-search-result-list-element.component.html'
+})
+/**
+ * The component for displaying a list element for a collection search result on the admin search page
+ */
+export class CollectionAdminSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+
+  /**
+   * Returns the path to the edit page of this collection
+   */
+  getEditPath(): string {
+    return getCollectionEditPath(this.dso.uuid)
+  }
+}
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
new file mode 100644
index 0000000000..43917e0399
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
@@ -0,0 +1,8 @@
+<ds-listable-object-component-loader [object]="object"
+                                     [viewMode]="viewModes.ListElement"
+                                     [index]="index"
+                                     [linkType]="linkType"
+                                     [listID]="listID"></ds-listable-object-component-loader>
+<a class="btn btn-primary mt-1 mb-3" [routerLink]="[getEditPath()]">
+    <i class="fa fa-edit"></i> {{"admin.search.community.edit" | translate}}
+</a>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
new file mode 100644
index 0000000000..79e7350437
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
@@ -0,0 +1,60 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+
+describe('CommunityAdminSearchResultListElementComponent', () => {
+  let component: CommunityAdminSearchResultListElementComponent;
+  let fixture: ComponentFixture<CommunityAdminSearchResultListElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new CommunitySearchResult();
+    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject.uuid = id;
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [CommunityAdminSearchResultListElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityAdminSearchResultListElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render an edit button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(getCommunityEditPath(id));
+  })
+});
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
new file mode 100644
index 0000000000..2ba298e596
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { Community } from '../../../../core/shared/community.model';
+import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-community-admin-search-result-list-element',
+  styleUrls: ['./community-admin-search-result-list-element.component.scss'],
+  templateUrl: './community-admin-search-result-list-element.component.html'
+})
+/**
+ * The component for displaying a list element for a community search result on the admin search page
+ */
+export class CommunityAdminSearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+
+  /**
+   * Returns the path to the edit page of this community
+   */
+  getEditPath(): string {
+    return getCommunityEditPath(this.dso.uuid)
+  }
+}
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
new file mode 100644
index 0000000000..5730e3f859
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -0,0 +1,39 @@
+<div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
+    <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
+</div>
+<div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
+    <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
+</div>
+<ds-listable-object-component-loader [object]="object"
+                                     [viewMode]="viewModes.ListElement"
+                                     [index]="index"
+                                     [linkType]="linkType"
+                                     [listID]="listID"></ds-listable-object-component-loader>
+
+<a class="btn btn-light my-1 edit-link" [routerLink]="[getEditPath()]">
+    <i class="fa fa-edit"></i><span class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
+</a>
+
+<a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]">
+    <i class="fa fa-box"></i><span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
+</a>
+
+<a *ngIf="dso && dso.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]">
+    <i class="fa fa-box-open"></i><span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
+</a>
+
+<a *ngIf="dso && dso.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]">
+    <i class="fa fa-eye-slash"></i><span class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
+</a>
+
+<a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicPath()]">
+    <i class="fa fa-eye"></i><span class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
+</a>
+
+<a class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]">
+    <i class="fa fa-trash"></i><span class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
+</a>
+
+<a class="btn btn-light my-1 move-link" [routerLink]="[getMovePath()]">
+    <i class="fa fa-arrow-circle-right"></i><span class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
+</a>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
new file mode 100644
index 0000000000..e75244ff3e
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
@@ -0,0 +1,120 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
+import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, ITEM_EDIT_REINSTATE_PATH, ITEM_EDIT_WITHDRAW_PATH } from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+
+describe('ItemAdminSearchResultListElementComponent', () => {
+  let component: ItemAdminSearchResultListElementComponent;
+  let fixture: ComponentFixture<ItemAdminSearchResultListElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new ItemSearchResult();
+    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject.uuid = id;
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [ItemAdminSearchResultListElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAdminSearchResultListElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render an edit button with the correct link', () => {
+    const button = fixture.debugElement.query(By.css('a.edit-link'));
+    const link = button.nativeElement.href;
+    expect(link).toContain(getItemEditPath(id));
+  });
+
+  it('should render a delete button with the correct link', () => {
+    const button = fixture.debugElement.query(By.css('a.delete-link'));
+    const link = button.nativeElement.href;
+    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_DELETE_PATH).toString());
+  });
+
+  it('should render a move button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a.move-link'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_MOVE_PATH).toString());
+  });
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+        component.dso.isWithdrawn = false;
+        fixture.detectChanges();
+    });
+
+    it('should not show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).toBeNull();
+    });
+
+    it('should render a withdraw button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.withdraw-link'));
+      const link = a.nativeElement.href;
+      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_WITHDRAW_PATH).toString());
+    });
+
+    it('should not render a reinstate button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.reinstate-link'));
+      expect(a).toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      component.dso.isWithdrawn = true;
+      fixture.detectChanges();
+    });
+
+    it('should show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).not.toBeNull();
+    });
+
+    it('should render a withdraw button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.withdraw-link'));
+      expect(a).toBeNull();
+    });
+
+    it('should not render a reinstate button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.reinstate-link'));
+      const link = a.nativeElement.href;
+      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_REINSTATE_PATH).toString());
+    });
+  })
+});
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
new file mode 100644
index 0000000000..3eb84e08ad
--- /dev/null
+++ b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
@@ -0,0 +1,77 @@
+import { Component } from '@angular/core';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
+import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import {
+  ITEM_EDIT_DELETE_PATH,
+  ITEM_EDIT_MOVE_PATH,
+  ITEM_EDIT_PRIVATE_PATH, ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_REINSTATE_PATH,
+  ITEM_EDIT_WITHDRAW_PATH
+} from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-item-admin-search-result-list-element',
+  styleUrls: ['./item-admin-search-result-list-element.component.scss'],
+  templateUrl: './item-admin-search-result-list-element.component.html'
+})
+/**
+ * The component for displaying a list element for an item search result on the admin search page
+ */
+export class ItemAdminSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
+
+  /**
+   * Returns the path to the edit page of this item
+   */
+  getEditPath(): string {
+    return getItemEditPath(this.dso.uuid)
+  }
+
+  /**
+   * Returns the path to the move page of this item
+   */
+  getMovePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_MOVE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the delete page of this item
+   */
+  getDeletePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_DELETE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the withdraw page of this item
+   */
+  getWithdrawPath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_WITHDRAW_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the reinstate page of this item
+   */
+  getReinstatePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_REINSTATE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the page where the user can make this item private
+   */
+  getPrivatePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PRIVATE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the page where the user can make this item public
+   */
+  getPublicPath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PUBLIC_PATH).toString();
+  }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index c6180e3a3b..c64fb51edc 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -177,6 +177,9 @@ import { ImportableListItemControlComponent } from './object-collection/shared/i
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ExistingMetadataListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import { SortablejsModule } from 'ngx-sortablejs';
+import { ItemAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
+import { CommunityAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
+import { CollectionAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -339,7 +342,10 @@ const COMPONENTS = [
   SelectableListItemControlComponent,
   ExternalSourceEntryImportModalComponent,
   ImportableListItemControlComponent,
-  ExistingMetadataListElementComponent
+  ExistingMetadataListElementComponent,
+  ItemAdminSearchResultListElementComponent,
+  CommunityAdminSearchResultListElementComponent,
+  CollectionAdminSearchResultListElementComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -402,7 +408,10 @@ const ENTRY_COMPONENTS = [
   DsDynamicLookupRelationSearchTabComponent,
   DsDynamicLookupRelationSelectionTabComponent,
   DsDynamicLookupRelationExternalSourceTabComponent,
-  ExternalSourceEntryImportModalComponent
+  ExternalSourceEntryImportModalComponent,
+  ItemAdminSearchResultListElementComponent,
+  CommunityAdminSearchResultListElementComponent,
+  CollectionAdminSearchResultListElementComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [

From 18eaf18108d749f5979324b58dd6ccd6768055e5 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Fri, 6 Mar 2020 14:07:25 +0100
Subject: [PATCH 02/13] updated admin menu

---
 resources/i18n/en.json5                       | 16 +++----
 .../admin-sidebar/admin-sidebar.component.ts  | 46 +++----------------
 2 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index 497dc8db54..e076d1a101 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -1143,6 +1143,10 @@
 
 
 
+  "menu.section.admin_search": "Admin Search",
+
+
+
   "menu.section.browse_community": "This Community",
 
   "menu.section.browse_community_by_author": "By Author",
@@ -1193,18 +1197,10 @@
 
 
 
-  "menu.section.find": "Find",
-
-  "menu.section.find_items": "Items",
-
-  "menu.section.find_private_items": "Private Items",
-
-  "menu.section.find_withdrawn_items": "Withdrawn Items",
-
-
-
   "menu.section.icon.access_control": "Access Control menu section",
 
+  "menu.section.icon.admin_search": "Admin search menu section",
+
   "menu.section.icon.control_panel": "Control Panel menu section",
 
   "menu.section.icon.curation_task": "Curation Task menu section",
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
index 72eb306bf1..9f4fa5f3f6 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
@@ -350,53 +350,19 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
           link: ''
         } as LinkMenuItemModel,
       },
-
-      /*  Search */
+      /*  Admin Search */
       {
-        id: 'find',
+        id: 'admin_search',
         active: false,
         visible: true,
         model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.find'
-        } as TextMenuItemModel,
+          type: MenuItemType.LINK,
+          text: 'menu.section.admin_search',
+          link: '/admin/search'
+        } as LinkMenuItemModel,
         icon: 'search',
         index: 5
       },
-      {
-        id: 'find_items',
-        parentID: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.find_items',
-          link: '/search'
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'find_withdrawn_items',
-        parentID: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.find_withdrawn_items',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'find_private_items',
-        parentID: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.find_private_items',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-
       /*  Registries */
       {
         id: 'registries',

From f5a66c2266dc5d764b651640e29215dff4e311f4 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Fri, 6 Mar 2020 16:22:04 +0100
Subject: [PATCH 03/13] added missing translation helper for facets

---
 resources/i18n/en.json5                               |  9 ++++++++-
 .../admin-search-page.component.html                  |  2 +-
 src/app/app.module.ts                                 |  4 ++--
 .../search-facet-option.component.html                |  4 +++-
 .../search-facet-selected-option.component.html       |  4 +++-
 .../search-label/search-label.component.html          |  4 ++--
 src/app/shared/shared.module.ts                       | 10 +++++++---
 .../shared/translate/missing-translation.helper.ts    | 11 +++++++++++
 8 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 src/app/shared/translate/missing-translation.helper.ts

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index e076d1a101..5ff51a4619 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -1627,6 +1627,13 @@
 
 
 
+  "search.filters.entityType.JournalIssue": "Journal Issue",
+
+  "search.filters.has_content_in_original_bundle.true": "Yes",
+
+  "search.filters.has_content_in_original_bundle.false": "No",
+
+
   "search.filters.head": "Filters",
 
   "search.filters.reset": "Reset filters",
@@ -2006,7 +2013,7 @@
   "title": "DSpace",
 
 
-  "undiscoverable.search.results.head": "Admin Search",
+  "discoverableAndUndiscoverableItems.search.results.head": "Admin Search",
 
 
   "uploader.browse": "browse",
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.html b/src/app/+admin/admin-search-page/admin-search-page.component.html
index 15fa71e4d5..8049b059c5 100644
--- a/src/app/+admin/admin-search-page/admin-search-page.component.html
+++ b/src/app/+admin/admin-search-page/admin-search-page.component.html
@@ -1 +1 @@
-<ds-configuration-search-page configuration="undiscoverable" [context]="context"></ds-configuration-search-page>
+<ds-configuration-search-page configuration="discoverableAndUndiscoverableItems" [context]="context"></ds-configuration-search-page>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index aaad66adf6..0735e44978 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router
 import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
 import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../config';
@@ -39,6 +39,7 @@ import { NotificationComponent } from './shared/notifications/notification/notif
 import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
 import { SharedModule } from './shared/shared.module';
 import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component';
+import { MissingTranslationHelper } from './shared/translate/missing-translation.helper';
 
 export function getConfig() {
   return ENV_CONFIG;
@@ -61,7 +62,6 @@ const IMPORTS = [
   CoreModule.forRoot(),
   ScrollToModule.forRoot(),
   NgbModule,
-  TranslateModule.forRoot(),
   EffectsModule.forRoot(appEffects),
   StoreModule.forRoot(appReducers),
   StoreRouterConnectingModule.forRoot(),
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 9441081661..cf4876e34f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -2,7 +2,9 @@
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
   <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
-  <span class="filter-value px-1">{{filterValue.value}}</span>
+  <span class="filter-value px-1">
+      {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
+  </span>
   <span class="float-right filter-value-count ml-auto">
                         <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
                     </span>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index 5198433207..a27a5d3d86 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -2,5 +2,7 @@
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
-    <span class="filter-value pl-1 text-capitalize">{{selectedValue.label}}</span>
+    <span class="filter-value pl-1 text-capitalize">
+        {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.value} }}
+    </span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 391efcb763..dcb0a1fd88 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,6 +1,6 @@
 <a class="badge badge-primary mr-1 mb-1 text-capitalize"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
-    {{('search.filters.applied.' + key) | translate}}: {{normalizeFilterValue(value)}}
+    {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + key + '.' + value | translate: {default: normalizeFilterValue(value)} }}
     <span> ×</span>
-</a>
\ No newline at end of file
+</a>
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index c64fb51edc..f799984545 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -6,7 +6,7 @@ import { NouisliderModule } from 'ng2-nouislider';
 
 import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
 
 import { NgxPaginationModule } from 'ngx-pagination';
 import { PublicationListElementComponent } from './object-list/item-list-element/item-types/publication/publication-list-element.component';
@@ -180,6 +180,7 @@ import { SortablejsModule } from 'ngx-sortablejs';
 import { ItemAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
 import { CommunityAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
 import { CollectionAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
+import { MissingTranslationHelper } from './translate/missing-translation.helper';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -197,7 +198,6 @@ const MODULES = [
   NgxPaginationModule,
   ReactiveFormsModule,
   RouterModule,
-  TranslateModule,
   NouisliderModule,
   MomentModule,
   TextMaskModule,
@@ -206,7 +206,11 @@ const MODULES = [
 ];
 
 const ROOT_MODULES = [
-  TooltipModule.forRoot()
+  TooltipModule.forRoot(),
+  TranslateModule.forRoot({
+    missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
+    useDefaultLang: true
+  })
 ];
 
 const PIPES = [
diff --git a/src/app/shared/translate/missing-translation.helper.ts b/src/app/shared/translate/missing-translation.helper.ts
new file mode 100644
index 0000000000..3995d4e5aa
--- /dev/null
+++ b/src/app/shared/translate/missing-translation.helper.ts
@@ -0,0 +1,11 @@
+import {MissingTranslationHandler, MissingTranslationHandlerParams} from '@ngx-translate/core';
+
+export class MissingTranslationHelper implements MissingTranslationHandler {
+  handle(params: MissingTranslationHandlerParams) {
+    console.log('bla', params);
+    if (params.interpolateParams) {
+      return (params.interpolateParams as any).default || params.key;
+    }
+    return params.key;
+  }
+}

From 6c7780ca56c41d24a14b074b25280aff15104a2b Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 9 Mar 2020 11:15:48 +0100
Subject: [PATCH 04/13] fixed translation service issues

---
 resources/i18n/en.json5                         |  4 ++++
 src/app/+search-page/search-page.module.ts      |  3 ++-
 src/app/app.module.ts                           |  4 ++--
 .../search-label/search-label.component.html    |  2 +-
 .../search-label/search-label.component.ts      | 10 ++++++++++
 src/app/shared/shared.module.ts                 | 17 +++++++++--------
 .../translate/missing-translation.helper.ts     |  1 -
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index 5ff51a4619..c2ec3cbf30 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -1629,6 +1629,10 @@
 
   "search.filters.entityType.JournalIssue": "Journal Issue",
 
+  "search.filters.entityType.JournalVolume": "Journal Volume",
+
+  "search.filters.entityType.OrgUnit": "Organizational Unit",
+
   "search.filters.has_content_in_original_bundle.true": "Yes",
 
   "search.filters.has_content_in_original_bundle.false": "No",
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index 456446781c..b69dcaf935 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -14,6 +14,7 @@ import { SearchPageComponent } from './search-page.component';
 import { SidebarFilterService } from '../shared/sidebar/filter/sidebar-filter.service';
 import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { TranslateModule } from '@ngx-translate/core';
 
 const components = [
   SearchPageComponent,
@@ -28,7 +29,7 @@ const components = [
     CommonModule,
     SharedModule,
     CoreModule.forRoot(),
-    StatisticsModule.forRoot(),
+    StatisticsModule.forRoot()
   ],
   declarations: components,
   providers: [
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 0735e44978..aaad66adf6 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router
 import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
-import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
 import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../config';
@@ -39,7 +39,6 @@ import { NotificationComponent } from './shared/notifications/notification/notif
 import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
 import { SharedModule } from './shared/shared.module';
 import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component';
-import { MissingTranslationHelper } from './shared/translate/missing-translation.helper';
 
 export function getConfig() {
   return ENV_CONFIG;
@@ -62,6 +61,7 @@ const IMPORTS = [
   CoreModule.forRoot(),
   ScrollToModule.forRoot(),
   NgbModule,
+  TranslateModule.forRoot(),
   EffectsModule.forRoot(appEffects),
   StoreModule.forRoot(appReducers),
   StoreRouterConnectingModule.forRoot(),
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index dcb0a1fd88..bffb7f9329 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,6 +1,6 @@
 <a class="badge badge-primary mr-1 mb-1 text-capitalize"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
-    {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + key + '.' + value | translate: {default: normalizeFilterValue(value)} }}
+    {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
     <span> ×</span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts
index 956b5b81de..2203f73a75 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts
@@ -22,6 +22,11 @@ export class SearchLabelComponent implements OnInit {
   searchLink: string;
   removeParameters: Observable<Params>;
 
+  /**
+   * The name of the filter without the f. prefix
+   */
+  filterName: string;
+
   /**
    * Initialize the instance variable
    */
@@ -33,6 +38,7 @@ export class SearchLabelComponent implements OnInit {
   ngOnInit(): void {
     this.searchLink = this.getSearchLink();
     this.removeParameters = this.getRemoveParams();
+    this.filterName = this.getFilterName();
   }
 
   /**
@@ -74,4 +80,8 @@ export class SearchLabelComponent implements OnInit {
     const pattern = /,authority*$/g;
     return value.replace(pattern, '');
   }
+
+  private getFilterName(): string {
+    return this.key.startsWith('f.') ? this.key.substring(2) : this.key;
+  }
 }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index f799984545..c5bfb4e81a 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -206,11 +206,11 @@ const MODULES = [
 ];
 
 const ROOT_MODULES = [
-  TooltipModule.forRoot(),
-  TranslateModule.forRoot({
+  TranslateModule.forChild({
     missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
     useDefaultLang: true
-  })
+  }),
+  TooltipModule.forRoot(),
 ];
 
 const PIPES = [
@@ -349,7 +349,9 @@ const COMPONENTS = [
   ExistingMetadataListElementComponent,
   ItemAdminSearchResultListElementComponent,
   CommunityAdminSearchResultListElementComponent,
-  CollectionAdminSearchResultListElementComponent
+  CollectionAdminSearchResultListElementComponent,
+  PublicationSearchResultListElementComponent,
+  ExistingMetadataListElementComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -415,7 +417,7 @@ const ENTRY_COMPONENTS = [
   ExternalSourceEntryImportModalComponent,
   ItemAdminSearchResultListElementComponent,
   CommunityAdminSearchResultListElementComponent,
-  CollectionAdminSearchResultListElementComponent
+  CollectionAdminSearchResultListElementComponent,
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -448,8 +450,8 @@ const DIRECTIVES = [
 
 @NgModule({
   imports: [
+    ...ROOT_MODULES,
     ...MODULES,
-    ...ROOT_MODULES
   ],
   declarations: [
     ...PIPES,
@@ -457,8 +459,7 @@ const DIRECTIVES = [
     ...DIRECTIVES,
     ...ENTRY_COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
-    PublicationSearchResultListElementComponent,
-    ExistingMetadataListElementComponent
+
   ],
   providers: [
     ...PROVIDERS
diff --git a/src/app/shared/translate/missing-translation.helper.ts b/src/app/shared/translate/missing-translation.helper.ts
index 3995d4e5aa..cac984ecd5 100644
--- a/src/app/shared/translate/missing-translation.helper.ts
+++ b/src/app/shared/translate/missing-translation.helper.ts
@@ -2,7 +2,6 @@ import {MissingTranslationHandler, MissingTranslationHandlerParams} from '@ngx-t
 
 export class MissingTranslationHelper implements MissingTranslationHandler {
   handle(params: MissingTranslationHandlerParams) {
-    console.log('bla', params);
     if (params.interpolateParams) {
       return (params.interpolateParams as any).default || params.key;
     }

From 401393c8bd694250a8a954b0c66d6df5ed241817 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 10 Mar 2020 10:49:18 +0100
Subject: [PATCH 05/13] grid view for admin search results

---
 resources/i18n/en.json5                       |  25 +++-
 src/app/+admin/admin-routing.module.ts        |   3 +-
 src/app/app-routing.module.ts                 |   2 -
 ...-search-result-grid-element.component.html |   5 +-
 ...-search-result-grid-element.component.html |  59 +++++----
 ...-search-result-grid-element.component.html |   5 +-
 ...-search-result-grid-element.component.html |   7 +-
 ...-search-result-grid-element.component.html |   2 +
 ...-search-result-grid-element.component.html |   5 +-
 ...-search-result-grid-element.component.html |  11 ++
 ...-search-result-grid-element.component.scss |   0
 ...arch-result-grid-element.component.spec.ts |  60 +++++++++
 ...in-search-result-grid-element.component.ts |  27 ++++
 ...-search-result-grid-element.component.html |  11 ++
 ...-search-result-grid-element.component.scss |   0
 ...arch-result-grid-element.component.spec.ts |  60 +++++++++
 ...in-search-result-grid-element.component.ts |  27 ++++
 ...-search-result-grid-element.component.html |  39 ++++++
 ...-search-result-grid-element.component.scss |   0
 ...arch-result-grid-element.component.spec.ts | 120 +++++++++++++++++
 ...in-search-result-grid-element.component.ts | 124 ++++++++++++++++++
 ...-search-result-grid-element.component.html |   1 +
 ...-search-result-grid-element.component.html |  23 ++--
 ...-search-result-grid-element.component.html |   2 +
 ...on-search-result-grid-element.component.ts |   1 +
 ...-search-result-list-element.component.html |  17 +--
 ...-search-result-list-element.component.html |  17 +--
 ...-search-result-list-element.component.html |  14 +-
 src/app/shared/search/search-filter.model.ts  |   7 +-
 src/app/shared/search/search-options.model.ts |   2 +-
 src/app/shared/shared.module.ts               |  12 +-
 .../translate/missing-translation.helper.ts   |   2 +-
 32 files changed, 608 insertions(+), 82 deletions(-)
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
 create mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index c2ec3cbf30..df3f4dc8ca 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -170,6 +170,8 @@
 
 
 
+  "admin.search.breadcrumbs": "Administrative Search",
+
   "admin.search.collection.edit": "Edit",
 
   "admin.search.community.edit": "Edit",
@@ -192,7 +194,7 @@
 
   "admin.search.item.withdrawn": "Withdrawn",
 
-  "admin.search.title": "Admin Search",
+  "admin.search.title": "Administrative Search",
 
 
 
@@ -1520,6 +1522,8 @@
 
   "search.filters.applied.f.dateSubmitted": "Date submitted",
 
+  "search.filters.applied.f.discoverable": "Private",
+
   "search.filters.applied.f.entityType": "Item Type",
 
   "search.filters.applied.f.has_content_in_original_bundle": "Has files",
@@ -1531,10 +1535,15 @@
   "search.filters.applied.f.subject": "Subject",
 
   "search.filters.applied.f.submitter": "Submitter",
+
   "search.filters.applied.f.jobTitle": "Job Title",
+
   "search.filters.applied.f.birthDate.max": "End birth date",
+
   "search.filters.applied.f.birthDate.min": "Start birth date",
 
+  "search.filters.applied.f.withdrawn": "Withdrawn",
+
 
 
   "search.filters.filter.author.head": "Author",
@@ -1571,6 +1580,10 @@
 
   "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
 
+  "search.filters.filter.discoverable.head": "Private",
+
+  "search.filters.filter.withdrawn.head": "Withdrawn",
+
   "search.filters.filter.entityType.head": "Item Type",
 
   "search.filters.filter.entityType.placeholder": "Item Type",
@@ -1637,6 +1650,14 @@
 
   "search.filters.has_content_in_original_bundle.false": "No",
 
+  "search.filters.discoverable.true": "No",
+
+  "search.filters.discoverable.false": "Yes",
+
+  "search.filters.withdrawn.true": "Yes",
+
+  "search.filters.withdrawn.false": "No",
+
 
   "search.filters.head": "Filters",
 
@@ -2017,7 +2038,7 @@
   "title": "DSpace",
 
 
-  "discoverableAndUndiscoverableItems.search.results.head": "Admin Search",
+  "discoverableAndUndiscoverableItems.search.results.head": "Administrative Search",
 
 
   "uploader.browse": "browse",
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index d750d22058..7864f91ad9 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAdminModulePath } from '../app-routing.module';
 import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const REGISTRIES_MODULE_PATH = 'registries';
 
@@ -17,7 +18,7 @@ export function getRegistriesModulePath() {
         path: REGISTRIES_MODULE_PATH,
         loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule'
       },
-      { path: 'search', component: AdminSearchPageComponent, data: { title: 'admin.search.title' } },
+      { path: 'search', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: AdminSearchPageComponent, data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' } },
     ])
   ]
 })
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4cf5efae41..854a86b798 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,7 +3,6 @@ import { RouterModule } from '@angular/router';
 
 import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
 import { AuthenticatedGuard } from './core/auth/authenticated.guard';
-import { Breadcrumb } from './breadcrumbs/breadcrumb/breadcrumb.model';
 import { DSpaceObject } from './core/shared/dspace-object.model';
 import { Community } from './core/shared/community.model';
 import { getCommunityPageRoute } from './+community-page/community-page-routing.module';
@@ -11,7 +10,6 @@ import { Collection } from './core/shared/collection.model';
 import { Item } from './core/shared/item.model';
 import { getItemPageRoute } from './+item-page/item-page-routing.module';
 import { getCollectionPageRoute } from './+collection-page/collection-page-routing.module';
-import { BrowseByDSOBreadcrumbResolver } from './+browse-by/browse-by-dso-breadcrumb.resolver';
 
 const ITEM_MODULE_PATH = 'items';
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index af339109c6..ce1d32c3a7 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <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">
+        <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>
@@ -32,5 +34,6 @@
                    class="lead btn btn-primary viewButton">View</a>
             </div>
         </div>
+        <ng-content></ng-content>
     </div>
 </ds-truncatable>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 2c7f24662a..261d6dc004 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -1,36 +1,39 @@
-    <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">
+<ds-truncatable [id]="dso.id">
+    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
+        <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]="dso.firstMetadataValue('dc.title')"></h4>
+        <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>
+            </ds-truncatable-part>
+            <p *ngIf="dso.hasMetadata('creativework.datePublished')" class="item-date card-text text-muted">
+                <ds-truncatable-part [id]="dso.id" [minLines]="1">
+                    <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
                 </ds-truncatable-part>
-                <p *ngIf="dso.hasMetadata('creativework.datePublished')" class="item-date card-text text-muted">
-                    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                        <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-                    </ds-truncatable-part>
-                </p>
-                <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-                    <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                        <span [innerHTML]="firstMetadataValue('dc.description')"></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>
+            </p>
+            <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
+                <ds-truncatable-part [id]="dso.id" [minLines]="3">
+                    <span [innerHTML]="firstMetadataValue('dc.description')"></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>
+</ds-truncatable>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index d6b9c4a62e..435d9194c4 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <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">
+        <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>
@@ -37,5 +39,6 @@
                    class="lead btn btn-primary viewButton">View</a>
             </div>
         </div>
+        <ng-content></ng-content>
     </div>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 0fb1ec02f8..2a2e71b8ca 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <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">
+        <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>
@@ -34,8 +36,9 @@
             </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>
+                   class="lead btn btn-primary viewButton">View</a>
             </div>
         </div>
+        <ng-content></ng-content>
     </div>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 321ecd4a47..93de2fd28e 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -1,5 +1,6 @@
 <ds-truncatable [id]="dso.id">
     <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
+        <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>
@@ -33,5 +34,6 @@
                    class="lead btn btn-primary viewButton">View</a>
             </div>
         </div>
+        <ng-content></ng-content>
     </div>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index c39de6bc2a..55aa9d5f0f 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <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">
+        <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>
@@ -27,5 +29,6 @@
                    class="lead btn btn-primary viewButton">View</a>
             </div>
         </div>
+        <ng-content></ng-content>
     </div>
 </ds-truncatable>
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
new file mode 100644
index 0000000000..db41da7c2c
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
@@ -0,0 +1,11 @@
+<ds-collection-search-result-grid-element [object]="object"
+                                          [index]="index"
+                                          [linkType]="linkType"
+                                          [listID]="listID">
+    <div class="card-footer text-center">
+        <a class="btn btn-light btn-sm btn-auto my-1" [routerLink]="[getEditPath()]">
+            <i class="fa fa-edit"></i>
+        </a>
+    </div>
+</ds-collection-search-result-grid-element>
+
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
new file mode 100644
index 0000000000..bd7aa841b8
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -0,0 +1,60 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+
+describe('CollectionAdminSearchResultListElementComponent', () => {
+  let component: CollectionAdminSearchResultGridElementComponent;
+  let fixture: ComponentFixture<CollectionAdminSearchResultGridElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new CollectionSearchResult();
+    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject.uuid = id;
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [CollectionAdminSearchResultGridElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionAdminSearchResultGridElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render an edit button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(getCollectionEditPath(id));
+  })
+});
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
new file mode 100644
index 0000000000..8730c98b0e
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+import { SearchResultGridElementComponent } from '../../search-result-grid-element/search-result-grid-element.component';
+
+@listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-collection-admin-search-result-list-element',
+  styleUrls: ['./collection-admin-search-result-grid-element.component.scss'],
+  templateUrl: './collection-admin-search-result-grid-element.component.html'
+})
+/**
+ * The component for displaying a list element for a collection search result on the admin search page
+ */
+export class CollectionAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> {
+
+  /**
+   * Returns the path to the edit page of this collection
+   */
+  getEditPath(): string {
+    return getCollectionEditPath(this.dso.uuid)
+  }
+}
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
new file mode 100644
index 0000000000..ca38804592
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
@@ -0,0 +1,11 @@
+<ds-community-search-result-grid-element [object]="object"
+                                         [index]="index"
+                                         [linkType]="linkType"
+                                         [listID]="listID">
+    <div class="card-footer text-center">
+        <a class="btn btn-light btn-sm btn-auto my-1" [routerLink]="[getEditPath()]">
+            <i class="fa fa-edit"></i>
+        </a>
+    </div>
+</ds-community-search-result-grid-element>
+
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
new file mode 100644
index 0000000000..4d39d52017
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -0,0 +1,60 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+
+describe('CommunityAdminSearchResultListElementComponent', () => {
+  let component: CommunityAdminSearchResultGridElementComponent;
+  let fixture: ComponentFixture<CommunityAdminSearchResultGridElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new CommunitySearchResult();
+    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject.uuid = id;
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [CommunityAdminSearchResultGridElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityAdminSearchResultGridElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render an edit button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(getCommunityEditPath(id));
+  })
+});
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
new file mode 100644
index 0000000000..becf0bc887
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { Community } from '../../../../core/shared/community.model';
+import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+import { SearchResultGridElementComponent } from '../../search-result-grid-element/search-result-grid-element.component';
+
+@listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-community-admin-search-result-grid-element',
+  styleUrls: ['./community-admin-search-result-grid-element.component.scss'],
+  templateUrl: './community-admin-search-result-grid-element.component.html'
+})
+/**
+ * The component for displaying a list element for a community search result on the admin search page
+ */
+export class CommunityAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> {
+
+  /**
+   * Returns the path to the edit page of this community
+   */
+  getEditPath(): string {
+    return getCommunityEditPath(this.dso.uuid)
+  }
+}
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
new file mode 100644
index 0000000000..54cbe7603a
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
@@ -0,0 +1,39 @@
+<ng-template dsListableObject>
+</ng-template>
+<div #badges class="position-absolute ml-1">
+    <div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
+        <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
+    </div>
+    <div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
+        <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
+    </div>
+</div>
+<div #buttons class="card-footer d-flex justify-content-between">
+    <a class="btn btn-light btn-sm my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
+        <i class="fa fa-edit"></i>
+    </a>
+
+    <a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light btn-sm my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
+        <i class="fa fa-box"></i>
+    </a>
+
+    <a *ngIf="dso && dso.isWithdrawn" class="btn btn-light btn-sm my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
+        <i class="fa fa-box-open"></i>
+    </a>
+
+    <a *ngIf="dso && dso.isDiscoverable" class="btn btn-light btn-sm my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
+        <i class="fa fa-eye-slash"></i>
+    </a>
+
+    <a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light btn-sm my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
+        <i class="fa fa-eye"></i>
+    </a>
+
+    <a class="btn btn-light btn-sm my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
+        <i class="fa fa-trash"></i>
+    </a>
+
+    <a class="btn btn-light btn-sm my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
+        <i class="fa fa-arrow-circle-right"></i>
+    </a>
+</div>
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
new file mode 100644
index 0000000000..d9edb410c0
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
@@ -0,0 +1,120 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
+import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, ITEM_EDIT_REINSTATE_PATH, ITEM_EDIT_WITHDRAW_PATH } from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+
+describe('ItemAdminSearchResultListElementComponent', () => {
+  let component: ItemAdminSearchResultGridElementComponent;
+  let fixture: ComponentFixture<ItemAdminSearchResultGridElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new ItemSearchResult();
+    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject.uuid = id;
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [ItemAdminSearchResultGridElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAdminSearchResultGridElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render an edit button with the correct link', () => {
+    const button = fixture.debugElement.query(By.css('a.edit-link'));
+    const link = button.nativeElement.href;
+    expect(link).toContain(getItemEditPath(id));
+  });
+
+  it('should render a delete button with the correct link', () => {
+    const button = fixture.debugElement.query(By.css('a.delete-link'));
+    const link = button.nativeElement.href;
+    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_DELETE_PATH).toString());
+  });
+
+  it('should render a move button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a.move-link'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_MOVE_PATH).toString());
+  });
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+        component.dso.isWithdrawn = false;
+        fixture.detectChanges();
+    });
+
+    it('should not show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).toBeNull();
+    });
+
+    it('should render a withdraw button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.withdraw-link'));
+      const link = a.nativeElement.href;
+      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_WITHDRAW_PATH).toString());
+    });
+
+    it('should not render a reinstate button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.reinstate-link'));
+      expect(a).toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      component.dso.isWithdrawn = true;
+      fixture.detectChanges();
+    });
+
+    it('should show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).not.toBeNull();
+    });
+
+    it('should render a withdraw button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.withdraw-link'));
+      expect(a).toBeNull();
+    });
+
+    it('should not render a reinstate button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.reinstate-link'));
+      const link = a.nativeElement.href;
+      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_REINSTATE_PATH).toString());
+    });
+  })
+});
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
new file mode 100644
index 0000000000..8ac4f3904c
--- /dev/null
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
@@ -0,0 +1,124 @@
+import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { getListableObjectComponent, listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import {
+  ITEM_EDIT_DELETE_PATH,
+  ITEM_EDIT_MOVE_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_REINSTATE_PATH,
+  ITEM_EDIT_WITHDRAW_PATH
+} from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+import { SearchResultGridElementComponent } from '../../search-result-grid-element/search-result-grid-element.component';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ListableObjectDirective } from '../../../object-collection/shared/listable-object/listable-object.directive';
+
+@listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-item-admin-search-result-grid-element',
+  styleUrls: ['./item-admin-search-result-grid-element.component.scss'],
+  templateUrl: './item-admin-search-result-grid-element.component.html'
+})
+/**
+ * The component for displaying a list element for an item search result on the admin search page
+ */
+export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
+  @ViewChild(ListableObjectDirective, {static: true}) listableObjectDirective: ListableObjectDirective;
+  @ViewChild('badges', {static: true}) badges: ElementRef;
+  @ViewChild('buttons', {static: true}) buttons: ElementRef;
+
+  constructor(protected truncatableService: TruncatableService,
+              protected bitstreamDataService: BitstreamDataService,
+              private componentFactoryResolver: ComponentFactoryResolver,
+              private viewContainerRef: ViewContainerRef) {
+      super(truncatableService, bitstreamDataService);
+  }
+
+  /**
+   * Setup the dynamic child component
+   */
+  ngOnInit(): void {
+    super.ngOnInit();
+    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
+
+    const viewContainerRef = this.listableObjectDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    const componentRef = viewContainerRef.createComponent(
+      componentFactory,
+      0,
+      undefined,
+      [
+        [this.badges.nativeElement],
+        [this.buttons.nativeElement]
+      ]);
+    (componentRef.instance as any).object = this.object;
+    (componentRef.instance as any).index = this.index;
+    (componentRef.instance as any).linkType = this.linkType;
+    (componentRef.instance as any).listID = this.listID;
+  }
+
+  /**
+   * Fetch the component depending on the item's relationship type, view mode and context
+   * @returns {GenericConstructor<Component>}
+   */
+  private getComponent(): GenericConstructor<Component> {
+    return getListableObjectComponent(this.object.getRenderTypes(), ViewMode.GridElement, undefined)
+  }
+
+  /**
+   * Returns the path to the edit page of this item
+   */
+  getEditPath(): string {
+    return getItemEditPath(this.dso.uuid)
+  }
+
+  /**
+   * Returns the path to the move page of this item
+   */
+  getMovePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_MOVE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the delete page of this item
+   */
+  getDeletePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_DELETE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the withdraw page of this item
+   */
+  getWithdrawPath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_WITHDRAW_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the reinstate page of this item
+   */
+  getReinstatePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_REINSTATE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the page where the user can make this item private
+   */
+  getPrivatePath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PRIVATE_PATH).toString();
+  }
+
+  /**
+   * Returns the path to the page where the user can make this item public
+   */
+  getPublicPath(): string {
+    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PUBLIC_PATH).toString();
+  }
+}
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index 0c45316e30..a2933fd0ec 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/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>
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index d0a9aa700e..8d5f288498 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/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>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
index 41c16c6eab..0dfa7b8d34 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
@@ -1,5 +1,6 @@
 <ds-truncatable [id]="dso.id">
     <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
+        <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>
@@ -37,5 +38,6 @@
                    class="lead btn btn-primary viewButton">View</a>
             </div>
         </div>
+        <ng-content></ng-content>
     </div>
 </ds-truncatable>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts
index 76618f18f2..c96e73d365 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts
+++ b/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'],
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
index 8cf98b6680..78bb8a3e67 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
+++ b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
@@ -1,8 +1,9 @@
-<ds-listable-object-component-loader [object]="object"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
-<a class="btn btn-primary mt-1 mb-3" [routerLink]="[getEditPath()]">
-    <i class="fa fa-edit"></i> {{"admin.search.collection.edit" | translate}}
-</a>
+<ds-collection-search-result-list-element [object]="object"
+                                          [index]="index"
+                                          [linkType]="linkType"
+                                          [listID]="listID"></ds-collection-search-result-list-element>
+<div>
+    <a class="btn btn-light mt-1" [routerLink]="[getEditPath()]">
+        <i class="fa fa-edit"></i> {{"admin.search.collection.edit" | translate}}
+    </a>
+</div>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
index 43917e0399..9333edbc55 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
+++ b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
@@ -1,8 +1,9 @@
-<ds-listable-object-component-loader [object]="object"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
-<a class="btn btn-primary mt-1 mb-3" [routerLink]="[getEditPath()]">
-    <i class="fa fa-edit"></i> {{"admin.search.community.edit" | translate}}
-</a>
+<ds-community-search-result-list-element [object]="object"
+                                         [index]="index"
+                                         [linkType]="linkType"
+                                         [listID]="listID"></ds-community-search-result-list-element>
+<div>
+    <a class="btn btn-light mt-1" [routerLink]="[getEditPath()]">
+        <i class="fa fa-edit"></i> {{"admin.search.community.edit" | translate}}
+    </a>
+</div>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
index 5730e3f859..83c769ae0a 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -10,30 +10,30 @@
                                      [linkType]="linkType"
                                      [listID]="listID"></ds-listable-object-component-loader>
 
-<a class="btn btn-light my-1 edit-link" [routerLink]="[getEditPath()]">
+<a class="btn btn-light my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
     <i class="fa fa-edit"></i><span class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
 </a>
 
-<a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]">
+<a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
     <i class="fa fa-box"></i><span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
 </a>
 
-<a *ngIf="dso && dso.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]">
+<a *ngIf="dso && dso.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
     <i class="fa fa-box-open"></i><span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
 </a>
 
-<a *ngIf="dso && dso.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]">
+<a *ngIf="dso && dso.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
     <i class="fa fa-eye-slash"></i><span class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
 </a>
 
-<a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicPath()]">
+<a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
     <i class="fa fa-eye"></i><span class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
 </a>
 
-<a class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]">
+<a class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
     <i class="fa fa-trash"></i><span class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
 </a>
 
-<a class="btn btn-light my-1 move-link" [routerLink]="[getMovePath()]">
+<a class="btn btn-light my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
     <i class="fa fa-arrow-circle-right"></i><span class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
 </a>
diff --git a/src/app/shared/search/search-filter.model.ts b/src/app/shared/search/search-filter.model.ts
index 9e93bafed8..ee55bec242 100644
--- a/src/app/shared/search/search-filter.model.ts
+++ b/src/app/shared/search/search-filter.model.ts
@@ -1,7 +1,6 @@
 /**
  * Represents a search filter
  */
-import { hasValue } from '../empty.util';
 
 export class SearchFilter {
   key: string;
@@ -11,10 +10,6 @@ export class SearchFilter {
   constructor(key: string, values: string[], operator?: string) {
     this.key = key;
     this.values = values;
-    if (hasValue(operator)) {
-      this.operator = operator;
-    } else {
-      this.operator = 'query';
-    }
+    this.operator = operator;
   }
 }
diff --git a/src/app/shared/search/search-options.model.ts b/src/app/shared/search/search-options.model.ts
index a8b115abd3..7d5f4dd207 100644
--- a/src/app/shared/search/search-options.model.ts
+++ b/src/app/shared/search/search-options.model.ts
@@ -50,7 +50,7 @@ export class SearchOptions {
     if (isNotEmpty(this.filters)) {
       this.filters.forEach((filter: SearchFilter) => {
         filter.values.forEach((value) => {
-          const filterValue = value.includes(',') ? `${value}` : `${value},${filter.operator}`;
+          const filterValue = value.includes(',') ? `${value}` : value + (filter.operator ? ',' + filter.operator : '');
           args.push(`${filter.key}=${filterValue}`)
         });
       });
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index c5bfb4e81a..84738559ee 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -181,6 +181,9 @@ import { ItemAdminSearchResultListElementComponent } from './object-list/admin-s
 import { CommunityAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
 import { CollectionAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
+import { ItemAdminSearchResultGridElementComponent } from './object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
+import { CommunityAdminSearchResultGridElementComponent } from './object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
+import { CollectionAdminSearchResultGridElementComponent } from './object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -347,11 +350,13 @@ const COMPONENTS = [
   ExternalSourceEntryImportModalComponent,
   ImportableListItemControlComponent,
   ExistingMetadataListElementComponent,
+  PublicationSearchResultListElementComponent,
   ItemAdminSearchResultListElementComponent,
   CommunityAdminSearchResultListElementComponent,
   CollectionAdminSearchResultListElementComponent,
-  PublicationSearchResultListElementComponent,
-  ExistingMetadataListElementComponent
+  ItemAdminSearchResultGridElementComponent,
+  CommunityAdminSearchResultGridElementComponent,
+  CollectionAdminSearchResultGridElementComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -418,6 +423,9 @@ const ENTRY_COMPONENTS = [
   ItemAdminSearchResultListElementComponent,
   CommunityAdminSearchResultListElementComponent,
   CollectionAdminSearchResultListElementComponent,
+  ItemAdminSearchResultGridElementComponent,
+  CommunityAdminSearchResultGridElementComponent,
+  CollectionAdminSearchResultGridElementComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
diff --git a/src/app/shared/translate/missing-translation.helper.ts b/src/app/shared/translate/missing-translation.helper.ts
index cac984ecd5..f071652cef 100644
--- a/src/app/shared/translate/missing-translation.helper.ts
+++ b/src/app/shared/translate/missing-translation.helper.ts
@@ -1,4 +1,4 @@
-import {MissingTranslationHandler, MissingTranslationHandlerParams} from '@ngx-translate/core';
+import { MissingTranslationHandler, MissingTranslationHandlerParams } from '@ngx-translate/core';
 
 export class MissingTranslationHelper implements MissingTranslationHandler {
   handle(params: MissingTranslationHandlerParams) {

From 2922deff50b009f6d79245f8354ec485fbcd6f23 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@atmire.com>
Date: Tue, 10 Mar 2020 18:38:04 +0100
Subject: [PATCH 06/13] small UI tweaks, fix tests

---
 .../configuration-search-page.component.ts    |  1 +
 ...-search-result-grid-element.component.html | 70 ++++++++-------
 ...-search-result-grid-element.component.html | 70 ++++++++-------
 ...-search-result-grid-element.component.html | 75 ++++++++--------
 ...-search-result-grid-element.component.html | 77 ++++++++--------
 ...-search-result-grid-element.component.html | 70 ++++++++-------
 ...-search-result-grid-element.component.html | 59 +++++++------
 .../shared/mocks/mock-trucatable.service.ts   | 19 ++++
 ...-search-result-grid-element.component.html | 12 +--
 ...arch-result-grid-element.component.spec.ts | 19 ++--
 ...in-search-result-grid-element.component.ts |  9 +-
 ...-search-result-grid-element.component.html | 12 +--
 ...arch-result-grid-element.component.spec.ts | 18 ++--
 ...in-search-result-grid-element.component.ts |  9 +-
 ...-search-result-grid-element.component.html | 20 +++--
 ...arch-result-grid-element.component.spec.ts | 25 +++++-
 ...arch-result-grid-element.component.spec.ts |  2 +
 ...arch-result-grid-element.component.spec.ts |  2 +
 ...-search-result-grid-element.component.html | 87 ++++++++++---------
 ...-search-result-list-element.component.html |  2 +-
 ...in-search-result-list-element.component.ts |  9 +-
 ...-search-result-list-element.component.html |  2 +-
 ...in-search-result-list-element.component.ts |  9 +-
 ...-search-result-list-element.component.html |  4 +-
 .../paginated-search-options.model.spec.ts    |  6 +-
 .../search/search-options.model.spec.ts       |  6 +-
 .../truncatable/truncatable.component.spec.ts | 20 +----
 27 files changed, 391 insertions(+), 323 deletions(-)
 create mode 100644 src/app/shared/mocks/mock-trucatable.service.ts

diff --git a/src/app/+search-page/configuration-search-page.component.ts b/src/app/+search-page/configuration-search-page.component.ts
index befac7f331..e6bb10f293 100644
--- a/src/app/+search-page/configuration-search-page.component.ts
+++ b/src/app/+search-page/configuration-search-page.component.ts
@@ -1,3 +1,4 @@
+import { switchMap } from 'rxjs/operators';
 import { HostWindowService } from '../shared/host-window.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { SearchComponent } from './search.component';
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index ce1d32c3a7..0f9b5894f9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -1,39 +1,43 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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 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('creativework.datePublished')" class="item-date card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-                </ds-truncatable-part>
-            </p>
-            <p *ngIf="dso.hasMetadata('journal.title')" class="item-journal-title card-text">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="firstMetadataValue('journal.title')"></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>
-        <ng-content></ng-content>
+    <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('creativework.datePublished')"
+         class="item-date card-text text-muted">
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
+        </ds-truncatable-part>
+      </p>
+      <p *ngIf="dso.hasMetadata('journal.title')" class="item-journal-title card-text">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <span [innerHTML]="firstMetadataValue('journal.title')"></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>
+  </ds-truncatable>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 261d6dc004..16e2a8b847 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -1,39 +1,43 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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 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]="dso.firstMetadataValue('dc.title')"></h4>
-            </ds-truncatable-part>
-            <p *ngIf="dso.hasMetadata('creativework.datePublished')" class="item-date card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-                </ds-truncatable-part>
-            </p>
-            <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="firstMetadataValue('dc.description')"></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>
-        <ng-content></ng-content>
+    <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>
+      </ds-truncatable-part>
+      <p *ngIf="dso.hasMetadata('creativework.datePublished')"
+         class="item-date card-text text-muted">
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
+        </ds-truncatable-part>
+      </p>
+      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <span [innerHTML]="firstMetadataValue('dc.description')"></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>
+  </ds-truncatable>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 435d9194c4..4902eec71e 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -1,44 +1,47 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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 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('creativework.editor')"
-               class="item-publisher card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span class="item-editor">{{firstMetadataValue('creativework.editor')}}</span>
-                    <span *ngIf="dso.hasMetadata('creativework.publisher')" class="item-publisher">
+    <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('creativework.editor')"
+         class="item-publisher card-text text-muted">
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span class="item-editor">{{firstMetadataValue('creativework.editor')}}</span>
+          <span *ngIf="dso.hasMetadata('creativework.publisher')" class="item-publisher">
             <span>, </span>
-                        {{firstMetadataValue('creativework.publisher')}}
+            {{firstMetadataValue('creativework.publisher')}}
           </span>
-                </ds-truncatable-part>
-            </p>
-            <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="firstMetadataValue('dc.description')"></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>
-        <ng-content></ng-content>
+        </ds-truncatable-part>
+      </p>
+      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <span [innerHTML]="firstMetadataValue('dc.description')"></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>
+  </ds-truncatable>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 2a2e71b8ca..1f64856583 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -1,44 +1,49 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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 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('organization.legalName')"></h4>
-            </ds-truncatable-part>
-            <p *ngIf="dso.hasMetadata('organization.foundingDate')" class="item-date card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
-                </ds-truncatable-part>
-            </p>
-            <p *ngIf="dso.hasMetadata('organization.address.addressCountry')"
-               class="item-location card-text">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span class="item-country">{{firstMetadataValue('organization.address.addressCountry')}}</span>
-                    <span *ngIf="dso.hasMetadata('organization.address.addressLocality')" class="item-city">
+    <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('organization.legalName')"></h4>
+      </ds-truncatable-part>
+      <p *ngIf="dso.hasMetadata('organization.foundingDate')"
+         class="item-date card-text text-muted">
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
+        </ds-truncatable-part>
+      </p>
+      <p *ngIf="dso.hasMetadata('organization.address.addressCountry')"
+         class="item-location card-text">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <span
+            class="item-country">{{firstMetadataValue('organization.address.addressCountry')}}</span>
+          <span *ngIf="dso.hasMetadata('organization.address.addressLocality')" class="item-city">
             <span>, </span>
-                        {{firstMetadataValue('organization.address.addressLocality')}}
+            {{firstMetadataValue('organization.address.addressLocality')}}
           </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>
-        <ng-content></ng-content>
+        </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>
+  </ds-truncatable>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 93de2fd28e..cbe93b2545 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -1,39 +1,43 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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 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('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></h4>
-            </ds-truncatable-part>
-            <p *ngIf="dso.hasMetadata('person.email')" class="item-email card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="1">
-                    <span [innerHTML]="firstMetadataValue('person.email')"></span>
-                </ds-truncatable-part>
-            </p>
-            <p *ngIf="dso.hasMetadata('person.jobTitle')" class="item-jobtitle card-text">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="firstMetadataValue('person.jobTitle')"></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>
-        <ng-content></ng-content>
+    <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('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></h4>
+      </ds-truncatable-part>
+      <p *ngIf="dso.hasMetadata('person.email')" class="item-email card-text text-muted">
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span [innerHTML]="firstMetadataValue('person.email')"></span>
+        </ds-truncatable-part>
+      </p>
+      <p *ngIf="dso.hasMetadata('person.jobTitle')" class="item-jobtitle card-text">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <span [innerHTML]="firstMetadataValue('person.jobTitle')"></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>
+  </ds-truncatable>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 55aa9d5f0f..22182d50be 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -1,34 +1,37 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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 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.description')" class="item-description card-text text-muted">
-                <ds-truncatable-part [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="firstMetadataValue('dc.description')"></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>
-        <ng-content></ng-content>
+    <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.description')" class="item-description card-text text-muted">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <span [innerHTML]="firstMetadataValue('dc.description')"></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>
+  </ds-truncatable>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/shared/mocks/mock-trucatable.service.ts b/src/app/shared/mocks/mock-trucatable.service.ts
new file mode 100644
index 0000000000..0acb0b4c76
--- /dev/null
+++ b/src/app/shared/mocks/mock-trucatable.service.ts
@@ -0,0 +1,19 @@
+import { of as observableOf } from 'rxjs/internal/observable/of';
+
+export const mockTruncatableService: any = {
+  /* tslint:disable:no-empty */
+  isCollapsed: (id: string) => {
+    if (id === '1') {
+      return observableOf(true)
+    } else {
+      return observableOf(false);
+    }
+  },
+  expand: (id: string) => {
+  },
+  collapse: (id: string) => {
+  },
+  toggle: (id: string) => {
+  }
+  /* tslint:enable:no-empty */
+};
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
index db41da7c2c..8aa75df7dd 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
@@ -2,10 +2,12 @@
                                           [index]="index"
                                           [linkType]="linkType"
                                           [listID]="listID">
-    <div class="card-footer text-center">
-        <a class="btn btn-light btn-sm btn-auto my-1" [routerLink]="[getEditPath()]">
-            <i class="fa fa-edit"></i>
-        </a>
-    </div>
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item text-center">
+      <a class="btn btn-light btn-sm btn-auto my-1 edit-link" [routerLink]="[editPath]">
+        <i class="fa fa-edit"></i>
+      </a>
+    </li>
+  </ul>
 </ds-collection-search-result-grid-element>
 
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
index bd7aa841b8..268ede777c 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -1,6 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { mockTruncatableService } from '../../../mocks/mock-trucatable.service';
+import { SharedModule } from '../../../shared.module';
 import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
@@ -12,7 +16,7 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
 
-describe('CollectionAdminSearchResultListElementComponent', () => {
+describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
   let fixture: ComponentFixture<CollectionAdminSearchResultGridElementComponent>;
   let id;
@@ -28,12 +32,15 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
+        NoopAnimationsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
+        SharedModule
       ],
-      declarations: [CollectionAdminSearchResultGridElementComponent],
-      providers: [{ provide: TruncatableService, useValue: {} }],
-      schemas: [NO_ERRORS_SCHEMA]
+      providers: [
+        { provide: TruncatableService, useValue: mockTruncatableService },
+        { provide: BitstreamDataService, useValue: {} },
+      ]
     })
       .compileComponents();
   }));
@@ -53,7 +60,7 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
   });
 
   it('should render an edit button with the correct link', () => {
-    const a = fixture.debugElement.query(By.css('a'));
+    const a = fixture.debugElement.query(By.css('a.edit-link'));
     const link = a.nativeElement.href;
     expect(link).toContain(getCollectionEditPath(id));
   })
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index 8730c98b0e..a43e6782e7 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -17,11 +17,10 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
  * The component for displaying a list element for a collection search result on the admin search page
  */
 export class CollectionAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> {
+  editPath: string;
 
-  /**
-   * Returns the path to the edit page of this collection
-   */
-  getEditPath(): string {
-    return getCollectionEditPath(this.dso.uuid)
+  ngOnInit() {
+    super.ngOnInit();
+    this.editPath = getCollectionEditPath(this.dso.uuid);
   }
 }
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
index ca38804592..4f6d80c43b 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
@@ -2,10 +2,12 @@
                                          [index]="index"
                                          [linkType]="linkType"
                                          [listID]="listID">
-    <div class="card-footer text-center">
-        <a class="btn btn-light btn-sm btn-auto my-1" [routerLink]="[getEditPath()]">
-            <i class="fa fa-edit"></i>
-        </a>
-    </div>
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item text-center">
+      <a class="btn btn-light btn-sm btn-auto my-1 edit-link" [routerLink]="[editPath]">
+        <i class="fa fa-edit"></i>
+      </a>
+    </li>
+  </ul>
 </ds-community-search-result-grid-element>
 
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
index 4d39d52017..fc8257289c 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -1,7 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { mockTruncatableService } from '../../../mocks/mock-trucatable.service';
+import { SharedModule } from '../../../shared.module';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
@@ -12,7 +16,7 @@ import { CommunityAdminSearchResultGridElementComponent } from './community-admi
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
 
-describe('CommunityAdminSearchResultListElementComponent', () => {
+describe('CommunityAdminSearchResultGridElementComponent', () => {
   let component: CommunityAdminSearchResultGridElementComponent;
   let fixture: ComponentFixture<CommunityAdminSearchResultGridElementComponent>;
   let id;
@@ -28,11 +32,15 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
+        NoopAnimationsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
+        SharedModule
+      ],
+      providers: [
+        { provide: TruncatableService, useValue: mockTruncatableService },
+        { provide: BitstreamDataService, useValue: {} },
       ],
-      declarations: [CommunityAdminSearchResultGridElementComponent],
-      providers: [{ provide: TruncatableService, useValue: {} }],
       schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
@@ -53,7 +61,7 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
   });
 
   it('should render an edit button with the correct link', () => {
-    const a = fixture.debugElement.query(By.css('a'));
+    const a = fixture.debugElement.query(By.css('a.edit-link'));
     const link = a.nativeElement.href;
     expect(link).toContain(getCommunityEditPath(id));
   })
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index becf0bc887..ae3221896e 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -17,11 +17,10 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
  * The component for displaying a list element for a community search result on the admin search page
  */
 export class CommunityAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> {
+  editPath: string;
 
-  /**
-   * Returns the path to the edit page of this community
-   */
-  getEditPath(): string {
-    return getCommunityEditPath(this.dso.uuid)
+  ngOnInit() {
+    super.ngOnInit();
+    this.editPath = getCommunityEditPath(this.dso.uuid);
   }
 }
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
index 54cbe7603a..1394d49154 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
@@ -8,32 +8,34 @@
         <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
     </div>
 </div>
-<div #buttons class="card-footer d-flex justify-content-between">
+<ul #buttons class="list-group list-group-flush">
+  <li class="list-group-item d-flex justify-content-between">
     <a class="btn btn-light btn-sm my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
-        <i class="fa fa-edit"></i>
+      <i class="fa fa-edit"></i>
     </a>
 
     <a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light btn-sm my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
-        <i class="fa fa-box"></i>
+      <i class="fa fa-ban"></i>
     </a>
 
     <a *ngIf="dso && dso.isWithdrawn" class="btn btn-light btn-sm my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
-        <i class="fa fa-box-open"></i>
+      <i class="fa fa-undo"></i>
     </a>
 
     <a *ngIf="dso && dso.isDiscoverable" class="btn btn-light btn-sm my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
-        <i class="fa fa-eye-slash"></i>
+      <i class="fa fa-eye-slash"></i>
     </a>
 
     <a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light btn-sm my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
-        <i class="fa fa-eye"></i>
+      <i class="fa fa-eye"></i>
     </a>
 
     <a class="btn btn-light btn-sm my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
-        <i class="fa fa-trash"></i>
+      <i class="fa fa-trash"></i>
     </a>
 
     <a class="btn btn-light btn-sm my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
-        <i class="fa fa-arrow-circle-right"></i>
+      <i class="fa fa-arrow-circle-right"></i>
     </a>
-</div>
+  </li>
+</ul>
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
index d9edb410c0..92110c4735 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
@@ -1,7 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { Item } from '../../../../core/shared/item.model';
+import { mockTruncatableService } from '../../../mocks/mock-trucatable.service';
+import { SharedModule } from '../../../shared.module';
+import { createSuccessfulRemoteDataObject$ } from '../../../testing/utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
@@ -20,6 +29,12 @@ describe('ItemAdminSearchResultListElementComponent', () => {
   let id;
   let searchResult;
 
+  const mockBitstreamDataService = {
+    getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
+      return createSuccessfulRemoteDataObject$(new Bitstream());
+    }
+  };
+
   function init() {
     id = '780b2588-bda5-4112-a1cd-0b15000a5339';
     searchResult = new ItemSearchResult();
@@ -30,11 +45,15 @@ describe('ItemAdminSearchResultListElementComponent', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
+        NoopAnimationsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
+        SharedModule
+      ],
+      providers: [
+        { provide: TruncatableService, useValue: mockTruncatableService },
+        { provide: BitstreamDataService, useValue: mockBitstreamDataService },
       ],
-      declarations: [ItemAdminSearchResultGridElementComponent],
-      providers: [{ provide: TruncatableService, useValue: {} }],
       schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index c14e3f6df1..de19f5b74a 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/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';
@@ -62,6 +63,7 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
+        { provide: BitstreamDataService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
         { provide: NotificationsService, useValue: {} },
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index 0ea72b52d5..b97c574970 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/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';
@@ -62,6 +63,7 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
+        { provide: BitstreamDataService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
         { provide: NotificationsService, useValue: {} },
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
index 0dfa7b8d34..ec0b792e34 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
@@ -1,43 +1,44 @@
-<ds-truncatable [id]="dso.id">
-    <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-        <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>
-        <ng-content></ng-content>
-    </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>
+
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
index 78bb8a3e67..e51e207bbe 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
+++ b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
@@ -3,7 +3,7 @@
                                           [linkType]="linkType"
                                           [listID]="listID"></ds-collection-search-result-list-element>
 <div>
-    <a class="btn btn-light mt-1" [routerLink]="[getEditPath()]">
+    <a class="btn btn-light mt-1" [routerLink]="[editPath]">
         <i class="fa fa-edit"></i> {{"admin.search.collection.edit" | translate}}
     </a>
 </div>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index 6077db58b3..5adb12cf77 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -17,11 +17,10 @@ import { getCollectionEditPath } from '../../../../+collection-page/collection-p
  * The component for displaying a list element for a collection search result on the admin search page
  */
 export class CollectionAdminSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+  editPath: string;
 
-  /**
-   * Returns the path to the edit page of this collection
-   */
-  getEditPath(): string {
-    return getCollectionEditPath(this.dso.uuid)
+  ngOnInit() {
+    super.ngOnInit();
+    this.editPath = getCollectionEditPath(this.dso.uuid);
   }
 }
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
index 9333edbc55..8938c316f4 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
+++ b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
@@ -3,7 +3,7 @@
                                          [linkType]="linkType"
                                          [listID]="listID"></ds-community-search-result-list-element>
 <div>
-    <a class="btn btn-light mt-1" [routerLink]="[getEditPath()]">
+    <a class="btn btn-light mt-1" [routerLink]="[editPath]">
         <i class="fa fa-edit"></i> {{"admin.search.community.edit" | translate}}
     </a>
 </div>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index 2ba298e596..c835f02062 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -17,11 +17,10 @@ import { getCommunityEditPath } from '../../../../+community-page/community-page
  * The component for displaying a list element for a community search result on the admin search page
  */
 export class CommunityAdminSearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+  editPath: string;
 
-  /**
-   * Returns the path to the edit page of this community
-   */
-  getEditPath(): string {
-    return getCommunityEditPath(this.dso.uuid)
+  ngOnInit() {
+    super.ngOnInit();
+    this.editPath = getCommunityEditPath(this.dso.uuid);
   }
 }
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
index 83c769ae0a..6c9d422a06 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -15,11 +15,11 @@
 </a>
 
 <a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
-    <i class="fa fa-box"></i><span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
+    <i class="fa fa-ban"></i><span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
 </a>
 
 <a *ngIf="dso && dso.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
-    <i class="fa fa-box-open"></i><span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
+    <i class="fa fa-undo"></i><span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
 </a>
 
 <a *ngIf="dso && dso.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
diff --git a/src/app/shared/search/paginated-search-options.model.spec.ts b/src/app/shared/search/paginated-search-options.model.spec.ts
index 2702c3ff01..1739fd54fb 100644
--- a/src/app/shared/search/paginated-search-options.model.spec.ts
+++ b/src/app/shared/search/paginated-search-options.model.spec.ts
@@ -27,9 +27,9 @@ describe('PaginatedSearchOptions', () => {
         'query=search query&' +
         'scope=0fde1ecb-82cc-425a-b600-ac3576d76b47&' +
         'dsoType=ITEM&' +
-        'f.test=value,query&' +
-        'f.example=another value,query&' +
-        'f.example=second value,query'
+        'f.test=value&' +
+        'f.example=another value&' +
+        'f.example=second value'
       );
     });
 
diff --git a/src/app/shared/search/search-options.model.spec.ts b/src/app/shared/search/search-options.model.spec.ts
index 3b047b578f..3195ec3660 100644
--- a/src/app/shared/search/search-options.model.spec.ts
+++ b/src/app/shared/search/search-options.model.spec.ts
@@ -21,9 +21,9 @@ describe('SearchOptions', () => {
         'query=search query&' +
         'scope=0fde1ecb-82cc-425a-b600-ac3576d76b47&' +
         'dsoType=ITEM&' +
-        'f.test=value,query&' +
-        'f.example=another value,query&' +
-        'f.example=second value,query'
+        'f.test=value&' +
+        'f.example=another value&' +
+        'f.example=second value'
       );
     });
 
diff --git a/src/app/shared/truncatable/truncatable.component.spec.ts b/src/app/shared/truncatable/truncatable.component.spec.ts
index d083c27d07..176beb0f15 100644
--- a/src/app/shared/truncatable/truncatable.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable.component.spec.ts
@@ -1,5 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
+import { mockTruncatableService } from '../mocks/mock-trucatable.service';
 import { TruncatableComponent } from './truncatable.component';
 import { TruncatableService } from './truncatable.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
@@ -10,29 +11,12 @@ describe('TruncatableComponent', () => {
   let fixture: ComponentFixture<TruncatableComponent>;
   const identifier = '1234567890';
   let truncatableService;
-  const truncatableServiceStub: any = {
-    /* tslint:disable:no-empty */
-    isCollapsed: (id: string) => {
-      if (id === '1') {
-        return observableOf(true)
-      } else {
-        return observableOf(false);
-      }
-    },
-    expand: (id: string) => {
-    },
-    collapse: (id: string) => {
-    },
-    toggle: (id: string) => {
-    }
-    /* tslint:enable:no-empty */
-  };
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
       declarations: [TruncatableComponent],
       providers: [
-        { provide: TruncatableService, useValue: truncatableServiceStub },
+        { provide: TruncatableService, useValue: mockTruncatableService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(TruncatableComponent, {

From 0175b50d480b51d90f28e627e48aa99a01735d5d Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 12 Mar 2020 12:49:48 +0100
Subject: [PATCH 07/13] applied feedback

---
 src/app/+admin/admin-routing.module.ts        |   7 +-
 ...-search-result-grid-element.component.html |   0
 ...-search-result-grid-element.component.scss |   0
 ...arch-result-grid-element.component.spec.ts |  21 ++-
 ...in-search-result-grid-element.component.ts |  14 +-
 ...-search-result-grid-element.component.html |   0
 ...-search-result-grid-element.component.scss |   0
 ...arch-result-grid-element.component.spec.ts |  22 +--
 ...in-search-result-grid-element.component.ts |  14 +-
 ...-search-result-grid-element.component.html |  15 ++
 ...-search-result-grid-element.component.scss |   0
 ...arch-result-grid-element.component.spec.ts | 121 +++++++++++++++
 ...in-search-result-grid-element.component.ts |  75 ++++++++++
 ...-search-result-list-element.component.html |   0
 ...-search-result-list-element.component.scss |   0
 ...arch-result-list-element.component.spec.ts |  12 +-
 ...in-search-result-list-element.component.ts |  14 +-
 ...-search-result-list-element.component.html |   0
 ...-search-result-list-element.component.scss |   0
 ...arch-result-list-element.component.spec.ts |  14 +-
 ...in-search-result-list-element.component.ts |  14 +-
 ...-search-result-list-element.component.html |  12 ++
 ...-search-result-list-element.component.scss |   0
 ...arch-result-list-element.component.spec.ts | 101 +++++++++++++
 ...in-search-result-list-element.component.ts |  20 +++
 ...admin-search-result-actions.component.html |  27 ++++
 ...admin-search-result-actions.component.scss |   1 +
 ...n-search-result-actions.component.spec.ts} |  98 +++++++-----
 ...-admin-search-result-actions.component.ts} |  32 ++--
 src/app/+admin/admin.module.ts                |  27 +++-
 ...-search-result-grid-element.component.html |  41 ------
 ...arch-result-grid-element.component.spec.ts | 139 ------------------
 ...in-search-result-grid-element.component.ts | 124 ----------------
 ...-search-result-list-element.component.html |  39 -----
 src/app/shared/shared.module.ts               |  18 ---
 35 files changed, 542 insertions(+), 480 deletions(-)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html (100%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss (100%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts (69%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts (51%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html (100%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss (100%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts (64%)
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts (51%)
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
 rename src/app/{shared/object-grid => +admin/admin-search-page/admin-search-results}/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss (100%)
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html (100%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss (100%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts (77%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts (51%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html (100%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss (100%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts (75%)
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts (51%)
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
 rename src/app/{shared/object-list => +admin/admin-search-page/admin-search-results}/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss (100%)
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
 create mode 100644 src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss
 rename src/app/{shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts => +admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts} (52%)
 rename src/app/{shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts => +admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts} (52%)
 delete mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
 delete mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
 delete mode 100644 src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
 delete mode 100644 src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html

diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index 7864f91ad9..373551d3c0 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -18,7 +18,12 @@ export function getRegistriesModulePath() {
         path: REGISTRIES_MODULE_PATH,
         loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule'
       },
-      { path: 'search', resolve: { breadcrumb: I18nBreadcrumbResolver }, component: AdminSearchPageComponent, data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' } },
+      {
+        path: 'search',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        component: AdminSearchPageComponent,
+        data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }
+      },
     ])
   ]
 })
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
similarity index 100%
rename from src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss
similarity index 100%
rename from src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
similarity index 69%
rename from src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
index 268ede777c..1dcd978095 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -1,20 +1,18 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { mockTruncatableService } from '../../../mocks/mock-trucatable.service';
-import { SharedModule } from '../../../shared.module';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { SharedModule } from '../../../../../shared/shared.module';
 import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
@@ -37,6 +35,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
         RouterTestingModule.withRoutes([]),
         SharedModule
       ],
+      declarations: [CollectionAdminSearchResultGridElementComponent],
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
         { provide: BitstreamDataService, useValue: {} },
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
similarity index 51%
rename from src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index a43e6782e7..5e784165ab 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
-import { SearchResultGridElementComponent } from '../../search-result-grid-element/search-result-grid-element.component';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../core/shared/context.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
similarity index 100%
rename from src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
similarity index 100%
rename from src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
similarity index 64%
rename from src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
index fc8257289c..99d33f841a 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -3,18 +3,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { mockTruncatableService } from '../../../mocks/mock-trucatable.service';
-import { SharedModule } from '../../../shared.module';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
+import { Community } from '../../../../../core/shared/community.model';
+import { CommunityAdminSearchResultListElementComponent } from '../../admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
 
 describe('CommunityAdminSearchResultGridElementComponent', () => {
   let component: CommunityAdminSearchResultGridElementComponent;
@@ -25,7 +26,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
   function init() {
     id = '780b2588-bda5-4112-a1cd-0b15000a5339';
     searchResult = new CommunitySearchResult();
-    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject = new Community();
     searchResult.indexableObject.uuid = id;
   }
   beforeEach(async(() => {
@@ -37,6 +38,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
         RouterTestingModule.withRoutes([]),
         SharedModule
       ],
+      declarations: [CommunityAdminSearchResultGridElementComponent],
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
         { provide: BitstreamDataService, useValue: {} },
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
similarity index 51%
rename from src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index ae3221896e..8df12e703f 100644
--- a/src/app/shared/object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { Community } from '../../../../core/shared/community.model';
-import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
-import { SearchResultGridElementComponent } from '../../search-result-grid-element/search-result-grid-element.component';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../core/shared/context.model';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { Community } from '../../../../../core/shared/community.model';
+import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
new file mode 100644
index 0000000000..c571c3d663
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
@@ -0,0 +1,15 @@
+<ng-template dsListableObject>
+</ng-template>
+<div #badges class="position-absolute ml-1">
+    <div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
+        <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
+    </div>
+    <div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
+        <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
+    </div>
+</div>
+<ul #buttons class="list-group list-group-flush">
+  <li class="list-group-item">
+      <ds-item-admin-search-result-actions-element class="d-flex justify-content-between" [item]="dso" [small]="true"></ds-item-admin-search-result-actions-element>
+  </li>
+</ul>
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
similarity index 100%
rename from src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
new file mode 100644
index 0000000000..d940781f79
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
@@ -0,0 +1,121 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { Bitstream } from '../../../../../core/shared/bitstream.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
+
+describe('ItemAdminSearchResultGridElementComponent', () => {
+  let component: ItemAdminSearchResultGridElementComponent;
+  let fixture: ComponentFixture<ItemAdminSearchResultGridElementComponent>;
+  let id;
+  let searchResult;
+
+  const mockBitstreamDataService = {
+    getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
+      return createSuccessfulRemoteDataObject$(new Bitstream());
+    }
+  };
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new ItemSearchResult();
+    searchResult.indexableObject = new Item();
+    searchResult.indexableObject.uuid = id;
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule(
+      {
+        declarations: [ItemAdminSearchResultGridElementComponent],
+        imports: [
+          NoopAnimationsModule,
+          TranslateModule.forRoot(),
+          RouterTestingModule.withRoutes([]),
+          SharedModule
+        ],
+        providers: [
+          { provide: TruncatableService, useValue: mockTruncatableService },
+          { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAdminSearchResultGridElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+      component.dso.isWithdrawn = false;
+      fixture.detectChanges();
+    });
+
+    it('should not show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      component.dso.isWithdrawn = true;
+      fixture.detectChanges();
+    });
+
+    it('should show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).not.toBeNull();
+    });
+  });
+
+  describe('when the item is not private', () => {
+    beforeEach(() => {
+      component.dso.isDiscoverable = true;
+      fixture.detectChanges();
+    });
+    it('should not show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is private', () => {
+    beforeEach(() => {
+      component.dso.isDiscoverable = false;
+      fixture.detectChanges();
+    });
+
+    it('should show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).not.toBeNull();
+    });
+  })
+});
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
new file mode 100644
index 0000000000..04558f6320
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
@@ -0,0 +1,75 @@
+import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { getListableObjectComponent, listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { getItemEditPath } from '../../../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
+import {
+  ITEM_EDIT_DELETE_PATH,
+  ITEM_EDIT_MOVE_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_REINSTATE_PATH,
+  ITEM_EDIT_WITHDRAW_PATH
+} from '../../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
+
+@listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-item-admin-search-result-grid-element',
+  styleUrls: ['./item-admin-search-result-grid-element.component.scss'],
+  templateUrl: './item-admin-search-result-grid-element.component.html'
+})
+/**
+ * The component for displaying a list element for an item search result on the admin search page
+ */
+export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
+  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
+  @ViewChild('badges', { static: true }) badges: ElementRef;
+  @ViewChild('buttons', { static: true }) buttons: ElementRef;
+
+  constructor(protected truncatableService: TruncatableService,
+              protected bitstreamDataService: BitstreamDataService,
+              private componentFactoryResolver: ComponentFactoryResolver
+  ) {
+    super(truncatableService, bitstreamDataService);
+  }
+
+  /**
+   * Setup the dynamic child component
+   */
+  ngOnInit(): void {
+    super.ngOnInit();
+    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
+
+    const viewContainerRef = this.listableObjectDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    const componentRef = viewContainerRef.createComponent(
+      componentFactory,
+      0,
+      undefined,
+      [
+        [this.badges.nativeElement],
+        [this.buttons.nativeElement]
+      ]);
+    (componentRef.instance as any).object = this.object;
+    (componentRef.instance as any).index = this.index;
+    (componentRef.instance as any).linkType = this.linkType;
+    (componentRef.instance as any).listID = this.listID;
+  }
+
+  /**
+   * Fetch the component depending on the item's relationship type, view mode and context
+   * @returns {GenericConstructor<Component>}
+   */
+  private getComponent(): GenericConstructor<Component> {
+    return getListableObjectComponent(this.object.getRenderTypes(), ViewMode.GridElement, undefined)
+  }
+}
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
similarity index 100%
rename from src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
similarity index 100%
rename from src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
similarity index 77%
rename from src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
index 9e932db81c..259d1d64aa 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
@@ -3,14 +3,14 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
 
 describe('CollectionAdminSearchResultListElementComponent', () => {
   let component: CollectionAdminSearchResultListElementComponent;
diff --git a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
similarity index 51%
rename from src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index 5adb12cf77..e49f272184 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
-import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../core/shared/context.model';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
similarity index 100%
rename from src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
similarity index 100%
rename from src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
similarity index 75%
rename from src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
index 79e7350437..a7922d7cf5 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
@@ -2,15 +2,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Collection } from '../../../../core/shared/collection.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
+import { Community } from '../../../../../core/shared/community.model';
 
 describe('CommunityAdminSearchResultListElementComponent', () => {
   let component: CommunityAdminSearchResultListElementComponent;
@@ -21,7 +21,7 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
   function init() {
     id = '780b2588-bda5-4112-a1cd-0b15000a5339';
     searchResult = new CommunitySearchResult();
-    searchResult.indexableObject = new Collection();
+    searchResult.indexableObject = new Community();
     searchResult.indexableObject.uuid = id;
   }
   beforeEach(async(() => {
diff --git a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
similarity index 51%
rename from src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index c835f02062..71fe4203ef 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
-import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { Community } from '../../../../core/shared/community.model';
-import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../core/shared/context.model';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { Community } from '../../../../../core/shared/community.model';
+import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
new file mode 100644
index 0000000000..a74e339e63
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -0,0 +1,12 @@
+<div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
+    <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
+</div>
+<div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
+    <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
+</div>
+<ds-listable-object-component-loader [object]="object"
+                                     [viewMode]="viewModes.ListElement"
+                                     [index]="index"
+                                     [linkType]="linkType"
+                                     [listID]="listID"></ds-listable-object-component-loader>
+<ds-item-admin-search-result-actions-element [item]="dso" [small]="false"></ds-item-admin-search-result-actions-element>
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
similarity index 100%
rename from src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
rename to src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
new file mode 100644
index 0000000000..8395bd4f11
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
@@ -0,0 +1,101 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+
+describe('ItemAdminSearchResultListElementComponent', () => {
+  let component: ItemAdminSearchResultListElementComponent;
+  let fixture: ComponentFixture<ItemAdminSearchResultListElementComponent>;
+  let id;
+  let searchResult;
+
+  function init() {
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    searchResult = new ItemSearchResult();
+    searchResult.indexableObject = new Item();
+    searchResult.indexableObject.uuid = id;
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [ItemAdminSearchResultListElementComponent],
+      providers: [{ provide: TruncatableService, useValue: {} }],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAdminSearchResultListElementComponent);
+    component = fixture.componentInstance;
+    component.object = searchResult;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+      component.dso.isWithdrawn = false;
+      fixture.detectChanges();
+    });
+
+    it('should not show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      component.dso.isWithdrawn = true;
+      fixture.detectChanges();
+    });
+
+    it('should show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).not.toBeNull();
+    });
+  });
+
+  describe('when the item is not private', () => {
+    beforeEach(() => {
+      component.dso.isDiscoverable = true;
+      fixture.detectChanges();
+    });
+    it('should not show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is private', () => {
+    beforeEach(() => {
+      component.dso.isDiscoverable = false;
+      fixture.detectChanges();
+    });
+
+    it('should show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).not.toBeNull();
+    });
+  })
+});
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
new file mode 100644
index 0000000000..b1dea11341
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.AdminSearch)
+@Component({
+  selector: 'ds-item-admin-search-result-list-element',
+  styleUrls: ['./item-admin-search-result-list-element.component.scss'],
+  templateUrl: './item-admin-search-result-list-element.component.html'
+})
+/**
+ * The component for displaying a list element for an item search result on the admin search page
+ */
+export class ItemAdminSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
+
+}
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
new file mode 100644
index 0000000000..a4a923e725
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
@@ -0,0 +1,27 @@
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
+    <i class="fa fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
+</a>
+
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
+    <i class="fa fa-ban"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
+</a>
+
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
+    <i class="fa fa-undo"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
+</a>
+
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
+    <i class="fa fa-eye-slash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
+</a>
+
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
+    <i class="fa fa-eye"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
+</a>
+
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
+    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
+</a>
+
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
+    <i class="fa fa-arrow-circle-right"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
+</a>
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
similarity index 52%
rename from src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
rename to src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
index e75244ff3e..c1aceb477d 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
@@ -2,29 +2,31 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Collection } from '../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
-import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
-import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, ITEM_EDIT_REINSTATE_PATH, ITEM_EDIT_WITHDRAW_PATH } from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
+import { Item } from '../../../core/shared/item.model';
+import {
+  ITEM_EDIT_DELETE_PATH,
+  ITEM_EDIT_MOVE_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_REINSTATE_PATH,
+  ITEM_EDIT_WITHDRAW_PATH
+} from '../../../+item-page/edit-item-page/edit-item-page.routing.module';
+import { getItemEditPath } from '../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
 
-describe('ItemAdminSearchResultListElementComponent', () => {
-  let component: ItemAdminSearchResultListElementComponent;
-  let fixture: ComponentFixture<ItemAdminSearchResultListElementComponent>;
+describe('ItemAdminSearchResultActionsComponent', () => {
+  let component: ItemAdminSearchResultActionsComponent;
+  let fixture: ComponentFixture<ItemAdminSearchResultActionsComponent>;
   let id;
-  let searchResult;
+  let item;
 
   function init() {
     id = '780b2588-bda5-4112-a1cd-0b15000a5339';
-    searchResult = new ItemSearchResult();
-    searchResult.indexableObject = new Collection();
-    searchResult.indexableObject.uuid = id;
+    item = new Item();
+    item.uuid = id;
   }
   beforeEach(async(() => {
     init();
@@ -33,20 +35,16 @@ describe('ItemAdminSearchResultListElementComponent', () => {
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([])
       ],
-      declarations: [ItemAdminSearchResultListElementComponent],
-      providers: [{ provide: TruncatableService, useValue: {} }],
+      declarations: [ItemAdminSearchResultActionsComponent],
       schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ItemAdminSearchResultListElementComponent);
+    fixture = TestBed.createComponent(ItemAdminSearchResultActionsComponent);
     component = fixture.componentInstance;
-    component.object = searchResult;
-    component.linkTypes = CollectionElementLinkType;
-    component.index = 0;
-    component.viewModes = ViewMode;
+    component.item = item;
     fixture.detectChanges();
   });
 
@@ -74,15 +72,10 @@ describe('ItemAdminSearchResultListElementComponent', () => {
 
   describe('when the item is not withdrawn', () => {
     beforeEach(() => {
-        component.dso.isWithdrawn = false;
+        component.item.isWithdrawn = false;
         fixture.detectChanges();
     });
 
-    it('should not show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).toBeNull();
-    });
-
     it('should render a withdraw button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.withdraw-link'));
       const link = a.nativeElement.href;
@@ -97,24 +90,55 @@ describe('ItemAdminSearchResultListElementComponent', () => {
 
   describe('when the item is withdrawn', () => {
     beforeEach(() => {
-      component.dso.isWithdrawn = true;
+      component.item.isWithdrawn = true;
       fixture.detectChanges();
     });
 
-    it('should show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).not.toBeNull();
-    });
-
-    it('should render a withdraw button with the correct link', () => {
+    it('should not render a withdraw button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.withdraw-link'));
       expect(a).toBeNull();
     });
 
-    it('should not render a reinstate button with the correct link', () => {
+    it('should render a reinstate button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.reinstate-link'));
       const link = a.nativeElement.href;
       expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_REINSTATE_PATH).toString());
     });
+  });
+
+  describe('when the item is not private', () => {
+    beforeEach(() => {
+      component.item.isDiscoverable = true;
+      fixture.detectChanges();
+    });
+
+    it('should render a make private button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.private-link'));
+      const link = a.nativeElement.href;
+      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_PRIVATE_PATH).toString());
+    });
+
+    it('should not render a make public button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.public-link'));
+      expect(a).toBeNull();
+    });
+  });
+
+  describe('when the item is private', () => {
+    beforeEach(() => {
+      component.item.isDiscoverable = false;
+      fixture.detectChanges();
+    });
+
+    it('should not render a make private button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.private-link'));
+      expect(a).toBeNull();
+    });
+
+    it('should render a make private button with the correct link', () => {
+      const a = fixture.debugElement.query(By.css('a.public-link'));
+      const link = a.nativeElement.href;
+      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_PUBLIC_PATH).toString());
+    });
   })
 });
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
similarity index 52%
rename from src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
rename to src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index 3eb84e08ad..e8ce31bcf6 100644
--- a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,36 +1,32 @@
-import { Component } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import { Component, Input } from '@angular/core';
+import { Item } from '../../../core/shared/item.model';
+import { getItemEditPath } from '../../../+item-page/item-page-routing.module';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
 import {
   ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
-  ITEM_EDIT_PRIVATE_PATH, ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH
-} from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
+} from '../../../+item-page/edit-item-page/edit-item-page.routing.module';
 
-@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
-  selector: 'ds-item-admin-search-result-list-element',
-  styleUrls: ['./item-admin-search-result-list-element.component.scss'],
-  templateUrl: './item-admin-search-result-list-element.component.html'
+  selector: 'ds-item-admin-search-result-actions-element',
+  styleUrls: ['./item-admin-search-result-actions.component.scss'],
+  templateUrl: './item-admin-search-result-actions.component.html'
 })
 /**
  * The component for displaying a list element for an item search result on the admin search page
  */
-export class ItemAdminSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
-
+export class ItemAdminSearchResultActionsComponent {
+  @Input() public item: Item;
+  @Input() public small: boolean;
   /**
    * Returns the path to the edit page of this item
    */
   getEditPath(): string {
-    return getItemEditPath(this.dso.uuid)
+    return getItemEditPath(this.item.uuid)
   }
 
   /**
diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts
index b3617cdf4d..90fe03cba0 100644
--- a/src/app/+admin/admin.module.ts
+++ b/src/app/+admin/admin.module.ts
@@ -4,6 +4,13 @@ import { AdminRoutingModule } from './admin-routing.module';
 import { SharedModule } from '../shared/shared.module';
 import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
 import { SearchPageModule } from '../+search-page/search-page.module';
+import { ItemAdminSearchResultListElementComponent } from './admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
+import { CommunityAdminSearchResultListElementComponent } from './admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
+import { CollectionAdminSearchResultListElementComponent } from './admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
+import { ItemAdminSearchResultGridElementComponent } from './admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
+import { CommunityAdminSearchResultGridElementComponent } from './admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
+import { CollectionAdminSearchResultGridElementComponent } from './admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
+import { ItemAdminSearchResultActionsComponent } from './admin-search-page/admin-search-results/item-admin-search-result-actions.component';
 
 @NgModule({
   imports: [
@@ -12,7 +19,25 @@ import { SearchPageModule } from '../+search-page/search-page.module';
     SharedModule,
     SearchPageModule
   ],
-  declarations: [AdminSearchPageComponent],
+  declarations: [
+    AdminSearchPageComponent,
+    ItemAdminSearchResultListElementComponent,
+    CommunityAdminSearchResultListElementComponent,
+    CollectionAdminSearchResultListElementComponent,
+    ItemAdminSearchResultGridElementComponent,
+    CommunityAdminSearchResultGridElementComponent,
+    CollectionAdminSearchResultGridElementComponent,
+    ItemAdminSearchResultActionsComponent
+  ],
+  entryComponents: [
+    ItemAdminSearchResultListElementComponent,
+    CommunityAdminSearchResultListElementComponent,
+    CollectionAdminSearchResultListElementComponent,
+    ItemAdminSearchResultGridElementComponent,
+    CommunityAdminSearchResultGridElementComponent,
+    CollectionAdminSearchResultGridElementComponent,
+    ItemAdminSearchResultActionsComponent
+  ]
 })
 export class AdminModule {
 
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
deleted file mode 100644
index 1394d49154..0000000000
--- a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<ng-template dsListableObject>
-</ng-template>
-<div #badges class="position-absolute ml-1">
-    <div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
-        <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
-    </div>
-    <div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
-        <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
-    </div>
-</div>
-<ul #buttons class="list-group list-group-flush">
-  <li class="list-group-item d-flex justify-content-between">
-    <a class="btn btn-light btn-sm my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
-      <i class="fa fa-edit"></i>
-    </a>
-
-    <a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light btn-sm my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
-      <i class="fa fa-ban"></i>
-    </a>
-
-    <a *ngIf="dso && dso.isWithdrawn" class="btn btn-light btn-sm my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
-      <i class="fa fa-undo"></i>
-    </a>
-
-    <a *ngIf="dso && dso.isDiscoverable" class="btn btn-light btn-sm my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
-      <i class="fa fa-eye-slash"></i>
-    </a>
-
-    <a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light btn-sm my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
-      <i class="fa fa-eye"></i>
-    </a>
-
-    <a class="btn btn-light btn-sm my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
-      <i class="fa fa-trash"></i>
-    </a>
-
-    <a class="btn btn-light btn-sm my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
-      <i class="fa fa-arrow-circle-right"></i>
-    </a>
-  </li>
-</ul>
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
deleted file mode 100644
index 92110c4735..0000000000
--- a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { Item } from '../../../../core/shared/item.model';
-import { mockTruncatableService } from '../../../mocks/mock-trucatable.service';
-import { SharedModule } from '../../../shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../../testing/utils';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { By } from '@angular/platform-browser';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
-import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
-import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, ITEM_EDIT_REINSTATE_PATH, ITEM_EDIT_WITHDRAW_PATH } from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
-
-describe('ItemAdminSearchResultListElementComponent', () => {
-  let component: ItemAdminSearchResultGridElementComponent;
-  let fixture: ComponentFixture<ItemAdminSearchResultGridElementComponent>;
-  let id;
-  let searchResult;
-
-  const mockBitstreamDataService = {
-    getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
-      return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
-  };
-
-  function init() {
-    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
-    searchResult = new ItemSearchResult();
-    searchResult.indexableObject = new Collection();
-    searchResult.indexableObject.uuid = id;
-  }
-  beforeEach(async(() => {
-    init();
-    TestBed.configureTestingModule({
-      imports: [
-        NoopAnimationsModule,
-        TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([]),
-        SharedModule
-      ],
-      providers: [
-        { provide: TruncatableService, useValue: mockTruncatableService },
-        { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemAdminSearchResultGridElementComponent);
-    component = fixture.componentInstance;
-    component.object = searchResult;
-    component.linkTypes = CollectionElementLinkType;
-    component.index = 0;
-    component.viewModes = ViewMode;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should render an edit button with the correct link', () => {
-    const button = fixture.debugElement.query(By.css('a.edit-link'));
-    const link = button.nativeElement.href;
-    expect(link).toContain(getItemEditPath(id));
-  });
-
-  it('should render a delete button with the correct link', () => {
-    const button = fixture.debugElement.query(By.css('a.delete-link'));
-    const link = button.nativeElement.href;
-    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_DELETE_PATH).toString());
-  });
-
-  it('should render a move button with the correct link', () => {
-    const a = fixture.debugElement.query(By.css('a.move-link'));
-    const link = a.nativeElement.href;
-    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_MOVE_PATH).toString());
-  });
-
-  describe('when the item is not withdrawn', () => {
-    beforeEach(() => {
-        component.dso.isWithdrawn = false;
-        fixture.detectChanges();
-    });
-
-    it('should not show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).toBeNull();
-    });
-
-    it('should render a withdraw button with the correct link', () => {
-      const a = fixture.debugElement.query(By.css('a.withdraw-link'));
-      const link = a.nativeElement.href;
-      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_WITHDRAW_PATH).toString());
-    });
-
-    it('should not render a reinstate button with the correct link', () => {
-      const a = fixture.debugElement.query(By.css('a.reinstate-link'));
-      expect(a).toBeNull();
-    });
-  });
-
-  describe('when the item is withdrawn', () => {
-    beforeEach(() => {
-      component.dso.isWithdrawn = true;
-      fixture.detectChanges();
-    });
-
-    it('should show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).not.toBeNull();
-    });
-
-    it('should render a withdraw button with the correct link', () => {
-      const a = fixture.debugElement.query(By.css('a.withdraw-link'));
-      expect(a).toBeNull();
-    });
-
-    it('should not render a reinstate button with the correct link', () => {
-      const a = fixture.debugElement.query(By.css('a.reinstate-link'));
-      const link = a.nativeElement.href;
-      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_REINSTATE_PATH).toString());
-    });
-  })
-});
diff --git a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
deleted file mode 100644
index 8ac4f3904c..0000000000
--- a/src/app/shared/object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { getListableObjectComponent, listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
-import {
-  ITEM_EDIT_DELETE_PATH,
-  ITEM_EDIT_MOVE_PATH,
-  ITEM_EDIT_PRIVATE_PATH,
-  ITEM_EDIT_PUBLIC_PATH,
-  ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
-} from '../../../../+item-page/edit-item-page/edit-item-page.routing.module';
-import { SearchResultGridElementComponent } from '../../search-result-grid-element/search-result-grid-element.component';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from '../../../object-collection/shared/listable-object/listable-object.directive';
-
-@listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminSearch)
-@Component({
-  selector: 'ds-item-admin-search-result-grid-element',
-  styleUrls: ['./item-admin-search-result-grid-element.component.scss'],
-  templateUrl: './item-admin-search-result-grid-element.component.html'
-})
-/**
- * The component for displaying a list element for an item search result on the admin search page
- */
-export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
-  @ViewChild(ListableObjectDirective, {static: true}) listableObjectDirective: ListableObjectDirective;
-  @ViewChild('badges', {static: true}) badges: ElementRef;
-  @ViewChild('buttons', {static: true}) buttons: ElementRef;
-
-  constructor(protected truncatableService: TruncatableService,
-              protected bitstreamDataService: BitstreamDataService,
-              private componentFactoryResolver: ComponentFactoryResolver,
-              private viewContainerRef: ViewContainerRef) {
-      super(truncatableService, bitstreamDataService);
-  }
-
-  /**
-   * Setup the dynamic child component
-   */
-  ngOnInit(): void {
-    super.ngOnInit();
-    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
-
-    const viewContainerRef = this.listableObjectDirective.viewContainerRef;
-    viewContainerRef.clear();
-
-    const componentRef = viewContainerRef.createComponent(
-      componentFactory,
-      0,
-      undefined,
-      [
-        [this.badges.nativeElement],
-        [this.buttons.nativeElement]
-      ]);
-    (componentRef.instance as any).object = this.object;
-    (componentRef.instance as any).index = this.index;
-    (componentRef.instance as any).linkType = this.linkType;
-    (componentRef.instance as any).listID = this.listID;
-  }
-
-  /**
-   * Fetch the component depending on the item's relationship type, view mode and context
-   * @returns {GenericConstructor<Component>}
-   */
-  private getComponent(): GenericConstructor<Component> {
-    return getListableObjectComponent(this.object.getRenderTypes(), ViewMode.GridElement, undefined)
-  }
-
-  /**
-   * Returns the path to the edit page of this item
-   */
-  getEditPath(): string {
-    return getItemEditPath(this.dso.uuid)
-  }
-
-  /**
-   * Returns the path to the move page of this item
-   */
-  getMovePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_MOVE_PATH).toString();
-  }
-
-  /**
-   * Returns the path to the delete page of this item
-   */
-  getDeletePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_DELETE_PATH).toString();
-  }
-
-  /**
-   * Returns the path to the withdraw page of this item
-   */
-  getWithdrawPath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_WITHDRAW_PATH).toString();
-  }
-
-  /**
-   * Returns the path to the reinstate page of this item
-   */
-  getReinstatePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_REINSTATE_PATH).toString();
-  }
-
-  /**
-   * Returns the path to the page where the user can make this item private
-   */
-  getPrivatePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PRIVATE_PATH).toString();
-  }
-
-  /**
-   * Returns the path to the page where the user can make this item public
-   */
-  getPublicPath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PUBLIC_PATH).toString();
-  }
-}
diff --git a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
deleted file mode 100644
index 6c9d422a06..0000000000
--- a/src/app/shared/object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
-    <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
-</div>
-<div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
-    <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
-</div>
-<ds-listable-object-component-loader [object]="object"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
-
-<a class="btn btn-light my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
-    <i class="fa fa-edit"></i><span class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
-</a>
-
-<a *ngIf="dso && !dso.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
-    <i class="fa fa-ban"></i><span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
-</a>
-
-<a *ngIf="dso && dso.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
-    <i class="fa fa-undo"></i><span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
-</a>
-
-<a *ngIf="dso && dso.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
-    <i class="fa fa-eye-slash"></i><span class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
-</a>
-
-<a *ngIf="dso && !dso.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
-    <i class="fa fa-eye"></i><span class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
-</a>
-
-<a class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
-    <i class="fa fa-trash"></i><span class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
-</a>
-
-<a class="btn btn-light my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
-    <i class="fa fa-arrow-circle-right"></i><span class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
-</a>
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 84738559ee..c229b6c429 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -177,13 +177,7 @@ import { ImportableListItemControlComponent } from './object-collection/shared/i
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ExistingMetadataListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import { SortablejsModule } from 'ngx-sortablejs';
-import { ItemAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
-import { CommunityAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
-import { CollectionAdminSearchResultListElementComponent } from './object-list/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
-import { ItemAdminSearchResultGridElementComponent } from './object-grid/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
-import { CommunityAdminSearchResultGridElementComponent } from './object-grid/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
-import { CollectionAdminSearchResultGridElementComponent } from './object-grid/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -351,12 +345,6 @@ const COMPONENTS = [
   ImportableListItemControlComponent,
   ExistingMetadataListElementComponent,
   PublicationSearchResultListElementComponent,
-  ItemAdminSearchResultListElementComponent,
-  CommunityAdminSearchResultListElementComponent,
-  CollectionAdminSearchResultListElementComponent,
-  ItemAdminSearchResultGridElementComponent,
-  CommunityAdminSearchResultGridElementComponent,
-  CollectionAdminSearchResultGridElementComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -420,12 +408,6 @@ const ENTRY_COMPONENTS = [
   DsDynamicLookupRelationSelectionTabComponent,
   DsDynamicLookupRelationExternalSourceTabComponent,
   ExternalSourceEntryImportModalComponent,
-  ItemAdminSearchResultListElementComponent,
-  CommunityAdminSearchResultListElementComponent,
-  CollectionAdminSearchResultListElementComponent,
-  ItemAdminSearchResultGridElementComponent,
-  CommunityAdminSearchResultGridElementComponent,
-  CollectionAdminSearchResultGridElementComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [

From 48b80c6a385269b63e8c4bf78ad6567f9bfec353 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Fri, 13 Mar 2020 16:22:36 +0100
Subject: [PATCH 08/13] renamed discoverableAndUndiscoverableItems to
 administrativeView

---
 resources/i18n/en.json5                                         | 2 +-
 .../+admin/admin-search-page/admin-search-page.component.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index df3f4dc8ca..d3ce471e05 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -2038,7 +2038,7 @@
   "title": "DSpace",
 
 
-  "discoverableAndUndiscoverableItems.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Administrative Search",
 
 
   "uploader.browse": "browse",
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.html b/src/app/+admin/admin-search-page/admin-search-page.component.html
index 8049b059c5..69ff132fe3 100644
--- a/src/app/+admin/admin-search-page/admin-search-page.component.html
+++ b/src/app/+admin/admin-search-page/admin-search-page.component.html
@@ -1 +1 @@
-<ds-configuration-search-page configuration="discoverableAndUndiscoverableItems" [context]="context"></ds-configuration-search-page>
+<ds-configuration-search-page configuration="administrativeView" [context]="context"></ds-configuration-search-page>

From 930624fd19d72d43ee11ca3126779ba294ac8713 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 16 Mar 2020 08:17:16 +0100
Subject: [PATCH 09/13] added missing typedoc

---
 .../item-admin-search-result-actions.component.ts      | 10 +++++++++-
 src/app/shared/translate/missing-translation.helper.ts |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index e8ce31bcf6..40cddc816d 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -17,11 +17,19 @@ import {
   templateUrl: './item-admin-search-result-actions.component.html'
 })
 /**
- * The component for displaying a list element for an item search result on the admin search page
+ * The component for displaying the actions for a list element for an item search result on the admin search page
  */
 export class ItemAdminSearchResultActionsComponent {
+  /**
+   * The item to perform the actions on
+   */
   @Input() public item: Item;
+
+  /**
+   * Whether or not to use small buttons
+   */
   @Input() public small: boolean;
+
   /**
    * Returns the path to the edit page of this item
    */
diff --git a/src/app/shared/translate/missing-translation.helper.ts b/src/app/shared/translate/missing-translation.helper.ts
index f071652cef..71a1dc3620 100644
--- a/src/app/shared/translate/missing-translation.helper.ts
+++ b/src/app/shared/translate/missing-translation.helper.ts
@@ -1,6 +1,14 @@
 import { MissingTranslationHandler, MissingTranslationHandlerParams } from '@ngx-translate/core';
 
+/**
+ * Class to handle missing translations for the ngx-translate library
+ */
 export class MissingTranslationHelper implements MissingTranslationHandler {
+  /**
+   * Called when there is not translation for a specific key
+   * Will return the 'default' parameter of the translate pipe, if there is one available
+   * @param params
+   */
   handle(params: MissingTranslationHandlerParams) {
     if (params.interpolateParams) {
       return (params.interpolateParams as any).default || params.key;

From 232b20689aeda33131568a8cc248f19bf082a4c6 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 16 Mar 2020 16:16:29 +0100
Subject: [PATCH 10/13] remove discover requests from cache after changing
 state of items

---
 src/app/core/data/item-data.service.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index b9fb36e6d8..962aed6554 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -180,6 +180,8 @@ export class ItemDataService extends DataService<Item> {
     const patchOperation = [{
       op: 'replace', path: '/withdrawn', value: withdrawn
     }];
+    this.requestService.removeByHrefSubstring('/discover');
+
     return this.getItemWithdrawEndpoint(itemId).pipe(
       distinctUntilChanged(),
       map((endpointURL: string) =>
@@ -201,6 +203,8 @@ export class ItemDataService extends DataService<Item> {
     const patchOperation = [{
       op: 'replace', path: '/discoverable', value: discoverable
     }];
+    this.requestService.removeByHrefSubstring('/discover');
+
     return this.getItemDiscoverableEndpoint(itemId).pipe(
       distinctUntilChanged(),
       map((endpointURL: string) =>

From 9d3da6fdef5585be1df62ba3b8e037418903b1f9 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Mon, 16 Mar 2020 18:27:28 +0100
Subject: [PATCH 11/13] fix issue where there was no redirect to the item
 status page after a withdraw/reinstate/make private/public

---
 src/app/core/data/item-data.service.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 962aed6554..a23eb27f4a 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -20,7 +20,7 @@ import { ITEM } from '../shared/item.resource-type';
 import {
   configureRequest,
   filterSuccessfulResponses,
-  getRequestFromRequestHref,
+  getRequestFromRequestHref, getRequestFromRequestUUID,
   getResponseFromEntry
 } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
@@ -188,8 +188,9 @@ export class ItemDataService extends DataService<Item> {
         new PatchRequest(this.requestService.generateRequestId(), endpointURL, patchOperation)
       ),
       configureRequest(this.requestService),
-      map((request: RestRequest) => request.href),
-      getRequestFromRequestHref(this.requestService),
+      map((request: RestRequest) => request.uuid),
+      getRequestFromRequestUUID(this.requestService),
+      filter((requestEntry: RequestEntry) => requestEntry.completed),
       map((requestEntry: RequestEntry) => requestEntry.response)
     );
   }
@@ -211,8 +212,9 @@ export class ItemDataService extends DataService<Item> {
         new PatchRequest(this.requestService.generateRequestId(), endpointURL, patchOperation)
       ),
       configureRequest(this.requestService),
-      map((request: RestRequest) => request.href),
-      getRequestFromRequestHref(this.requestService),
+      map((request: RestRequest) => request.uuid),
+      getRequestFromRequestUUID(this.requestService),
+      filter((requestEntry: RequestEntry) => requestEntry.completed),
       map((requestEntry: RequestEntry) => requestEntry.response)
     );
   }

From 92c5804af52592b62a15bbfc4e8f7e1f8bb2ad0b Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 17 Mar 2020 09:01:03 +0100
Subject: [PATCH 12/13] force resolvers to rerun on sub-path change

---
 src/app/+item-page/item-page-routing.module.ts | 1 +
 src/app/app-routing.module.ts                  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts
index 686c5ff2fc..5caf0e3036 100644
--- a/src/app/+item-page/item-page-routing.module.ts
+++ b/src/app/+item-page/item-page-routing.module.ts
@@ -30,6 +30,7 @@ const ITEM_EDIT_PATH = 'edit';
           item: ItemPageResolver,
           breadcrumb: ItemBreadcrumbResolver
         },
+        runGuardsAndResolvers: 'always',
         children: [
           {
             path: '',
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 854a86b798..ddd3cb606d 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -67,7 +67,10 @@ export function getDSOPath(dso: DSpaceObject): string {
       { path: 'workspaceitems', loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule' },
       { path: 'workflowitems', loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowItemsEditPageModule' },
       { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
-    ])
+    ],
+    {
+      onSameUrlNavigation: 'reload',
+    })
   ],
   exports: [RouterModule],
 })

From 7390999010bbc5c0eb12f4ccae714461c5098891 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 17 Mar 2020 09:08:14 +0100
Subject: [PATCH 13/13] force resolvers to rerun for community and collection
 sub-path changes too

---
 src/app/+collection-page/collection-page-routing.module.ts | 1 +
 src/app/+community-page/community-page-routing.module.ts   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts
index 61cfda0d9e..b51c74b457 100644
--- a/src/app/+collection-page/collection-page-routing.module.ts
+++ b/src/app/+collection-page/collection-page-routing.module.ts
@@ -40,6 +40,7 @@ const COLLECTION_EDIT_PATH = 'edit';
           dso: CollectionPageResolver,
           breadcrumb: CollectionBreadcrumbResolver
         },
+        runGuardsAndResolvers: 'always',
         children: [
           {
             path: COLLECTION_EDIT_PATH,
diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/+community-page/community-page-routing.module.ts
index 976a4ad0fe..0e2407577c 100644
--- a/src/app/+community-page/community-page-routing.module.ts
+++ b/src/app/+community-page/community-page-routing.module.ts
@@ -39,6 +39,7 @@ const COMMUNITY_EDIT_PATH = 'edit';
           dso: CommunityPageResolver,
           breadcrumb: CommunityBreadcrumbResolver
         },
+        runGuardsAndResolvers: 'always',
         children: [
           {
             path: COMMUNITY_EDIT_PATH,