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

[ACA-3700] - fix suspended data filter not preserving data (#6940)

Browse Source 
* [ACA-3700] - fix suspended data filter not preserving data

* fix lint
This commit is contained in:
Silviu Popa
2021-04-23 10:49:51 +03:00
committed by GitHub
parent dd56588df8
commit 59dc6cb1d1
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts
View File

@@ -401,6 +401,18 @@ describe('EditProcessFilterCloudComponent', () => {
});
it('should get form attributes for suspendedData', async() => {
const filter = new ProcessFilterCloudModel({
id: 'filter-id',
name: 'ADF_CLOUD_PROCESS_FILTERS.RUNNING_PROCESSES',
sort: 'my-custom-sort',
processDefinitionId: 'process-definition-id',
priority: '12',
suspendedDateType: DateCloudFilterType.RANGE
});
filter.suspendedFrom = new Date(2021, 1, 1).toString();
filter.suspendedTo = new Date(2021, 1, 2).toString();
getProcessFilterByIdSpy.and.returnValue(of(filter));
fixture.detectChanges();
component.filterProperties = ['appName', 'suspendedDateRange'];
fixture.detectChanges();
@@ -409,9 +421,9 @@ describe('EditProcessFilterCloudComponent', () => {
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(component.editProcessFilterForm.get('_suspendedFrom')).toBeDefined();
expect(component.editProcessFilterForm.get('_suspendedTo')).toBeDefined();
expect(component.editProcessFilterForm.get('suspendedDateType')).toBeDefined();
expect(component.editProcessFilterForm.get('_suspendedFrom').value).toEqual(new Date(2021, 1, 1).toString());
expect(component.editProcessFilterForm.get('_suspendedTo').value).toEqual(new Date(2021, 1, 2).toString());
expect(component.editProcessFilterForm.get('suspendedDateType').value).toEqual(DateCloudFilterType.RANGE);
});
});

4
lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts
View File

@@ -785,8 +785,8 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
attributes: { dateType: 'suspendedDateType', from: '_suspendedFrom', to: '_suspendedTo'},
value: {
suspendedDateType: filterModel.suspendedDateType || null,
_startFrom: filterModel.suspendedFrom || null,
_startTo: filterModel.suspendedTo || null
_suspendedFrom: filterModel.suspendedFrom || null,
_suspendedTo: filterModel.suspendedTo || null
}
}
];