You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/10/07 07:31:02 UTC
[incubator-datalab] branch develop updated: [DATALAB-2088]: Fixed
UI issues connected with name replacement (#938)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 37c484b [DATALAB-2088]: Fixed UI issues connected with name replacement (#938)
37c484b is described below
commit 37c484be22a0d93e915e4904613c6118c7a1d878
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Wed Oct 7 10:30:54 2020 +0300
[DATALAB-2088]: Fixed UI issues connected with name replacement (#938)
[DATALAB-2088]: Fixed UI issues connected with name replacement
---
.../reporting/reporting-grid/reporting-grid.component.html | 8 ++++----
.../cost-details-dialog/cost-details-dialog.component.html | 2 +-
.../src/main/resources/webapp/src/dictionary/aws.dictionary.ts | 2 +-
.../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 2 +-
.../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts | 2 +-
.../src/main/resources/webapp/src/dictionary/global.dictionary.ts | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 883b9f4..77fd72a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -26,12 +26,12 @@
<div class="label"><span class="text"> Resource name</span></div>
<button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()">
<i class="material-icons">
- <span *ngIf="filteredReportData.datalab_id.length > 0; else datalab_id_filtered">filter_list</span>
- <ng-template #datalab_id_filtered>more_vert</ng-template>
+ <span *ngIf="filteredReportData.datalabId.length > 0; else datalabId_filtered">filter_list</span>
+ <ng-template #datalabId_filtered>more_vert</ng-template>
</i>
</button>
</th>
- <td mat-cell *matCellDef="let element"><span class="table-item">{{element.datalab_id}}</span></td>
+ <td mat-cell *matCellDef="let element"><span class="table-item">{{element.datalabId}}</span></td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
@@ -186,7 +186,7 @@
<div class="input-wrapper">
<input #nameFilter type="text" placeholder="Filter by environment name"
class="form-control filter-field"
- [value]="filtered?.datalab_id" (input)="filteredReportData.datalab_id = $event.target['value']"
+ [value]="filtered?.datalabId" (input)="filteredReportData.datalabId = $event.target['value']"
(keyup)="checkFilters()"/>
</div>
</th>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
index b3ae086..cea7140 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
@@ -61,5 +61,5 @@
<strong>Total: </strong>{{ notebook.cost | localcurrency }}</div>
</div>
</div>
- </div>:'USD':'code'
+ </div>
</div>
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 78fb9a5..8fcc9ec 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
@@ -43,7 +43,7 @@ export const NAMING_CONVENTION_AWS = {
'type': 'resource_type',
'resourceType': 'data_lab_resource_type',
'instance_size': 'shape',
- 'datalab_id': 'datalab_id'
+ 'datalabId': 'datalabId'
},
'service': 'Service',
'type': 'Type',
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 ddce787..15b0ec0 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
@@ -44,7 +44,7 @@ export const NAMING_CONVENTION_AZURE = {
'type': '',
'resourceType': 'resource_type',
'instance_size': 'size',
- 'datalab_id': 'datalab_id'
+ 'datalabId': 'datalabId'
},
'service': 'Category',
'type': '',
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 a71804c..179fc45 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
@@ -43,7 +43,7 @@ export const NAMING_CONVENTION_GCP = {
'type': 'data_lab_resource_type',
'resourceType': 'data_lab_resource_type',
'instance_size': 'shapes',
- 'datalab_id': 'datalab_id'
+ 'datalabId': 'datalabId'
},
'service': 'Product',
'type': 'Resource',
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
index a6b160d..db47698 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
@@ -43,7 +43,7 @@ export class ReportingConfigModel {
public shapes: Array<string>,
public date_start: string,
public date_end: string,
- public datalab_id: string,
+ public datalabId: string,
public projects: Array<string>
) { }
@@ -55,7 +55,7 @@ export class ReportingConfigModel {
this.shapes = [];
this.date_start = '';
this.date_end = '';
- this.datalab_id = '';
+ this.datalabId = '';
this.projects = [];
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org