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

Merge branch 'main' into CST-3620

Browse Source 
# Conflicts:
#	src/app/+my-dspace-page/my-dspace-page.module.ts
#	src/app/core/tasks/tasks.service.ts
#	src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
#	src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
#	src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
#	src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
#	src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
#	src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
#	src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
#	src/app/shared/mydspace-actions/mydspace-actions.ts
#	src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
#	src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
#	src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
#	src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
#	src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
#	src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
#	src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
#	src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
#	src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
#	src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
This commit is contained in:
Alessandro Martelli
2021-01-29 16:02:07 +01:00
parent 2becaca1b0 a64cb63d99
commit 5ef5a27e2b
1090 changed files with 11660 additions and 9745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/core/tasks/tasks.service.ts
View File

@@ -1,19 +1,14 @@
import { HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';
import { distinctUntilChanged, filter, find, flatMap, map, switchMap, tap } from 'rxjs/operators';
import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
import { DataService } from '../data/data.service';
import {
DeleteRequest,
FindListOptions,
PostRequest,
TaskDeleteRequest,
TaskPostRequest
} from '../data/request.models';
import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { DeleteRequest, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
import { isNotEmpty } from '../../shared/empty.util';
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
import { ProcessTaskResponse } from './models/process-task-response';
import {getFirstCompletedRemoteData, getFirstSucceededRemoteData} from '../shared/operators';
import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../shared/operators';
import { CacheableObject } from '../cache/object-cache.reducer';
import { RemoteData } from '../data/remote-data';
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
@@ -37,7 +32,7 @@ export abstract class TasksService<T extends CacheableObject> extends DataServic
getFirstCompletedRemoteData(),
map((response: RemoteData<any>) => {
if (response.hasFailed) {
return new ProcessTaskResponse(false, response.statusCode, response.errorMessage)
return new ProcessTaskResponse(false, response.statusCode, response.errorMessage);
} else {
return new ProcessTaskResponse(true, response.statusCode);
}
@@ -79,7 +74,7 @@ export abstract class TasksService<T extends CacheableObject> extends DataServic
distinctUntilChanged(),
map((endpointURL: string) => new TaskPostRequest(requestId, endpointURL, body, options)),
tap((request: PostRequest) => this.requestService.configure(request)),
flatMap((request: PostRequest) => this.fetchRequest(requestId)),
mergeMap((request: PostRequest) => this.fetchRequest(requestId)),
distinctUntilChanged());
}
@@ -100,7 +95,7 @@ export abstract class TasksService<T extends CacheableObject> extends DataServic
return this.getEndpointById(scopeId, linkPath).pipe(
map((endpointURL: string) => new TaskDeleteRequest(requestId, endpointURL, null, options)),
tap((request: DeleteRequest) => this.requestService.configure(request)),
flatMap((request: DeleteRequest) => this.fetchRequest(requestId)),
mergeMap((request: DeleteRequest) => this.fetchRequest(requestId)),
distinctUntilChanged());
}