This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1559 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f0e3de07830dfe726d441cbb6ed4f134f5be1462 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Tue Mar 3 14:33:52 2020 +0200 [DLAB-1599]: Adjusted billing acording to multicloud support --- .../management-grid/management-grid.component.html | 4 +++- .../management-grid/management-grid.component.scss | 10 +++++++--- .../administration/project/project-data.service.ts | 2 +- .../project-list/project-list.component.html | 4 +++- .../project-list/project-list.component.scss | 8 +++++++- .../reporting-grid/reporting-grid.component.html | 2 +- .../reporting-grid/reporting-grid.component.scss | 21 ++++++++++++--------- .../resources-grid/resources-grid.component.html | 4 +++- .../resources-grid/resources-grid.component.scss | 3 +++ .../webapp/src/dictionary/azure.dictionary.ts | 2 +- .../webapp/src/dictionary/gcp.dictionary.ts | 2 +- 11 files changed, 42 insertions(+), 20 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index ced278d..1f6c55e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -121,7 +121,9 @@ </ng-container> <ng-container matColumnDef="actions"> - <th mat-header-cell *matHeaderCellDef class="actions"></th> + <th mat-header-cell *matHeaderCellDef class="actions"> + <span class="label"> Actions </span> + </th> <td mat-cell *matCellDef="let element" class="settings actions-col"> <span #settings class="actions" (click)="actions.toggle($event, settings)" *ngIf="element.type !== 'edge node'" [ngClass]="{ diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss index 87bef73..ffbfc6c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss @@ -50,13 +50,17 @@ .settings { padding-right: 14px; - .actions { - margin-top: 2px; + + } + .actions { + margin-top: 0px; + .label{ + padding-right: 5px; } } - .actions-col { width: 6%; + } .dashboard_table_body { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index e21990d..f60fb56 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -41,7 +41,7 @@ export class ProjectDataService { this.projectService.getProjectsList() .pipe( mergeMap ((response: Project[]) => { - if (response) { + if (response && this.endpointsList.length) { response.forEach(project => project.endpoints.forEach(endpoint => { const filtredEndpoints = this.endpointsList.filter(v => v.name === endpoint.name); if (filtredEndpoints.length) { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 3983ab1..d8f697f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -63,7 +63,9 @@ </ng-container> <ng-container matColumnDef="actions"> - <th mat-header-cell *matHeaderCellDef class="project-actions"></th> + <th mat-header-cell *matHeaderCellDef class="project-actions"> + <span class="label"> Actions </span> + </th> <td mat-cell *matCellDef="let element" class="settings"> <span #settings (click)="actions.toggle($event, settings)" class="actions"></span> <bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left"> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index 73b725d..1456aaa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -79,7 +79,13 @@ table { vertical-align: top; padding: 10px 24px; - span { + &.mat-header-cell{ + padding-top: 20px; + padding-right: 13px; + color: rgba(0,0,0,.54); + } + + span:not(.mat-header-cell span) { transition: all .5s ease-in-out; cursor: pointer; 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 4a92bc6..010dd77 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 @@ -135,7 +135,7 @@ </th> <td mat-cell *matCellDef="let element"> - {{ element[DICTIONARY[PROVIDER].billing.cost].toFixed(2) }} {{ element[DICTIONARY[PROVIDER].billing.currencyCode] }} + {{ element[DICTIONARY[PROVIDER].billing.cost] }} {{ element[DICTIONARY[PROVIDER].billing.currencyCode] }} </td> <td mat-footer-cell *matFooterCellDef class="table-footer"> Total <span *ngIf="reportData?.length"> {{ fullReport['cost_total'] }} diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss index 3b19ae7..74a6e43 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss @@ -113,7 +113,7 @@ .th_charges { width: 8%; - min-width: 110px; + min-width: 130px; padding-right: 15px; text-align: right; @@ -161,6 +161,16 @@ text-align: right; } } + + .table-footer{ + position: sticky; + bottom: 0; + background: inherit; + border-top: 1px solid #E0E0E0; + transform: translateY(-1px); + border-bottom: none; + padding-left: 0 !important; + } } .dashboard_table_body { @@ -177,14 +187,7 @@ } } -.table-footer{ - position: sticky; - bottom: 0; - background: inherit; - border-top: 1px solid #E0E0E0; - transform: translateY(-1px); - border-bottom: none; -} + @media screen and (max-width: 1280px) { .dashboard_table.reporting { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 6f05128..bfd1484 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -93,7 +93,9 @@ </th> </ng-container> <ng-container matColumnDef="actions" stickyEnd> - <th mat-header-cell *matHeaderCellDef class="actions-col"></th> + <th mat-header-cell *matHeaderCellDef class="actions-col"> + <span class="label"> Actions </span> + </th> </ng-container> <!-- ----------------------------------------------------- --> diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss index 57abbc1..ce866b0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -132,6 +132,9 @@ table { padding-right: 24px; text-align: right; background-color: inherit; + .label{ + padding-right: 5px; + } } } 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 0478533..c0fe6d6 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 @@ -40,7 +40,7 @@ export const NAMING_CONVENTION_AZURE = { 'dateFrom': 'from', 'dateTo': 'to', 'service': 'meterCategory', - 'service_filter_key': 'category', + 'service_filter_key': 'meterCategory', 'type': '', 'resourceType': 'resource_type', 'instance_size': 'shape', diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts index 0d02f63..6daee3f 100644 --- a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts +++ b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts @@ -35,7 +35,7 @@ export const NAMING_CONVENTION_GCP = { 'resourceName': 'resource_name', 'cost': 'cost', 'costTotal': 'cost_total', - 'currencyCode': 'currency_code', + 'currency_code': 'currency_code', 'dateFrom': 'from', 'dateTo': 'to', 'service': 'product', --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
