98344: Added decline task simple workflow step

This commit is contained in:
Alexandre Vryghem
2023-01-09 17:30:00 +01:00
parent 5a5884dd1a
commit f4a303f808
7 changed files with 149 additions and 0 deletions

View File

@@ -0,0 +1,12 @@
<button (click)="submitTask()"
[disabled]="processing$ | async"
class="declineTaskAction btn btn-warning"
ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
type="button">
<span *ngIf="processing$ | async">
<i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
</span>
<span *ngIf="!(processing$ | async)">
<i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
</span>
</button>

View File

@@ -0,0 +1,90 @@
import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
import { getMockSearchService } from '../../../mocks/search-service.mock';
import { getMockRequestService } from '../../../mocks/request.service.mock';
import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
import { NotificationsService } from '../../../notifications/notifications.service';
import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
import { Router } from '@angular/router';
import { RouterStub } from '../../../testing/router.stub';
import { SearchService } from '../../../../core/shared/search/search.service';
import { RequestService } from '../../../../core/data/request.service';
import { ClaimedTaskActionsDeclineTaskComponent } from './claimed-task-actions-decline-task.component';
import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
let component: ClaimedTaskActionsDeclineTaskComponent;
let fixture: ComponentFixture<ClaimedTaskActionsDeclineTaskComponent>;
const searchService = getMockSearchService();
const requestService = getMockRequestService();
let mockPoolTaskDataService: PoolTaskDataService;
describe('ClaimedTaskActionsDeclineTaskComponent', () => {
const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
let claimedTaskService: ClaimedTaskDataServiceStub;
beforeEach(waitForAsync(() => {
claimedTaskService = new ClaimedTaskDataServiceStub();
mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useClass: TranslateLoaderMock
}
})
],
providers: [
{ provide: ClaimedTaskDataService, useValue: claimedTaskService },
{ provide: Injector, useValue: {} },
{ provide: NotificationsService, useValue: new NotificationsServiceStub() },
{ provide: Router, useValue: new RouterStub() },
{ provide: SearchService, useValue: searchService },
{ provide: RequestService, useValue: requestService },
{ provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
],
declarations: [ClaimedTaskActionsDeclineTaskComponent],
schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(ClaimedTaskActionsDeclineTaskComponent, {
set: { changeDetection: ChangeDetectionStrategy.Default }
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ClaimedTaskActionsDeclineTaskComponent);
component = fixture.componentInstance;
component.object = object;
spyOn(component, 'initReloadAnchor').and.returnValue(undefined);
fixture.detectChanges();
});
afterEach(() => {
fixture.debugElement.nativeElement.remove();
});
it('should display decline button', () => {
const btn = fixture.debugElement.query(By.css('.declineTaskAction'));
expect(btn).not.toBeNull();
});
it('should display spin icon when decline is pending', () => {
component.processing$.next(true);
fixture.detectChanges();
const span = fixture.debugElement.query(By.css('.declineTaskAction .fa-spin'));
expect(span).not.toBeNull();
});
});

View File

@@ -0,0 +1,34 @@
import { Component, Injector } from '@angular/core';
import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
import { Router } from '@angular/router';
import { NotificationsService } from '../../../notifications/notifications.service';
import { TranslateService } from '@ngx-translate/core';
import { SearchService } from '../../../../core/shared/search/search.service';
import { RequestService } from '../../../../core/data/request.service';
export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
@rendersWorkflowTaskOption(WORKFLOW_TASK_OPTION_DECLINE_TASK)
@Component({
selector: 'ds-claimed-task-actions-decline-task',
templateUrl: './claimed-task-actions-decline-task.component.html',
styleUrls: ['./claimed-task-actions-decline-task.component.scss']
})
/**
* Component for displaying and processing the decline task action on a workflow task item
*/
export class ClaimedTaskActionsDeclineTaskComponent extends ClaimedTaskActionsAbstractComponent {
option = WORKFLOW_TASK_OPTION_DECLINE_TASK;
constructor(protected injector: Injector,
protected router: Router,
protected notificationsService: NotificationsService,
protected translate: TranslateService,
protected searchService: SearchService,
protected requestService: RequestService) {
super(injector, router, notificationsService, translate, searchService, requestService);
}
}

View File

@@ -181,6 +181,7 @@ import { AdvancedClaimedTaskActionSelectReviewerComponent } from './mydspace-act
import { import {
AdvancedClaimedTaskActionRatingReviewerComponent AdvancedClaimedTaskActionRatingReviewerComponent
} from './mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component'; } from './mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component';
import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
const MODULES = [ const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -265,6 +266,7 @@ const COMPONENTS = [
ClaimedTaskActionsRejectComponent, ClaimedTaskActionsRejectComponent,
ClaimedTaskActionsReturnToPoolComponent, ClaimedTaskActionsReturnToPoolComponent,
ClaimedTaskActionsEditMetadataComponent, ClaimedTaskActionsEditMetadataComponent,
ClaimedTaskActionsDeclineTaskComponent,
ClaimedTaskActionsLoaderComponent, ClaimedTaskActionsLoaderComponent,
ItemActionsComponent, ItemActionsComponent,
PoolTaskActionsComponent, PoolTaskActionsComponent,
@@ -389,6 +391,7 @@ const ENTRY_COMPONENTS = [
LogInOidcComponent, LogInOidcComponent,
BundleListElementComponent, BundleListElementComponent,
ClaimedTaskActionsApproveComponent, ClaimedTaskActionsApproveComponent,
ClaimedTaskActionsDeclineTaskComponent,
ClaimedTaskActionsRejectComponent, ClaimedTaskActionsRejectComponent,
ClaimedTaskActionsReturnToPoolComponent, ClaimedTaskActionsReturnToPoolComponent,
ClaimedTaskActionsEditMetadataComponent, ClaimedTaskActionsEditMetadataComponent,

View File

@@ -1,5 +1,7 @@
import { Observable, EMPTY } from 'rxjs'; import { Observable, EMPTY } from 'rxjs';
import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response'; import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
import { RemoteData } from '../../core/data/remote-data';
export class ClaimedTaskDataServiceStub { export class ClaimedTaskDataServiceStub {
@@ -7,4 +9,8 @@ export class ClaimedTaskDataServiceStub {
return EMPTY; return EMPTY;
} }
public findByItem(_uuid: string): Observable<RemoteData<ClaimedTask>> {
return EMPTY;
}
} }

View File

@@ -4069,6 +4069,10 @@
"submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
"submission.workflow.tasks.claimed.decline": "Decline",
"submission.workflow.tasks.claimed.decline_help": "",
"submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.", "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
"submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject", "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",