You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/12 10:22:41 UTC
[incubator-dlab] branch feature/projects updated: [DLAB-855]:
removed extra scrollbar from cluster name popup
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new b7569c8 [DLAB-855]: removed extra scrollbar from cluster name popup
b7569c8 is described below
commit b7569c861c5f6d815230cc115d18622d0b7f3462
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Jul 12 13:22:29 2019 +0300
[DLAB-855]: removed extra scrollbar from cluster name popup
---
.../cluster-details/cluster-details.component.scss | 10 ++++++++++
.../cluster-details/cluster-details.component.ts | 13 +++----------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss
index 63eb269..0c26eaf 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss
@@ -17,13 +17,19 @@
* under the License.
*/
+.detail-dialog {
+ overflow: hidden;
+}
+
.checkbox-group {
position: relative;
+
label {
input[type="checkbox"] {
margin: 10px 0;
}
}
+
span {
&.danger_color {
position: absolute;
@@ -32,16 +38,19 @@
}
}
}
+
.config-details {
height: 0;
opacity: 0;
visibility: hidden;
text-align: left;
position: relative;
+
&.show {
height: 200px;
visibility: visible;
opacity: 1;
+
textarea {
height: 100%;
resize: none;
@@ -49,6 +58,7 @@
line-height: 1.5;
font-family: Consolas, monospace;
}
+
span {
.danger_color {
position: absolute;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
index 186c519..e3345d9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
@@ -52,10 +52,9 @@ export class DetailComputationalResourcesComponent implements OnInit {
public dialogRef: MatDialogRef<DetailComputationalResourcesComponent>,
private dataengineConfigurationService: DataengineConfigurationService,
private _fb: FormBuilder
- ) {}
+ ) { }
ngOnInit() {
- // this.bindDialog.onClosing = () => this.resetDialog();
this.open(this.data.environment, this.data.resource)
}
@@ -90,7 +89,7 @@ export class DetailComputationalResourcesComponent implements OnInit {
this.dataengineConfigurationService
.getClusterConfiguration(this.environment.name, this.resource.computational_name)
.subscribe((result: any) => this.config = result,
- error => this.toastr.error(error.message || 'Configuration loading failed!', 'Oops!'));
+ error => this.toastr.error(error.message || 'Configuration loading failed!', 'Oops!'));
}
public editClusterConfiguration(data): void {
@@ -99,13 +98,7 @@ export class DetailComputationalResourcesComponent implements OnInit {
.subscribe(result => {
this.dialogRef.close();
},
- error => this.toastr.error(error.message || 'Edit onfiguration failed!', 'Oops!'));
- }
-
- public resetDialog() {
- this.initFormModel();
-
- if (this.configuration) this.configuration.nativeElement['checked'] = false;
+ error => this.toastr.error(error.message || 'Edit onfiguration failed!', 'Oops!'));
}
private initFormModel(): void {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org