You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/12/05 12:33:38 UTC
[incubator-dlab] branch DLAB-1366 created (now d35cf2b)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1366
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at d35cf2b [DLAB-1366]: cleanup tags on billing page
This branch includes the following new commits:
new fe8acf2 [DLAB-1366]: bucket labels changed
new d35cf2b [DLAB-1366]: cleanup tags on billing page
The 2 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] 02/02: [DLAB-1366]: cleanup tags on billing page
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1366
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d35cf2b5897f0b36dd74d901f6d1e78daf2b97dd
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Dec 5 14:33:22 2019 +0200
[DLAB-1366]: cleanup tags on billing page
---
.../management-grid/management-grid.component.scss | 2 +-
.../reporting-grid/reporting-grid.component.html | 27 ----------------------
.../reporting-grid/reporting-grid.component.scss | 4 ++--
.../reporting-grid/reporting-grid.component.ts | 4 ++--
4 files changed, 5 insertions(+), 32 deletions(-)
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 30515a5..8f6f183 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
@@ -31,7 +31,7 @@
}
.shape {
- width: 16% !important;
+ width: 18% !important;
}
.status {
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 141ca6b..f9bf7cf 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
@@ -129,30 +129,6 @@
<td mat-footer-cell *matFooterCellDef></td>
</ng-container>
- <ng-container matColumnDef="tags">
- <th mat-header-cell *matHeaderCellDef class="tags">
- <span class="label"> Tags </span>
- </th>
- <td mat-cell *matCellDef="let element">
- <mat-chip-list aria-label="Tags" *ngIf="element.tags" class="tags-col selection">
- <mat-chip matTooltip="Endpoint tag: {{ element.tags.endpoint_tag }}" matTooltipPosition="above">
- {{ element.tags.endpoint_tag }}
- </mat-chip>
- <mat-chip *ngIf="element.tags.custom_tag" matTooltip="Custom tag: {{ element.tags.custom_tag }}"
- matTooltipPosition="above">
- {{ element.tags.custom_tag }}
- </mat-chip>
- <mat-chip matTooltip="User tag: {{ element.tags.user_tag }}" matTooltipPosition="above">
- {{ element.tags.user_tag }}
- </mat-chip>
- <mat-chip matTooltip="Project tag: {{ element.tags.project_tag }}" matTooltipPosition="above">
- {{ element.tags.project_tag }}
- </mat-chip>
- </mat-chip-list>
- </td>
- <td mat-footer-cell *matFooterCellDef></td>
- </ng-container>
-
<ng-container matColumnDef="charge" stickyEnd>
<th mat-header-cell *matHeaderCellDef class="th_charges">
<span class="label"> Service Charges </span>
@@ -214,9 +190,6 @@
[model]="filteredReportData[DICTIONARY.billing.service_filter_key]"></multi-select-dropdown>
</th>
</ng-container>
- <ng-container matColumnDef="tags-filter">
- <th mat-header-cell *matHeaderCellDef></th>
- </ng-container>
<ng-container matColumnDef="actions" stickyEnd>
<th mat-header-cell *matHeaderCellDef>
<div class="actions">
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 4f870cd..b4a0c36 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
@@ -39,7 +39,7 @@
td {
font-size: 13px;
- padding-left: 5px;
+ padding-left: 15px;
&.info {
z-index: 1 !important;
@@ -147,7 +147,7 @@
display: inline-block;
padding-top: 15px;
vertical-align: super !important;
- padding-left: 5px;
+ padding-left: 15px;
}
}
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 3a904fd..4aa2f53 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
@@ -42,8 +42,8 @@ export class ReportingGridComponent implements OnInit {
@Output() filterReport: EventEmitter<{}> = new EventEmitter();
@Output() resetRangePicker: EventEmitter<boolean> = new EventEmitter();
- displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status', 'shape', 'service', 'tags', 'charge'];
- displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'project-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'tags-filter', 'actions'];
+ displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status', 'shape', 'service', 'charge']; //'tags'
+ displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'project-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions']; //'tags-filter'
ngOnInit() { }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1366]: bucket labels changed
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1366
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fe8acf29bd6eaba8800f9cb85fe2d55a467b137e
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Dec 5 14:18:40 2019 +0200
[DLAB-1366]: bucket labels changed
---
.../src/main/resources/webapp/src/dictionary/aws.dictionary.ts | 4 ++--
.../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 4 ++--
.../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
index 64c1b6c..a37445f 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
@@ -21,8 +21,8 @@ export const NAMING_CONVENTION = {
'cloud_provider': 'aws',
'use_ldap': true,
'notebook_instance_size': 'Instance shape',
- 'personal_storage': 'Shared bucket',
- 'collaboration_storage': 'Shared project bucket',
+ 'personal_storage': 'Project bucket',
+ 'collaboration_storage': 'Shared endpoint bucket',
'account': '',
'container': '',
'data_engine': 'Deploy Spark Server / Deploy EMR',
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 fd178c5..819c181 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
@@ -21,8 +21,8 @@ export const NAMING_CONVENTION = {
'cloud_provider': 'azure',
'use_ldap': true,
'notebook_instance_size': 'Virtual machine size',
- 'personal_storage': 'Shared bucket',
- 'collaboration_storage': 'Shared project bucket',
+ 'personal_storage': 'Project bucket',
+ 'collaboration_storage': 'Shared endpoint bucket',
'account': 'Account:',
'container': 'Container:',
'data_engine': 'Deploy Spark Server / Deploy HDInsight',
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 554e5ee..10d7cf2 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
@@ -21,8 +21,8 @@ export const NAMING_CONVENTION = {
'cloud_provider': 'gcp',
'use_ldap': true,
'notebook_instance_size': 'Instance type',
- 'personal_storage': 'Shared bucket',
- 'collaboration_storage': 'Shared project bucket',
+ 'personal_storage': 'Project bucket',
+ 'collaboration_storage': 'Shared endpoint bucket',
'account': '',
'container': '',
'data_engine': 'Deploy Spark Server / Deploy Dataproc',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org