You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/01/20 16:33:23 UTC
[incubator-dlab] branch DLAB-1439 created (now f111945)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1439
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at f111945 [DLAB-1439]: Fixed drop down list structure should disappear simultaneously with other items
This branch includes the following new commits:
new ca0fb1e Merge branch 'develop' of github.com:apache/incubator-dlab into develop
new f111945 [DLAB-1439]: Fixed drop down list structure should disappear simultaneously with other items
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: Merge branch 'develop' of
github.com:apache/incubator-dlab into develop
Posted by dg...@apache.org.
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 ca0fb1e78056d05ea9cf6ec71da55e9816cbb227
Merge: 0a84520 51f3d37
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Jan 20 10:08:37 2020 +0200
Merge branch 'develop' of github.com:apache/incubator-dlab into develop
.../management/endpoints/endpoints.component.html | 13 ++-
.../management/endpoints/endpoints.component.scss | 112 +++++++++++----------
.../management/endpoints/endpoints.component.ts | 18 +++-
.../app/administration/roles/roles.component.ts | 2 +-
.../resources/webapp/src/app/core/util/patterns.ts | 5 +-
.../resources-grid/resources-grid.component.ts | 2 +-
6 files changed, 87 insertions(+), 65 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1439]: Fixed drop down list structure
should disappear simultaneously with other items
Posted by dg...@apache.org.
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 <di...@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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org