From c3cb1f9bf8c086daced0101f7ad11d53c498d446 Mon Sep 17 00:00:00 2001
From: Silviu Popa <silviucpopa@gmail.com>
Date: Fri, 4 Dec 2020 20:10:37 +0200
Subject: [PATCH] [ACA-4208] - fix date filter by range (#6421)

---
 .../edit-task-filters/base-edit-task-filter-cloud.component.ts   | 1 +
 .../edit-task-filters/edit-task-filter-cloud.component.spec.ts   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts
index 388ca35fa4..8c2bfa4bd6 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts
@@ -279,6 +279,7 @@ export abstract class BaseEditTaskFilterCloudComponent<T> implements OnInit, OnC
         this.editTaskFilterForm.get(property.attributes?.to).setValue(
             dateRange.endDate ? dateRange.endDate : null
         );
+        this.editTaskFilterForm.get(property.attributes.dateType).setValue(DateCloudFilterType.RANGE);
     }
 
     onChangedUser(users: IdentityUserModel[], userProperty: TaskFilterProperties) {
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts
index 93f7bce244..29ffe6ba2d 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts
@@ -613,6 +613,7 @@ describe('EditTaskFilterCloudComponent', () => {
             component.filterChange.subscribe(() => {
                 expect(component.changedTaskFilter.dueDateFrom).toEqual(dateFilter.startDate);
                 expect(component.changedTaskFilter.dueDateTo).toEqual(dateFilter.endDate);
+                expect(component.changedTaskFilter.dueDateType).toEqual(DateCloudFilterType.RANGE);
                 done();
             });
             component.onFilterChange();