This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1615 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ac6b3a7ef202e4a63116d6898dc1e59ebcc7276b Author: Dmytro Gnatyshyn <di1...@ukr.net> AuthorDate: Fri Mar 6 17:03:27 2020 +0200 [DLAB-1615]: Added some billing values on UI --- .../app/reporting/reporting-grid/reporting-grid.component.html | 9 ++++----- .../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 2 +- .../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 6 +++--- 3 files changed, 8 insertions(+), 9 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 010dd77..d7827fa 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>{{element[DICTIONARY[PROVIDER].billing.instance_size]}}</span> </td> <td mat-footer-cell *matFooterCellDef class="table-footer"></td> </ng-container> @@ -123,8 +123,7 @@ </button> </th> <td mat-cell *matCellDef="let element"> - {{ element['service'] }} - <span *ngIf="element.product">{{ element.product }}</span> + <span *ngIf="element.service">{{ element.service }}</span> </td> <td mat-footer-cell *matFooterCellDef class="table-footer"></td> </ng-container> @@ -178,8 +177,8 @@ <ng-container matColumnDef="shape-filter"> <th mat-header-cell *matHeaderCellDef> <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" - [type]="[DICTIONARY[PROVIDER].billing.instance_size]" [items]="filterConfiguration[DICTIONARY[PROVIDER].billing.instance_size]" - [model]="filteredReportData[DICTIONARY[PROVIDER].billing.instance_size]"></multi-select-dropdown> + [type]="'shape'"[items]="filterConfiguration['shape']" + [model]="filteredReportData['shape']"></multi-select-dropdown> </th> </ng-container> <ng-container matColumnDef="service-filter"> diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index fb144a6..08708f8 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -268,7 +268,7 @@ mat-dialog-container { } } - span { + span:not(.description) { font-size: 14px; overflow: hidden; text-overflow: ellipsis; diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts index c0fe6d6..b7d9abc 100644 --- a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts +++ b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts @@ -36,15 +36,15 @@ export const NAMING_CONVENTION_AZURE = { 'resourceName': 'resourceName', 'cost': 'cost', 'costTotal': 'cost_total', - 'currencyCode': 'currency_code', + 'currencyCode': 'currencyCode', 'dateFrom': 'from', 'dateTo': 'to', 'service': 'meterCategory', 'service_filter_key': 'meterCategory', 'type': '', 'resourceType': 'resource_type', - 'instance_size': 'shape', - 'dlabId': 'dlab_id' + 'instance_size': 'size', + 'dlabId': 'dlabId' }, 'service': 'Category', 'type': '', --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org