This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0fdfa1a AMBARI-25103 Duplicate title on YARN summary page.
(ababiichuk)
0fdfa1a is described below
commit 0fdfa1afa534c022d6546aac9da6ff9bfc3b6302
Author: ababiichuk <ababiic...@hortonworks.com>
AuthorDate: Mon Jan 14 18:33:31 2019 +0200
AMBARI-25103 Duplicate title on YARN summary page. (ababiichuk)
---
.../main/service/info/summary/master_components.hbs | 12 ------------
ambari-web/app/templates/main/service/services/hbase.hbs | 2 +-
ambari-web/app/templates/main/service/services/hdfs.hbs | 12 ++++++++++++
ambari-web/app/templates/main/service/services/hive.hbs | 2 +-
ambari-web/app/templates/main/service/services/onefs.hbs | 2 +-
ambari-web/app/templates/main/service/services/ranger.hbs | 2 +-
ambari-web/app/templates/main/service/services/storm.hbs | 4 ++--
ambari-web/app/templates/main/service/services/yarn.hbs | 2 +-
ambari-web/app/views/main/service/service.js | 2 ++
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git
a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
index 249247f..72a91d4 100644
--- a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
@@ -64,18 +64,6 @@
{{/if}}
{{/if}}
{{/each}}
-{{#unless view.mastersComp.length}}
- <div class="col-md-12">
- <div class="col-md-2">
- {{#if view.parentView.parentView.hasComponents}}
- {{t dashboard.services.hdfs.summary.components}}
- {{/if}}
- </div>
- <div class="col-md-10">
- {{view App.SummaryClientComponentsView
clientsObjBinding="view.parentView.parentView.clientObj"}}
- </div>
- </div>
-{{/unless}}
{{#if view.parentView.parentView.service.hasMasterOrSlaveComponent}}
{{#if view.componentCommonWidgetsView}}
{{view view.componentCommonWidgetsView}}
diff --git a/ambari-web/app/templates/main/service/services/hbase.hbs
b/ambari-web/app/templates/main/service/services/hbase.hbs
index 6134c71..581099b 100644
--- a/ambari-web/app/templates/main/service/services/hbase.hbs
+++ b/ambari-web/app/templates/main/service/services/hbase.hbs
@@ -22,7 +22,7 @@
{{view view.dashboardMasterComponentView}}
<div class="col-md-12">
<div class="col-md-2">
- {{#if view.hasMultipleMasterGroups}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
</div>
diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs
b/ambari-web/app/templates/main/service/services/hdfs.hbs
index 43a0083..7f6b647 100644
--- a/ambari-web/app/templates/main/service/services/hdfs.hbs
+++ b/ambari-web/app/templates/main/service/services/hdfs.hbs
@@ -25,5 +25,17 @@
{{view view.slaveComponentsView
slaveComponentsViewBinding="view.slaveComponentsView" summaryViewBinding="view"
showTitle=true}}
{{/if}}
+ {{#unless view.parentView.service.hasMasterOrSlaveComponent}}
+ <div class="col-md-12">
+ <div class="col-md-2">
+ {{#if view.parentView.hasComponents}}
+ {{t dashboard.services.hdfs.summary.components}}
+ {{/if}}
+ </div>
+ <div class="col-md-10">
+ {{view App.SummaryClientComponentsView
clientsObjBinding="view.parentView.clientObj"}}
+ </div>
+ </div>
+ {{/unless}}
</div>
</div>
diff --git a/ambari-web/app/templates/main/service/services/hive.hbs
b/ambari-web/app/templates/main/service/services/hive.hbs
index ebd1e28..00ad345 100644
--- a/ambari-web/app/templates/main/service/services/hive.hbs
+++ b/ambari-web/app/templates/main/service/services/hive.hbs
@@ -20,7 +20,7 @@
{{view view.dashboardMasterComponentView}}
<div class="col-md-12">
<div class="col-md-2">
- {{#if view.hasMultipleMasterGroups}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
</div>
diff --git a/ambari-web/app/templates/main/service/services/onefs.hbs
b/ambari-web/app/templates/main/service/services/onefs.hbs
index e4d6d27..23dd7f9 100644
--- a/ambari-web/app/templates/main/service/services/onefs.hbs
+++ b/ambari-web/app/templates/main/service/services/onefs.hbs
@@ -39,7 +39,7 @@
</div>
<div class="col-md-12">
<div class="col-md-2">
- {{#if view.hasMultipleMasterGroups}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
</div>
diff --git a/ambari-web/app/templates/main/service/services/ranger.hbs
b/ambari-web/app/templates/main/service/services/ranger.hbs
index 54b3efc..bed92e8 100644
--- a/ambari-web/app/templates/main/service/services/ranger.hbs
+++ b/ambari-web/app/templates/main/service/services/ranger.hbs
@@ -20,7 +20,7 @@
{{view view.dashboardMasterComponentView}}
<div class="col-md-12">
<div class="col-md-2">
- {{#if view.hasMultipleMasterGroups}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
</div>
diff --git a/ambari-web/app/templates/main/service/services/storm.hbs
b/ambari-web/app/templates/main/service/services/storm.hbs
index 3eb0aea..6cfa1c6 100644
--- a/ambari-web/app/templates/main/service/services/storm.hbs
+++ b/ambari-web/app/templates/main/service/services/storm.hbs
@@ -17,11 +17,11 @@
}}
<div class="row">
- <div class="col-md-12 component-summary">
+ <div class="component-summary">
{{view view.dashboardMasterComponentView}}
<div class="col-md-12">
<div class="col-md-2">
- {{#if view.hasMultipleMasterGroups}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
</div>
diff --git a/ambari-web/app/templates/main/service/services/yarn.hbs
b/ambari-web/app/templates/main/service/services/yarn.hbs
index f6733d9..a17004e 100644
--- a/ambari-web/app/templates/main/service/services/yarn.hbs
+++ b/ambari-web/app/templates/main/service/services/yarn.hbs
@@ -22,7 +22,7 @@
{{view view.dashboardMasterComponentView}}
<div class="col-md-12">
<div class="col-md-2">
- {{#if view.parentView.hasComponents}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
</div>
diff --git a/ambari-web/app/views/main/service/service.js
b/ambari-web/app/views/main/service/service.js
index 1e2d57c..04fa1fd 100644
--- a/ambari-web/app/views/main/service/service.js
+++ b/ambari-web/app/views/main/service/service.js
@@ -159,6 +159,8 @@ App.MainDashboardServiceView =
Em.View.extend(App.MainDashboardServiceViewWrappe
hasMultipleMasterGroups: Em.computed.gt('parentView.mastersObj.length', 1),
+ showComponentsTitleForNonMasters: Em.computed.or('!masters.length',
'hasMultipleMasterGroups'),
+
/**
* Check if service component is created
* @param componentName
