This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push: new 67ae0ff [DLAB-1913]: Fixed set of UI tasks for 'Billing report' and 'List of resource' pages (#807) 67ae0ff is described below commit 67ae0ffd26c7afe8e8d7d0c46fae565ce77a22e6 Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com> AuthorDate: Thu Jul 2 16:33:25 2020 +0300 [DLAB-1913]: Fixed set of UI tasks for 'Billing report' and 'List of resource' pages (#807) --- .../src/app/reports/audit/audit-grid/audit-grid.component.ts | 5 ++++- .../webapp/src/app/reports/reporting/reporting.component.ts | 12 +++--------- .../cluster-details/cluster-details.component.html | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts index c5eeea5..0eeaa2a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts @@ -167,7 +167,10 @@ export class AuditGridComponent implements OnInit { </mat-list-item> <div class="scrolling-content mat-list-wrapper" id="scrolling"> <mat-list-item class="list-item" *ngFor="let action of actionList"> - <div class="info-item-title">{{action[0]}}</div> + <div *ngIf="(data.action === 'upload' && action[0] === 'File(s)') || (data.action === 'download' && action[0] === 'File(s)');else multiAction" class="info-item-title">File</div> + <ng-template #multiAction> + <div class="info-item-title">{{action[0]}}</div> + </ng-template> <div class="info-item-data" *ngIf="action[0] === 'File(s)'"> <div class="file-description ellipsis" *ngFor="let description of action[1]?.split(',')" [matTooltip]="description" matTooltipPosition="above"> {{description}} diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts index f65dc19..060b284 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts @@ -115,9 +115,8 @@ export class ReportingComponent implements OnInit, OnDestroy { } rebuildBillingReport(): void { - this.checkAutorize(); this.reportData = this.cashedFilterData; - this.buildBillingReport(); + this.getGeneralBillingData(); } buildBillingReport() { @@ -126,13 +125,6 @@ export class ReportingComponent implements OnInit, OnDestroy { this.getGeneralBillingData(); } - private checkAutorize() { - this.applicationSecurityService.isLoggedIn().subscribe( () => { - this.getEnvironmentHealthStatus(); - } - ); - } - exportBillingReport(): void { this.billingReportService.downloadReport(this.reportData) .subscribe( @@ -162,6 +154,8 @@ export class ReportingComponent implements OnInit, OnDestroy { shape = shape.replace('Master: ', ''); shape = shape.replace(/Slave: /, ''); shape = shape.replace(/\s+/g, ''); + shape = shape.replace(/[0-9]?[0-9]x/g, ''); + shapes.indexOf(shape) === -1 && shapes.push(shape); } } else if (item.shape.match(/\d x \S+/)) { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html index 44718bd..58ec39f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html @@ -71,14 +71,14 @@ <p>Total instance number:</p> </div> </ng-template> - <div class="col"><span>{{ resource[DICTIONARY[PROVIDER][resource.image].total_instance_number] }}</span></div> + <div class="col"><span>{{ resource[DICTIONARY[PROVIDER][resource.image].total_instance_number] || 1}}</span></div> </div> <div class="row-wrap" *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'gcp' && resource.image === 'docker.dlab-dataengine-service'"> <div class="col"> <p>Slave instance number:</p> </div> - <div class="col"><span>{{ resource[DICTIONARY[PROVIDER][resource.image].total_slave_instance_number] }}</span></div> + <div class="col"><span>{{ resource.totalInstanceCount - 1}}</span></div> </div> <div class="row-wrap"> <div class="col"> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org