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

Intermediate commit fixing merge

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-12-13 20:28:34 +01:00
parent ff97a4cc8b
commit 7407740e3b
8 changed files with 113 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/+login-page/login-page.component.ts
View File

@@ -1,5 +1,8 @@
import { Component, OnDestroy, OnInit } from '@angular/core'; import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
import { filter, take } from 'rxjs/operators';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '../app.reducer'; import { AppState } from '../app.reducer';
@@ -9,11 +12,8 @@ import {
AuthenticationSuccessAction, AuthenticationSuccessAction,
ResetAuthenticationMessagesAction ResetAuthenticationMessagesAction
} from '../core/auth/auth.actions'; } from '../core/auth/auth.actions';
import { Subscription } from 'rxjs/Subscription';
import { hasValue, isNotEmpty } from '../shared/empty.util'; import { hasValue, isNotEmpty } from '../shared/empty.util';
import { ActivatedRoute } from '@angular/router';
import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
import { Observable } from 'rxjs/Observable';
import { isAuthenticated } from '../core/auth/selectors'; import { isAuthenticated } from '../core/auth/selectors';
@Component({ @Component({
@@ -30,10 +30,10 @@ export class LoginPageComponent implements OnDestroy, OnInit {
ngOnInit() { ngOnInit() {
const queryParamsObs = this.route.queryParams; const queryParamsObs = this.route.queryParams;
const authenticated = this.store.select(isAuthenticated); const authenticated = this.store.select(isAuthenticated);
this.sub = Observable.combineLatest(queryParamsObs, authenticated) this.sub = observableCombineLatest(queryParamsObs, authenticated).pipe(
.filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)) filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)),
.take(1) take(1)
.subscribe(([params, auth]) => { ).subscribe(([params, auth]) => {
const token = params.token; const token = params.token;
let authToken: AuthTokenInfo; let authToken: AuthTokenInfo;
if (!auth) { if (!auth) {

19
src/app/core/data/data.service.ts
View File

@@ -1,6 +1,7 @@
import { distinctUntilChanged, filter, take, first, map } from 'rxjs/operators'; import { distinctUntilChanged, filter, take, first, map, flatMap } from 'rxjs/operators';
import { of as observableOf, Observable } from 'rxjs'; import { of as observableOf, Observable } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { ResponseCacheService } from '../cache/response-cache.service'; import { ResponseCacheService } from '../cache/response-cache.service';
@@ -60,7 +61,7 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
let result: Observable<string>; let result: Observable<string>;
const args = []; const args = [];
result = Observable.of(`${endpoint}/search/${searchByLink}`); result = observableOf(`${endpoint}/search/${searchByLink}`);
if (hasValue(options.searchParams)) { if (hasValue(options.searchParams)) {
options.searchParams.forEach((param: SearchParam) => { options.searchParams.forEach((param: SearchParam) => {
@@ -86,7 +87,7 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
} }
if (isNotEmpty(args)) { if (isNotEmpty(args)) {
return result.map((href: string) => new URLCombiner(href, `?${args.join('&')}`).toString()); return result.pipe(map((href: string) => new URLCombiner(href, `?${args.join('&')}`).toString()));
} else { } else {
return result; return result;
} }
@@ -131,11 +132,13 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
protected searchBy(searchMethod: string, options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<TDomain>>> { protected searchBy(searchMethod: string, options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<TDomain>>> {
const hrefObs = this.halService.getEndpoint(this.linkPath).filter((href: string) => isNotEmpty(href)) const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
.flatMap((endpoint: string) => this.getSearchByHref(endpoint, searchMethod, options)); filter((href: string) => isNotEmpty(href)),
hrefObs flatMap((endpoint: string) => this.getSearchByHref(endpoint, searchMethod, options)));
.filter((href: string) => hasValue(href))
.take(1) hrefObs.pipe(
filter((href: string) => hasValue(href)),
take(1))
.subscribe((href: string) => { .subscribe((href: string) => {
const request = new FindAllRequest(this.requestService.generateRequestId(), href, options); const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
this.requestService.configure(request, true); this.requestService.configure(request, true);

6
src/app/core/data/request.service.ts
View File

@@ -1,14 +1,14 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { remove } from 'lodash'; import { remove } from 'lodash';
import { Observable, merge as observableMerge } from 'rxjs'; import { merge as observableMerge, Observable } from 'rxjs';
import { filter, first, map, mergeMap, partition, take } from 'rxjs/operators'; import { filter, map, mergeMap, take } from 'rxjs/operators';
import { MemoizedSelector, select, Store } from '@ngrx/store'; import { MemoizedSelector, select, Store } from '@ngrx/store';
import { hasValue } from '../../shared/empty.util'; import { hasValue } from '../../shared/empty.util';
import { CacheableObject } from '../cache/object-cache.reducer'; import { CacheableObject } from '../cache/object-cache.reducer';
import { ObjectCacheService } from '../cache/object-cache.service'; import { ObjectCacheService } from '../cache/object-cache.service';
import { DSOSuccessResponse, RestResponse } from '../cache/response-cache.models'; import { DSOSuccessResponse } from '../cache/response-cache.models';
import { ResponseCacheEntry } from '../cache/response-cache.reducer'; import { ResponseCacheEntry } from '../cache/response-cache.reducer';
import { ResponseCacheService } from '../cache/response-cache.service'; import { ResponseCacheService } from '../cache/response-cache.service';
import { coreSelector, CoreState } from '../core.reducers'; import { coreSelector, CoreState } from '../core.reducers';

2
src/app/core/eperson/eperson.service.ts
View File

@@ -1,4 +1,4 @@
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
import { RequestService } from '../data/request.service'; import { RequestService } from '../data/request.service';
import { ResponseCacheService } from '../cache/response-cache.service'; import { ResponseCacheService } from '../cache/response-cache.service';
import { EpersonRequest, FindAllOptions } from '../data/request.models'; import { EpersonRequest, FindAllOptions } from '../data/request.models';

2
src/app/core/eperson/group-eperson.service.ts
View File

@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
import { filter, map, take } from 'rxjs/operators'; import { filter, map, take } from 'rxjs/operators';
import { EpersonService } from './eperson.service'; import { EpersonService } from './eperson.service';

5
src/app/core/integration/integration.service.ts
View File

@@ -2,7 +2,7 @@ import { Observable, of as observableOf, throwError as observableThrowError } fr
import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators'; import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
import { RequestService } from '../data/request.service'; import { RequestService } from '../data/request.service';
import { ResponseCacheService } from '../cache/response-cache.service'; import { ResponseCacheService } from '../cache/response-cache.service';
import { IntegrationSuccessResponse } from '../cache/response-cache.models'; import { IntegrationSuccessResponse, RestResponse } from '../cache/response-cache.models';
import { GetRequest, IntegrationRequest } from '../data/request.models'; import { GetRequest, IntegrationRequest } from '../data/request.models';
import { ResponseCacheEntry } from '../cache/response-cache.reducer'; import { ResponseCacheEntry } from '../cache/response-cache.reducer';
import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { hasValue, isNotEmpty } from '../../shared/empty.util';
@@ -24,9 +24,8 @@ export abstract class IntegrationService {
protected getData(request: GetRequest): Observable<IntegrationData> { protected getData(request: GetRequest): Observable<IntegrationData> {
return this.responseCache.get(request.href).pipe( return this.responseCache.get(request.href).pipe(
map((entry: ResponseCacheEntry) => entry.response), map((entry: ResponseCacheEntry) => entry.response),
mergeMap((response) => { mergeMap((response: IntegrationSuccessResponse) => {
if (response.isSuccessful && isNotEmpty(response)) { if (response.isSuccessful && isNotEmpty(response)) {
const dataResponse = response as IntegrationSuccessResponse;
return observableOf(new IntegrationData( return observableOf(new IntegrationData(
response.pageInfo, response.pageInfo,
(response.dataDefinition) ? response.dataDefinition.page : [] (response.dataDefinition) ? response.dataDefinition.page : []

119
src/app/core/json-patch/json-patch-operations.service.ts
View File

@@ -1,7 +1,15 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, of as observableOf, throwError as observableThrowError, merge as observableMerge } from 'rxjs';
import { distinctUntilChanged, filter, flatMap, map, mergeMap, partition, take, tap } from 'rxjs/operators';
import { hasValue, isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util'; import { hasValue, isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
import { ErrorResponse, PostPatchSuccessResponse, RestResponse } from '../cache/response-cache.models'; import {
ConfigSuccessResponse,
ErrorResponse,
PostPatchSuccessResponse,
RestResponse
} from '../cache/response-cache.models';
import { ResponseCacheEntry } from '../cache/response-cache.reducer'; import { ResponseCacheEntry } from '../cache/response-cache.reducer';
import { ResponseCacheService } from '../cache/response-cache.service'; import { ResponseCacheService } from '../cache/response-cache.service';
import { PatchRequest, RestRequest, SubmissionPatchRequest } from '../data/request.models'; import { PatchRequest, RestRequest, SubmissionPatchRequest } from '../data/request.models';
@@ -29,27 +37,27 @@ export class JsonPatchOperationsService<ResponseDefinitionDomain> {
} }
protected submitData(request: RestRequest): Observable<ResponseDefinitionDomain> { protected submitData(request: RestRequest): Observable<ResponseDefinitionDomain> {
const [successResponse, errorResponse] = this.responseCache.get(request.href) const responses = this.responseCache.get(request.href).pipe(map((entry: ResponseCacheEntry) => entry.response));
.map((entry: ResponseCacheEntry) => entry.response) const errorResponses = responses.pipe(
.partition((response: RestResponse) => response.isSuccessful); filter((response) => !response.isSuccessful),
return Observable.merge( mergeMap(() => observableThrowError(new Error(`Couldn't send data to server`)))
errorResponse.flatMap((response: ErrorResponse) => );
Observable.throw(new Error(`Couldn't send data to server`))), const successResponses = responses.pipe(
successResponse filter((response: PostPatchSuccessResponse) => isNotEmpty(response)),
.filter((response: PostPatchSuccessResponse) => isNotEmpty(response)) map((response: PostPatchSuccessResponse) => response.dataDefinition)
.map((response: PostPatchSuccessResponse) => response.dataDefinition) );
.distinctUntilChanged()); return observableMerge(errorResponses, successResponses);
} }
protected submitJsonPatchOperations(hrefObs: Observable<string>, resourceType: string, resourceId?: string) { protected submitJsonPatchOperations(hrefObs: Observable<string>, resourceType: string, resourceId?: string) {
let startTransactionTime = null; let startTransactionTime = null;
const [patchRequestObs, emptyRequestObs] = hrefObs const [patchRequest$, emptyRequest$] = partition((request: PatchRequest) => isNotEmpty(request.body))(hrefObs.pipe(
.flatMap((endpointURL: string) => { flatMap((endpointURL: string) => {
return this.store.select(jsonPatchOperationsByResourceType(resourceType)) return this.store.select(jsonPatchOperationsByResourceType(resourceType)).pipe(
.take(1) take(1),
.filter((operationsList: JsonPatchOperationsResourceEntry) => isUndefined(operationsList) || !(operationsList.commitPending)) filter((operationsList: JsonPatchOperationsResourceEntry) => isUndefined(operationsList) || !(operationsList.commitPending)),
.do(() => startTransactionTime = new Date().getTime()) tap(() => startTransactionTime = new Date().getTime()),
.map((operationsList: JsonPatchOperationsResourceEntry) => { map((operationsList: JsonPatchOperationsResourceEntry) => {
const body: JsonPatchOperationModel[] = []; const body: JsonPatchOperationModel[] = [];
if (isNotEmpty(operationsList)) { if (isNotEmpty(operationsList)) {
if (isNotEmpty(resourceId)) { if (isNotEmpty(resourceId)) {
@@ -71,35 +79,34 @@ export class JsonPatchOperationsService<ResponseDefinitionDomain> {
} }
} }
return new SubmissionPatchRequest(this.requestService.generateRequestId(), endpointURL, body); return new SubmissionPatchRequest(this.requestService.generateRequestId(), endpointURL, body);
}); }));
}) })));
.partition((request: PatchRequest) => isNotEmpty(request.body));
return Observable.merge( return observableMerge(
emptyRequestObs emptyRequest$.pipe(
.filter((request: PatchRequest) => isEmpty(request.body)) filter((request: PatchRequest) => isEmpty(request.body)),
.do(() => startTransactionTime = null) tap(() => startTransactionTime = null),
.map(() => null), map(() => null)),
patchRequestObs patchRequest$.pipe(
.filter((request: PatchRequest) => isNotEmpty(request.body)) filter((request: PatchRequest) => isNotEmpty(request.body)),
.do(() => this.store.dispatch(new StartTransactionPatchOperationsAction(resourceType, resourceId, startTransactionTime))) tap(() => this.store.dispatch(new StartTransactionPatchOperationsAction(resourceType, resourceId, startTransactionTime))),
.do((request: PatchRequest) => this.requestService.configure(request, true)) tap((request: PatchRequest) => this.requestService.configure(request, true)),
.flatMap((request: PatchRequest) => { flatMap((request: PatchRequest) => {
const [successResponse, errorResponse] = this.responseCache.get(request.href) const [successResponse$, errorResponse$] = partition((response: RestResponse) => response.isSuccessful)(this.responseCache.get(request.href).pipe(
.filter((entry: ResponseCacheEntry) => startTransactionTime < entry.timeAdded) filter((entry: ResponseCacheEntry) => startTransactionTime < entry.timeAdded),
.take(1) take(1),
.map((entry: ResponseCacheEntry) => entry.response) map((entry: ResponseCacheEntry) => entry.response)
.partition((response: RestResponse) => response.isSuccessful); ));
return Observable.merge( return observableMerge(
errorResponse errorResponse$.pipe(
.do(() => this.store.dispatch(new RollbacktPatchOperationsAction(resourceType, resourceId))) tap(() => this.store.dispatch(new RollbacktPatchOperationsAction(resourceType, resourceId))),
.flatMap((response: ErrorResponse) => Observable.of(new Error(`Couldn't patch operations`))), flatMap((response: ErrorResponse) => observableOf(new Error(`Couldn't patch operations`)))),
successResponse successResponse$.pipe(
.filter((response: PostPatchSuccessResponse) => isNotEmpty(response)) filter((response: PostPatchSuccessResponse) => isNotEmpty(response)),
.do(() => this.store.dispatch(new CommitPatchOperationsAction(resourceType, resourceId))) tap(() => this.store.dispatch(new CommitPatchOperationsAction(resourceType, resourceId))),
.map((response: PostPatchSuccessResponse) => response.dataDefinition) map((response: PostPatchSuccessResponse) => response.dataDefinition),
.distinctUntilChanged()); distinctUntilChanged()));
}) }))
); );
} }
@@ -108,19 +115,19 @@ export class JsonPatchOperationsService<ResponseDefinitionDomain> {
} }
public jsonPatchByResourceType(linkName: string, scopeId: string, resourceType: string,) { public jsonPatchByResourceType(linkName: string, scopeId: string, resourceType: string,) {
const hrefObs = this.halService.getEndpoint(linkName) const href$ = this.halService.getEndpoint(linkName).pipe(
.filter((href: string) => isNotEmpty(href)) filter((href: string) => isNotEmpty(href)),
.distinctUntilChanged() distinctUntilChanged(),
.map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, scopeId)); map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, scopeId)));
return this.submitJsonPatchOperations(hrefObs, resourceType); return this.submitJsonPatchOperations(href$, resourceType);
} }
public jsonPatchByResourceID(linkName: string, scopeId: string, resourceType: string, resourceId: string) { public jsonPatchByResourceID(linkName: string, scopeId: string, resourceType: string, resourceId: string) {
const hrefObs = this.halService.getEndpoint(linkName) const hrefObs = this.halService.getEndpoint(linkName).pipe(
.filter((href: string) => isNotEmpty(href)) filter((href: string) => isNotEmpty(href)),
.distinctUntilChanged() distinctUntilChanged(),
.map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, scopeId)); map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, scopeId)));
return this.submitJsonPatchOperations(hrefObs, resourceType, resourceId); return this.submitJsonPatchOperations(hrefObs, resourceType, resourceId);
} }

10
yarn.lock
View File

@@ -324,6 +324,11 @@
"@types/express-serve-static-core" "*" "@types/express-serve-static-core" "*"
"@types/serve-static" "*" "@types/serve-static" "*"
"@types/file-saver@^1.3.0":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-1.3.1.tgz#55d76b3c78b5fcc8a7588ead428dce0822464120"
integrity sha512-A+lNc0nnhtX3iTLEYd/DisKTZdNKTf1bN0aSfQD/fG8bQ6SfUe5u8Fm2ab8qQHaMY5GVZumAXLnYptwX+mmQgg==
"@types/fs-extra@4.0.0": "@types/fs-extra@4.0.0":
version "4.0.0" version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.0.tgz#1dd742ad5c9bce308f7a52d02ebc01421bc9102f" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.0.tgz#1dd742ad5c9bce308f7a52d02ebc01421bc9102f"
@@ -3530,6 +3535,11 @@ figures@^2.0.0:
dependencies: dependencies:
escape-string-regexp "^1.0.5" escape-string-regexp "^1.0.5"
file-saver@^1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
filename-regex@^2.0.0: filename-regex@^2.0.0:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"