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

78849: Fix cache/re-request issue & other improvements

Browse Source
This commit is contained in:
Yura Bondarenko
2021-04-23 13:28:41 +02:00
parent a86f9444ce
commit 1aa659e6b7
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/core/data/eperson-registration.service.ts
View File

@@ -3,7 +3,7 @@ import { RequestService } from './request.service';
import { HALEndpointService } from '../shared/hal-endpoint.service'; import { HALEndpointService } from '../shared/hal-endpoint.service';
import { GetRequest, PostRequest } from './request.models'; import { GetRequest, PostRequest } from './request.models';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { filter, find, map, take } from 'rxjs/operators'; import { filter, find, map, skipWhile, take } from 'rxjs/operators';
import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { Registration } from '../shared/registration.model'; import { Registration } from '../shared/registration.model';
import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../shared/operators'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../shared/operators';
@@ -60,9 +60,9 @@ export class EpersonRegistrationService {
const requestId = this.requestService.generateRequestId(); const requestId = this.requestService.generateRequestId();
const hrefObs = this.getRegistrationEndpoint(); const href$ = this.getRegistrationEndpoint();
hrefObs.pipe( href$.pipe(
find((href: string) => hasValue(href)), find((href: string) => hasValue(href)),
map((href: string) => { map((href: string) => {
const request = new PostRequest(requestId, href, registration); const request = new PostRequest(requestId, href, registration);
@@ -82,27 +82,28 @@ export class EpersonRegistrationService {
searchByToken(token: string): Observable<Registration> { searchByToken(token: string): Observable<Registration> {
const requestId = this.requestService.generateRequestId(); const requestId = this.requestService.generateRequestId();
const hrefObs = this.getTokenSearchEndpoint(token); const href$ = this.getTokenSearchEndpoint(token).pipe(
hrefObs.pipe(
find((href: string) => hasValue(href)), find((href: string) => hasValue(href)),
map((href: string) => { )
const request = new GetRequest(requestId, href);
Object.assign(request, {
getResponseParser(): GenericConstructor<ResponseParsingService> {
return RegistrationResponseParsingService;
}
});
this.requestService.send(request, true);
})
).subscribe();
return this.rdbService.buildFromRequestUUID<Registration>(requestId).pipe( href$.subscribe((href: string) => {
const request = new GetRequest(requestId, href);
Object.assign(request, {
getResponseParser(): GenericConstructor<ResponseParsingService> {
return RegistrationResponseParsingService;
}
});
this.requestService.send(request, true);
});
return this.rdbService.buildSingle<Registration>(href$).pipe(
skipWhile((rd: RemoteData<Registration>) => rd.isStale),
getFirstSucceededRemoteData(), getFirstSucceededRemoteData(),
map((restResponse: RemoteData<Registration>) => { map((restResponse: RemoteData<Registration>) => {
return Object.assign(new Registration(), {email: restResponse.payload.email, token: token, user: restResponse.payload.user}); return Object.assign(new Registration(), {
email: restResponse.payload.email, token: token, user: restResponse.payload.user
});
}), }),
take(1),
); );
} }