From b4d7311a1cf65e13a67cdf08ac42314b2821a13e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 29 Jul 2019 13:33:44 +0200
Subject: [PATCH] 63945: Loading bitstreams section

---
 resources/i18n/en.json                                    | 3 ++-
 .../item-bitstreams/item-bitstreams.component.html        | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index b4960f395e..eddfadb5b9 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -870,7 +870,8 @@
     "search-results": "Loading search results...",
     "mydspace-results": "Loading items...",
     "browse-by": "Loading items...",
-    "browse-by-page": "Loading page..."
+    "browse-by-page": "Loading page...",
+    "bitstreams": "Loading bitstreams..."
   },
   "error": {
     "default": "Error",
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 91f7a0b1f7..9c4248475b 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -23,7 +23,8 @@
     </button>
   </div>
 
-  <ds-pagination *ngIf="(updates$ | async) && ((updates$ | async) | dsObjectValues).length > 0"
+  <ds-pagination *ngIf="(bitstreams$ | async) && !(bitstreams$ | async)?.isLoading &&
+                        (updates$ | async) && ((updates$ | async) | dsObjectValues).length > 0"
                  [paginationOptions]="(searchOptions$ | async)?.pagination"
                  [pageInfoState]="(bitstreams$ | async)?.payload"
                  [collectionSize]="(bitstreams$ | async)?.payload?.totalElements"
@@ -54,9 +55,12 @@
       </tbody>
     </table>
   </ds-pagination>
-  <div *ngIf="!(updates$ | async) || (updates$ | async) && ((updates$ | async) | dsObjectValues).length === 0" class="alert alert-info w-100 d-inline-block" role="alert">
+  <div *ngIf="(bitstreams$ | async) && !(bitstreams$ | async)?.isLoading &&
+              !(updates$ | async) || (updates$ | async) && ((updates$ | async) | dsObjectValues).length === 0"
+       class="alert alert-info w-100 d-inline-block mt-4" role="alert">
     {{'item.edit.bitstreams.empty' | translate}}
   </div>
+  <ds-loading *ngIf="!(bitstreams$ | async) || (bitstreams$ | async)?.isLoading" message="{{'loading.bitstreams' | translate}}"></ds-loading>
 
   <div class="button-row bottom">
     <div class="my-2 float-right">