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/05/20 11:46:03 UTC

[incubator-dlab] 07/09: added material controllers into ungit component

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit ccc6cc8dd1b8c17408750a8ffb192771d8fb9e73
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon May 20 14:42:37 2019 +0300

    added material controllers into ungit component
---
 .../manage-ungit/manage-ungit.component.html       | 12 ++++----
 .../manage-ungit/manage-ungit.component.ts         | 33 +++++++++-------------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
index c1d1e2c..a8a46dd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
@@ -17,11 +17,11 @@
   ~ under the License.
   -->
 
-<modal-dialog #bindDialog modalClass="manage-ungit modal-xxl">
-  <modal-header>
+<div modalClass="manage-ungit modal-xxl">
+  <header>
     <h4 class="modal-title" id="myModalLabel">Manage Git Credentials</h4>
-  </modal-header>
-  <modal-content class="manage-ungit">
+  </header>
+  <div class="manage-ungit modal-content">
     <mat-tab-group mat-stretch-tabs #tabGroup class="content-box">
       <mat-tab label="LIST">
         <button mat-raised-button class="butt add-creds" (click)="tabGroup.selectedIndex = 1">
@@ -139,5 +139,5 @@
         </form>
       </mat-tab>
     </mat-tab-group>
-  </modal-content>
-</modal-dialog>
+  </div>
+</div>
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 2bceb72..46acefe 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
@@ -44,41 +44,34 @@ export class ManageUngitComponent implements OnInit {
   public editableForm: boolean = false;
   public updateAccountCredentialsForm: FormGroup;
 
-  @ViewChild('bindDialog') bindDialog;
   @ViewChild('tabGroup') tabGroup;
 
   constructor(
+    public toastr: ToastrService,
+    public dialog: MatDialog,
+    public dialogRef: MatDialogRef<ManageUngitComponent>,
     private manageUngitService: ManageUngitService,
     private _fb: FormBuilder,
-    public dialog: MatDialog,
-    public toastr: ToastrService
   ) {
     this.model = MangeUngitModel.getDefault(manageUngitService);
   }
 
   ngOnInit() {
-    this.bindDialog.onClosing = () => this.cancelAllModifyings();
+    // this.bindDialog.onClosing = () => this.cancelAllModifyings();
+    this.open();
 
     this.initFormModel();
     this.getGitCredentials();
   }
 
-  public open(param): void {
-    if (!this.bindDialog.isOpened)
-      this.model = new MangeUngitModel(response => { },
-      error => this.toastr.error(error.message || 'Manage git credentials failed!', 'Oops!'),
-      () => {
-        this.bindDialog.open(param);
-
-        if (!this.gitCredentials.length)
-          this.tabGroup.selectedIndex = 1;
-      },
-      this.manageUngitService);
-  }
-
-  public close(): void {
-    if (this.bindDialog.isOpened)
-      this.bindDialog.close();
+  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);
   }
 
   public resetForm(): void {


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