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 c9693b5a96b8ad6202b008b2774721e39feaf82a Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Tue May 28 13:47:04 2019 +0300 [DLAB-642]: replaced ssn monitor dialog with nateroal component --- .../src/app/administration/management/index.ts | 3 +- .../management/management.component.ts | 6 +-- .../ssn-monitor/ssn-monitor.component.html | 49 +++++++++++----------- .../ssn-monitor/ssn-monitor.component.ts | 20 ++++----- 4 files changed, 39 insertions(+), 39 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 4423798..e246457 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 @@ -80,7 +80,8 @@ export * from './management.component'; ConfirmationDialogComponent, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent, - BackupDilogComponent], + BackupDilogComponent, + SsnMonitorComponent], exports: [ManagementComponent] }) export class ManagenementModule { } 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 bf32a97..0671d5d 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 @@ -35,6 +35,7 @@ import { import { EnvironmentModel, GeneralEnvironmentStatus } from './management.model'; import { HTTP_STATUS_CODES } from '../../core/util'; import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; +import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; @Component({ selector: 'environments-management', @@ -103,7 +104,6 @@ export class ManagementComponent implements OnInit, OnDestroy { } showBackupDialog() { - // if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }) .afterClosed().subscribe(() => this.buildGrid()); } @@ -124,8 +124,8 @@ export class ManagementComponent implements OnInit, OnDestroy { } openSsnMonitorDialog() { - this.healthStatusService.getSsnMonitorData() - .subscribe(data => this.ssnMonitorDialog.open({ isFooter: false }, data), + this.healthStatusService.getSsnMonitorData().subscribe( + data => this.dialog.open(SsnMonitorComponent, {data: data, panelClass: 'modal-lg' }), () => this.toastr.error('Failed ssn data loading!', 'Oops!')); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html index 3d13266..a4f9cf5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html @@ -17,43 +17,44 @@ ~ under the License. --> -<modal-dialog #bindDialog modalClass="ssn-monitor-dialog modal-lg"> - <modal-header> +<div id="dialog-box" class="ssn-monitor-dialog"> + <header class="dialog-header"> <h4 class="modal-title">SSN Monitor</h4> - </modal-header> - <modal-content> - <div class="content-box" *ngIf="monitorData"> + <button type="button" class="close" (click)="dialogRef.close()">×</button> + </header> + <div class="dialog-content"> + <div class="content-box" *ngIf="data"> <div class="ssn-info"> - <mat-tab-group *ngIf="monitorData?.processorInfo" [dynamicHeight]="true"> + <mat-tab-group *ngIf="data?.processorInfo" [dynamicHeight]="true"> <mat-tab label="CPU"> <div class="scrolling-content" id="scrolling"> <mat-list-item class="list-header"> <div class="col">Name</div> - <div class="col">{{ monitorData.processorInfo.name }}</div> + <div class="col">{{ data.processorInfo.name }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Vendor</div> - <div class="col">{{ monitorData.processorInfo.vendor }}</div> + <div class="col">{{ data.processorInfo.vendor }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Logical Core Count</div> - <div class="col">{{ monitorData.processorInfo.logicalCoreCount }}</div> + <div class="col">{{ data.processorInfo.logicalCoreCount }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Physical Core Count</div> - <div class="col">{{ monitorData.processorInfo.physicalCoreCount }}</div> + <div class="col">{{ data.processorInfo.physicalCoreCount }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Current System Load</div> - <div class="col">{{ monitorData.processorInfo.currentSystemLoad /100 | percent:'1.0-2' }}</div> + <div class="col">{{ data.processorInfo.currentSystemLoad /100 | percent:'1.0-2' }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">System Load Average</div> - <div class="col">{{ monitorData.processorInfo.systemLoadAverage /100 | percent:'1.0-2' }}</div> + <div class="col">{{ data.processorInfo.systemLoadAverage /100 | percent:'1.0-2' }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">CPU 64 Bit</div> - <div class="col">{{ monitorData.processorInfo.cpu64Bit }}</div> + <div class="col">{{ data.processorInfo.cpu64Bit }}</div> </mat-list-item> </div> </mat-tab> @@ -62,34 +63,34 @@ <div class="scrolling-content" id="scrolling"> <mat-list-item class="list-header"> <div class="col">Available Memory</div> - <div class="col">{{ convertSize(monitorData.memoryInfo.availableMemory) }}</div> + <div class="col">{{ convertSize(data.memoryInfo.availableMemory) }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Total Memory</div> - <div class="col">{{ convertSize(monitorData.memoryInfo.totalMemory) }}</div> + <div class="col">{{ convertSize(data.memoryInfo.totalMemory) }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Swap Total</div> - <div class="col">{{ convertSize(monitorData.memoryInfo.swapTotal) }}</div> + <div class="col">{{ convertSize(data.memoryInfo.swapTotal) }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Swap Used</div> - <div class="col">{{ convertSize(monitorData.memoryInfo.swapUsed) }}</div> + <div class="col">{{ convertSize(data.memoryInfo.swapUsed) }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Pages Page In</div> - <div class="col">{{ convertSize(monitorData.memoryInfo.pagesPageIn) }}</div> + <div class="col">{{ convertSize(data.memoryInfo.pagesPageIn) }}</div> </mat-list-item> <mat-list-item class="list-header"> <div class="col">Pages Page Out</div> - <div class="col">{{ convertSize(monitorData.memoryInfo.pagesPageOut) }}</div> + <div class="col">{{ convertSize(data.memoryInfo.pagesPageOut) }}</div> </mat-list-item> </div> </mat-tab> <mat-tab label="HDD"> <div class="scrolling-content" id="scrolling"> - <div *ngFor="let disk of monitorData.disksInfo; let i = index"> + <div *ngFor="let disk of data.disksInfo; let i = index"> <mat-list-item> <div class="col"><strong>Disk {{i +1}}</strong></div> </mat-list-item> @@ -106,12 +107,12 @@ </mat-tab> </mat-tab-group> <div class="text-center"> - <button type="button" class="butt" mat-raised-button (click)="close()">Close</button> + <button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">Close</button> </div> </div> - <div class="info message" *ngIf="isEmpty(monitorData)"> + <div class="info message" *ngIf="isEmpty(data)"> No ssn monitor data available </div> </div> - </modal-content> -</modal-dialog> + </div> +</div> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts index 3d95499..1021213 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts @@ -17,7 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; +import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; + import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @Component({ @@ -32,17 +34,13 @@ export class SsnMonitorComponent implements OnInit { public errorMessage: string = ''; public monitorData = {}; - @ViewChild('bindDialog') bindDialog; - @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); - - ngOnInit() {} + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef<SsnMonitorComponent>, + ) { } - public open(param, data): void { - this.monitorData = data || {}; - this.bindDialog.open(param); - } - public close(param, data): void { - this.bindDialog.close(); + ngOnInit() { + this.monitorData = this.data || {}; } public isEmpty(obj) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
