hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 22:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

59415: Browse-Entries empty response handling and doc fix

Browse Source
This commit is contained in:
Kristof De Langhe
2019-01-29 17:44:28 +01:00
parent 64f301d1dd
commit fde2e1cc6e
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/i18n/en.json
View File

@@ -293,7 +293,8 @@
"author": "By Author", "author": "By Author",
"subject": "By Subject" "subject": "By Subject"
} }
} },
"empty": "No items to show."
}, },
"admin": { "admin": {
"registries": { "registries": {

4
src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
View File

@@ -71,8 +71,8 @@ export class BrowseByMetadataPageComponent implements OnInit {
/** /**
* The value we're browing items for * The value we're browing items for
* - When the value is not empty, we're browing items * - When the value is not empty, we're browsing items
* - When the value is empty, we're browing browse-entries (values for the given metadata definition) * - When the value is empty, we're browsing browse-entries (values for the given metadata definition)
*/ */
value = ''; value = '';

10
src/app/core/data/browse-entries-response-parsing.service.ts
View File

@@ -30,10 +30,12 @@ export class BrowseEntriesResponseParsingService extends BaseResponseParsingServ
} }
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
if (isNotEmpty(data.payload) && isNotEmpty(data.payload._embedded) if (isNotEmpty(data.payload)) {
&& Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) { let browseEntries = [];
const serializer = new DSpaceRESTv2Serializer(BrowseEntry); if (isNotEmpty(data.payload._embedded) && Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) {
const browseEntries = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]); const serializer = new DSpaceRESTv2Serializer(BrowseEntry);
browseEntries = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]);
}
return new GenericSuccessResponse(browseEntries, data.statusCode, this.processPageInfo(data.payload)); return new GenericSuccessResponse(browseEntries, data.statusCode, this.processPageInfo(data.payload));
} else { } else {
return new ErrorResponse( return new ErrorResponse(

5
src/app/shared/browse-by/browse-by.component.html
View File

@@ -7,6 +7,9 @@
[objects]="objects"> [objects]="objects">
</ds-viewable-collection> </ds-viewable-collection>
</div> </div>
<ds-loading *ngIf="!objects || objects?.payload?.page.length <= 0" message="{{'loading.browse-by' | translate}}"></ds-loading> <ds-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-loading>
<ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error> <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
<div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
{{'browse.empty' | translate}}
</div>
</ng-container> </ng-container>