Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
AMBARI-25103 Duplicate title on YARN summary page. (ababiichuk)
  • Loading branch information
aBabiichuk committed Jan 15, 2019
1 parent 8245597 commit 0fdfa1afa534c022d6546aac9da6ff9bfc3b6302
Showing 9 changed files with 21 additions and 19 deletions.
@@ -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}}
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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

0 comments on commit 0fdfa1a

Please sign in to comment.