[incubator-dlab] 20/29: [DLAB-642]: added check before credentials dialog opening

[ankovalyshyn]

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

commit 4fb5bd8121286fc518af1c0c783c1f94cd8cf38d
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Tue May 28 12:52:43 2019 +0300

    [DLAB-642]: added check before credentials dialog opening
---
 .../manage-ungit/manage-ungit.component.scss       |  1 +
 .../manage-ungit/manage-ungit.component.ts         | 25 +++++++++++-----------
 .../resources/webapp/src/assets/styles/_theme.scss |  3 +--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss
 
b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss
index 2c17f44..228c048 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss
@@ -95,6 +95,7 @@
         position: absolute;
         top: 45px;
         padding: 0;
+        font-size: 12px;
       }
     }
     .col {
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts
index 46acefe..7bd6538 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts
@@ -29,7 +29,7 @@ import { ManageUngitService } from '../../core/services';
   selector: 'dlab-manage-ungit',
   templateUrl: './manage-ungit.component.html',
   styleUrls: ['./manage-ungit.component.scss',
-              
'../exploratory/install-libraries/install-libraries.component.scss']
+    '../exploratory/install-libraries/install-libraries.component.scss']
 })
 export class ManageUngitComponent implements OnInit {
   model: MangeUngitModel;
@@ -57,21 +57,22 @@ export class ManageUngitComponent implements OnInit {
   }
 
   ngOnInit() {
-    // this.bindDialog.onClosing = () => this.cancelAllModifyings();
-    this.open();
-
     this.initFormModel();
-    this.getGitCredentials();
+    this.model.getGitCredentials().subscribe(
+      (credentials: any) => {
+        this.gitCredentials = credentials.git_creds || [];
+        this.open();
+      }, () => this.open());
   }
 
   public open(): void {
-    this.model = new MangeUngitModel(response => { },
-    error => this.toastr.error(error.message || 'Manage git credentials 
failed!', 'Oops!'),
-    () => {
-      if (!this.gitCredentials.length)
-        this.tabGroup.selectedIndex = 1;
-    },
-    this.manageUngitService);
+    this.model = new MangeUngitModel(() => {},
+      error => this.toastr.error(error.message || 'Manage git credentials 
failed!', 'Oops!'),
+      () => {
+        if (!this.gitCredentials.length)
+          this.tabGroup.selectedIndex = 1;
+      },
+      this.manageUngitService);
   }
 
   public resetForm(): void {
diff --git 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 434e325..da8c808 100644
--- 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -21,12 +21,11 @@
 .mat-raised-button {
   &.butt {
     width: 160px;
-    height: 35px;
     padding: 0 20px;
     border-radius: 0;
     font-style: normal;
     font-weight: 600;
-    font-size: 16px;
+    font-size: 15px;
     font-family: 'Open Sans', sans-serif;
     color: #577289;
     i {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org