This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1439 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f11194591d1b9cbd3cc58e695847c87214889cc7 Author: Dmytro Gnatyshyn <di1...@ukr.net> AuthorDate: Mon Jan 20 18:32:33 2020 +0200 [DLAB-1439]: Fixed drop down list structure should disappear simultaneously with other items --- .../webapp/src/app/administration/roles/roles.component.ts | 3 +-- .../computational-resource-create-dialog.component.html | 6 ++++-- .../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index 356b1d2..cf2f086 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -172,8 +172,7 @@ export class RolesComponent implements OnInit { } public updateGroupData(groups) { - this.groupsData = groups; - this.groupsData.sort(v => v.group); + this.groupsData = groups.map(v=>v).sort((a,b) => (a.group > b.group) ? 1 : ((b.group > a.group) ? -1 : 0)); this.groupsData.forEach(item => { item.selected_roles = item.roles.map(role => role.description); }); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index c40a5d9..0bbc0e8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -51,7 +51,8 @@ <label class="label">Select template</label> <div class="control selector-wrapper"> <mat-form-field> - <mat-select formControlName="version" disableOptionCentering placeholder="Select template"> + <mat-label>Select template</mat-label> + <mat-select formControlName="version" disableOptionCentering> <mat-option *ngFor="let template of selectedImage.templates" [value]="template.version"> {{ template.version }}</mat-option> <mat-option *ngIf="!selectedImage.templates" class="multiple-select ml-10" disabled>Templates list @@ -122,7 +123,8 @@ <label class="label">{{ DICTIONARY[selectedImage.image].data_engine_slave_instance_size }}</label> <div class="control selector-wrapper"> <mat-form-field> - <mat-select formControlName="shape_slave" disableOptionCentering placeholder="Select {{ DICTIONARY.notebook_instance_size }}"> + <mat-label>Select cluster type</mat-label> + <mat-select formControlName="shape_slave" disableOptionCentering> <mat-optgroup *ngFor="let item of (selectedImage.computation_resources_shapes | keys)" [label]="item.key | underscoreless"> <mat-option *ngFor="let list_item of item.value" [value]="list_item.Type"> diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 8a811e1..bdb98f3 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -295,7 +295,7 @@ mat-dialog-container { .mat-select-panel { &.ng-animating { - visibility: hidden; + display: none; } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org