From d542072a37148259e338fed28c33d75cf823467f Mon Sep 17 00:00:00 2001 From: Alessandro Martelli Date: Thu, 7 Jan 2021 15:26:55 +0100 Subject: [PATCH] [CSTPER-3620] Workflow Actions refresh entire MyDSpace page instead of just WorkflowItem Fixed test. Removed unused imports. --- src/app/core/tasks/tasks.service.ts | 9 ++++----- .../abstract/claimed-task-actions-abstract.component.ts | 2 +- .../approve/claimed-task-actions-approve.component.ts | 5 ----- .../reject/claimed-task-actions-reject.component.ts | 5 ----- .../listable-object-component-loader.component.spec.ts | 1 - 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts index 8638bb30e6..ed58eb920e 100644 --- a/src/app/core/tasks/tasks.service.ts +++ b/src/app/core/tasks/tasks.service.ts @@ -1,7 +1,7 @@ import { HttpHeaders } from '@angular/common/http'; -import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; -import { distinctUntilChanged, filter, find, flatMap, map, mergeMap, switchMap, tap } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { distinctUntilChanged, filter, find, flatMap, map, switchMap, tap } from 'rxjs/operators'; import { DataService } from '../data/data.service'; import { @@ -13,12 +13,11 @@ import { } from '../data/request.models'; import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { ProcessTaskResponse } from './models/process-task-response'; -import {getFirstCompletedRemoteData, getResponseFromEntry} from '../shared/operators'; -import { ErrorResponse, MessageResponse, RestResponse } from '../cache/response.models'; +import { getFirstCompletedRemoteData } 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'; -import {HttpOptions} from '../dspace-rest/dspace-rest.service'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; /** * An abstract class that provides methods to handle task requests. diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts index eb43a33a20..b9a424c57f 100644 --- a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts @@ -10,7 +10,7 @@ import { RequestService} from '../../../../core/data/request.service'; import { Observable} from 'rxjs'; import { RemoteData} from '../../../../core/data/remote-data'; import { WorkflowItem} from '../../../../core/submission/models/workflowitem.model'; -import { map, switchMap } from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { CLAIMED_TASK } from '../../../../core/tasks/models/claimed-task-object.resource-type'; import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { Item } from '../../../../core/shared/item.model'; diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts index 1f4111a14a..d73da460b7 100644 --- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts @@ -49,9 +49,4 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra return reloadedObject; } - // mock - actionExecution(): Observable { - return of({ hasSucceeded: true}); - } - } diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts index 267f978392..911bd385f4 100644 --- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts @@ -99,9 +99,4 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac }); return reloadedObject; } - - // mock - actionExecution(): Observable { - return of({ hasSucceeded: true}); - } } diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts index 44bc5c28f7..b7221b4632 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts @@ -12,7 +12,6 @@ import { spyOnExported } from '../../../testing/utils.test'; import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; import { Item } from '../../../../core/shared/item.model'; -import { By } from '@angular/platform-browser'; const testType = 'TestType'; const testContext = Context.Search;