AMBARI-16799. Fix multiple Persistent Error pop ups (alexantonenko)

ambari-web/app/controllers/global/background_operations_controller.js

@@ -211,7 +211,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
 
     data.items.forEach(function (request) {
       if (this.isUpgradeRequest(request)) {
-        if (!App.get('upgradeIsRunning') && !App.get('testMode')) {
+        if (!App.get('upgradeIsRunning') && !App.get('testMode') && Em.get(request, 'Requests.request_status') !== 'COMPLETED') {
           restoreUpgradeState = true;
         }
         return;

ambari-web/app/models/cluster_states.js

@@ -85,6 +85,12 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
    */
   isInstalled: Em.computed.notExistsIn('clusterState', ['CLUSTER_NOT_CREATED_1', 'CLUSTER_DEPLOY_PREP_2', 'CLUSTER_INSTALLING_3', 'SERVICE_STARTING_3']),
 
+  /**
+   * Stores instance of <code>App.ModalPopup</code> created by <code>postUserPrefErrorCallback</code>
+   * @property {App.ModalPopup|null}
+   */
+  persistErrorModal: null,
+
   /**
    * General info about cluster
    * @type {{clusterName: string, clusterState: string, wizardControllerName: string, localdb: object}}
@@ -277,7 +283,16 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
       msg += JSON.parse(request.responseText).message;
     }
 
-    App.ModalPopup.show({
+    if (this.get('persistErrorModal')) {
+      if (this.get('persistErrorModal').get('state') === 'destroyed') {
+        this.set('persistErrorModal', null);
+      } else {
+        this.get('persistErrorModal').onPrimary();
+        this.set('persistErrorModal', null);
+      }
+    }
+
+    var modal = App.ModalPopup.show({
       header: Em.I18n.t('common.error'),
       secondary: false,
       response: msg,
@@ -285,6 +300,7 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
         template: Em.Handlebars.compile('<p>{{t common.persist.error}} {{response}}</p>')
       })
     });
+    this.set('persistErrorModal', modal);
   }
 
 });