You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/07/02 13:31:26 UTC
[incubator-dlab] branch DLAB-1913 created (now 1a15c42)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1913
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 1a15c42 [DLAB-1913]: Fixed set of UI tasks for 'Billing report' and 'List of resource' pages
This branch includes the following new commits:
new 1a15c42 [DLAB-1913]: Fixed set of UI tasks for 'Billing report' and 'List of resource' pages
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1913]: Fixed set of UI tasks for
'Billing report' and 'List of resource' pages
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1913
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1a15c42b73b80ef850be174b96ae1f924bf3b643
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Jul 2 16:31:00 2020 +0300
[DLAB-1913]: Fixed set of UI tasks for 'Billing report' and 'List of resource' pages
---
.../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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org