From 417547afc6b455164c0fb72379992528501e993b Mon Sep 17 00:00:00 2001
From: Andrii Tkach <atkach@apache.org>
Date: Thu, 11 Jan 2018 13:30:24 +0200
Subject: [PATCH] [AMBARI-22764] NN HA wizard is broken due to recent commit
 for config compare

---
 ambari-web/app/templates/common/configs/service_config.hbs      | 2 +-
 .../views/common/configs/service_configs_by_category_view.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 34ac6029576..fe9706279ae 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -188,7 +188,7 @@
   {{view App.SpinnerView}}
 {{/if}}
 
-<div class="configs-save-panel" {{bindAttr class="view.showSavePanel::hidden"}}>
+<div {{bindAttr class="view.showSavePanel::hidden :configs-save-panel"}}>
   <div class="pull-right">
     <button class="btn btn-default" {{action doCancel target="controller"}}
       {{bindAttr disabled="view.isDiscardDisabled"}}>
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index 4726c612e1b..ffa4bfea738 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -189,7 +189,7 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.Persist, App.ConfigOverrid
    */
   isShowBlock: function () {
     const isFilterEmpty = this.get('controller.filter') === '';
-    const isFilterActive = this.get('mainView.columns').someProperty('selected');
+    const isFilterActive = this.get('mainView.columns') && this.get('mainView.columns').someProperty('selected');
     const isCustomPropertiesCategory = this.get('category.customCanAddProperty');
     const isCompareMode = this.get('controller.isCompareMode');
     const hasFilteredAdvancedConfigs = this.get('categoryConfigs').filter(function (config) {