63945: Loading bitstreams section

This commit is contained in:
Kristof De Langhe
2019-07-29 13:33:44 +02:00
parent 55a5b1891e
commit b4d7311a1c
2 changed files with 8 additions and 3 deletions

View File

@@ -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",

View File

@@ -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">