From 13ff89ee8c49b6f427b1228a0ca9922730914e69 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Fri, 14 Sep 2018 10:05:59 +0100 Subject: [PATCH] Revert "autocomplete component added (#3701)" This reverts commit 21d7a8aec2fb82cf98d103697760cb2eb3074102. --- .../adf/process_services/processListPage.js | 2 +- .../adf/process_services/startProcessPage.js | 4 +- .../process_filters_component.e2e.ts | 2 - .../components/start-process.component.html | 26 ++++++----- .../start-process.component.spec.ts | 36 ++++++--------- .../components/start-process.component.ts | 44 ++----------------- 6 files changed, 33 insertions(+), 81 deletions(-) diff --git a/e2e/pages/adf/process_services/processListPage.js b/e2e/pages/adf/process_services/processListPage.js index bd6fedab95..0365ce5466 100644 --- a/e2e/pages/adf/process_services/processListPage.js +++ b/e2e/pages/adf/process_services/processListPage.js @@ -26,7 +26,7 @@ var ProcessListPage = function () { var processListTitle = element(by.css("p[class='adf-empty-content__title']")); var processListSubtitle = element(by.css("p[class='adf-empty-content__subtitle']")); var processDetailsMessage = element(by.css("adf-process-instance-details div[class='ng-star-inserted']")); - var openProcessDropdown = element(by.css("input[aria-label='Number']")); + var openProcessDropdown = element(by.css('mat-select[aria-label="Select Process"]')); var selectProcessDropdown = element.all(by.css('span[class="mat-option-text"]')); var startProcessButton = element(by.css('button[data-automation-id="btn-start"]')); diff --git a/e2e/pages/adf/process_services/startProcessPage.js b/e2e/pages/adf/process_services/startProcessPage.js index f2ca9023fe..655ce185bd 100644 --- a/e2e/pages/adf/process_services/startProcessPage.js +++ b/e2e/pages/adf/process_services/startProcessPage.js @@ -21,8 +21,8 @@ var StartProcessPage = function () { var defaultProcessName = element(by.css("input[id='processName']")); var processNameInput = element(by.id('processName')); - var selectProcessDropdownArrow = element(by.css("input[aria-label='Number']")); - var cancelProcessButton = element(by.id('cancel_process')); + var selectProcessDropdownArrow = element(by.css("div[class='mat-select-arrow-wrapper'] div")); + var cancelProcessButton = element(by.id('cancle_process')); var formStartProcessButton = element(by.css('button[data-automation-id="adf-form-start process"]')); var startProcessButton = element(by.css("button[data-automation-id='btn-start']")); var noProcess = element(by.id('no-process-message')); diff --git a/e2e/process-services/process_filters_component.e2e.ts b/e2e/process-services/process_filters_component.e2e.ts index c570e41fad..2ce219762a 100644 --- a/e2e/process-services/process_filters_component.e2e.ts +++ b/e2e/process-services/process_filters_component.e2e.ts @@ -106,8 +106,6 @@ describe('Process Filters Test', () => { startProcessPage.selectFromProcessDropdown(app.process_title); startProcessPage.clickFormStartProcessButton(); - processFiltersPage.clickRunningFilterButton(); - processFiltersPage.checkFilterIsHighlighted(processFilter.running); processFiltersPage.selectFromProcessList(processTitle.running); diff --git a/lib/process-services/process-list/components/start-process.component.html b/lib/process-services/process-list/components/start-process.component.html index 013ebd04e0..151b745ab9 100644 --- a/lib/process-services/process-list/components/start-process.component.html +++ b/lib/process-services/process-list/components/start-process.component.html @@ -9,25 +9,27 @@ - - - - {{'ADF_PROCESS_LIST.START_PROCESS.FORM.TYPE_PLACEHOLDER' | translate}} - - {{ processDef.name }} - - - +
+ + + {{'ADF_PROCESS_LIST.START_PROCESS.FORM.TYPE_PLACEHOLDER' | translate}} + + {{ processDef.name }} + + + +
- + + @@ -35,7 +37,7 @@ - + diff --git a/lib/process-services/process-list/components/start-process.component.spec.ts b/lib/process-services/process-list/components/start-process.component.spec.ts index d65f145738..02f1c29d72 100644 --- a/lib/process-services/process-list/components/start-process.component.spec.ts +++ b/lib/process-services/process-list/components/start-process.component.spec.ts @@ -143,7 +143,7 @@ describe('StartFormComponent', () => { }); })); - it('should have start button disabled if the process is not selected', async(() => { + it('should have start button disabled if the process is not seleted', async(() => { component.name = 'My new process'; fixture.detectChanges(); fixture.whenStable().then(() => { @@ -154,7 +154,7 @@ describe('StartFormComponent', () => { it('should emit cancel event on cancel Button', async(() => { fixture.detectChanges(); - let cancelButton = fixture.nativeElement.querySelector('#cancel_process'); + let cancelButton = fixture.nativeElement.querySelector('#cancle_process'); let cancelSpy: jasmine.Spy = spyOn(component.cancel, 'emit'); cancelButton.click(); fixture.detectChanges(); @@ -222,7 +222,8 @@ describe('StartFormComponent', () => { component.ngOnChanges({}); fixture.detectChanges(); - expect(component.processDefinitions.length).toBe(2); + let selectElement = fixture.nativeElement.querySelector('mat-select'); + expect(selectElement.children.length).toBe(1); }); it('should display the option def details', () => { @@ -231,7 +232,7 @@ describe('StartFormComponent', () => { component.processDefinitions = testMultipleProcessDefs; fixture.detectChanges(); fixture.whenStable().then(() => { - let selectElement = fixture.nativeElement.querySelector('mat-autocomplete'); + let selectElement = fixture.nativeElement.querySelector('mat-select > .mat-select-trigger'); let optionElement = fixture.nativeElement.querySelectorAll('mat-option'); selectElement.click(); expect(selectElement).not.toBeNull(); @@ -241,7 +242,7 @@ describe('StartFormComponent', () => { }); }); - it('should indicate an error to the user if process definitions cannot be loaded', async(() => { + it('should indicate an error to the user if process defs cannot be loaded', async(() => { getDefinitionsSpy = getDefinitionsSpy.and.returnValue(throwError({})); component.appId = 123; component.ngOnChanges({}); @@ -278,7 +279,7 @@ describe('StartFormComponent', () => { }); })); - it('should select automatically the processDefinition if the app contain only one', async(() => { + it('should select automatically the processDefinition if the app contain oly one', async(() => { getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of(testProcessDefinitions)); component.appId = 123; component.ngOnChanges({}); @@ -288,17 +289,6 @@ describe('StartFormComponent', () => { }); })); - it('should have start button enabled when process is selected', async(() => { - component.selectedProcessDef = testProcessDefRepr; - component.name = 'My process'; - fixture.detectChanges(); - fixture.whenStable().then(() => { - fixture.detectChanges(); - let startBtn = fixture.nativeElement.querySelector('#button-start'); - expect(startBtn.disabled).toBe(false); - }); - })); - describe('dropdown', () => { it('should hide the process dropdown if showSelectProcessDropdown is false', async(() => { @@ -308,12 +298,12 @@ describe('StartFormComponent', () => { component.ngOnChanges({}); fixture.detectChanges(); fixture.whenStable().then(() => { - let selectElement = fixture.nativeElement.querySelector('mat-autocomplete'); + let selectElement = fixture.nativeElement.querySelector('mat-select > .mat-select-trigger'); expect(selectElement).toBeNull(); }); })); - it('should show the process dropdown if showSelectProcessDropdown is true', async(() => { + it('should show the process dropdown if showSelectProcessDropdown is false', async(() => { getDefinitionsSpy = getDefinitionsSpy.and.returnValue(of(testMultipleProcessDefs)); component.appId = 123; component.processDefinitionName = 'My Process 2'; @@ -321,7 +311,7 @@ describe('StartFormComponent', () => { component.ngOnChanges({}); fixture.detectChanges(); fixture.whenStable().then(() => { - let selectElement = fixture.nativeElement.querySelector('mat-autocomplete'); + let selectElement = fixture.nativeElement.querySelector('mat-select > .mat-select-trigger'); expect(selectElement).not.toBeNull(); }); })); @@ -333,7 +323,7 @@ describe('StartFormComponent', () => { component.ngOnChanges({}); fixture.detectChanges(); fixture.whenStable().then(() => { - let selectElement = fixture.nativeElement.querySelector('mat-autocomplete'); + let selectElement = fixture.nativeElement.querySelector('mat-select > .mat-select-trigger'); expect(selectElement).not.toBeNull(); }); })); @@ -361,7 +351,7 @@ describe('StartFormComponent', () => { }); })); - it('should get current processDef', () => { + it('should get current processDeff', () => { component.appId = 456; component.ngOnChanges({ appId: change }); fixture.detectChanges(); @@ -402,7 +392,7 @@ describe('StartFormComponent', () => { }); })); - it('should call service to start process with the variables set up', async(() => { + it('should call service to start process with the variables setted', async(() => { let inputProcessVariable: ProcessInstanceVariable[] = []; let variable: ProcessInstanceVariable = {}; diff --git a/lib/process-services/process-list/components/start-process.component.ts b/lib/process-services/process-list/components/start-process.component.ts index 869ccb6030..27f7965b3e 100644 --- a/lib/process-services/process-list/components/start-process.component.ts +++ b/lib/process-services/process-list/components/start-process.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, EventEmitter, Input, AfterViewInit, OnChanges, +import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core'; import { ActivitiContentService, AppConfigService, AppConfigValues, @@ -26,9 +26,6 @@ import { ProcessDefinitionRepresentation } from './../models/process-definition. import { ProcessInstance } from './../models/process-instance.model'; import { ProcessService } from './../services/process.service'; import { AttachFileWidgetComponent, AttachFolderWidgetComponent } from '../../content-widget'; -import { FormControl } from '@angular/forms'; -import { Observable } from 'rxjs'; -import { map, startWith, delay } from 'rxjs/operators'; @Component({ selector: 'adf-start-process', @@ -36,7 +33,7 @@ import { map, startWith, delay } from 'rxjs/operators'; styleUrls: ['./start-process.component.scss'], encapsulation: ViewEncapsulation.None }) -export class StartProcessInstanceComponent implements AfterViewInit, OnChanges { +export class StartProcessInstanceComponent implements OnChanges { /** (optional) Limit the list of processes that can be started to those * contained in the specified app. @@ -87,9 +84,6 @@ export class StartProcessInstanceComponent implements AfterViewInit, OnChanges { errorMessageId: string = ''; - processControl = new FormControl(); - filteredOptions: Observable; - constructor(private activitiProcess: ProcessService, private formRenderingService: FormRenderingService, private activitiContentService: ActivitiContentService, @@ -98,17 +92,6 @@ export class StartProcessInstanceComponent implements AfterViewInit, OnChanges { this.formRenderingService.setComponentTypeResolver('select-folder', () => AttachFolderWidgetComponent, true); } - ngAfterViewInit() { - setTimeout(() => { - this.filteredOptions = this.processControl.valueChanges - .pipe( - startWith(''), - delay(0), - map(value => this._filter(value)) - ); - }); - } - ngOnChanges(changes: SimpleChanges) { if (changes['values'] && changes['values'].currentValue) { this.moveNodeFromCStoPS(); @@ -117,23 +100,6 @@ export class StartProcessInstanceComponent implements AfterViewInit, OnChanges { this.loadStartProcess(); } - private _filter(value) { - let filterValue = ''; - if (value && value.name) { - filterValue = value.name.toLowerCase(); - } else if (value) { - filterValue = value.toLowerCase(); - } - let processDefArray = this.processDefinitions.filter(option => option.name.toLowerCase() === filterValue); - this.selectedProcessDef = processDefArray.length ? processDefArray[0] : null; - - return this.processDefinitions.filter(option => option.name.toLowerCase().includes(filterValue)); - } - - displayFn(processDef): string { - return processDef ? processDef.name : ''; - } - public loadStartProcess() { this.resetSelectedProcessDefinition(); this.resetErrorMessage(); @@ -251,10 +217,6 @@ export class StartProcessInstanceComponent implements AfterViewInit, OnChanges { } hasProcessName(): boolean { - return !!this.name; - } - - onItemSelect(item) { - this.selectedProcessDef = item; + return this.name ? true : false; } }