You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2018/06/01 20:07:34 UTC

[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-24011: Add workaround to hide client modules in the dashboard (jluniya) (#1443)

This is an automated email from the ASF dual-hosted git repository.

jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by this push:
     new f48f11f  AMBARI-24011: Add workaround to hide client modules in the dashboard (jluniya) (#1443)
f48f11f is described below

commit f48f11fc9740ae9e3f1341bc605fa1b76335b64a
Author: jayush <ja...@gmail.com>
AuthorDate: Fri Jun 1 13:07:31 2018 -0700

    AMBARI-24011: Add workaround to hide client modules in the dashboard (jluniya) (#1443)
    
    Change-Id: Ie69b4e0ca654d59952807694cf2f3f24d6b74c0d
---
 ambari-web/app/mappers/service_mapper.js | 36 +++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/ambari-web/app/mappers/service_mapper.js b/ambari-web/app/mappers/service_mapper.js
index e6cde57..1d00d84 100644
--- a/ambari-web/app/mappers/service_mapper.js
+++ b/ambari-web/app/mappers/service_mapper.js
@@ -33,24 +33,26 @@ App.serviceMapper = App.QuickDataMapper.create({
     var self = this;
     var passiveStateMap = this.get('passiveStateMap');
     json.items.forEach(function (service) {
-      var cachedService = App.cache['services'].findProperty('ServiceInfo.service_name', service.ServiceInfo.service_name);
-      if (cachedService) {
-        // restore service workStatus
-        App.Service.find(cachedService.ServiceInfo.service_name).set('workStatus', service.ServiceInfo.state);
-        cachedService.ServiceInfo.state = service.ServiceInfo.state;
-      } else {
-        var serviceData = {
-          ServiceInfo: {
-            service_name: service.ServiceInfo.service_name,
-            service_group_name: service.ServiceInfo.service_group_name,
-            state: service.ServiceInfo.state
-          },
-          host_components: [],
-          components: []
-        };
-        App.cache['services'].push(serviceData);
+      if(!service.ServiceInfo.service_name.includes('CLIENT')) {
+        var cachedService = App.cache['services'].findProperty('ServiceInfo.service_name', service.ServiceInfo.service_name);
+        if (cachedService) {
+          // restore service workStatus
+          App.Service.find(cachedService.ServiceInfo.service_name).set('workStatus', service.ServiceInfo.state);
+          cachedService.ServiceInfo.state = service.ServiceInfo.state;
+        } else {
+          var serviceData = {
+            ServiceInfo: {
+              service_name: service.ServiceInfo.service_name,
+              service_group_name: service.ServiceInfo.service_group_name,
+              state: service.ServiceInfo.state
+            },
+            host_components: [],
+            components: []
+          };
+          App.cache['services'].push(serviceData);
+        }
+        passiveStateMap[service.ServiceInfo.service_name] = service.ServiceInfo.maintenance_state;
       }
-      passiveStateMap[service.ServiceInfo.service_name] = service.ServiceInfo.maintenance_state;
     });
 
     if (!this.get('initialAppLoad')) {

-- 
To stop receiving notification emails like this one, please contact
jluniya@apache.org.