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 c65fa447a24bba7b93fd0485f9f7a3514ec1cef1 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Thu May 30 14:02:19 2019 +0300 [DLAB-631]: replaced progress uploading component with material --- .../webapp/src/app/administration/management/index.ts | 2 -- .../app/administration/management/management.component.html | 2 -- .../app/administration/management/management.component.ts | 1 - .../src/app/shared/modal-dialog/progress-dialog/index.ts | 5 +++-- .../progress-dialog/progress-dialog.component.html | 13 +++++++------ .../progress-dialog/progress-dialog.component.ts | 12 ------------ .../webapp/src/app/shared/navbar/navbar.component.html | 8 -------- .../webapp/src/app/shared/navbar/navbar.component.ts | 12 +++++++----- 8 files changed, 17 insertions(+), 38 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index 3dadada..88b0e44 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -24,7 +24,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ModalModule, UploadKeyDialogModule, - ProgressDialogModule, BubbleModule, ConfirmationDialogModule } from '../../shared'; @@ -54,7 +53,6 @@ export * from './management.component'; ProjectModule, ModalModule, UploadKeyDialogModule, - ProgressDialogModule, BubbleModule, ConfirmationDialogModule, ComputationalResourcesModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index cffca62..b46549b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -42,5 +42,3 @@ [environmentsHealthStatuses]="healthStatus?.list_resources" (refreshGrid)="buildGrid()" (actionToggle)="manageEnvironmentAction($event)"> </management-grid> - -<progress-dialog #preloaderModal></progress-dialog> \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index e698281..970b41c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -58,7 +58,6 @@ export class ManagementComponent implements OnInit, OnDestroy { @ViewChild('backupDialog') backupDialog; @ViewChild('manageEnvDialog') manageEnvironmentDialog; @ViewChild('keyUploadModal') keyUploadDialog; - @ViewChild('preloaderModal') preloaderDialog; @ViewChild('ssnMonitor') ssnMonitorDialog; // @ViewChild('rolesGroupsModal') rolesGroupsDialog; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/index.ts index 8001541..f66af62 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/index.ts @@ -19,14 +19,15 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ModalModule } from '..'; + import { ProgressDialogComponent } from './progress-dialog.component'; export * from './progress-dialog.component'; @NgModule({ - imports: [CommonModule, ModalModule], + imports: [CommonModule], declarations: [ProgressDialogComponent], + entryComponents: [ProgressDialogComponent], exports: [ProgressDialogComponent], }) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.html index 45cc7ae..726bcfb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.html @@ -17,13 +17,14 @@ ~ under the License. --> -<modal-dialog #bindDialog modalClass="modal-xs progress-dialog"> - <modal-header></modal-header> - <modal-content class="text-center"> +<div id="dialog-box" class="progress-dialog"> + <header class="dialog-header header-white"> + <button type="button" class="close" (click)="dialogRef.close()">×</button> + </header> + <div class="dialog-content text-center"> <div class="content-box"> <div><img src="assets/img/gif-spinner.gif" alt="loader"></div> <p class="info-label">Initial infrastructure is being created, <br/>please, wait...</p> </div> - </modal-content> - <modal-footer></modal-footer> -</modal-dialog> + </div> +</div> diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts index 5dc200a..48f6cb5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts @@ -27,20 +27,8 @@ import { Component, OnInit, ViewChild, Input } from '@angular/core'; export class ProgressDialogComponent implements OnInit { @Input() theBoundCallback: Function; - @ViewChild('bindDialog') bindDialog; - ngOnInit() { if (this.theBoundCallback) this.theBoundCallback(); } - - open(params) { - if (!this.bindDialog.isOpened) - this.bindDialog.open(params); - } - - close() { - if (this.bindDialog.isOpened) - this.bindDialog.close(); - } } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 3fd9218..4bd0eaa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -26,13 +26,6 @@ <span class="line"></span> </button> - <nav role="navigation"> - <!-- <mat-menu #menu="matMenu" [overlapTrigger]="false"> - <a class="nav-item" mat-menu-item [routerLink]="['/resources_list']" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">List of Resources</a> - <a class="nav-item" mat-menu-item [routerLink]="['/administration']" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">Environment Management</a> - <a *ngIf="healthStatus.billingEnabled" class="nav-item" mat-menu-item [routerLink]="['/billing_report']" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">Billing Report</a> - </mat-menu> --> - </nav> <a [routerLink]="['/resources_list']" class="navbar-logo"> <img src="assets/img/logo-nav.png" alt=""> </a> @@ -127,4 +120,3 @@ <key-upload-dialog #keyUploadModal (generateUserKey)="generateUserKey($event)" (checkInfrastructureCreationProgress)="checkCreationProgress($event)" [primaryUploading]="true"></key-upload-dialog> -<progress-dialog #preloaderModal></progress-dialog> \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 8efc7a7..7bf49a0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -33,6 +33,7 @@ import { GeneralEnvironmentStatus } from '../../administration/management/manage import { DICTIONARY } from '../../../dictionary/global.dictionary'; import { HTTP_STATUS_CODES, FileUtils } from '../../core/util'; import { NotificationDialogComponent } from '../modal-dialog/notification-dialog'; +import { ProgressDialogComponent } from '../modal-dialog/progress-dialog'; @Component({ selector: 'dlab-navbar', @@ -59,7 +60,6 @@ export class NavbarComponent implements OnInit, OnDestroy { subscriptions: Subscription = new Subscription(); @ViewChild('keyUploadModal') keyUploadDialog; - @ViewChild('preloaderModal') preloaderDialog; constructor( public toastr: ToastrService, @@ -159,13 +159,15 @@ export class NavbarComponent implements OnInit, OnDestroy { } private processAccessKeyStatus(status: number): void { + debugger; if (status === HTTP_STATUS_CODES.NOT_FOUND || status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { - this.preloaderDialog.bindDialog.isOpened && this.preloaderDialog.close(); + !this.dialog.openDialogs.length && this.dialog.closeAll(); + this.keyUploadDialog.open({ isFooter: false }); this.alive = false; this.lastStatus = status; } else if (status === HTTP_STATUS_CODES.ACCEPTED) { - !this.preloaderDialog.bindDialog.isOpened && this.preloaderDialog.open({ isHeader: false, isFooter: false }); + !this.dialog.openDialogs.length && this.dialog.open(ProgressDialogComponent, {panelClass: 'modal-xs'}); if (!this.alive) { this.alive = true; @@ -181,7 +183,7 @@ export class NavbarComponent implements OnInit, OnDestroy { this.lastStatus = false; } this.alive = false; - this.preloaderDialog.close(); + this.dialog.closeAll(); this.keyUploadDialog.close(); } } @@ -191,7 +193,7 @@ export class NavbarComponent implements OnInit, OnDestroy { if (list.length) { if (this.dialog.openDialogs.length > 0) return; const filteredData = this.groupSchedulerData(list); - const dialogRef: MatDialogRef<NotificationDialogComponent> = this.dialog.open(NotificationDialogComponent, { + this.dialog.open(NotificationDialogComponent, { data: { template: filteredData, type: 'list' }, width: '550px' }); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
