Move build-info to status page (elastic#13341)

* Move build-info to status page * Remove info property from management section
stacey-gammon · Aug 8, 2017 · ea2a31d · ea2a31d
1 parent 9bdba7c
commit ea2a31d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 37 deletions.
diff --git a/src/core_plugins/kibana/public/management/index.js b/src/core_plugins/kibana/public/management/index.js
@@ -25,7 +25,7 @@ require('ui/index_patterns/route_setup/load_default')({
 
 uiModules
 .get('apps/management')
-.directive('kbnManagementApp', function (Private, $location, timefilter, buildNum, buildSha) {
+.directive('kbnManagementApp', function (Private, $location, timefilter) {
   return {
     restrict: 'E',
     template: appTemplate,
@@ -46,8 +46,6 @@ uiModules
           item.active = `#${$location.path()}`.indexOf(item.url) > -1;
         });
       }
-
-      management.getSection('kibana').info = `Build ${buildNum}, Commit SHA ${buildSha.substr(0, 8)}`;
     }
   };
 });

diff --git a/src/core_plugins/kibana/public/management/landing.html b/src/core_plugins/kibana/public/management/landing.html
@@ -9,7 +9,6 @@
     <div
       ng-if="section.visibleItems.length > 0"
       ng-repeat="section in sections"
-      ng-class="{ 'management-section-info-expanded': section.showInfo }"
       class="page-row"
     >
       <div class="kuiPanel management-panel">
@@ -22,15 +21,6 @@
               {{::section.display}}
             </div>
           </div>
-
-          <div class="kuiPanelHeaderSection" ng-if="section.info">
-            <div class="kuiText">
-              <span
-                class="fa fa-info-circle management-panel__heading-icon--secondary"
-                ng-click="section.showInfo = !!!section.showInfo"
-              ></span>
-            </div>
-          </div>
         </div>
 
         <div class="kuiPanelBody management-panel__body">
@@ -55,10 +45,6 @@
               </li>
             </ul>
           </div>
-
-          <div class="management-section-info">
-            {{::section.info}}
-          </div>
         </div>
       </div>
     </div>

diff --git a/src/core_plugins/kibana/public/management/styles/main.less b/src/core_plugins/kibana/public/management/styles/main.less
@@ -55,20 +55,6 @@ kbn-management-landing {
     }
   }
 
-  .management-section-info {
-    bottom: 10px;
-    display: none;
-    color: @kibanaPink1;
-    font-size: 0.8em;
-    position: absolute;
-  }
-
-  .management-section-info-expanded {
-    .management-section-info {
-      display: block;
-    }
-  }
-
   /**
    * 1. Set icon size.
    * 2. Hack the panel title to move to the left a bit.
@@ -102,10 +88,6 @@ kbn-management-landing {
     background-image: url("~ui/icons/logstash-gray.svg");
   }
 
-  .management-panel__heading-icon--secondary {
-    font-size: 0.9em;
-    padding: 5px;
-  }
 }
 
 kbn-management-objects {

diff --git a/src/core_plugins/status_page/public/status_page.html b/src/core_plugins/status_page/public/status_page.html
@@ -43,4 +43,10 @@ <h4 ng-if="!ui.statuses && !ui.loading" class="statuses_missing">
       </tr>
     </table>
   </div>
+
+  <footer class="row">
+    <div class="col-xs-12 text-right build-info">
+      Build {{::ui.buildInfo.num}}, Commit SHA {{::ui.buildInfo.sha}}
+    </div>
+  </footer>
 </div>
diff --git a/src/core_plugins/status_page/public/status_page.js b/src/core_plugins/status_page/public/status_page.js
@@ -8,10 +8,15 @@ import { uiModules } from 'ui/modules';
 
 const chrome = require('ui/chrome')
 .setRootTemplate(require('plugins/status_page/status_page.html'))
-.setRootController('ui', function ($http) {
+.setRootController('ui', function ($http, buildNum, buildSha) {
   const ui = this;
   ui.loading = false;
 
+  ui.buildInfo = {
+    num: buildNum,
+    sha: buildSha.substr(0, 8)
+  };
+
   ui.refresh = function () {
     ui.loading = true;
 

diff --git a/src/core_plugins/status_page/public/status_page.less b/src/core_plugins/status_page/public/status_page.less
@@ -178,3 +178,7 @@
 .overall_state_red {
   .state(@status-red, @icon-red);
 }
+
+.build-info {
+  color: #555;
+}
diff --git a/src/ui/public/management/section.js b/src/ui/public/management/section.js
@@ -9,7 +9,6 @@ export class ManagementSection {
    * @param {number|null} options.order
    * @param {string|null} options.display - defaults to id
    * @param {string|null} options.url - defaults to ''
-   * @param {string|null} options.info
    * @param {boolean|null} options.visible - defaults to true
    * @param {boolean|null} options.disabled - defaults to false
    * @param {string|null} options.tooltip - defaults to ''