This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1748 by this push:
new 84d7c1f [DLAB-1748]: Fixed bug with autocomplete
84d7c1f is described below
commit 84d7c1f1bab850bb65ea110fab4f7d3546537dc4
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Thu Jul 16 11:42:09 2020 +0300
[DLAB-1748]: Fixed bug with autocomplete
---
.../install-libraries/install-libraries.component.html | 9 ++++++---
.../exploratory/install-libraries/install-libraries.component.ts | 7 ++++---
.../form-controls/dropdown-list/dropdown-list.component.html | 4 ++--
.../form-controls/dropdown-list/dropdown-list.component.ts | 5 +++++
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index 76edd7b..5d53b59 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -41,13 +41,13 @@
<div class="control-group constol-select">
<label class="label">Select resource</label>
<div class="control">
- <dropdown-list #resourceSelect
(selectedItem)="onUpdate($event)"></dropdown-list>
+ <dropdown-list #resourceSelect
(selectedItem)="onUpdate($event)" (emitClick)="emitClick()"></dropdown-list>
</div>
</div>
<div class="control-group control-select">
<label class="label">Select group</label>
<div class="control">
- <dropdown-list #groupSelect
(selectedItem)="onUpdate($event)"></dropdown-list>
+ <dropdown-list #groupSelect (selectedItem)="onUpdate($event)"
(emitClick)="emitClick()"></dropdown-list>
<span class="error-message" *ngIf="!group &&
libSearch.value">Group field is required. Please choose appropriate
group.</span>
</div>
</div>
@@ -59,8 +59,11 @@
<mat-form-field class="chip-list">
<input
type="text"
- [placeholder]="group === 'java' ? 'Enter library name in
<groupId>:<artifactId>:<versionId> format' : 'Enter library name in
<name>:<version> format(version is not required)'"
+ [placeholder]="group === 'java' ?
+ 'Enter library name in <groupId>:<artifactId>:<versionId>
format' :
+ 'Enter library name in <name>:<version> format(version is not
required)'"
matInput
+ #trigger="matAutocompleteTrigger"
[formControl]="libSearch"
[value]="query"
[matAutocomplete]="auto"
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index fa26a34..2f22fb9 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -81,6 +81,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
@ViewChild('groupSelect', { static: false }) group_select;
@ViewChild('resourceSelect', { static: false }) resource_select;
+ @ViewChild('trigger', { static: false }) matAutoComplete;
public isLibInfoOpened = { };
private isLibExist: boolean;
@@ -378,9 +379,9 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
LibInfoDialogComponent, { data: {lib, type}, width: '550px', panelClass:
'error-modalbox' });
}
- // showlibinfo(lib: any) {
- // this.isLibInfoOpened[lib.name] = !this.isLibInfoOpened[lib.name];
- // }
+ public emitClick() {
+ this.matAutoComplete.closePanel();
+ }
}
@Component({
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.html
index e3dae92..13d6b7d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.html
@@ -17,8 +17,8 @@
~ under the License.
-->
-<div class="dropdown-list">
- <button class="dropdown-toggle" type="button" #list
(click)="actions.toggle($event, list)">
+<div class="dropdown-list" >
+ <button class="dropdown-toggle" type="button" #list (click)="emitEvent()"
(click)="actions.toggle($event, list)">
<span class="title"><span [innerHTML]="label || 'None'"></span></span>
<span class="caret-btn"><i
class="material-icons">keyboard_arrow_down</i></span>
</button>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.ts
index 7622adf..eccceb6 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/dropdown-list/dropdown-list.component.ts
@@ -44,6 +44,7 @@ export class DropdownListComponent {
empty: boolean = false;
@Output() selectedItem: EventEmitter<{}> = new EventEmitter();
+ @Output() emitClick: EventEmitter<{}> = new EventEmitter();
public selectOptions($event: Event, value: any, index: number): void {
this.label = this.map ? this.map[value] : (this.empty && !value ? value :
value[this.byField]);
@@ -69,4 +70,8 @@ export class DropdownListComponent {
private onUpdate(): void {
this.selectedItem.emit({ model: this.model });
}
+
+ public emitEvent() {
+ this.emitClick.emit();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
