Skip to content

Commit 1c2f45e

Browse files
FrancescoMolinaroAndrea Barbasso
FrancescoMolinaro
authored and
Andrea Barbasso
committed
Merged in task/dspace-cris-2023_02_x/DSC-1924 (pull request DSpace#2274)
Task/dspace cris 2023 02 x/DSC-1924 Approved-by: Andrea Barbasso
2 parents 6e70d05 + d37e31f commit 1c2f45e

9 files changed

Lines changed: 669 additions & 12 deletions

File tree

‎src/app/my-dspace-page/my-dspace-new-submission/my-dspace-bulk-action/my-dspace-bulk-action.component.html‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<div class="w-100 d-flex mt-1 mb-3 align-items-start">
2+
<button
3+
type="button"
4+
class="btn btn-info mr-2"
5+
ngbTooltip="{{'submission.workflow.tasks.pool.claim_selected_help' | translate}}"
6+
[disabled]="(processing$ | async) || !(claimEnabled$ | async)"
7+
(click)="claimAllSelectedTask()"
8+
[attr.data-test-disabled]="!(claimEnabled$ | async) ?? false"
9+
>
10+
<span>
11+
<i class="fas fa-hand-paper"></i>
12+
{{'submission.workflow.tasks.pool.claim.selected' | translate}}
13+
</span>
14+
</button>
15+
16+
<button
17+
type="button"
18+
class="btn btn-success mr-2"
19+
ngbTooltip="{{'submission.workflow.tasks.claimed.approve_selected_help' | translate}}"
20+
[disabled]="(processing$ | async) || !(claimedTaskActionsEnabled$ | async)"
21+
(click)="submitAllSelectedTask()"
22+
[attr.data-test-disabled]="!(claimedTaskActionsEnabled$ | async) ?? false"
23+
>
24+
<span>
25+
<i class="fa fa-thumbs-up"></i>
26+
{{'submission.workflow.tasks.claimed.approve.selected' | translate}}
27+
</span>
28+
</button>
29+
30+
<button
31+
class="btn btn-danger mr-2"
32+
[ngbTooltip]="rejectTipContent"
33+
[disabled]="!(claimedTaskActionsEnabled$ | async)"
34+
(click)="openRejectModal(rejectModal)"
35+
[attr.data-test-disabled]="!(claimedTaskActionsEnabled$ | async) ?? false"
36+
>
37+
<span>
38+
<i class="fa fa-trash"></i>
39+
{{'submission.workflow.tasks.claimed.reject.selected.submit' | translate}}
40+
</span>
41+
</button>
42+
43+
<button
44+
type="button"
45+
class="btn btn-secondary"
46+
ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
47+
[disabled]="!(claimedTaskActionsEnabled$ | async)"
48+
(click)="returnSelectedToPool()"
49+
[attr.data-test-disabled]="!(claimedTaskActionsEnabled$ | async) ?? false"
50+
>
51+
<span>
52+
<i class="fa fa-undo"></i>
53+
{{'submission.workflow.tasks.claimed.return.selected' | translate}}
54+
</span>
55+
</button>
56+
57+
<span *ngIf="(processing$ | async)">
58+
<i class='fas fa-circle-notch fa-spin'></i>
59+
{{'submission.workflow.tasks.generic.processing' | translate}}
60+
</span>
61+
</div>
62+
63+
<ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
64+
<ng-template #rejectModal let-c="close" let-d="dismiss">
65+
<div class="modal-header">
66+
<h4 class="modal-title">{{'submission.workflow.tasks.claimed.reject.reason.title' | translate}}</h4>
67+
<button
68+
type="button"
69+
class="close"
70+
aria-label="Close"
71+
(click)="d('Cross click')"
72+
>
73+
<span aria-hidden="true">&times;</span>
74+
</button>
75+
</div>
76+
<div class="modal-body">
77+
<div class="alert alert-info" role="alert">
78+
{{'submission.workflow.tasks.claimed.reject.reason.info' | translate}}
79+
</div>
80+
<form (ngSubmit)="rejectSelected();" [formGroup]="rejectForm">
81+
<textarea
82+
style="width: 100%"
83+
formControlName="reason"
84+
rows="4"
85+
placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"
86+
></textarea>
87+
<button
88+
id="btn-chat"
89+
class="btn btn-danger btn-lg btn-block mt-3"
90+
[disabled]="!rejectForm.valid"
91+
type="submit"
92+
>
93+
<span>{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
94+
</button>
95+
</form>
96+
</div>
97+
</ng-template>

‎src/app/my-dspace-page/my-dspace-new-submission/my-dspace-bulk-action/my-dspace-bulk-action.component.spec.ts‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
import { NO_ERRORS_SCHEMA } from '@angular/core';
2+
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
3+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
4+
import { RouterTestingModule } from '@angular/router/testing';
5+
6+
import { of } from 'rxjs';
7+
import { TranslateModule } from '@ngx-translate/core';
8+
import { MyDSpaceBulkActionComponent } from './my-dspace-bulk-action.component';
9+
import { SearchService } from '../../../core/shared/search/search.service';
10+
import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
11+
import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
12+
import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
13+
import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
14+
import { NotificationsService } from '../../../shared/notifications/notifications.service';
15+
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
16+
import { Router } from '@angular/router';
17+
import { RouterStub } from '../../../shared/testing/router.stub';
18+
import { SearchServiceStub } from '../../../shared/testing/search-service.stub';
19+
import { UntypedFormBuilder } from '@angular/forms';
20+
import { RequestService } from '../../../core/data/request.service';
21+
import { By } from '@angular/platform-browser';
22+
23+
describe('MyDSpaceBulkActionComponent test suite', () => {
24+
let comp: MyDSpaceBulkActionComponent;
25+
let fixture: ComponentFixture<MyDSpaceBulkActionComponent>;
26+
27+
const testAction = {
28+
_embedded: {
29+
indexableObject: {
30+
type: ''
31+
}
32+
}
33+
};
34+
35+
const selectableListService = jasmine.createSpyObj('selectableListService', {
36+
getSelectableList: of({selection: []}),
37+
deselectAll: jasmine.createSpy('deselectAll')
38+
});
39+
40+
const poolTaskService = new PoolTaskDataService(null, null, null, null);
41+
42+
const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
43+
submitTask: of(new ProcessTaskResponse(true))
44+
});
45+
46+
const requestService = jasmine.createSpyObj('requestService', {
47+
removeByHrefSubstring: {},
48+
});
49+
50+
beforeEach(waitForAsync(() => {
51+
TestBed.configureTestingModule({
52+
imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
53+
declarations: [MyDSpaceBulkActionComponent],
54+
providers: [
55+
{ provide: SelectableListService, useValue: selectableListService },
56+
{ provide: RequestService, useValue: requestService },
57+
{ provide: PoolTaskDataService, useValue: poolTaskService },
58+
{ provide: ClaimedTaskDataService, useValue: claimedTaskService },
59+
{ provide: NotificationsService, useValue: new NotificationsServiceStub() },
60+
{ provide: Router, useValue: new RouterStub() },
61+
{ provide: SearchService, useValue: new SearchServiceStub('searchLink') },
62+
{
63+
provide: NgbModal, useValue: {
64+
/* eslint-disable no-empty,@typescript-eslint/no-empty-function */
65+
open: () => {}
66+
}
67+
},
68+
{ provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
69+
],
70+
schemas: [NO_ERRORS_SCHEMA]
71+
}).compileComponents();
72+
}));
73+
74+
afterEach(() => {
75+
fixture.destroy();
76+
});
77+
78+
beforeEach(() => {
79+
fixture = TestBed.createComponent(MyDSpaceBulkActionComponent);
80+
comp = fixture.componentInstance;
81+
comp.processing$.next(false);
82+
selectableListService.getSelectableList.and.returnValue(of({ selection: []}));
83+
84+
fixture.detectChanges();
85+
});
86+
87+
it('should create', () => {
88+
expect(comp).toBeTruthy();
89+
});
90+
91+
it('all button should be disabled by default', () => {
92+
const disabledButtons = fixture.debugElement.queryAll(By.css('button[data-test-disabled="true"]'));
93+
expect(disabledButtons.length).toBe(4);
94+
});
95+
96+
it('claim button should be enabled', () => {
97+
const mockAction = testAction;
98+
mockAction._embedded.indexableObject.type = 'claimaction';
99+
selectableListService.getSelectableList.and.returnValue(of({ selection: [mockAction]}));
100+
comp.claimEnabled$ = of(true);
101+
fixture.detectChanges();
102+
103+
const disabledButtons = fixture.debugElement.queryAll(By.css('button[data-test-disabled="true"]'));
104+
const claimButton = fixture.debugElement.query(By.css('.btn.btn-info'));
105+
expect(disabledButtons.length).toBe(3);
106+
expect(claimButton.nativeElement.disabled).toBeFalsy();
107+
});
108+
109+
it('claimed task buttons should be enabled', () => {
110+
const mockAction = testAction;
111+
mockAction._embedded.indexableObject.type = 'claimedtask';
112+
selectableListService.getSelectableList.and.returnValue(of({ selection: [mockAction]}));
113+
comp.claimedTaskActionsEnabled$ = of(true);
114+
fixture.detectChanges();
115+
116+
const disabledButtons = fixture.debugElement.queryAll(By.css('button[data-test-disabled="true"]'));
117+
const approveButton = fixture.debugElement.query(By.css('.btn.btn-success'));
118+
const rejectButton = fixture.debugElement.query(By.css('.btn.btn-danger'));
119+
const returnToPoolButton = fixture.debugElement.query(By.css('.btn.btn-secondary'));
120+
expect(disabledButtons.length).toBe(1);
121+
expect(approveButton.nativeElement.disabled).toBeFalsy();
122+
expect(rejectButton.nativeElement.disabled).toBeFalsy();
123+
expect(returnToPoolButton.nativeElement.disabled).toBeFalsy();
124+
});
125+
126+
it('All buttons should be enabled', () => {
127+
const mockAction = testAction;
128+
const mockAction2 = testAction;
129+
mockAction._embedded.indexableObject.type = 'claimaction';
130+
mockAction2._embedded.indexableObject.type = 'claimedtask';
131+
selectableListService.getSelectableList.and.returnValue(of({ selection: [mockAction, mockAction2]}));
132+
comp.claimEnabled$ = of(true);
133+
comp.claimedTaskActionsEnabled$ = of(true);
134+
fixture.detectChanges();
135+
136+
const disabledButtons = fixture.debugElement.queryAll(By.css('button[data-test-disabled="true"]'));
137+
expect(disabledButtons.length).toBe(0);
138+
});
139+
140+
});

0 commit comments

Comments
 (0)