Merge branch 'release_3.2.4' into release_3.3.0

awx/ui/client/src/app.js

@@ -113,7 +113,11 @@ angular
         $locationProvider.hashPrefix('');
     }])
     .config(['$logProvider', function($logProvider) {
-        $logProvider.debugEnabled($ENV['ng-debug'] || false);
+        window.debug = function(){
+            $logProvider.debugEnabled(!$logProvider.debugEnabled());
+            return $logProvider.debugEnabled();
+        };
+        window.debug(false);
     }])
     .config(['ngToastProvider', function(ngToastProvider) {
         ngToastProvider.configure({

awx/ui/client/src/shared/socket/socket.service.js

@@ -8,7 +8,8 @@ export default
 ['$rootScope', '$location', '$log','$state', '$q', 'i18n',
     function ($rootScope, $location, $log, $state, $q, i18n) {
         var needsResubscribing = false,
-        socketPromise = $q.defer();
+        socketPromise = $q.defer(),
+        needsRefreshAfterBlur;
         return {
             init: function() {
                 var self = this,
@@ -24,6 +25,26 @@ export default
                 }
                 url = `${protocol}://${host}/websocket/`;
 
+                // only toggle background tabbed sockets if the
+                // UI_LIVE_UPDATES_ENABLED flag is true in the settings file
+                if(window.liveUpdates){
+                    document.addEventListener('visibilitychange', function() {
+                        $log.debug(document.visibilityState);
+                        if(document.visibilityState === 'hidden'){
+                            window.liveUpdates = false;
+                        }
+                        else if(document.visibilityState === 'visible'){
+                            window.liveUpdates = true;
+                            if(needsRefreshAfterBlur){
+                                $state.go('.', null, {reload: true});
+                                needsRefreshAfterBlur = false;
+                            }
+
+                        }
+                    });
+                }
+
+
                 if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) {
 
                     $log.debug('Socket connecting to: ' + url);
@@ -75,6 +96,13 @@ export default
                 $log.debug('Received From Server: ' + e.data);
 
                 var data = JSON.parse(e.data), str = "";
+
+                if(!window.liveUpdates && data.group_name !== "control" && $state.current.name !== "jobResult"){
+                    $log.debug('Message from server dropped: ' + e.data);
+                    needsRefreshAfterBlur = true;
+                    return;
+                }
+
                 if(data.group_name==="jobs" && !('status' in data)){
                     // we know that this must have been a
                     // summary complete message b/c status is missing.

awx/ui/conf.py

@@ -63,3 +63,13 @@ register(
     category=_('UI'),
     category_slug='ui',
 )
+
+register(
+    'UI_LIVE_UPDATES_ENABLED',
+    field_class=fields.BooleanField,
+    label=_('Enable Live Updates in the UI'),
+    help_text=_('If disabled, the page will not refresh when events are received. '
+                'Reloading the page will be required to get the latest details.'),
+    category=_('UI'),
+    category_slug='ui',
+)

awx/ui/views.py

@@ -2,6 +2,7 @@
 # All Rights Reserved.
 
 from django.views.generic.base import TemplateView, RedirectView
+from django.conf import settings
 
 class IndexView(TemplateView):
 
@@ -9,6 +10,7 @@ class IndexView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super(IndexView, self).get_context_data(**kwargs)
+        context['UI_LIVE_UPDATES_ENABLED'] = settings.UI_LIVE_UPDATES_ENABLED
         # Add any additional context info here.
         return context