From ab3bb9002fe9f660336f0193fd9cd334a45ed84f Mon Sep 17 00:00:00 2001 From: Geeta Mandakini Ayyalasomayajula <45559635+gmandakini@users.noreply.github.com> Date: Thu, 13 Jun 2019 11:04:46 +0100 Subject: [PATCH] [ADF-4288] -Sort Process Custom filters (#4826) * Update data-table-component.page.ts * new pr * fix error - sortOrder.toLowerCase is not a function * new pr * new process definition added * taking the development branch changes --- .../editProcessFilter.config.ts | 57 +++++++ .../process-custom-filters.e2e.ts | 150 ++++++++++++++---- .../processList-cloud-component.e2e.ts | 4 +- .../processListCloud.config.ts | 16 +- e2e/resources/activiti7/candidatebaseapp.zip | Bin 4517 -> 5976 bytes ...dit-process-filter-cloud-component.page.ts | 5 + 6 files changed, 187 insertions(+), 45 deletions(-) create mode 100644 e2e/process-services-cloud/editProcessFilter.config.ts diff --git a/e2e/process-services-cloud/editProcessFilter.config.ts b/e2e/process-services-cloud/editProcessFilter.config.ts new file mode 100644 index 0000000000..4c11ba99c2 --- /dev/null +++ b/e2e/process-services-cloud/editProcessFilter.config.ts @@ -0,0 +1,57 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export class EditProcessFilterConfiguration { + + getConfiguration() { + return { + 'filterProperties': + [ + 'appName', + 'status', + 'sort', + 'order', + 'processName', + 'lastModified', + 'processInstanceId', + 'initiator', + 'processDefinitionId', + 'processDefinitionKey', + 'startDate', + 'businessKey' + ], + 'sortProperties': + [ + 'id', + 'name', + 'status', + 'initiator', + 'processDefinitionId', + 'processDefinitionKey', + 'lastModified', + 'startDate', + 'businessKey' + ], + 'actions': + [ + 'save', + 'saveAs', + 'delete' + ] + }; + } +} diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index c2303a1e15..4e5e0f2945 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -17,7 +17,7 @@ import { TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, ApiService, SettingsPage, IdentityService, GroupIdentityService + LoginSSOPage, ApiService, SettingsPage, IdentityService, GroupIdentityService, StringUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; @@ -25,6 +25,8 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas import { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; import resources = require('../util/resources'); import { browser } from 'protractor'; +import { ProcessListCloudConfiguration } from './processListCloud.config'; +import { EditProcessFilterConfiguration } from './editProcessFilter.config'; xdescribe('Process list cloud', () => { @@ -39,6 +41,10 @@ xdescribe('Process list cloud', () => { browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers ); + const processListCloudConfiguration = new ProcessListCloudConfiguration(); + const editProcessFilterConfiguration = new EditProcessFilterConfiguration(); + const processListCloudConfigFile = processListCloudConfiguration.getConfiguration(); + const editProcessFilterConfigFile = editProcessFilterConfiguration.getConfiguration(); let tasksService: TasksService; let identityService: IdentityService; @@ -47,7 +53,7 @@ xdescribe('Process list cloud', () => { let processInstancesService: ProcessInstancesService; let queryService: QueryService; - let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo; + let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo, anotherProcessInstance; const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; beforeAll(async (done) => { @@ -63,14 +69,30 @@ xdescribe('Process list cloud', () => { processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService.getProcessDefinitionByName('candidateGroupProcess', candidateBaseApp); + const anotherProcessDefinition = await processDefinitionService.getProcessDefinitionByName('anotherCandidateGroupProcess', candidateBaseApp); processInstancesService = new ProcessInstancesService(apiService); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); - runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); - switchProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); + runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { + 'name': StringUtil.generateRandomString(), + 'businessKey': StringUtil.generateRandomString() + }); - completedProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); + anotherProcessInstance = await processInstancesService.createProcessInstance(anotherProcessDefinition.entry.key, candidateBaseApp, { + 'name': StringUtil.generateRandomString(), + 'businessKey': StringUtil.generateRandomString() + }); + + switchProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { + 'name': StringUtil.generateRandomString(), + 'businessKey': StringUtil.generateRandomString() + }); + + completedProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { + 'name': StringUtil.generateRandomString(), + 'businessKey': StringUtil.generateRandomString() + }); queryService = new QueryService(apiService); const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp); @@ -83,34 +105,15 @@ xdescribe('Process list cloud', () => { browser.params.config.oauth2.host, browser.params.config.identityHost); loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify({ - 'filterProperties': [ - 'appName', - 'status', - 'processInstanceId', - 'order', - 'sort', - 'initiator', - 'order' - ], - 'sortProperties': [ - 'id', - 'name', - 'status', - 'startDate' - ], - 'actions': [ - 'save', - 'saveAs', - 'delete' - ] - })); + await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify(editProcessFilterConfigFile)); + await LocalStorageUtil.setConfigField('adf-cloud-process-list', JSON.stringify(processListCloudConfigFile)); done(); - }, 5 * 60 * 1000); + }); afterAll(async (done) => { await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); await identityService.deleteIdentityUser(testUser.idIdentityService); + await processInstancesService.deleteProcessInstance(anotherProcessInstance.id, candidateBaseApp); done(); }); @@ -144,6 +147,69 @@ xdescribe('Process list cloud', () => { }); + it('[C305054] Should display processes ordered by status when Status is selected from sort dropdown', async () => { + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ALL') + .setSortFilterDropDown('Status').setOrderFilterDropDown('ASC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Status')).toBe(true); + + processCloudDemoPage.editProcessFilterCloudComponent().setOrderFilterDropDown('DESC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Status')).toBe(true); + }); + + it('[C305054] Should display processes ordered by initiator when Initiator is selected from sort dropdown', async () => { + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ALL') + .setSortFilterDropDown('Initiator').setOrderFilterDropDown('ASC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Initiator')).toBe(true); + + processCloudDemoPage.editProcessFilterCloudComponent().setOrderFilterDropDown('DESC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Initiator')).toBe(true); + }); + + it('[C305054] Should display processes ordered by processdefinitionid date when ProcessDefinitionId is selected from sort dropdown', async () => { + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ALL') + .setSortFilterDropDown('ProcessDefinitionId').setOrderFilterDropDown('ASC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Process Definition Id')).toBe(true); + + processCloudDemoPage.editProcessFilterCloudComponent().setOrderFilterDropDown('DESC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Process Definition Id')).toBe(true); + }); + + it('[C305054] Should display processes ordered by processdefinitionkey date when ProcessDefinitionKey is selected from sort dropdown', async () => { + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ALL') + .setSortFilterDropDown('ProcessDefinitionKey').setOrderFilterDropDown('ASC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Process Definition Key')).toBe(true); + + processCloudDemoPage.editProcessFilterCloudComponent().setOrderFilterDropDown('DESC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Process Definition Key')).toBe(true); + }); + + it('[C305054] Should display processes ordered by last modified date when Last Modified is selected from sort dropdown', async () => { + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ALL') + .setSortFilterDropDown('LastModified').setOrderFilterDropDown('ASC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Last Modified')).toBe(true); + + processCloudDemoPage.editProcessFilterCloudComponent().setOrderFilterDropDown('DESC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Last Modified')).toBe(true); + }); + + it('[C305054] Should display processes ordered by business key date when BusinessKey is selected from sort dropdown', async () => { + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ALL') + .setSortFilterDropDown('BusinessKey').setOrderFilterDropDown('ASC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Business Key')).toBe(true); + + processCloudDemoPage.editProcessFilterCloudComponent().setOrderFilterDropDown('DESC'); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Business Key')).toBe(true); + }); + + it('[C305054] Should display the actions filters Save, SaveAs and Delete', async () => { + processCloudDemoPage.allProcessesFilter().clickProcessFilter(); + processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); + expect(processCloudDemoPage.getActiveFilterName()).toBe('All Processes'); + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsDisplayed().checkSaveAsButtonIsDisplayed() + .checkDeleteButtonIsDisplayed(); + }); + it('[C297697] The value of the filter should be preserved when saving it', async () => { processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader() .setProcessInstanceId(completedProcess.entry.id); @@ -194,6 +260,34 @@ xdescribe('Process list cloud', () => { BrowserActions.closeMenuAndDialogs(); }); + describe('Process List - Check Action Filters', () => { + + beforeEach(async (done) => { + await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify({ + 'actions': [ + 'save', + 'saveAs' + ] + })); + navigationBarPage.navigateToProcessServicesCloudPage(); + appListCloudComponent.checkApsContainer(); + appListCloudComponent.goToApp(candidateBaseApp); + tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded(); + processCloudDemoPage.clickOnProcessFilters(); + done(); + }); + + it('[C305054] Should display the actions filters Save and SaveAs, Delete button is not displayed', async () => { + processCloudDemoPage.allProcessesFilter().clickProcessFilter(); + processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); + expect(processCloudDemoPage.getActiveFilterName()).toBe('All Processes'); + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsDisplayed().checkSaveAsButtonIsDisplayed() + .checkDeleteButtonIsNotDisplayed(); + }); + + }); + }); }); diff --git a/e2e/process-services-cloud/processList-cloud-component.e2e.ts b/e2e/process-services-cloud/processList-cloud-component.e2e.ts index f60548f3ee..bdb47e40b4 100644 --- a/e2e/process-services-cloud/processList-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/processList-cloud-component.e2e.ts @@ -100,7 +100,7 @@ describe('Process list cloud', () => { it('[C291997] Should be able to change the default columns', async () => { - expect(processCloudDemoPage.processListCloudComponent().getDataTable().getNumberOfColumns()).toBe(12); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().getNumberOfColumns()).toBe(10); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('id'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('name'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('status'); @@ -109,8 +109,6 @@ describe('Process list cloud', () => { processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('businessKey'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('initiator'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('lastModified'); - processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('processName'); - processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('processId'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('processDefinitionId'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('processDefinitionKey'); diff --git a/e2e/process-services-cloud/processListCloud.config.ts b/e2e/process-services-cloud/processListCloud.config.ts index 875b3c2e2b..5c75beffc8 100644 --- a/e2e/process-services-cloud/processListCloud.config.ts +++ b/e2e/process-services-cloud/processListCloud.config.ts @@ -70,28 +70,16 @@ export class ProcessListCloudConfiguration { 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.LAST_MODIFIED', 'sortable': true }, - { - 'key': 'entry.processName', - 'type': 'text', - 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.PROCESS_NAME', - 'sortable': true - }, - { - 'key': 'entry.processId', - 'type': 'text', - 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.PROCESS_ID', - 'sortable': true - }, { 'key': 'entry.processDefinitionId', 'type': 'text', - 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.PROCESS_DEFINITION_ID', + 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.PROCESS_DEF_ID', 'sortable': true }, { 'key': 'entry.processDefinitionKey', 'type': 'text', - 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.PROCESS_DEFINITION_KEY', + 'title': 'ADF_CLOUD_PROCESS_LIST.PROPERTIES.PROCESS_DEF_KEY', 'sortable': true } ] diff --git a/e2e/resources/activiti7/candidatebaseapp.zip b/e2e/resources/activiti7/candidatebaseapp.zip index 83d8f45b5a072657bad0e4154f3447a3ee31acf6..318d6be329b32b7d54aca0a95481ffc5cee71713 100644 GIT binary patch delta 1479 zcmZ3gd_#{nz?+#xgn@&DgCX4GmBOU8=N&9Rj1xsa(T(N)ziXmML)Tr_fg8O&3E#b>*s64oF}Q> zy0>BH^LfSZzZ%BG<{#er%`f=eqZ91c4zNh|7WhPn{CM#6r(gNOuTLIj&1@0;!cm(l zC~Pz(TS&Yx|MX1$FejCHi8*Go52jgkTt3jSEK_p7+`H%X6|T-pHg|A~BywqmO!Pf? zG%{I{#+Q+oSox2NO z>K-#|efHfs z@5|m?mU7+FsS{RtvhqldZ!!Pem+`67L{HYVPMVZ*QAd2O++n_lasH>KuvD8DiV6N) z`=K${^Ts*$3)A9f@G2)gZC=Q{MKtxG*Oc>ai;ulHWw~y%^;FhG+1|Z7Wv^J4dCi?x zfBVH0@fXVjuK!_Qcvtw6c-4j6*oA%8f9~_no!B5(5)=O_E`Hlnqx|Nw&OOC07b9=$ zvi9GZw#l~eE6Ws%rA;v}Bw44}{ae*=>TP>#?>Da3$4w_&E@epFZSdv!)P->ZpY+eX z_}k{I_m3&So1Mef^takmCI*H>oD2-mjHn68i72_rjKLmzZW5V%k6%dAnt^d|x>q^Y z`~*@VP%nG>AfJN)55tA}myyC*Zhv`$FEwXwlU3PNFW&e5gWLt)v<)S!Cnc+2sg=F% zda|qG9Jk{3I)`N!xB5Ie?02Ezj%(62?X(&5^=B_x^l7D8fnJ(afBe>cARlPVV)hIJ zX8a@|Mkz{=Juq39H&!J|>nama2|LH1C40AP0hMclwJ7$?JGMzy;4w-Zn7Z z#5Vy`0gz_h7A4Vc~{&}ITEdyoSXRQ4c%2rmQnup?9w$vXsiqd3kF*{`4| zL4ZjDI4mJDf+p(;@+gA*fgCoX3~~q?7`g=+CL8jaOzs!t;NxQ8V$fk_U=R}mDF6W7 CBSJm^ delta 223 zcmcbiw^W%oz?+#xgn@&DgWpV9*5O0B=Sn5eB#=lU0R0z#0mK z+Q9Trp$TBRN4Nt_i;GMG(`!U(z_hk#n*z`ke#mBuGROfjlM3?G;o J80PbWBmiX1MzjC` diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts index 13a4a6629c..62dc4148ad 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts @@ -155,6 +155,11 @@ export class EditProcessFilterCloudComponentPage { return this; } + checkDeleteButtonIsNotDisplayed() { + BrowserVisibility.waitUntilElementIsNotVisible(this.deleteButton); + return this; + } + checkSaveButtonIsEnabled() { BrowserVisibility.waitUntilElementIsVisible(this.saveButton); return this.saveButton.isEnabled();