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/02/28 10:51:57 UTC
[incubator-dlab] branch odahu-integration updated: Fixed billing
for Azure
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 5ed6742 Fixed billing for Azure
new 1619ae0 Merge remote-tracking branch 'origin/odahu-integration' into odahu-integration
5ed6742 is described below
commit 5ed674237f1f1ebe060fe605ad9398e1f74c46a9
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Feb 28 12:51:03 2020 +0200
Fixed billing for Azure
---
.../app/reporting/reporting-grid/reporting-grid.component.html | 4 ++--
.../src/app/reporting/reporting-grid/reporting-grid.component.ts | 2 +-
.../resources/webapp/src/app/reporting/reporting.component.ts | 9 +++++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index 1f5513d..5de5725 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -106,7 +106,7 @@
</button>
</th>
<td mat-cell *matCellDef="let element">
- <span [outerHTML]="element['shape'] | lineBreak"></span>
+ <span [outerHTML]="element.size | lineBreak"></span>
</td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
@@ -124,7 +124,7 @@
</th>
<td mat-cell *matCellDef="let element">
{{ element['service'] }}
- <span *ngIf="element.product">{{ element.product }}</span>
+ <span *ngIf="element[DICTIONARY[PROVIDER].billing.service]">{{ element[DICTIONARY[PROVIDER].billing.service] }}</span>
</td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index 1856688..29914e5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -81,7 +81,7 @@ export class ReportingGridComponent implements OnInit {
resetFiltering(): void {
this.filteredReportData.defaultConfigurations();
- this.filter.nativeElement.value = ''
+ this.filter.nativeElement.value = '';
this.filterReport.emit(this.filteredReportData);
this.resetRangePicker.emit(true);
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
index 2737ea7..71a5c61 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
@@ -98,15 +98,20 @@ export class ReportingComponent implements OnInit, OnDestroy {
if (this.PROVIDER) {
this.rebuildBillingReport();
}
+ } else {
+ this.PROVIDER = 'azure';
+ if (this.PROVIDER) {
+ this.rebuildBillingReport();
+ }
}
}, e => {
- this.PROVIDER = 'gcp';
+ this.PROVIDER = 'azure';
if (this.PROVIDER) {
this.rebuildBillingReport();
}
}) ;
} else {
- this.PROVIDER = 'gcp';
+ this.PROVIDER = 'azure';
if (this.PROVIDER) {
this.rebuildBillingReport();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org