Revert "AMBARI-7815. UI - prevent user from deleting host with not "DECOMMISSIONED" datanode/nodemanager. (akovalenko)"

ambari-web/app/controllers/main/host/details.js

@@ -1511,7 +1511,6 @@ App.MainHostDetailsController = Em.Controller.extend({
       lastComponents: [],
       masterComponents: [],
       runningComponents: [],
-      notDecommissionedComponents: [],
       nonDeletableComponents: [],
       unknownComponents: []
     };
@@ -1537,9 +1536,6 @@ App.MainHostDetailsController = Em.Controller.extend({
         if (workStatus === App.HostComponentStatus.unknown) {
           container.unknownComponents.push(cInstance.get('displayName'));
         }
-        if (cInstance.get('adminState') === 'INSERVICE') {
-          container.notDecommissionedComponents.push(cInstance.get('displayName'));
-        }
       });
     }
     return container;
@@ -1558,7 +1554,7 @@ App.MainHostDetailsController = Em.Controller.extend({
     } else if (container.nonDeletableComponents.length > 0) {
       this.raiseDeleteComponentsError(container.nonDeletableComponents, 'nonDeletableList');
       return;
-    } else if (container.runningComponents.length + container.notDecommissionedComponents.length > 0) {
+    } else if (container.runningComponents.length > 0) {
       this.raiseDeleteComponentsError(container.runningComponents, 'runningList');
       return;
     }
@@ -1574,7 +1570,7 @@ App.MainHostDetailsController = Em.Controller.extend({
 
   /**
    * Show popup with info about reasons why host can't be deleted
-   * @param {Array} components
+   * @param {string[]} components
    * @param {string} type
    * @method raiseDeleteComponentsError
    */
@@ -1590,8 +1586,7 @@ App.MainHostDetailsController = Em.Controller.extend({
         return this.get('components').join(", ");
       }.property(),
       componentsBody: function () {
-        var componentsLength = this.get('components.length');
-        return componentsLength ? Em.I18n.t('hosts.cant.do.popup.' + type + '.body').format(this.get('components').length) : '';
+        return Em.I18n.t('hosts.cant.do.popup.' + type + '.body').format(this.get('components').length);
       }.property(),
       componentsBodyEnd: function () {
         if (this.get('showBodyEnd')) {

ambari-web/app/messages.js

@@ -2117,7 +2117,8 @@ Em.I18n.translations = {
   'hosts.cant.do.popup.masterList.body.end':'To delete this host, you must first move all the master components listed above to another host.',
   'hosts.cant.do.popup.nonDeletableList.body':'Deletion of the following {0} components is not supported. ',
   'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since the following components are running:',
-  'hosts.cant.do.popup.runningList.body.end': 'If this host has a DataNode or NodeManager, it should be decommissioned first to prevent data loss.',
+  'hosts.cant.do.popup.runningList.body.end':'To delete this host, you must first stop all the running components listed above. ' +
+    'If this host has a DataNode, it should be decommissioned first to prevent data loss.',
   'hosts.add.header':'Add Host Wizard',
   'hosts.add.exit.header':'Exit',
   'hosts.add.exit.body':'Do you really want to exit Add Host Wizard?',

ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs

@@ -20,13 +20,11 @@
   <div class="warning">
   <i class="icon-warning-sign"></i> <strong>{{componentsBody}}</strong>
   </div>
-  {{#if components.length}}
-    <div class="row-fluid">
-      <div class="tinyoffset span10 warning-list">
-        {{componentsStr}}
-      </div>
+  <div class="row-fluid">
+    <div class="tinyoffset span10 warning-list">
+    {{componentsStr}}
     </div>
-  {{/if}}
+  </div>
 
 {{#if showBodyEnd}}
   <div class="warning-details">{{{componentsBodyEnd}}}</div>

ambari-web/test/controllers/main/host/details_test.js

@@ -1428,7 +1428,6 @@ describe('App.MainHostDetailsController', function () {
       lastComponents: [],
       masterComponents: [],
       runningComponents: [],
-      notDecommissionedComponents: [],
       nonDeletableComponents: [],
       unknownComponents: []
     };
@@ -1506,38 +1505,6 @@ describe('App.MainHostDetailsController', function () {
       expect(controller.getHostComponentsInfo().runningComponents).to.eql(['ZK1']);
       App.HostComponent.find.restore();
     });
-    it('content.hostComponents has notDecommissioned running component', function () {
-      sinon.stub(App.HostComponent, 'find', function() {
-        return [{
-          id: 'DATANODE_host1',
-          componentName: 'DATANODE'
-        }];
-      });
-      controller.set('content', {hostComponents: [Em.Object.create({
-        componentName: 'DATANODE',
-        workStatus: 'STARTED',
-        displayName: 'DataNode',
-        adminState: 'INSERVICE'
-      })]});
-      expect(controller.getHostComponentsInfo().notDecommissionedComponents).to.eql(['DataNode']);
-      App.HostComponent.find.restore();
-    });
-    it('content.hostComponents has notDecommissioned running component', function () {
-      sinon.stub(App.HostComponent, 'find', function() {
-        return [{
-          id: 'DATANODE_host1',
-          componentName: 'DATANODE'
-        }];
-      });
-      controller.set('content', {hostComponents: [Em.Object.create({
-        componentName: 'DATANODE',
-        workStatus: 'INSTALLED',
-        displayName: 'DataNode',
-        adminState: 'INSERVICE'
-      })]});
-      expect(controller.getHostComponentsInfo().notDecommissionedComponents).to.eql(['DataNode']);
-      App.HostComponent.find.restore();
-    });
     it('content.hostComponents has non-deletable component', function () {
       sinon.stub(App.HostComponent, 'find', function () {
         return [
@@ -1618,8 +1585,7 @@ describe('App.MainHostDetailsController', function () {
       controller.set('mockHostComponentsInfo', {
         masterComponents: [],
         nonDeletableComponents: [],
-        runningComponents: [{}],
-        notDecommissionedComponents: []
+        runningComponents: [{}]
       });
       controller.validateAndDeleteHost();
       expect(controller.raiseDeleteComponentsError.calledWith([{}], 'runningList')).to.be.true;
@@ -1629,7 +1595,6 @@ describe('App.MainHostDetailsController', function () {
         masterComponents: [],
         nonDeletableComponents: [],
         runningComponents: [],
-        notDecommissionedComponents: [],
         unknownComponents: [],
         lastComponents: [],
         zkServerInstalled: true
@@ -1644,7 +1609,6 @@ describe('App.MainHostDetailsController', function () {
         masterComponents: [],
         nonDeletableComponents: [],
         runningComponents: [],
-        notDecommissionedComponents: [],
         unknownComponents: [],
         lastComponents: [],
         zkServerInstalled: false