Merge pull request #2407 from spadgett/edit-env-background-update

Automatic merge from submit-queue.

Correctly merge env edits after background upates

Fixes #2394

/kind bug

Author: openshift-merge-robot

app/scripts/directives/editEnvironmentVariables.js

@@ -52,7 +52,7 @@
       // variables. If not, merge the environment edits into the updated
       // deployment config object.
       if (EnvironmentService.isEnvironmentEqual(currentValue, previousValue)) {
-        ctrl.updatedObject = EnvironmentService.mergeEdits(currentValue, previousValue);
+        ctrl.updatedObject = EnvironmentService.mergeEdits(ctrl.updatedObject, currentValue);
         return;
       }
 

dist/scripts/scripts.js

@@ -14478,7 +14478,7 @@ bottom: n.offsetBottom
 angular.module("openshiftConsole").component("editEnvironmentVariables", {
 controller: [ "$filter", "APIService", "DataService", "EnvironmentService", "NotificationsService", function(e, t, n, a, r) {
 var o, i, s, c, l = this, u = !1, d = [], m = [], p = !1, f = e("canI"), g = e("getErrorDetails"), v = e("humanizeKind"), h = e("orderByDisplayName"), y = function(e, t) {
-u || (l.form && !l.form.$pristine && l.updatedObject ? a.isEnvironmentEqual(e, t) ? l.updatedObject = a.mergeEdits(e, t) : (u = !0, r.addNotification({
+u || (l.form && !l.form.$pristine && l.updatedObject ? a.isEnvironmentEqual(e, t) ? l.updatedObject = a.mergeEdits(l.updatedObject, e) : (u = !0, r.addNotification({
 type: "warning",
 message: "The environment variables for the " + o + " have been updated in the background.",
 details: "Saving your changes may create a conflict or cause loss of data."