inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-5898] prevent custom task filters from always sending due after date (#8847)

Browse Source 
* ACS-5898 prevent custom task filters from always sending due after date, build custom filters form without initial values

* ACS-5898 revert setDueAfterFilter method removal, make its use conditional
This commit is contained in:
Grzegorz Jaśkowski
2023-08-24 16:51:38 +02:00
committed by GitHub
parent de16072171
commit 87e57272fa
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
View File

@@ -105,19 +105,19 @@ export class TaskListDemoComponent implements OnInit, OnDestroy {
buildForm() { buildForm() {
this.taskListForm = this.formBuilder.group({ this.taskListForm = this.formBuilder.group({
taskAppId: new UntypedFormControl(this.defaultAppId, [Validators.pattern('^[0-9]*$')]), taskAppId: new UntypedFormControl(this.defaultAppId, [Validators.pattern('^[0-9]*$')]),
taskName: new UntypedFormControl(''), taskName: new UntypedFormControl(),
taskId: new UntypedFormControl(''), taskId: new UntypedFormControl(),
taskProcessDefinitionId: new UntypedFormControl(''), taskProcessDefinitionId: new UntypedFormControl(),
taskProcessInstanceId: new UntypedFormControl(''), taskProcessInstanceId: new UntypedFormControl(),
taskAssignment: new UntypedFormControl(''), taskAssignment: new UntypedFormControl(),
taskState: new UntypedFormControl(''), taskState: new UntypedFormControl(),
taskSort: new UntypedFormControl(''), taskSort: new UntypedFormControl(),
taskSize: new UntypedFormControl('', [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]), taskSize: new UntypedFormControl(null, [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]),
taskPage: new UntypedFormControl('', [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]), taskPage: new UntypedFormControl(null, [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]),
taskDueAfter: new UntypedFormControl(''), taskDueAfter: new UntypedFormControl(),
taskDueBefore: new UntypedFormControl(''), taskDueBefore: new UntypedFormControl(),
taskStart: new UntypedFormControl('', [Validators.pattern('^[0-9]*$')]), taskStart: new UntypedFormControl(null, [Validators.pattern('^[0-9]*$')]),
taskIncludeProcessInstance: new UntypedFormControl('') taskIncludeProcessInstance: new UntypedFormControl()
}); });
this.taskListForm.valueChanges this.taskListForm.valueChanges
@@ -142,7 +142,7 @@ export class TaskListDemoComponent implements OnInit, OnDestroy {
this.state = taskFilter.taskState; this.state = taskFilter.taskState;
this.sort = taskFilter.taskSort; this.sort = taskFilter.taskSort;
this.start = taskFilter.taskStart; this.start = taskFilter.taskStart;
this.dueAfter = this.setDueAfterFilter(taskFilter.taskDueAfter); this.dueAfter = taskFilter.taskDueAfter ? this.setDueAfterFilter(taskFilter.taskDueAfter) : null;
this.dueBefore = taskFilter.taskDueBefore; this.dueBefore = taskFilter.taskDueBefore;
if (taskFilter.taskSize) { if (taskFilter.taskSize) {