diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6cbdae5c3e2369..25d4433bd8f9c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ Please make sure you have signed the [Contributor License Agreement](http://www. npm run elasticsearch ``` -- Start the development server. +- Start the development server. _On Windows, you'll need you use Git Bash, Cygwin, or a similar shell that exposes the `sh` command._ ```sh npm start @@ -128,7 +128,7 @@ Runs both server and browser tests, but skips linting Run only the server tests `npm run test:browser` -Run only the browser tests +Run only the browser tests. Coverage reports are available for browser tests by running `npm run test:coverage`. You can find the results under the `coverage/` directory that will be created upon completion. `npm run test:dev` Initializes an environment for debugging the browser tests. Includes an dedicated instance of the kibana server for building the test bundle, and a karma server. When running this task the build is optimized for the first time and then a karma-owned instance of the browser is opened. Click the "debug" button to open a new tab that executes the unit tests. @@ -146,7 +146,8 @@ Run the tests for just your particular plugin. Assuming you plugin lives outside #### Running browser automation tests: -*The Selenium server that is started currently only runs the tests in Firefox* +*The Selenium server that is started currently only runs the tests in a recent version of Firefox.* +*You can use the `PATH` environment variable to specify which version of Firefox to use.* The following will start Kibana, Elasticsearch and Selenium for you. To run the functional UI tests use the following commands @@ -177,7 +178,7 @@ npm run test:ui:runner - These tests have been developed and tested with Chrome and Firefox browser. In theory, they should work on all browsers (that's the benefit of Intern using Leadfoot). - These tests should also work with an external testing service like https://saucelabs.com/ or https://www.browserstack.com/ but that has not been tested. - https://theintern.github.io/ -- https://theintern.github.io/leadfoot/Element.html +- https://theintern.github.io/leadfoot/module-leadfoot_Element.html #### Building OS packages @@ -218,7 +219,7 @@ So, you've been assigned a pull to review. What's that look like? Remember, someone is blocked by a pull awaiting review, make it count. Be thorough, the more action items you catch in the first review, the less back and forth will be required, and the better chance the pull has of being successful. Don't you like success? -1. **Understand the issue** that is being fixed, or the feature being added. Check the description on the pull, and check out the related issue. If you don't understand something, ask the person the submitter for clarification. +1. **Understand the issue** that is being fixed, or the feature being added. Check the description on the pull, and check out the related issue. If you don't understand something, ask the submitter for clarification. 1. **Reproduce the bug** (or the lack of feature I guess?) in the destination branch, usually `master`. The referenced issue will help you here. If you're unable to reproduce the issue, contact the issue submitter for clarification 1. **Check out the pull** and test it. Is the issue fixed? Does it have nasty side effects? Try to create suspect inputs. If it operates on the value of a field try things like: strings (including an empty string), null, numbers, dates. Try to think of edge cases that might break the code. 1. **Merge the target branch**. It is possible that tests or the linter have been updated in the target branch since the pull was submitted. Merging the pull could cause core to start failing. diff --git a/Gruntfile.js b/Gruntfile.js index a7867384a6faf4..3f510761549f25 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,10 +1,11 @@ -require('babel/register')(require('./src/optimize/babelOptions').node); +const camelCase = require('lodash').camelCase; +require('babel/register')(require('./src/optimize/babel_options').node); module.exports = function (grunt) { // set the config once before calling load-grunt-config // and once during so that we have access to it via // grunt.config.get() within the config files - var config = { + const config = { pkg: grunt.file.readJSON('package.json'), root: __dirname, src: __dirname + '/src', @@ -12,7 +13,7 @@ module.exports = function (grunt) { plugins: __dirname + '/src/plugins', server: __dirname + '/src/server', target: __dirname + '/target', // location of the compressed build targets - testUtilsDir: __dirname + '/src/testUtils', + testUtilsDir: __dirname + '/src/test_utils', configFile: __dirname + '/src/config/kibana.yml', karmaBrowser: (function () { diff --git a/docs/advanced-settings.asciidoc b/docs/advanced-settings.asciidoc index e649d7dc5d8a88..eb599be309ad0d 100644 --- a/docs/advanced-settings.asciidoc +++ b/docs/advanced-settings.asciidoc @@ -1,6 +1,8 @@ [[kibana-settings-reference]] -WARNING: Modifying the following settings can signficantly affect Kibana's performance and cause problems that are difficult to diagnose. Setting a property's value to a blank field will revert to the default behavior, which may not be compatible with other configuration settings. Deleting a custom setting removes it from Kibana permanently. +WARNING: Modifying the following settings can signficantly affect Kibana's performance and cause problems that are +difficult to diagnose. Setting a property's value to a blank field will revert to the default behavior, which may not be +compatible with other configuration settings. Deleting a custom setting removes it from Kibana permanently. .Kibana Settings Reference [horizontal] @@ -8,30 +10,43 @@ WARNING: Modifying the following settings can signficantly affect Kibana's perfo `sort:options`:: Options for the Elasticsearch https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html[sort] parameter. `dateFormat`:: The format to use for displaying pretty-formatted dates. `dateFormat:tz`:: The timezone that Kibana uses. The default value of `Browser` uses the timezone detected by the browser. -`dateFormat:scaled`:: These values define the format used to render ordered time-based data. Formatted timestamps must adapt to the interval between measurements. Keys are http://en.wikipedia.org/wiki/ISO_8601#Time_intervals[ISO8601 intervals]. +`dateFormat:scaled`:: These values define the format used to render ordered time-based data. Formatted timestamps must +adapt to the interval between measurements. Keys are http://en.wikipedia.org/wiki/ISO_8601#Time_intervals[ISO8601 intervals]. `defaultIndex`:: Default is `null`. This property specifies the default index. -`metaFields`:: An array of fields outside of `_source`. Kibana merges these fields into the document when displaying the document. +`metaFields`:: An array of fields outside of `_source`. Kibana merges these fields into the document when displaying the +document. `discover:sampleSize`:: The number of rows to show in the Discover table. -`doc_table:highlight`:: Highlight results in Discover and Saved Searches Dashboard. Highlighing makes request slow when working on big documents. Set this property to `false` to disable highlighting. -`courier:maxSegmentCount`:: Kibana splits requests in the Discover app into segments to limit the size of requests sent to the Elasticsearch cluster. This setting constrains the length of the segment list. Long segment lists can significantly increase request processing time. +`doc_table:highlight`:: Highlight results in Discover and Saved Searches Dashboard. Highlighing makes request slow when +working on big documents. Set this property to `false` to disable highlighting. +`courier:maxSegmentCount`:: Kibana splits requests in the Discover app into segments to limit the size of requests sent to +the Elasticsearch cluster. This setting constrains the length of the segment list. Long segment lists can significantly +increase request processing time. `fields:popularLimit`:: This setting governs how many of the top most popular fields are shown. `histogram:barTarget`:: When date histograms use the `auto` interval, Kibana attempts to generate this number of bars. -`histogram:maxBars`:: Date histograms are not generated with more bars than the value of this property, scaling values when necessary. -`visualization:tileMap:maxPrecision`:: The maximum geoHash precision displayed on tile maps: 7 is high, 10 is very high, 12 is the maximum. http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator[Explanation of cell dimensions]. +`histogram:maxBars`:: Date histograms are not generated with more bars than the value of this property, scaling values +when necessary. +`visualization:tileMap:maxPrecision`:: The maximum geoHash precision displayed on tile maps: 7 is high, 10 is very high, +12 is the maximum. http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator[Explanation of cell dimensions]. `visualization:tileMap:WMSdefaults`:: Default properties for the WMS map server support in the tile map. `visualization:colorMapping`:: Maps values to specified colors within visualizations. `visualization:loadingDelay`:: Time to wait before dimming visualizations during query. `csv:separator`:: A string that serves as the separator for exported values. `csv:quoteValues`:: Set this property to `true` to quote exported values. -`history:limit`:: In fields that have history, such as query inputs, the value of this property limits how many recent values are shown. -`shortDots:enable`:: Set this property to `true` to shorten long field names in visualizations. For example, instead of `foo.bar.baz`, show `f.b.baz`. -`truncate:maxHeight`:: This property specifies the maximum height that a cell occupies in a table. A value of 0 disables truncation. -`indexPattern:fieldMapping:lookBack`:: The value of this property sets the number of recent matching patterns to query the field mapping for index patterns with names that contain timestamps. -`format:defaultTypeMap`:: A map of the default format name for each field type. Field types that are not explicitly mentioned use "_default_". +`history:limit`:: In fields that have history, such as query inputs, the value of this property limits how many recent +values are shown. +`shortDots:enable`:: Set this property to `true` to shorten long field names in visualizations. For example, instead of +`foo.bar.baz`, show `f.b.baz`. +`truncate:maxHeight`:: This property specifies the maximum height that a cell occupies in a table. A value of 0 disables +truncation. +`indexPattern:fieldMapping:lookBack`:: The value of this property sets the number of recent matching patterns to query the +field mapping for index patterns with names that contain timestamps. +`format:defaultTypeMap`:: A map of the default format name for each field type. Field types that are not explicitly +mentioned use "_default_". `format:number:defaultPattern`:: Default numeral format for the "number" format. `format:bytes:defaultPattern`:: Default numeral format for the "bytes" format. `format:percent:defaultPattern`:: Default numeral format for the "percent" format. `format:currency:defaultPattern`:: Default numeral format for the "currency" format. +`savedObjects:perPage`:: The number of objects shown on each page of the list of saved objects. The default value is 5. `timepicker:timeDefaults`:: The default time filter selection. `timepicker:refreshIntervalDefaults`:: The time filter's default refresh interval. -`dashboard:defaultDarkTheme`:: Set this property to `true` to make new dashboards use the dark theme by default. \ No newline at end of file +`dashboard:defaultDarkTheme`:: Set this property to `true` to make new dashboards use the dark theme by default. diff --git a/docs/datatable.asciidoc b/docs/datatable.asciidoc index b80cb8ccd812d9..6246b19f0f1d64 100644 --- a/docs/datatable.asciidoc +++ b/docs/datatable.asciidoc @@ -45,6 +45,8 @@ sub-aggregation from the list of types. You can use the up or down arrows to the right of the aggregation's type to change the aggregation's priority. +Enter a string in the *Custom Label* field to change the display label. + You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation: *Exclude Pattern*:: Specify a pattern in this field to exclude from the results. diff --git a/docs/metric.asciidoc b/docs/metric.asciidoc index 8a813f7dba8662..e4ce743a8210b5 100644 --- a/docs/metric.asciidoc +++ b/docs/metric.asciidoc @@ -4,6 +4,7 @@ A metric visualization displays a single number for each aggregation you select: include::y-axis-aggs.asciidoc[] + You can click the *Advanced* link to display more customization options: *JSON Input*:: A text field where you can add specific JSON-formatted properties to merge with the aggregation @@ -17,7 +18,7 @@ NOTE: In Elasticsearch releases 1.4.3 and later, this functionality requires you The availability of these options varies depending on the aggregation you choose. -Click the *Options* tab to change the font used to display the metrics. +Click the *Options* tab to display the font size slider. [float] [[metric-viewing-detailed-information]] diff --git a/docs/pie.asciidoc b/docs/pie.asciidoc index 6c2b5a32be9798..233b263b1e84d2 100644 --- a/docs/pie.asciidoc +++ b/docs/pie.asciidoc @@ -11,6 +11,8 @@ field. Select a field from the drop-down. *Unique Count*:: The {ref}search-aggregations-metrics-cardinality-aggregation.html[_cardinality_] aggregation returns the number of unique values in a field. Select a field from the drop-down. +Enter a string in the *Custom Label* field to change the display label. + The _buckets_ aggregations determine what information is being retrieved from your data set. Before you choose a buckets aggregation, specify if you are splitting slices within a single chart or splitting into @@ -57,6 +59,8 @@ aggregation's type to change the aggregation's priority. include::color-picker.asciidoc[] +Enter a string in the *Custom Label* field to change the display label. + You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation: *Exclude Pattern*:: Specify a pattern in this field to exclude from the results. diff --git a/docs/plugins.asciidoc b/docs/plugins.asciidoc index b4ff08e6d1d5ae..d505ef84e4dbf8 100644 --- a/docs/plugins.asciidoc +++ b/docs/plugins.asciidoc @@ -65,6 +65,11 @@ bin/kibana plugin --remove marvel You can also remove a plugin manually by deleting the plugin's subdirectory under the `installedPlugins` directory. +[float] +=== Listing Installed Plugins + +Use `--list` or `-l` option to list the currently installed plugins. + [float] === Updating Plugins diff --git a/docs/tilemap.asciidoc b/docs/tilemap.asciidoc index 804abea1219b63..4d959de0ed2587 100644 --- a/docs/tilemap.asciidoc +++ b/docs/tilemap.asciidoc @@ -19,6 +19,8 @@ numeric field. Select a field from the drop-down. *Unique Count*:: The {ref}search-aggregations-metrics-cardinality-aggregation.html[_cardinality_] aggregation returns the number of unique values in a field. Select a field from the drop-down. +Enter a string in the *Custom Label* field to change the display label. + The _buckets_ aggregations determine what information is being retrieved from your data set. Before you choose a buckets aggregation, specify if you are splitting the chart or displaying the buckets as *Geo @@ -71,6 +73,8 @@ based on the geohash coordinates. NOTE: By default, the *Change precision on map zoom* box is checked. Uncheck the box to disable this behavior. +Enter a string in the *Custom Label* field to change the display label. + You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation: *Exclude Pattern*:: Specify a pattern in this field to exclude from the results. diff --git a/docs/vertbar.asciidoc b/docs/vertbar.asciidoc index 201b87843452d0..b329897a3ad8b9 100644 --- a/docs/vertbar.asciidoc +++ b/docs/vertbar.asciidoc @@ -26,6 +26,8 @@ values field. Click *+Add* to add a values field. You can add an aggregation by clicking the *+ Add Aggregation* button. +Enter a string in the *Custom Label* field to change the display label. + The _buckets_ aggregations determine what information is being retrieved from your data set. Before you choose a buckets aggregation, specify if you are splitting slices within a single chart or splitting into @@ -36,6 +38,8 @@ include::x-axis-aggs.asciidoc[] include::color-picker.asciidoc[] +Enter a string in the *Custom Label* field to change the display label. + You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation: *Exclude Pattern*:: Specify a pattern in this field to exclude from the results. diff --git a/docs/x-axis-aggs.asciidoc b/docs/x-axis-aggs.asciidoc index a39eb8a48a20b1..3b9fd3e9486235 100644 --- a/docs/x-axis-aggs.asciidoc +++ b/docs/x-axis-aggs.asciidoc @@ -28,8 +28,8 @@ remove a range. or bottom _n_ elements of a given field to display, ordered by count or a custom metric. *Filters*:: You can specify a set of {ref}/search-aggregations-bucket-filters-aggregation.html[_filters_] for the data. You can specify a filter as a query string or in JSON format, just as in the Discover search bar. Click *Add Filter* to -add another filter. Click the images:labelbutton.png[] *label* button to open the label field, where you can type in a -name to display on the visualization. +add another filter. Click the image:images/labelbutton.png[Label button icon] *label* button to open the label field, where +you can type in a name to display on the visualization. *Significant Terms*:: Displays the results of the experimental {ref}/search-aggregations-bucket-significantterms-aggregation.html[_significant terms_] aggregation. @@ -39,3 +39,5 @@ from the list of types. When multiple aggregations are defined on a chart's axis, you can use the up or down arrows to the right of the aggregation's type to change the aggregation's priority. + +Enter a string in the *Custom Label* field to change the display label. diff --git a/docs/y-axis-aggs.asciidoc b/docs/y-axis-aggs.asciidoc index 18029bb0904f51..1153a1cb478fe2 100644 --- a/docs/y-axis-aggs.asciidoc +++ b/docs/y-axis-aggs.asciidoc @@ -22,3 +22,5 @@ from the drop-down, then specify one or more percentile rank values in the *Valu values field. Click *+Add* to add a values field. You can add an aggregation by clicking the *+ Add Aggregation* button. + +Enter a string in the *Custom Label* field to change the display label. diff --git a/package.json b/package.json index c2aeaf89aa8a72..85794819d10b9b 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "test:coverage": "grunt test:coverage", "build": "grunt build", "build:ospackages": "grunt build --os-packages", - "start": "./bin/kibana --dev", + "start": "sh ./bin/kibana --dev", "precommit": "grunt precommit", "karma": "karma start", "elasticsearch": "grunt esvm:dev:keepalive", @@ -87,7 +87,7 @@ "babel-runtime": "5.8.20", "bluebird": "2.9.34", "boom": "2.8.0", - "bootstrap": "3.3.5", + "bootstrap": "3.3.6", "brace": "0.5.1", "bunyan": "1.7.1", "clipboard": "1.5.5", @@ -156,7 +156,7 @@ "grunt-cli": "0.1.13", "grunt-contrib-clean": "0.6.0", "grunt-contrib-copy": "0.8.1", - "grunt-esvm": "2.1.1", + "grunt-esvm": "3.0.4", "grunt-karma": "0.12.0", "grunt-run": "0.5.0", "grunt-s3": "0.2.0-alpha.3", @@ -174,12 +174,12 @@ "karma-ie-launcher": "0.2.0", "karma-mocha": "0.2.0", "karma-safari-launcher": "0.1.1", - "libesvm": "3.3.0", "license-checker": "3.1.0", - "load-grunt-config": "0.7.2", + "load-grunt-config": "0.19.1", "makelogs": "3.0.0-beta3", "marked-text-renderer": "0.1.0", "mocha": "2.3.0", + "ncp": "2.0.0", "nock": "2.10.0", "npm": "2.11.0", "portscanner": "1.0.0", diff --git a/src/cli/cli.js b/src/cli/cli.js index bf90bb2da8a523..0de588a87ab073 100644 --- a/src/cli/cli.js +++ b/src/cli/cli.js @@ -1,7 +1,7 @@ import _ from 'lodash'; -import pkg from '../utils/packageJson'; -import Command from './Command'; +import pkg from '../utils/package_json'; +import Command from './command'; let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice(); let program = new Command('bin/kibana'); diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index ca9227912404c8..4e48c0a704bc18 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -4,7 +4,7 @@ const { format: formatUrl } = require('url'); import Hapi from 'hapi'; const { debounce, compact, get, invoke, bindAll, once, sample, uniq } = require('lodash'); -import Log from '../Log'; +import Log from '../log'; import Worker from './worker'; import BasePathProxy from './base_path_proxy'; @@ -83,7 +83,7 @@ module.exports = class ClusterManager { setupWatching(extraPaths) { const chokidar = require('chokidar'); - const fromRoot = require('../../utils/fromRoot'); + const fromRoot = require('../../utils/from_root'); const watchPaths = uniq( [ diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js index c8bbcada4579d0..cc0c823c5090d3 100644 --- a/src/cli/cluster/worker.js +++ b/src/cli/cluster/worker.js @@ -3,7 +3,7 @@ import cluster from 'cluster'; let { resolve } = require('path'); let { EventEmitter } = require('events'); -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; let cliPath = fromRoot('src/cli'); let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']); diff --git a/src/cli/Command.js b/src/cli/command.js similarity index 100% rename from src/cli/Command.js rename to src/cli/command.js diff --git a/src/cli/index.js b/src/cli/index.js index e7f562b5711548..a0cd17d62f1512 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -1,5 +1,5 @@ // load the babel options seperately so that they can modify the process.env // before calling babel/register -const babelOptions = require('../optimize/babelOptions').node; +const babelOptions = require('../optimize/babel_options').node; require('babel/register')(babelOptions); require('./cli'); diff --git a/src/cli/Log.js b/src/cli/log.js similarity index 100% rename from src/cli/Log.js rename to src/cli/log.js diff --git a/src/cli/plugin/__tests__/setting_parser.js b/src/cli/plugin/__tests__/setting_parser.js index 09cb0ddd9c3bbd..bf47bd7c82c130 100644 --- a/src/cli/plugin/__tests__/setting_parser.js +++ b/src/cli/plugin/__tests__/setting_parser.js @@ -1,7 +1,7 @@ import path from 'path'; import expect from 'expect.js'; -import fromRoot from '../../../utils/fromRoot'; +import fromRoot from '../../../utils/from_root'; import settingParser from '../setting_parser'; describe('kibana cli', function () { diff --git a/src/cli/plugin/plugin.js b/src/cli/plugin/plugin.js index 5cf125775b8043..390d2e48baeea7 100644 --- a/src/cli/plugin/plugin.js +++ b/src/cli/plugin/plugin.js @@ -1,4 +1,4 @@ -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; import settingParser from './setting_parser'; import installer from './plugin_installer'; import remover from './plugin_remover'; diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js index 56c558ff688891..f95dd6c37f739a 100644 --- a/src/cli/plugin/plugin_installer.js +++ b/src/cli/plugin/plugin_installer.js @@ -1,9 +1,9 @@ import _ from 'lodash'; -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; import pluginDownloader from './plugin_downloader'; import pluginCleaner from './plugin_cleaner'; import pluginExtractor from './plugin_extractor'; -import KbnServer from '../../server/KbnServer'; +import KbnServer from '../../server/kbn_server'; import readYamlConfig from '../serve/read_yaml_config'; import Promise from 'bluebird'; import { sync as rimrafSync } from 'rimraf'; diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js index 0c28635eddc769..eda24281d245d2 100644 --- a/src/cli/serve/read_yaml_config.js +++ b/src/cli/serve/read_yaml_config.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import fs from 'fs'; import yaml from 'js-yaml'; -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; let legacySettingMap = { // server @@ -48,7 +48,14 @@ module.exports = function (path) { _.forOwn(val, function (subVal, subKey) { apply(config, subVal, key + '.' + subKey); }); - } else { + } + else if (_.isArray(val)) { + config[key] = []; + val.forEach((subVal, i) => { + apply(config, subVal, key + '.' + i); + }); + } + else { _.set(config, key, val); } } diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index 675840b979fc54..eea4763bb31d71 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -3,7 +3,7 @@ const { isWorker } = require('cluster'); const { resolve } = require('path'); const cwd = process.cwd(); -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; let canCluster; try { @@ -126,7 +126,7 @@ module.exports = function (program) { } let kbnServer = {}; - const KbnServer = require('../../server/KbnServer'); + const KbnServer = require('../../server/kbn_server'); try { kbnServer = new KbnServer(settings); await kbnServer.ready(); diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js index cac43c3255d3d4..1bbcfd76e175cc 100644 --- a/src/fixtures/stubbed_logstash_index_pattern.js +++ b/src/fixtures/stubbed_logstash_index_pattern.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import TestUtilsStubIndexPatternProvider from 'testUtils/stub_index_pattern'; +import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern'; import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types'; import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields'; export default function stubbedLogstashIndexPatternService(Private) { diff --git a/src/optimize/babelOptions.build.js b/src/optimize/babel_options.build.js similarity index 100% rename from src/optimize/babelOptions.build.js rename to src/optimize/babel_options.build.js diff --git a/src/optimize/babelOptions.js b/src/optimize/babel_options.js similarity index 100% rename from src/optimize/babelOptions.js rename to src/optimize/babel_options.js diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/base_optimizer.js similarity index 98% rename from src/optimize/BaseOptimizer.js rename to src/optimize/base_optimizer.js index 19a0c2fedd4b3b..9498962623272b 100644 --- a/src/optimize/BaseOptimizer.js +++ b/src/optimize/base_optimizer.js @@ -4,8 +4,8 @@ import DirectoryNameAsMain from 'webpack-directory-name-as-main'; import ExtractTextPlugin from 'extract-text-webpack-plugin'; import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin'; -import fromRoot from '../utils/fromRoot'; -import babelOptions from './babelOptions'; +import fromRoot from '../utils/from_root'; +import babelOptions from './babel_options'; import { inherits } from 'util'; import { defaults, transform } from 'lodash'; import { resolve } from 'path'; diff --git a/src/optimize/FsOptimizer.js b/src/optimize/fs_optimizer.js similarity index 86% rename from src/optimize/FsOptimizer.js rename to src/optimize/fs_optimizer.js index 178385838b8b42..67e03c66c64a80 100644 --- a/src/optimize/FsOptimizer.js +++ b/src/optimize/fs_optimizer.js @@ -1,6 +1,6 @@ -import BaseOptimizer from './BaseOptimizer'; -import fromRoot from '../utils/fromRoot'; +import BaseOptimizer from './base_optimizer'; +import fromRoot from '../utils/from_root'; import { fromNode } from 'bluebird'; import { writeFile } from 'fs'; diff --git a/src/optimize/index.js b/src/optimize/index.js index fd7d4ac5a64237..9131f8fe278f71 100644 --- a/src/optimize/index.js +++ b/src/optimize/index.js @@ -1,4 +1,4 @@ -import FsOptimizer from './FsOptimizer'; +import FsOptimizer from './fs_optimizer'; module.exports = async (kbnServer, server, config) => { if (!config.get('optimize.enabled')) return; diff --git a/src/optimize/lazy/lazy.js b/src/optimize/lazy/lazy.js index 9a32eb00913a66..c370f88c16de17 100644 --- a/src/optimize/lazy/lazy.js +++ b/src/optimize/lazy/lazy.js @@ -21,11 +21,11 @@ module.exports = async (kbnServer, server, config) => { */ switch (process.env.kbnWorkerType) { case 'optmzr': - await kbnServer.mixin(require('./optmzrRole')); + await kbnServer.mixin(require('./optmzr_role')); break; case 'server': - await kbnServer.mixin(require('./proxyRole')); + await kbnServer.mixin(require('./proxy_role')); break; default: diff --git a/src/optimize/lazy/LazyOptimizer.js b/src/optimize/lazy/lazy_optimizer.js similarity index 96% rename from src/optimize/lazy/LazyOptimizer.js rename to src/optimize/lazy/lazy_optimizer.js index a4ead1974f528b..ca7b052e392f69 100644 --- a/src/optimize/lazy/LazyOptimizer.js +++ b/src/optimize/lazy/lazy_optimizer.js @@ -1,7 +1,7 @@ import Boom from 'boom'; -import BaseOptimizer from '../BaseOptimizer'; -import WeirdControlFlow from './WeirdControlFlow'; +import BaseOptimizer from '../base_optimizer'; +import WeirdControlFlow from './weird_control_flow'; import { once, pick, size } from 'lodash'; import { join } from 'path'; diff --git a/src/optimize/lazy/LazyServer.js b/src/optimize/lazy/lazy_server.js similarity index 100% rename from src/optimize/lazy/LazyServer.js rename to src/optimize/lazy/lazy_server.js diff --git a/src/optimize/lazy/optmzrRole.js b/src/optimize/lazy/optmzr_role.js similarity index 87% rename from src/optimize/lazy/optmzrRole.js rename to src/optimize/lazy/optmzr_role.js index 129d309576329f..152d8cf42e471f 100644 --- a/src/optimize/lazy/optmzrRole.js +++ b/src/optimize/lazy/optmzr_role.js @@ -1,6 +1,6 @@ -import LazyServer from './LazyServer'; -import LazyOptimizer from './LazyOptimizer'; -import fromRoot from '../../utils/fromRoot'; +import LazyServer from './lazy_server'; +import LazyOptimizer from './lazy_optimizer'; +import fromRoot from '../../utils/from_root'; export default async (kbnServer, kibanaHapiServer, config) => { let server = new LazyServer( diff --git a/src/optimize/lazy/proxyRole.js b/src/optimize/lazy/proxy_role.js similarity index 100% rename from src/optimize/lazy/proxyRole.js rename to src/optimize/lazy/proxy_role.js diff --git a/src/optimize/lazy/WeirdControlFlow.js b/src/optimize/lazy/weird_control_flow.js similarity index 100% rename from src/optimize/lazy/WeirdControlFlow.js rename to src/optimize/lazy/weird_control_flow.js diff --git a/src/plugins/devMode/index.js b/src/plugins/dev_mode/index.js similarity index 77% rename from src/plugins/devMode/index.js rename to src/plugins/dev_mode/index.js index 256667bb217432..6e54e0e9c79165 100644 --- a/src/plugins/devMode/index.js +++ b/src/plugins/dev_mode/index.js @@ -3,7 +3,7 @@ module.exports = (kibana) => { return new kibana.Plugin({ uiExports: { spyModes: [ - 'plugins/devMode/visDebugSpyPanel' + 'plugins/dev_mode/vis_debug_spy_panel' ] } }); diff --git a/src/plugins/devMode/package.json b/src/plugins/dev_mode/package.json similarity index 53% rename from src/plugins/devMode/package.json rename to src/plugins/dev_mode/package.json index 0d52e00a9094cf..666d9a81a6a70c 100644 --- a/src/plugins/devMode/package.json +++ b/src/plugins/dev_mode/package.json @@ -1,4 +1,4 @@ { - "name": "devMode", + "name": "dev_mode", "version": "1.0.0" } diff --git a/src/plugins/devMode/public/ngMock.js b/src/plugins/dev_mode/public/ng_mock.js similarity index 100% rename from src/plugins/devMode/public/ngMock.js rename to src/plugins/dev_mode/public/ng_mock.js diff --git a/src/plugins/devMode/public/visDebugSpyPanel.html b/src/plugins/dev_mode/public/vis_debug_spy_panel.html similarity index 100% rename from src/plugins/devMode/public/visDebugSpyPanel.html rename to src/plugins/dev_mode/public/vis_debug_spy_panel.html diff --git a/src/plugins/devMode/public/visDebugSpyPanel.js b/src/plugins/dev_mode/public/vis_debug_spy_panel.js similarity index 85% rename from src/plugins/devMode/public/visDebugSpyPanel.js rename to src/plugins/dev_mode/public/vis_debug_spy_panel.js index a9b0ba154bd30d..d691a806de038c 100644 --- a/src/plugins/devMode/public/visDebugSpyPanel.js +++ b/src/plugins/dev_mode/public/vis_debug_spy_panel.js @@ -1,4 +1,4 @@ -import visDebugSpyPanelTemplate from 'plugins/devMode/visDebugSpyPanel.html'; +import visDebugSpyPanelTemplate from 'plugins/dev_mode/vis_debug_spy_panel.html'; // register the spy mode or it won't show up in the spys require('ui/registry/spy_modes').register(VisDetailsSpyProvider); diff --git a/src/plugins/elasticsearch/index.js b/src/plugins/elasticsearch/index.js index 76a44285d9ef8d..c60f56f88b6df9 100644 --- a/src/plugins/elasticsearch/index.js +++ b/src/plugins/elasticsearch/index.js @@ -33,6 +33,16 @@ module.exports = function ({ Plugin }) { }).default(); }, + uiExports: { + injectDefaultVars(server, options) { + return { + esRequestTimeout: options.requestTimeout, + esShardTimeout: options.shardTimeout, + esApiVersion: options.apiVersion, + }; + } + }, + init(server, options) { const kibanaIndex = server.config().get('kibana.index'); diff --git a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js index 51424a841af4df..0db05f066534e1 100644 --- a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js +++ b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js @@ -1,7 +1,9 @@ import _ from 'lodash'; import Promise from 'bluebird'; import sinon from 'sinon'; +import url from 'url'; +import serverConfig from '../../../../../test/server_config'; import checkEsVersion from '../check_es_version'; describe('plugins/elasticsearch', function () { @@ -23,7 +25,7 @@ describe('plugins/elasticsearch', function () { status: { red: sinon.stub() }, - url: 'http://localhost:9210' + url: url.format(serverConfig.servers.elasticsearch) } } }; diff --git a/src/plugins/elasticsearch/lib/__tests__/findPort.js b/src/plugins/elasticsearch/lib/__tests__/find_port.js similarity index 100% rename from src/plugins/elasticsearch/lib/__tests__/findPort.js rename to src/plugins/elasticsearch/lib/__tests__/find_port.js diff --git a/src/plugins/elasticsearch/lib/__tests__/health_check.js b/src/plugins/elasticsearch/lib/__tests__/health_check.js index 3292ba67abb08c..00efcbca7a5089 100644 --- a/src/plugins/elasticsearch/lib/__tests__/health_check.js +++ b/src/plugins/elasticsearch/lib/__tests__/health_check.js @@ -1,9 +1,15 @@ import Promise from 'bluebird'; import sinon from 'sinon'; import expect from 'expect.js'; +import url from 'url'; + const NoConnections = require('elasticsearch').errors.NoConnections; import healthCheck from '../health_check'; +import serverConfig from '../../../../../test/server_config'; + +const esPort = serverConfig.servers.elasticsearch.port; +const esUrl = url.format(serverConfig.servers.elasticsearch); describe('plugins/elasticsearch', function () { describe('lib/health_check', function () { @@ -39,7 +45,7 @@ describe('plugins/elasticsearch', function () { nodes: { 'node-01': { version: '1.5.0', - http_address: 'inet[/127.0.0.1:9210]', + http_address: `inet[/127.0.0.1:${esPort}]`, ip: '127.0.0.1' } } @@ -73,7 +79,7 @@ describe('plugins/elasticsearch', function () { it('should set the cluster red if the ping fails, then to green', function () { - get.withArgs('elasticsearch.url').returns('http://localhost:9210'); + get.withArgs('elasticsearch.url').returns(esUrl); get.withArgs('elasticsearch.engineVersion').returns('^1.4.4'); get.withArgs('kibana.index').returns('.my-kibana'); client.ping.onCall(0).returns(Promise.reject(new NoConnections())); @@ -85,7 +91,7 @@ describe('plugins/elasticsearch', function () { expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch'); sinon.assert.calledOnce(plugin.status.red); expect(plugin.status.red.args[0][0]).to.be( - 'Unable to connect to Elasticsearch at http://localhost:9210.' + `Unable to connect to Elasticsearch at ${esUrl}.` ); sinon.assert.calledTwice(client.ping); sinon.assert.calledOnce(client.nodes.info); @@ -97,7 +103,7 @@ describe('plugins/elasticsearch', function () { }); it('should set the cluster red if the health check status is red, then to green', function () { - get.withArgs('elasticsearch.url').returns('http://localhost:9210'); + get.withArgs('elasticsearch.url').returns(esUrl); get.withArgs('elasticsearch.engineVersion').returns('^1.4.4'); get.withArgs('kibana.index').returns('.my-kibana'); client.ping.returns(Promise.resolve()); @@ -120,7 +126,7 @@ describe('plugins/elasticsearch', function () { }); it('should set the cluster yellow if the health check timed_out and create index', function () { - get.withArgs('elasticsearch.url').returns('http://localhost:9210'); + get.withArgs('elasticsearch.url').returns(esUrl); get.withArgs('elasticsearch.engineVersion').returns('^1.4.4'); get.withArgs('kibana.index').returns('.my-kibana'); client.ping.returns(Promise.resolve()); diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js index e64de8a89a07a2..bc527560acf57a 100644 --- a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js +++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js @@ -3,11 +3,11 @@ import expect from 'expect.js'; import sinon from 'sinon'; import isUpgradeable from '../is_upgradeable'; -import pkg from '../../../../utils/packageJson'; +import pkg from '../../../../utils/package_json'; let version = pkg.version; describe('plugins/elasticsearch', function () { - describe('lib/isUpgradeable', function () { + describe('lib/is_upgradeable', function () { let server = { config: _.constant({ get: function (key) { diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js index c4bacca30d553f..34a75f6a298147 100644 --- a/src/plugins/elasticsearch/lib/__tests__/routes.js +++ b/src/plugins/elasticsearch/lib/__tests__/routes.js @@ -1,9 +1,8 @@ import expect from 'expect.js'; -import util from 'util'; -import * as kbnTestServer from '../../../../../test/utils/kbn_server'; - -const format = util.format; +import { format } from 'util'; +import * as kbnTestServer from '../../../../../test/utils/kbn_server'; +import fromRoot from '../../../../utils/from_root'; describe('plugins/elasticsearch', function () { describe('routes', function () { @@ -13,7 +12,13 @@ describe('plugins/elasticsearch', function () { before(function () { this.timeout(60000); // sometimes waiting for server takes longer than 10 - kbnServer = kbnTestServer.createServer(); + kbnServer = kbnTestServer.createServer({ + plugins: { + scanDirs: [ + fromRoot('src/plugins') + ] + } + }); return kbnServer.ready() .then(() => kbnServer.server.plugins.elasticsearch.waitUntilReady()); }); diff --git a/src/plugins/kbn_doc_views/public/__tests__/doc_views.js b/src/plugins/kbn_doc_views/public/__tests__/doc_views.js index 4d6a1f70524476..76643b9baa6d12 100644 --- a/src/plugins/kbn_doc_views/public/__tests__/doc_views.js +++ b/src/plugins/kbn_doc_views/public/__tests__/doc_views.js @@ -2,7 +2,7 @@ import angular from 'angular'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'ui/render_directive'; import 'plugins/kbn_doc_views/views/table'; diff --git a/src/plugins/kbn_vislib_vis_types/public/area.js b/src/plugins/kbn_vislib_vis_types/public/area.js index 8f7df38820e99b..f4e99beed3b2c2 100644 --- a/src/plugins/kbn_vislib_vis_types/public/area.js +++ b/src/plugins/kbn_vislib_vis_types/public/area.js @@ -1,5 +1,5 @@ -import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import areaTemplate from 'plugins/kbn_vislib_vis_types/editors/area.html'; export default function HistogramVisType(Private) { diff --git a/src/plugins/kbn_vislib_vis_types/public/histogram.js b/src/plugins/kbn_vislib_vis_types/public/histogram.js index 80851875efd837..b1c060226c2802 100644 --- a/src/plugins/kbn_vislib_vis_types/public/histogram.js +++ b/src/plugins/kbn_vislib_vis_types/public/histogram.js @@ -1,5 +1,5 @@ -import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import histogramTemplate from 'plugins/kbn_vislib_vis_types/editors/histogram.html'; export default function HistogramVisType(Private) { diff --git a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js index 0f19a3a031b49c..38859a7738b476 100644 --- a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js +++ b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js @@ -3,4 +3,4 @@ visTypes.register(require('plugins/kbn_vislib_vis_types/histogram')); visTypes.register(require('plugins/kbn_vislib_vis_types/line')); visTypes.register(require('plugins/kbn_vislib_vis_types/pie')); visTypes.register(require('plugins/kbn_vislib_vis_types/area')); -visTypes.register(require('plugins/kbn_vislib_vis_types/tileMap')); +visTypes.register(require('plugins/kbn_vislib_vis_types/tile_map')); diff --git a/src/plugins/kbn_vislib_vis_types/public/line.js b/src/plugins/kbn_vislib_vis_types/public/line.js index 60bd40e36435d5..9e113ca04b33d0 100644 --- a/src/plugins/kbn_vislib_vis_types/public/line.js +++ b/src/plugins/kbn_vislib_vis_types/public/line.js @@ -1,5 +1,5 @@ -import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import lineTemplate from 'plugins/kbn_vislib_vis_types/editors/line.html'; export default function HistogramVisType(Private) { diff --git a/src/plugins/kbn_vislib_vis_types/public/pie.js b/src/plugins/kbn_vislib_vis_types/public/pie.js index f7621a381d2633..10d14d48149592 100644 --- a/src/plugins/kbn_vislib_vis_types/public/pie.js +++ b/src/plugins/kbn_vislib_vis_types/public/pie.js @@ -1,5 +1,5 @@ -import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import pieTemplate from 'plugins/kbn_vislib_vis_types/editors/pie.html'; export default function HistogramVisType(Private) { diff --git a/src/plugins/kbn_vislib_vis_types/public/tileMap.js b/src/plugins/kbn_vislib_vis_types/public/tile_map.js similarity index 98% rename from src/plugins/kbn_vislib_vis_types/public/tileMap.js rename to src/plugins/kbn_vislib_vis_types/public/tile_map.js index 537bfbd1b8c5f1..788b50e832e80a 100644 --- a/src/plugins/kbn_vislib_vis_types/public/tileMap.js +++ b/src/plugins/kbn_vislib_vis_types/public/tile_map.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import supports from 'ui/utils/supports'; -import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json'; import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter'; import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html'; diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js index b1ea675fd1057e..f64fbaf4ed80d2 100644 --- a/src/plugins/kibana/index.js +++ b/src/plugins/kibana/index.js @@ -1,4 +1,5 @@ import ingest from './server/routes/api/ingest'; +import search from './server/routes/api/search'; module.exports = function (kibana) { return new kibana.Plugin({ @@ -33,11 +34,18 @@ module.exports = function (kibana) { kbnDefaultAppId: config.get('kibana.defaultAppId') }; } - } + }, + + injectDefaultVars(server, options) { + return { + kbnIndex: options.index + }; + }, }, init: function (server, options) { ingest(server); + search(server); } }); diff --git a/src/plugins/kibana/public/dashboard/directives/grid.js b/src/plugins/kibana/public/dashboard/directives/grid.js index 4c501aeeb2a756..77c0d1aeb4f42f 100644 --- a/src/plugins/kibana/public/dashboard/directives/grid.js +++ b/src/plugins/kibana/public/dashboard/directives/grid.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import $ from 'jquery'; -import Binder from 'ui/Binder'; +import Binder from 'ui/binder'; import 'gridster'; import uiModules from 'ui/modules'; diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js index c4813d6499bead..581979cbb4ab57 100644 --- a/src/plugins/kibana/public/dashboard/index.js +++ b/src/plugins/kibana/public/dashboard/index.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import $ from 'jquery'; import angular from 'angular'; -import ConfigTemplate from 'ui/ConfigTemplate'; +import ConfigTemplate from 'ui/config_template'; import chrome from 'ui/chrome'; import 'ui/directives/config'; import 'ui/courier'; diff --git a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js index 554c97fdb27d6c..7515cf94fc8420 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js @@ -2,7 +2,7 @@ import angular from 'angular'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import $ from 'jquery'; import 'ui/private'; diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js index f4820abfbc9c52..e248be72b4f2c1 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator'; import expect from 'expect.js'; import 'ui/private'; diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js index 78c7fca669c0fb..d892dcbb99d3f7 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js @@ -1,6 +1,6 @@ import angular from 'angular'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; diff --git a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js index 601b1928279015..197f499d0720ce 100644 --- a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js +++ b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn'; diff --git a/src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html b/src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html index d90c7cd1c4b77c..719d1c6ef62f57 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html +++ b/src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html @@ -3,8 +3,15 @@
Quick Count ( - {{::field.details.exists}} - {{::field.details.exists}} + + {{::field.details.exists}} + + + {{::field.details.exists}} + /{{::field.details.total}} records ) diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js index c89b823fc8f8b2..d180abb0fa4e7e 100644 --- a/src/plugins/kibana/public/discover/controllers/discover.js +++ b/src/plugins/kibana/public/discover/controllers/discover.js @@ -1,14 +1,14 @@ import _ from 'lodash'; import angular from 'angular'; import moment from 'moment'; -import ConfigTemplate from 'ui/ConfigTemplate'; +import ConfigTemplate from 'ui/config_template'; import getSort from 'ui/doc_table/lib/get_sort'; import rison from 'ui/utils/rison'; -import dateMath from 'ui/utils/dateMath'; +import dateMath from 'ui/utils/date_math'; import 'ui/doc_table'; import 'ui/visualize'; import 'ui/notify'; -import 'ui/fixedScroll'; +import 'ui/fixed_scroll'; import 'ui/directives/validate_json'; import 'ui/filters/moment'; import 'ui/courier'; @@ -17,7 +17,7 @@ import 'ui/state_management/app_state'; import 'ui/timefilter'; import 'ui/highlight/highlight_tags'; import 'ui/share'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import DocTitleProvider from 'ui/doc_title'; import UtilsBrushEventProvider from 'ui/utils/brush_event'; import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn'; diff --git a/src/plugins/kibana/public/doc/__tests__/doc.js b/src/plugins/kibana/public/doc/__tests__/doc.js index 32bec47cadbbc8..5efbe5a49f9804 100644 --- a/src/plugins/kibana/public/doc/__tests__/doc.js +++ b/src/plugins/kibana/public/doc/__tests__/doc.js @@ -1,5 +1,5 @@ // Load the kibana app dependencies. -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import 'plugins/kibana/doc/index'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js index 56037a5848a9d8..f1e88929b239ce 100644 --- a/src/plugins/kibana/public/settings/index.js +++ b/src/plugins/kibana/public/settings/index.js @@ -20,7 +20,7 @@ uiRoutes redirectTo: '/settings/indices' }); -require('ui/index_patterns/routeSetup/loadDefault')({ +require('ui/index_patterns/route_setup/load_default')({ notRequiredRe: /^\/settings\//, whenMissingRedirectTo: '/settings/indices' }); diff --git a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js index 0afced983fb88f..df8d592098b7f2 100644 --- a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js +++ b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js @@ -2,7 +2,7 @@ import angular from 'angular'; import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'plugins/kibana/visualize/editor/agg'; diff --git a/src/plugins/kibana/public/visualize/editor/agg_add.js b/src/plugins/kibana/public/visualize/editor/agg_add.js index d0b7ec14953e45..44a3334169bda9 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_add.js +++ b/src/plugins/kibana/public/visualize/editor/agg_add.js @@ -1,4 +1,4 @@ -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import uiModules from 'ui/modules'; import aggAddTemplate from 'plugins/kibana/visualize/editor/agg_add.html'; diff --git a/src/plugins/kibana/public/visualize/editor/agg_params.js b/src/plugins/kibana/public/visualize/editor/agg_params.js index 61cf86f8483192..a525057c017cd9 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_params.js +++ b/src/plugins/kibana/public/visualize/editor/agg_params.js @@ -1,4 +1,4 @@ -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; import _ from 'lodash'; import $ from 'jquery'; import aggSelectHtml from 'plugins/kibana/visualize/editor/agg_select.html'; diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js index 0428833db4998e..7e6784553a88a7 100644 --- a/src/plugins/kibana/public/visualize/editor/editor.js +++ b/src/plugins/kibana/public/visualize/editor/editor.js @@ -7,7 +7,7 @@ import 'ui/visualize'; import 'ui/collapsible_sidebar'; import 'ui/share'; import angular from 'angular'; -import ConfigTemplate from 'ui/ConfigTemplate'; +import ConfigTemplate from 'ui/config_template'; import Notifier from 'ui/notify/notifier'; import RegistryVisTypesProvider from 'ui/registry/vis_types'; import DocTitleProvider from 'ui/doc_title'; diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js index dfcecb6199437e..20ab2138469b7d 100644 --- a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js +++ b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import uiModules from 'ui/modules'; uiModules .get('app/visualize') diff --git a/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js index cf4563458ecef3..7444d383846380 100644 --- a/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js +++ b/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js @@ -39,21 +39,21 @@ describe('createMappingsFromPatternFields', function () { let mappings = createMappingsFromPatternFields(testFields); _.forEach(mappings, function (mapping) { - if (mapping.type !== 'string') { + if (mapping.type !== 'text') { expect(_.isEqual(mapping, { type: mapping.type, - index: 'not_analyzed', + index: true, doc_values: true })).to.be.ok(); } }); }); - it('should give strings a multi-field mapping', function () { + it('should give strings a multi-field mapping with a "text" base type', function () { let mappings = createMappingsFromPatternFields(testFields); _.forEach(mappings, function (mapping) { - if (mapping.type === 'string') { + if (mapping.type === 'text') { expect(mapping).to.have.property('fields'); } }); @@ -68,7 +68,7 @@ describe('createMappingsFromPatternFields', function () { expect(mappings.geo.properties).to.have.property('coordinates'); expect(_.isEqual(mappings.geo.properties.coordinates, { type: 'geo_point', - index: 'not_analyzed', + index: true, doc_values: true })).to.be.ok(); }); diff --git a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js index d05e650991613c..b9ee189e35c4af 100644 --- a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js +++ b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js @@ -13,10 +13,9 @@ module.exports = function createMappingsFromPatternFields(fields) { if (field.type === 'string') { mapping = { - type: 'string', - index: 'analyzed', + type: 'text', fields: { - raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256} + raw: {type: 'keyword', ignore_above: 256} } }; } @@ -24,7 +23,7 @@ module.exports = function createMappingsFromPatternFields(fields) { const fieldType = field.type === 'number' ? 'double' : field.type; mapping = { type: fieldType, - index: 'not_analyzed', + index: true, doc_values: true }; } diff --git a/src/plugins/kibana/server/routes/api/ingest/register_delete.js b/src/plugins/kibana/server/routes/api/ingest/register_delete.js index 92a020d8435ddb..fb81655f1da047 100644 --- a/src/plugins/kibana/server/routes/api/ingest/register_delete.js +++ b/src/plugins/kibana/server/routes/api/ingest/register_delete.js @@ -7,9 +7,10 @@ module.exports = function registerDelete(server) { path: '/api/kibana/ingest/{id}', method: 'DELETE', handler: function (req, reply) { + const kibanaIndex = server.config().get('kibana.index'); const callWithRequest = server.plugins.elasticsearch.callWithRequest; const deletePatternParams = { - index: '.kibana', + index: kibanaIndex, type: 'index-pattern', id: req.params.id }; diff --git a/src/plugins/kibana/server/routes/api/ingest/register_post.js b/src/plugins/kibana/server/routes/api/ingest/register_post.js index b36b778232fddf..a4e259d6efaed3 100644 --- a/src/plugins/kibana/server/routes/api/ingest/register_post.js +++ b/src/plugins/kibana/server/routes/api/ingest/register_post.js @@ -17,6 +17,7 @@ module.exports = function registerPost(server) { } }, handler: function (req, reply) { + const kibanaIndex = server.config().get('kibana.index'); const callWithRequest = server.plugins.elasticsearch.callWithRequest; const requestDocument = _.cloneDeep(req.payload); const indexPatternId = requestDocument.id; @@ -36,7 +37,7 @@ module.exports = function registerPost(server) { } const patternCreateParams = { - index: '.kibana', + index: kibanaIndex, type: 'index-pattern', id: indexPatternId, body: indexPattern @@ -57,10 +58,9 @@ module.exports = function registerPost(server) { match: '*', match_mapping_type: 'string', mapping: { - type: 'string', - index: 'analyzed', + type: 'text', fields: { - raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256} + raw: {type: 'keyword', ignore_above: 256} } } } @@ -74,7 +74,7 @@ module.exports = function registerPost(server) { return callWithRequest(req, 'indices.putTemplate', templateParams) .catch((templateError) => { const deleteParams = { - index: '.kibana', + index: kibanaIndex, type: 'index-pattern', id: indexPatternId }; diff --git a/src/plugins/kibana/server/routes/api/search/count/register_count.js b/src/plugins/kibana/server/routes/api/search/count/register_count.js new file mode 100644 index 00000000000000..8e542afe70cf08 --- /dev/null +++ b/src/plugins/kibana/server/routes/api/search/count/register_count.js @@ -0,0 +1,25 @@ +import _ from 'lodash'; +import handleESError from '../../../../lib/handle_es_error'; + +export default function registerCount(server) { + server.route({ + path: '/api/kibana/{id}/_count', + method: ['POST', 'GET'], + handler: function (req, reply) { + const boundCallWithRequest = _.partial(server.plugins.elasticsearch.callWithRequest, req); + + boundCallWithRequest('count', { + allowNoIndices: false, + index: req.params.id + }) + .then( + function (res) { + reply({count: res.count}); + }, + function (error) { + reply(handleESError(error)); + } + ); + } + }); +} diff --git a/src/plugins/kibana/server/routes/api/search/index.js b/src/plugins/kibana/server/routes/api/search/index.js new file mode 100644 index 00000000000000..2dfea0d380d4f5 --- /dev/null +++ b/src/plugins/kibana/server/routes/api/search/index.js @@ -0,0 +1,5 @@ +import registerCount from './count/register_count'; + +export default function (server) { + registerCount(server); +} diff --git a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js index 0c6f45fef45538..93fafef12882c7 100644 --- a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js +++ b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; describe('markdown vis controller', function () { diff --git a/src/plugins/markdown_vis/public/markdown_vis.js b/src/plugins/markdown_vis/public/markdown_vis.js index fb7edc8caf40e5..4dd89fad523679 100644 --- a/src/plugins/markdown_vis/public/markdown_vis.js +++ b/src/plugins/markdown_vis/public/markdown_vis.js @@ -1,6 +1,6 @@ import 'plugins/markdown_vis/markdown_vis.less'; import 'plugins/markdown_vis/markdown_vis_controller'; -import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/TemplateVisType'; +import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/template_vis_type'; import markdownVisTemplate from 'plugins/markdown_vis/markdown_vis.html'; import markdownVisParamsTemplate from 'plugins/markdown_vis/markdown_vis_params.html'; // we need to load the css ourselves diff --git a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js index 032d83fedf2a71..a745d90c7f841f 100644 --- a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js +++ b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; describe('metric vis', function () { diff --git a/src/plugins/metric_vis/public/metric_vis.js b/src/plugins/metric_vis/public/metric_vis.js index e5427ad965a436..f73b9ffe5a7a9c 100644 --- a/src/plugins/metric_vis/public/metric_vis.js +++ b/src/plugins/metric_vis/public/metric_vis.js @@ -1,7 +1,7 @@ import 'plugins/metric_vis/metric_vis.less'; import 'plugins/metric_vis/metric_vis_controller'; -import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/TemplateVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/template_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import metricVisTemplate from 'plugins/metric_vis/metric_vis.html'; import metricVisParamsTemplate from 'plugins/metric_vis/metric_vis_params.html'; // we need to load the css ourselves diff --git a/src/plugins/spyModes/index.js b/src/plugins/spy_modes/index.js similarity index 56% rename from src/plugins/spyModes/index.js rename to src/plugins/spy_modes/index.js index cbcc86e2012dab..83ca9f18800358 100644 --- a/src/plugins/spyModes/index.js +++ b/src/plugins/spy_modes/index.js @@ -2,8 +2,8 @@ module.exports = function (kibana) { return new kibana.Plugin({ uiExports: { spyModes: [ - 'plugins/spyModes/tableSpyMode', - 'plugins/spyModes/reqRespStatsSpyMode' + 'plugins/spy_modes/table_spy_mode', + 'plugins/spy_modes/req_resp_stats_spy_mode' ] } }); diff --git a/src/plugins/spyModes/package.json b/src/plugins/spy_modes/package.json similarity index 52% rename from src/plugins/spyModes/package.json rename to src/plugins/spy_modes/package.json index e5f8c52a1f4a8d..8bf42bfa865a79 100644 --- a/src/plugins/spyModes/package.json +++ b/src/plugins/spy_modes/package.json @@ -1,4 +1,4 @@ { - "name": "spyModes", + "name": "spy_modes", "version": "1.0.0" } diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.html b/src/plugins/spy_modes/public/req_resp_stats_spy_mode.html similarity index 100% rename from src/plugins/spyModes/public/reqRespStatsSpyMode.html rename to src/plugins/spy_modes/public/req_resp_stats_spy_mode.html diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.js b/src/plugins/spy_modes/public/req_resp_stats_spy_mode.js similarity index 94% rename from src/plugins/spyModes/public/reqRespStatsSpyMode.js rename to src/plugins/spy_modes/public/req_resp_stats_spy_mode.js index 967260c7f2b1b9..2084d42a430dbc 100644 --- a/src/plugins/spyModes/public/reqRespStatsSpyMode.js +++ b/src/plugins/spy_modes/public/req_resp_stats_spy_mode.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import reqRespStatsHTML from 'plugins/spyModes/reqRespStatsSpyMode.html'; +import reqRespStatsHTML from 'plugins/spy_modes/req_resp_stats_spy_mode.html'; const linkReqRespStats = function ($scope, config) { $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]'); diff --git a/src/plugins/spyModes/public/tableSpyMode.html b/src/plugins/spy_modes/public/table_spy_mode.html similarity index 100% rename from src/plugins/spyModes/public/tableSpyMode.html rename to src/plugins/spy_modes/public/table_spy_mode.html diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spy_modes/public/table_spy_mode.js similarity index 93% rename from src/plugins/spyModes/public/tableSpyMode.js rename to src/plugins/spy_modes/public/table_spy_mode.js index 31a78ca895fae2..f786614074779d 100644 --- a/src/plugins/spyModes/public/tableSpyMode.js +++ b/src/plugins/spy_modes/public/table_spy_mode.js @@ -2,7 +2,7 @@ import { saveAs } from '@spalger/filesaver'; import _ from 'lodash'; import 'ui/agg_table'; import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; -import tableSpyModeTemplate from 'plugins/spyModes/tableSpyMode.html'; +import tableSpyModeTemplate from 'plugins/spy_modes/table_spy_mode.html'; function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) { const tabifyAggResponse = Private(AggResponseTabifyTabifyProvider); diff --git a/src/plugins/statusPage/index.js b/src/plugins/status_page/index.js similarity index 80% rename from src/plugins/statusPage/index.js rename to src/plugins/status_page/index.js index 1807813438ab99..d7e7649f9d492f 100644 --- a/src/plugins/statusPage/index.js +++ b/src/plugins/status_page/index.js @@ -3,7 +3,7 @@ module.exports = function (kibana) { uiExports: { app: { title: 'Server Status', - main: 'plugins/statusPage/statusPage', + main: 'plugins/status_page/status_page', hidden: true, url: '/status' } diff --git a/src/plugins/statusPage/package.json b/src/plugins/status_page/package.json similarity index 50% rename from src/plugins/statusPage/package.json rename to src/plugins/status_page/package.json index 853b935ec57e97..551751fda01ca6 100644 --- a/src/plugins/statusPage/package.json +++ b/src/plugins/status_page/package.json @@ -1,4 +1,4 @@ { - "name": "statusPage", + "name": "status_page", "version": "1.0.0" } diff --git a/src/plugins/statusPage/public/lib/formatNumber.js b/src/plugins/status_page/public/lib/format_number.js similarity index 100% rename from src/plugins/statusPage/public/lib/formatNumber.js rename to src/plugins/status_page/public/lib/format_number.js diff --git a/src/plugins/statusPage/public/lib/makeChartOptions.js b/src/plugins/status_page/public/lib/make_chart_options.js similarity index 93% rename from src/plugins/statusPage/public/lib/makeChartOptions.js rename to src/plugins/status_page/public/lib/make_chart_options.js index 085ab4b788d55b..e5cf46f2602ddd 100644 --- a/src/plugins/statusPage/public/lib/makeChartOptions.js +++ b/src/plugins/status_page/public/lib/make_chart_options.js @@ -1,5 +1,5 @@ -import formatNumber from './formatNumber'; +import formatNumber from './format_number'; module.exports = function makeChartOptions(type) { return { diff --git a/src/plugins/statusPage/public/lib/readStatData.js b/src/plugins/status_page/public/lib/read_stat_data.js similarity index 100% rename from src/plugins/statusPage/public/lib/readStatData.js rename to src/plugins/status_page/public/lib/read_stat_data.js diff --git a/src/plugins/statusPage/public/lib/toTitleCase.js b/src/plugins/status_page/public/lib/to_title_case.js similarity index 100% rename from src/plugins/statusPage/public/lib/toTitleCase.js rename to src/plugins/status_page/public/lib/to_title_case.js diff --git a/src/plugins/statusPage/public/statusPage.html b/src/plugins/status_page/public/status_page.html similarity index 100% rename from src/plugins/statusPage/public/statusPage.html rename to src/plugins/status_page/public/status_page.html diff --git a/src/plugins/statusPage/public/statusPage.js b/src/plugins/status_page/public/status_page.js similarity index 88% rename from src/plugins/statusPage/public/statusPage.js rename to src/plugins/status_page/public/status_page.js index b7ce8705fc5c66..8938e33e62bf75 100644 --- a/src/plugins/statusPage/public/statusPage.js +++ b/src/plugins/status_page/public/status_page.js @@ -2,8 +2,8 @@ import _ from 'lodash'; import notify from 'ui/notify'; import $ from 'jquery'; import 'ui/autoload/styles'; -import 'plugins/statusPage/statusPageMetric'; -import 'plugins/statusPage/statusPage.less'; +import 'plugins/status_page/status_page_metric'; +import 'plugins/status_page/status_page.less'; const chrome = require('ui/chrome') @@ -14,7 +14,7 @@ const chrome = require('ui/chrome') activeIndicatorColor: '#EFF0F2' } ]) -.setRootTemplate(require('plugins/statusPage/statusPage.html')) +.setRootTemplate(require('plugins/status_page/status_page.html')) .setRootController('ui', function ($http, $scope) { const ui = this; ui.loading = false; diff --git a/src/plugins/statusPage/public/statusPage.less b/src/plugins/status_page/public/status_page.less similarity index 100% rename from src/plugins/statusPage/public/statusPage.less rename to src/plugins/status_page/public/status_page.less diff --git a/src/plugins/statusPage/public/statusPageMetric.html b/src/plugins/status_page/public/status_page_metric.html similarity index 100% rename from src/plugins/statusPage/public/statusPageMetric.html rename to src/plugins/status_page/public/status_page_metric.html diff --git a/src/plugins/statusPage/public/statusPageMetric.js b/src/plugins/status_page/public/status_page_metric.js similarity index 88% rename from src/plugins/statusPage/public/statusPageMetric.js rename to src/plugins/status_page/public/status_page_metric.js index 06faa301173cde..1893e8eda2d4bc 100644 --- a/src/plugins/statusPage/public/statusPageMetric.js +++ b/src/plugins/status_page/public/status_page_metric.js @@ -2,11 +2,11 @@ import _ from 'lodash'; import moment from 'moment'; import numeral from 'numeral'; -import toTitleCase from './lib/toTitleCase'; -import formatNumber from './lib/formatNumber'; -import readStatData from './lib/readStatData'; +import toTitleCase from './lib/to_title_case'; +import formatNumber from './lib/format_number'; +import readStatData from './lib/read_stat_data'; import uiModules from 'ui/modules'; -import statusPageMetricTemplate from 'plugins/statusPage/statusPageMetric.html'; +import statusPageMetricTemplate from 'plugins/status_page/status_page_metric.html'; function calcAvg(metricList, metricNumberType) { return metricList.map(function (data) { diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js index de4ba73f1d4ad0..8578d7ce1529b3 100644 --- a/src/plugins/table_vis/public/__tests__/_table_vis.js +++ b/src/plugins/table_vis/public/__tests__/_table_vis.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'auto-release-sinon'; import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('Integration', function () { diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js index a0bee84cc43a83..8b923b0337f0e3 100644 --- a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js +++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'auto-release-sinon'; import tabifyPm from 'ui/agg_response/tabify/tabify'; import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('Controller', function () { diff --git a/src/plugins/table_vis/public/table_vis.js b/src/plugins/table_vis/public/table_vis.js index 6ee5b06749619d..6fc93174f131bb 100644 --- a/src/plugins/table_vis/public/table_vis.js +++ b/src/plugins/table_vis/public/table_vis.js @@ -3,8 +3,8 @@ import 'plugins/table_vis/table_vis_controller'; import 'plugins/table_vis/table_vis_params'; import 'ui/agg_table'; import 'ui/agg_table/agg_table_group'; -import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/TemplateVisType'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/template_vis_type'; +import VisSchemasProvider from 'ui/vis/schemas'; import tableVisTemplate from 'plugins/table_vis/table_vis.html'; // we need to load the css ourselves diff --git a/src/plugins/testsBundle/findSourceFiles.js b/src/plugins/tests_bundle/find_source_files.js similarity index 95% rename from src/plugins/testsBundle/findSourceFiles.js rename to src/plugins/tests_bundle/find_source_files.js index b9b3ac9205610c..a9c5fd59d3d7c0 100644 --- a/src/plugins/testsBundle/findSourceFiles.js +++ b/src/plugins/tests_bundle/find_source_files.js @@ -1,5 +1,5 @@ -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; import { chain, memoize } from 'lodash'; import { resolve } from 'path'; import { map, fromNode } from 'bluebird'; diff --git a/src/plugins/testsBundle/index.js b/src/plugins/tests_bundle/index.js similarity index 83% rename from src/plugins/testsBundle/index.js rename to src/plugins/tests_bundle/index.js index 297492e513db4b..817d8963a5f497 100644 --- a/src/plugins/testsBundle/index.js +++ b/src/plugins/tests_bundle/index.js @@ -1,6 +1,7 @@ import { union } from 'lodash'; -import findSourceFiles from './findSourceFiles'; -import fromRoot from '../../utils/fromRoot'; + +import findSourceFiles from './find_source_files'; +import fromRoot from '../../utils/from_root'; export default (kibana) => { return new kibana.Plugin({ @@ -18,7 +19,7 @@ export default (kibana) => { let config = kibana.config; const testGlobs = ['src/ui/public/**/*.js']; - const testingPluginId = config.get('testsBundle.pluginId'); + const testingPluginId = config.get('tests_bundle.pluginId'); if (testingPluginId) { const plugin = plugins.byId[testingPluginId]; @@ -48,7 +49,7 @@ export default (kibana) => { const testFiles = await findSourceFiles(testGlobs); for (let f of testFiles) modules.push(f); - if (config.get('testsBundle.instrument')) { + if (config.get('tests_bundle.instrument')) { env.addPostLoader({ test: /\.jsx?$/, exclude: /[\/\\](__tests__|node_modules|bower_components|webpackShims)[\/\\]/, @@ -59,15 +60,15 @@ export default (kibana) => { return new UiBundle({ id: 'tests', modules: modules, - template: require('./testsEntryTemplate'), + template: require('./tests_entry_template'), env: env }); }, modules: { - ngMock$: fromRoot('src/plugins/devMode/public/ngMock'), + ng_mock$: fromRoot('src/plugins/dev_mode/public/ng_mock'), fixtures: fromRoot('src/fixtures'), - testUtils: fromRoot('src/testUtils'), + test_utils: fromRoot('src/test_utils'), 'angular-mocks': { path: require.resolve('angular-mocks'), imports: 'angular' diff --git a/src/plugins/tests_bundle/package.json b/src/plugins/tests_bundle/package.json new file mode 100644 index 00000000000000..dd351b09560c46 --- /dev/null +++ b/src/plugins/tests_bundle/package.json @@ -0,0 +1,4 @@ +{ + "name": "tests_bundle", + "version": "0.0.0" +} diff --git a/src/plugins/testsBundle/testsEntryTemplate.js b/src/plugins/tests_bundle/tests_entry_template.js similarity index 88% rename from src/plugins/testsBundle/testsEntryTemplate.js rename to src/plugins/tests_bundle/tests_entry_template.js index 61127f4bfc48fc..5bb064386112fc 100644 --- a/src/plugins/testsBundle/testsEntryTemplate.js +++ b/src/plugins/tests_bundle/tests_entry_template.js @@ -31,9 +31,9 @@ window.__KBN__ = { } }; -require('ui/testHarness'); +require('ui/test_harness'); ${requires} -require('ui/testHarness').bootstrap(/* go! */); +require('ui/test_harness').bootstrap(/* go! */); `; diff --git a/src/server/__tests__/basePath.js b/src/server/__tests__/base_path.js similarity index 100% rename from src/server/__tests__/basePath.js rename to src/server/__tests__/base_path.js diff --git a/src/server/config/__tests__/deepCloneWithBuffers.js b/src/server/config/__tests__/deep_clone_with_buffers.js similarity index 96% rename from src/server/config/__tests__/deepCloneWithBuffers.js rename to src/server/config/__tests__/deep_clone_with_buffers.js index 6482c5f24ed5db..02bb17c5c430c9 100644 --- a/src/server/config/__tests__/deepCloneWithBuffers.js +++ b/src/server/config/__tests__/deep_clone_with_buffers.js @@ -1,4 +1,4 @@ -import deepCloneWithBuffers from '../deepCloneWithBuffers'; +import deepCloneWithBuffers from '../deep_clone_with_buffers'; import expect from 'expect.js'; describe('deepCloneWithBuffers()', function () { diff --git a/src/server/config/__tests__/explodeBy.js b/src/server/config/__tests__/explode_by.js similarity index 94% rename from src/server/config/__tests__/explodeBy.js rename to src/server/config/__tests__/explode_by.js index 08e5d95e3bc221..5ca86e331ef113 100644 --- a/src/server/config/__tests__/explodeBy.js +++ b/src/server/config/__tests__/explode_by.js @@ -1,4 +1,4 @@ -import explodeBy from '../explodeBy'; +import explodeBy from '../explode_by'; import expect from 'expect.js'; describe('explode_by(dot, flatObject)', function () { diff --git a/src/server/config/__tests__/flattenWith.js b/src/server/config/__tests__/flatten_with.js similarity index 93% rename from src/server/config/__tests__/flattenWith.js rename to src/server/config/__tests__/flatten_with.js index 10891cc488bb5a..928c441ef4a763 100644 --- a/src/server/config/__tests__/flattenWith.js +++ b/src/server/config/__tests__/flatten_with.js @@ -1,4 +1,4 @@ -import flattenWith from '../flattenWith'; +import flattenWith from '../flatten_with'; import expect from 'expect.js'; describe('flatten_with(dot, nestedObj)', function () { diff --git a/src/server/config/config.js b/src/server/config/config.js index 6beff92f99c156..0f601959ede063 100644 --- a/src/server/config/config.js +++ b/src/server/config/config.js @@ -3,8 +3,8 @@ import Joi from 'joi'; import _ from 'lodash'; import override from './override'; import createDefaultSchema from './schema'; -import pkg from '../../utils/packageJson'; -import clone from './deepCloneWithBuffers'; +import pkg from '../../utils/package_json'; +import clone from './deep_clone_with_buffers'; import { zipObject } from 'lodash'; const schema = Symbol('Joi Schema'); diff --git a/src/server/config/deepCloneWithBuffers.js b/src/server/config/deep_clone_with_buffers.js similarity index 100% rename from src/server/config/deepCloneWithBuffers.js rename to src/server/config/deep_clone_with_buffers.js diff --git a/src/server/config/explodeBy.js b/src/server/config/explode_by.js similarity index 100% rename from src/server/config/explodeBy.js rename to src/server/config/explode_by.js diff --git a/src/server/config/flattenWith.js b/src/server/config/flatten_with.js similarity index 100% rename from src/server/config/flattenWith.js rename to src/server/config/flatten_with.js diff --git a/src/server/config/override.js b/src/server/config/override.js index 146af0bc304fe7..0a938f29ead3a0 100644 --- a/src/server/config/override.js +++ b/src/server/config/override.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import flattenWith from './flattenWith'; -import explodeBy from './explodeBy'; +import flattenWith from './flatten_with'; +import explodeBy from './explode_by'; module.exports = function (target, source) { var _target = flattenWith('.', target); diff --git a/src/server/config/schema.js b/src/server/config/schema.js index e6306282c2fccc..45dbdf1defb4b5 100644 --- a/src/server/config/schema.js +++ b/src/server/config/schema.js @@ -4,7 +4,7 @@ import path from 'path'; import { get } from 'lodash'; import { randomBytes } from 'crypto'; -import fromRoot from '../../utils/fromRoot'; +import fromRoot from '../../utils/from_root'; module.exports = () => Joi.object({ pkg: Joi.object({ diff --git a/src/server/http/getDefaultRoute.js b/src/server/http/get_default_route.js similarity index 100% rename from src/server/http/getDefaultRoute.js rename to src/server/http/get_default_route.js diff --git a/src/server/http/index.js b/src/server/http/index.js index c03a08ec30c526..2497648f7429c1 100644 --- a/src/server/http/index.js +++ b/src/server/http/index.js @@ -4,7 +4,7 @@ import _ from 'lodash'; import fs from 'fs'; import Boom from 'boom'; import Hapi from 'hapi'; -import getDefaultRoute from './getDefaultRoute'; +import getDefaultRoute from './get_default_route'; module.exports = async function (kbnServer, server, config) { @@ -82,7 +82,7 @@ module.exports = async function (kbnServer, server, config) { path: '/', method: 'GET', handler: function (req, reply) { - return reply.view('rootRedirect', { + return reply.view('root_redirect', { hashRoute: `${config.get('server.basePath')}/app/kibana`, defaultRoute: getDefaultRoute(kbnServer), }); diff --git a/src/server/KbnServer.js b/src/server/kbn_server.js similarity index 97% rename from src/server/KbnServer.js rename to src/server/kbn_server.js index 37ab022368b20f..d42554026b21f9 100644 --- a/src/server/KbnServer.js +++ b/src/server/kbn_server.js @@ -1,8 +1,8 @@ import Hapi from 'hapi'; import { constant, once, compact, flatten } from 'lodash'; import { promisify, resolve, fromNode } from 'bluebird'; -import fromRoot from '../utils/fromRoot'; -import pkg from '../utils/packageJson'; +import fromRoot from '../utils/from_root'; +import pkg from '../utils/package_json'; let rootDir = fromRoot('.'); diff --git a/src/server/lib/commanderExtensions.js b/src/server/lib/commander_extensions.js similarity index 100% rename from src/server/lib/commanderExtensions.js rename to src/server/lib/commander_extensions.js diff --git a/src/server/logging/__tests__/applyFiltersToKeys.js b/src/server/logging/__tests__/apply_filters_to_keys.js similarity index 92% rename from src/server/logging/__tests__/applyFiltersToKeys.js rename to src/server/logging/__tests__/apply_filters_to_keys.js index f0fd46ea21e2b0..fc0c520520b47c 100644 --- a/src/server/logging/__tests__/applyFiltersToKeys.js +++ b/src/server/logging/__tests__/apply_filters_to_keys.js @@ -1,4 +1,4 @@ -import applyFiltersToKeys from '../applyFiltersToKeys'; +import applyFiltersToKeys from '../apply_filters_to_keys'; import expect from 'expect.js'; describe('applyFiltersToKeys(obj, actionsByKey)', function () { diff --git a/src/server/logging/applyFiltersToKeys.js b/src/server/logging/apply_filters_to_keys.js similarity index 100% rename from src/server/logging/applyFiltersToKeys.js rename to src/server/logging/apply_filters_to_keys.js diff --git a/src/server/logging/index.js b/src/server/logging/index.js index 7164216e15a6e6..3279b1aca0aa6e 100644 --- a/src/server/logging/index.js +++ b/src/server/logging/index.js @@ -44,7 +44,7 @@ module.exports = function (kbnServer, server, config) { requestPayload: true, reporters: [ { - reporter: require('./LogReporter'), + reporter: require('./log_reporter'), config: { json: config.get('logging.json'), dest: config.get('logging.dest'), diff --git a/src/server/logging/LogFormat.js b/src/server/logging/log_format.js similarity index 98% rename from src/server/logging/LogFormat.js rename to src/server/logging/log_format.js index b4818945a982bd..c1fa7a4744791d 100644 --- a/src/server/logging/LogFormat.js +++ b/src/server/logging/log_format.js @@ -5,7 +5,7 @@ import numeral from '@spalger/numeral'; import ansicolors from 'ansicolors'; import stringify from 'json-stringify-safe'; import querystring from 'querystring'; -import applyFiltersToKeys from './applyFiltersToKeys'; +import applyFiltersToKeys from './apply_filters_to_keys'; import { inspect } from 'util'; function serializeError(err) { diff --git a/src/server/logging/LogFormatJson.js b/src/server/logging/log_format_json.js similarity index 88% rename from src/server/logging/LogFormatJson.js rename to src/server/logging/log_format_json.js index 1db642f9e48dbf..7df528ab968bbd 100644 --- a/src/server/logging/LogFormatJson.js +++ b/src/server/logging/log_format_json.js @@ -1,4 +1,4 @@ -import LogFormat from './LogFormat'; +import LogFormat from './log_format'; import stringify from 'json-stringify-safe'; let stripColors = function (string) { diff --git a/src/server/logging/log_format_string.js b/src/server/logging/log_format_string.js index 7de1ef695ce6a1..544c15691bb9b1 100644 --- a/src/server/logging/log_format_string.js +++ b/src/server/logging/log_format_string.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import ansicolors from 'ansicolors'; import moment from 'moment'; -import LogFormat from './LogFormat'; +import LogFormat from './log_format'; let statuses = [ 'err', diff --git a/src/server/logging/LogReporter.js b/src/server/logging/log_reporter.js similarity index 94% rename from src/server/logging/LogReporter.js rename to src/server/logging/log_reporter.js index b517b931549fb4..db5c1655902e8f 100644 --- a/src/server/logging/LogReporter.js +++ b/src/server/logging/log_reporter.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import LogFormatJson from './LogFormatJson'; +import LogFormatJson from './log_format_json'; import LogFormatString from './log_format_string'; import { Squeeze } from 'good-squeeze'; import { createWriteStream as writeStr } from 'fs'; diff --git a/src/server/plugins/Plugin.js b/src/server/plugins/plugin.js similarity index 88% rename from src/server/plugins/Plugin.js rename to src/server/plugins/plugin.js index 2b504142a86cec..18c7786c157202 100644 --- a/src/server/plugins/Plugin.js +++ b/src/server/plugins/plugin.js @@ -1,9 +1,11 @@ import _ from 'lodash'; import Joi from 'joi'; -import { attempt, fromNode } from 'bluebird'; +import Bluebird, { attempt, fromNode } from 'bluebird'; import { basename, resolve } from 'path'; import { inherits } from 'util'; +const extendInitFns = Symbol('extend plugin initialization'); + const defaultConfigSchema = Joi.object({ enabled: Joi.boolean().default(true) }).default(); @@ -57,6 +59,7 @@ module.exports = class Plugin { this.externalInit = opts.init || _.noop; this.getConfigSchema = opts.config || _.noop; this.init = _.once(this.init); + this[extendInitFns] = []; if (opts.publicDir === false) { this.publicDir = null; @@ -98,14 +101,12 @@ module.exports = class Plugin { let { config } = kbnServer; // setup the hapi register function and get on with it - let register = (server, options, next) => { + const asyncRegister = async (server, options) => { this.server = server; - // bind the server and options to all - // apps created by this plugin - for (let app of this.apps) { - app.getInjectedVars = _.partial(app.getInjectedVars, server, options); - } + await Promise.all(this[extendInitFns].map(async fn => { + await fn.call(this, server, options); + })); server.log(['plugins', 'debug'], { tmpl: 'Initializing plugin <%= plugin.id %>', @@ -119,7 +120,11 @@ module.exports = class Plugin { this.status = kbnServer.status.create(`plugin:${this.id}`); server.expose('status', this.status); - attempt(this.externalInit, [server, options], this).nodeify(next); + return await attempt(this.externalInit, [server, options], this); + }; + + const register = (server, options, next) => { + Bluebird.resolve(asyncRegister(server, options)).nodeify(next); }; register.attributes = { name: id, version: version }; @@ -138,6 +143,10 @@ module.exports = class Plugin { } } + extendInit(fn) { + this[extendInitFns].push(fn); + } + toJSON() { return this.pkg; } diff --git a/src/server/plugins/PluginApi.js b/src/server/plugins/plugin_api.js similarity index 96% rename from src/server/plugins/PluginApi.js rename to src/server/plugins/plugin_api.js index 5514dfd4cea203..bda666f81d5432 100644 --- a/src/server/plugins/PluginApi.js +++ b/src/server/plugins/plugin_api.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import Plugin from './Plugin'; +import Plugin from './plugin'; import { basename, join } from 'path'; module.exports = class PluginApi { diff --git a/src/server/plugins/PluginCollection.js b/src/server/plugins/plugin_collection.js similarity index 92% rename from src/server/plugins/PluginCollection.js rename to src/server/plugins/plugin_collection.js index 40cee339d910eb..6019fd3baf60b7 100644 --- a/src/server/plugins/PluginCollection.js +++ b/src/server/plugins/plugin_collection.js @@ -1,8 +1,8 @@ -import PluginApi from './PluginApi'; +import PluginApi from './plugin_api'; import { inspect } from 'util'; import { get, indexBy } from 'lodash'; -import Collection from '../../utils/Collection'; +import Collection from '../../utils/collection'; let byIdCache = Symbol('byIdCache'); let pluginApis = Symbol('pluginApis'); diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js index 358ef049d8dc8a..07af33f38c98d6 100644 --- a/src/server/plugins/scan.js +++ b/src/server/plugins/scan.js @@ -3,7 +3,7 @@ import { fromNode } from 'bluebird'; import { readdir, stat } from 'fs'; import { resolve } from 'path'; import { each } from 'bluebird'; -import PluginCollection from './PluginCollection'; +import PluginCollection from './plugin_collection'; module.exports = async (kbnServer, server, config) => { var plugins = kbnServer.plugins = new PluginCollection(kbnServer); diff --git a/src/server/status/__tests__/ServerStatus.js b/src/server/status/__tests__/server_status.js similarity index 97% rename from src/server/status/__tests__/ServerStatus.js rename to src/server/status/__tests__/server_status.js index a88f308afa123a..c1c4228bddfa9a 100644 --- a/src/server/status/__tests__/ServerStatus.js +++ b/src/server/status/__tests__/server_status.js @@ -3,8 +3,8 @@ import expect from 'expect.js'; import sinon from 'sinon'; import states from '../states'; -import Status from '../Status'; -import ServerStatus from '../ServerStatus'; +import Status from '../status'; +import ServerStatus from '../server_status'; describe('ServerStatus class', function () { var server; diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/status.js similarity index 76% rename from src/server/status/__tests__/Status.js rename to src/server/status/__tests__/status.js index 56ba7f0757580f..bb550820a0ad59 100644 --- a/src/server/status/__tests__/Status.js +++ b/src/server/status/__tests__/status.js @@ -1,10 +1,9 @@ import expect from 'expect.js'; import sinon from 'sinon'; -import Status from '../Status'; -import ServerStatus from '../ServerStatus'; +import Status from '../status'; +import ServerStatus from '../server_status'; describe('Status class', function () { - var server; var serverStatus; @@ -59,6 +58,34 @@ describe('Status class', function () { expect(json.message).to.eql('Ready'); }); + it('should call on handler if status is already matched', function (done) { + var status = serverStatus.create('test'); + var msg = 'Test Ready'; + status.green(msg); + + status.on('green', function (prev, prevMsg) { + expect(arguments.length).to.equal(2); + expect(prev).to.be('green'); + expect(prevMsg).to.be(msg); + expect(status.message).to.equal(msg); + done(); + }); + }); + + it('should call once handler if status is already matched', function (done) { + var status = serverStatus.create('test'); + var msg = 'Test Ready'; + status.green(msg); + + status.once('green', function (prev, prevMsg) { + expect(arguments.length).to.equal(2); + expect(prev).to.be('green'); + expect(prevMsg).to.be(msg); + expect(status.message).to.equal(msg); + done(); + }); + }); + function testState(color) { it(`should change the state to ${color} when #${color}() is called`, function () { var status = serverStatus.create('test'); diff --git a/src/server/status/index.js b/src/server/status/index.js index add6b1fe065815..c2d73d1c823a59 100644 --- a/src/server/status/index.js +++ b/src/server/status/index.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import ServerStatus from './ServerStatus'; +import ServerStatus from './server_status'; import { join } from 'path'; module.exports = function (kbnServer, server, config) { @@ -21,7 +21,7 @@ module.exports = function (kbnServer, server, config) { }); server.decorate('reply', 'renderStatusPage', function () { - var app = kbnServer.uiExports.getHiddenApp('statusPage'); + var app = kbnServer.uiExports.getHiddenApp('status_page'); var resp = app ? this.renderApp(app) : this(kbnServer.status.toString()); resp.code(kbnServer.status.isGreen() ? 200 : 503); return resp; diff --git a/src/server/status/metrics.js b/src/server/status/metrics.js index af9af67a4c2b26..52b32af19bfcae 100644 --- a/src/server/status/metrics.js +++ b/src/server/status/metrics.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import Samples from './Samples'; +import Samples from './samples'; module.exports = function (kbnServer, server, config) { let lastReport = Date.now(); diff --git a/src/server/status/Samples.js b/src/server/status/samples.js similarity index 100% rename from src/server/status/Samples.js rename to src/server/status/samples.js diff --git a/src/server/status/ServerStatus.js b/src/server/status/server_status.js similarity index 97% rename from src/server/status/ServerStatus.js rename to src/server/status/server_status.js index d9909cffd36883..4fb914ca00980f 100644 --- a/src/server/status/ServerStatus.js +++ b/src/server/status/server_status.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import states from './states'; -import Status from './Status'; +import Status from './status'; module.exports = class ServerStatus { constructor(server) { diff --git a/src/server/status/Status.js b/src/server/status/status.js similarity index 81% rename from src/server/status/Status.js rename to src/server/status/status.js index cc7f0162aa9d6f..929118d08512fa 100644 --- a/src/server/status/Status.js +++ b/src/server/status/status.js @@ -36,6 +36,22 @@ class Status extends EventEmitter { since: this.since }; } + + on(eventName, handler) { + super.on(eventName, handler); + + if (eventName === this.state) { + setImmediate(() => handler(this.state, this.message)); + } + } + + once(eventName, handler) { + if (eventName === this.state) { + setImmediate(() => handler(this.state, this.message)); + } else { + super.once(eventName, handler); + } + } } states.all.forEach(function (state) { diff --git a/src/testUtils/noDigestPromises.js b/src/test_utils/no_digest_promises.js similarity index 92% rename from src/testUtils/noDigestPromises.js rename to src/test_utils/no_digest_promises.js index 02376b5f5fd89d..98ce02c45942ac 100644 --- a/src/testUtils/noDigestPromises.js +++ b/src/test_utils/no_digest_promises.js @@ -8,7 +8,7 @@ Bluebird.longStackTraces(); * replace the Promise service with Bluebird so that tests * can use promises without having to call $rootScope.apply() * - * var noDigestPromises = require('testUtils/noDigestPromises'); + * var noDigestPromises = require('test_utils/no_digest_promises'); * * describe('some module that does complex shit with promises', function () { * beforeEach(noDigestPromises.activate); diff --git a/src/testUtils/simulateKeys.js b/src/test_utils/simulate_keys.js similarity index 100% rename from src/testUtils/simulateKeys.js rename to src/test_utils/simulate_keys.js diff --git a/src/testUtils/stub_index_pattern.js b/src/test_utils/stub_index_pattern.js similarity index 97% rename from src/testUtils/stub_index_pattern.js rename to src/test_utils/stub_index_pattern.js index 48311a8a1a7149..7d5f2624c15c05 100644 --- a/src/testUtils/stub_index_pattern.js +++ b/src/test_utils/stub_index_pattern.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'sinon'; import Promise from 'bluebird'; -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; import IndexPattern from 'ui/index_patterns/_index_pattern'; import formatHit from 'ui/index_patterns/_format_hit'; import getComputedFields from 'ui/index_patterns/_get_computed_fields'; diff --git a/src/ui/__tests__/fixtures/plugin_async_foo/index.js b/src/ui/__tests__/fixtures/plugin_async_foo/index.js new file mode 100644 index 00000000000000..a0cd8887bbed0e --- /dev/null +++ b/src/ui/__tests__/fixtures/plugin_async_foo/index.js @@ -0,0 +1,18 @@ +import Bluebird from 'bluebird'; + +export default kibana => new kibana.Plugin({ + config(Joi) { + return Joi.object().keys({ + enabled: Joi.boolean().default(true), + delay: Joi.number().required(), + shared: Joi.string(), + }).default(); + }, + + uiExports: { + async injectDefaultVars(server, options) { + await Bluebird.delay(options.delay); + return { shared: options.shared }; + } + } +}); diff --git a/src/ui/__tests__/fixtures/plugin_async_foo/package.json b/src/ui/__tests__/fixtures/plugin_async_foo/package.json new file mode 100644 index 00000000000000..4ad7dda995ca52 --- /dev/null +++ b/src/ui/__tests__/fixtures/plugin_async_foo/package.json @@ -0,0 +1,4 @@ +{ + "name": "plugin_async_foo", + "version": "0.0.0" +} diff --git a/src/ui/__tests__/fixtures/plugin_bar/index.js b/src/ui/__tests__/fixtures/plugin_bar/index.js new file mode 100644 index 00000000000000..59c5556444496c --- /dev/null +++ b/src/ui/__tests__/fixtures/plugin_bar/index.js @@ -0,0 +1,14 @@ +export default kibana => new kibana.Plugin({ + config(Joi) { + return Joi.object().keys({ + enabled: Joi.boolean().default(true), + shared: Joi.string() + }).default(); + }, + + uiExports: { + injectDefaultVars(server, options) { + return { shared: options.shared }; + } + } +}); diff --git a/src/plugins/testsBundle/package.json b/src/ui/__tests__/fixtures/plugin_bar/package.json similarity index 50% rename from src/plugins/testsBundle/package.json rename to src/ui/__tests__/fixtures/plugin_bar/package.json index 0b7104a0c3f341..bfc5da01822660 100644 --- a/src/plugins/testsBundle/package.json +++ b/src/ui/__tests__/fixtures/plugin_bar/package.json @@ -1,4 +1,4 @@ { - "name": "testsBundle", + "name": "plugin_bar", "version": "0.0.0" } diff --git a/src/ui/__tests__/fixtures/plugin_foo/index.js b/src/ui/__tests__/fixtures/plugin_foo/index.js new file mode 100644 index 00000000000000..59c5556444496c --- /dev/null +++ b/src/ui/__tests__/fixtures/plugin_foo/index.js @@ -0,0 +1,14 @@ +export default kibana => new kibana.Plugin({ + config(Joi) { + return Joi.object().keys({ + enabled: Joi.boolean().default(true), + shared: Joi.string() + }).default(); + }, + + uiExports: { + injectDefaultVars(server, options) { + return { shared: options.shared }; + } + } +}); diff --git a/src/ui/__tests__/fixtures/plugin_foo/package.json b/src/ui/__tests__/fixtures/plugin_foo/package.json new file mode 100644 index 00000000000000..6a73b89110ae97 --- /dev/null +++ b/src/ui/__tests__/fixtures/plugin_foo/package.json @@ -0,0 +1,4 @@ +{ + "name": "plugin_foo", + "version": "0.0.0" +} diff --git a/src/ui/__tests__/ui_exports.js b/src/ui/__tests__/ui_exports.js index 678d88d8398359..adf561822e947c 100644 --- a/src/ui/__tests__/ui_exports.js +++ b/src/ui/__tests__/ui_exports.js @@ -1,6 +1,8 @@ import expect from 'expect.js'; +import { resolve } from 'path'; import UiExports from '../ui_exports'; +import * as kbnTestServer from '../../../test/utils/kbn_server'; describe('UiExports', function () { describe('#find()', function () { @@ -23,4 +25,83 @@ describe('UiExports', function () { expect(uiExports.find(['foo', 'bar'])).to.eql(['a', 'b', 'c']); }); }); +// + describe('#defaultInjectedVars', function () { + context('two plugins, two sync', function () { + this.slow(10000); + this.timeout(60000); + + let kbnServer; + before(async function () { + kbnServer = kbnTestServer.createServer({ + plugins: { + paths: [ + resolve(__dirname, 'fixtures/plugin_bar'), + resolve(__dirname, 'fixtures/plugin_foo') + ] + }, + + plugin_foo: { + shared: 'foo' + }, + + plugin_bar: { + shared: 'bar' + } + }); + + await kbnServer.ready(); + }); + + after(async function () { + await kbnServer.close(); + }); + + it('merges the two plugins in the order they are loaded', function () { + expect(kbnServer.uiExports.defaultInjectedVars).to.eql({ + shared: 'foo' + }); + }); + }); + + context('two plugins, one async', function () { + this.slow(10000); + this.timeout(60000); + + let kbnServer; + before(async function () { + kbnServer = kbnTestServer.createServer({ + plugins: { + scanDirs: [], + paths: [ + resolve(__dirname, 'fixtures/plugin_async_foo'), + resolve(__dirname, 'fixtures/plugin_foo') + ] + }, + + plugin_async_foo: { + delay: 500, + shared: 'foo' + }, + + plugin_bar: { + shared: 'bar' + } + }); + + await kbnServer.ready(); + }); + + after(async function () { + await kbnServer.close(); + }); + + it('merges the two plugins in the order they are loaded', function () { + // even though plugin_async_foo loads 500ms later, it is still "first" to merge + expect(kbnServer.uiExports.defaultInjectedVars).to.eql({ + shared: 'foo' + }); + }); + }); + }); }); diff --git a/src/ui/index.js b/src/ui/index.js index 28b1fc267f1a8d..b6a8350f543231 100644 --- a/src/ui/index.js +++ b/src/ui/index.js @@ -3,7 +3,7 @@ import { readFileSync as readFile } from 'fs'; import { defaults } from 'lodash'; import Boom from 'boom'; import { resolve } from 'path'; -import fromRoot from '../utils/fromRoot'; +import fromRoot from '../utils/from_root'; import UiExports from './ui_exports'; import UiBundle from './ui_bundle'; import UiBundleCollection from './ui_bundle_collection'; @@ -59,16 +59,6 @@ module.exports = async (kbnServer, server, config) => { } }); - const defaultInjectedVars = {}; - if (config.has('kibana')) { - defaultInjectedVars.kbnIndex = config.get('kibana.index'); - } - if (config.has('elasticsearch')) { - defaultInjectedVars.esRequestTimeout = config.get('elasticsearch.requestTimeout'); - defaultInjectedVars.esShardTimeout = config.get('elasticsearch.shardTimeout'); - defaultInjectedVars.esApiVersion = config.get('elasticsearch.apiVersion'); - } - server.decorate('reply', 'renderApp', function (app) { const payload = { app: app, @@ -77,7 +67,7 @@ module.exports = async (kbnServer, server, config) => { buildNum: config.get('pkg.buildNum'), buildSha: config.get('pkg.buildSha'), basePath: config.get('server.basePath'), - vars: defaults(app.getInjectedVars() || {}, defaultInjectedVars), + vars: defaults(app.getInjectedVars() || {}, uiExports.defaultInjectedVars), }; return this.view(app.templateName, { diff --git a/src/ui/public/Vis/__tests__/index.js b/src/ui/public/Vis/__tests__/index.js deleted file mode 100644 index f6facc7fbcfcf9..00000000000000 --- a/src/ui/public/Vis/__tests__/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import './_AggConfig'; -import './_AggConfigResult'; -import './_AggConfigs'; -import './_Vis'; -describe('Vis Component', function () { -}); diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js index 914f0f2036f1ab..dffaa87e2b66cf 100644 --- a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js +++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import FixturesAggRespGeohashGridProvider from 'fixtures/agg_resp/geohash_grid'; import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; diff --git a/src/ui/public/agg_response/geo_json/geo_json.js b/src/ui/public/agg_response/geo_json/geo_json.js index e5a9d11bb364f2..c0e0b9b52e4b7f 100644 --- a/src/ui/public/agg_response/geo_json/geo_json.js +++ b/src/ui/public/agg_response/geo_json/geo_json.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import rowsToFeatures from 'ui/agg_response/geo_json/rowsToFeatures'; +import rowsToFeatures from 'ui/agg_response/geo_json/rows_to_features'; import AggResponseGeoJsonTooltipFormatterProvider from 'ui/agg_response/geo_json/_tooltip_formatter'; export default function TileMapConverterFn(Private, timefilter, $compile, $rootScope) { diff --git a/src/ui/public/agg_response/geo_json/rowsToFeatures.js b/src/ui/public/agg_response/geo_json/rows_to_features.js similarity index 96% rename from src/ui/public/agg_response/geo_json/rowsToFeatures.js rename to src/ui/public/agg_response/geo_json/rows_to_features.js index b80ef6086673a1..6c65e09ab35b1c 100644 --- a/src/ui/public/agg_response/geo_json/rowsToFeatures.js +++ b/src/ui/public/agg_response/geo_json/rows_to_features.js @@ -1,5 +1,5 @@ import decodeGeoHash from 'ui/utils/decode_geo_hash'; -import AggConfigResult from 'ui/Vis/AggConfigResult'; +import AggConfigResult from 'ui/vis/agg_config_result'; import _ from 'lodash'; function getAcr(val) { diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js index dc444ce6500408..68e258ba1d06b9 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js @@ -3,9 +3,9 @@ import _ from 'lodash'; import fixtures from 'fixtures/fake_hierarchical_data'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigsProvider from 'ui/Vis/AggConfigs'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigsProvider from 'ui/vis/agg_configs'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggResponseHierarchicalBuildHierarchicalDataProvider from 'ui/agg_response/hierarchical/build_hierarchical_data'; diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js index fcf386cc73109c..2f89a7697bc939 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js @@ -4,9 +4,9 @@ import fixtures from 'fixtures/fake_hierarchical_data'; import createRawData from 'ui/agg_response/hierarchical/_create_raw_data'; import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_list'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigsProvider from 'ui/Vis/AggConfigs'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigsProvider from 'ui/vis/agg_configs'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; var AggConfigs; diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js index 3e524f7c7517b4..b40f7a7de90530 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseHierarchicalTransformAggregationProvider from 'ui/agg_response/hierarchical/_transform_aggregation'; describe('buildHierarchicalData()', function () { diff --git a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js index 199a2fcd0b1785..6078989cd13b3e 100644 --- a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js +++ b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets'; -import AggConfigResult from 'ui/Vis/AggConfigResult'; +import AggConfigResult from 'ui/vis/agg_config_result'; export default function transformAggregationProvider(Private) { return function transformAggregation(agg, metric, aggData, parent) { return _.map(extractBuckets(aggData, agg), function (bucket) { diff --git a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js index fe58f2f19dff52..7c64f4285c65a8 100644 --- a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js +++ b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets'; import createRawData from 'ui/agg_response/hierarchical/_create_raw_data'; import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_list'; -import AggConfigResult from 'ui/Vis/AggConfigResult'; +import AggConfigResult from 'ui/vis/agg_config_result'; import AggResponseHierarchicalBuildSplitProvider from 'ui/agg_response/hierarchical/_build_split'; import AggResponseHierarchicalHierarchicalTooltipFormatterProvider from 'ui/agg_response/hierarchical/_hierarchical_tooltip_formatter'; export default function buildHierarchicalDataProvider(Private, Notifier) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js index 4fdb81c605ae76..483765e37e74ab 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js +++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js @@ -1,5 +1,5 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri'; describe('addToSiri', function () { var addToSiri; diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js index d98b80b3a17726..5447589c8178bd 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js +++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js @@ -1,8 +1,8 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; -import AggTypesAggTypeProvider from 'ui/agg_types/AggType'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; +import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; import AggResponsePointSeriesFakeXAspectProvider from 'ui/agg_response/point_series/_fake_x_aspect'; describe('makeFakeXAspect', function () { diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js index 6e0ed60cacb34f..551484c84a79cd 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js @@ -1,10 +1,10 @@ import _ from 'lodash'; import moment from 'moment'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import AggResponsePointSeriesGetAspectsProvider from 'ui/agg_response/point_series/_get_aspects'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('getAspects', function () { diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js index 90c69d46d9b036..173d68a8983ef0 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_point.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesGetPointProvider from 'ui/agg_response/point_series/_get_point'; describe('getPoint', function () { diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js index 07939ac0f3b34e..ce2d4506e6a158 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_series.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesGetSeriesProvider from 'ui/agg_response/point_series/_get_series'; describe('getSeries', function () { var getSeries; diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js index dc1b9ab27684d6..4a00b2b5beb6e1 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesInitXAxisProvider from 'ui/agg_response/point_series/_init_x_axis'; describe('initXAxis', function () { diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js index c15a4aa3147424..5c42090963b3ff 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesInitYAxisProvider from 'ui/agg_response/point_series/_init_y_axis'; describe('initYAxis', function () { diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js index e8ab322b893959..9563f397e27d75 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_main.js +++ b/src/ui/public/agg_response/point_series/__tests__/_main.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import moment from 'moment'; -import AggConfigResult from 'ui/Vis/AggConfigResult'; +import AggConfigResult from 'ui/vis/agg_config_result'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggResponsePointSeriesPointSeriesProvider from 'ui/agg_response/point_series/point_series'; diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js index 040ee2ddce21ee..8becee118e43be 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js @@ -2,7 +2,7 @@ import moment from 'moment'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesOrderedDateAxisProvider from 'ui/agg_response/point_series/_ordered_date_axis'; describe('orderedDateAxis', function () { diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js index 3bd12d0298c9ba..16ccb6eb78b0a9 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js +++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import $ from 'jquery'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponsePointSeriesTooltipFormatterProvider from 'ui/agg_response/point_series/_tooltip_formatter'; describe('tooltipFormatter', function () { diff --git a/src/ui/public/agg_response/point_series/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/_fake_x_aspect.js index 52bdc510daf646..a88978181b087d 100644 --- a/src/ui/public/agg_response/point_series/_fake_x_aspect.js +++ b/src/ui/public/agg_response/point_series/_fake_x_aspect.js @@ -1,5 +1,5 @@ -import VisAggConfigProvider from 'ui/Vis/AggConfig'; -import AggTypesAggTypeProvider from 'ui/agg_types/AggType'; +import VisAggConfigProvider from 'ui/vis/agg_config'; +import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; export default function PointSeriesFakeXAxis(Private) { var AggConfig = Private(VisAggConfigProvider); diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js index c6ce328e166a1f..6b2747ebf93bc3 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js +++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js @@ -1,5 +1,5 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets'; describe('Buckets wrapper', function () { var Buckets; diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js index 4af94e212f284b..a542c35b1470cf 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js +++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_columns'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('get columns', function () { var getColumns; diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js index b686d30ac5f46d..b8c4816c06e5df 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_integration.js +++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import fixtures from 'fixtures/fake_hierarchical_data'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('tabifyAggResponse Integration', function () { diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js index d325a51f739ece..e613da98ee551a 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js +++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js @@ -1,12 +1,12 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_response_writer'; import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group'; import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets'; import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('ResponseWriter class', function () { diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js index ea734c967c3279..c3f9aa9f734f21 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table'; describe('Table class', function () { diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js index f37756dd75ae54..5c4cd7f5158677 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js @@ -1,5 +1,5 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group'; describe('Table Group class', function () { var TableGroup; diff --git a/src/ui/public/agg_response/tabify/_get_columns.js b/src/ui/public/agg_response/tabify/_get_columns.js index aae442938a8e0d..1ddda56b14179e 100644 --- a/src/ui/public/agg_response/tabify/_get_columns.js +++ b/src/ui/public/agg_response/tabify/_get_columns.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import VisAggConfigProvider from 'ui/vis/agg_config'; export default function GetColumnsProvider(Private) { var AggConfig = Private(VisAggConfigProvider); diff --git a/src/ui/public/agg_response/tabify/_response_writer.js b/src/ui/public/agg_response/tabify/_response_writer.js index 2e629ae3b6ba3a..be27f4518dc934 100644 --- a/src/ui/public/agg_response/tabify/_response_writer.js +++ b/src/ui/public/agg_response/tabify/_response_writer.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import AggConfigResult from 'ui/Vis/AggConfigResult'; +import AggConfigResult from 'ui/vis/agg_config_result'; import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table'; import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group'; import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_columns'; diff --git a/src/ui/public/agg_response/tabify/tabify.js b/src/ui/public/agg_response/tabify/tabify.js index 8b5d35a7b01600..a74a340dc52e88 100644 --- a/src/ui/public/agg_response/tabify/tabify.js +++ b/src/ui/public/agg_response/tabify/tabify.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_response_writer'; import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets'; export default function tabifyAggResponseProvider(Private, Notifier) { diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js index bbc8bc4bd869c9..1c36a062c78526 100644 --- a/src/ui/public/agg_table/__tests__/_group.js +++ b/src/ui/public/agg_table/__tests__/_group.js @@ -1,11 +1,11 @@ import _ from 'lodash'; import $ from 'jquery'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import fixtures from 'fixtures/fake_hierarchical_data'; import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; describe('AggTableGroup Directive', function () { var $rootScope; diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js index f5a385bf49976f..b3519a8cb642bf 100644 --- a/src/ui/public/agg_table/__tests__/_table.js +++ b/src/ui/public/agg_table/__tests__/_table.js @@ -1,12 +1,12 @@ import _ from 'lodash'; import $ from 'jquery'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import fixtures from 'fixtures/fake_hierarchical_data'; import sinon from 'auto-release-sinon'; import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; describe('AggTable Directive', function () { var $rootScope; diff --git a/src/ui/public/agg_types/__tests__/AggParamWriter.js b/src/ui/public/agg_types/__tests__/agg_param_writer.js similarity index 99% rename from src/ui/public/agg_types/__tests__/AggParamWriter.js rename to src/ui/public/agg_types/__tests__/agg_param_writer.js index 4ff401f28b2c03..ed9a12c043a065 100644 --- a/src/ui/public/agg_types/__tests__/AggParamWriter.js +++ b/src/ui/public/agg_types/__tests__/agg_param_writer.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import AggTypesIndexProvider from 'ui/agg_types/index'; import RegistryVisTypesProvider from 'ui/registry/vis_types'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; diff --git a/src/ui/public/agg_types/__tests__/AggParams.js b/src/ui/public/agg_types/__tests__/agg_params.js similarity index 97% rename from src/ui/public/agg_types/__tests__/AggParams.js rename to src/ui/public/agg_types/__tests__/agg_params.js index 45d28dfe0d8510..0fca03b0dda346 100644 --- a/src/ui/public/agg_types/__tests__/AggParams.js +++ b/src/ui/public/agg_types/__tests__/agg_params.js @@ -1,7 +1,7 @@ import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; -import AggTypesAggParamsProvider from 'ui/agg_types/AggParams'; +import AggTypesAggParamsProvider from 'ui/agg_types/agg_params'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field'; import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned'; diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/agg_type.js similarity index 95% rename from src/ui/public/agg_types/__tests__/AggType.js rename to src/ui/public/agg_types/__tests__/agg_type.js index 5af85a362e33f1..ab8b774cc57d3f 100644 --- a/src/ui/public/agg_types/__tests__/AggType.js +++ b/src/ui/public/agg_types/__tests__/agg_type.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'auto-release-sinon'; import 'ui/private'; -import AggParamsPM from 'ui/agg_types/AggParams'; -import VisProvider from 'ui/Vis'; +import AggParamsPM from 'ui/agg_types/agg_params'; +import VisProvider from 'ui/vis'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; -import AggTypesAggTypeProvider from 'ui/agg_types/AggType'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('AggType Class', function () { var AggType; diff --git a/src/ui/public/agg_types/__tests__/bucketCountBetween.js b/src/ui/public/agg_types/__tests__/bucket_count_between.js similarity index 97% rename from src/ui/public/agg_types/__tests__/bucketCountBetween.js rename to src/ui/public/agg_types/__tests__/bucket_count_between.js index 67fdddc537fe73..34b62e6a98f7e1 100644 --- a/src/ui/public/agg_types/__tests__/bucketCountBetween.js +++ b/src/ui/public/agg_types/__tests__/bucket_count_between.js @@ -1,11 +1,11 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import RegistryVisTypesProvider from 'ui/registry/vis_types'; import AggTypesIndexProvider from 'ui/agg_types/index'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between'; describe('bucketCountBetween util', function () { var indexPattern; diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js index 0aa6a3122bd5bb..8127a5eb0221c7 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggTypesIndexProvider from 'ui/agg_types/index'; -import AggParamWriterProvider from '../AggParamWriter'; +import AggParamWriterProvider from '../agg_param_writer'; describe('Histogram Agg', function () { describe('ordered', function () { @@ -82,6 +82,7 @@ describe('Histogram Agg', function () { describe('extended_bounds', function () { it('writes when only eb.min is set', function () { var output = paramWriter.write({ + min_doc_count: true, extended_bounds: { min: 0 } }); expect(output.params.extended_bounds).to.have.property('min', 0); @@ -90,6 +91,7 @@ describe('Histogram Agg', function () { it('writes when only eb.max is set', function () { var output = paramWriter.write({ + min_doc_count: true, extended_bounds: { max: 0 } }); expect(output.params.extended_bounds).to.have.property('min', undefined); @@ -98,6 +100,7 @@ describe('Histogram Agg', function () { it('writes when both eb.min and eb.max are set', function () { var output = paramWriter.write({ + min_doc_count: true, extended_bounds: { min: 99, max: 100 } }); expect(output.params.extended_bounds).to.have.property('min', 99); @@ -106,10 +109,19 @@ describe('Histogram Agg', function () { it('does not write when nothing is set', function () { var output = paramWriter.write({ + min_doc_count: true, extended_bounds: {} }); expect(output.params).to.not.have.property('extended_bounds'); }); + + it('does not write when min_doc_count is false', function () { + var output = paramWriter.write({ + min_doc_count: false, + extended_bounds: { min: 99, max: 100 } + }); + expect(output.params).to.not.have.property('extended_bounds'); + }); }); }); }); diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js index bc80276961b96f..5c85afeb0d907d 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/_range.js @@ -1,10 +1,10 @@ import { values } from 'lodash'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import resp from 'fixtures/agg_resp/range'; import AggTypesIndexProvider from 'ui/agg_types/index'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; describe('Range Agg', function () { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js index 5ffc20e4e81f92..3392cb413dbb5f 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js @@ -2,9 +2,9 @@ import _ from 'lodash'; import moment from 'moment'; import sinon from 'auto-release-sinon'; import aggResp from 'fixtures/agg_resp/date_histogram'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterDateHistogramProvider from 'ui/agg_types/buckets/create_filter/date_histogram'; import TimeBucketsProvider from 'ui/time_buckets'; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js index 55b37c2001ab85..5fe8ef92b2b60c 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js @@ -1,9 +1,9 @@ import moment from 'moment'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterDateRangeProvider from 'ui/agg_types/buckets/create_filter/date_range'; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js index 1694908238cd69..6f63705a97d333 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/create_filter/filters'; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js index 9cb00383b49f05..e807bd8a7e1961 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/create_filter/histogram'; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js index e394b19345cfd9..6984e0725b7e75 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterIpRangeProvider from 'ui/agg_types/buckets/create_filter/ip_range'; describe('AggConfig Filters', function () { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js index d5fb7013adad9d..841996b1375600 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/create_filter/range'; describe('AggConfig Filters', function () { diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js index e6c636afe900a0..f5a27342d5465f 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms'; describe('AggConfig Filters', function () { diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js index 18a5d0ff37cf49..5261b02e9ebd39 100644 --- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js +++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import $ from 'jquery'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import AggTypesBucketsIntervalOptionsProvider from 'ui/agg_types/buckets/_interval_options'; describe('editor', function () { diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js index 406e0484313c99..ae870c5f3c0647 100644 --- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js +++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js @@ -1,11 +1,11 @@ import _ from 'lodash'; import moment from 'moment'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import AggParamWriterProvider from '../../AggParamWriter'; +import ngMock from 'ng_mock'; +import AggParamWriterProvider from '../../agg_param_writer'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesIndexProvider from 'ui/agg_types/index'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import VisAggConfigProvider from 'ui/vis/agg_config'; describe('params', function () { var paramWriter; diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js index 8b1e0be98305d1..c73649b67937b3 100644 --- a/src/ui/public/agg_types/__tests__/controls/number_list.js +++ b/src/ui/public/agg_types/__tests__/controls/number_list.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import _ from 'lodash'; import expect from 'expect.js'; -import simulateKeys from 'testUtils/simulateKeys'; -import ngMock from 'ngMock'; +import simulateKeys from 'test_utils/simulate_keys'; +import ngMock from 'ng_mock'; import 'ui/number_list'; describe('NumberList directive', function () { diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js index a180083ae82c05..8ceb3c95e9f9f0 100644 --- a/src/ui/public/agg_types/__tests__/index.js +++ b/src/ui/public/agg_types/__tests__/index.js @@ -1,13 +1,13 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import './AggType'; -import './AggParams'; -import './bucketCountBetween'; +import ngMock from 'ng_mock'; +import './agg_type'; +import './agg_params'; +import './bucket_count_between'; import './buckets/_histogram'; import './buckets/_range'; import AggTypesIndexProvider from 'ui/agg_types/index'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; describe('AggTypesComponent', function () { diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js index 19c993cca8e901..b0eb534a961fb1 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js +++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import VisProvider from 'ui/Vis'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; +import ngMock from 'ng_mock'; +import VisProvider from 'ui/vis'; +import VisAggConfigProvider from 'ui/vis/agg_config'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import AggTypesParamTypesCalculateIntervalProvider from 'ui/agg_types/param_types/_calculate_interval'; diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js index 2ffff305145834..019d336d8d9bf3 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_field.js +++ b/src/ui/public/agg_types/__tests__/param_types/_field.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field'; describe('Field', function () { diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js index 8404b16f75945b..d4d6c7e711a24f 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js +++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned'; describe('Optioned', function () { diff --git a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js index af69dfefd2bcce..fbfb6a61d94932 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js +++ b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesRawJsonProvider from 'ui/agg_types/param_types/raw_json'; diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js index 9f89bc6a3e9e36..5aea856e74845e 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_regex.js +++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesRegexProvider from 'ui/agg_types/param_types/regex'; -import VisProvider from 'ui/Vis'; +import VisProvider from 'ui/vis'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('Regex', function () { diff --git a/src/ui/public/agg_types/__tests__/param_types/_string.js b/src/ui/public/agg_types/__tests__/param_types/_string.js index 26f71d9fbc7dc2..f6d8629ca72e1d 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_string.js +++ b/src/ui/public/agg_types/__tests__/param_types/_string.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; import AggTypesParamTypesStringProvider from 'ui/agg_types/param_types/string'; diff --git a/src/ui/public/agg_types/AggParams.js b/src/ui/public/agg_types/agg_params.js similarity index 98% rename from src/ui/public/agg_types/AggParams.js rename to src/ui/public/agg_types/agg_params.js index 1cb60963eef755..1c5aa3a52e3281 100644 --- a/src/ui/public/agg_types/AggParams.js +++ b/src/ui/public/agg_types/agg_params.js @@ -1,6 +1,6 @@ import 'ui/filters/label'; import _ from 'lodash'; -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field'; import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned'; import AggTypesParamTypesRegexProvider from 'ui/agg_types/param_types/regex'; diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/agg_type.js similarity index 98% rename from src/ui/public/agg_types/AggType.js rename to src/ui/public/agg_types/agg_type.js index 92e53ef7969a33..d262d507766482 100644 --- a/src/ui/public/agg_types/AggType.js +++ b/src/ui/public/agg_types/agg_type.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import AggTypesAggParamsProvider from 'ui/agg_types/AggParams'; +import AggTypesAggParamsProvider from 'ui/agg_types/agg_params'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; export default function AggTypeFactory(Private) { var AggParams = Private(AggTypesAggParamsProvider); diff --git a/src/ui/public/agg_types/buckets/_bucket_agg_type.js b/src/ui/public/agg_types/buckets/_bucket_agg_type.js index 830cd635fbee1a..d47006baa55ed8 100644 --- a/src/ui/public/agg_types/buckets/_bucket_agg_type.js +++ b/src/ui/public/agg_types/buckets/_bucket_agg_type.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import AggTypesAggTypeProvider from 'ui/agg_types/AggType'; +import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; export default function BucketAggTypeProvider(Private) { var AggType = Private(AggTypesAggTypeProvider); diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js index c28fe940afa0e2..d71e36bf09a9b4 100644 --- a/src/ui/public/agg_types/buckets/create_filter/ip_range.js +++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js @@ -1,4 +1,4 @@ -import CidrMask from 'ui/utils/CidrMask'; +import CidrMask from 'ui/utils/cidr_mask'; import buildRangeFilter from 'ui/filter_manager/lib/range'; export default function createIpRangeFilterProvider() { return function (aggConfig, key) { diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js index cd4c988a249d4e..485ce7e664d09e 100644 --- a/src/ui/public/agg_types/buckets/date_histogram.js +++ b/src/ui/public/agg_types/buckets/date_histogram.js @@ -2,7 +2,7 @@ import { jstz as tzDetect } from 'jstimezonedetect'; import _ from 'lodash'; import moment from 'moment'; import 'ui/filters/field_type'; -import 'ui/validateDateInterval'; +import 'ui/validate_date_interval'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; import TimeBucketsProvider from 'ui/time_buckets'; import AggTypesBucketsCreateFilterDateHistogramProvider from 'ui/agg_types/buckets/create_filter/date_histogram'; diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js index b5f5fd4c01e3a6..af54504c8fa311 100644 --- a/src/ui/public/agg_types/buckets/filters.js +++ b/src/ui/public/agg_types/buckets/filters.js @@ -2,12 +2,12 @@ import _ from 'lodash'; import angular from 'angular'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/create_filter/filters'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; +import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; import filtersTemplate from 'ui/agg_types/controls/filters.html'; export default function FiltersAggDefinition(Private, Notifier) { var BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider); var createFilter = Private(AggTypesBucketsCreateFilterFiltersProvider); - var decorateQuery = Private(CourierDataSourceDecorateQueryProvider); + var decorateQuery = Private(DecorateQueryProvider); var notif = new Notifier({ location: 'Filters Agg' }); return new BucketAggType({ diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js index 14d292444b8349..c580625793e8e7 100644 --- a/src/ui/public/agg_types/buckets/histogram.js +++ b/src/ui/public/agg_types/buckets/histogram.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import moment from 'moment'; -import 'ui/validateDateInterval'; +import 'ui/validate_date_interval'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/create_filter/histogram'; import intervalTemplate from 'ui/agg_types/controls/interval.html'; @@ -51,7 +51,7 @@ export default function HistogramAggDefinition(Private) { write: function (aggConfig, output) { var val = aggConfig.params.extended_bounds; - if (val.min != null || val.max != null) { + if (aggConfig.params.min_doc_count && (val.min != null || val.max != null)) { output.params.extended_bounds = { min: val.min, max: val.max diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js index 91c32da44f5b21..7bddefcf025133 100644 --- a/src/ui/public/agg_types/buckets/range.js +++ b/src/ui/public/agg_types/buckets/range.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/create_filter/range'; -import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat'; -import RangeKeyProvider from './RangeKey'; +import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; +import RangeKeyProvider from './range_key'; import rangesTemplate from 'ui/agg_types/controls/ranges.html'; export default function RangeAggDefinition(Private) { var BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider); diff --git a/src/ui/public/agg_types/buckets/RangeKey.js b/src/ui/public/agg_types/buckets/range_key.js similarity index 100% rename from src/ui/public/agg_types/buckets/RangeKey.js rename to src/ui/public/agg_types/buckets/range_key.js diff --git a/src/ui/public/agg_types/buckets/terms.js b/src/ui/public/agg_types/buckets/terms.js index af59b91b94cc57..acc74d7cf2f469 100644 --- a/src/ui/public/agg_types/buckets/terms.js +++ b/src/ui/public/agg_types/buckets/terms.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between'; -import VisAggConfigProvider from 'ui/Vis/AggConfig'; -import VisSchemasProvider from 'ui/Vis/Schemas'; +import VisAggConfigProvider from 'ui/vis/agg_config'; +import VisSchemasProvider from 'ui/vis/schemas'; import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms'; import orderAggTemplate from 'ui/agg_types/controls/order_agg.html'; import orderAndSizeTemplate from 'ui/agg_types/controls/order_and_size.html'; diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js index 0706370303098c..dafc04b8245a78 100644 --- a/src/ui/public/agg_types/index.js +++ b/src/ui/public/agg_types/index.js @@ -1,12 +1,12 @@ -import IndexedArray from 'ui/IndexedArray'; -import 'ui/agg_types/AggParams'; +import IndexedArray from 'ui/indexed_array'; +import 'ui/agg_types/agg_params'; import AggTypesMetricsCountProvider from 'ui/agg_types/metrics/count'; import AggTypesMetricsAvgProvider from 'ui/agg_types/metrics/avg'; import AggTypesMetricsSumProvider from 'ui/agg_types/metrics/sum'; import AggTypesMetricsMedianProvider from 'ui/agg_types/metrics/median'; import AggTypesMetricsMinProvider from 'ui/agg_types/metrics/min'; import AggTypesMetricsMaxProvider from 'ui/agg_types/metrics/max'; -import AggTypesMetricsStdDeviationProvider from 'ui/agg_types/metrics/stdDeviation'; +import AggTypesMetricsStdDeviationProvider from 'ui/agg_types/metrics/std_deviation'; import AggTypesMetricsCardinalityProvider from 'ui/agg_types/metrics/cardinality'; import AggTypesMetricsPercentilesProvider from 'ui/agg_types/metrics/percentiles'; import AggTypesMetricsPercentileRanksProvider from 'ui/agg_types/metrics/percentile_ranks'; diff --git a/src/ui/public/agg_types/metrics/avg.js b/src/ui/public/agg_types/metrics/avg.js index 970336f3019d2f..e70c3b775408c4 100644 --- a/src/ui/public/agg_types/metrics/avg.js +++ b/src/ui/public/agg_types/metrics/avg.js @@ -1,4 +1,4 @@ -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; export default function AggTypeMetricAvgProvider(Private) { var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider); diff --git a/src/ui/public/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js index a50100a4f165ed..0cce5b7ab1be7b 100644 --- a/src/ui/public/agg_types/metrics/cardinality.js +++ b/src/ui/public/agg_types/metrics/cardinality.js @@ -1,4 +1,4 @@ -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; export default function AggTypeMetricCardinalityProvider(Private) { diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js index 571fe05fada34b..ec9d2d37008f4c 100644 --- a/src/ui/public/agg_types/metrics/count.js +++ b/src/ui/public/agg_types/metrics/count.js @@ -1,4 +1,4 @@ -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; export default function AggTypeMetricCountProvider(Private) { diff --git a/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js b/src/ui/public/agg_types/metrics/get_response_agg_config_class.js similarity index 100% rename from src/ui/public/agg_types/metrics/getResponseAggConfigClass.js rename to src/ui/public/agg_types/metrics/get_response_agg_config_class.js diff --git a/src/ui/public/agg_types/metrics/max.js b/src/ui/public/agg_types/metrics/max.js index b40d95dc97355a..70e893f0b869f1 100644 --- a/src/ui/public/agg_types/metrics/max.js +++ b/src/ui/public/agg_types/metrics/max.js @@ -1,4 +1,4 @@ -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; export default function AggTypeMetricMaxProvider(Private) { var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider); diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js index c175e300f579d7..1f6273e1def5b0 100644 --- a/src/ui/public/agg_types/metrics/median.js +++ b/src/ui/public/agg_types/metrics/median.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; -import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; +import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class'; import AggTypesMetricsPercentilesProvider from 'ui/agg_types/metrics/percentiles'; export default function AggTypeMetricMaxProvider(Private) { var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider); diff --git a/src/ui/public/agg_types/metrics/MetricAggType.js b/src/ui/public/agg_types/metrics/metric_agg_type.js similarity index 96% rename from src/ui/public/agg_types/metrics/MetricAggType.js rename to src/ui/public/agg_types/metrics/metric_agg_type.js index 7e3cfe4b177ca8..1d435accefe359 100644 --- a/src/ui/public/agg_types/metrics/MetricAggType.js +++ b/src/ui/public/agg_types/metrics/metric_agg_type.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import AggTypesAggTypeProvider from 'ui/agg_types/AggType'; +import AggTypesAggTypeProvider from 'ui/agg_types/agg_type'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; export default function MetricAggTypeProvider(Private) { var AggType = Private(AggTypesAggTypeProvider); diff --git a/src/ui/public/agg_types/metrics/min.js b/src/ui/public/agg_types/metrics/min.js index 4ab6242d484962..fd31dbd3dff588 100644 --- a/src/ui/public/agg_types/metrics/min.js +++ b/src/ui/public/agg_types/metrics/min.js @@ -1,4 +1,4 @@ -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; export default function AggTypeMetricMinProvider(Private) { var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider); diff --git a/src/ui/public/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js index 3634d0ed5e8da5..f0e6147a6c7051 100644 --- a/src/ui/public/agg_types/metrics/percentile_ranks.js +++ b/src/ui/public/agg_types/metrics/percentile_ranks.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import valuesEditor from 'ui/agg_types/controls/percentile_ranks.html'; import 'ui/number_list'; -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; -import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; +import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; import getPercentileValue from './percentiles_get_value'; @@ -37,6 +37,11 @@ export default function AggTypeMetricPercentileRanksProvider(Private) { name: 'values', editor: valuesEditor, default: [] + }, + { + write(agg, output) { + output.params.keyed = false; + } } ], getResponseAggs: function (agg) { diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js index c46602ba6fbab9..08edbfc193a8bf 100644 --- a/src/ui/public/agg_types/metrics/percentiles.js +++ b/src/ui/public/agg_types/metrics/percentiles.js @@ -2,8 +2,8 @@ import _ from 'lodash'; import ordinalSuffix from 'ui/utils/ordinal_suffix'; import percentsEditor from 'ui/agg_types/controls/percentiles.html'; import 'ui/number_list'; -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; -import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; +import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; import getPercentileValue from './percentiles_get_value'; @@ -35,6 +35,11 @@ export default function AggTypeMetricPercentilesProvider(Private) { name: 'percents', editor: percentsEditor, default: [1, 5, 25, 50, 75, 95, 99] + }, + { + write(agg, output) { + output.params.keyed = false; + } } ], getResponseAggs: function (agg) { diff --git a/src/ui/public/agg_types/metrics/stdDeviation.js b/src/ui/public/agg_types/metrics/std_deviation.js similarity index 95% rename from src/ui/public/agg_types/metrics/stdDeviation.js rename to src/ui/public/agg_types/metrics/std_deviation.js index 1e31bbbf1d8d2d..6a720bf83d1d10 100644 --- a/src/ui/public/agg_types/metrics/stdDeviation.js +++ b/src/ui/public/agg_types/metrics/std_deviation.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; -import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; +import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class'; export default function AggTypeMetricStandardDeviationProvider(Private) { var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider); var getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider); diff --git a/src/ui/public/agg_types/metrics/sum.js b/src/ui/public/agg_types/metrics/sum.js index 8ba2e9407b3e8e..cbdced241db104 100644 --- a/src/ui/public/agg_types/metrics/sum.js +++ b/src/ui/public/agg_types/metrics/sum.js @@ -1,4 +1,4 @@ -import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType'; +import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type'; export default function AggTypeMetricSumProvider(Private) { var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider); diff --git a/src/ui/public/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js index 0a4b0297e4a66c..646d7c103b5551 100644 --- a/src/ui/public/agg_types/param_types/optioned.js +++ b/src/ui/public/agg_types/param_types/optioned.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base'; export default function OptionedAggParamFactory(Private) { diff --git a/src/ui/public/autoload/modules.js b/src/ui/public/autoload/modules.js index af825a973179d4..5919a146054743 100644 --- a/src/ui/public/autoload/modules.js +++ b/src/ui/public/autoload/modules.js @@ -25,11 +25,11 @@ import 'ui/state_management/app_state'; import 'ui/state_management/global_state'; import 'ui/storage'; import 'ui/stringify/register'; -import 'ui/styleCompile'; +import 'ui/style_compile'; import 'ui/timefilter'; import 'ui/timepicker'; import 'ui/tooltip'; import 'ui/typeahead'; import 'ui/url'; -import 'ui/validateDateInterval'; +import 'ui/validate_date_interval'; import 'ui/watch_multi'; diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js index 76aaa29082f195..3b02918a30cdfe 100644 --- a/src/ui/public/bind/__tests__/bind.js +++ b/src/ui/public/bind/__tests__/bind.js @@ -1,6 +1,6 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; describe('$scope.$bind', function () { var $rootScope; diff --git a/src/ui/public/Binder/__tests__/Binder.js b/src/ui/public/binder/__tests__/binder.js similarity index 96% rename from src/ui/public/Binder/__tests__/Binder.js rename to src/ui/public/binder/__tests__/binder.js index d68119a73cb6d7..6bd2a3406de961 100644 --- a/src/ui/public/Binder/__tests__/Binder.js +++ b/src/ui/public/binder/__tests__/binder.js @@ -1,8 +1,8 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; -import Binder from 'ui/Binder'; +import Binder from 'ui/binder'; import $ from 'jquery'; describe('Binder class', function () { diff --git a/src/ui/public/Binder/Binder.js b/src/ui/public/binder/binder.js similarity index 100% rename from src/ui/public/Binder/Binder.js rename to src/ui/public/binder/binder.js diff --git a/src/ui/public/chrome/__tests__/_TabFakeStore.js b/src/ui/public/chrome/__tests__/_tab_fake_store.js similarity index 100% rename from src/ui/public/chrome/__tests__/_TabFakeStore.js rename to src/ui/public/chrome/__tests__/_tab_fake_store.js diff --git a/src/ui/public/chrome/__tests__/nav_controls.js b/src/ui/public/chrome/__tests__/nav_controls.js index b4d61a813b9699..64b3d54ef9d887 100644 --- a/src/ui/public/chrome/__tests__/nav_controls.js +++ b/src/ui/public/chrome/__tests__/nav_controls.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import expect from 'expect.js'; diff --git a/src/ui/public/chrome/__tests__/Tab.js b/src/ui/public/chrome/__tests__/tab.js similarity index 99% rename from src/ui/public/chrome/__tests__/Tab.js rename to src/ui/public/chrome/__tests__/tab.js index 6f4b05adc402cd..dcba69a356f948 100644 --- a/src/ui/public/chrome/__tests__/Tab.js +++ b/src/ui/public/chrome/__tests__/tab.js @@ -1,6 +1,6 @@ -import Tab from '../Tab'; +import Tab from '../tab'; import expect from 'expect.js'; -import TabFakeStore from './_TabFakeStore'; +import TabFakeStore from './_tab_fake_store'; describe('Chrome Tab', function () { describe('construction', function () { diff --git a/src/ui/public/chrome/__tests__/TabCollection.js b/src/ui/public/chrome/__tests__/tab_collection.js similarity index 94% rename from src/ui/public/chrome/__tests__/TabCollection.js rename to src/ui/public/chrome/__tests__/tab_collection.js index ffb2bc9597c4f3..419e00a0fa3218 100644 --- a/src/ui/public/chrome/__tests__/TabCollection.js +++ b/src/ui/public/chrome/__tests__/tab_collection.js @@ -1,8 +1,8 @@ import expect from 'expect.js'; -import TabFakeStore from './_TabFakeStore'; -import TabCollection from '../TabCollection'; -import Tab from '../Tab'; +import TabFakeStore from './_tab_fake_store'; +import TabCollection from '../tab_collection'; +import Tab from '../tab'; import { indexBy, random } from 'lodash'; describe('Chrome TabCollection', function () { diff --git a/src/ui/public/chrome/api/__tests__/apps.js b/src/ui/public/chrome/api/__tests__/apps.js index 059cc2a40d9abc..f0269e79c46d45 100644 --- a/src/ui/public/chrome/api/__tests__/apps.js +++ b/src/ui/public/chrome/api/__tests__/apps.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; import setup from '../apps'; -import TabFakeStore from '../../__tests__/_TabFakeStore'; +import TabFakeStore from '../../__tests__/_tab_fake_store'; describe('Chrome API :: apps', function () { describe('#get/setShowAppsLink()', function () { diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js index e3c89deedd60b0..2161c63d6ce7a8 100644 --- a/src/ui/public/chrome/api/__tests__/nav.js +++ b/src/ui/public/chrome/api/__tests__/nav.js @@ -36,5 +36,10 @@ describe('chrome nav apis', function () { const chrome = getChrome(); expect(chrome.addBasePath('http://github.com/elastic/kibana')).to.be('http://github.com/elastic/kibana'); }); + + it('includes the query string', function () { + const chrome = getChrome(); + expect(chrome.addBasePath('/app/kibana?a=b')).to.be(`${basePath}/app/kibana?a=b`); + }); }); }); diff --git a/src/ui/public/chrome/api/__tests__/xsrf.js b/src/ui/public/chrome/api/__tests__/xsrf.js index 09c4790772a8eb..8bd5d3b9cd3b05 100644 --- a/src/ui/public/chrome/api/__tests__/xsrf.js +++ b/src/ui/public/chrome/api/__tests__/xsrf.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import expect from 'expect.js'; import { stub } from 'auto-release-sinon'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import xsrfChromeApi from '../xsrf'; import { version } from '../../../../../../package.json'; diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index 297df1543be3a3..0b630a2eccd148 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -18,7 +18,7 @@ export default function (chrome, internals) { var isUrl = url && isString(url); if (!isUrl) return url; - var parsed = parse(url); + var parsed = parse(url, true); if (!parsed.host && parsed.pathname) { if (parsed.pathname[0] === '/') { parsed.pathname = chrome.getBasePath() + parsed.pathname; diff --git a/src/ui/public/chrome/api/tabs.js b/src/ui/public/chrome/api/tabs.js index 659b00eae30e4b..97205ed5974844 100644 --- a/src/ui/public/chrome/api/tabs.js +++ b/src/ui/public/chrome/api/tabs.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import TabCollection from '../TabCollection'; +import TabCollection from '../tab_collection'; module.exports = function (chrome, internals) { diff --git a/src/ui/public/chrome/context.js b/src/ui/public/chrome/context.js index 72961f889701f9..092ea422dcdffc 100644 --- a/src/ui/public/chrome/context.js +++ b/src/ui/public/chrome/context.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import ConfigTemplate from 'ui/ConfigTemplate'; +import ConfigTemplate from 'ui/config_template'; import uiModules from 'ui/modules'; uiModules diff --git a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js index 57a5931f53e1a6..d09f9aaf909db3 100644 --- a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js @@ -1,8 +1,8 @@ import sinon from 'auto-release-sinon'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; -import DomLocationProvider from 'ui/domLocation'; +import DomLocationProvider from 'ui/dom_location'; import { constant } from 'lodash'; import { set } from 'lodash'; import { cloneDeep } from 'lodash'; diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js index 77c8a4834adce0..7853012e4dcd1e 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js @@ -1,5 +1,5 @@ -import DomLocationProvider from 'ui/domLocation'; +import DomLocationProvider from 'ui/dom_location'; import { parse } from 'url'; import { bindKey } from 'lodash'; import '../app_switcher/app_switcher.less'; diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js index e06b373a3c15bb..6b0f5789582c53 100644 --- a/src/ui/public/chrome/directives/kbn_chrome.js +++ b/src/ui/public/chrome/directives/kbn_chrome.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import UiModules from 'ui/modules'; -import ConfigTemplate from 'ui/ConfigTemplate'; +import ConfigTemplate from 'ui/config_template'; export default function (chrome, internals) { diff --git a/src/ui/public/chrome/Tab.js b/src/ui/public/chrome/tab.js similarity index 100% rename from src/ui/public/chrome/Tab.js rename to src/ui/public/chrome/tab.js diff --git a/src/ui/public/chrome/TabCollection.js b/src/ui/public/chrome/tab_collection.js similarity index 97% rename from src/ui/public/chrome/TabCollection.js rename to src/ui/public/chrome/tab_collection.js index 81ce9266ead935..d74e0104d33b24 100644 --- a/src/ui/public/chrome/TabCollection.js +++ b/src/ui/public/chrome/tab_collection.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import Tab from 'ui/chrome/Tab'; +import Tab from 'ui/chrome/tab'; import { startsWith, get, set, omit, wrap, pick } from 'lodash'; import { parse } from 'url'; diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js index 03f26c4b6707fd..29c88060788d34 100644 --- a/src/ui/public/config/__tests__/config.js +++ b/src/ui/public/config/__tests__/config.js @@ -1,5 +1,5 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import ConfigDefaultsProvider from 'ui/config/defaults'; describe('config component', function () { var $scope; diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js index 486e5c4929b208..8bb289a0aae7f6 100644 --- a/src/ui/public/config/config.js +++ b/src/ui/public/config/config.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import ConfigDefaultsProvider from 'ui/config/defaults'; import ConfigDelayedUpdaterProvider from 'ui/config/_delayed_updater'; import ConfigValsProvider from 'ui/config/_vals'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; +import DocSourceProvider from 'ui/courier/data_source/doc_source'; import uiRoutes from 'ui/routes'; import uiModules from 'ui/modules'; import Notifier from 'ui/notify/notifier'; @@ -30,7 +30,7 @@ module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, bu // update once it is requested by calling #set() or #clear(). var updater; - var DocSource = Private(CourierDataSourceDocSourceProvider); + var DocSource = Private(DocSourceProvider); var doc = (new DocSource()) .index(kbnIndex) .type('config') diff --git a/src/ui/public/ConfigTemplate.js b/src/ui/public/config_template.js similarity index 100% rename from src/ui/public/ConfigTemplate.js rename to src/ui/public/config_template.js diff --git a/src/ui/public/courier/__tests__/requestQueue.js b/src/ui/public/courier/__tests__/request_queue.js similarity index 98% rename from src/ui/public/courier/__tests__/requestQueue.js rename to src/ui/public/courier/__tests__/request_queue.js index 723f0f016ccd4b..947671686e1bd8 100644 --- a/src/ui/public/courier/__tests__/requestQueue.js +++ b/src/ui/public/courier/__tests__/request_queue.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js index 6fdc80e00d4d50..486d5bcb20e881 100644 --- a/src/ui/public/courier/courier.js +++ b/src/ui/public/courier/courier.js @@ -1,45 +1,48 @@ -import errors from 'ui/errors'; import _ from 'lodash'; + +import errors from 'ui/errors'; import 'ui/es'; import 'ui/promises'; import 'ui/safe_confirm'; import 'ui/index_patterns'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierErrorHandlersProvider from 'ui/courier/_error_handlers'; -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierLooperDocProvider from 'ui/courier/looper/doc'; -import CourierLooperSearchProvider from 'ui/courier/looper/search'; -import CourierDataSourceRootSearchSourceProvider from 'ui/courier/data_source/_root_search_source'; -import CourierSavedObjectSavedObjectProvider from 'ui/courier/saved_object/saved_object'; -import CourierRedirectWhenMissingProvider from 'ui/courier/_redirect_when_missing'; import uiModules from 'ui/modules'; +import Notifier from 'ui/notify/notifier'; + +import DocSourceProvider from './data_source/doc_source'; +import SearchSourceProvider from './data_source/search_source'; +import SearchStrategyProvider from './fetch/strategy/search'; +import RequestQueueProvider from './_request_queue'; +import ErrorHandlersProvider from './_error_handlers'; +import FetchProvider from './fetch'; +import DocLooperProvider from './looper/doc'; +import SearchLooperProvider from './looper/search'; +import RootSearchSourceProvider from './data_source/_root_search_source'; +import SavedObjectProvider from './saved_object'; +import RedirectWhenMissingProvider from './_redirect_when_missing'; uiModules.get('kibana/courier') -.service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) { +.service('courier', function ($rootScope, Private, Promise, indexPatterns) { function Courier() { var self = this; - var DocSource = Private(CourierDataSourceDocSourceProvider); - var SearchSource = Private(CourierDataSourceSearchSourceProvider); - var searchStrategy = Private(CourierFetchStrategySearchProvider); + var DocSource = Private(DocSourceProvider); + var SearchSource = Private(SearchSourceProvider); + var searchStrategy = Private(SearchStrategyProvider); - var requestQueue = Private(CourierRequestQueueProvider); - var errorHandlers = Private(CourierErrorHandlersProvider); + var requestQueue = Private(RequestQueueProvider); + var errorHandlers = Private(ErrorHandlersProvider); - var fetch = Private(CourierFetchFetchProvider); - var docLooper = self.docLooper = Private(CourierLooperDocProvider); - var searchLooper = self.searchLooper = Private(CourierLooperSearchProvider); + var fetch = Private(FetchProvider); + var docLooper = self.docLooper = Private(DocLooperProvider); + var searchLooper = self.searchLooper = Private(SearchLooperProvider); // expose some internal modules - self.setRootSearchSource = Private(CourierDataSourceRootSearchSourceProvider).set; + self.setRootSearchSource = Private(RootSearchSourceProvider).set; - self.SavedObject = Private(CourierSavedObjectSavedObjectProvider); + self.SavedObject = Private(SavedObjectProvider); self.indexPatterns = indexPatterns; - self.redirectWhenMissing = Private(CourierRedirectWhenMissingProvider); + self.redirectWhenMissing = Private(RedirectWhenMissingProvider); self.DocSource = DocSource; self.SearchSource = SearchSource; diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js index 68faabfe947ebf..64b2f7b9b146bd 100644 --- a/src/ui/public/courier/data_source/__tests__/decorate_query.js +++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js @@ -1,8 +1,8 @@ import moment from 'moment'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import _ from 'lodash'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; +import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; describe('Query decorator', function () { @@ -29,7 +29,7 @@ describe('Query decorator', function () { beforeEach(ngMock.inject(function (Private, $injector, _config_) { config = _config_; - fn = Private(CourierDataSourceDecorateQueryProvider); + fn = Private(DecorateQueryProvider); })); it('should be a function', function () { diff --git a/src/ui/public/courier/data_source/__tests__/DocSource.js b/src/ui/public/courier/data_source/__tests__/doc_source.js similarity index 94% rename from src/ui/public/courier/data_source/__tests__/DocSource.js rename to src/ui/public/courier/data_source/__tests__/doc_source.js index 6ff86a2c80c010..7be2fbc7496eb2 100644 --- a/src/ui/public/courier/data_source/__tests__/DocSource.js +++ b/src/ui/public/courier/data_source/__tests__/doc_source.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; @@ -6,7 +6,7 @@ import RequestQueueProv from '../../_request_queue'; import DocSourceProv from '../doc_source'; describe('DocSource', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); let requestQueue; let DocSource; diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js index 1c255c8383db58..b891b986ce56bf 100644 --- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js +++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js @@ -1,19 +1,17 @@ import 'ui/private'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; -import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request'; +import NormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('SearchSource#normalizeSortRequest', function () { - - var normalizeSortRequest; var indexPattern; var normalizedSort; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { - normalizeSortRequest = Private(CourierDataSourceNormalizeSortRequestProvider); + normalizeSortRequest = Private(NormalizeSortRequestProvider); indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); normalizedSort = [{ diff --git a/src/ui/public/courier/data_source/__tests__/SearchSource.js b/src/ui/public/courier/data_source/__tests__/search_source.js similarity index 94% rename from src/ui/public/courier/data_source/__tests__/SearchSource.js rename to src/ui/public/courier/data_source/__tests__/search_source.js index 02f4f73d2aa297..7559ef9e88eba8 100644 --- a/src/ui/public/courier/data_source/__tests__/SearchSource.js +++ b/src/ui/public/courier/data_source/__tests__/search_source.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; @@ -6,7 +6,7 @@ import RequestQueueProv from '../../_request_queue'; import SearchSourceProv from '../search_source'; describe('SearchSource', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); let requestQueue; let SearchSource; diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js index 0475e2cd32a0a0..d666db7ff5c559 100644 --- a/src/ui/public/courier/data_source/_abstract.js +++ b/src/ui/public/courier/data_source/_abstract.js @@ -1,14 +1,17 @@ import _ from 'lodash'; import angular from 'angular'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierErrorHandlersProvider from 'ui/courier/_error_handlers'; -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; + +import 'ui/promises'; + +import RequestQueueProvider from '../_request_queue'; +import ErrorHandlersProvider from '../_error_handlers'; +import FetchProvider from '../fetch'; +import DecorateQueryProvider from './_decorate_query'; export default function SourceAbstractFactory(Private, Promise, PromiseEmitter) { - var requestQueue = Private(CourierRequestQueueProvider); - var errorHandlers = Private(CourierErrorHandlersProvider); - var courierFetch = Private(CourierFetchFetchProvider); + var requestQueue = Private(RequestQueueProvider); + var errorHandlers = Private(ErrorHandlersProvider); + var courierFetch = Private(FetchProvider); function SourceAbstract(initialState, strategy) { var self = this; @@ -268,7 +271,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter) .then(function () { if (type === 'search') { // This is down here to prevent the circular dependency - var decorateQuery = Private(CourierDataSourceDecorateQueryProvider); + var decorateQuery = Private(DecorateQueryProvider); flatState.body = flatState.body || {}; diff --git a/src/ui/public/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js index 4de2f9c8258c73..a97740b0508bae 100644 --- a/src/ui/public/courier/data_source/_decorate_query.js +++ b/src/ui/public/courier/data_source/_decorate_query.js @@ -1,4 +1,5 @@ import _ from 'lodash'; + export default function DecorateQuery(config) { /** * Decorate queries with default parameters diff --git a/src/ui/public/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js index 2b1652e8bcc8a9..97a2ce64004e2b 100644 --- a/src/ui/public/courier/data_source/_doc_send_to_es.js +++ b/src/ui/public/courier/data_source/_doc_send_to_es.js @@ -1,11 +1,12 @@ import _ from 'lodash'; + import errors from 'ui/errors'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; +import RequestQueueProvider from 'ui/courier/_request_queue'; +import FetchProvider from 'ui/courier/fetch/fetch'; export default function (Promise, Private, es) { - var requestQueue = Private(CourierRequestQueueProvider); - var courierFetch = Private(CourierFetchFetchProvider); + var requestQueue = Private(RequestQueueProvider); + var courierFetch = Private(FetchProvider); /** * Backend for doUpdate and doIndex diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js index 220ca70c6fa30c..f43a4fc2ccbe30 100644 --- a/src/ui/public/courier/data_source/_normalize_sort_request.js +++ b/src/ui/public/courier/data_source/_normalize_sort_request.js @@ -1,4 +1,5 @@ import _ from 'lodash'; + export default function normalizeSortRequest(config) { var defaultSortOptions = config.get('sort:options'); @@ -48,4 +49,3 @@ export default function normalizeSortRequest(config) { return normalized; } }; - diff --git a/src/ui/public/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js index 385cdea4784728..128f922b8a6cfa 100644 --- a/src/ui/public/courier/data_source/_root_search_source.js +++ b/src/ui/public/courier/data_source/_root_search_source.js @@ -1,7 +1,7 @@ -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; +import SearchSourceProvider from 'ui/courier/data_source/search_source'; export default function RootSearchSource(Private, $rootScope, timefilter, Notifier) { - var SearchSource = Private(CourierDataSourceSearchSourceProvider); + var SearchSource = Private(SearchSourceProvider); var notify = new Notifier({ location: 'Root Search Source' }); diff --git a/src/ui/public/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js index 6d93ac0c5b9c23..c2725309bfb7e4 100644 --- a/src/ui/public/courier/data_source/doc_source.js +++ b/src/ui/public/courier/data_source/doc_source.js @@ -1,16 +1,18 @@ import _ from 'lodash'; -import CourierDataSourceDocSendToEsProvider from 'ui/courier/data_source/_doc_send_to_es'; -import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract'; -import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc'; -import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc'; + import 'ui/es'; import 'ui/storage'; +import DocSendToEsProvider from './_doc_send_to_es'; +import AbstractDataSourceProvider from './_abstract'; +import DocRequestProvider from '../fetch/request/doc'; +import DocStrategyProvider from '../fetch/strategy/doc'; + export default function DocSourceFactory(Private, Promise, es, sessionStorage) { - var sendToEs = Private(CourierDataSourceDocSendToEsProvider); - var SourceAbstract = Private(CourierDataSourceAbstractProvider); - var DocRequest = Private(CourierFetchRequestDocProvider); - var docStrategy = Private(CourierFetchStrategyDocProvider); + var sendToEs = Private(DocSendToEsProvider); + var SourceAbstract = Private(AbstractDataSourceProvider); + var DocRequest = Private(DocRequestProvider); + var docStrategy = Private(DocStrategyProvider); _.class(DocSource).inherits(SourceAbstract); function DocSource(initialState) { diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js index c01f606376c044..0cd2a14d749bed 100644 --- a/src/ui/public/courier/data_source/search_source.js +++ b/src/ui/public/courier/data_source/search_source.js @@ -1,16 +1,18 @@ import _ from 'lodash'; -import rootSearchSource from 'ui/courier/data_source/_root_search_source'; -import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract'; -import CourierFetchRequestSearchProvider from 'ui/courier/fetch/request/search'; -import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request'; + +import NormalizeSortRequestProvider from './_normalize_sort_request'; +import rootSearchSource from './_root_search_source'; +import AbstractDataSourceProvider from './_abstract'; +import SearchRequestProvider from '../fetch/request/search'; +import SegmentedRequestProvider from '../fetch/request/segmented'; +import SearchStrategyProvider from '../fetch/strategy/search'; + export default function SearchSourceFactory(Promise, Private) { - var SourceAbstract = Private(CourierDataSourceAbstractProvider); - var SearchRequest = Private(CourierFetchRequestSearchProvider); - var SegmentedRequest = Private(CourierFetchRequestSegmentedProvider); - var searchStrategy = Private(CourierFetchStrategySearchProvider); - var normalizeSortRequest = Private(CourierDataSourceNormalizeSortRequestProvider); + var SourceAbstract = Private(AbstractDataSourceProvider); + var SearchRequest = Private(SearchRequestProvider); + var SegmentedRequest = Private(SegmentedRequestProvider); + var searchStrategy = Private(SearchStrategyProvider); + var normalizeSortRequest = Private(NormalizeSortRequestProvider); _.class(SearchSource).inherits(SourceAbstract); function SearchSource(initialState) { diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js index 6ce8059c14ba15..ebecce6b32b98e 100644 --- a/src/ui/public/courier/fetch/__tests__/doc.js +++ b/src/ui/public/courier/fetch/__tests__/doc.js @@ -1,6 +1,6 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import DocSourceProvider from '../../data_source/doc_source'; import DocRequestProvider from '../request/doc'; diff --git a/src/ui/public/courier/fetch/__tests__/fetch.js b/src/ui/public/courier/fetch/__tests__/fetch.js index 1c5c6b107c9a4f..3979228cd97cde 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch.js +++ b/src/ui/public/courier/fetch/__tests__/fetch.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; @@ -10,7 +10,7 @@ import DocSourceProvider from '../../data_source/doc_source'; import SearchSourceProvider from '../../data_source/search_source'; describe('Fetch service', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); let es; let fetch; diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js index 513373af11b7f3..7b696bf321379b 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch_these.js +++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js @@ -1,6 +1,6 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FetchTheseProvider from '../fetch_these'; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js index cabfae475a296f..4ccb32e0c38bd9 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js @@ -1,6 +1,6 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import SegmentedRequestProvider from '../segmented'; import SearchRequestProvider from '../search'; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js index e7a20f988090b6..4d35848ed846b6 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js @@ -1,6 +1,6 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; @@ -13,7 +13,7 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => { let SegmentedReq; let MockSource; - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject((Private, $injector) => { diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js index 89a2c1735a95cb..a302da89e7bc1d 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js @@ -1,10 +1,10 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import { times } from 'lodash'; import sinon from 'auto-release-sinon'; import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; -import NoDigestPromises from 'testUtils/noDigestPromises'; +import NoDigestPromises from 'test_utils/no_digest_promises'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; import SegmentedRequestProvider from '../segmented'; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js index 3339b21d2e925e..631308a15d6fbe 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js @@ -1,10 +1,10 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import { times } from 'lodash'; import sinon from 'auto-release-sinon'; import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; -import NoDigestPromises from 'testUtils/noDigestPromises'; +import NoDigestPromises from 'test_utils/no_digest_promises'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; import SegmentedRequestProvider from '../segmented'; diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js index 21d62a2bbb4191..ac73fe8e1a18bc 100644 --- a/src/ui/public/courier/fetch/strategy/__tests__/search.js +++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import SearchStrategyProvider from '../search'; diff --git a/src/ui/public/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js index 1f76b872407d20..fcb25511e6a14a 100644 --- a/src/ui/public/courier/looper/_looper.js +++ b/src/ui/public/courier/looper/_looper.js @@ -1,5 +1,9 @@ import _ from 'lodash'; -export default function LooperFactory($timeout, Notifier, Promise) { + +import 'ui/promises'; +import Notifier from 'ui/notify/notifier'; + +export default function LooperFactory($timeout, Promise) { var notify = new Notifier(); function Looper(ms, fn) { diff --git a/src/ui/public/courier/looper/doc.js b/src/ui/public/courier/looper/doc.js index 0a37f334fca7e3..a1c6104ce20aa7 100644 --- a/src/ui/public/courier/looper/doc.js +++ b/src/ui/public/courier/looper/doc.js @@ -1,18 +1,18 @@ -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierLooperLooperProvider from 'ui/courier/looper/_looper'; -import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc'; +import FetchProvider from '../fetch'; +import LooperProvider from './_looper'; +import DocStrategyProvider from '../fetch/strategy/doc'; export default function DocLooperService(Private) { - var fetch = Private(CourierFetchFetchProvider); - var Looper = Private(CourierLooperLooperProvider); - var docStrategy = Private(CourierFetchStrategyDocProvider); + var fetch = Private(FetchProvider); + var Looper = Private(LooperProvider); + var DocStrategy = Private(DocStrategyProvider); /** * The Looper which will manage the doc fetch interval * @type {Looper} */ var docLooper = new Looper(1500, function () { - fetch.fetchQueued(docStrategy); + fetch.fetchQueued(DocStrategy); }); return docLooper; diff --git a/src/ui/public/courier/looper/search.js b/src/ui/public/courier/looper/search.js index a3f5dfd57e3b90..cb3914c601c0ed 100644 --- a/src/ui/public/courier/looper/search.js +++ b/src/ui/public/courier/looper/search.js @@ -1,14 +1,14 @@ -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierLooperLooperProvider from 'ui/courier/looper/_looper'; +import FetchProvider from '../fetch'; +import SearchStrategyProvider from '../fetch/strategy/search'; +import RequestQueueProvider from '../_request_queue'; +import LooperProvider from './_looper'; export default function SearchLooperService(Private, Promise, Notifier, $rootScope) { - var fetch = Private(CourierFetchFetchProvider); - var searchStrategy = Private(CourierFetchStrategySearchProvider); - var requestQueue = Private(CourierRequestQueueProvider); + var fetch = Private(FetchProvider); + var searchStrategy = Private(SearchStrategyProvider); + var requestQueue = Private(RequestQueueProvider); - var Looper = Private(CourierLooperLooperProvider); + var Looper = Private(LooperProvider); var notif = new Notifier({ location: 'Search Looper' }); /** diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js index ea568383410c17..4aae5a210cd189 100644 --- a/src/ui/public/courier/saved_object/saved_object.js +++ b/src/ui/public/courier/saved_object/saved_object.js @@ -1,15 +1,18 @@ import angular from 'angular'; -import errors from 'ui/errors'; import _ from 'lodash'; + +import errors from 'ui/errors'; import slugifyId from 'ui/utils/slugify_id'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; -import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; +import MappingSetupProvider from 'ui/utils/mapping_setup'; + +import DocSourceProvider from '../data_source/doc_source'; +import SearchSourceProvider from '../data_source/search_source'; + export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, safeConfirm, indexPatterns) { - var DocSource = Private(CourierDataSourceDocSourceProvider); - var SearchSource = Private(CourierDataSourceSearchSourceProvider); - var mappingSetup = Private(UtilsMappingSetupProvider); + var DocSource = Private(DocSourceProvider); + var SearchSource = Private(SearchSourceProvider); + var mappingSetup = Private(MappingSetupProvider); function SavedObject(config) { if (!_.isObject(config)) config = {}; diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js index df3187e42174f6..137de3df714465 100644 --- a/src/ui/public/debounce/__tests__/debounce.js +++ b/src/ui/public/debounce/__tests__/debounce.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; var debounce; var $timeout; diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js index 4036de599ef82c..a6ad20f40c9963 100644 --- a/src/ui/public/directives/__tests__/auto_select_if_only_one.js +++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js @@ -1,7 +1,7 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/auto_select_if_only_one'; describe('Auto-select if only one directive', function () { diff --git a/src/ui/public/directives/__tests__/config.js b/src/ui/public/directives/__tests__/config.js index b05025b7735767..25396bec64025b 100644 --- a/src/ui/public/directives/__tests__/config.js +++ b/src/ui/public/directives/__tests__/config.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import { assign } from 'lodash'; import $ from 'jquery'; diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js index cb7a13973ed993..3a6c695f601a39 100644 --- a/src/ui/public/directives/__tests__/confirm-click.js +++ b/src/ui/public/directives/__tests__/confirm-click.js @@ -1,7 +1,7 @@ import angular from 'angular'; import sinon from 'sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'ui/directives/confirm_click'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js index 620dfaff13e098..eceee770001018 100644 --- a/src/ui/public/directives/__tests__/css_truncate.js +++ b/src/ui/public/directives/__tests__/css_truncate.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/directives/__tests__/fixedScroll.js b/src/ui/public/directives/__tests__/fixed_scroll.js similarity index 98% rename from src/ui/public/directives/__tests__/fixedScroll.js rename to src/ui/public/directives/__tests__/fixed_scroll.js index 7f8f7d51ab8317..3d345e549f6137 100644 --- a/src/ui/public/directives/__tests__/fixedScroll.js +++ b/src/ui/public/directives/__tests__/fixed_scroll.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import 'ui/fixedScroll'; +import ngMock from 'ng_mock'; +import 'ui/fixed_scroll'; import $ from 'jquery'; import sinon from 'auto-release-sinon'; import Promise from 'bluebird'; diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js index 3ca4d6f6d3b7ad..d7b7c5578ba12c 100644 --- a/src/ui/public/directives/__tests__/inequality.js +++ b/src/ui/public/directives/__tests__/inequality.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/inequality'; describe('greater_than model validator directive', function () { diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js index 6230c59ccb953d..3104be8e46d384 100644 --- a/src/ui/public/directives/__tests__/input_focus.js +++ b/src/ui/public/directives/__tests__/input_focus.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'ui/directives/input_focus'; diff --git a/src/ui/public/directives/__tests__/input_whole_number.js b/src/ui/public/directives/__tests__/input_whole_number.js index f6103443172634..6aaa4cb52bdbd2 100644 --- a/src/ui/public/directives/__tests__/input_whole_number.js +++ b/src/ui/public/directives/__tests__/input_whole_number.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/input_whole_number'; describe('Whole number input directive', function () { diff --git a/src/ui/public/directives/__tests__/json_input.js b/src/ui/public/directives/__tests__/json_input.js index 739e510e205275..8f89ce2b55b2c7 100644 --- a/src/ui/public/directives/__tests__/json_input.js +++ b/src/ui/public/directives/__tests__/json_input.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/json_input'; diff --git a/src/ui/public/directives/__tests__/parse_query.js b/src/ui/public/directives/__tests__/parse_query.js index d1f07d33eea200..8f726e83b4056f 100644 --- a/src/ui/public/directives/__tests__/parse_query.js +++ b/src/ui/public/directives/__tests__/parse_query.js @@ -1,7 +1,7 @@ import angular from 'angular'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; // Load the kibana app dependencies. diff --git a/src/ui/public/directives/__tests__/spinner.js b/src/ui/public/directives/__tests__/spinner.js index a585297395b804..291faa3ef2d1a4 100644 --- a/src/ui/public/directives/__tests__/spinner.js +++ b/src/ui/public/directives/__tests__/spinner.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js index d4fb70d7e0f1ee..bd8f9f6fe7be69 100644 --- a/src/ui/public/directives/__tests__/timepicker.js +++ b/src/ui/public/directives/__tests__/timepicker.js @@ -3,7 +3,7 @@ import moment from 'moment'; import expect from 'expect.js'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'plugins/kibana/visualize/index'; import 'plugins/kibana/dashboard/index'; diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js index ad7eff3f33b93d..1c9e1256051b93 100644 --- a/src/ui/public/directives/__tests__/truncate.js +++ b/src/ui/public/directives/__tests__/truncate.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/directives/__tests__/typeahead.js b/src/ui/public/directives/__tests__/typeahead.js index 191a6252f99cbb..f6d90ed8ad1f01 100644 --- a/src/ui/public/directives/__tests__/typeahead.js +++ b/src/ui/public/directives/__tests__/typeahead.js @@ -1,7 +1,7 @@ import angular from 'angular'; import sinon from 'sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/typeahead'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js index c9235a3b3fa47e..95681f8fe608bd 100644 --- a/src/ui/public/directives/__tests__/validate_cidr_mask.js +++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/validate_cidr_mask'; diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js index 9654d459acbbfe..117977b9b24271 100644 --- a/src/ui/public/directives/__tests__/validate_date_math.js +++ b/src/ui/public/directives/__tests__/validate_date_math.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/validate_date_math'; diff --git a/src/ui/public/directives/__tests__/validate_index_name.js b/src/ui/public/directives/__tests__/validate_index_name.js index d35617dc1208ae..759004a7764f3c 100644 --- a/src/ui/public/directives/__tests__/validate_index_name.js +++ b/src/ui/public/directives/__tests__/validate_index_name.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/validate_index_name'; // Load the kibana app dependencies. diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js index dba902108bf750..81a03be15d0c91 100644 --- a/src/ui/public/directives/__tests__/validate_ip.js +++ b/src/ui/public/directives/__tests__/validate_ip.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/validate_ip'; diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js index 4063b2fbc52f2d..b182e5906f6f06 100644 --- a/src/ui/public/directives/__tests__/validate_json.js +++ b/src/ui/public/directives/__tests__/validate_json.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/directives/validate_json'; // Load the kibana app dependencies. diff --git a/src/ui/public/directives/config.js b/src/ui/public/directives/config.js index b2ed2fc0e2226d..7c0fda3aa197f0 100644 --- a/src/ui/public/directives/config.js +++ b/src/ui/public/directives/config.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import 'ui/watch_multi'; -import ConfigTemplate from 'ui/ConfigTemplate'; +import ConfigTemplate from 'ui/config_template'; import angular from 'angular'; import 'ui/directives/input_focus'; import uiModules from 'ui/modules'; diff --git a/src/ui/public/directives/kbnSrc.js b/src/ui/public/directives/kbnSrc.js deleted file mode 100644 index 93bbe6f776a0ae..00000000000000 --- a/src/ui/public/directives/kbnSrc.js +++ /dev/null @@ -1,3 +0,0 @@ -import { kbnUrlDirective } from './kbnHref'; - -kbnUrlDirective('kbnSrc'); diff --git a/src/ui/public/directives/kbnHref.js b/src/ui/public/directives/kbn_href.js similarity index 100% rename from src/ui/public/directives/kbnHref.js rename to src/ui/public/directives/kbn_href.js diff --git a/src/ui/public/directives/kbn_src.js b/src/ui/public/directives/kbn_src.js new file mode 100644 index 00000000000000..208ecf1144ac8c --- /dev/null +++ b/src/ui/public/directives/kbn_src.js @@ -0,0 +1,3 @@ +import { kbnUrlDirective } from './kbn_href'; + +kbnUrlDirective('kbnSrc'); diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js index f1464e2cc8862e..a463c215d1ab4f 100644 --- a/src/ui/public/directives/pretty_duration.js +++ b/src/ui/public/directives/pretty_duration.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dateMath from 'ui/utils/dateMath'; +import dateMath from 'ui/utils/date_math'; import moment from 'moment'; import 'ui/timepicker/quick_ranges'; import 'ui/timepicker/time_units'; diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js index 38abec5cc1540a..436bfb9830711e 100644 --- a/src/ui/public/directives/rows.js +++ b/src/ui/public/directives/rows.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import _ from 'lodash'; -import AggConfigResult from 'ui/Vis/AggConfigResult'; +import AggConfigResult from 'ui/vis/agg_config_result'; import FilterBarFilterBarClickHandlerProvider from 'ui/filter_bar/filter_bar_click_handler'; import uiModules from 'ui/modules'; var module = uiModules.get('kibana'); diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js index 52bc041b74a542..7288a9ec59dbe3 100644 --- a/src/ui/public/directives/validate_cidr_mask.js +++ b/src/ui/public/directives/validate_cidr_mask.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import CidrMask from 'ui/utils/CidrMask'; +import CidrMask from 'ui/utils/cidr_mask'; import uiModules from 'ui/modules'; uiModules.get('kibana').directive('validateCidrMask', function () { diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js index 48e7ccc24b9c83..bfb4e437d4fc49 100644 --- a/src/ui/public/directives/validate_date_math.js +++ b/src/ui/public/directives/validate_date_math.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dateMath from 'ui/utils/dateMath'; +import dateMath from 'ui/utils/date_math'; import uiModules from 'ui/modules'; uiModules.get('kibana').directive('validateDateMath', function () { diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js index adc0a263c79f1c..9b639ae63e4049 100644 --- a/src/ui/public/directives/validate_ip.js +++ b/src/ui/public/directives/validate_ip.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import Ipv4Address from 'ui/utils/Ipv4Address'; +import Ipv4Address from 'ui/utils/ipv4_address'; import uiModules from 'ui/modules'; uiModules diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js index 5963ad7dc689fa..9df39fe9d7df10 100644 --- a/src/ui/public/doc_table/__tests__/doc_table.js +++ b/src/ui/public/doc_table/__tests__/doc_table.js @@ -3,7 +3,7 @@ import expect from 'expect.js'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import searchResponse from 'fixtures/search_response'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import $ from 'jquery'; import 'ui/private'; import 'ui/doc_table'; diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js index 7c3f95e177f6b2..a1ad3811b7962f 100644 --- a/src/ui/public/doc_table/__tests__/lib/get_sort.js +++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js @@ -1,7 +1,7 @@ import getSort from 'ui/doc_table/lib/get_sort'; var defaultSort = {time: 'desc'}; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; var indexPattern; diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js index c2f80a43574244..b33ee202291c4c 100644 --- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js +++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js @@ -2,7 +2,7 @@ import angular from 'angular'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import getFakeRow from 'fixtures/fake_row'; import $ from 'jquery'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js index a064ab78b64a9c..5313063e2b224c 100644 --- a/src/ui/public/doc_title/__tests__/doc_title.js +++ b/src/ui/public/doc_title/__tests__/doc_title.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import DocTitleProvider from 'ui/doc_title'; describe('docTitle Service', function () { diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js index b50ae7729c5b3b..fcd64aab90b1cf 100644 --- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js +++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js @@ -1,7 +1,7 @@ import angular from 'angular'; import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/private'; import docViewsRegistry from 'ui/registry/doc_views'; diff --git a/src/ui/public/domLocation.js b/src/ui/public/dom_location.js similarity index 100% rename from src/ui/public/domLocation.js rename to src/ui/public/dom_location.js diff --git a/src/ui/public/events.js b/src/ui/public/events.js index 5bf1320829a09e..f86946dcf61a9e 100644 --- a/src/ui/public/events.js +++ b/src/ui/public/events.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import Notifier from 'ui/notify/notifier'; -import SimpleEmitter from 'ui/utils/SimpleEmitter'; +import SimpleEmitter from 'ui/utils/simple_emitter'; export default function EventsProvider(Private, Promise) { var notify = new Notifier({ location: 'EventEmitter' }); diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js index 9f41d923dcc9d1..c19ffc10a67fbd 100644 --- a/src/ui/public/factories/__tests__/base_object.js +++ b/src/ui/public/factories/__tests__/base_object.js @@ -2,7 +2,7 @@ import angular from 'angular'; import _ from 'lodash'; import sinon from 'sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/private'; describe('Base Object', function () { @@ -12,7 +12,7 @@ describe('Base Object', function () { beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (_$rootScope_, Private) { $rootScope = _$rootScope_; - BaseObject = require('ui/utils/BaseObject'); + BaseObject = require('ui/utils/base_object'); })); it('should take an inital set of values', function () { diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js index a9bde866fb06b5..2d37485791e01a 100644 --- a/src/ui/public/factories/__tests__/events.js +++ b/src/ui/public/factories/__tests__/events.js @@ -3,12 +3,12 @@ import angular from 'angular'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/private'; import EventsProvider from 'ui/events'; describe('Events', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); var $rootScope; var Events; diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js index c1dd31b2728c05..c24240521684e6 100644 --- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js +++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import $ from 'jquery'; diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js index c28adb50b8c971..1dd23015894dca 100644 --- a/src/ui/public/fancy_forms/fancy_forms.js +++ b/src/ui/public/fancy_forms/fancy_forms.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import $ from 'jquery'; -import KbnFormController from 'ui/fancy_forms/KbnFormController'; +import KbnFormController from 'ui/fancy_forms/kbn_form_controller'; import uiModules from 'ui/modules'; diff --git a/src/ui/public/fancy_forms/KbnFormController.js b/src/ui/public/fancy_forms/kbn_form_controller.js similarity index 100% rename from src/ui/public/fancy_forms/KbnFormController.js rename to src/ui/public/fancy_forms/kbn_form_controller.js diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js index 89b54cd4c06097..d5aae3c231e0fd 100644 --- a/src/ui/public/field_editor/__tests__/field_editor.js +++ b/src/ui/public/field_editor/__tests__/field_editor.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import IndexPatternsFieldProvider from 'ui/index_patterns/_field'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; diff --git a/src/ui/public/filter_bar/__tests__/_addFilters.js b/src/ui/public/filter_bar/__tests__/_add_filters.js similarity index 99% rename from src/ui/public/filter_bar/__tests__/_addFilters.js rename to src/ui/public/filter_bar/__tests__/_add_filters.js index 656adabc502bf1..13c3ab0353c227 100644 --- a/src/ui/public/filter_bar/__tests__/_addFilters.js +++ b/src/ui/public/filter_bar/__tests__/_add_filters.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; describe('add filters', function () { diff --git a/src/ui/public/filter_bar/__tests__/_getFilters.js b/src/ui/public/filter_bar/__tests__/_get_filters.js similarity index 99% rename from src/ui/public/filter_bar/__tests__/_getFilters.js rename to src/ui/public/filter_bar/__tests__/_get_filters.js index 38dd7f8cd04763..94c68e19f8835d 100644 --- a/src/ui/public/filter_bar/__tests__/_getFilters.js +++ b/src/ui/public/filter_bar/__tests__/_get_filters.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; diff --git a/src/ui/public/filter_bar/__tests__/_invertFilters.js b/src/ui/public/filter_bar/__tests__/_invert_filters.js similarity index 99% rename from src/ui/public/filter_bar/__tests__/_invertFilters.js rename to src/ui/public/filter_bar/__tests__/_invert_filters.js index f1b44054d47640..b99189b5e5c64b 100644 --- a/src/ui/public/filter_bar/__tests__/_invertFilters.js +++ b/src/ui/public/filter_bar/__tests__/_invert_filters.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; describe('invert filters', function () { diff --git a/src/ui/public/filter_bar/__tests__/_pinFilters.js b/src/ui/public/filter_bar/__tests__/_pin_filters.js similarity index 99% rename from src/ui/public/filter_bar/__tests__/_pinFilters.js rename to src/ui/public/filter_bar/__tests__/_pin_filters.js index 273ecb626ec7a4..d8f962869f1d13 100644 --- a/src/ui/public/filter_bar/__tests__/_pinFilters.js +++ b/src/ui/public/filter_bar/__tests__/_pin_filters.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; describe('pin filters', function () { diff --git a/src/ui/public/filter_bar/__tests__/_removeFilters.js b/src/ui/public/filter_bar/__tests__/_remove_filters.js similarity index 99% rename from src/ui/public/filter_bar/__tests__/_removeFilters.js rename to src/ui/public/filter_bar/__tests__/_remove_filters.js index 9a04c2a30d07ec..7b311c84fd27f4 100644 --- a/src/ui/public/filter_bar/__tests__/_removeFilters.js +++ b/src/ui/public/filter_bar/__tests__/_remove_filters.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; describe('remove filters', function () { diff --git a/src/ui/public/filter_bar/__tests__/_toggleFilters.js b/src/ui/public/filter_bar/__tests__/_toggle_filters.js similarity index 99% rename from src/ui/public/filter_bar/__tests__/_toggleFilters.js rename to src/ui/public/filter_bar/__tests__/_toggle_filters.js index a05a41e6346e48..b81abe52eea566 100644 --- a/src/ui/public/filter_bar/__tests__/_toggleFilters.js +++ b/src/ui/public/filter_bar/__tests__/_toggle_filters.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'auto-release-sinon'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; diff --git a/src/ui/public/filter_bar/__tests__/_updateFilters.js b/src/ui/public/filter_bar/__tests__/_update_filters.js similarity index 98% rename from src/ui/public/filter_bar/__tests__/_updateFilters.js rename to src/ui/public/filter_bar/__tests__/_update_filters.js index 5de414606aa654..99244cc111368e 100644 --- a/src/ui/public/filter_bar/__tests__/_updateFilters.js +++ b/src/ui/public/filter_bar/__tests__/_update_filters.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import MockState from 'fixtures/mock_state'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; describe('update filters', function () { diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js index ea8977a8062604..f1c450bc0459f5 100644 --- a/src/ui/public/filter_bar/__tests__/filter_bar.js +++ b/src/ui/public/filter_bar/__tests__/filter_bar.js @@ -1,13 +1,13 @@ import angular from 'angular'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import sinon from 'sinon'; import MockState from 'fixtures/mock_state'; import $ from 'jquery'; import 'ui/filter_bar'; -import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/mapFilter'; +import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; describe('Filter Bar Directive', function () { @@ -20,7 +20,7 @@ describe('Filter Bar Directive', function () { var mapFilter; var $el; var $scope; - // require('testUtils/noDigestPromises').activateForSuite(); + // require('test_utils/no_digest_promises').activateForSuite(); beforeEach(ngMock.module('kibana/global_state', function ($provide) { $provide.service('getAppState', _.constant(_.constant( diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js index f885acd245071f..aebc3651b4c0b7 100644 --- a/src/ui/public/filter_bar/__tests__/push_filter.js +++ b/src/ui/public/filter_bar/__tests__/push_filter.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter'; describe('Filter Bar pushFilter()', function () { diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js index b73631c65788fc..f8411ed469f491 100644 --- a/src/ui/public/filter_bar/__tests__/query_filter.js +++ b/src/ui/public/filter_bar/__tests__/query_filter.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import './_getFilters'; -import './_addFilters'; -import './_removeFilters'; -import './_updateFilters'; -import './_toggleFilters'; -import './_invertFilters'; -import './_pinFilters'; +import ngMock from 'ng_mock'; +import './_get_filters'; +import './_add_filters'; +import './_remove_filters'; +import './_update_filters'; +import './_toggle_filters'; +import './_invert_filters'; +import './_pin_filters'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; import EventsProvider from 'ui/events'; var queryFilter; diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js index 8953a8ae2be9f8..d50a33d3b08e47 100644 --- a/src/ui/public/filter_bar/filter_bar.js +++ b/src/ui/public/filter_bar/filter_bar.js @@ -3,12 +3,12 @@ import template from 'ui/filter_bar/filter_bar.html'; import moment from 'moment'; import angular from 'angular'; import 'ui/directives/json_input'; -import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filterAppliedAndUnwrap'; -import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters'; -import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/mapFlattenAndWrapFilters'; -import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extractTimeFilter'; -import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filterOutTimeBasedFilter'; -import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/changeTimeFilter'; +import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filter_applied_and_unwrap'; +import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters'; +import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters'; +import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_time_filter'; +import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter'; +import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; import uiModules from 'ui/modules'; var module = uiModules.get('kibana'); diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js index ed254ba5957632..8f2c7eb004a11e 100644 --- a/src/ui/public/filter_bar/filter_bar_click_handler.js +++ b/src/ui/public/filter_bar/filter_bar_click_handler.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -import dedupFilters from './lib/dedupFilters'; -import uniqFilters from './lib/uniqFilters'; +import dedupFilters from './lib/dedup_filters'; +import uniqFilters from './lib/uniq_filters'; import findByParam from 'ui/utils/find_by_param'; export default function (Notifier) { diff --git a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js rename to src/ui/public/filter_bar/lib/__tests__/change_time_filter.js index 93531a2be83345..bbda04ddebe994 100644 --- a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js @@ -1,8 +1,8 @@ import moment from 'moment'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; -import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/changeTimeFilter'; +import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter'; describe('Filter Bar Directive', function () { describe('changeTimeFilter()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js b/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/dedupFilters.js rename to src/ui/public/filter_bar/lib/__tests__/dedup_filters.js index da54a30d576f75..a225fb824b1761 100644 --- a/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js @@ -1,4 +1,4 @@ -import dedupFilters from 'ui/filter_bar/lib/dedupFilters'; +import dedupFilters from 'ui/filter_bar/lib/dedup_filters'; import expect from 'expect.js'; describe('Filter Bar Directive', function () { describe('dedupFilters(existing, filters)', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js rename to src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js index 72af2d1408f888..23bc5e14174133 100644 --- a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extractTimeFilter'; +import ngMock from 'ng_mock'; +import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_time_filter'; describe('Filter Bar Directive', function () { describe('extractTimeFilter()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js similarity index 86% rename from src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js rename to src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js index c3b3c6edfde974..530a74b40baa85 100644 --- a/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js +++ b/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js @@ -1,5 +1,5 @@ import expect from 'expect.js'; -import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filterAppliedAndUnwrap'; +import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filter_applied_and_unwrap'; describe('Filter Bar Directive', function () { describe('filterAppliedAndUnwrap()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js similarity index 94% rename from src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js rename to src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js index 7bd5eb25e755c9..9d103438d1905d 100644 --- a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'auto-release-sinon'; -import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filterOutTimeBasedFilter'; +import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter'; describe('Filter Bar Directive', function () { describe('filterOutTimeBasedFilter()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js similarity index 98% rename from src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js rename to src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js index 50df4a1be7ca53..03b5c564f7309a 100644 --- a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js +++ b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibGenerateMappingChainProvider from 'ui/filter_bar/lib/generateMappingChain'; +import ngMock from 'ng_mock'; +import FilterBarLibGenerateMappingChainProvider from 'ui/filter_bar/lib/generate_mapping_chain'; describe('Filter Bar Directive', function () { describe('generateMappingChain()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js similarity index 97% rename from src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js rename to src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js index 5b89292b6930a4..bfc8116982a66b 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'auto-release-sinon'; -import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters'; +import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters'; describe('Filter Bar Directive', function () { describe('mapAndFlattenFilters()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js b/src/ui/public/filter_bar/lib/__tests__/map_default.js similarity index 97% rename from src/ui/public/filter_bar/lib/__tests__/mapDefault.js rename to src/ui/public/filter_bar/lib/__tests__/map_default.js index 1cc10f807434cb..d03ea3e481ff76 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_default.js @@ -1,6 +1,6 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapDefaultProvider from 'ui/filter_bar/lib/mapDefault'; +import ngMock from 'ng_mock'; +import FilterBarLibMapDefaultProvider from 'ui/filter_bar/lib/map_default'; describe('Filter Bar Directive', function () { describe('mapDefault()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapExists.js b/src/ui/public/filter_bar/lib/__tests__/map_exists.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/mapExists.js rename to src/ui/public/filter_bar/lib/__tests__/map_exists.js index 6a8c3edd46ea02..f3c494223626bd 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapExists.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_exists.js @@ -1,6 +1,6 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapExistsProvider from 'ui/filter_bar/lib/mapExists'; +import ngMock from 'ng_mock'; +import FilterBarLibMapExistsProvider from 'ui/filter_bar/lib/map_exists'; describe('Filter Bar Directive', function () { describe('mapExists()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js b/src/ui/public/filter_bar/lib/__tests__/map_filter.js similarity index 98% rename from src/ui/public/filter_bar/lib/__tests__/mapFilter.js rename to src/ui/public/filter_bar/lib/__tests__/map_filter.js index e69f4ab1251f03..5931a00b7b28f5 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_filter.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/mapFilter'; +import ngMock from 'ng_mock'; +import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter'; describe('Filter Bar Directive', function () { var mapFilter; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js similarity index 95% rename from src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js rename to src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js index 97bc0c3ba67e0a..46b8c6a01c43fa 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js @@ -2,8 +2,8 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/mapFlattenAndWrapFilters'; +import ngMock from 'ng_mock'; +import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters'; describe('Filter Bar Directive', function () { describe('mapFlattenAndWrapFilters()', function () { var mapFlattenAndWrapFilters; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js rename to src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js index 30d3e1e8c5293e..11acded334c23b 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/mapGeoBoundingBox'; +import ngMock from 'ng_mock'; +import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/map_geo_bounding_box'; describe('Filter Bar Directive', function () { describe('mapGeoBoundingBox()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js b/src/ui/public/filter_bar/lib/__tests__/map_match_all.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js rename to src/ui/public/filter_bar/lib/__tests__/map_match_all.js index 3fcc107f38f7ec..3f8ce53a02f6fc 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_match_all.js @@ -1,6 +1,6 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapMatchAllProvider from 'ui/filter_bar/lib/mapMatchAll'; +import ngMock from 'ng_mock'; +import FilterBarLibMapMatchAllProvider from 'ui/filter_bar/lib/map_match_all'; describe('ui/filter_bar/lib', function () { describe('mapMatchAll()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js b/src/ui/public/filter_bar/lib/__tests__/map_missing.js similarity index 96% rename from src/ui/public/filter_bar/lib/__tests__/mapMissing.js rename to src/ui/public/filter_bar/lib/__tests__/map_missing.js index 721c1116398a3b..8566b41c07cb52 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_missing.js @@ -1,6 +1,6 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; -import FilterBarLibMapMissingProvider from 'ui/filter_bar/lib/mapMissing'; +import FilterBarLibMapMissingProvider from 'ui/filter_bar/lib/map_missing'; describe('Filter Bar Directive', function () { describe('mapMissing()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js similarity index 95% rename from src/ui/public/filter_bar/lib/__tests__/mapQueryString.js rename to src/ui/public/filter_bar/lib/__tests__/map_query_string.js index f4acd1eb3b9c48..89f5a5786685c4 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js @@ -1,6 +1,6 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapQueryStringProvider from 'ui/filter_bar/lib/mapQueryString'; +import ngMock from 'ng_mock'; +import FilterBarLibMapQueryStringProvider from 'ui/filter_bar/lib/map_query_string'; describe('Filter Bar Directive', function () { describe('mapQueryString()', function () { var mapQueryString; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapRange.js b/src/ui/public/filter_bar/lib/__tests__/map_range.js similarity index 94% rename from src/ui/public/filter_bar/lib/__tests__/mapRange.js rename to src/ui/public/filter_bar/lib/__tests__/map_range.js index 3c4cb1484c8b7e..c6338bc4ff59ac 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapRange.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_range.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/mapRange'; +import ngMock from 'ng_mock'; +import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/map_range'; describe('Filter Bar Directive', function () { describe('mapRange()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapScript.js b/src/ui/public/filter_bar/lib/__tests__/map_script.js similarity index 98% rename from src/ui/public/filter_bar/lib/__tests__/mapScript.js rename to src/ui/public/filter_bar/lib/__tests__/map_script.js index 3a7e2713aadca1..c2e7c94b968706 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapScript.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_script.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/mapScript'; +import ngMock from 'ng_mock'; +import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/map_script'; describe('Filter Bar Directive', function () { describe('mapScript()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js b/src/ui/public/filter_bar/lib/__tests__/map_terms.js similarity index 92% rename from src/ui/public/filter_bar/lib/__tests__/mapTerms.js rename to src/ui/public/filter_bar/lib/__tests__/map_terms.js index 9bc0ab67377425..71818e8c3a38de 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js +++ b/src/ui/public/filter_bar/lib/__tests__/map_terms.js @@ -1,7 +1,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/mapTerms'; +import ngMock from 'ng_mock'; +import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/map_terms'; describe('Filter Bar Directive', function () { describe('mapTerms()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js b/src/ui/public/filter_bar/lib/__tests__/only_disabled.js similarity index 98% rename from src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js rename to src/ui/public/filter_bar/lib/__tests__/only_disabled.js index fc4bb030dae21d..2ce365dab1eb9e 100644 --- a/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js +++ b/src/ui/public/filter_bar/lib/__tests__/only_disabled.js @@ -1,4 +1,4 @@ -import onlyDisabled from 'ui/filter_bar/lib/onlyDisabled'; +import onlyDisabled from 'ui/filter_bar/lib/only_disabled'; import expect from 'expect.js'; describe('Filter Bar Directive', function () { describe('onlyDisabled()', function () { diff --git a/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js b/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js similarity index 95% rename from src/ui/public/filter_bar/lib/__tests__/uniqFilters.js rename to src/ui/public/filter_bar/lib/__tests__/uniq_filters.js index 90544df4e8b39b..e6699f332f5f0e 100644 --- a/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js @@ -1,4 +1,4 @@ -import uniqFilters from 'ui/filter_bar/lib/uniqFilters'; +import uniqFilters from 'ui/filter_bar/lib/uniq_filters'; import expect from 'expect.js'; describe('Filter Bar Directive', function () { describe('uniqFilter', function () { diff --git a/src/ui/public/filter_bar/lib/changeTimeFilter.js b/src/ui/public/filter_bar/lib/change_time_filter.js similarity index 100% rename from src/ui/public/filter_bar/lib/changeTimeFilter.js rename to src/ui/public/filter_bar/lib/change_time_filter.js diff --git a/src/ui/public/filter_bar/lib/compareFilters.js b/src/ui/public/filter_bar/lib/compare_filters.js similarity index 100% rename from src/ui/public/filter_bar/lib/compareFilters.js rename to src/ui/public/filter_bar/lib/compare_filters.js diff --git a/src/ui/public/filter_bar/lib/dedupFilters.js b/src/ui/public/filter_bar/lib/dedup_filters.js similarity index 91% rename from src/ui/public/filter_bar/lib/dedupFilters.js rename to src/ui/public/filter_bar/lib/dedup_filters.js index 067f8cd95c19e9..cfcc2ac91351ea 100644 --- a/src/ui/public/filter_bar/lib/dedupFilters.js +++ b/src/ui/public/filter_bar/lib/dedup_filters.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import angular from 'angular'; -import compareFilters from 'ui/filter_bar/lib/compareFilters'; +import compareFilters from 'ui/filter_bar/lib/compare_filters'; /** * Combine 2 filter collections, removing duplicates diff --git a/src/ui/public/filter_bar/lib/extractTimeFilter.js b/src/ui/public/filter_bar/lib/extract_time_filter.js similarity index 100% rename from src/ui/public/filter_bar/lib/extractTimeFilter.js rename to src/ui/public/filter_bar/lib/extract_time_filter.js diff --git a/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js similarity index 100% rename from src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js rename to src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js diff --git a/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/filter_out_time_based_filter.js similarity index 100% rename from src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js rename to src/ui/public/filter_bar/lib/filter_out_time_based_filter.js diff --git a/src/ui/public/filter_bar/lib/generateMappingChain.js b/src/ui/public/filter_bar/lib/generate_mapping_chain.js similarity index 100% rename from src/ui/public/filter_bar/lib/generateMappingChain.js rename to src/ui/public/filter_bar/lib/generate_mapping_chain.js diff --git a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/map_and_flatten_filters.js similarity index 97% rename from src/ui/public/filter_bar/lib/mapAndFlattenFilters.js rename to src/ui/public/filter_bar/lib/map_and_flatten_filters.js index 67b480dabc7281..f8d2820cd0454d 100644 --- a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js +++ b/src/ui/public/filter_bar/lib/map_and_flatten_filters.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/mapFilter'; +import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter'; export default function mapAndFlattenFiltersProvider(Private, Promise) { var mapFilter = Private(FilterBarLibMapFilterProvider); return function (filters) { diff --git a/src/ui/public/filter_bar/lib/mapDefault.js b/src/ui/public/filter_bar/lib/map_default.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapDefault.js rename to src/ui/public/filter_bar/lib/map_default.js diff --git a/src/ui/public/filter_bar/lib/mapExists.js b/src/ui/public/filter_bar/lib/map_exists.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapExists.js rename to src/ui/public/filter_bar/lib/map_exists.js diff --git a/src/ui/public/filter_bar/lib/mapFilter.js b/src/ui/public/filter_bar/lib/map_filter.js similarity index 81% rename from src/ui/public/filter_bar/lib/mapFilter.js rename to src/ui/public/filter_bar/lib/map_filter.js index dbb8fb514a3897..79291f97b84420 100644 --- a/src/ui/public/filter_bar/lib/mapFilter.js +++ b/src/ui/public/filter_bar/lib/map_filter.js @@ -1,14 +1,14 @@ import _ from 'lodash'; -import GenerateMappingChainProvider from './generateMappingChain'; -import MapMatchAllProvider from './mapMatchAll'; -import MapTermsProvider from './mapTerms'; -import MapRangeProvider from './mapRange'; -import MapExistsProvider from './mapExists'; -import MapMissingProvider from './mapMissing'; -import MapQueryStringProvider from './mapQueryString'; -import MapGeoBoundingBoxProvider from './mapGeoBoundingBox'; -import MapScriptProvider from './mapScript'; -import MapDefaultProvider from './mapDefault'; +import GenerateMappingChainProvider from './generate_mapping_chain'; +import MapMatchAllProvider from './map_match_all'; +import MapTermsProvider from './map_terms'; +import MapRangeProvider from './map_range'; +import MapExistsProvider from './map_exists'; +import MapMissingProvider from './map_missing'; +import MapQueryStringProvider from './map_query_string'; +import MapGeoBoundingBoxProvider from './map_geo_bounding_box'; +import MapScriptProvider from './map_script'; +import MapDefaultProvider from './map_default'; export default function mapFilterProvider(Promise, Private) { var generateMappingChain = Private(GenerateMappingChainProvider); diff --git a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js similarity index 93% rename from src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js rename to src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js index 22a315c28f24a7..da726135aba640 100644 --- a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js +++ b/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters'; +import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters'; export default function mapFlattenAndWrapFilters(Private) { var mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider); return function (filters) { diff --git a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapGeoBoundingBox.js rename to src/ui/public/filter_bar/lib/map_geo_bounding_box.js diff --git a/src/ui/public/filter_bar/lib/mapMatchAll.js b/src/ui/public/filter_bar/lib/map_match_all.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapMatchAll.js rename to src/ui/public/filter_bar/lib/map_match_all.js diff --git a/src/ui/public/filter_bar/lib/mapMissing.js b/src/ui/public/filter_bar/lib/map_missing.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapMissing.js rename to src/ui/public/filter_bar/lib/map_missing.js diff --git a/src/ui/public/filter_bar/lib/mapQueryString.js b/src/ui/public/filter_bar/lib/map_query_string.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapQueryString.js rename to src/ui/public/filter_bar/lib/map_query_string.js diff --git a/src/ui/public/filter_bar/lib/mapRange.js b/src/ui/public/filter_bar/lib/map_range.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapRange.js rename to src/ui/public/filter_bar/lib/map_range.js diff --git a/src/ui/public/filter_bar/lib/mapScript.js b/src/ui/public/filter_bar/lib/map_script.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapScript.js rename to src/ui/public/filter_bar/lib/map_script.js diff --git a/src/ui/public/filter_bar/lib/mapTerms.js b/src/ui/public/filter_bar/lib/map_terms.js similarity index 100% rename from src/ui/public/filter_bar/lib/mapTerms.js rename to src/ui/public/filter_bar/lib/map_terms.js diff --git a/src/ui/public/filter_bar/lib/onlyDisabled.js b/src/ui/public/filter_bar/lib/only_disabled.js similarity index 100% rename from src/ui/public/filter_bar/lib/onlyDisabled.js rename to src/ui/public/filter_bar/lib/only_disabled.js diff --git a/src/ui/public/filter_bar/lib/onlyStateChanged.js b/src/ui/public/filter_bar/lib/only_state_changed.js similarity index 87% rename from src/ui/public/filter_bar/lib/onlyStateChanged.js rename to src/ui/public/filter_bar/lib/only_state_changed.js index 81cfa0807956ff..2b3a7ad9723bd8 100644 --- a/src/ui/public/filter_bar/lib/onlyStateChanged.js +++ b/src/ui/public/filter_bar/lib/only_state_changed.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import compareFilters from 'ui/filter_bar/lib/compareFilters'; +import compareFilters from 'ui/filter_bar/lib/compare_filters'; var compareOptions = { disabled: true, negate: true }; /** diff --git a/src/ui/public/filter_bar/lib/remapFilters.js b/src/ui/public/filter_bar/lib/remap_filters.js similarity index 100% rename from src/ui/public/filter_bar/lib/remapFilters.js rename to src/ui/public/filter_bar/lib/remap_filters.js diff --git a/src/ui/public/filter_bar/lib/uniqFilters.js b/src/ui/public/filter_bar/lib/uniq_filters.js similarity index 88% rename from src/ui/public/filter_bar/lib/uniqFilters.js rename to src/ui/public/filter_bar/lib/uniq_filters.js index 4de74305fa2ea3..988f921af7b371 100644 --- a/src/ui/public/filter_bar/lib/uniqFilters.js +++ b/src/ui/public/filter_bar/lib/uniq_filters.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedupFilters from 'ui/filter_bar/lib/dedupFilters'; +import dedupFilters from 'ui/filter_bar/lib/dedup_filters'; /** * Remove duplicate filters from an array of filters diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js index 79f549d1ee9c97..37557030d20113 100644 --- a/src/ui/public/filter_bar/query_filter.js +++ b/src/ui/public/filter_bar/query_filter.js @@ -1,11 +1,11 @@ import _ from 'lodash'; -import onlyDisabled from 'ui/filter_bar/lib/onlyDisabled'; -import onlyStateChanged from 'ui/filter_bar/lib/onlyStateChanged'; -import uniqFilters from 'ui/filter_bar/lib/uniqFilters'; -import compareFilters from 'ui/filter_bar/lib/compareFilters'; +import onlyDisabled from 'ui/filter_bar/lib/only_disabled'; +import onlyStateChanged from 'ui/filter_bar/lib/only_state_changed'; +import uniqFilters from 'ui/filter_bar/lib/uniq_filters'; +import compareFilters from 'ui/filter_bar/lib/compare_filters'; import angular from 'angular'; import EventsProvider from 'ui/events'; -import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters'; +import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters'; export default function (Private, $rootScope, getAppState, globalState, config) { var EventEmitter = Private(EventsProvider); diff --git a/src/ui/public/filter_manager/__tests__/filter_manager.js b/src/ui/public/filter_manager/__tests__/filter_manager.js index 4caa67cf2b6d3f..7a11b80de4c32c 100644 --- a/src/ui/public/filter_manager/__tests__/filter_manager.js +++ b/src/ui/public/filter_manager/__tests__/filter_manager.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import MockState from 'fixtures/mock_state'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FilterManagerProvider from 'ui/filter_manager'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; var $rootScope; diff --git a/src/ui/public/filter_manager/lib/__tests__/phrase.js b/src/ui/public/filter_manager/lib/__tests__/phrase.js index 891b6f66048f38..983cf5a9188559 100644 --- a/src/ui/public/filter_manager/lib/__tests__/phrase.js +++ b/src/ui/public/filter_manager/lib/__tests__/phrase.js @@ -2,7 +2,7 @@ import fn from 'ui/filter_manager/lib/phrase'; import expect from 'expect.js'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; var indexPattern; var expected; diff --git a/src/ui/public/filter_manager/lib/__tests__/query.js b/src/ui/public/filter_manager/lib/__tests__/query.js index 5cbd0db0b60bb0..798fa0937dc57f 100644 --- a/src/ui/public/filter_manager/lib/__tests__/query.js +++ b/src/ui/public/filter_manager/lib/__tests__/query.js @@ -2,7 +2,7 @@ import fn from 'ui/filter_manager/lib/query'; import expect from 'expect.js'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; var indexPattern; var expected; diff --git a/src/ui/public/filter_manager/lib/__tests__/range.js b/src/ui/public/filter_manager/lib/__tests__/range.js index f6981972ca5656..f1d97f179bcf5e 100644 --- a/src/ui/public/filter_manager/lib/__tests__/range.js +++ b/src/ui/public/filter_manager/lib/__tests__/range.js @@ -2,7 +2,7 @@ import fn from 'ui/filter_manager/lib/range'; import expect from 'expect.js'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; var indexPattern; var expected; diff --git a/src/ui/public/filters/__tests__/commaList.js b/src/ui/public/filters/__tests__/comma_list.js similarity index 92% rename from src/ui/public/filters/__tests__/commaList.js rename to src/ui/public/filters/__tests__/comma_list.js index 761eaeaa0992b0..d54e39c8e9d410 100644 --- a/src/ui/public/filters/__tests__/commaList.js +++ b/src/ui/public/filters/__tests__/comma_list.js @@ -1,6 +1,6 @@ import expect from 'expect.js'; -import ngMock from 'ngMock'; -import 'ui/filters/commaList'; +import ngMock from 'ng_mock'; +import 'ui/filters/comma_list'; describe('Comma-List filter', function () { diff --git a/src/ui/public/filters/__tests__/field_type.js b/src/ui/public/filters/__tests__/field_type.js index 2c29c9f7285086..ff2816855ce9ae 100644 --- a/src/ui/public/filters/__tests__/field_type.js +++ b/src/ui/public/filters/__tests__/field_type.js @@ -1,7 +1,7 @@ import angular from 'angular'; import expect from 'expect.js'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'plugins/kibana/discover/index'; import 'ui/filters/field_type'; diff --git a/src/ui/public/filters/__tests__/label.js b/src/ui/public/filters/__tests__/label.js index 0224f0214e0b8b..d4cdd3bf5c40c7 100644 --- a/src/ui/public/filters/__tests__/label.js +++ b/src/ui/public/filters/__tests__/label.js @@ -2,7 +2,7 @@ import angular from 'angular'; import expect from 'expect.js'; import _ from 'lodash'; import faker from 'faker'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'plugins/kibana/discover/index'; // Load kibana and its applications diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js index d7bfc9e3c5d0d2..72f1bb98203be9 100644 --- a/src/ui/public/filters/__tests__/moment.js +++ b/src/ui/public/filters/__tests__/moment.js @@ -2,7 +2,7 @@ import angular from 'angular'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; import moment from 'moment'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/filters/moment'; diff --git a/src/ui/public/filters/__tests__/rison.js b/src/ui/public/filters/__tests__/rison.js index 5e891834bbe06b..768203f2576813 100644 --- a/src/ui/public/filters/__tests__/rison.js +++ b/src/ui/public/filters/__tests__/rison.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'plugins/kibana/discover/index'; // Load kibana and its applications diff --git a/src/ui/public/filters/__tests__/short_dots.js b/src/ui/public/filters/__tests__/short_dots.js index e5ca6f2233247a..c4de34d12ce275 100644 --- a/src/ui/public/filters/__tests__/short_dots.js +++ b/src/ui/public/filters/__tests__/short_dots.js @@ -1,7 +1,7 @@ import angular from 'angular'; import expect from 'expect.js'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'plugins/kibana/discover/index'; import 'ui/filters/short_dots'; diff --git a/src/ui/public/filters/__tests__/start_from.js b/src/ui/public/filters/__tests__/start_from.js index 1e00f526c7c5ad..408b4396a7c258 100644 --- a/src/ui/public/filters/__tests__/start_from.js +++ b/src/ui/public/filters/__tests__/start_from.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/filters/start_from'; diff --git a/src/ui/public/filters/__tests__/uriescape.js b/src/ui/public/filters/__tests__/uriescape.js index 104c83e12162a5..6702c7713dd536 100644 --- a/src/ui/public/filters/__tests__/uriescape.js +++ b/src/ui/public/filters/__tests__/uriescape.js @@ -1,7 +1,7 @@ import angular from 'angular'; import expect from 'expect.js'; import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'plugins/kibana/discover/index'; diff --git a/src/ui/public/filters/commaList.js b/src/ui/public/filters/comma_list.js similarity index 100% rename from src/ui/public/filters/commaList.js rename to src/ui/public/filters/comma_list.js diff --git a/src/ui/public/fixedScroll.js b/src/ui/public/fixed_scroll.js similarity index 100% rename from src/ui/public/fixedScroll.js rename to src/ui/public/fixed_scroll.js diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js index 375ca88aab913a..b66f3b1d38ebe6 100644 --- a/src/ui/public/highlight/__tests__/highlight.js +++ b/src/ui/public/highlight/__tests__/highlight.js @@ -1,6 +1,6 @@ import angular from 'angular'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/highlight'; describe('Highlight', function () { diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js index 34b94ff448cedf..4e55b1d613ad75 100644 --- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js +++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type'; describe('type normalizer (castMappingType)', function () { diff --git a/src/ui/public/index_patterns/__tests__/_FieldFormat.js b/src/ui/public/index_patterns/__tests__/_field_format.js similarity index 98% rename from src/ui/public/index_patterns/__tests__/_FieldFormat.js rename to src/ui/public/index_patterns/__tests__/_field_format.js index e10e1956891ff8..504a1eb2f93a5f 100644 --- a/src/ui/public/index_patterns/__tests__/_FieldFormat.js +++ b/src/ui/public/index_patterns/__tests__/_field_format.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; -import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat'; +import ngMock from 'ng_mock'; +import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; describe('FieldFormat class', function () { var FieldFormat; diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js index 046f7dc283828d..0d5309fe0c9981 100644 --- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js +++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('get computed fields', function () { diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js index 79585e3728c1a4..cc39abe9462aee 100644 --- a/src/ui/public/index_patterns/__tests__/_index_pattern.js +++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import Promise from 'bluebird'; import errors from 'ui/errors'; -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields'; import FixturesStubbedDocSourceResponseProvider from 'fixtures/stubbed_doc_source_response'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; +import DocSourceProvider from 'ui/courier/data_source/doc_source'; import IndexPatternsMapperProvider from 'ui/index_patterns/_mapper'; import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; @@ -33,7 +33,7 @@ describe('index pattern', function () { mockLogstashFields = Private(FixturesLogstashFieldsProvider); docSourceResponse = Private(FixturesStubbedDocSourceResponseProvider); - DocSource = Private(CourierDataSourceDocSourceProvider); + DocSource = Private(DocSourceProvider); sinon.stub(DocSource.prototype, 'doIndex'); sinon.stub(DocSource.prototype, 'fetch'); @@ -146,7 +146,7 @@ describe('index pattern', function () { describe('refresh fields', function () { // override the default indexPattern, with a truncated field list - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); var indexPatternId = 'test-pattern'; var indexPattern; var fieldLength; @@ -301,7 +301,7 @@ describe('index pattern', function () { }); describe('#toDetailedIndexList', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); context('when index pattern is an interval', function () { var interval; beforeEach(function () { @@ -380,7 +380,7 @@ describe('index pattern', function () { describe('#toIndexList', function () { context('when index pattern is an interval', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); var interval; beforeEach(function () { @@ -411,7 +411,7 @@ describe('index pattern', function () { }); context('when index pattern is a time-base wildcard', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); beforeEach(function () { sinon.stub(indexPattern, 'getInterval').returns(false); sinon.stub(indexPattern, 'hasTimeField').returns(true); @@ -433,7 +433,7 @@ describe('index pattern', function () { }); context('when index pattern is a time-base wildcard that is configured not to expand', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); beforeEach(function () { sinon.stub(indexPattern, 'getInterval').returns(false); sinon.stub(indexPattern, 'hasTimeField').returns(true); diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js index b795ab53a85068..cbc7b783334c88 100644 --- a/src/ui/public/index_patterns/__tests__/_map_field.js +++ b/src/ui/public/index_patterns/__tests__/_map_field.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import IndexPatternsMapFieldProvider from 'ui/index_patterns/_map_field'; describe('field mapping normalizer (mapField)', function () { diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js index 050574d9782057..aefd7f458faa8c 100644 --- a/src/ui/public/index_patterns/__tests__/calculate_indices.js +++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js @@ -2,7 +2,7 @@ import { pluck } from 'lodash'; import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import moment from 'moment'; import IndexPatternsCalculateIndicesProvider from 'ui/index_patterns/_calculate_indices'; describe('ui/index_patterns/_calculate_indices', () => { @@ -119,7 +119,7 @@ describe('ui/index_patterns/_calculate_indices', () => { }); describe('response sorting', function () { - require('testUtils/noDigestPromises').activateForSuite(); + require('test_utils/no_digest_promises').activateForSuite(); context('when no sorting direction given', function () { it('returns the indices in the order that elasticsearch sends them', function () { diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js index bfeb19148b720d..9fda8bd0411d07 100644 --- a/src/ui/public/index_patterns/__tests__/flatten_hit.js +++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit'; describe('IndexPattern#flattenHit()', function () { diff --git a/src/ui/public/index_patterns/__tests__/index.js b/src/ui/public/index_patterns/__tests__/index.js index c0bdbcd4510ee9..45e604d232556e 100644 --- a/src/ui/public/index_patterns/__tests__/index.js +++ b/src/ui/public/index_patterns/__tests__/index.js @@ -3,6 +3,6 @@ import './_cast_mapping_type'; import './_map_field'; import './_pattern_to_wildcard'; import './_get_computed_fields'; -import './_FieldFormat'; +import './_field_format'; describe('Index Patterns', function () { }); diff --git a/src/ui/public/index_patterns/__tests__/index_patterns.js b/src/ui/public/index_patterns/__tests__/index_patterns.js index 7146e94f2e27a4..6ef012dfc135b7 100644 --- a/src/ui/public/index_patterns/__tests__/index_patterns.js +++ b/src/ui/public/index_patterns/__tests__/index_patterns.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; import IndexPatternProvider from '../_index_pattern'; diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js index d46ecbd8223713..73e2d376e928d3 100644 --- a/src/ui/public/index_patterns/__tests__/intervals.js +++ b/src/ui/public/index_patterns/__tests__/intervals.js @@ -1,7 +1,7 @@ import moment from 'moment'; import { pluck } from 'lodash'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; describe('Index Patterns', function () { diff --git a/src/ui/public/index_patterns/_cast_mapping_type.js b/src/ui/public/index_patterns/_cast_mapping_type.js index 1dd6cb6ca0adc0..2445ab2442cdc6 100644 --- a/src/ui/public/index_patterns/_cast_mapping_type.js +++ b/src/ui/public/index_patterns/_cast_mapping_type.js @@ -1,4 +1,4 @@ -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; export default function CastMappingTypeFn() { castMappingType.types = new IndexedArray({ diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js index 5061703b9e0997..d20b23625dff31 100644 --- a/src/ui/public/index_patterns/_field.js +++ b/src/ui/public/index_patterns/_field.js @@ -1,5 +1,5 @@ -import ObjDefine from 'ui/utils/ObjDefine'; -import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat'; +import ObjDefine from 'ui/utils/obj_define'; +import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types'; import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) { diff --git a/src/ui/public/index_patterns/_field_format/contentTypes.js b/src/ui/public/index_patterns/_field_format/content_types.js similarity index 100% rename from src/ui/public/index_patterns/_field_format/contentTypes.js rename to src/ui/public/index_patterns/_field_format/content_types.js diff --git a/src/ui/public/index_patterns/_field_format/FieldFormat.js b/src/ui/public/index_patterns/_field_format/field_format.js similarity index 98% rename from src/ui/public/index_patterns/_field_format/FieldFormat.js rename to src/ui/public/index_patterns/_field_format/field_format.js index de83ab8fef0159..cca0fb1ef4741c 100644 --- a/src/ui/public/index_patterns/_field_format/FieldFormat.js +++ b/src/ui/public/index_patterns/_field_format/field_format.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import IndexPatternsFieldFormatContentTypesProvider from 'ui/index_patterns/_field_format/contentTypes'; +import IndexPatternsFieldFormatContentTypesProvider from 'ui/index_patterns/_field_format/content_types'; export default function FieldFormatClassProvider(config, $rootScope, Private) { var contentTypes = Private(IndexPatternsFieldFormatContentTypesProvider); diff --git a/src/ui/public/index_patterns/_field_list.js b/src/ui/public/index_patterns/_field_list.js index efa5764b82a125..a55c27ad504cac 100644 --- a/src/ui/public/index_patterns/_field_list.js +++ b/src/ui/public/index_patterns/_field_list.js @@ -1,4 +1,4 @@ -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; import _ from 'lodash'; import IndexPatternsFieldProvider from 'ui/index_patterns/_field'; export default function FieldListProvider(Private) { diff --git a/src/ui/public/index_patterns/_field_types.js b/src/ui/public/index_patterns/_field_types.js index f61cafa8817277..3ff7f290e5315a 100644 --- a/src/ui/public/index_patterns/_field_types.js +++ b/src/ui/public/index_patterns/_field_types.js @@ -1,4 +1,4 @@ -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; export default function IndexPatternFieldTypes() { return new IndexedArray({ diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js index f673b356be3379..5cf219dbc67d1e 100644 --- a/src/ui/public/index_patterns/_index_pattern.js +++ b/src/ui/public/index_patterns/_index_pattern.js @@ -7,7 +7,7 @@ import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; import IndexPatternsGetIdsProvider from 'ui/index_patterns/_get_ids'; import IndexPatternsMapperProvider from 'ui/index_patterns/_mapper'; import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; +import DocSourceProvider from 'ui/courier/data_source/doc_source'; import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; import IndexPatternsFieldListProvider from 'ui/index_patterns/_field_list'; import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit'; @@ -19,7 +19,7 @@ export default function IndexPatternFactory(Private, timefilter, Notifier, confi var getIds = Private(IndexPatternsGetIdsProvider); var mapper = Private(IndexPatternsMapperProvider); var intervals = Private(IndexPatternsIntervalsProvider); - var DocSource = Private(CourierDataSourceDocSourceProvider); + var DocSource = Private(DocSourceProvider); var mappingSetup = Private(UtilsMappingSetupProvider); var FieldList = Private(IndexPatternsFieldListProvider); diff --git a/src/ui/public/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js index 2910a2fa7f9c11..b43f060757fe50 100644 --- a/src/ui/public/index_patterns/_intervals.js +++ b/src/ui/public/index_patterns/_intervals.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import moment from 'moment'; -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; export default function IndexNameIntervalsService(timefilter) { var intervals = new IndexedArray({ diff --git a/src/ui/public/index_patterns/routeSetup/loadDefault.js b/src/ui/public/index_patterns/route_setup/load_default.js similarity index 100% rename from src/ui/public/index_patterns/routeSetup/loadDefault.js rename to src/ui/public/index_patterns/route_setup/load_default.js diff --git a/src/ui/public/IndexedArray/__tests__/IndexedArray.js b/src/ui/public/indexed_array/__tests__/indexed_array.js similarity index 98% rename from src/ui/public/IndexedArray/__tests__/IndexedArray.js rename to src/ui/public/indexed_array/__tests__/indexed_array.js index 6cb9c662cb2d31..86cd4961358457 100644 --- a/src/ui/public/IndexedArray/__tests__/IndexedArray.js +++ b/src/ui/public/indexed_array/__tests__/indexed_array.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import expect from 'expect.js'; -import IndexedArray from 'ui/IndexedArray'; +import IndexedArray from 'ui/indexed_array'; // this is generally a data-structure that IndexedArray is good for managing var users = [ diff --git a/src/ui/public/IndexedArray/__tests__/inflector.js b/src/ui/public/indexed_array/__tests__/inflector.js similarity index 96% rename from src/ui/public/IndexedArray/__tests__/inflector.js rename to src/ui/public/indexed_array/__tests__/inflector.js index 7178a952f41080..6af57d8ce99c1d 100644 --- a/src/ui/public/IndexedArray/__tests__/inflector.js +++ b/src/ui/public/indexed_array/__tests__/inflector.js @@ -1,4 +1,4 @@ -import inflector from 'ui/IndexedArray/inflector'; +import inflector from 'ui/indexed_array/inflector'; import expect from 'expect.js'; describe('IndexedArray Inflector', function () { diff --git a/src/ui/public/IndexedArray/IndexedArray.js b/src/ui/public/indexed_array/indexed_array.js similarity index 98% rename from src/ui/public/IndexedArray/IndexedArray.js rename to src/ui/public/indexed_array/indexed_array.js index c6cef5ef007175..c63d0b157528a8 100644 --- a/src/ui/public/IndexedArray/IndexedArray.js +++ b/src/ui/public/indexed_array/indexed_array.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import inflector from 'ui/IndexedArray/inflector'; +import inflector from 'ui/indexed_array/inflector'; var pathGetter = _(_.get).rearg(1, 0).ary(2); diff --git a/src/ui/public/IndexedArray/inflector.js b/src/ui/public/indexed_array/inflector.js similarity index 100% rename from src/ui/public/IndexedArray/inflector.js rename to src/ui/public/indexed_array/inflector.js diff --git a/src/ui/public/jquery/__tests__/findTestSubject.js b/src/ui/public/jquery/__tests__/find_test_subject.js similarity index 100% rename from src/ui/public/jquery/__tests__/findTestSubject.js rename to src/ui/public/jquery/__tests__/find_test_subject.js diff --git a/src/ui/public/jquery/findTestSubject.js b/src/ui/public/jquery/find_test_subject.js similarity index 100% rename from src/ui/public/jquery/findTestSubject.js rename to src/ui/public/jquery/find_test_subject.js diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js index 0970a511b4f64c..b81480e2276f8b 100644 --- a/src/ui/public/listen/__tests__/listen.js +++ b/src/ui/public/listen/__tests__/listen.js @@ -1,6 +1,6 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import 'ui/listen'; import EventsProvider from 'ui/events'; diff --git a/src/ui/public/navbar/__tests__/navbar.js b/src/ui/public/navbar/__tests__/navbar.js index 507cd017e24390..571445c8733f41 100644 --- a/src/ui/public/navbar/__tests__/navbar.js +++ b/src/ui/public/navbar/__tests__/navbar.js @@ -1,4 +1,4 @@ -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import sinon from 'sinon'; import expect from 'expect.js'; import angular from 'angular'; diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js index a7febe7c5b93bf..a7d767e979d462 100644 --- a/src/ui/public/notify/__tests__/notifier.js +++ b/src/ui/public/notify/__tests__/notifier.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import ngMock from 'ngMock'; +import ngMock from 'ng_mock'; import expect from 'expect.js'; import Notifier from 'ui/notify/notifier'; describe('Notifier', function () { @@ -43,8 +43,8 @@ describe('Notifier', function () { expect(notify('error').title).to.equal('Error'); }); - it('sets lifetime to Infinity', function () { - expect(notify('error').lifetime).to.equal(Infinity); + it('sets lifetime to 5 minutes', function () { + expect(notify('error').lifetime).to.equal(300000); }); it('allows reporting', function () { diff --git a/src/ui/public/notify/__tests__/Notifier_lib.js b/src/ui/public/notify/__tests__/notifier_lib.js similarity index 100% rename from src/ui/public/notify/__tests__/Notifier_lib.js rename to src/ui/public/notify/__tests__/notifier_lib.js diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js index 332961e94e41c9..e2ff33b3901e24 100644 --- a/src/ui/public/notify/notifier.js +++ b/src/ui/public/notify/notifier.js @@ -229,7 +229,7 @@ Notifier.prototype.error = function (err, cb) { content: formatMsg(err, this.from), icon: 'warning', title: 'Error', - lifetime: Infinity, + lifetime: 300000, actions: ['report', 'accept'], stack: formatStack(err) }, cb); diff --git a/src/ui/public/notify/partials/toaster.html b/src/ui/public/notify/partials/toaster.html index 52a2e83a067dba..b1679f1082a25a 100644 --- a/src/ui/public/notify/partials/toaster.html +++ b/src/ui/public/notify/partials/toaster.html @@ -16,6 +16,13 @@ ng-class="'btn-' + notif.type" ng-click="notif.showStack = true" >More Info +