Bug 1459834 - Don't stop navigation when a user has blocked confirm dialogs

Author: spadgett

app/scripts/constants.js

@@ -78,6 +78,10 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
   // removes the option from the route creation form.
   DISABLE_WILDCARD_ROUTES: true,
 
+  // true indicates that the web console should not show confirmation prompts
+  // when users navigate away from a page without saving.
+  DISABLE_CONFIRM_ON_EXIT: false,
+
   // This blacklist hides certain kinds from the "Other Resources" page because they are unpersisted, disallowed for most end users, or not supported by openshift but exist in kubernetes
   AVAILABLE_KINDS_BLACKLIST: [],
 

app/scripts/directives/confirmOnExit.js

@@ -9,6 +9,13 @@ angular.module("openshiftConsole")
         message: '='
       },
       link: function($scope) {
+        // If the feature is disabled or the user has asked the browser to
+        // block dialogs, don't try to prompt.
+        if (_.get(window, 'OPENSHIFT_CONSTANTS.DISABLE_CONFIRM_ON_EXIT') ||
+            _.get(window, 'OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED')) {
+          return;
+        }
+
         var getMessage = function() {
           return $scope.message || "You have unsaved changes. Leave this page anyway?";
         };
@@ -27,7 +34,27 @@ angular.module("openshiftConsole")
             return;
           }
 
-          if(!confirm(getMessage())) {
+          var start = new Date().getTime();
+
+          // Use a native confirm dialog to block code execution since we're in
+          // the local change handler.
+          var okToExit = confirm(getMessage());
+          if (okToExit) {
+            return;
+          }
+
+          // Workaround "Prevent this page from creating additional dialogs"
+          //
+          // If the response took less than 50ms, assume the confirm dialog was
+          // blocked by the browser. There's no API to detect that the user
+          // has told Chrome to block these dialogs, and the user can't
+          // navigate away otherwise.
+          var end = new Date().getTime();
+          console.log('confirm time', end - start);
+          if ((end - start) < 50) {
+            // Remember that the user is blocking dialogs. This is a per session settings.
+            _.set(window, 'OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED', true);
+          } else {
             event.preventDefault();
           }
         });

dist/scripts/scripts.js

@@ -687,6 +687,7 @@ DEFAULT_HPA_CPU_TARGET_PERCENT:80,
 DISABLE_OVERVIEW_METRICS:!1,
 DISABLE_CUSTOM_METRICS:!1,
 DISABLE_WILDCARD_ROUTES:!0,
+DISABLE_CONFIRM_ON_EXIT:!1,
 AVAILABLE_KINDS_BLACKLIST:[],
 ENABLE_TECH_PREVIEW_FEATURE:{
 service_catalog_landing_page:!1,
@@ -13306,19 +13307,27 @@ dirty:"=",
 message:"="
 },
 link:function(a) {
+if (!_.get(window, "OPENSHIFT_CONSTANTS.DISABLE_CONFIRM_ON_EXIT") && !_.get(window, "OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED")) {
 var b = function() {
 return a.message || "You have unsaved changes. Leave this page anyway?";
 }, c = function() {
 if (a.dirty) return b();
 };
 $(window).on("beforeunload", c);
 var d = a.$on("$locationChangeStart", function(c) {
-a.dirty && (confirm(b()) || c.preventDefault());
+if (a.dirty) {
+var d = new Date().getTime(), e = confirm(b());
+if (!e) {
+var f = new Date().getTime();
+console.log("confirm time", f - d), f - d < 50 ? _.set(window, "OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED", !0) :c.preventDefault();
+}
+}
 });
 a.$on("$destroy", function() {
 $(window).off("beforeunload", c), d && d();
 });
 }
+}
 };
 }), angular.module("openshiftConsole").filter("duration", function() {
 return function(a, b, c, d) {

dist/scripts/vendor.js

@@ -60542,9 +60542,8 @@ return a;
 var e = {
 group:"servicecatalog.k8s.io",
 resource:"bindings"
-}, f = function(b) {
-var c = a("generateName");
-return {
+}, f = function(b, c) {
+var e = a("generateName"), f = e(_.trunc(b, d.maxlength - 6) + "-"), g = {
 kind:"Binding",
 apiVersion:"servicecatalog.k8s.io/v1alpha1",
 metadata:{
@@ -60554,14 +60553,20 @@ spec:{
 instanceRef:{
 name:b
 },
-secretName:c(_.trunc(b, d.maxlength - 6) + "-")
+secretName:f
 }
-};
+}, h = _.get(c, "spec.selector");
+return h && (h.matchLabels || h.matchExpressions || (h = {
+matchLabels:h
+}), g.spec.alphaPodPresetTemplate = {
+name:f,
+selector:h
+}), g;
 };
 return {
 bindingResource:e,
 bindService:function(a, b, d) {
-var g = f(b);
+var g = f(b, d);
 return c.create(e, null, g, a);
 },
 isServiceBindable:function(a, b) {
@@ -64564,7 +64569,9 @@ repository:a.ctrl.repository,
 namespace:a.ctrl.selectedProject.metadata.name,
 imageStreamTag:b
 });
-a.createAPIObjects(c), a.ctrl.serviceToBind && a.bindService();
+a.createAPIObjects(c), a.ctrl.serviceToBind && a.bindService(e.find(c, {
+kind:"DeploymentConfig"
+}));
 }, function(b) {
 a.ctrl.error = b;
 });
@@ -64592,18 +64599,18 @@ a.failure.length ? b.ctrl.error = a :b.ctrl.success = !0;
 }, function(a) {
 b.ctrl.error = a;
 });
-}, a.prototype.bindService = function() {
-var a = this;
+}, a.prototype.bindService = function(a) {
+var b = this;
 this.ctrl.bindInProgress = !0, this.ctrl.bindError = !1;
-var b = {
+var c = {
 namespace:e.get(this.ctrl.selectedProject, "metadata.name")
 };
-this.BindingService.bindService(b, this.ctrl.serviceToBind, this.ctrl.name).then(function(c) {
-a.ctrl.binding = c, a.ctrl.bindInProgress = !1, a.ctrl.bindComplete = !0, a.ctrl.bindError = null, a.DataService.watchObject(a.BindingService.bindingResource, e.get(a.ctrl.binding, "metadata.name"), b, function(b) {
-a.ctrl.binding = b;
+this.BindingService.bindService(c, this.ctrl.serviceToBind, a).then(function(a) {
+b.ctrl.binding = a, b.ctrl.bindInProgress = !1, b.ctrl.bindComplete = !0, b.ctrl.bindError = null, b.DataService.watchObject(b.BindingService.bindingResource, e.get(b.ctrl.binding, "metadata.name"), c, function(a) {
+b.ctrl.binding = a;
 });
-}, function(b) {
-a.ctrl.bindInProgress = !1, a.ctrl.bindComplete = !0, a.ctrl.bindError = b;
+}, function(a) {
+b.ctrl.bindInProgress = !1, b.ctrl.bindComplete = !0, b.ctrl.bindError = a;
 });
 }, a.prototype.getServiceClasses = function() {
 var a = this, b = {