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

fix an issue where the results of a dso-selector wouldn't update until you clicked anywhere on the page

Browse Source
This commit is contained in:
Art Lowel
2021-06-23 17:28:36 +02:00
parent 2599068ccd
commit 04f4a25870
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/dso-selector/dso-selector/dso-selector.component.html
View File

@@ -14,12 +14,12 @@
[infiniteScrollContainer]="'.scrollable-menu'"
[fromRoot]="true"
(scrolled)="onScrollDown()">
<ng-container *ngIf="listEntries">
<ng-container *ngIf="listEntries$ | async">
<button class="list-group-item list-group-item-action border-0 disabled"
*ngIf="listEntries.length == 0">
*ngIf="(listEntries$ | async).length == 0">
{{'dso-selector.no-results' | translate: { type: typesString } }}
</button>
<button *ngFor="let listEntry of listEntries"
<button *ngFor="let listEntry of (listEntries$ | async)"
class="list-group-item list-group-item-action border-0 list-entry"
[ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}"
title="{{ listEntry.indexableObject.name }}"

15
src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
View File

@@ -81,7 +81,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
/**
* List with search results of DSpace objects for the current query
*/
listEntries: SearchResult<DSpaceObject>[] = null;
listEntries$: BehaviorSubject<SearchResult<DSpaceObject>[]> = new BehaviorSubject(null);
/**
* The current page to load
@@ -160,7 +160,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
this.loading = true;
if (page === 1) {
// The first page is loading, this means we should reset the list instead of adding to it
this.listEntries = null;
this.listEntries$.next(null);
}
return this.search(query, page).pipe(
map((rd) => {
@@ -181,15 +181,16 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
).subscribe((rd) => {
this.loading = false;
if (rd.hasSucceeded) {
if (hasNoValue(this.listEntries)) {
this.listEntries = rd.payload.page;
const currentEntries = this.listEntries$.getValue();
if (hasNoValue(currentEntries)) {
this.listEntries$.next(rd.payload.page);
} else {
this.listEntries.push(...rd.payload.page);
this.listEntries$.next([...currentEntries, ...rd.payload.page]);
}
// Check if there are more pages available after the current one
this.hasNextPage = rd.payload.totalElements > this.listEntries.length;
this.hasNextPage = rd.payload.totalElements > this.listEntries$.getValue().length;
} else {
this.listEntries = null;
this.listEntries$.next(null);
this.hasNextPage = false;
}
}));