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/04/17 13:51:17 UTC
[incubator-dlab] 01/01: [DLAB-598]: added cluster version on Data
Engine Service popup
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-598
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7d9c59498f57b7488e41656a279a222271b80c87
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Apr 17 16:49:54 2019 +0300
[DLAB-598]: added cluster version on Data Engine Service popup
---
.../computational/cluster-details/cluster-details.component.html | 4 ++++
.../src/main/resources/webapp/src/dictionary/aws.dictionary.ts | 1 +
.../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 1 +
.../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts | 1 +
4 files changed, 7 insertions(+)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index fc79c1c..ec62674 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -40,6 +40,10 @@
<div class="col"><p>Cluster type:</p></div>
<div class="col"><span>{{ resource.template_name }}</span></div>
</div>
+ <div class="row-wrap" *ngIf="resource.image === 'docker.dlab-dataengine-service'">
+ <div class="col"><p>Cluster version:</p></div>
+ <div class="col"><span>{{ resource[DICTIONARY.cluster_version] }}</span></div>
+ </div>
<div class="row-wrap">
<div class="col"><p>Cluster alias:</p></div>
<div class="col tooltip-wrap" (mouseover)="isEllipsisActive($event)">
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 bbb35a5..c87b95a 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
@@ -33,6 +33,7 @@ export const NAMING_CONVENTION = {
'slave_node_shape': 'slave_node_shape',
'total_instance_number': 'total_instance_number',
'spot_instance': 'Spot instance',
+ 'cluster_version': 'emr_version',
'billing': {
'resourceName': 'resource_name',
'cost': 'cost',
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 52a264d..66f73f8 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
@@ -34,6 +34,7 @@ export const NAMING_CONVENTION = {
'total_instance_number': 'dataengine_instance_count',
'spot_instance': 'Low-priority virtual machines',
+ 'cluster_version': '',
'billing': {
'resourceName': 'resourceName',
'cost': 'costString',
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 15f2f17..f6ef295 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,6 +35,7 @@ export const NAMING_CONVENTION = {
'total_instance_number': 'total_instance_number',
'spot_instance': 'Preemptible worker nodes',
+ 'cluster_version': 'dataproc_version',
'billing': {
'resourceName': 'resource_name',
'cost': 'cost',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org