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

99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent

Browse Source
This commit is contained in:
Alexandre Vryghem
2023-02-10 12:50:36 +01:00
parent 19d0975df5
commit 99f9f592a0
6 changed files with 82 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts
View File

@@ -1,12 +1,11 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import {
AdvancedWorkflowActionSelectReviewerComponent,
ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER
ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER,
} from './advanced-workflow-action-select-reviewer.component';
import { ActivatedRoute } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
import { RouterTestingModule } from '@angular/router/testing';
import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
import { RouteService } from '../../../core/services/route.service';
@@ -25,6 +24,7 @@ import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-res
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { RequestService } from '../../../core/data/request.service';
import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
import { RouterStub } from '../../../shared/testing/router.stub';
const claimedTaskId = '2';
const workflowId = '1';
@@ -37,18 +37,19 @@ describe('AdvancedWorkflowActionSelectReviewerComponent', () => {
let claimedTaskDataService: ClaimedTaskDataServiceStub;
let notificationService: NotificationsServiceStub;
let router: RouterStub;
let workflowActionDataService: WorkflowItemDataServiceStub;
let workflowItemDataService: WorkflowItemDataServiceStub;
beforeEach(async () => {
claimedTaskDataService = new ClaimedTaskDataServiceStub();
notificationService = new NotificationsServiceStub();
router = new RouterStub();
workflowActionDataService = new WorkflowActionDataServiceStub();
workflowItemDataService = new WorkflowItemDataServiceStub();
await TestBed.configureTestingModule({
imports: [
RouterTestingModule,
TranslateModule.forRoot(),
],
declarations: [
@@ -66,10 +67,12 @@ describe('AdvancedWorkflowActionSelectReviewerComponent', () => {
queryParams: {
claimedTask: claimedTaskId,
workflow: 'testaction',
previousSearchQuery: 'Thor%20Love%20and%20Thunder',
},
},
},
},
{ provide: Router, useValue: router },
{ provide: ClaimedTaskDataService, useValue: claimedTaskDataService },
{ provide: NotificationsService, useValue: notificationService },
{ provide: RouteService, useValue: routeServiceStub },
@@ -85,14 +88,30 @@ describe('AdvancedWorkflowActionSelectReviewerComponent', () => {
fixture = TestBed.createComponent(AdvancedWorkflowActionSelectReviewerComponent);
component = fixture.componentInstance;
fixture.detectChanges();
spyOn(component, 'previousPage');
});
afterEach(() => {
fixture.debugElement.nativeElement.remove();
});
describe('previousPage', () => {
it('should navigate back to the Workflow tasks page with the previous query', () => {
component.previousPage();
expect(router.navigate).toHaveBeenCalledWith(['/mydspace'], {
queryParams: {
configuration: 'workflow',
query: 'Thor Love and Thunder',
},
});
});
});
describe('performAction', () => {
beforeEach(() => {
spyOn(component, 'previousPage');
});
it('should call the claimedTaskDataService with the list of selected ePersons', () => {
spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
component.selectedReviewers = [EPersonMock, EPersonMock2];

13
src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
View File

@@ -12,7 +12,7 @@ import {
} from '../../../access-control/group-registry/group-form/members-list/members-list.component';
import { Subscription } from 'rxjs';
import { EPerson } from '../../../core/eperson/models/eperson.model';
import { ActivatedRoute, Router } from '@angular/router';
import { ActivatedRoute, Params, Router } from '@angular/router';
import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
import { RouteService } from '../../../core/services/route.service';
import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -20,7 +20,8 @@ import { TranslateService } from '@ngx-translate/core';
import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
import { ReviewersListComponent } from './reviewers-list/reviewers-list.component';
import { RequestService } from 'src/app/core/data/request.service';
import { RequestService } from '../../../core/data/request.service';
import { hasValue } from '../../../shared/empty.util';
export const ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer';
export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction';
@@ -138,7 +139,13 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf
* switching between the different pages
*/
previousPage(): void {
void this.router.navigate(['/mydspace'], { queryParams: { configuration: 'workflow' } });
const queryParams: Params = {
configuration: 'workflow',
};
if (hasValue(this.route.snapshot.queryParams.previousSearchQuery)) {
queryParams.query = decodeURIComponent(this.route.snapshot.queryParams.previousSearchQuery);
}
void this.router.navigate(['/mydspace'], { queryParams: queryParams });
}
}