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-3109] Change order of default process filters for DW (#5760)

Browse Source 
* [ACA-3109] Change order of default process filters

* Updated strings to constants; Fixed failing e2e

* fixed lint

* Fixed failed e2e
This commit is contained in:
Mercy Chrysolite
2020-06-16 14:14:28 +05:30
committed by GitHub
parent 904c7eff7c
commit 0349280d42
13 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import { browser } from 'protractor';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import CONSTANTS = require('../util/constants');
describe('Edit process filters cloud', () => {
@@ -43,6 +44,8 @@ describe('Edit process filters cloud', () => {
let testUser, groupInfo;
const PROCESSES = CONSTANTS.PROCESS_FILTERS;
beforeAll(async () => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
@@ -72,7 +75,7 @@ describe('Edit process filters cloud', () => {
it('[C291804] Delete Save and Save as actions should be displayed when clicking on custom filter header', async () => {
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('All Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('All');
await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsDisplayed();
await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsDisplayed();
await processCloudDemoPage.editProcessFilterCloudComponent().checkDeleteButtonIsDisplayed();
@@ -183,7 +186,7 @@ describe('Edit process filters cloud', () => {
await browser.driver.sleep(1000);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('All Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(CONSTANTS.PROCESS_FILTERS.RUNNING);
await processCloudDemoPage.processFilterCloudComponent.checkProcessFilterNotDisplayed('New');
});
@@ -195,12 +198,12 @@ describe('Edit process filters cloud', () => {
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().getFilterName()).toEqual('Cancel');
await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnCancelButton();
await processCloudDemoPage.processFilterCloudComponent.checkProcessFilterNotDisplayed('Cancel');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('All Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.ALL);
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('All Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.ALL);
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate');
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
});
@@ -230,7 +233,7 @@ describe('Edit process filters cloud', () => {
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().checkCancelButtonIsEnabled()).toEqual(true);
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().checkSaveButtonIsEnabled()).toEqual(true);
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().getTitle()).toEqual('Save filter as');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().getFilterName()).toEqual('All Processes');
await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().getFilterName()).toEqual(PROCESSES.ALL);
await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnCancelButton();
});
});

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

@@ -200,6 +200,7 @@ describe('Process list cloud', () => {
});
it('[C297697] The value of the filter should be preserved when saving it', async () => {
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setProcessInstanceId(completedProcess.entry.id);

14
e2e/process-services-cloud/process-filters-cloud.e2e.ts
View File

@@ -32,6 +32,7 @@ import { browser } from 'protractor';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import CONSTANTS = require('../util/constants');
describe('Process filters cloud', () => {
@@ -53,6 +54,7 @@ describe('Process filters cloud', () => {
let runningProcess, completedProcess, testUser, groupInfo;
const candidateBaseApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.name;
const PROCESSES = CONSTANTS.PROCESS_FILTERS;
beforeAll(async () => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
@@ -107,17 +109,17 @@ describe('Process filters cloud', () => {
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await editProcessFilterCloudComponentPage.openFilter();
await editProcessFilterCloudComponentPage.setProcessName(runningProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.RUNNING);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(runningProcess.entry.id);
await processCloudDemoPage.processFilterCloudComponent.clickCompletedProcessesFilter();
await editProcessFilterCloudComponentPage.setProcessName(runningProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Completed Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.COMPLETED);
await processCloudDemoPage.processListCloudComponent().checkContentIsNotDisplayedById(runningProcess.entry.id);
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await editProcessFilterCloudComponentPage.setProcessName(runningProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('All Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.ALL);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(runningProcess.entry.id);
});
@@ -125,17 +127,17 @@ describe('Process filters cloud', () => {
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await editProcessFilterCloudComponentPage.openFilter();
await editProcessFilterCloudComponentPage.setProcessName(completedProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.RUNNING);
await processCloudDemoPage.processListCloudComponent().checkContentIsNotDisplayedById(completedProcess.entry.id);
await processCloudDemoPage.processFilterCloudComponent.clickCompletedProcessesFilter();
await editProcessFilterCloudComponentPage.setProcessName(completedProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Completed Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.COMPLETED);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(completedProcess.entry.id);
await processCloudDemoPage.processFilterCloudComponent.clickAllProcessesFilter();
await editProcessFilterCloudComponentPage.setProcessName(completedProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('All Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.ALL);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(completedProcess.entry.id);
});
});

5
e2e/process-services-cloud/process-header-cloud.e2e.ts
View File

@@ -51,6 +51,7 @@ describe('Process Header cloud component', () => {
let testUser, groupInfo;
let runningProcess, runningCreatedDate, parentCompleteProcess, childCompleteProcess, completedCreatedDate;
const PROCESSES = CONSTANTS.PROCESS_FILTERS;
beforeAll(async () => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
@@ -100,7 +101,7 @@ describe('Process Header cloud component', () => {
await processCloudDemoPage.processFilterCloudComponent.clickOnProcessFilters();
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ processName: runningProcess.entry.name });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
@@ -123,7 +124,7 @@ describe('Process Header cloud component', () => {
await processCloudDemoPage.processFilterCloudComponent.clickOnProcessFilters();
await processCloudDemoPage.processFilterCloudComponent.clickCompletedProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Completed Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.COMPLETED);
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ initiator: testUser.username });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();

3
e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts
View File

@@ -29,6 +29,7 @@ import { browser } from 'protractor';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import CONSTANTS = require('../util/constants');
describe('Process list cloud', () => {
@@ -103,7 +104,7 @@ describe('Process list cloud', () => {
it('[C315236] Should be able to see and execute custom action menu', async () => {
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setProcessName(editProcess.entry.name);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(CONSTANTS.PROCESS_FILTERS.RUNNING);
await processCloudDemoPage.processListCloudComponent().checkProcessListIsLoaded();
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(editProcess.entry.id);
await processCloudDemoPage.processListCloudComponent().clickOptionsButton(editProcess.entry.id);

16
e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
View File

@@ -22,6 +22,7 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config';
import CONSTANTS = require('../util/constants');
describe('Process list cloud', () => {
@@ -48,6 +49,7 @@ describe('Process list cloud', () => {
const processInstances = [];
const editProcessFilterConfiguration = new EditProcessFilterConfiguration();
const editProcessFilterConfigFile = editProcessFilterConfiguration.getConfiguration();
const PROCESSES = CONSTANTS.PROCESS_FILTERS;
beforeAll(async () => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
@@ -81,7 +83,7 @@ describe('Process list cloud', () => {
await appListCloudComponent.goToApp(simpleApp);
await processCloudDemoPage.processFilterCloudComponent.clickOnProcessFilters();
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(PROCESSES.RUNNING);
await tasksCloudDemoPage.clickSettingsButton();
await tasksCloudDemoPage.disableDisplayProcessDetails();
await tasksCloudDemoPage.clickAppButton();
@@ -92,7 +94,7 @@ describe('Process list cloud', () => {
await tasksCloudDemoPage.selectSelectionMode('None');
await tasksCloudDemoPage.clickAppButton();
await processCloudDemoPage.processFilterCloudComponent.isProcessFiltersListVisible();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('initiator', testUser.username);
await processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]);
@@ -104,7 +106,7 @@ describe('Process list cloud', () => {
await tasksCloudDemoPage.selectSelectionMode('Single');
await tasksCloudDemoPage.clickAppButton();
await processCloudDemoPage.processFilterCloudComponent.isProcessFiltersListVisible();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ 'initiator': testUser.username });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
@@ -121,7 +123,7 @@ describe('Process list cloud', () => {
await tasksCloudDemoPage.selectSelectionMode('Multiple');
await tasksCloudDemoPage.clickAppButton();
await processCloudDemoPage.processFilterCloudComponent.isProcessFiltersListVisible();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ 'initiator': testUser.username });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]);
@@ -138,7 +140,7 @@ describe('Process list cloud', () => {
await tasksCloudDemoPage.enableMultiSelection();
await tasksCloudDemoPage.clickAppButton();
await processCloudDemoPage.processFilterCloudComponent.isProcessFiltersListVisible();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ 'initiator': testUser.username });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await processCloudDemoPage.processListCloudComponent().checkCheckboxById(processInstances[0]);
@@ -158,7 +160,7 @@ describe('Process list cloud', () => {
await processCloudDemoPage.processFilterCloudComponent.isProcessFiltersListVisible();
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ 'initiator': testUser.username });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await browser.sleep(1000);
await processCloudDemoPage.processListCloudComponent().getDataTable().checkAllRowsButtonIsDisplayed();
await processCloudDemoPage.processListCloudComponent().getDataTable().checkAllRows();
@@ -179,7 +181,7 @@ describe('Process list cloud', () => {
await tasksCloudDemoPage.enableTestingMode();
await tasksCloudDemoPage.clickAppButton();
await processCloudDemoPage.processFilterCloudComponent.isProcessFiltersListVisible();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toEqual(PROCESSES.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ 'initiator': testUser.username });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await processCloudDemoPage.processListCloudComponent().checkCheckboxById(processInstances[0]);

5
e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts
View File

@@ -32,6 +32,7 @@ import {
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
import CONSTANTS = require('../util/constants');
describe('Process Task - Attach content file', () => {
@@ -98,7 +99,7 @@ describe('Process Task - Attach content file', () => {
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setProcessName('upload process');
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(CONSTANTS.PROCESS_FILTERS.RUNNING);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(processInstance.entry.id);
await processCloudDemoPage.processListCloudComponent().selectRowById(processInstance.entry.id);
@@ -134,7 +135,7 @@ describe('Process Task - Attach content file', () => {
await processCloudDemoPage.editProcessFilterCloudComponent().setProcessName('upload process');
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Completed Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(CONSTANTS.PROCESS_FILTERS.COMPLETED);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(processInstance.entry.id);
});

3
e2e/process-services-cloud/start-process-cloud.e2e.ts
View File

@@ -19,6 +19,7 @@ import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, Ide
import { browser, protractor } from 'protractor';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import CONSTANTS = require('../util/constants');
describe('Start Process', () => {
@@ -107,7 +108,7 @@ describe('Start Process', () => {
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setProcessName(processName);
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(CONSTANTS.PROCESS_FILTERS.RUNNING);
await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(processName);
});
});

3
e2e/process-services-cloud/start-task-form-cloud.e2e.ts
View File

@@ -43,6 +43,7 @@ import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/p
import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page';
import { FileModel } from '../models/ACS/file.model';
import { BreadCrumbDropdownPage } from '../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page';
import CONSTANTS = require('../util/constants');
describe('Start Task Form', () => {
@@ -246,7 +247,7 @@ describe('Start Task Form', () => {
await expect(await startProcessPage.checkStartProcessButtonIsEnabled()).toBe(true);
await startProcessPage.clickStartProcessButton();
await processCloudDemoPage.processFilterCloudComponent.clickRunningProcessesFilter();
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe('Running Processes');
await expect(await processCloudDemoPage.processFilterCloudComponent.getActiveFilterName()).toBe(CONSTANTS.PROCESS_FILTERS.RUNNING);
await processCloudDemoPage.editProcessFilterCloudComponent().openFilter();
await processCloudDemoPage.editProcessFilterCloudComponent().setProcessName(startEventFormProcess);

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

@@ -102,9 +102,9 @@
"COMPLETED_TASKS": "Completed Tasks"
},
"ADF_CLOUD_PROCESS_FILTERS": {
"ALL_PROCESSES": "All Processes",
"RUNNING_PROCESSES": "Running Processes",
"COMPLETED_PROCESSES": "Completed Processes"
"ALL_PROCESSES": "All",
"RUNNING_PROCESSES": "Running",
"COMPLETED_PROCESSES": "Completed"
},
"ADF_CLOUD_START_TASK": {
"ERROR": {

11
lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts
View File

@@ -287,6 +287,17 @@ describe('ProcessFiltersCloudComponent', () => {
filterButton.click();
});
it('should not emit a filter click event on binding changes', () => {
spyOn(component, 'selectFilterAndEmit').and.callThrough();
const change = new SimpleChange(null, undefined, false);
component.ngOnChanges({ 'filterParam': change });
fixture.detectChanges();
expect(component.selectFilterAndEmit).toHaveBeenCalled();
expect(component.currentFilter).not.toBeDefined();
});
it('should reload filters by appName on binding changes', () => {
spyOn(component, 'getFilters').and.stub();
const appName = 'my-app-1';

8
lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts
View File

@@ -129,8 +129,12 @@ export class ProcessFiltersCloudComponent implements OnInit, OnChanges, OnDestro
* Select and emit the given filter
*/
public selectFilterAndEmit(newParamFilter: FilterParamsModel) {
this.selectFilter(newParamFilter);
this.filterClick.emit(this.currentFilter);
if (newParamFilter) {
this.selectFilter(newParamFilter);
this.filterClick.emit(this.currentFilter);
} else {
this.currentFilter = undefined;
}
}
/**

18
lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts
View File

@@ -258,15 +258,6 @@ export class ProcessFilterCloudService {
*/
private defaultProcessFilters(appName: string): ProcessFilterCloudModel[] {
return [
new ProcessFilterCloudModel({
name: 'ADF_CLOUD_PROCESS_FILTERS.ALL_PROCESSES',
key: 'all-processes',
icon: 'adjust',
appName: appName,
sort: 'startDate',
status: '',
order: 'DESC'
}),
new ProcessFilterCloudModel({
name: 'ADF_CLOUD_PROCESS_FILTERS.RUNNING_PROCESSES',
icon: 'inbox',
@@ -284,6 +275,15 @@ export class ProcessFilterCloudService {
sort: 'startDate',
status: 'COMPLETED',
order: 'DESC'
}),
new ProcessFilterCloudModel({
name: 'ADF_CLOUD_PROCESS_FILTERS.ALL_PROCESSES',
key: 'all-processes',
icon: 'adjust',
appName: appName,
sort: 'startDate',
status: '',
order: 'DESC'
})
];
}