From 03702dc0dcdf76f893c557e1b32527a4bb379bb1 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 24 Jan 2019 11:14:17 +0100
Subject: [PATCH] 58789: Empty page error fix and navigate to last page on
 delete

---
 .../metadata-registry/metadata-registry.component.ts        | 1 -
 .../metadata-schema/metadata-schema.component.ts            | 1 -
 .../registry-metadataschemas-response-parsing.service.ts    | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index cf4e787dec..89db4970b6 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -143,7 +143,6 @@ export class MetadataRegistryComponent {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataSchema();
-          this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
           this.forceUpdateSchemas();
         });
       }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 295556374b..f577832a63 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -175,7 +175,6 @@ export class MetadataSchemaComponent implements OnInit {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataField();
-          this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
           this.forceUpdateFields();
         });
       }
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
index a1e9ac60ff..05a61f6b4f 100644
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
+++ b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
@@ -6,6 +6,7 @@ import { RegistryMetadataschemasResponse } from '../registry/registry-metadatasc
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { DSOResponseParsingService } from './dso-response-parsing.service';
 import { Injectable } from '@angular/core';
+import { hasValue } from '../../shared/empty.util';
 
 @Injectable()
 export class RegistryMetadataschemasResponseParsingService implements ResponseParsingService {
@@ -15,7 +16,10 @@ export class RegistryMetadataschemasResponseParsingService implements ResponsePa
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     const payload = data.payload;
 
-    const metadataschemas = payload._embedded.metadataschemas;
+    let metadataschemas = [];
+    if (hasValue(payload._embedded)) {
+      metadataschemas = payload._embedded.metadataschemas;
+    }
     payload.metadataschemas = metadataschemas;
 
     const deserialized = new DSpaceRESTv2Serializer(RegistryMetadataschemasResponse).deserialize(payload);