Merge branch 'master' into adding-kibana-setting-for-max-file-upload

.eslintrc.js

@@ -739,6 +739,19 @@ module.exports = {
       },
     },
 
+    /**
+     * Alerting Services overrides
+     */
+    {
+      // typescript only for front and back end
+      files: [
+        'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
+      ],
+      rules: {
+        '@typescript-eslint/no-explicit-any': 'error',
+      },
+    },
+
     /**
      * Lens overrides
      */

.i18nrc.json

@@ -51,7 +51,7 @@
     "visTypeTable": "src/plugins/vis_type_table",
     "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
     "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
-    "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
+    "visTypeVega": "src/plugins/vis_type_vega",
     "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
     "visTypeXy": "src/legacy/core_plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",

package.json

@@ -185,7 +185,7 @@
     "glob-all": "^3.2.1",
     "globby": "^8.0.1",
     "h2o2": "^8.1.2",
-    "handlebars": "4.5.3",
+    "handlebars": "4.7.6",
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
     "history": "^4.9.0",

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -138,9 +138,12 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
 
     module: {
       // no parse rules for a few known large packages which have no require() statements
+      // or which have require() statements that should be ignored because the file is
+      // already bundled with all its necessary depedencies
       noParse: [
         /[\///]node_modules[\///]elasticsearch-browser[\///]/,
-        /[\///]node_modules[\///]lodash[\///]index\.js/,
+        /[\///]node_modules[\///]lodash[\///]index\.js$/,
+        /[\///]node_modules[\///]vega-lib[\///]build[\///]vega\.js$/,
       ],
 
       rules: [

src/dev/precommit_hook/casing_check_config.js

@@ -159,8 +159,6 @@ export const TEMPORARILY_IGNORED_PATHS = [
   'webpackShims/elasticsearch-browser.js',
   'webpackShims/moment-timezone.js',
   'webpackShims/ui-bootstrap.js',
-  'x-pack/legacy/plugins/graph/public/graphClientWorkspace.js',
-  'x-pack/legacy/plugins/graph/public/angular-venn-simple.js',
   'x-pack/legacy/plugins/index_management/public/lib/editSettings.js',
   'x-pack/legacy/plugins/license_management/public/store/reducers/licenseManagement.js',
   'x-pack/legacy/plugins/monitoring/public/components/sparkline/__mocks__/plugins/xpack_main/jquery_flot.js',

src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js → src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js

@@ -21,7 +21,9 @@ import Bluebird from 'bluebird';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import $ from 'jquery';
-import { createVegaVisualization } from '../vega_visualization';
+// Will be replaced with new path when tests are moved
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createVegaVisualization } from '../../../../../../plugins/vis_type_vega/public/vega_visualization';
 import { ImageComparator } from 'test_utils/image_comparator';
 
 import vegaliteGraph from '!!raw-loader!./vegalite_graph.hjson';
@@ -35,24 +37,34 @@ import vegaTooltipGraph from '!!raw-loader!./vega_tooltip_test.hjson';
 
 import vegaMapGraph from '!!raw-loader!./vega_map_test.hjson';
 import vegaMapImage256 from './vega_map_image_256.png';
+// Will be replaced with new path when tests are moved
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { VegaParser } from '../../../../../../plugins/vis_type_vega/public/data_model/vega_parser';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { SearchCache } from '../../../../../../plugins/vis_type_vega/public/data_model/search_cache';
 
-import { VegaParser } from '../data_model/vega_parser';
-import { SearchCache } from '../data_model/search_cache';
-
-import { createVegaTypeDefinition } from '../vega_type';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createVegaTypeDefinition } from '../../../../../../plugins/vis_type_vega/public/vega_type';
 // TODO This is an integration test and thus requires a running platform. When moving to the new platform,
 // this test has to be migrated to the newly created integration test environment.
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { npStart } from 'ui/new_platform';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { BaseVisType } from '../../../../../plugins/visualizations/public/vis_types/base_vis_type';
+import { BaseVisType } from '../../../../../../plugins/visualizations/public/vis_types/base_vis_type';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExprVis } from '../../../../../plugins/visualizations/public/expressions/vis';
-import { setInjectedVars } from '../services';
+import { ExprVis } from '../../../../../../plugins/visualizations/public/expressions/vis';
+
+import {
+  setInjectedVars,
+  setData,
+  setSavedObjects,
+  setNotifications,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../plugins/vis_type_vega/public/services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
+import { setInjectedVarFunc } from '../../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
+import { ServiceSettings } from '../../../../../../plugins/maps_legacy/public/map/service_settings';
 
 const THRESHOLD = 0.1;
 const PIXEL_DIFF = 30;
@@ -70,6 +82,9 @@ describe('VegaVisualizations', () => {
     enableExternalUrls: true,
     esShardTimeout: 10000,
   });
+  setData(npStart.plugins.data);
+  setSavedObjects(npStart.core.savedObjects);
+  setNotifications(npStart.core.notifications);
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(
@@ -111,9 +126,6 @@ describe('VegaVisualizations', () => {
                 timefilter: {},
               },
             },
-            __LEGACY: {
-              esClient: npStart.plugins.data.search.__LEGACY.esClient,
-            },
           },
         },
       };

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -59,11 +59,7 @@ export const [getUrlTracker, setUrlTracker] = createGetterSetter<{
 export const getHistory = _.once(() => createHashHistory());
 
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
-export {
-  unhashUrl,
-  redirectWhenMissing,
-  ensureDefaultIndexPattern,
-} from '../../../../../plugins/kibana_utils/public';
+export { unhashUrl, redirectWhenMissing } from '../../../../../plugins/kibana_utils/public';
 export {
   formatMsg,
   formatStack,

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js

@@ -49,7 +49,6 @@ import {
   subscribeWithScope,
   tabifyAggResponse,
   getAngularModule,
-  ensureDefaultIndexPattern,
   redirectWhenMissing,
 } from '../../kibana_services';
 
@@ -118,7 +117,7 @@ app.config($routeProvider => {
       savedObjects: function($route, Promise) {
         const history = getHistory();
         const savedSearchId = $route.current.params.id;
-        return ensureDefaultIndexPattern(core, data, history).then(() => {
+        return data.indexPatterns.ensureDefaultIndexPattern(history).then(() => {
           const { appStateContainer } = getState({ history });
           const { index } = appStateContainer.getState();
           return Promise.props({

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.html

@@ -6,156 +6,7 @@
       role="region"
       aria-label="{{::'kbn.management.editIndexPattern.detailsAria' | i18n: { defaultMessage: 'Index pattern details' } }}"
     >
-      <!-- Header -->
-      <div id="reactIndexHeader"></div>
-
-      <div class="euiSpacer euiSpacer--s"></div>
-      <p ng-if="::(indexPattern.timeFieldName || (indexPattern.tags && indexPattern.tags.length))">
-        <span ng-if="::indexPattern.timeFieldName">
-          <span class="euiBadge euiBadge--warning">
-            <span class="euiBadge__content">
-              <span class="euiBadge__text">
-                <span
-                  i18n-id="kbn.management.editIndexPattern.timeFilterHeader"
-                  i18n-default-message="Time Filter field name: {timeFieldName}"
-                  i18n-values="{ timeFieldName: indexPattern.timeFieldName }">
-                </span>
-              </span>
-            </span>
-          </span>
-        </span>
-        <span ng-repeat="tag in indexPattern.tags">
-          <span class="euiBadge euiBadge--hollow">
-            <span class="euiBadge__content">
-              <span class="euiBadge__text">
-                  {{tag.name}}
-                </span>
-              </span>
-            </span>
-        </span>
-      </p>
-
-      <div class="euiSpacer euiSpacer--m"></div>
-
-      <div class="euiText">
-        <p>
-          <span i18n-id="kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail"
-            i18n-default-message="This page lists every field in the {indexPatternTitle} index and the field's associated core type as recorded by Elasticsearch. To change a field type, use the Elasticsearch"
-            i18n-values="{ html_indexPatternTitle: '<strong>' + indexPattern.title + '</strong>' }"></span>
-          <a target="_blank" class="euiLink euiLink--primary" href="http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html">
-            <span i18n-id="kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink"
-                  i18n-default-message="Mapping API"></span>
-            <i aria-hidden="true" class="fa-link fa"></i>
-          </a>
-        </p>
-      </div>
-
-      <div class="euiSpacer euiSpacer--m"></div>
-
-      <!-- Alerts -->
-      <div
-        ng-if="conflictFields.length"
-        class="kuiInfoPanel kuiInfoPanel--warning kuiVerticalRhythm"
-      >
-        <div class="kuiInfoPanelHeader">
-          <span class="kuiInfoPanelHeader__icon kuiIcon kuiIcon--warning fa-bolt"></span>
-          <span class="kuiInfoPanelHeader__title"
-                i18n-id="kbn.management.editIndexPattern.mappingConflictHeader"
-                i18n-default-message="Mapping conflict"></span>
-        </div>
-
-        <div class="kuiInfoPanelBody">
-          <div class="kuiInfoPanelBody__message">
-            <span i18n-id="kbn.management.editIndexPattern.mappingConflictLabel"
-                  i18n-default-message="{conflictFieldsLength, plural, one {A field is} other {# fields are}} defined as several types (string, integer, etc) across the indices that match this pattern. You may still be able to use these conflict fields in parts of Kibana, but they will be unavailable for functions that require Kibana to know their type. Correcting this issue will require reindexing your data."
-                  i18n-values="{ conflictFieldsLength: conflictFields.length }"></span>
-          </div>
-        </div>
-      </div>
-
-      <!-- Tabs -->
-      <div class="kuiTabs kuiVerticalRhythm">
-        <button
-          class="kuiTab"
-          ng-repeat="editSection in editSections"
-          ng-class="{ 'kuiTab-isSelected': getCurrentTab() === editSection.index }"
-          ng-click="setCurrentTab(editSection.index)"
-          data-test-subj="tab-{{ editSection.index }}"
-        >
-          {{ editSection.title }}
-          <span
-            data-test-subj="tab-count-{{ editSection.index }}"
-            aria-label="{{:: editSection.count + ' ' + editSection.title}}"
-          >
-            <span ng-if="editSection.count != editSection.totalCount">
-              ({{ editSection.count }} / {{ editSection.totalCount }})
-            </span>
-            <span ng-if="editSection.count == editSection.totalCount">
-              ({{ editSection.count }})
-            </span>
-          </span>
-        </button>
-      </div>
-
-      <!-- Field Filters -->
-      <form role="form" class="kuiFieldGroup kuiVerticalRhythm">
-        <div class="kuiFieldGroupSection kuiFieldGroupSection--wide">
-          <div class="kuiSearchInput">
-            <div class="kuiSearchInput__icon kuiIcon fa-search"></div>
-            <input
-              class="kuiSearchInput__input"
-              type="text"
-              aria-label="{{::'kbn.management.editIndexPattern.fields.filterAria' | i18n: {defaultMessage: 'Filter'} }}"
-              ng-model="fieldFilter"
-              placeholder="{{::'kbn.management.editIndexPattern.fields.filterPlaceholder' | i18n: {defaultMessage: 'Filter'} }}"
-              data-test-subj="indexPatternFieldFilter"
-            >
-          </div>
-        </div>
-
-        <div
-          class="kuiFieldGroupSection"
-          ng-if="getCurrentTab() == 'indexedFields' && indexedFieldTypes.length > 0"
-        >
-          <select
-            data-test-subj="indexedFieldTypeFilterDropdown"
-            class="kuiSelect"
-            ng-model="indexedFieldTypeFilter"
-            ng-change="changeFilter('indexedFieldTypeFilter', indexedFieldTypeFilter)"
-            ng-options="o for o in indexedFieldTypes"
-          >
-            <option value=""
-                    i18n-id="kbn.management.editIndexPattern.fields.allTypesDropDown"
-                    i18n-default-message="All field types"></option>
-          </select>
-        </div>
-
-        <div
-          class="kuiFieldGroupSection"
-          ng-if="getCurrentTab() == 'scriptedFields' && scriptedFieldLanguages.length > 0"
-        >
-          <select
-            data-test-subj="scriptedFieldLanguageFilterDropdown"
-            class="kuiSelect"
-            ng-model="scriptedFieldLanguageFilter"
-            ng-change="changeFilter('scriptedFieldLanguageFilter', scriptedFieldLanguageFilter)"
-            ng-options="o for o in scriptedFieldLanguages"
-          >
-            <option value=""
-                    i18n-id="kbn.management.editIndexPattern.fields.allLangsDropDown"
-                    i18n-default-message="All languages"></option>
-          </select>
-        </div>
-      </form>
-
-      <!-- Tab content -->
-      <div class="kuiVerticalRhythm">
-        <div id="reactIndexedFieldsTable"></div>
-
-        <div id="reactScriptedFieldsTable"></div>
-
-        <div id="reactSourceFiltersTable"></div>
-      </div>
+      <div id="reactEditIndexPattern"></div>
     </div>
   </div>
 </kbn-management-app>