AMBARI-10474. NFSGateways have incorrect displaying at UI. (akovalenko)

ambari-web/app/mappers/components_state_mapper.js

@@ -48,6 +48,11 @@ App.componentsStateMapper = App.QuickDataMapper.create({
       data_nodes_installed: 'INSTALLED_PATH',
       data_nodes_total: 'TOTAL_PATH'
     },
+    'NFS_GATEWAY': {
+      nfs_gateways_started: 'STARTED_PATH',
+      nfs_gateways_installed: 'INSTALLED_PATH',
+      nfs_gateways_total: 'TOTAL_PATH'
+    },
     'NODEMANAGER': {
       node_managers_started: 'STARTED_PATH',
       node_managers_installed: 'INSTALLED_PATH',

ambari-web/app/mappers/service_metrics_mapper.js

@@ -65,7 +65,10 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     name_node_rpc: 'nameNodeComponent.host_components[0].metrics.rpc.RpcQueueTime_avg_time',
     data_nodes_started: 'data_nodes_started',
     data_nodes_installed: 'data_nodes_installed',
-    data_nodes_total: 'data_nodes_total'
+    data_nodes_total: 'data_nodes_total',
+    nfs_gateways_started: 'nfs_gateways_started',
+    nfs_gateways_installed: 'nfs_gateways_installed',
+    nfs_gateways_total: 'nfs_gateways_total'
   },
   yarnConfig: {
     version: 'resourceManagerComponent.ServiceComponentInfo.Version',

ambari-web/app/templates/main/service/services/hdfs.hbs

@@ -29,6 +29,18 @@
       {{t common.started}}
   </td>
 </tr>
+<!-- NFS Gateway -->
+<tr>
+  <td><a href="#" {{action filterHosts view.nfsGatewayComponent}}>{{t dashboard.services.hdfs.nfsgateways}}</a></td>
+  <td>
+    <span>
+      {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.nfsGatewaysStarted" totalComponentsBinding="view.service.nfsGatewaysTotal"}}
+        {{view.liveComponents}}/{{view.totalComponents}}
+      {{/view}}
+    </span>
+    {{t common.started}}
+  </td>
+</tr>
 <!-- Data Node Counts -->
 <tr>
   <td>{{t dashboard.services.hdfs.datanodecounts}}</td>
@@ -115,16 +127,4 @@
   <td>
     {{view.safeModeStatus}}
   </td>
-</tr>
-<!-- NFS Gateway -->
-<tr>
-  <td><a href="#" {{action filterHosts view.nfsGatewayComponent}}>{{t dashboard.services.hdfs.nfsgateways}}</a></td>
-  <!--td>
-    <span>
-      {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.nfsGatewaysStarted" totalComponentsBinding="view.service.nfsGatewaysTotal"}}
-        {{view.liveComponents}}/{{view.totalComponents}}
-      {{/view}}
-    </span>
-      {{t common.started}}
-  </td-->
-</tr>
+</tr>

ambari-web/app/views/main/service/services/hdfs.js

@@ -70,13 +70,6 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     return this.get('service.dataNodesInstalled');
   }.property('service.dataNodesInstalled'),
 
-  nfsGatewaysLive: function () {
-    return this.get('service.nfsGatewaysStarted');
-  }.property('service.nfsGatewaysStarted'),
-  nfsGatewaysDead: function () {
-    return this.get('service.nfsGatewaysInstalled');
-  }.property('service.nfsGatewaysInstalled'),
-
   showJournalNodes: function () {
     return this.get('service.journalNodes.length') > 0;
   }.property('service.journalNodes.length'),