Merge pull request #2201 from cdcabrera/issue-envfrom-link

Automatic merge from submit-queue.

EnvFrom Config Map and Secret Link

EnvFrom Issue Updates for...

EnvFrom issue fixes for CSS, copy, and UX. Updates parts of #2182
- Config Map and Secret Link

Initial work is aimed at re-opening the discussion around behavior... this PR initially... 
- has the link display until the envFrom form aspect is edited, then it hides. 
- when the link is displayed it navigates directly to the secret or config map view

![oct-02-2017 14-32-04](https://user-images.githubusercontent.com/3761375/31093083-8a0a87ac-a77e-11e7-887d-f1cedd3d773d.gif)

@beanh66

Author: openshift-merge-robot

app/scripts/directives/editEnvironmentFrom.js

@@ -27,6 +27,15 @@
 
     ctrl.setFocusClass = 'edit-environment-from-set-focus-' + uniqueId;
 
+    ctrl.viewOverlayPanel = function(entry) {
+      ctrl.overlayPaneEntryDetails = entry;
+      ctrl.overlayPanelVisible = true;
+    };
+
+    ctrl.closeOverlayPanel = function() {
+      ctrl.overlayPanelVisible = false;
+    };
+
     var addEntry = function(entries, entry) {
       entries && entries.push(entry || {});
     };
@@ -61,7 +70,6 @@
       return humanizeKind(object.kind);
     };
 
-    //ctrl.uniqueForValue = utils.uniqueForValue;
     ctrl.dragControlListeners = {
       accept: function (sourceItemHandleScope, destSortableScope) {
         return sourceItemHandleScope.itemScope.sortableScope.$id === destSortableScope.$id;

app/styles/_kve.less

@@ -118,6 +118,7 @@
   .key-value-editor-entry,
   .environment-from-entry {
     display: table;
+    margin-bottom: 15px;
     padding-right: (@as-sortable-item-button-width * 2);
     position: relative;
     table-layout: fixed;
@@ -127,11 +128,12 @@
         float: left;
         padding-right: 5px;
         position: relative;
-        width: 50%;
+        width: auto;
       }
     }
     .environment-from-input {
       float: left;
+      margin-bottom: 0;
       padding-right: 5px;
       width: 100%;
       @media(min-width: @screen-md-min) {
@@ -144,6 +146,13 @@
       }
     }
   }
+  .environment-from-entry {
+    .environment-from-view-details {
+      float: left;
+      line-height: 1;
+      padding: 6px 0 0;
+    }
+  }
 
   .key-value-editor-input .ui-select {
     @media(min-width: @screen-md-min) {
@@ -163,6 +172,7 @@
 .key-value-editor .key-value-editor-input,
 .key-value-editor-header {
   float: left;
+  margin-bottom: 0;
   padding-right: 5px;
   width: 50%;
 }

app/views/directives/edit-environment-from.html

@@ -68,6 +68,12 @@
           aria-label="Delete row"
           ng-click="$ctrl.deleteEntry($index, 1)"></a>
       </div>
+      <div class="environment-from-view-details">
+        <a
+          ng-if="entry.selectedEnvFrom"
+          href=""
+          ng-click="$ctrl.viewOverlayPanel(entry.selectedEnvFrom)">View Details</a>
+      </div>
     </div>
 
     <div class="environment-from-entry form-group" ng-if="!$ctrl.cannotAdd">
@@ -78,4 +84,44 @@
         ng-click="$ctrl.onAddRow()">{{ $ctrl.addRowLink }}</a>
     </div>
   </div>
+
+  <overlay-panel class="add-config-to-application" show-panel="$ctrl.overlayPanelVisible" show-close="true" handle-close="$ctrl.closeOverlayPanel">
+    <div class="dialog-title">
+      <h3>Value Details</h3>
+    </div>
+    <div class="modal-body">
+      <h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}
+        <small class="muted">&ndash; {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}}</small></h4>
+
+      <div ng-if="!($ctrl.overlayPaneEntryDetails.data | size)" class="empty-state-message text-center">
+        The {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind}} has no properties.
+      </div>
+
+      <div ng-if="$ctrl.overlayPaneEntryDetails.data | size" class="table-responsive scroll-shadows-horizontal">
+        <table class="table table-bordered table-bordered-columns config-map-table key-value-table">
+          <tbody>
+            <tr ng-repeat="(prop, value) in $ctrl.overlayPaneEntryDetails.data">
+              <td class="key">{{prop}}</td>
+              <td class="value">
+                <truncate-long-text
+                  ng-if="$ctrl.overlayPaneEntryDetails.kind === 'ConfigMap'"
+                  content="value"
+                  limit="50"
+                  newline-limit="2"
+                  expandable="true">
+                </truncate-long-text>
+
+                <span ng-if="$ctrl.overlayPaneEntryDetails.kind === 'Secret'">&#42;&#42;&#42;&#42;&#42;</span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+    <div class="modal-footer">
+      <button ng-click="$ctrl.closeOverlayPanel()"
+              type="button"
+              class="btn btn-primary pull-right">Close</button>
+    </div>
+  </overlay-panel>
 </ng-form>

dist/scripts/scripts.js

@@ -9156,7 +9156,11 @@ n[e.key] = e.value;
 angular.module("openshiftConsole").component("editEnvironmentFrom", {
 controller: [ "$attrs", "$filter", "keyValueEditorUtils", function(e, t, n) {
 var a = this, r = t("canI"), o = t("humanizeKind"), i = _.uniqueId();
-a.setFocusClass = "edit-environment-from-set-focus-" + i;
+a.setFocusClass = "edit-environment-from-set-focus-" + i, a.viewOverlayPanel = function(e) {
+a.overlayPaneEntryDetails = e, a.overlayPanelVisible = !0;
+}, a.closeOverlayPanel = function() {
+a.overlayPanelVisible = !1;
+};
 var s = function(e, t) {
 e && e.push(t || {});
 };

dist/scripts/templates.js

@@ -6696,11 +6696,43 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<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 class=\"environment-from-view-details\">\n" +
+    "<a ng-if=\"entry.selectedEnvFrom\" href=\"\" ng-click=\"$ctrl.viewOverlayPanel(entry.selectedEnvFrom)\">View Details</a>\n" +
+    "</div>\n" +
     "</div>\n" +
     "<div class=\"environment-from-entry form-group\" ng-if=\"!$ctrl.cannotAdd\">\n" +
     "<a href=\"\" class=\"add-row-link\" role=\"button\" ng-click=\"$ctrl.onAddRow()\">{{ $ctrl.addRowLink }}</a>\n" +
     "</div>\n" +
     "</div>\n" +
+    "<overlay-panel class=\"add-config-to-application\" show-panel=\"$ctrl.overlayPanelVisible\" show-close=\"true\" handle-close=\"$ctrl.closeOverlayPanel\">\n" +
+    "<div class=\"dialog-title\">\n" +
+    "<h3>Value Details</h3>\n" +
+    "</div>\n" +
+    "<div class=\"modal-body\">\n" +
+    "<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}\n" +
+    "<small class=\"muted\">&ndash; {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}}</small></h4>\n" +
+    "<div ng-if=\"!($ctrl.overlayPaneEntryDetails.data | size)\" class=\"empty-state-message text-center\">\n" +
+    "The {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind}} has no properties.\n" +
+    "</div>\n" +
+    "<div ng-if=\"$ctrl.overlayPaneEntryDetails.data | size\" class=\"table-responsive scroll-shadows-horizontal\">\n" +
+    "<table class=\"table table-bordered table-bordered-columns config-map-table key-value-table\">\n" +
+    "<tbody>\n" +
+    "<tr ng-repeat=\"(prop, value) in $ctrl.overlayPaneEntryDetails.data\">\n" +
+    "<td class=\"key\">{{prop}}</td>\n" +
+    "<td class=\"value\">\n" +
+    "<truncate-long-text ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'ConfigMap'\" content=\"value\" limit=\"50\" newline-limit=\"2\" expandable=\"true\">\n" +
+    "</truncate-long-text>\n" +
+    "<span ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'Secret'\">&#42;&#42;&#42;&#42;&#42;</span>\n" +
+    "</td>\n" +
+    "</tr>\n" +
+    "</tbody>\n" +
+    "</table>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<div class=\"modal-footer\">\n" +
+    "<button ng-click=\"$ctrl.closeOverlayPanel()\" type=\"button\" class=\"btn btn-primary pull-right\">Close</button>\n" +
+    "</div>\n" +
+    "</overlay-panel>\n" +
     "</ng-form>"
   );