Merge remote-tracking branch 'upstream/6.x' into 6.x

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,10 +4,10 @@ are a few simple things to check before submitting your pull request
 that can help with the review process. You should delete these items
 from your submission, but they are here to help bring them to your
 attention.
--->
 
 - Have you signed the [contributor license agreement](https://www.elastic.co/contributor-agreement)?
 - Have you followed the [contributor guidelines](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md)?
 - If submitting code, have you included unit tests that cover the changes?
 - If submitting code, have you tested and built your code locally prior to submission with `npm test && npm run build`?
 - If submitting code, is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed.
+-->

.gitignore

@@ -36,3 +36,4 @@ selenium
 ui_framework/doc_site/build
 !ui_framework/doc_site/build/index.html
 yarn.lock
+.yo-rc.json

STYLEGUIDE.md

@@ -7,9 +7,11 @@ recommended for the development of all Kibana plugins.
 - [Angular](style_guides/angular_style_guide.md)
 - [React](style_guides/react_style_guide.md)
 - [CSS](style_guides/css_style_guide.md)
+- [SCSS](style_guides/scss_style_guide.md)
 - [HTML](style_guides/html_style_guide.md)
 - [API](style_guides/api_style_guide.md)
 - [Architecture](style_guides/architecture_style_guide.md)
+- [Accessibility](style_guides/acecssibility_guide.md)
 
 ## Filenames
 

docs/development/core/development-elasticsearch.asciidoc

@@ -31,9 +31,8 @@ Browser clients are exposed through AngularJS services.
 [source,javascript]
 ----
 uiModules.get('kibana')
-.run(function (esAdmin, es) {
+.run(function (es) {
   es.ping()
-  .then(() => esAdmin.ping())
   .catch(err => {
     console.log('error pinging servers');
   });

docs/index-shared1.asciidoc

@@ -1,11 +1,5 @@
 
-//////////
-release-state can be: released | prerelease | unreleased
-//////////
-:release-state:  unreleased
-:version:        6.1.0
-:major-version:  6.x
-:branch:         6.x
+include::{asciidoc-dir}/../../shared/versions61.asciidoc[]
 
 :docker-image:   docker.elastic.co/kibana/kibana:{version}
 :repo:           https://github.com/elastic/kibana/

docs/setup/install.asciidoc

@@ -41,8 +41,8 @@ Docker registry.
 {kibana-ref}/docker.html[Running Kibana on Docker]
 
 IMPORTANT: If your Elasticsearch installation is protected by {xpack-ref}/xpack-security.html[X-Pack Security]
-see {xpack-ref}/kibana.html[Using Kibana with X-Pack Security] for additional setup
-instructions.
+see {kibana-ref}/using-kibana-with-security.html[Configuring Security in Kibana]
+for additional setup instructions.
 
 
 include::install/targz.asciidoc[]

docs/setup/production.asciidoc

@@ -34,7 +34,8 @@ not exist. X-Pack Security does not currently provide a way to control which
 users can load which dashboards.
 
 For information about setting up Kibana users and how to configure Kibana
-to work with X-Pack, see {xpack-ref}/kibana.html[Kibana and Security].
+to work with X-Pack, see
+{kibana-ref}/using-kibana-with-security.html[Configuring Security in Kibana].
 
 [float]
 [[enabling-ssl]]

package.json

@@ -63,22 +63,23 @@
     "mocha": "echo 'use `node scripts/mocha`' && false",
     "sterilize": "grunt sterilize",
     "uiFramework:start": "grunt uiFramework:start",
-    "uiFramework:build": "grunt uiFramework:build"
+    "uiFramework:build": "grunt uiFramework:build",
+    "uiFramework:createComponent": "yo ./ui_framework/generator-kui/app/component.js",
+    "uiFramework:documentComponent": "yo ./ui_framework/generator-kui/app/documentation.js"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/elastic/kibana.git"
   },
   "dependencies": {
-    "@bigfunger/jsondiffpatch": "0.1.38-webpack",
     "@elastic/datemath": "2.3.0",
+    "@elastic/filesaver": "1.1.2",
+    "@elastic/leaflet-draw": "0.2.3",
+    "@elastic/leaflet-heat": "0.1.3",
+    "@elastic/numeral": "2.2.1",
+    "@elastic/test-subj-selector": "0.2.1",
+    "@elastic/ui-ace": "0.2.3",
     "@elastic/webpack-directory-name-as-main": "2.0.2",
-    "@spalger/filesaver": "1.1.2",
-    "@spalger/leaflet-draw": "0.2.3",
-    "@spalger/leaflet-heat": "0.1.3",
-    "@spalger/numeral": "^2.0.0",
-    "@spalger/test-subj-selector": "0.2.1",
-    "@spalger/ui-ace": "0.2.3",
     "JSONStream": "1.1.1",
     "accept-language-parser": "1.2.0",
     "angular": "1.4.7",
@@ -158,8 +159,8 @@
     "node-fetch": "1.3.2",
     "pegjs": "0.9.0",
     "postcss-loader": "1.3.3",
-    "proxy-from-env": "1.0.0",
     "prop-types": "15.5.8",
+    "proxy-from-env": "1.0.0",
     "pui-react-overlay-trigger": "7.5.4",
     "pui-react-tooltip": "7.5.4",
     "querystring-browser": "1.0.4",
@@ -203,12 +204,13 @@
     "yauzl": "2.7.0"
   },
   "devDependencies": {
-    "@elastic/eslint-config-kibana": "0.9.0",
+    "@elastic/eslint-config-kibana": "0.10.0",
     "@elastic/eslint-import-resolver-kibana": "0.8.1",
     "@elastic/eslint-plugin-kibana-custom": "1.0.3",
     "angular-mocks": "1.4.7",
     "babel-eslint": "7.2.3",
     "chai": "3.5.0",
+    "chalk": "2.0.1",
     "chance": "1.0.6",
     "cheerio": "0.22.0",
     "chokidar": "1.6.0",
@@ -276,7 +278,9 @@
     "supertest": "3.0.0",
     "supertest-as-promised": "2.0.2",
     "tree-kill": "1.1.0",
-    "webpack-dev-server": "1.14.1"
+    "webpack-dev-server": "1.14.1",
+    "yeoman-generator": "1.1.1",
+    "yo": "2.0.0"
   },
   "engines": {
     "node": "6.11.1",

src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html

@@ -97,16 +97,17 @@
         <table class="vis-editor-agg-editor-ranges form-group" ng-show="vis.params.gauge.colorsRange.length">
           <tr>
             <th>
-              <label>From</label>
+              <label id="gaugeOptionsCustomRangeFrom">From</label>
             </th>
             <th colspan="2">
-              <label>To</label>
+              <label id="gaugeOptionsCustomRangeTo">To</label>
             </th>
           </tr>
 
           <tr ng-repeat="range in vis.params.gauge.colorsRange track by $index">
             <td>
               <input
+                aria-labelledby="gaugeOptionsCustomRangeFrom"
                 ng-model="range.from"
                 type="number"
                 class="form-control"
@@ -117,6 +118,7 @@
             </td>
             <td>
               <input
+                aria-labelledby="gaugeOptionsCustomRangeTo"
                 ng-model="range.to"
                 type="number"
                 class="form-control"

src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html

@@ -1,17 +1,18 @@
 <div>
   <div class="vis-option-item">
-    <label>
+    <label for="visualizeBasicSettingsLegendPosition">
       Legend Position
     </label>
     <select
+      id="visualizeBasicSettingsLegendPosition"
       class="form-control"
       ng-model="vis.params.legendPosition"
       ng-options="position.value as position.text for position in vis.type.editorConfig.collections.legendPositions"
     >
     </select>
   </div>
   <div class="vis-option-item">
-    <label>
+    <label id="visualizeBasicSettingsShowTooltip">
       <input type="checkbox" ng-model="vis.params.addTooltip">
       Show Tooltip
     </label>

src/core_plugins/kibana/common/field_formats/types/_numeral.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import numeral from '@spalger/numeral';
+import numeral from '@elastic/numeral';
 import { FieldFormat } from '../../../../../ui/field_formats/field_format';
 
 const numeralInst = numeral();

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js

@@ -27,12 +27,12 @@ export function DashboardListingController($injector, $scope) {
   const sortableProperties = new SortableProperties([
     {
       name: 'title',
-      getValue: item => item.title,
+      getValue: item => item.title.toLowerCase(),
       isAscending: true,
     },
     {
       name: 'description',
-      getValue: item => item.description,
+      getValue: item => item.description.toLowerCase(),
       isAscending: true
     }
   ],

src/core_plugins/kibana/public/dashboard/top_nav/clone_modal.js

@@ -42,7 +42,7 @@ export class DashboardCloneModal extends React.Component {
           data-tests-subj="dashboardCloneModal"
           aria-label="Clone a dashboard"
           className="dashboardCloneModal"
-          onKeyDown={ this.onKeyDown }
+          onKeyDown={this.onKeyDown}
         >
           <KuiModalHeader>
             <KuiModalHeaderTitle>
@@ -58,8 +58,8 @@ export class DashboardCloneModal extends React.Component {
                 autoFocus
                 data-test-subj="clonedDashboardTitle"
                 className="kuiTextInput kuiTextInput--large"
-                value={ this.state.newDashboardName }
-                onChange={ this.onInputChange }
+                value={this.state.newDashboardName}
+                onChange={this.onInputChange}
               />
             </KuiModalBodyText>
           </KuiModalBody>
@@ -68,14 +68,14 @@ export class DashboardCloneModal extends React.Component {
             <KuiButton
               buttonType="hollow"
               data-test-subj="cloneCancelButton"
-              onClick={ this.props.onClose }
+              onClick={this.props.onClose}
             >
               Cancel
             </KuiButton>
             <KuiButton
               buttonType="primary"
               data-test-subj="cloneConfirmButton"
-              onClick={ this.cloneDashboard }
+              onClick={this.cloneDashboard}
             >
               Confirm Clone
             </KuiButton>

src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html

@@ -1,4 +1,4 @@
-<div class="sidebar-list">
+<section class="sidebar-list" aria-label="Index and fields">
   <div ng-show="indexPatternList.length > 1">
     <ui-select
       class="index-pattern-selection"
@@ -158,4 +158,4 @@ <h6>Popular</h6>
     </discover-field>
   </ul>
 
-</div>
+</section>

src/core_plugins/kibana/public/discover/controllers/discover.js

@@ -167,9 +167,8 @@ function discoverController(
   .highlightAll(true)
   .version(true);
 
-  if (savedSearch.id) {
-    docTitle.change(savedSearch.title);
-  }
+  const pageTitleSuffix = savedSearch.id && savedSearch.title ? `: ${savedSearch.title}` : '';
+  docTitle.change(`Discover${pageTitleSuffix}`);
 
   let stateMonitor;
   const $appStatus = $scope.appStatus = this.appStatus = {

src/core_plugins/kibana/public/discover/index.html

@@ -75,7 +75,7 @@ <h2>Searching</h2>
               </span>
             </button>
 
-            <div class="discover-timechart" ng-if="opts.timefield">
+            <section aria-label="Histogram of found documents" class="discover-timechart" ng-if="opts.timefield">
               <header>
                 <center class="small">
                   <span tooltip="To change the time, click the clock icon in the navigation bar">{{timeRange.from | moment}} - {{timeRange.to | moment}}</span>
@@ -114,9 +114,9 @@ <h2>Searching</h2>
                  style="height: 200px"
                 >
               </visualization>
-            </div>
+            </section>
 
-            <div class="discover-table" fixed-scroll>
+            <section class="discover-table" fixed-scroll aria-label="Documents">
               <doc-table
                 hits="rows"
                 index-pattern="indexPattern"
@@ -143,7 +143,7 @@ <h2>Searching</h2>
                 your search, refine your search to see others.
                 <a kbn-accessible-click ng-click="scrollToTop()">Back to top.</a>
               </div>
-            </div>
+            </section>
           </div>
         </div>
       </div>

src/core_plugins/kibana/public/management/app.html

@@ -14,9 +14,9 @@
 
       <!-- Tabs. -->
       <div data-transclude-slot="bottomRow" class="kuiLocalTabs">
-        <span ng-if="!sectionName" class="kuiLocalTab">
+        <h2 class="kuiLocalTab" ng-if="!sectionName" id="tabHeader" tabindex="0">
           {{::section.display}}
-        </span>
+        </h2>
         <a
           ng-if="sectionName"
           ng-repeat="item in section.visibleItems"

src/core_plugins/kibana/public/management/sections/objects/_objects.html

@@ -67,7 +67,10 @@ <h1 class="kuiTitle">
       <!-- ToolBar -->
       <div class="kuiToolBar">
         <div class="kuiToolBarSearch">
-          <div class="kuiToolBarSearchBox">
+          <div
+            class="kuiToolBarSearchBox"
+            role="search"
+          >
             <div class="kuiToolBarSearchBox__icon kuiIcon fa-search"></div>
             <input
               class="kuiToolBarSearchBox__input"
@@ -129,6 +132,7 @@ <h1 class="kuiTitle">
             <th class="kuiTableHeaderCell kuiTableHeaderCell--checkBox">
               <input
                 type="checkbox"
+                aria-label="Select All"
                 class="kuiCheckBox"
                 ng-checked="managementObjectsController.areAllRowsChecked()"
                 ng-click="toggleAll()"

src/core_plugins/kibana/public/management/sections/objects/_objects.js

@@ -1,4 +1,4 @@
-import { saveAs } from '@spalger/filesaver';
+import { saveAs } from '@elastic/filesaver';
 import { find, flattenDeep, pluck, sortBy } from 'lodash';
 import angular from 'angular';
 import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';

src/core_plugins/kibana/public/management/sections/objects/_view.html

@@ -130,6 +130,7 @@ <h1 class="kuiTitle">
 
           <div
             ng-if="field.type === 'json' || field.type === 'array'"
+            kbn-ui-ace-keyboard-mode
             ui-ace="{ onLoad: aceLoaded, mode: 'json' }"
             id="{{field.name}}"
             ng-model="field.value"

src/core_plugins/kibana/public/management/sections/objects/_view.js

@@ -5,6 +5,7 @@ import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_o
 import objectViewHTML from 'plugins/kibana/management/sections/objects/_view.html';
 import uiRoutes from 'ui/routes';
 import { uiModules } from 'ui/modules';
+import 'ui/accessibility/kbn_ui_ace_keyboard_mode';
 import { castEsToKbnFieldTypeName } from '../../../../../../utils';
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
 

src/core_plugins/kibana/public/visualize/listing/visualize_listing.js

@@ -25,12 +25,12 @@ export function VisualizeListingController($injector) {
   const sortableProperties = new SortableProperties([
     {
       name: 'title',
-      getValue: item => item.title,
+      getValue: item => item.title.toLowerCase(),
       isAscending: true,
     },
     {
       name: 'type',
-      getValue: item => item.type.title,
+      getValue: item => item.type.title.toLowerCase(),
       isAscending: true,
     }
   ],

src/core_plugins/metrics/public/components/add_delete_buttons.js

@@ -8,7 +8,7 @@ function AddDeleteButtons(props) {
     }
     return (
       <Tooltip text={props.deleteTooltip}>
-        <a className="thor__button-outlined-danger sm" onClick={ props.onDelete }>
+        <a className="thor__button-outlined-danger sm" onClick={props.onDelete}>
           <i className="fa fa-trash-o" />
         </a>
       </Tooltip>
@@ -20,7 +20,7 @@ function AddDeleteButtons(props) {
     }
     return (
       <Tooltip text={props.addTooltip}>
-        <a className="thor__button-outlined-default sm" onClick={ props.onAdd }>
+        <a className="thor__button-outlined-default sm" onClick={props.onAdd}>
           <i className="fa fa-plus" />
         </a>
       </Tooltip>
@@ -32,7 +32,7 @@ function AddDeleteButtons(props) {
   if (props.onClone && !props.disableAdd) {
     clone = (
       <Tooltip text={props.cloneTooltip}>
-        <a className="thor__button-outlined-default sm" onClick={ props.onClone }>
+        <a className="thor__button-outlined-default sm" onClick={props.onClone}>
           <i className="fa fa-files-o" />
         </a>
       </Tooltip>