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

[ACA-3722] - rename process name sort option (#5931)

Browse Source 
* [ACA-3722] - rename process name sort option

* rework unit test

* remove unnecesary property

* fix e2e

* PR changes

* fix e2e

* fix e2e

* fix e2e

Co-authored-by: Silviu Popa <p3701014@L3700101120.ness.com>
This commit is contained in:
Silviu Popa 2020-09-22 14:14:37 +03:00 committed by GitHub
parent 3b02233481
commit 2d0b09f3e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 122 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
e2e/process-services-cloud/edit-process-filters-component.e2e.ts
View File

@ -90,8 +90,8 @@ describe('Edit process filters cloud', () => {
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('New');
await processCloudDemoPage.processFilterCloudComponent.clickProcessFilter('custom-new');
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('StartDate');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate');
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Start Date');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Start Date');
await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsDisplayed();
await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsDisplayed();
@ -113,7 +113,7 @@ describe('Edit process filters cloud', () => {
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false);
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkDeleteButtonIsEnabled()).toEqual(true);
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Start Date');
await processCloudDemoPage.processFilterCloudComponent.clickProcessFilter('custom-new');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id');
await processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton();
@ -131,8 +131,8 @@ describe('Edit process filters cloud', () => {
await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('New');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id');
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name');
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Process Name');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Process Name');
await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton();
await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New');
@ -143,7 +143,7 @@ describe('Edit process filters cloud', () => {
await browser.driver.sleep(1000);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('New');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Process Name');
await processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton();
await browser.driver.sleep(1000);
@ -168,8 +168,8 @@ describe('Edit process filters cloud', () => {
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded();
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id');
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name');
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Process Name');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Process Name');
await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveButton();
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded();
@ -177,7 +177,7 @@ describe('Edit process filters cloud', () => {
await browser.driver.sleep(1000);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('New');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Process Name');
await processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton();
});
@ -215,7 +215,7 @@ describe('Edit process filters cloud', () => {
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.ALL);
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Start Date');
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
});
@ -232,8 +232,8 @@ describe('Edit process filters cloud', () => {
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded();
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('StartDate');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate');
await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Start Date');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Start Date');
await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveButton();
});

4
e2e/process-services-cloud/process-custom-filters.e2e.ts
View File

@ -178,7 +178,7 @@ describe('Process list cloud', () => {
});
it('[C305054] Should display processes ordered by last modified date when Last Modified is selected from sort dropdown', async () => {
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ status: 'ALL', sort: 'LastModified', order: 'ASC' });
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ status: 'ALL', sort: 'Last Modified', order: 'ASC' });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await expect(await processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Last Modified')).toBe(true);
@ -189,7 +189,7 @@ describe('Process list cloud', () => {
});
it('[C305054] Should display processes ordered by business key date when BusinessKey is selected from sort dropdown', async () => {
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ status: 'ALL', sort: 'BusinessKey', order: 'ASC' });
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ status: 'ALL', sort: 'Business Key', order: 'ASC' });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await expect(await processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Business Key')).toBe(true);

4
lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.html
View File

@ -14,8 +14,8 @@
<mat-form-field class="adf-cloud-date-range-picker">
<mat-label>{{ 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.DATE_RANGE_TITLE' | translate }}</mat-label>
<mat-date-range-input [formGroup]="dateRangeForm" [rangePicker]="picker">
<input matStartDate formControlName="from" placeholder="Start date">
<input matEndDate formControlName="to" placeholder="End date">
<input matStartDate formControlName="from" placeholder="{{ 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.START_DATE' | translate }}">
<input matEndDate formControlName="to" placeholder="{{ 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.END_DATE' | translate }}">
</mat-date-range-input>
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker (closed)="onDateRangeClosed()"></mat-date-range-picker>

10
lib/process-services-cloud/src/lib/i18n/en.json
View File

@ -162,10 +162,10 @@
"PROCESS_DEF_ID": "ProcessDefinitionId",
"PROCESS_DEF_NAME": "ProcessDefinitionName",
"PROCESS_DEF_KEY": "ProcessDefinitionKey",
"LAST_MODIFIED": "LastModified",
"LAST_MODIFIED": "Last Modified",
"LAST_MODIFIED_DATE_FORM": "LastModifiedFrom",
"LAST_MODIFIED_TO": "LastModifiedTo",
"PROCESS_NAME": "ProcessName",
"PROCESS_NAME": "Process Name",
"APP_VERSION": "AppReleaseVersion",
"CREATED_DATE": "Created Date",
"DATE_RANGE": {
@ -180,8 +180,10 @@
"RANGE": "Date within"
},
"DATE_RANGE_TITLE": "Start date - End date",
"START_DATE": "Start date",
"END_DATE": "End date"
"START_DATE": "Start Date",
"END_DATE": "End date",
"ID": "Id",
"BUSINESS_KEY": "Business Key"
},
"ERROR": {
"DATE": "Date format DD/MM/YYYY",

2
lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.html
View File

@ -30,7 +30,7 @@
[formControlName]="processFilterProperty.key"
[attr.data-automation-id]="'adf-cloud-edit-process-property-' + processFilterProperty.key">
<mat-option *ngFor="let propertyOption of processFilterProperty.options" [value]="propertyOption.value" [attr.data-automation-id]="'adf-cloud-edit-process-property-options-' + processFilterProperty.key">
{{ propertyOption.label }}
{{ propertyOption.label | translate }}
</mat-option>
</mat-select>
</mat-form-field>

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

@ -380,7 +380,7 @@ describe('EditProcessFilterCloudComponent', () => {
expect(sortElement).toBeDefined();
expect(orderElement).toBeDefined();
expect(stateElement.innerText.trim()).toEqual('RUNNING');
expect(sortElement.innerText.trim()).toEqual('Id');
expect(sortElement.innerText.trim()).toEqual('ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.ID');
expect(orderElement.innerText.trim()).toEqual('ASC');
});
}));
@ -556,7 +556,7 @@ describe('EditProcessFilterCloudComponent', () => {
processDefinitionId: 'process-definition-id',
priority: '12'
}));
component.sortProperties = ['id', 'processName', 'processDefinitionId'];
component.sortProperties = ['id', 'name', 'processDefinitionId'];
fixture.detectChanges();
const processFilterIdChange = new SimpleChange(null, 'mock-process-filter-id', true);
component.ngOnChanges({ 'id': processFilterIdChange });
@ -578,6 +578,29 @@ describe('EditProcessFilterCloudComponent', () => {
});
}));
it('should display the process name label for the name property', async () => {
getProcessFilterByIdSpy.and.returnValue(of({
id: 'filter-id',
processName: 'process-name',
sort: 'my-custom-sort',
processDefinitionId: 'process-definition-id',
priority: '12'
}));
component.sortProperties = ['name'];
const processFilterIdChange = new SimpleChange(null, 'mock-process-filter-id', true);
component.ngOnChanges({ 'id': processFilterIdChange });
fixture.detectChanges();
const expansionPanel = fixture.debugElement.nativeElement.querySelector('mat-expansion-panel-header');
expansionPanel.click();
fixture.detectChanges();
const sortElement = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-cloud-edit-process-property-sort"]');
sortElement.click();
fixture.detectChanges();
await fixture.whenStable();
const sortOptions = fixture.debugElement.queryAll(By.css('.mat-option-text'));
expect(sortOptions[0].nativeElement.textContent).toEqual(' ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_NAME ');
});
describe('edit filter actions', () => {
beforeEach(() => {

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

@ -25,7 +25,7 @@ import moment from 'moment-es6';
import { Moment } from 'moment';
import { AppsProcessCloudService } from '../../../app/services/apps-process-cloud.service';
import { ProcessFilterCloudModel, ProcessFilterProperties, ProcessFilterAction, ProcessFilterOptions } from '../models/process-filter-cloud.model';
import { ProcessFilterCloudModel, ProcessFilterProperties, ProcessFilterAction, ProcessFilterOptions, ProcessSortFilterProperties } from '../models/process-filter-cloud.model';
import { TranslationService, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
import { ProcessFilterCloudService } from '../services/process-filter-cloud.service';
import { ProcessFilterDialogCloudComponent } from './process-filter-dialog-cloud.component';
@ -260,9 +260,8 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
get createSortProperties(): ProcessFilterOptions[] {
this.checkMandatorySortProperties();
const sortProperties = this.sortProperties.map((property: string) => {
return <ProcessFilterOptions> { label: property.charAt(0).toUpperCase() + property.slice(1), value: property };
});
const defaultSortProperties = this.createProcessSortProperties();
const sortProperties = defaultSortProperties.filter((sortProperty: ProcessFilterProperties) => this.isValidProperty(this.sortProperties, sortProperty));
return sortProperties;
}
@ -538,6 +537,71 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
];
}
createProcessSortProperties(): ProcessSortFilterProperties[] {
return [
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.ID',
key: 'id',
value: 'id'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_NAME',
key: 'name',
value: 'name'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.START_DATE',
key: 'startDate',
value: 'startDate'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.STATUS',
key: 'status',
value: 'status'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.INITIATOR',
key: 'initiator',
value: 'initiator'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.APP_NAME',
key: 'appName',
value: 'appName'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.APP_VERSION',
key: 'appVersion',
value: 'appVersion'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_INS_ID',
key: 'processInstanceId',
value: 'processInstanceId'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_DEF_ID',
key: 'processDefinitionId',
value: 'processDefinitionId'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_DEF_KEY',
key: 'processDefinitionKey',
value: 'processDefinitionKey'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.LAST_MODIFIED',
key: 'lastModified',
value: 'lastModified'
},
{
label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.BUSINESS_KEY',
key: 'businessKey',
value: 'businessKey'
}
];
}
createProcessFilterProperties(currentProcessFilter: ProcessFilterCloudModel): ProcessFilterProperties[] {
return [
new ProcessFilterProperties({

6
lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts
View File

@ -99,3 +99,9 @@ export class ProcessFilterProperties {
}
}
}
export interface ProcessSortFilterProperties {
label: string;
value: string;
key: string;
}