From 544127e7229fae4aaab26f68de053f5409ef6984 Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Mon, 2 Oct 2017 09:39:38 -0400
Subject: [PATCH] EnvFrom Issue Updates

EnvFrom issue fixes for CSS, copy, and UX
---
 app/scripts/directives/editEnvironmentFrom.js        | 6 +++++-
 app/views/directives/edit-environment-from.html      | 4 ++--
 app/views/directives/edit-environment-variables.html | 2 +-
 dist/scripts/scripts.js                              | 4 ++--
 dist/scripts/templates.js                            | 6 +++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/scripts/directives/editEnvironmentFrom.js b/app/scripts/directives/editEnvironmentFrom.js
index 7c0093910e..709ca35835 100644
--- a/app/scripts/directives/editEnvironmentFrom.js
+++ b/app/scripts/directives/editEnvironmentFrom.js
@@ -134,7 +134,11 @@
       return referenceValue;
     };
 
-    ctrl.checkEntries = function(option) {
+    ctrl.checkEntries = function(option, entrySelectedEnvFrom) {
+      if(option === entrySelectedEnvFrom) {
+        return false;
+      }
+
       return !!(getReferenceValue(option));
     };
 
diff --git a/app/views/directives/edit-environment-from.html b/app/views/directives/edit-environment-from.html
index db92b95872..2b607be32b 100644
--- a/app/views/directives/edit-environment-from.html
+++ b/app/views/directives/edit-environment-from.html
@@ -42,7 +42,7 @@
                 </span>
               </ui-select-match>
               <ui-select-choices
-                ui-disable-choice="$ctrl.checkEntries(source)"
+                ui-disable-choice="$ctrl.checkEntries(source, entry.selectedEnvFrom)"
                 repeat="source in $ctrl.envFromSelectorOptions | filter : { metadata: { name: $select.search } } track by (source | uid)"
                 group-by="$ctrl.groupByKind">
                 <span ng-bind-html="source.metadata.name | highlight : $select.search"></span>
@@ -54,7 +54,7 @@
 
       <div ng-if="!$ctrl.isReadonlyAny && !entry.isReadonlyValue" class="environment-from-editor-button">
         <span
-          ng-if="!$ctrl.cannotSort"
+          ng-if="!$ctrl.cannotSort && $ctrl.entries.length > 1"
           class="fa fa-bars sort-row"
           role="button"
           aria-label="Move row"
diff --git a/app/views/directives/edit-environment-variables.html b/app/views/directives/edit-environment-variables.html
index 945f4e1e50..501caba6ec 100644
--- a/app/views/directives/edit-environment-variables.html
+++ b/app/views/directives/edit-environment-variables.html
@@ -46,7 +46,7 @@ <h4 class="section-label">
       entries="container.envFrom"
       selector-placeholder="Secret/Config Map"
       env-from-selector-options="$ctrl.valueFromObjects"
-      add-row-link="Add ALL Values from a Resource"
+      add-row-link="Add ALL Values from Secret or Config Map"
       show-header>
     </edit-environment-from>
   </div>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 8b137f8a96..3b95b81ef5 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -9158,8 +9158,8 @@ name: e.metadata.name
 }
 return t;
 };
-a.checkEntries = function(e) {
-return !!l(e);
+a.checkEntries = function(e, t) {
+return e !== t && !!l(e);
 };
 var u = function(e, t) {
 a.cannotAdd = a.isReadonlyAny || _.isEmpty(t), t && _.each(t, function(e) {
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 83098ed537..7543ec2364 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -6674,7 +6674,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
     "</span>\n" +
     "</ui-select-match>\n" +
-    "<ui-select-choices ui-disable-choice=\"$ctrl.checkEntries(source)\" repeat=\"source in $ctrl.envFromSelectorOptions | filter : { metadata: { name: $select.search } } track by (source | uid)\" group-by=\"$ctrl.groupByKind\">\n" +
+    "<ui-select-choices ui-disable-choice=\"$ctrl.checkEntries(source, entry.selectedEnvFrom)\" repeat=\"source in $ctrl.envFromSelectorOptions | filter : { metadata: { name: $select.search } } track by (source | uid)\" group-by=\"$ctrl.groupByKind\">\n" +
     "<span ng-bind-html=\"source.metadata.name | highlight : $select.search\"></span>\n" +
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
@@ -6682,7 +6682,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "<div ng-if=\"!$ctrl.isReadonlyAny && !entry.isReadonlyValue\" class=\"environment-from-editor-button\">\n" +
-    "<span ng-if=\"!$ctrl.cannotSort\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
+    "<span ng-if=\"!$ctrl.cannotSort && $ctrl.entries.length > 1\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
     "<a ng-if=\"!$ctrl.cannotDeleteAny\" href=\"\" class=\"pficon pficon-close delete-row as-sortable-item-delete\" role=\"button\" aria-label=\"Delete row\" ng-click=\"$ctrl.deleteEntry($index, 1)\"></a>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -6713,7 +6713,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "Environment From\n" +
     "<span class=\"pficon pficon-help\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Environment From lets you add all key-value pairs from a config map or secret as environment variables.\"></span>\n" +
     "</h4>\n" +
-    "<edit-environment-from entries=\"container.envFrom\" selector-placeholder=\"Secret/Config Map\" env-from-selector-options=\"$ctrl.valueFromObjects\" add-row-link=\"Add ALL Values from a Resource\" show-header>\n" +
+    "<edit-environment-from entries=\"container.envFrom\" selector-placeholder=\"Secret/Config Map\" env-from-selector-options=\"$ctrl.valueFromObjects\" add-row-link=\"Add ALL Values from Secret or Config Map\" show-header>\n" +
     "</edit-environment-from>\n" +
     "</div>\n" +
     "<button class=\"btn btn-default\" ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" ng-click=\"$ctrl.save()\" ng-disabled=\"$ctrl.form.$pristine || $ctrl.form.$invalid\">Save</button>\n" +